From aee5626e5b9e50789fd8067f6494ebb74bccd130 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Fri, 29 Apr 2022 00:32:16 -0400 Subject: [PATCH] world AI (#701) * monty mole AI pt 1 * monty mole AI #2 * enum values for evt priority and flags * enemy ai flags * done monty mole + partner enums * removed union for partner action state * missed parter action states + cam move flags + entity collision bit * basic ai * piranha plant stuff * attack ahead * consistent hitbox names * idk * organized piranha plant * delete matches * start fuzzy * naming * bzzap pt 1 * bzzap 2 * bzzap names done * rename bzzap to flyingAI * complete flying names * done for today * file reorganizing * world AI * starting clubba dedupe * suggested changes * bullet bills * sentinel start * dedupe sentinel complete * sentinel AI done * melee ai organization * piranha plant dedupe * resolved some bad dead syms * patrol start * patrol AI almost done * enough * more ai work * clean up clubba ai enum * dedupe all clubbae * started cleft extraction * ready to dedupe cleft * dedupe one cleft * iwa_04 * iwa_01 * iwa_02 * ai state file reorganization * enemy anim enum * extracted shy guy * dedupe shy guy ai * shy guy patrol ai * done shy guy ai dedupe * added NON_MATCHING wrap * ai etc * more dead ai * most dead ai merged with living * lakitu etc * paratroopas * fix warnings * fix other warning * ParatroopaAI * lakituAI parameter fix * dead_flo_13 debug strings * misc map matches * flying magikoopa start * name npc field * lungeAI renamed to tackleAI * magikoopa ai foothold * extrated one magikoopa * starting clubba dedupe * addressed PR comments * consolidated magikoopa helper funcs * misc map stuff * flying magikoopa dedupe * zipline funcs * delete matched * grind out another 0.05% * started letter delivery dedupe * more delivery dedupe * special delivery * rest of letter delivery * slight delivery reorg * delivery func names * cleft doc start * name enemy field * more renamins * unk_28.f * changed field names to facilitate renaming * done cleft cleanup * hopping ai * cleanup some ai * name field + patrol reorg * filled out NpcAISettings fields * assembling ai includes * elimated state files * remove X32 for alertOffsetDist * removed other NpcAISettings union * new NpcAISettings for UnkAI_4 * stationary AI cleanup * smalls * 0 new warnings Co-authored-by: HailSanta Co-authored-by: Ethan Roseman --- include/common_structs.h | 2 +- include/dead.h | 25 +- include/dead_structs.h | 6 +- include/enums.h | 115 +- include/functions.h | 27 +- include/macros.h | 22 + include/npc.h | 32 +- include/script_api/macros.h | 2 +- include/script_api/map.h | 2 +- include/variables.h | 3 - src/1a1f0_len_5390.c | 3 +- src/23680.c | 345 +- src/25AF0.c | 70 +- src/EA0C10.c | 357 +- src/EA36E0.c | 9 +- src/EA8AE0.c | 9 +- src/EB1170.c | 21 +- src/EB8E90.c | 2 +- src/EC2240.c | 6 +- src/EC9D00.c | 2 - src/ECAA80.c | 199 +- src/ED0310.c | 2 +- src/EDEA00.c | 155 +- src/EE70C0.c | 2 +- src/EED1E0.c | 2 - src/EEDF50.c | 9 +- src/EF2680.c | 22 +- src/battle/battle.c | 20 +- src/e0b30_len_b80.c | 6 +- src/encounter_api.c | 8 +- src/npc.c | 14 +- src/world/area_arn/arn_02/arn_02.h | 2 +- src/world/area_arn/arn_02/events.c | 245 +- src/world/area_arn/arn_03/events.c | 32 +- src/world/area_arn/arn_04/arn_04.h | 6 +- src/world/area_arn/arn_04/events.c | 265 +- src/world/area_arn/arn_05/events.c | 44 +- src/world/area_arn/arn_07/arn_07.h | 2 +- src/world/area_arn/arn_07/events.c | 42 +- src/world/area_arn/arn_08/events.c | 4 +- src/world/area_arn/arn_09/events.c | 2 +- src/world/area_arn/arn_10/events.c | 14 +- src/world/area_arn/arn_11/events.c | 2 +- src/world/area_arn/arn_12/events.c | 14 +- src/world/area_arn/arn_13/events.c | 14 +- src/world/area_dgb/dgb_00/BFA100.c | 4 +- src/world/area_dgb/dgb_01/BFD9A0.c | 358 +- src/world/area_dgb/dgb_01/dgb_01.h | 4 +- src/world/area_dgb/dgb_02/C2EBA0.c | 421 +- src/world/area_dgb/dgb_02/dgb_02.h | 6 +- src/world/area_dgb/dgb_03/C31730.c | 527 +-- src/world/area_dgb/dgb_03/dgb_03.h | 8 +- src/world/area_dgb/dgb_04/C36530.c | 325 +- src/world/area_dgb/dgb_04/dgb_04.h | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 402 +- src/world/area_dgb/dgb_05/dgb_05.h | 4 +- src/world/area_dgb/dgb_07/C3DBF0.c | 401 +- src/world/area_dgb/dgb_07/dgb_07.h | 4 +- src/world/area_dgb/dgb_08/C3FDB0.c | 484 +- src/world/area_dgb/dgb_08/dgb_08.h | 8 +- src/world/area_dgb/dgb_09/C46BE0.c | 742 +-- src/world/area_dgb/dgb_09/dgb_09.h | 8 +- src/world/area_dgb/dgb_15/C4F510.c | 119 +- src/world/area_dgb/dgb_15/dgb_15.h | 6 +- src/world/area_dgb/dgb_16/C52540.c | 421 +- src/world/area_dgb/dgb_16/dgb_16.h | 4 +- src/world/area_dgb/dgb_18/C55F40.c | 22 +- src/world/area_dgb/dgb_18/dgb_18.h | 2 +- src/world/area_dro/dro_01/95B7E0.c | 78 +- src/world/area_dro/dro_01/dro_01.h | 10 +- src/world/area_dro/dro_02/9694C0.c | 65 +- src/world/area_dro/dro_02/dro_02.h | 8 +- src/world/area_flo/flo_00/C9DF60.c | 30 +- src/world/area_flo/flo_00/flo_00.h | 2 +- src/world/area_flo/flo_03/CA72E0.c | 18 +- src/world/area_flo/flo_07/CAC5D0.c | 2 +- src/world/area_flo/flo_08/CAFAC0.c | 263 +- src/world/area_flo/flo_08/flo_08.h | 2 +- src/world/area_flo/flo_09/CB50E0.c | 38 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_09/flo_09.h | 4 +- src/world/area_flo/flo_10/CB9280.c | 2 +- src/world/area_flo/flo_11/CBDCD0.c | 4 +- src/world/area_flo/flo_12/CC0E70.c | 2 +- src/world/area_flo/flo_13/CC3850.c | 320 +- src/world/area_flo/flo_13/flo_13.h | 4 +- src/world/area_flo/flo_14/CCBE20.c | 22 +- src/world/area_flo/flo_14/flo_14.h | 2 +- src/world/area_flo/flo_15/CD06C0.c | 4 +- src/world/area_flo/flo_16/CD2C80.c | 20 +- src/world/area_flo/flo_16/flo_16.h | 2 +- src/world/area_flo/flo_17/CD7350.c | 322 +- src/world/area_flo/flo_17/flo_17.h | 4 +- src/world/area_flo/flo_18/CDC6A0.c | 10 +- src/world/area_flo/flo_21/CE6700.c | 36 +- src/world/area_flo/flo_22/CEC240.c | 4 +- src/world/area_flo/flo_23/CEE2A0.c | 18 +- src/world/area_flo/flo_23/flo_23.h | 2 +- src/world/area_flo/flo_25/CF2C10.c | 32 +- src/world/area_flo/flo_25/flo_25.h | 4 +- src/world/area_hos/hos_02/A17210.c | 4 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_hos/hos_05/A2AAC0.c | 47 +- src/world/area_hos/hos_06/A397F0.c | 9 +- src/world/area_isk/isk_04/97B670.c | 2 +- src/world/area_isk/isk_05/97DAD0.c | 2 +- src/world/area_isk/isk_08/984E30.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_18/997F70.c | 2 +- src/world/area_iwa/iwa_00/90CC40.c | 38 +- src/world/area_iwa/iwa_00/90CEF0.c | 6 +- src/world/area_iwa/iwa_01/90FBD0.c | 54 +- src/world/area_iwa/iwa_01/912960.c | 6 +- src/world/area_iwa/iwa_02/915D70.c | 32 +- src/world/area_iwa/iwa_03/918BB0.c | 15 +- src/world/area_iwa/iwa_03/918EF0.c | 38 +- src/world/area_iwa/iwa_04/91B8E0.c | 60 +- src/world/area_iwa/iwa_10/91E570.c | 9 +- src/world/area_iwa/iwa_11/9269F0.c | 8 +- src/world/area_iwa/iwa_11/926A10.c | 14 +- src/world/area_jan/jan_00/B20540.c | 12 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 11 +- src/world/area_jan/jan_05/B4AF10.c | 1 - src/world/area_jan/jan_05/B4B260.c | 6 +- src/world/area_jan/jan_06/B52F70.c | 6 +- src/world/area_jan/jan_07/B59870.c | 2 +- src/world/area_jan/jan_08/B5F650.c | 4 +- src/world/area_jan/jan_09/B663F0.c | 2 +- src/world/area_jan/jan_10/B6C6A0.c | 2 +- src/world/area_jan/jan_12/B730B0.c | 9 +- src/world/area_jan/jan_12/B73570.c | 2 +- src/world/area_jan/jan_14/B7A050.c | 9 +- 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 | 2 +- src/world/area_jan/jan_22/B851A0.c | 42 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 11 +- 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_11/8DA3A0.c | 2 +- src/world/area_kmr/kmr_12/events.c | 14 +- src/world/area_kpa/kpa_01/A470C0.c | 2 +- src/world/area_kpa/kpa_03/A48720.c | 41 +- src/world/area_kpa/kpa_03/A4A410.c | 12 +- src/world/area_kpa/kpa_08/A4CAC0.c | 36 +- src/world/area_kpa/kpa_09/A4F0A0.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 38 +- src/world/area_kpa/kpa_11/A52BD0.c | 2 +- src/world/area_kpa/kpa_111/A99590.c | 2 +- src/world/area_kpa/kpa_113/A9CC70.c | 2 +- src/world/area_kpa/kpa_115/A9ED40.c | 2 +- src/world/area_kpa/kpa_130/AA2D20.c | 6 +- src/world/area_kpa/kpa_50/A609D0.c | 4 +- src/world/area_kpa/kpa_51/A640E0.c | 38 +- src/world/area_kpa/kpa_52/A671E0.c | 2 +- src/world/area_kpa/kpa_61/A6E6F0.c | 34 +- src/world/area_kpa/kpa_70/A74B80.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 6 +- src/world/area_kpa/kpa_95/A8CB60.c | 6 +- src/world/area_kzn/kzn_02/C5AC20.c | 13 +- src/world/area_kzn/kzn_03/C61020.c | 42 +- src/world/area_kzn/kzn_03/C63A10.c | 29 +- src/world/area_kzn/kzn_07/C6EA50.c | 4 +- src/world/area_kzn/kzn_08/C71ED0.c | 34 +- src/world/area_kzn/kzn_09/C77A20.c | 29 +- src/world/area_kzn/kzn_09/C77D00.c | 42 +- src/world/area_kzn/kzn_11/C80600.c | 4 +- src/world/area_kzn/kzn_17/C85DC0.c | 42 +- src/world/area_kzn/kzn_19/C8DBB0.c | 9 +- src/world/area_kzn/kzn_20/C96240.c | 9 +- src/world/area_mac/mac_00/7EB340.c | 9 +- src/world/area_mac/mac_00/7ED280.c | 13 +- src/world/area_mac/mac_01/8017D0.c | 11 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 11 +- src/world/area_mac/mac_03/831B20.c | 9 +- src/world/area_mac/mac_05/852170.c | 11 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_01/B93940.c | 95 +- src/world/area_mim/mim_02/B97C70.c | 2 +- src/world/area_mim/mim_04/B9DB60.c | 2 +- src/world/area_mim/mim_05/BA07A0.c | 30 +- src/world/area_mim/mim_06/BA4CF0.c | 32 +- src/world/area_mim/mim_07/BAA3B0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 37 +- src/world/area_mim/mim_09/BB2E00.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 11 +- src/world/area_nok/nok_02/9D7AA0.c | 11 +- src/world/area_nok/nok_03/9EB7F0.c | 2 +- src/world/area_nok/nok_11/9F4A40.c | 4 +- src/world/area_nok/nok_12/9FAD60.c | 6 +- src/world/area_nok/nok_13/A00600.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 17 +- src/world/area_nok/nok_15/A06F00.c | 17 +- src/world/area_obk/obk_01/BBD980.c | 9 +- src/world/area_obk/obk_03/BC43F0.c | 9 +- src/world/area_omo/omo_02/D9D510.c | 14 +- src/world/area_omo/omo_04/DAD400.c | 22 +- src/world/area_omo/omo_05/DB22C0.c | 18 +- src/world/area_omo/omo_07/DBD2B0.c | 26 +- src/world/area_omo/omo_08/DC4C40.c | 10 +- src/world/area_omo/omo_09/DCD6B0.c | 26 +- src/world/area_omo/omo_13/DE2710.c | 35 +- src/world/area_omo/omo_17/DEF400.c | 20 +- src/world/area_osr/osr_00/AACBB0.c | 12 +- src/world/area_osr/osr_01/AB0350.c | 9 +- src/world/area_pra/pra_35/D8D270.c | 68 +- src/world/area_pra/pra_37/D92F40.c | 14 +- src/world/area_sam/sam_01/CF7E80.c | 9 +- src/world/area_sam/sam_03/D110C0.c | 21 +- src/world/area_sam/sam_05/D187E0.c | 30 +- src/world/area_sam/sam_06/D203E0.c | 11 +- src/world/area_sam/sam_07/D2BD30.c | 30 +- src/world/area_sam/sam_08/D309C0.c | 40 +- src/world/area_sam/sam_10/D37BD0.c | 14 +- src/world/area_sbk/sbk_00/9292B0.c | 14 +- src/world/area_sbk/sbk_01/929AD0.c | 14 +- src/world/area_sbk/sbk_02/92A9A0.c | 6 +- src/world/area_sbk/sbk_30/93F5B0.c | 11 +- src/world/area_sbk/sbk_34/945F10.c | 9 +- src/world/area_tik/tik_07/87AC00.c | 2 +- src/world/area_tik/tik_09/882BF0.c | 24 +- src/world/area_tik/tik_12/88A530.c | 2 +- src/world/area_tik/tik_20/89ACB0.c | 2 +- src/world/area_tik/tik_23/8A2D30.c | 2 +- src/world/area_tik/tik_24/8A5DE0.c | 2 +- src/world/area_trd/trd_01/99CD80.c | 4 +- src/world/area_trd/trd_02/9A10C0.c | 6 +- src/world/area_trd/trd_03/9A46F0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 61 +- src/world/area_trd/trd_07/9B6C90.c | 41 +- src/world/common/AwaitPlayerNearNpc.inc.c | 4 +- src/world/common/DeadUnkNpcAIMainFunc.inc.c | 98 - src/world/common/DeadUnkNpcAIMainFunc10.inc.c | 69 - src/world/common/DeadUnkNpcAIMainFunc6.inc.c | 19 +- src/world/common/DeadUnkNpcAIMainFunc9.inc.c | 71 - src/world/common/GetDefeatedEnemyCount.inc.c | 23 + src/world/common/HeartPlant_SpawnHeart.inc.c | 12 + src/world/common/LetterDelivery.inc.c | 58 + src/world/common/NpcJumpFunc.inc.c | 16 - src/world/common/NpcJumpFunc2.inc.c | 14 - src/world/common/NpcJumpFunc3.inc.c | 12 - src/world/common/PullVine.inc.c | 58 + src/world/common/SetManyVars.inc.c | 18 - src/world/common/SixFloatsFunc.inc.c | 15 - src/world/common/UnkDistFunc.inc.c | 24 - src/world/common/UnkDurationCheck.inc.c | 11 - src/world/common/UnkDurationCheckNoArgs.inc.c | 12 - src/world/common/UnkFunc10.inc.c | 38 - src/world/common/UnkFunc11.inc.c | 14 +- src/world/common/UnkFunc12.inc.c | 6 +- src/world/common/UnkFunc13.inc.c | 51 - src/world/common/UnkFunc14.inc.c | 32 - src/world/common/UnkFunc15.inc.c | 23 - src/world/common/UnkFunc16.inc.c | 20 - src/world/common/UnkFunc4.inc.c | 69 - src/world/common/UnkFunc45.inc.c | 14 - src/world/common/UnkFunc5.inc.c | 31 - src/world/common/UnkFunc53.inc.c | 2 +- src/world/common/UnkFunc54.inc.c | 147 - src/world/common/UnkFunc55.inc.c | 112 - src/world/common/UnkFunc58.inc.c | 14 - src/world/common/UnkFunc59.inc.c | 12 - src/world/common/UnkFunc6.inc.c | 89 - src/world/common/UnkFunc61.inc.c | 46 - src/world/common/UnkFunc7.inc.c | 74 - src/world/common/UnkFunc8.inc.c | 27 - src/world/common/UnkFunc9.inc.c | 19 - src/world/common/UnkNpcAIFunc1.inc.c | 12 - src/world/common/UnkNpcAIFunc10.inc.c | 11 - src/world/common/UnkNpcAIFunc11.inc.c | 24 - src/world/common/UnkNpcAIFunc12.inc.c | 34 - src/world/common/UnkNpcAIFunc13.inc.c | 29 - src/world/common/UnkNpcAIFunc13_2.inc.c | 29 - src/world/common/UnkNpcAIFunc14.inc.c | 31 - src/world/common/UnkNpcAIFunc15.inc.c | 15 - src/world/common/UnkNpcAIFunc16.inc.c | 11 - src/world/common/UnkNpcAIFunc17.inc.c | 14 - src/world/common/UnkNpcAIFunc18.inc.c | 15 - src/world/common/UnkNpcAIFunc19.inc.c | 17 - src/world/common/UnkNpcAIFunc1_copy.inc.c | 12 - src/world/common/UnkNpcAIFunc2.inc.c | 13 - src/world/common/UnkNpcAIFunc20.inc.c | 14 - src/world/common/UnkNpcAIFunc21.inc.c | 16 - src/world/common/UnkNpcAIFunc22.inc.c | 12 - src/world/common/UnkNpcAIFunc23.inc.c | 26 - src/world/common/UnkNpcAIFunc24.inc.c | 36 - src/world/common/UnkNpcAIFunc25.inc.c | 19 - src/world/common/UnkNpcAIFunc26.inc.c | 40 - src/world/common/UnkNpcAIFunc27.inc.c | 87 - src/world/common/UnkNpcAIFunc28.inc.c | 87 - src/world/common/UnkNpcAIFunc29.inc.c | 67 - src/world/common/UnkNpcAIFunc3.inc.c | 13 - src/world/common/UnkNpcAIFunc34.inc.c | 48 - src/world/common/UnkNpcAIFunc35.inc.c | 147 - src/world/common/UnkNpcAIFunc36.inc.c | 41 - src/world/common/UnkNpcAIFunc37.inc.c | 76 - src/world/common/UnkNpcAIFunc38.inc.c | 28 - src/world/common/UnkNpcAIFunc39.inc.c | 54 - src/world/common/UnkNpcAIFunc4.inc.c | 12 - src/world/common/UnkNpcAIFunc40.inc.c | 18 - src/world/common/UnkNpcAIFunc42.inc.c | 16 - src/world/common/UnkNpcAIFunc43.inc.c | 20 - src/world/common/UnkNpcAIFunc44.inc.c | 22 - src/world/common/UnkNpcAIFunc45.inc.c | 41 - src/world/common/UnkNpcAIFunc47.inc.c | 40 - src/world/common/UnkNpcAIFunc48.inc.c | 25 - src/world/common/UnkNpcAIFunc49.inc.c | 29 - src/world/common/UnkNpcAIFunc5.inc.c | 13 - src/world/common/UnkNpcAIFunc6.inc.c | 15 - src/world/common/UnkNpcAIFunc7.inc.c | 15 - src/world/common/UnkNpcAIFunc8.inc.c | 21 - src/world/common/UnkNpcAIFunc9.inc.c | 16 - src/world/common/UnkNpcAIMainFunc.inc.c | 86 - src/world/common/UnkNpcAIMainFunc10.inc.c | 62 - src/world/common/UnkNpcAIMainFunc2.inc.c | 69 - src/world/common/UnkNpcAIMainFunc3.inc.c | 55 - src/world/common/UnkNpcAIMainFunc4.inc.c | 75 - src/world/common/UnkNpcAIMainFunc5.inc.c | 135 - src/world/common/UnkNpcAIMainFunc7.inc.c | 100 - src/world/common/UnkNpcAIMainFunc9.inc.c | 63 - .../common/UnkNpcDurationAnimationFunc.inc.c | 13 - src/world/common/UnkNpcDurationFlagFunc.inc.c | 16 - src/world/common/UnkSetDurationFunc.inc.c | 9 - src/world/common/UnkYawFunc.inc.c | 23 - src/world/common/atomic/QuizmoData.inc.c | 10 +- .../common/atomic/enemy/BulletBill.inc.c | 121 - .../common/atomic/enemy/Dead_UnkAI_1.inc.c | 23 - .../common/atomic/enemy/Dead_UnkAI_9.inc.c | 21 - src/world/common/atomic/enemy/SpearGuy.inc.c | 23 - .../common/atomic/enemy/ThrowAttackAI.inc.c | 17 - src/world/common/atomic/enemy/UnkAI_1.inc.c | 32 - src/world/common/atomic/enemy/UnkAI_10.inc.c | 7 - src/world/common/atomic/enemy/UnkAI_2.inc.c | 34 - src/world/common/atomic/enemy/UnkAI_3.inc.c | 5 - src/world/common/atomic/enemy/UnkAI_4.inc.c | 20 - src/world/common/atomic/enemy/UnkAI_5.inc.c | 3 - src/world/common/atomic/enemy/UnkAI_6.inc.c | 5 - src/world/common/atomic/enemy/UnkAI_9.inc.c | 21 - .../atomic/enemy/UnkAI_StateHandlers_A.inc.c | 7 - src/world/common/enemy/BulletBillAI.inc.c | 227 + src/world/common/enemy/CleftAI.inc.c | 406 ++ src/world/common/enemy/ClubbaNappingAI.inc.c | 311 ++ src/world/common/enemy/ClubbaPatrolAI.inc.c | 104 + src/world/common/enemy/FlyingAI.inc.c | 511 ++ .../common/enemy/FlyingMagikoopaAI.inc.c | 378 ++ src/world/common/enemy/FlyingNoAttackAI.inc.c | 172 + src/world/common/enemy/GrooveGuyAI.inc.c | 155 + src/world/common/enemy/HoppingAI.inc.c | 289 ++ .../KoopaPatrolAI.inc.c} | 56 +- src/world/common/enemy/LakituAI.inc.c | 314 ++ src/world/common/enemy/MagikoopaAI.inc.c | 342 ++ .../MagikoopaSpellAI.inc.c} | 45 +- src/world/common/enemy/MeleeHitbox.inc.c | 192 + .../{atomic => }/enemy/MontyMoleAI.inc.c | 153 +- src/world/common/enemy/ParatroopaAI.inc.c | 185 + src/world/common/enemy/PatrolNoAttackAI.inc.c | 113 + src/world/common/enemy/PiranhaPlantAI.inc.c | 12 + src/world/common/enemy/ProjectileHitbox.inc.c | 377 ++ src/world/common/enemy/RangedAttackAI.inc.c | 109 + src/world/common/enemy/SentinelAI.inc.c | 361 ++ src/world/common/enemy/ShyGuyPatrolAI.inc.c | 166 + src/world/common/enemy/ShyGuyWanderAI.inc.c | 169 + src/world/common/enemy/SpearGuyAI.inc.c | 176 + .../SpinyAI.inc.c} | 85 +- src/world/common/enemy/States_PatrolAI.inc.c | 265 ++ src/world/common/enemy/States_TackleAI.inc.c | 93 + src/world/common/enemy/StationaryAI.inc.c | 276 ++ src/world/common/enemy/StoneChompAI.inc.c | 74 + .../TackleAI.inc.c} | 61 +- src/world/common/enemy/UnkFloAI.inc.c | 238 + src/world/common/enemy/WanderMeleeAI.inc.c | 122 + .../enemy/wip/Dead_PiranhaPlantAI_Main.inc.c | 82 + .../wip/PiranhaPlantAI_00.inc.c} | 4 +- .../wip/PiranhaPlantAI_01.inc.c} | 8 +- .../wip/PiranhaPlantAI_10.inc.c} | 5 +- .../wip/PiranhaPlantAI_11.inc.c} | 3 +- .../wip/PiranhaPlantAI_12.inc.c} | 4 +- .../wip/PiranhaPlantAI_13.inc.c} | 2 +- .../wip/PiranhaPlantAI_14.inc.c} | 4 +- .../enemy/wip/PiranhaPlantAI_Main.inc.c | 82 + .../common/set_script_owner_npc_anim.inc.c | 12 - .../set_script_owner_npc_col_height.inc.c | 20 - src/world/partner/bombette.c | 2 +- src/world/partner/bow.c | 2 +- src/world/partner/goombario.c | 2 +- src/world/partner/kooper.c | 4 +- src/world/partner/parakarry.c | 4 +- tools/ignored_funcs.txt | 23 +- ver/us/asm/data/16A680.data.s | 2 +- ver/us/asm/data/EA3A80.data.s | 24 +- ver/us/asm/data/EAA810.data.s | 8 +- ver/us/asm/data/EB1920.data.s | 8 +- ver/us/asm/data/EBA260.data.s | 2 +- ver/us/asm/data/ECBC10.data.s | 2 +- ver/us/asm/data/ED1840.data.s | 4 +- ver/us/asm/data/EE20E0.data.s | 6 +- ver/us/asm/data/EE8970.data.s | 4 +- ver/us/asm/data/EEFAD0.data.s | 4 +- ver/us/asm/data/EF58E0.data.s | 4 +- .../data/world/area_hos/hos_02/A1A6A0.data.s | 4 +- .../data/world/area_hos/hos_03/A1F3C0.data.s | 4 +- .../data/world/area_hos/hos_03/A23120.data.s | 2 +- .../data/world/area_hos/hos_06/A3C090.data.s | 8 +- .../data/world/area_isk/isk_02/9793F0.data.s | 2 +- .../data/world/area_isk/isk_04/97CB60.data.s | 8 +- .../data/world/area_isk/isk_05/97FE50.data.s | 2 +- .../data/world/area_isk/isk_07/982CA0.data.s | 2 +- .../data/world/area_isk/isk_08/985B00.data.s | 8 +- .../data/world/area_isk/isk_13/991A90.data.s | 2 +- .../data/world/area_isk/isk_14/994860.data.s | 2 +- .../data/world/area_isk/isk_18/998B90.data.s | 8 +- .../data/world/area_iwa/iwa_00/90CF20.data.s | 4 +- .../data/world/area_iwa/iwa_01/9135D0.data.s | 10 +- .../data/world/area_iwa/iwa_02/917220.data.s | 6 +- .../data/world/area_iwa/iwa_03/91A6B0.data.s | 4 +- .../data/world/area_iwa/iwa_04/91CFA0.data.s | 2 +- .../data/world/area_jan/jan_00/B226D0.data.s | 10 +- .../data/world/area_jan/jan_01/B299B0.data.s | 2 +- .../data/world/area_jan/jan_02/B2F410.data.s | 6 +- .../data/world/area_jan/jan_03/B39530.data.s | 16 +- .../data/world/area_jan/jan_05/B4F170.data.s | 8 +- .../data/world/area_jan/jan_06/B57320.data.s | 8 +- .../data/world/area_jan/jan_07/B5ACA0.data.s | 4 +- .../data/world/area_jan/jan_08/B62850.data.s | 6 +- .../data/world/area_jan/jan_09/B687D0.data.s | 4 +- .../data/world/area_jan/jan_10/B6DB60.data.s | 2 +- .../data/world/area_jan/jan_12/B74310.data.s | 4 +- .../data/world/area_jan/jan_12/B75D30.data.s | 4 +- .../data/world/area_jan/jan_14/B7B5C0.data.s | 4 +- .../data/world/area_jan/jan_14/B7D2C0.data.s | 2 +- .../data/world/area_jan/jan_15/B7DEE0.data.s | 2 +- .../data/world/area_jan/jan_22/B85AE0.data.s | 2 +- .../data/world/area_kkj/kkj_00/ABC3D0.data.s | 2 +- .../data/world/area_kkj/kkj_01/AC67E0.data.s | 4 +- .../data/world/area_kkj/kkj_02/AC9160.data.s | 2 +- .../data/world/area_kkj/kkj_18/AF4BB0.data.s | 2 +- .../data/world/area_kmr/kmr_02/8B3D10.data.s | 4 +- .../data/world/area_kmr/kmr_02/8B5640.data.s | 24 +- .../data/world/area_kmr/kmr_02/8C51D0.data.s | 4 +- .../data/world/area_kmr/kmr_05/8CF880.data.s | 8 +- .../data/world/area_kmr/kmr_06/8D3340.data.s | 6 +- .../data/world/area_kmr/kmr_07/8D49A0.data.s | 2 +- .../data/world/area_kmr/kmr_09/8D73C0.data.s | 6 +- .../data/world/area_kmr/kmr_11/8DE400.data.s | 2 +- .../data/world/area_kpa/kpa_01/A47D70.data.s | 8 +- .../data/world/area_kpa/kpa_03/A4A750.data.s | 20 +- .../data/world/area_kpa/kpa_08/A4E710.data.s | 10 +- .../data/world/area_kpa/kpa_09/A50B90.data.s | 6 +- .../data/world/area_kpa/kpa_102/A97690.data.s | 14 +- .../data/world/area_kpa/kpa_11/A53E30.data.s | 2 +- .../data/world/area_kpa/kpa_111/A9ACF0.data.s | 6 +- .../data/world/area_kpa/kpa_113/A9DD00.data.s | 8 +- .../data/world/area_kpa/kpa_115/AA0B20.data.s | 6 +- .../data/world/area_kpa/kpa_130/AA3870.data.s | 8 +- .../data/world/area_kpa/kpa_50/A624D0.data.s | 8 +- .../data/world/area_kpa/kpa_51/A660E0.data.s | 12 +- .../data/world/area_kpa/kpa_52/A68B40.data.s | 6 +- .../data/world/area_kpa/kpa_61/A70FE0.data.s | 8 +- .../data/world/area_kpa/kpa_70/A75B70.data.s | 2 +- .../data/world/area_kpa/kpa_82/A7AF80.data.s | 6 +- .../data/world/area_kpa/kpa_91/A88730.data.s | 2 +- .../data/world/area_kpa/kpa_95/A8E970.data.s | 2 +- .../data/world/area_kzn/kzn_02/C5D9B0.data.s | 16 +- .../data/world/area_kzn/kzn_03/C647B0.data.s | 24 +- .../data/world/area_kzn/kzn_07/C70EC0.data.s | 4 +- .../data/world/area_kzn/kzn_08/C76030.data.s | 8 +- .../data/world/area_kzn/kzn_09/C7B0D0.data.s | 20 +- .../data/world/area_kzn/kzn_11/C83870.data.s | 4 +- .../data/world/area_kzn/kzn_17/C89450.data.s | 22 +- .../data/world/area_kzn/kzn_19/C90BF0.data.s | 8 +- .../data/world/area_kzn/kzn_20/C97600.data.s | 8 +- .../data/world/area_mac/mac_00/7F0A20.data.s | 10 +- .../data/world/area_mac/mac_00/7F9850.data.s | 12 +- .../data/world/area_mac/mac_00/7FD1A0.data.s | 2 +- .../data/world/area_mac/mac_01/8091F0.data.s | 20 +- .../data/world/area_mac/mac_02/828F10.data.s | 14 +- .../data/world/area_mac/mac_03/837CB0.data.s | 14 +- .../data/world/area_mac/mac_04/8469B0.data.s | 4 +- .../data/world/area_mac/mac_04/8508F0.data.s | 2 +- .../data/world/area_mac/mac_05/857070.data.s | 14 +- .../data/world/area_mgm/mgm_00/E111A0.data.s | 2 +- .../data/world/area_mim/mim_01/B960E0.data.s | 4 +- .../data/world/area_mim/mim_02/B98EA0.data.s | 2 +- .../data/world/area_mim/mim_04/B9FEA0.data.s | 2 +- .../data/world/area_mim/mim_05/BA3A80.data.s | 4 +- .../data/world/area_mim/mim_06/BA9170.data.s | 6 +- .../data/world/area_mim/mim_07/BAC9C0.data.s | 2 +- .../data/world/area_mim/mim_08/BB1D00.data.s | 8 +- .../data/world/area_mim/mim_09/BB4830.data.s | 2 +- .../data/world/area_nok/nok_01/9C89E0.data.s | 18 +- .../data/world/area_nok/nok_02/9DDE90.data.s | 14 +- .../data/world/area_nok/nok_03/9ECBD0.data.s | 2 +- .../data/world/area_nok/nok_11/9F7180.data.s | 10 +- .../data/world/area_nok/nok_12/9FE000.data.s | 10 +- .../data/world/area_nok/nok_13/A02420.data.s | 2 +- .../data/world/area_nok/nok_14/A06110.data.s | 8 +- .../data/world/area_nok/nok_15/A0AB90.data.s | 8 +- .../data/world/area_obk/obk_01/BC11A0.data.s | 10 +- .../data/world/area_obk/obk_03/BC7120.data.s | 8 +- .../data/world/area_omo/omo_02/DA1CD0.data.s | 10 +- .../data/world/area_omo/omo_04/DAF3E0.data.s | 6 +- .../data/world/area_omo/omo_05/DB4770.data.s | 8 +- .../data/world/area_omo/omo_07/DC0B80.data.s | 10 +- .../data/world/area_omo/omo_08/DCBA10.data.s | 2 +- .../data/world/area_omo/omo_09/DD4150.data.s | 16 +- .../data/world/area_omo/omo_11/DDEE80.data.s | 2 +- .../data/world/area_omo/omo_13/DE3F70.data.s | 4 +- .../data/world/area_omo/omo_17/DF4EB0.data.s | 16 +- .../data/world/area_osr/osr_01/AB1150.data.s | 8 +- .../data/world/area_pra/pra_35/D90700.data.s | 4 +- .../data/world/area_pra/pra_36/D926F0.data.s | 2 +- .../data/world/area_pra/pra_37/D94800.data.s | 4 +- .../data/world/area_pra/pra_39/D99010.data.s | 2 +- .../data/world/area_sam/sam_01/CF9BC0.data.s | 12 +- .../data/world/area_sam/sam_02/D09AD0.data.s | 4 +- .../data/world/area_sam/sam_03/D11D40.data.s | 4 +- .../data/world/area_sam/sam_05/D1A900.data.s | 8 +- .../data/world/area_sam/sam_06/D23E50.data.s | 18 +- .../data/world/area_sam/sam_07/D2E9C0.data.s | 8 +- .../data/world/area_sam/sam_08/D31E80.data.s | 4 +- .../data/world/area_sam/sam_10/D38840.data.s | 4 +- .../data/world/area_sam/sam_11/D3D900.data.s | 4 +- .../data/world/area_sbk/sbk_02/92E220.data.s | 2 +- .../data/world/area_sbk/sbk_03/92FC20.data.s | 2 +- .../data/world/area_sbk/sbk_04/930840.data.s | 2 +- .../data/world/area_sbk/sbk_05/931130.data.s | 2 +- .../data/world/area_sbk/sbk_06/932BF0.data.s | 2 +- .../data/world/area_sbk/sbk_11/934530.data.s | 4 +- .../data/world/area_sbk/sbk_12/935130.data.s | 2 +- .../data/world/area_sbk/sbk_13/935CD0.data.s | 4 +- .../data/world/area_sbk/sbk_15/9370C0.data.s | 2 +- .../data/world/area_sbk/sbk_20/938DD0.data.s | 2 +- .../data/world/area_sbk/sbk_22/939A90.data.s | 4 +- .../data/world/area_sbk/sbk_24/93B3C0.data.s | 2 +- .../data/world/area_sbk/sbk_25/93C9A0.data.s | 2 +- .../data/world/area_sbk/sbk_26/93E390.data.s | 4 +- .../data/world/area_sbk/sbk_30/940DC0.data.s | 8 +- .../data/world/area_sbk/sbk_31/9444D0.data.s | 2 +- .../data/world/area_sbk/sbk_32/944BC0.data.s | 4 +- .../data/world/area_sbk/sbk_34/9468B0.data.s | 8 +- .../data/world/area_sbk/sbk_35/948A30.data.s | 2 +- .../data/world/area_sbk/sbk_40/94B800.data.s | 2 +- .../data/world/area_sbk/sbk_42/94C9E0.data.s | 2 +- .../data/world/area_sbk/sbk_44/94DA90.data.s | 4 +- .../data/world/area_sbk/sbk_46/94F070.data.s | 4 +- .../data/world/area_sbk/sbk_51/950E60.data.s | 4 +- .../data/world/area_sbk/sbk_53/951ED0.data.s | 2 +- .../data/world/area_sbk/sbk_55/953090.data.s | 2 +- .../data/world/area_sbk/sbk_60/956CF0.data.s | 2 +- .../data/world/area_sbk/sbk_62/9576C0.data.s | 2 +- .../data/world/area_sbk/sbk_63/9580E0.data.s | 2 +- .../data/world/area_sbk/sbk_66/9592E0.data.s | 2 +- .../data/world/area_tik/tik_04/8746E0.data.s | 2 +- .../data/world/area_tik/tik_05/876A50.data.s | 2 +- .../data/world/area_tik/tik_07/87E890.data.s | 4 +- .../data/world/area_tik/tik_09/885A80.data.s | 4 +- .../data/world/area_tik/tik_12/88C810.data.s | 8 +- .../data/world/area_tik/tik_18/896CA0.data.s | 4 +- .../data/world/area_tik/tik_20/89D200.data.s | 2 +- .../data/world/area_tik/tik_23/8A5340.data.s | 2 +- .../data/world/area_tik/tik_24/8A7A20.data.s | 2 +- .../data/world/area_trd/trd_01/99FD80.data.s | 4 +- .../data/world/area_trd/trd_02/9A3AB0.data.s | 6 +- .../data/world/area_trd/trd_03/9A60F0.data.s | 4 +- .../data/world/area_trd/trd_04/9AD960.data.s | 8 +- .../data/world/area_trd/trd_06/9B5FC0.data.s | 2 +- .../data/world/area_trd/trd_07/9B9760.data.s | 8 +- .../EA0C10/func_80242D64_EA3664.s | 21 - .../EA0C10/func_80242DA8_EA36A8.s | 18 - .../EA36E0/func_80242E00_EA3700.s | 17 - .../EA8AE0/func_80241B50_EAA630.s | 21 - .../EA8AE0/func_80241B94_EAA674.s | 15 - .../ECAA80/func_80241364_ECB064.s | 100 - .../EDEA00/func_80241DE4_EE07A4.s | 352 -- .../EDEA00/func_80242684_EE1044.s | 320 -- .../EDEA00/func_80242AF0_EE14B0.s | 634 --- .../EEDF50/func_80242780_EEF880.s | 160 - .../EF2680/func_80241C90_EF42A0.s | 12 +- .../CC3850/flo_13_func_80241DB8_CC55C8.s | 341 -- .../CD7350/flo_17_func_80241C64_CD8F44.s | 341 -- .../hos_05/A2AAC0/func_80240880_A2AAC0.s | 85 - .../hos_05/A2AAC0/func_80240D54_A2AF94.s | 30 - .../hos_05/A2AAC0/func_80240DA0_A2AFE0.s | 26 - .../hos_05/A2AAC0/func_80240DF8_A2B038.s | 19 - .../hos_05/A2AAC0/func_80240E30_A2B070.s | 12 - .../hos_06/A397F0/func_802409F8_A39ED8.s | 21 - .../hos_06/A397F0/func_80240A3C_A39F1C.s | 15 - .../iwa_00/90CC40/func_80240118_90CD58.s | 111 - .../iwa_00/90CEF0/func_802402B0_90CEF0.s | 16 - .../iwa_01/90FBD0/func_802422C4_911974.s | 106 - .../iwa_01/90FBD0/func_80242498_911B48.s | 88 - .../iwa_01/90FBD0/func_80242958_912008.s | 118 - .../iwa_01/90FBD0/func_80242C48_9122F8.s | 57 - .../iwa_01/90FBD0/func_80242F54_912604.s | 250 - .../iwa_01/912960/func_802432B0_912960.s | 16 - .../iwa_02/915D70/func_80240000_915D70.s | 106 - .../iwa_02/915D70/func_802401D4_915F44.s | 88 - .../iwa_02/915D70/func_80240694_916404.s | 118 - .../iwa_02/915D70/func_80240984_9166F4.s | 57 - .../iwa_02/915D70/func_80240C90_916A00.s | 247 - .../iwa_03/918BB0/func_802402BC_918E6C.s | 40 - .../iwa_03/918EF0/func_80240340_918EF0.s | 106 - .../iwa_03/918EF0/func_80240514_9190C4.s | 88 - .../iwa_03/918EF0/func_802409D4_919584.s | 118 - .../iwa_03/918EF0/func_80240CC4_919874.s | 57 - .../iwa_03/918EF0/func_80240FD0_919B80.s | 247 - .../iwa_03/918EF0/func_80241320_919ED0.s | 16 - .../iwa_04/91B8E0/func_80240000_91B8E0.s | 39 - .../iwa_04/91B8E0/func_80240080_91B960.s | 106 - .../iwa_04/91B8E0/func_80240254_91BB34.s | 88 - .../iwa_04/91B8E0/func_80240714_91BFF4.s | 118 - .../iwa_04/91B8E0/func_80240A04_91C2E4.s | 57 - .../iwa_04/91B8E0/func_80240D10_91C5F0.s | 247 - .../iwa_04/91B8E0/func_80241060_91C940.s | 11 - .../iwa_04/91B8E0/func_8024107C_91C95C.s | 29 - .../iwa_10/91E570/func_80240000_91E570.s | 21 - .../iwa_11/9269F0/func_80240000_9269F0.s | 12 - .../iwa_11/926A10/func_802401B0_926BA0.s | 26 - .../iwa_11/926A10/func_80240208_926BF8.s | 34 - .../jan_00/B20540/func_80240340_B20880.s | 50 - .../jan_00/B20540/func_80240ADC_B2101C.s | 21 - .../jan_00/B20540/func_80240B20_B21060.s | 15 - .../jan_02/B2C8A0/func_80241578_B2D9E8.s | 12 +- .../jan_03/B34BD0/func_80242EAC_B37A7C.s | 21 - .../jan_03/B34BD0/func_80242EF0_B37AC0.s | 15 - .../jan_05/B4B260/func_802407F0_B4B260.s | 50 - .../jan_06/B52F70/func_80241554_B53D84.s | 50 - .../jan_08/B5F650/func_802413A0_B5F650.s | 50 - .../jan_12/B730B0/func_80240000_B730B0.s | 67 - .../jan_12/B730B0/func_802400F8_B731A8.s | 34 - .../jan_12/B730B0/func_80240170_B73220.s | 34 - .../jan_12/B730B0/func_802401CC_B7327C.s | 51 - .../jan_14/B7A050/func_80240000_B7A050.s | 67 - .../jan_14/B7A050/func_802400F8_B7A148.s | 34 - .../jan_14/B7A050/func_80240170_B7A1C0.s | 34 - .../jan_14/B7A050/func_802401CC_B7A21C.s | 51 - .../jan_15/B7D920/func_80240000_B7D920.s | 53 - .../jan_22/B851A0/func_80241020_B851A0.s | 46 - .../jan_22/B851A0/func_802410C4_B85244.s | 46 - .../jan_22/B851A0/func_802412E0_B85460.s | 67 - .../kkj_18/AF2FE0/func_802405F8_AF3298.s | 12 +- .../kkj_19/AF7C00/func_802406C4_AF8014.s | 24 +- .../kmr_02/8B0070/func_802426A0_8B2710.s | 21 - .../kmr_02/8B0070/func_802426E4_8B2754.s | 15 - .../kmr_21/8FEE90/func_80240010_8FEE90.s | 4 +- .../kmr_21/8FEE90/func_80240210_8FF090.s | 4 +- .../kpa_03/A48720/func_8024119C_A4975C.s | 81 - .../kpa_03/A48720/func_80241368_A49928.s | 30 - .../kpa_03/A48720/func_802413CC_A4998C.s | 86 - .../kpa_03/A48720/func_8024150C_A49ACC.s | 127 - .../kpa_03/A48720/func_802416EC_A49CAC.s | 118 - .../kpa_03/A48720/func_802418AC_A49E6C.s | 32 - .../kpa_03/A48720/func_80241918_A49ED8.s | 83 - .../kpa_03/A48720/func_80241A4C_A4A00C.s | 31 - .../kpa_03/A48720/func_80241AB4_A4A074.s | 181 - .../kpa_03/A48720/func_80241D20_A4A2E0.s | 23 - .../kpa_03/A48720/func_80241D6C_A4A32C.s | 26 - .../kpa_03/A48720/func_80241DFC_A4A3BC.s | 26 - .../kpa_03/A4A410/func_80241E50_A4A410.s | 34 - .../kpa_08/A4CAC0/func_802407F4_A4D214.s | 81 - .../kpa_08/A4CAC0/func_802409C0_A4D3E0.s | 30 - .../kpa_08/A4CAC0/func_80240A24_A4D444.s | 86 - .../kpa_08/A4CAC0/func_80240B64_A4D584.s | 127 - .../kpa_08/A4CAC0/func_80240D08_A4D728.s | 19 - .../kpa_08/A4CAC0/func_80240D44_A4D764.s | 118 - .../kpa_08/A4CAC0/func_80240F04_A4D924.s | 32 - .../kpa_08/A4CAC0/func_80240F70_A4D990.s | 83 - .../kpa_08/A4CAC0/func_802410A4_A4DAC4.s | 31 - .../kpa_08/A4CAC0/func_8024110C_A4DB2C.s | 181 - .../kpa_08/A4CAC0/func_80241378_A4DD98.s | 23 - .../kpa_08/A4CAC0/func_802413C4_A4DDE4.s | 26 - .../kpa_08/A4CAC0/func_80241454_A4DE74.s | 24 - .../kpa_102/A93A50/func_80242410_A95B50.s | 19 - .../kpa_102/A93A50/func_8024244C_A95B8C.s | 106 - .../kpa_102/A93A50/func_802425D8_A95D18.s | 282 -- .../kpa_102/A93A50/func_802429C8_A96108.s | 66 - .../kpa_102/A93A50/func_80242ABC_A961FC.s | 164 - .../kpa_102/A93A50/func_80242D00_A96440.s | 19 - .../kpa_102/A93A50/func_80242D3C_A9647C.s | 122 - .../kpa_102/A93A50/func_80242F08_A96648.s | 32 - .../kpa_102/A93A50/func_80242F74_A966B4.s | 84 - .../kpa_102/A93A50/func_802430A8_A967E8.s | 65 - .../kpa_102/A93A50/func_80243198_A968D8.s | 59 - .../kpa_102/A93A50/func_80243270_A969B0.s | 191 - .../kpa_102/A93A50/func_8024353C_A96C7C.s | 26 - .../kpa_130/AA2D20/func_80240000_AA2D20.s | 25 - .../kpa_130/AA2D20/func_802404AC_AA31CC.s | 185 - .../kpa_51/A640E0/func_802407A4_A64834.s | 81 - .../kpa_51/A640E0/func_80240970_A64A00.s | 30 - .../kpa_51/A640E0/func_802409D4_A64A64.s | 86 - .../kpa_51/A640E0/func_80240B14_A64BA4.s | 127 - .../kpa_51/A640E0/func_80240CB8_A64D48.s | 19 - .../kpa_51/A640E0/func_80240CF4_A64D84.s | 118 - .../kpa_51/A640E0/func_80240EB4_A64F44.s | 32 - .../kpa_51/A640E0/func_80240F20_A64FB0.s | 83 - .../kpa_51/A640E0/func_80241054_A650E4.s | 31 - .../kpa_51/A640E0/func_802410BC_A6514C.s | 181 - .../kpa_51/A640E0/func_80241328_A653B8.s | 23 - .../kpa_51/A640E0/func_80241374_A65404.s | 26 - .../kpa_51/A640E0/func_80241404_A65494.s | 23 - .../kpa_61/A6E6F0/func_802411C4_A6F5A4.s | 19 - .../kpa_61/A6E6F0/func_80241200_A6F5E0.s | 106 - .../kpa_61/A6E6F0/func_8024138C_A6F76C.s | 282 -- .../kpa_61/A6E6F0/func_8024177C_A6FB5C.s | 66 - .../kpa_61/A6E6F0/func_80241870_A6FC50.s | 164 - .../kpa_61/A6E6F0/func_80241AB4_A6FE94.s | 19 - .../kpa_61/A6E6F0/func_80241AF0_A6FED0.s | 122 - .../kpa_61/A6E6F0/func_80241CBC_A7009C.s | 32 - .../kpa_61/A6E6F0/func_80241D28_A70108.s | 84 - .../kpa_61/A6E6F0/func_80241E5C_A7023C.s | 65 - .../kpa_61/A6E6F0/func_80241F4C_A7032C.s | 59 - .../kpa_61/A6E6F0/func_802422F0_A706D0.s | 25 - .../A6E6F0/update_heroes_start_turn_A70404.s | 191 - .../kzn_02/C5AC20/func_8024239C_C5CADC.s | 12 +- .../kzn_02/C5AC20/func_802426B4_C5CDF4.s | 21 - .../kzn_02/C5AC20/func_802426F8_C5CE38.s | 18 - .../kzn_03/C61020/func_8024234C_C6305C.s | 165 - .../kzn_03/C61020/func_8024296C_C6367C.s | 12 +- .../kzn_03/C61020/func_80242C84_C63994.s | 21 - .../kzn_03/C61020/func_80242CC8_C639D8.s | 18 - .../kzn_03/C63A10/func_80242DB0_C63AC0.s | 46 - .../kzn_03/C63A10/func_80242E54_C63B64.s | 46 - .../kzn_03/C63A10/func_80243070_C63D80.s | 12 - .../kzn_08/C71ED0/func_80243C90_C75110.s | 165 - .../kzn_09/C77A20/func_80240D40_C77A20.s | 46 - .../kzn_09/C77A20/func_80240DE4_C77AC4.s | 46 - .../kzn_09/C77A20/func_80241000_C77CE0.s | 12 - .../kzn_09/C77D00/func_80241A58_C78738.s | 710 --- .../kzn_09/C77D00/func_80242774_C79454.s | 165 - .../kzn_09/C77D00/func_80243994_C7A674.s | 21 - .../kzn_09/C77D00/func_802439D8_C7A6B8.s | 18 - .../kzn_17/C85DC0/func_80240D48_C867F8.s | 710 --- .../kzn_17/C85DC0/func_80241A64_C87514.s | 165 - .../kzn_17/C85DC0/func_80242C84_C88734.s | 21 - .../kzn_17/C85DC0/func_80242CC8_C88778.s | 18 - .../kzn_19/C8DBB0/func_80241B50_C8F700.s | 21 - .../kzn_19/C8DBB0/func_80241B94_C8F744.s | 15 - .../kzn_20/C96240/func_802409F8_C96928.s | 21 - .../kzn_20/C96240/func_80240A3C_C9696C.s | 15 - .../mac_00/7EB340/func_80241D30_7ECA40.s | 21 - .../mac_00/7EB340/func_80241D74_7ECA84.s | 15 - .../mac_00/7ED280/func_80243AE8_7EE7F8.s | 21 - .../mac_00/7ED280/func_80243B2C_7EE83C.s | 17 - .../mac_01/8017D0/func_80244078_8048F8.s | 21 - .../mac_01/8017D0/func_802440BC_80493C.s | 15 - .../mac_02/823BF0/func_80243380_826640.s | 21 - .../mac_02/823BF0/func_802433C4_826684.s | 15 - .../mac_03/831B20/func_80241B14_833314.s | 21 - .../mac_03/831B20/func_80241B58_833358.s | 15 - .../mac_05/852170/func_80242A20_854B90.s | 21 - .../mac_05/852170/func_80242A64_854BD4.s | 15 - .../mim_05/BA07A0/func_802417C4_BA1EF4.s | 168 - .../mim_06/BA4CF0/func_80241CC4_BA6444.s | 165 - .../mim_08/BAD940/func_80240068_BAD9A8.s | 18 - .../mim_08/BAD940/func_80242CEC_BB062C.s | 166 - .../nok_01/9C53E0/func_802423CC_9C77AC.s | 21 - .../nok_01/9C53E0/func_80242410_9C77F0.s | 15 - .../nok_02/9D7AA0/func_80242F74_9D9F94.s | 21 - .../nok_02/9D7AA0/func_80242FB8_9D9FD8.s | 15 - .../nok_14/A02A00/func_80241E8C_A046CC.s | 78 - .../nok_14/A02A00/func_80241FB4_A047F4.s | 52 - .../nok_14/A02A00/func_80242070_A048B0.s | 76 - .../nok_14/A02A00/func_802421CC_A04A0C.s | 174 - .../nok_15/A06F00/func_80241FAC_A08EAC.s | 78 - .../nok_15/A06F00/func_802420D4_A08FD4.s | 52 - .../nok_15/A06F00/func_80242190_A09090.s | 76 - .../nok_15/A06F00/func_802422EC_A091EC.s | 174 - .../obk_01/BBD980/func_80240EC8_BBE068.s | 21 - .../obk_01/BBD980/func_80240F0C_BBE0AC.s | 15 - .../obk_03/BC43F0/func_80240858_BC4AD8.s | 21 - .../obk_03/BC43F0/func_8024089C_BC4B1C.s | 17 - .../omo_01/D9B150/func_80240260_D9B150.s | 2 +- .../omo_01/D9B150/func_80240844_D9B734.s | 2 +- .../omo_01/D9B150/func_802409EC_D9B8DC.s | 14 +- .../omo_02/D9D510/func_80240970_D9DE40.s | 39 - .../omo_02/D9D510/func_802409E0_D9DEB0.s | 65 - .../omo_02/D9D510/func_80240AB0_D9DF80.s | 44 - .../omo_02/D9D510/func_80240BA8_D9E078.s | 236 - .../omo_04/DAD400/func_802402F4_DAD6F4.s | 47 - .../omo_04/DAD400/func_80241898_DAEC98.s | 39 - .../omo_04/DAD400/func_80241908_DAED08.s | 65 - .../omo_04/DAD400/func_802419D8_DAEDD8.s | 44 - .../omo_04/DAD400/func_80241AD0_DAEED0.s | 236 - .../omo_05/DB22C0/func_80240000_DB22C0.s | 39 - .../omo_05/DB22C0/func_80240070_DB2330.s | 65 - .../omo_05/DB22C0/func_80240140_DB2400.s | 44 - .../omo_05/DB22C0/func_80240238_DB24F8.s | 236 - .../omo_05/DB22C0/func_802405BC_DB287C.s | 142 - .../omo_05/DB22C0/func_80240780_DB2A40.s | 209 - .../omo_07/DBD2B0/func_80240000_DBD2B0.s | 39 - .../omo_07/DBD2B0/func_80240070_DBD320.s | 65 - .../omo_07/DBD2B0/func_80240140_DBD3F0.s | 44 - .../omo_07/DBD2B0/func_80240238_DBD4E8.s | 236 - .../omo_07/DBD2B0/func_802413FC_DBE6AC.s | 39 - .../omo_07/DBD2B0/func_8024146C_DBE71C.s | 65 - .../omo_07/DBD2B0/func_8024153C_DBE7EC.s | 44 - .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 241 - .../omo_08/DC4C40/func_80240870_DC4C40.s | 39 - .../omo_08/DC4C40/func_802408E0_DC4CB0.s | 65 - .../omo_08/DC4C40/func_802409B0_DC4D80.s | 44 - .../omo_08/DC4C40/func_80240AA8_DC4E78.s | 237 - .../omo_09/DCD6B0/func_802409E0_DCD6B0.s | 39 - .../omo_09/DCD6B0/func_80240A50_DCD720.s | 65 - .../omo_09/DCD6B0/func_80240B20_DCD7F0.s | 44 - .../omo_09/DCD6B0/func_80240C18_DCD8E8.s | 236 - .../omo_09/DCD6B0/func_80241DDC_DCEAAC.s | 39 - .../omo_09/DCD6B0/func_80241E4C_DCEB1C.s | 65 - .../omo_09/DCD6B0/func_80241F1C_DCEBEC.s | 44 - .../omo_09/DCD6B0/func_80242014_DCECE4.s | 241 - .../omo_13/DE2710/func_80240280_DE2710.s | 39 - .../omo_13/DE2710/func_802402F0_DE2780.s | 65 - .../omo_13/DE2710/func_802403C0_DE2850.s | 44 - .../omo_13/DE2710/func_802404B8_DE2948.s | 236 - .../omo_13/DE2710/func_8024083C_DE2CCC.s | 142 - .../omo_13/DE2710/func_80240A00_DE2E90.s | 209 - .../omo_17/DEF400/func_80240560_DEF400.s | 39 - .../omo_17/DEF400/func_802405D0_DEF470.s | 65 - .../omo_17/DEF400/func_802406A0_DEF540.s | 44 - .../omo_17/DEF400/func_80240798_DEF638.s | 236 - .../omo_17/DEF400/func_80240B1C_DEF9BC.s | 142 - .../omo_17/DEF400/func_80240CE0_DEFB80.s | 209 - .../osr_00/AACBB0/func_80240678_AACEA8.s | 30 - .../osr_01/AB0350/func_80240A48_AB0A38.s | 21 - .../osr_01/AB0350/func_80240A8C_AB0A7C.s | 17 - .../pra_04/D54840/func_802401B0_D54840.s | 2 +- .../pra_10/D5F2D0/func_80240F20_D601D0.s | 2 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 32 +- .../pra_38/D955F0/func_80240F50_D96540.s | 2 +- .../pra_39/D97890/func_80240F50_D987E0.s | 2 +- .../sam_01/CF7E80/func_80241A10_CF9580.s | 21 - .../sam_01/CF7E80/func_80241A54_CF95C4.s | 15 - .../sam_03/D110C0/func_80240000_D110C0.s | 24 - .../sam_05/D187E0/func_80241754_D19F34.s | 165 - .../sam_06/D203E0/func_802424C8_D22358.s | 21 - .../sam_06/D203E0/func_8024250C_D2239C.s | 15 - .../sam_07/D2BD30/func_80241DA4_D2DAD4.s | 168 - .../sam_08/D309C0/func_80241610_D31290.s | 41 - .../sam_08/D309C0/func_802416A4_D31324.s | 46 - .../sam_08/D309C0/func_8024174C_D313CC.s | 29 - .../sbk_02/92A9A0/func_80240B98_92AE48.s | 19 - .../sbk_30/93F5B0/func_80241560_940B10.s | 21 - .../sbk_30/93F5B0/func_802415A4_940B54.s | 15 - .../sbk_34/945F10/func_80240728_9465F8.s | 21 - .../sbk_34/945F10/func_8024076C_94663C.s | 17 - .../trd_04/9A88A0/func_802434F4_9AB8E4.s | 76 - .../trd_04/9A88A0/func_80243650_9ABA40.s | 173 - .../trd_07/9B6C90/func_80241FDC_9B895C.s | 78 - .../trd_07/9B6C90/func_80242104_9B8A84.s | 52 - .../trd_07/9B6C90/func_802421C0_9B8B40.s | 76 - .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 173 - .../trd_07/9B6C90/func_8024256C_9B8EEC.s | 47 - .../trd_07/9B6C90/func_80242600_9B8F80.s | 131 - .../trd_07/9B6C90/func_802427FC_9B917C.s | 65 - ver/us/symbol_addrs.txt | 4124 ++++++++--------- ver/us/undefined_syms.txt | 72 +- 863 files changed, 11209 insertions(+), 36855 deletions(-) delete mode 100644 src/world/common/DeadUnkNpcAIMainFunc.inc.c delete mode 100644 src/world/common/DeadUnkNpcAIMainFunc10.inc.c delete mode 100644 src/world/common/DeadUnkNpcAIMainFunc9.inc.c create mode 100644 src/world/common/GetDefeatedEnemyCount.inc.c create mode 100644 src/world/common/HeartPlant_SpawnHeart.inc.c create mode 100644 src/world/common/LetterDelivery.inc.c delete mode 100644 src/world/common/NpcJumpFunc.inc.c delete mode 100644 src/world/common/NpcJumpFunc2.inc.c delete mode 100644 src/world/common/NpcJumpFunc3.inc.c create mode 100644 src/world/common/PullVine.inc.c delete mode 100644 src/world/common/SetManyVars.inc.c delete mode 100644 src/world/common/SixFloatsFunc.inc.c delete mode 100644 src/world/common/UnkDistFunc.inc.c delete mode 100644 src/world/common/UnkDurationCheck.inc.c delete mode 100644 src/world/common/UnkDurationCheckNoArgs.inc.c delete mode 100644 src/world/common/UnkFunc10.inc.c delete mode 100644 src/world/common/UnkFunc13.inc.c delete mode 100644 src/world/common/UnkFunc14.inc.c delete mode 100644 src/world/common/UnkFunc15.inc.c delete mode 100644 src/world/common/UnkFunc16.inc.c delete mode 100644 src/world/common/UnkFunc4.inc.c delete mode 100644 src/world/common/UnkFunc45.inc.c delete mode 100644 src/world/common/UnkFunc5.inc.c delete mode 100644 src/world/common/UnkFunc54.inc.c delete mode 100644 src/world/common/UnkFunc55.inc.c delete mode 100644 src/world/common/UnkFunc58.inc.c delete mode 100644 src/world/common/UnkFunc59.inc.c delete mode 100644 src/world/common/UnkFunc6.inc.c delete mode 100644 src/world/common/UnkFunc61.inc.c delete mode 100644 src/world/common/UnkFunc7.inc.c delete mode 100644 src/world/common/UnkFunc8.inc.c delete mode 100644 src/world/common/UnkFunc9.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc1.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc10.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc11.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc12.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc13.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc13_2.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc14.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc15.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc16.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc17.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc18.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc19.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc1_copy.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc2.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc20.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc21.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc22.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc23.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc24.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc25.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc26.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc27.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc28.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc29.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc3.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc34.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc35.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc36.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc37.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc38.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc39.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc4.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc40.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc42.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc43.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc44.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc45.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc47.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc48.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc49.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc5.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc6.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc7.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc8.inc.c delete mode 100644 src/world/common/UnkNpcAIFunc9.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc10.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc2.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc3.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc4.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc5.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc7.inc.c delete mode 100644 src/world/common/UnkNpcAIMainFunc9.inc.c delete mode 100644 src/world/common/UnkNpcDurationAnimationFunc.inc.c delete mode 100644 src/world/common/UnkNpcDurationFlagFunc.inc.c delete mode 100644 src/world/common/UnkSetDurationFunc.inc.c delete mode 100644 src/world/common/UnkYawFunc.inc.c delete mode 100644 src/world/common/atomic/enemy/BulletBill.inc.c delete mode 100644 src/world/common/atomic/enemy/Dead_UnkAI_1.inc.c delete mode 100644 src/world/common/atomic/enemy/Dead_UnkAI_9.inc.c delete mode 100644 src/world/common/atomic/enemy/SpearGuy.inc.c delete mode 100644 src/world/common/atomic/enemy/ThrowAttackAI.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_1.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_10.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_2.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_3.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_4.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_5.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_6.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_9.inc.c delete mode 100644 src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c create mode 100644 src/world/common/enemy/BulletBillAI.inc.c create mode 100644 src/world/common/enemy/CleftAI.inc.c create mode 100644 src/world/common/enemy/ClubbaNappingAI.inc.c create mode 100644 src/world/common/enemy/ClubbaPatrolAI.inc.c create mode 100644 src/world/common/enemy/FlyingAI.inc.c create mode 100644 src/world/common/enemy/FlyingMagikoopaAI.inc.c create mode 100644 src/world/common/enemy/FlyingNoAttackAI.inc.c create mode 100644 src/world/common/enemy/GrooveGuyAI.inc.c create mode 100644 src/world/common/enemy/HoppingAI.inc.c rename src/world/common/{UnkNpcAIMainFunc8.inc.c => enemy/KoopaPatrolAI.inc.c} (57%) create mode 100644 src/world/common/enemy/LakituAI.inc.c create mode 100644 src/world/common/enemy/MagikoopaAI.inc.c rename src/world/common/{UnkFunc57.inc.c => enemy/MagikoopaSpellAI.inc.c} (75%) create mode 100644 src/world/common/enemy/MeleeHitbox.inc.c rename src/world/common/{atomic => }/enemy/MontyMoleAI.inc.c (66%) create mode 100644 src/world/common/enemy/ParatroopaAI.inc.c create mode 100644 src/world/common/enemy/PatrolNoAttackAI.inc.c create mode 100644 src/world/common/enemy/PiranhaPlantAI.inc.c create mode 100644 src/world/common/enemy/ProjectileHitbox.inc.c create mode 100644 src/world/common/enemy/RangedAttackAI.inc.c create mode 100644 src/world/common/enemy/SentinelAI.inc.c create mode 100644 src/world/common/enemy/ShyGuyPatrolAI.inc.c create mode 100644 src/world/common/enemy/ShyGuyWanderAI.inc.c create mode 100644 src/world/common/enemy/SpearGuyAI.inc.c rename src/world/common/{UnkNpcAIMainFunc6.inc.c => enemy/SpinyAI.inc.c} (78%) create mode 100644 src/world/common/enemy/States_PatrolAI.inc.c create mode 100644 src/world/common/enemy/States_TackleAI.inc.c create mode 100644 src/world/common/enemy/StationaryAI.inc.c create mode 100644 src/world/common/enemy/StoneChompAI.inc.c rename src/world/common/{DeadUnkNpcAIMainFunc5.inc.c => enemy/TackleAI.inc.c} (74%) create mode 100644 src/world/common/enemy/UnkFloAI.inc.c create mode 100644 src/world/common/enemy/WanderMeleeAI.inc.c create mode 100644 src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c rename src/world/common/{UnkNpcAIFunc31.inc.c => enemy/wip/PiranhaPlantAI_00.inc.c} (67%) rename src/world/common/{UnkNpcAIFunc32.inc.c => enemy/wip/PiranhaPlantAI_01.inc.c} (53%) rename src/world/common/{UnkNpcAIFunc46.inc.c => enemy/wip/PiranhaPlantAI_10.inc.c} (96%) rename src/world/common/{UnkNpcDurationFlagFunc3.inc.c => enemy/wip/PiranhaPlantAI_11.inc.c} (80%) rename src/world/common/{UnkNpcAIFunc33.inc.c => enemy/wip/PiranhaPlantAI_12.inc.c} (79%) rename src/world/common/{UnkNpcDurationFlagFunc2.inc.c => enemy/wip/PiranhaPlantAI_13.inc.c} (71%) rename src/world/common/{UnkNpcAIFunc30.inc.c => enemy/wip/PiranhaPlantAI_14.inc.c} (63%) create mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c delete mode 100644 src/world/common/set_script_owner_npc_anim.inc.c delete mode 100644 src/world/common/set_script_owner_npc_col_height.inc.c delete mode 100644 ver/us/asm/nonmatchings/EA0C10/func_80242D64_EA3664.s delete mode 100644 ver/us/asm/nonmatchings/EA0C10/func_80242DA8_EA36A8.s delete mode 100644 ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s delete mode 100644 ver/us/asm/nonmatchings/EA8AE0/func_80241B50_EAA630.s delete mode 100644 ver/us/asm/nonmatchings/EA8AE0/func_80241B94_EAA674.s delete mode 100644 ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s delete mode 100644 ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s delete mode 100644 ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240880_A2AAC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DF8_A2B038.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E30_A2B070.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368_A49928.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802413CC_A4998C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20_A4A2E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C_A4A32C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802409C0_A4D3E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24_A4D444.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D08_A4D728.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378_A4DD98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4_A4DDE4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242410_A95B50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00_A96440.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240000_AA2D20.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240970_A64A00.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802409D4_A64A64.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8_A64D48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328_A653B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374_A65404.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802411C4_A6F5A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AB4_A6FE94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240068_BAD9A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240678_AACEA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240000_D110C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240B98_92AE48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s diff --git a/include/common_structs.h b/include/common_structs.h index f4fafc30f3..1b83916fea 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -180,7 +180,7 @@ typedef struct Npc { /* 0x0A6 */ s16 collisionRadius; /* 0x0A8 */ s16 collisionHeight; /* 0x0AA */ s8 renderMode; - /* 0x0AB */ s8 unk_AB; + /* 0x0AB */ s8 verticalRenderOffset; /* 0x0AC */ u8 alpha; /* 0x0AD */ u8 alpha2; ///< Multiplied with Npc::alpha /* 0x0AE */ char unk_AE[2]; diff --git a/include/dead.h b/include/dead.h index e31b79eaaf..205c7425c1 100644 --- a/include/dead.h +++ b/include/dead.h @@ -1,6 +1,7 @@ #ifndef _DEAD_H_ #define _DEAD_H_ + // There can be multiple invalid references to a symbol from the dead code, // so some symbols here have a "2" suffix. @@ -31,7 +32,7 @@ #define gPlayerActionState dead_gPlayerActionState #define is_point_within_region dead_is_point_within_region #define npc_raycast_down_sides dead_npc_raycast_down_sides -#define func_800490B4 func_8004D1A4 +#define basic_ai_check_player_dist dead_basic_ai_check_player_dist #define fx_emote dead_fx_emote #define ai_enemy_play_sound dead_ai_enemy_play_sound #define npc_move_heading dead_npc_move_heading @@ -39,8 +40,7 @@ #define get_enemy dead_get_enemy #define npc_test_move_simple_with_slipping dead_npc_test_move_simple_with_slipping #define get_screen_coords dead_get_screen_coords -#define func_800495A0 func_800495A0 -#define func_8004A73C func_8004EB8C +#define basic_ai_suspend dead_basic_ai_suspend #define gCurrentCameraID dead_gCurrentCameraID #define add_vec2D_polar dead_add_vec2D_polar #define gCurrentCamID dead_gCurrentCamID @@ -92,15 +92,15 @@ #define get_model_list_index_from_tree_index dead_get_model_list_index_from_tree_index #define guMtxCatF dead_guMtxCatF #define guMtxIdentF dead_guMtxIdentF -#define func_800495A0 func_8004D9C0 -#define func_800496B8 func_8004DAD8 -#define base_UnkNpcAIFunc1 func_8004DF64 -#define func_80049C04 func_8004E024 -#define func_80049E3C func_8004E25C -#define func_80049ECC func_8004E2EC -#define func_80049F7C func_8004E39C -#define func_8004A124 func_8004E544 -#define func_8004A3E8 func_8004E808 +#define basic_ai_wander_init dead_basic_ai_wander_init +#define basic_ai_wander dead_basic_ai_wander +#define basic_ai_loiter_init dead_basic_ai_loiter_init +#define basic_ai_loiter dead_basic_ai_loiter +#define basic_ai_found_player_jump_init dead_basic_ai_found_player_jump_init +#define basic_ai_found_player_jump dead_basic_ai_found_player_jump +#define basic_ai_chase_init dead_basic_ai_chase_init +#define basic_ai_chase dead_basic_ai_chase +#define basic_ai_lose_player dead_basic_ai_lose_player #define gCurrentEncounter dead_gCurrentEncounter #define fx_motion_blur_flame dead_fx_motion_blur_flame #define wPartnerHudScripts dead_wPartnerHudScripts @@ -110,5 +110,6 @@ #define destroy_popup_menu dead_destroy_popup_menu #define heap_free dead_heap_free #define entity_upgrade_block_hide_content dead_entity_upgrade_block_hide_content +#define func_8003D660 dead_func_80041080 #endif diff --git a/include/dead_structs.h b/include/dead_structs.h index bec425db5d..c39dd90692 100644 --- a/include/dead_structs.h +++ b/include/dead_structs.h @@ -37,9 +37,9 @@ typedef struct DeadEnemy { /* 0x064 */ void* unk_64; /* 0x068 */ char unk_68[4]; /* 0x06C */ s32 varTable[16]; - /* 0x0AC */ char unk_AC[4]; - /* 0x0B0 */ s32 unk_B0; - /* 0x0B4 */ s8 unk_B4; + /* 0x0AC */ s32 aiDetectFlags; + /* 0x0B0 */ s32 aiFlags; + /* 0x0B4 */ s8 aiPaused; /* 0x0B5 */ s8 unk_B5; /* 0x0B6 */ char unk_B6[2]; /* 0x0B8 */ EvtScript* unk_B8; // some bytecode diff --git a/include/enums.h b/include/enums.h index 0e91902070..7578637016 100644 --- a/include/enums.h +++ b/include/enums.h @@ -545,8 +545,10 @@ enum SoundIDs { SOUND_ENTER_PIPE = 0x00000163, SOUND_SMASH_GOOMNUT_TREE = 0x00000165, SOUND_167 = 0x00000167, + SOUND_168 = 0x00000168, SOUND_172 = 0x00000172, SOUND_17B = 0x0000017B, + SOUND_185 = 0x00000185, SOUND_194 = 0x00000194, SOUND_1A5 = 0x000001A5, SOUND_1A6 = 0x000001A6, @@ -600,7 +602,9 @@ enum SoundIDs { SOUND_MOLE_SURFACE = 0x00000321, SOUND_MOLE_DIG = 0x00000322, SOUND_MOLE_POP = 0x00000323, + SOUND_328 = 0x00000328, SOUND_32E = 0x0000032E, + SOUND_32F = 0x0000032F, SOUND_359 = 0x00000359, SOUND_361 = 0x00000361, SOUND_362 = 0x00000362, @@ -620,6 +624,7 @@ enum SoundIDs { SOUND_HIT_SHOCK = 0x0000037B, SOUND_GENERAL_WHISTLE = 0x00000395, SOUND_OPEN_SHELL = 0x000003D4, + SOUND_3E1 = 0x000003E1, SOUND_JUMP_3E2 = 0x000003E2, SOUND_MISS_JUMP = 0x000003E3, SOUND_DEATH = 0x000003E5, @@ -640,6 +645,7 @@ enum SoundIDs { SOUND_CANNON1 = 0x00002016, SOUND_CANNON2 = 0x00002017, SOUND_CANNON3 = 0x00002018, + SOUND_20C1 = 0x000020C1, SOUND_202C = 0x0000202C, SOUND_202D = 0x0000202D, SOUND_202E = 0x0000202E, @@ -687,6 +693,9 @@ enum SoundIDs { SOUND_211A = 0x0000211A, SOUND_212D = 0x0000212D, SOUND_212E = 0x0000212E, + SOUND_80000011 = 0x80000011, + SOUND_B0000017 = 0xB0000017, + SOUND_B0000018 = 0xB0000018, }; enum Cams { @@ -1940,9 +1949,9 @@ enum NpcFlags { NPC_FLAG_40 = 0x00000040, NPC_FLAG_UPSIDE_DOWN = 0x00000080, ///< Render NPCs upside-down NPC_FLAG_100 = 0x00000100, // TODO - NPC_FLAG_GRAVITY = 0x00000200, ///< Enables gravity. Does nothing if NPC_FLAG_NO_Y_MOVEMENT is set. + NPC_FLAG_GRAVITY = 0x00000200, ///< Enables gravity. Does nothing if NPC_FLAG_JUMPING is set. NPC_FLAG_LOCK_ANIMS = 0x00000400, ///< Do not allow scripts to change animation - NPC_FLAG_NO_Y_MOVEMENT = 0x00000800, ///< Causes NpcMoveTo() to ignore stairs + NPC_FLAG_JUMPING = 0x00000800, ///< Causes NpcMoveTo() to ignore stairs NPC_FLAG_1000 = 0x00001000, NPC_FLAG_NO_PROJECT_SHADOW = 0x00002000, ///< Draw shadow at base of sprite instead of projecting to ground NPC_FLAG_4000 = 0x00004000, @@ -1959,7 +1968,7 @@ enum NpcFlags { NPC_FLAG_SIMPLIFIED_PHYSICS = 0x02000000, /// Use simpler, faster physics calculations: /// - Perform only one lateral collision test during motion - /// - Allow falling below Y=-2000 (by default, NPC_FLAG_NO_Y_MOVEMENT is set when an NPC falls out-of-bounds) + /// - Allow falling below Y=-2000 (by default, NPC_FLAG_JUMPING is set when an NPC falls out-of-bounds) NPC_FLAG_PARTICLE = 0x04000000, NPC_FLAG_8000000 = 0x08000000, NPC_FLAG_10000000 = 0x10000000, @@ -2748,15 +2757,15 @@ enum EnemyFlags { ENEMY_FLAGS_8000000 = 0x08000000, ENEMY_FLAGS_10000000 = 0x10000000, ENEMY_FLAGS_20000000 = 0x20000000, - ENEMY_FLAGS_40000000 = 0x40000000, + ENEMY_FLAGS_40000000 = 0x40000000, // spawn in AI_STATE_CHASE_INIT ENEMY_FLAGS_80000000 = 0x80000000, }; -// used with enemy->unk_B0 +// used with enemy->aiFlags enum EnemyAIFlags { ENEMY_AI_FLAGS_1 = 0x00000001, - ENEMY_AI_FLAGS_2 = 0x00000002, - ENEMY_AI_FLAGS_4 = 0x00000004, + ENEMY_AI_FLAGS_2 = 0x00000002, // do not move; do not sense player + ENEMY_AI_FLAGS_4 = 0x00000004, // pause ai ENEMY_AI_FLAGS_8 = 0x00000008, ENEMY_AI_FLAGS_10 = 0x00000010, ENEMY_AI_FLAGS_20 = 0x00000020, @@ -2764,6 +2773,98 @@ enum EnemyAIFlags { ENEMY_AI_FLAGS_80 = 0x00000080, }; +enum EnemyAIStates { + // basic states + AI_STATE_WANDER_INIT = 0, + AI_STATE_WANDER = 1, + AI_STATE_PATROL_INIT = 0, + AI_STATE_PATROL = 1, + AI_STATE_HOP_INIT = 0, + AI_STATE_HOP = 1, + AI_STATE_LOITER_INIT = 2, + AI_STATE_LOITER = 3, + AI_STATE_LOITER_POST = 4, + AI_STATE_ALERT_INIT = 10, + AI_STATE_ALERT = 11, + AI_STATE_CHASE_INIT = 12, + AI_STATE_CHASE = 13, + AI_STATE_LOSE_PLAYER = 14, + AI_STATE_PATROL_15 = 15, + AI_RETURN_HOME_INIT = 40, + AI_RETURN_HOME = 41, + AI_STATE_SUSPEND = 99, + // melee hitboxes + AI_STATE_MELEE_HITBOX_INIT = 30, + AI_STATE_MELEE_HITBOX_PRE = 31, + AI_STATE_MELEE_HITBOX_ACTIVE = 32, + AI_STATE_MELEE_HITBOX_MISS = 33, + // projectile hitboxes + AI_STATE_PROJECTILE_HITBOX_30 = 30, + AI_STATE_PROJECTILE_HITBOX_31 = 31, + AI_STATE_PROJECTILE_HITBOX_32 = 32, + AI_STATE_PROJECTILE_HITBOX_33 = 33, +}; + +enum EnemyAIAnims { + ENEMY_ANIM_IDLE = 0, + ENEMY_ANIM_WALK = 1, + ENEMY_ANIM_RUN = 2, + ENEMY_ANIM_CHASE = 3, + ENEMY_ANIM_JUMP = 4, + ENEMY_ANIM_05 = 5, + ENEMY_ANIM_DEATH = 6, + ENEMY_ANIM_HIT = 7, + ENEMY_ANIM_MELEE_PRE = 8, + ENEMY_ANIM_MELEE_HIT = 9, +}; + +enum EnemyActionFlags { + AI_ACTION_JUMP_WHEN_SEE_PLAYER = 0x01, + AI_ACTION_02 = 0x02, + AI_ACTION_04 = 0x04, + AI_ACTION_08 = 0x08, + AI_ACTION_LOOK_AROUND_DURING_LOITER = 0x10, + AI_ACTION_20 = 0x20 +}; + +enum EnemyDetectFlags { + AI_DETECT_SIGHT = 0x01, + AI_DETECT_SENSITIVE_MOTION = 0x02, +}; + +enum EnemyTerritoryFlags { + AI_TERRITORY_IGNORE_HIDING = 0x01, // bow and sushi dont prevent enemy detection + AI_TERRITORY_IGNORE_ELEVATION = 0x02, // vertical size of detection volume is ignored +}; + +enum PiranhaPlantStates { + AI_STATE_PIRANHA_PLANT_00 = 0, + AI_STATE_PIRANHA_PLANT_01 = 1, + AI_STATE_PIRANHA_PLANT_10 = 10, + AI_STATE_PIRANHA_PLANT_11 = 11, + AI_STATE_PIRANHA_PLANT_12 = 12, + AI_STATE_PIRANHA_PLANT_13 = 13, + AI_STATE_PIRANHA_PLANT_14 = 14, + AI_STATE_PIRANHA_PLANT_SUSPEND = 99 +}; + +enum MeleeHitboxAttackStates { + MELEE_HITBOX_STATE_NONE = 0, + MELEE_HITBOX_STATE_INIT = 1, + MELEE_HITBOX_STATE_PRE = 2, + MELEE_HITBOX_STATE_ACTIVE = 3, // hitbox is active + MELEE_HITBOX_STATE_POST = 4 +}; + +enum ProjectileHitboxAttackStates { + PROJECTILE_HITBOX_STATE_NONE = 0, + PROJECTILE_HITBOX_STATE_INIT = 1, + PROJECTILE_HITBOX_STATE_PRE = 2, + PROJECTILE_HITBOX_STATE_ACTIVE = 3, // hitbox is active + PROJECTILE_HITBOX_STATE_POST = 4, + PROJECTILE_HITBOX_STATE_DONE = 100 +}; + enum MusicSettingsFlags { MUSIC_SETTINGS_FLAGS_1 = 0x00000001, MUSIC_SETTINGS_FLAGS_2 = 0x00000002, diff --git a/include/functions.h b/include/functions.h index ad792df7d4..c7487b450b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -92,7 +92,7 @@ void get_msg_properties(s32 msgID, s32* height, s32* width, s32* maxLineChars, s void replace_window_update(s32 idx, s8 arg1, WindowUpdateFunc pendingFunc); void decode_yay0(void* src, void* dst); -s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3); +s32 ai_check_player_dist(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3); //pause void pause_init(void); @@ -398,6 +398,7 @@ s32 npc_test_move_simple_with_slipping(s32, f32*, f32*, f32*, f32, f32, f32, f32 s32 npc_test_move_complex_with_slipping(s32, f32*, f32*, f32*, f32, f32, f32, f32); // Partner +void partner_handle_before_battle(void); void partner_walking_update_player_tracking(Npc* partner); void partner_walking_update_motion(Npc* partner); void enable_partner_ai(void); @@ -669,15 +670,15 @@ void set_curtain_fade(f32 fade); void crash_screen_init(void); void crash_screen_set_draw_info(u16* frameBufPtr, s16 width, s16 height); -void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_800496B8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_80049C04(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_80049E3C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_80049ECC(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_80049F7C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_8004A124(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_8004A3E8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); -void func_8004A73C(Evt* script); +void basic_ai_wander_init(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_wander(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_loiter(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_found_player_jump_init(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_found_player_jump(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_chase_init(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_chase(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_lose_player(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory); +void basic_ai_suspend(Evt* script); // This legally allows all functions to be pointers without warnings. // Perhaps the void arg functions can be changed later to remove this need. @@ -696,9 +697,9 @@ void free_generic_entity(s32); void sfx_get_spatialized_sound_params(f32 arg0, f32 arg1, f32 arg2, s16* arg3, s16* arg4, s32 arg5); void sfx_play_sound_with_params(s32 arg0, u8 arg1, u8 arg2, s16 arg3); -s32 func_8004A784(Npc* npc, f32 arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5); -void base_UnkNpcAIFunc1(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -void UnkNpcAIFunc1(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +s32 ai_check_fwd_collisions(Npc* npc, f32 arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5); +void basic_ai_loiter_init(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory); +void PatrolAI_LoiterInit(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory); s32 func_80263230(Actor*, Actor*); void func_80266EA8(ActorPart*, s32); diff --git a/include/macros.h b/include/macros.h index 501ebb1986..eb78711379 100644 --- a/include/macros.h +++ b/include/macros.h @@ -98,6 +98,28 @@ #define SPRITE_PIXEL_SCALE (5.0 / 7.0) +/* common AI function and script variables */ +// ai script +#define AI_TEMP_STATE functionTemp[0] +#define AI_TEMP_STATE_AFTER_SUSPEND functionTemp[1] +#define AI_PATROL_GOAL_INDEX functionTemp[2] +// melee enemy +#define AI_VAR_ATTACK_STATE varTable[0] +#define AI_VAR_MELEE_PRE_TIME varTable[1] +#define AI_VAR_MELEE_HIT_TIME varTable[2] +#define AI_VAR_MELEE_MISS_TIME varTable[3] +#define AI_VAR_NEXT_STATE varTable[7] +// melee hitbox +#define AI_VAR_HITNPC_YOFFSET varTable[0] +#define AI_VAR_HITNPC_DIST varTable[1] +#define AI_VAR_HITNPC_2 varTable[2] +#define AI_VAR_HITNPC_3 varTable[3] +#define AI_VAR_HITNPC_4 varTable[4] +#define AI_VAR_HITNPC_SOUND varTable[15] +// projectile hitbox +#define VAR_PROJECTILE_HITBOX_STATE varTable[0] +#define AI_PROJECTILE_AMMO_COUNT varTable[3] + #ifdef PERMUTER #undef SCRIPT #define SCRIPT(...) {} diff --git a/include/npc.h b/include/npc.h index b4994832b5..b1fbbf8630 100644 --- a/include/npc.h +++ b/include/npc.h @@ -75,14 +75,14 @@ typedef struct NpcAISettings { /* 0x04 */ s32 moveTime; /* 0x08 */ s32 waitTime; /* 0x0C */ f32 alertRadius; - /* 0x10 */ X32 unk_10; - /* 0x14 */ s32 unk_14; + /* 0x10 */ f32 alertOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight' + /* 0x14 */ s32 playerSearchInterval; // how often to search for player (frames) /* 0x18 */ f32 chaseSpeed; - /* 0x1C */ X32 unk_1C; // chase turn step? - /* 0x20 */ s32 unk_20; + /* 0x1C */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing + /* 0x20 */ s32 chaseUpdateInterval; // how often to re-run chase init and re-acquire player position (frames) /* 0x24 */ f32 chaseRadius; - /* 0x28 */ X32 unk_28; - /* 0x2C */ s32 unk_2C; // bool + /* 0x28 */ f32 chaseOffsetDist; // offset along npc->yaw of the test point for chase volume overlap, creates directionality to enemy 'sight' + /* 0x2C */ s32 unk_AI_2C; // unk time } NpcAISettings; // size = 0x30 typedef struct NpcSettings { @@ -98,7 +98,7 @@ typedef struct NpcSettings { /* 0x20 */ s32 flags; /* 0x24 */ char unk_24[4]; /* 0x28 */ s16 level; - /* 0x2A */ s16 unk_2A; + /* 0x2A */ s16 unk_2A; // action flags: 1 = jump on seeing player } NpcSettings; // size = 0x2C typedef struct ItemDrop { @@ -190,15 +190,15 @@ typedef struct EnemyDrops { enum TerritoryShape { SHAPE_CYLINDER, SHAPE_RECT }; typedef struct { - /* 0x00 */ s32 unk_00; + /* 0x00 */ s32 skipPlayerDetectChance; /* 0x04 */ enum TerritoryShape shape; /* 0x08 */ s32 pointX; /* 0x0C */ s32 pointZ; /* 0x10 */ s32 sizeX; /* 0x14 */ s32 sizeZ; - /* 0x18 */ f32 unk_18; - /* 0x1C */ s16 unk_1C; -} EnemyTerritoryThing; // size = 0x20 + /* 0x18 */ f32 halfHeight; + /* 0x1C */ s16 detectFlags; // 1 = ignore partner hiding (bow/sushie dont work) | 2 = ignore elevation +} EnemyDetectVolume; // size = 0x20 typedef struct { /* 0x00 */ Vec3i point; @@ -231,7 +231,7 @@ typedef union { } EnemyTerritory; // size = 0xC0 // function signature used for state handlers in AI main functions -typedef void AIStateHandler(Evt* script, NpcAISettings* settings, EnemyTerritoryThing* territory); +typedef void AIStateHandler(Evt* script, NpcAISettings* settings, EnemyDetectVolume* territory); typedef struct Enemy { /* 0x00 */ s32 flags; @@ -269,10 +269,10 @@ typedef struct Enemy { /* */ f32 varTableF[16]; /* */ void* varTablePtr[16]; /* */ }; - /* 0xAC */ u8 unk_AC; + /* 0xAC */ u8 aiDetectFlags; // detect player flags: 1 = require line of sight | 2 = adjust hitbox for moving player /* 0xAD */ char unk_AD[3]; - /* 0xB0 */ u32 unk_B0; - /* 0xB4 */ s8 unk_B4; + /* 0xB0 */ u32 aiFlags; + /* 0xB4 */ s8 aiPaused; /* 0xB5 */ s8 unk_B5; /* 0xB6 */ char unk_B6[2]; /* 0xB8 */ EvtScript* unk_B8; // some bytecode @@ -287,7 +287,7 @@ typedef struct Enemy { /* 0xDC */ char unk_DC[20]; } Enemy; // size = 0xF0 -s32 func_800490B4(EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, f32 arg3, s8 arg4); +s32 basic_ai_check_player_dist(EnemyDetectVolume* arg0, Enemy* arg1, f32 arg2, f32 arg3, s8 arg4); /// The default Npc::onUpdate and Npc::onRender callback. void STUB_npc_callback(Npc*); diff --git a/include/script_api/macros.h b/include/script_api/macros.h index 83830e8c7e..a410772553 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -17,7 +17,7 @@ /// Decimal constant. /// Despite the name, "floats" are actually stored as fixed-point values. - // This fixes an issue with fixed point numbers not being correct. POtentially a truncation vs round difference. + // This fixes an issue with fixed point numbers not being correct. Potentially a truncation vs round difference. #define EVT_FLOAT_ROUND(x) ((x)>=0?(f64)((x) + 0.9):(f64)(x)) #define EVT_FLOAT(DOUBLE) (((Bytecode)EVT_FLOAT_ROUND((DOUBLE * 1024.0f)) + -230000000)) diff --git a/include/script_api/map.h b/include/script_api/map.h index 657aacfe2d..d9e302b221 100644 --- a/include/script_api/map.h +++ b/include/script_api/map.h @@ -7,7 +7,7 @@ #include "script_api/common.h" ApiStatus MakeNpcs(Evt* script, s32 isInitialCall); -ApiStatus DoBasicAI(Evt* script, s32 isInitialCall); +ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall); ApiStatus ResetFromLava(Evt* script, s32 isInitialCall); ApiStatus MakeShop(Evt* script, s32 isInitialCall); ApiStatus MakeShopOwner(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index 52dac0ba63..05b2c9018b 100644 --- a/include/variables.h +++ b/include/variables.h @@ -333,7 +333,4 @@ extern EntityBlueprint Entity_ShatteringHammer2BlockTiny; extern EntityBlueprint Entity_ShatteringHammer3BlockTiny; extern EntityBlueprint Entity_ShatteringBrickBlock; -// Temporary dead stuff -extern PartnerActionStatus dead_gPartnerActionStatus2; - #endif diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index ccc520fb11..3488e82b51 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -246,8 +246,7 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) { } } - script->functionTemp[1] -= 1; - + script->functionTemp[1]--; if (script->functionTemp[1] == 0) { npc->flags |= NPC_FLAG_2; return ApiStatus_DONE1; diff --git a/src/23680.c b/src/23680.c index d78e77f489..a4c64fc32b 100644 --- a/src/23680.c +++ b/src/23680.c @@ -121,36 +121,42 @@ s32 is_point_within_region(s32 shape, f32 pointX, f32 pointY, f32 centerX, f32 c } } -s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 radius, f32 moveSpeed, s8 arg4) { +s32 basic_ai_check_player_dist(EnemyDetectVolume* territory, Enemy* enemy, f32 radius, f32 fwdPosOffset, s8 useWorldYaw) { Npc* npc = get_npc_unsafe(enemy->npcID); PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus; f32 x, y, z; f32 dist; - s32 phi_v0; + s32 skipCheckForPlayer; - if (enemy->unk_B0 & ENEMY_AI_FLAGS_2) { + if (enemy->aiFlags & ENEMY_AI_FLAGS_2) { return FALSE; } partnerActionStatus = &gPartnerActionStatus; - if (partnerActionStatus->actingPartner == PARTNER_BOW && partnerActionStatus->partnerActionState && !(territory->unk_1C & 1)) { + if (partnerActionStatus->actingPartner == PARTNER_BOW && partnerActionStatus->partnerActionState + && !(territory->detectFlags & AI_TERRITORY_IGNORE_HIDING)) { return FALSE; } - if (partnerActionStatus->actingPartner == PARTNER_SUSHIE && partnerActionStatus->partnerActionState && !(territory->unk_1C & 1)) { + if (partnerActionStatus->actingPartner == PARTNER_SUSHIE && partnerActionStatus->partnerActionState + && !(territory->detectFlags & AI_TERRITORY_IGNORE_HIDING)) { return FALSE; } - if (territory->unk_00 < 0) { + if (territory->skipPlayerDetectChance < 0) { return FALSE; } - if (territory->unk_18 <= fabsf(npc->pos.y - playerStatus->position.y) && !(territory->unk_1C & 2)) { + if (territory->halfHeight <= fabsf(npc->pos.y - playerStatus->position.y) + && !(territory->detectFlags & AI_TERRITORY_IGNORE_ELEVATION)) { return FALSE; } - if (territory->sizeX | territory->sizeZ && is_point_within_region(territory->shape, territory->pointX, territory->pointZ, playerStatus->position.x, playerStatus->position.z, territory->sizeX, territory->sizeZ)) { + if (territory->sizeX | territory->sizeZ && is_point_within_region(territory->shape, + territory->pointX, territory->pointZ, + playerStatus->position.x, playerStatus->position.z, + territory->sizeX, territory->sizeZ)) { return FALSE; } @@ -158,24 +164,28 @@ s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 radius, f32 return FALSE; } - if (enemy->unk_AC & 1) { + // check for unbroken line of sight + if (enemy->aiDetectFlags & AI_DETECT_SIGHT) { x = npc->pos.x; y = npc->pos.y + npc->collisionHeight * 0.5; z = npc->pos.z; dist = dist2D(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); - if (npc_test_move_simple_with_slipping(0x50000, &x, &y, &z, dist, atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z), 0.1f, 0.1f)) { + if (npc_test_move_simple_with_slipping(0x50000, + &x, &y, &z, + dist, atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z), + 0.1f, 0.1f)) { return FALSE; } } - if (territory->unk_00 == 0) { - phi_v0 = 0; + if (territory->skipPlayerDetectChance == 0) { + skipCheckForPlayer = 0; } else { - phi_v0 = rand_int(territory->unk_00 + 1); + skipCheckForPlayer = rand_int(territory->skipPlayerDetectChance + 1); } - if (phi_v0 == 0) { - if (enemy->unk_AC & 2) { + if (skipCheckForPlayer == 0) { + if (enemy->aiDetectFlags & AI_DETECT_SENSITIVE_MOTION) { if (playerStatus->actionState == ACTION_STATE_WALK) { radius *= 1.15; } else if (playerStatus->actionState == ACTION_STATE_RUN) { @@ -184,10 +194,10 @@ s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 radius, f32 } x = npc->pos.x; z = npc->pos.z; - if (arg4 & 0xFF) { - add_vec2D_polar(&x, &z, moveSpeed, npc->yaw); + if (useWorldYaw & 0xFF) { + add_vec2D_polar(&x, &z, fwdPosOffset, npc->yaw); } else { - add_vec2D_polar(&x, &z, moveSpeed, 270.0f - npc->renderYaw); + add_vec2D_polar(&x, &z, fwdPosOffset, 270.0f - npc->renderYaw); } if (dist2D(x, z, playerStatus->position.x, playerStatus->position.z) <= radius) { return TRUE; @@ -197,26 +207,26 @@ s32 func_800490B4(EnemyTerritoryThing* territory, Enemy* enemy, f32 radius, f32 return FALSE; } -s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3) { +s32 ai_check_player_dist(Enemy* enemy, s32 chance, f32 radius, f32 moveSpeed) { PlayerStatus* playerStatus = &gPlayerStatus; Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posZ; - if (arg1 >= 0) { - s32 temp; + if (chance >= 0) { + s32 skipCheckForPlayer; - if (arg1 != 0) { - temp = rand_int(arg1 + 1); + if (chance != 0) { + skipCheckForPlayer = rand_int(chance + 1); } else { - temp = 0; + skipCheckForPlayer = 0; } - if (temp == 0) { - f32 f1 = npc->pos.x; - f32 f2 = npc->pos.z; + if (skipCheckForPlayer == 0) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, moveSpeed, 270.0f - npc->renderYaw); - add_vec2D_polar(&f1, &f2, arg3, 270.0f - npc->renderYaw); - - if (dist2D(f1, f2, playerStatus->position.x, playerStatus->position.z) <= arg2) { + if (dist2D(posX, posZ, playerStatus->position.x, playerStatus->position.z) <= radius) { return TRUE; } } @@ -225,37 +235,38 @@ s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3) { return FALSE; } -void ai_enemy_play_sound(Npc* npc, s32 arg1, s32 arg2) { +void ai_enemy_play_sound(Npc* npc, s32 soundID, s32 upperSoundFlags) { Enemy* enemy = get_enemy(npc->npcID); - s32 value2 = (arg2 & 0xFFFF0000) | 2; + s32 soundFlags = (upperSoundFlags & 0xFFFF0000) | 2; - if (arg2 & 1) { - value2 |= 0x10000; + if (upperSoundFlags & 1) { + soundFlags |= 0x10000; } - if (enemy->npcSettings->unk_2A & 0x20) { - value2 |= 0x20000; + if (enemy->npcSettings->unk_2A & AI_ACTION_20) { + soundFlags |= 0x20000; } - sfx_play_sound_at_position(arg1, value2, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_play_sound_at_position(soundID, soundFlags, npc->pos.x, npc->pos.y, npc->pos.z); } -void func_80049550(Evt* script, s32 arg1) { +void ai_try_set_state(Evt* script, s32 state) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; if (npc->duration <= 0) { - script->functionTemp[0] = arg1; + script->AI_TEMP_STATE = state; } } -void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { +void basic_ai_wander_init(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); + // chose a random direction and move time npc->duration = (npcAISettings->moveTime / 2) + rand_int((npcAISettings->moveTime / 2) + 1); npc->yaw = clamp_angle(npc->yaw + rand_int(60) - 30.0f); - npc->currentAnim.w = enemy->animList[1]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; script->functionTemp[1] = 0; if (enemy->territory->wander.moveSpeedOverride < 0) { @@ -264,23 +275,23 @@ void func_800495A0(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThin npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_20; - script->functionTemp[0] = 1; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_20; + script->functionTemp[0] = AI_STATE_WANDER; } -void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void basic_ai_wander(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 phi_s5 = 0; + s32 stillWithinTerritory = FALSE; f32 x, y, z; s32 sp34; f32 yaw; - if (aiSettings->unk_14 >= 0) { + if (aiSettings->playerSearchInterval >= 0) { if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { x = npc->pos.x; y = npc->pos.y; z = npc->pos.z; @@ -289,13 +300,13 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* npc->yaw = yaw; ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp34); - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_20; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_20; - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; + if (enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; } else { - script->functionTemp[0] = 12; + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } return; } @@ -304,6 +315,7 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* script->functionTemp[1]--; } + // check if the wander we've reached the boundary of the territory if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, enemy->territory->wander.point.z, @@ -312,13 +324,13 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ) && npc->moveSpeed < dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z)) { - if (!(enemy->unk_B0 & ENEMY_AI_FLAGS_20)) { - enemy->unk_B0 |= (ENEMY_AI_FLAGS_20 | ENEMY_AI_FLAGS_40); + if (!(enemy->aiFlags & ENEMY_AI_FLAGS_20)) { + enemy->aiFlags |= (ENEMY_AI_FLAGS_20 | ENEMY_AI_FLAGS_40); } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_40) { + if (enemy->aiFlags & ENEMY_AI_FLAGS_40) { npc->yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z)); - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; } x = npc->pos.x; @@ -326,17 +338,18 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* z = npc->pos.z; if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 2.0 * npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z)); - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; - func_8004A784(npc, 5.0f, &yaw, NULL, NULL, NULL); + enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; + ai_check_fwd_collisions(npc, 5.0f, &yaw, NULL, NULL, NULL); npc->yaw = yaw; } - phi_s5 = 1; - } else if (enemy->unk_B0 & ENEMY_AI_FLAGS_20) { - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_20; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_40; + stillWithinTerritory = TRUE; + } else if (enemy->aiFlags & ENEMY_AI_FLAGS_20) { + enemy->aiFlags &= ~ENEMY_AI_FLAGS_20; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; } - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s5) { + // perform the motion + if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | stillWithinTerritory) { if (!npc->turnAroundYawAdjustment) { npc_move_heading(npc, npc->moveSpeed, npc->yaw); } else { @@ -344,155 +357,164 @@ void func_800496B8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* } } + // decide to loiter or continue wandering if (aiSettings->moveTime > 0) { npc->duration--; if (npc->duration <= 0) { - script->functionTemp[0] = 2; + script->functionTemp[0] = AI_STATE_LOITER_INIT; script->functionTemp[1] = rand_int(1000) % 3 + 2; - if (aiSettings->unk_2C <= 0 || aiSettings->waitTime <= 0) { - script->functionTemp[0] = 0; + if (aiSettings->unk_AI_2C <= 0 || aiSettings->waitTime <= 0) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; } } } } -#define NAMESPACE base -#include "world/common/UnkNpcAIFunc1.inc.c" +void basic_ai_loiter_init(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); -void func_80049C04(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + script->AI_TEMP_STATE = AI_STATE_LOITER; +} + +void basic_ai_loiter(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 x, y, z; f32 yaw; - s32 sp34; + s32 emoteTemp; - if (aiSettings->unk_14 >= 0 && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + if (aiSettings->playerSearchInterval >= 0 && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { x = npc->pos.x; y = npc->pos.y; z = npc->pos.z; yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionRadius)) { npc->yaw = yaw; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &sp34); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + if (enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; } else { - script->functionTemp[0] = 12; + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } return; } } + + // look around randomly if (npc->turnAroundYawAdjustment == 0) { npc->duration--; if (npc->duration <= 0) { script->functionTemp[1]--; if (script->functionTemp[1]) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { + if (!(enemy->npcSettings->unk_2A & AI_ACTION_LOOK_AROUND_DURING_LOITER)) { npc->yaw = clamp_angle(npc->yaw + 180.0f); } npc->duration = (aiSettings->waitTime / 2) + rand_int(aiSettings->waitTime / 2 + 1); return; } - script->functionTemp[0] = 0; + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; } } } -void func_80049E3C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { +void basic_ai_found_player_jump_init(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - ai_enemy_play_sound(npc, 0x3E1, 0); - npc->currentAnim.w = enemy->animList[4]; + ai_enemy_play_sound(npc, SOUND_3E1, 0); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_JUMP]; npc->jumpVelocity = 10.0f; npc->jumpScale = 2.5f; npc->moveToPos.y = npc->pos.y; - npc->flags |= 0x800; - script->functionTemp[0] = 11; + npc->flags |= NPC_FLAG_JUMPING; + script->functionTemp[0] = AI_STATE_ALERT; } -void func_80049ECC(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { +void basic_ai_found_player_jump(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - s32 flag = FALSE; + s32 done = FALSE; if (npc->jumpVelocity <= 0.0) { if (npc->pos.y <= npc->moveToPos.y) { npc->pos.y = npc->moveToPos.y; - flag = TRUE; + done = TRUE; } } - if (!flag) { + if (!done) { npc->pos.y += npc->jumpVelocity; npc->jumpVelocity -= npc->jumpScale; } else { npc->jumpVelocity = 0.0f; - npc->flags &= ~0x800; - script->functionTemp[0] = 12; + npc->flags &= ~NPC_FLAG_JUMPING; + script->functionTemp[0] = AI_STATE_CHASE_INIT; } } -void func_80049F7C(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { +void basic_ai_chase_init(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 cond = FALSE; + s32 skipTurnAround = FALSE; if ((gPlayerStatusPtr->actionState == ACTION_STATE_JUMP || gPlayerStatusPtr->actionState == ACTION_STATE_BOUNCE || gPlayerStatusPtr->actionState == ACTION_STATE_HOP || gPlayerStatusPtr->actionState == ACTION_STATE_FALLING) && (f64)dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) < npc->collisionRadius) { - cond = TRUE; + skipTurnAround = TRUE; } - if (!cond) { - f32 yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - f32 angleDiff = get_clamped_angle_diff(npc->yaw, yaw); - s32 temp_f4 = npcAISettings->unk_1C.s; + if (!skipTurnAround) { + f32 angle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + f32 deltaAngleToPlayer = get_clamped_angle_diff(npc->yaw, angle); - if (temp_f4 < fabsf(angleDiff)) { - yaw = npc->yaw; - if (angleDiff < 0.0f) { - yaw += -npcAISettings->unk_1C.s; + if (npcAISettings->chaseTurnRate < fabsf(deltaAngleToPlayer)) { + angle = npc->yaw; + if (deltaAngleToPlayer < 0.0f) { + angle += -npcAISettings->chaseTurnRate; } else { - yaw += temp_f4; + angle += npcAISettings->chaseTurnRate; } } - npc->yaw = clamp_angle(yaw); - npc->duration = (npcAISettings->unk_20 / 2) + rand_int((npcAISettings->unk_20 / 2) + 1); + npc->yaw = clamp_angle(angle); + npc->duration = (npcAISettings->chaseUpdateInterval / 2) + rand_int((npcAISettings->chaseUpdateInterval / 2) + 1); } else { npc->duration = 0; } - npc->currentAnim.w = enemy->animList[3]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_CHASE]; npc->moveSpeed = npcAISettings->chaseSpeed; - script->functionTemp[0] = 13; + script->functionTemp[0] = AI_STATE_CHASE; } -void func_8004A124(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void basic_ai_chase(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 sp28; f32 x, y, z; - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + if (!basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; npc->duration = 20; - script->functionTemp[0] = 14; + script->functionTemp[0] = AI_STATE_LOSE_PLAYER; return; } - if (enemy->npcSettings->unk_2A & 4) { + if (enemy->npcSettings->unk_2A & AI_ACTION_04) { if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) > (npc->moveSpeed * 5.0)) { x = npc->pos.x; y = npc->pos.y; z = npc->pos.z; if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &sp28); - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; npc->duration = 15; - script->functionTemp[0] = 14; + script->functionTemp[0] = AI_STATE_LOSE_PLAYER; return; } } @@ -502,53 +524,52 @@ void func_8004A124(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* npc_move_heading(npc, npc->moveSpeed, npc->yaw); if (npc->moveSpeed > 8.0 && !(gGameStatusPtr->frameCounter % 5)) { - ai_enemy_play_sound(npc, 0x20C1, 0); + ai_enemy_play_sound(npc, SOUND_20C1, 0); } if (npc->duration > 0) { npc->duration--; } else { - script->functionTemp[0] = 12; + script->functionTemp[0] = AI_STATE_CHASE_INIT; } } -void func_8004A3E8(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { +void basic_ai_lose_player(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); npc->duration--; if (npc->duration == 0) { - npc->yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z)); - script->functionTemp[0] = 0; + // turn to face home position + npc->yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z)); + script->functionTemp[0] = AI_STATE_WANDER_INIT; } } -ApiStatus DoBasicAI(Evt* script, s32 isInitialCall) { +ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* pTerritory = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* pTerritory = &territory; NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args++); - territory.unk_00 = 0; + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; territory.pointX = enemy->territory->wander.detect.x; territory.pointZ = enemy->territory->wander.detect.z; territory.sizeX = enemy->territory->wander.detectSizeX; territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; - - if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 0; + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->functionTemp[0] = AI_STATE_WANDER_INIT; npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->flags &= ~NPC_FLAG_JUMPING; if (!enemy->territory->wander.isFlying) { npc->flags |= NPC_FLAG_GRAVITY; npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; @@ -557,50 +578,50 @@ ApiStatus DoBasicAI(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->functionTemp[0] = AI_STATE_SUSPEND; + script->functionTemp[1] = AI_STATE_WANDER_INIT; } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; + script->functionTemp[0] = AI_STATE_CHASE_INIT; } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; enemy->flags &= ~ENEMY_FLAGS_40000000; } switch (script->functionTemp[0]) { - case 0x0: - func_800495A0(script, aiSettings, pTerritory); - /* fallthrough */ - case 0x1: - func_800496B8(script, aiSettings, pTerritory); + case AI_STATE_WANDER_INIT: + basic_ai_wander_init(script, aiSettings, pTerritory); + // fallthrough + case AI_STATE_WANDER: + basic_ai_wander(script, aiSettings, pTerritory); break; - case 0x2: - base_UnkNpcAIFunc1(script, aiSettings, pTerritory); - /* fallthrough */ - case 0x3: - func_80049C04(script, aiSettings, pTerritory); + case AI_STATE_LOITER_INIT: + basic_ai_loiter_init(script, aiSettings, pTerritory); + // fallthrough + case AI_STATE_LOITER: + basic_ai_loiter(script, aiSettings, pTerritory); break; - case 0xA: - func_80049E3C(script, aiSettings, pTerritory); - /* fallthrough */ - case 0xB: - func_80049ECC(script, aiSettings, pTerritory); + case AI_STATE_ALERT_INIT: + basic_ai_found_player_jump_init(script, aiSettings, pTerritory); + // fallthrough + case AI_STATE_ALERT: + basic_ai_found_player_jump(script, aiSettings, pTerritory); break; - case 0xC: - func_80049F7C(script, aiSettings, pTerritory); - /* fallthrough */ - case 0xD: - func_8004A124(script, aiSettings, pTerritory); - if (script->functionTemp[0] != 0xE) { + case AI_STATE_CHASE_INIT: + basic_ai_chase_init(script, aiSettings, pTerritory); + // fallthrough + case AI_STATE_CHASE: + basic_ai_chase(script, aiSettings, pTerritory); + if (script->functionTemp[0] != AI_STATE_LOSE_PLAYER) { break; } - /* fallthrough */ - case 0xE: - func_8004A3E8(script, aiSettings, pTerritory); + // fallthrough + case AI_STATE_LOSE_PLAYER: + basic_ai_lose_player(script, aiSettings, pTerritory); break; - case 0x63: - func_8004A73C(script); + case AI_STATE_SUSPEND: + basic_ai_suspend(script); break; } return ApiStatus_BLOCK; diff --git a/src/25AF0.c b/src/25AF0.c index f2ca5350c3..5e0171cdd4 100644 --- a/src/25AF0.c +++ b/src/25AF0.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -void func_8004A6F0(Evt* script) { +void ai_suspend_for_time(Evt* script) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; @@ -10,58 +10,68 @@ void func_8004A6F0(Evt* script) { } } -void func_8004A73C(Evt* script) { +void basic_ai_suspend(Evt* script) { Enemy* enemy = script->owner1.enemy; get_npc_unsafe(enemy->npcID); - if (enemy->unk_B4 == 0) { + if (enemy->aiPaused == 0) { script->functionTemp[0] = script->functionTemp[1]; } } -s32 func_8004A784(Npc* npc, f32 arg1, f32* outYaw, f32* outDist1, f32* outDist2, f32* outDist3) { +s32 ai_check_fwd_collisions(Npc* npc, f32 time, f32* outYaw, f32* outDistFwd, f32* outDistCW, f32* outDistCCW) { f32 x1, y1, z1; f32 x2, y2, z2; f32 x3, y3, z3; - f32 dist1 = -1.0f; - f32 dist2 = -1.0f; - f32 dist3 = -1.0f; + f32 fwdHitDist = -1.0f; + f32 cwHitDist = -1.0f; + f32 ccwHitDist = -1.0f; f32 yaw; - s32 ret; + s32 fwdHit; x1 = npc->pos.x; y1 = npc->pos.y; z1 = npc->pos.z; yaw = *outYaw; - ret = npc_test_move_simple_with_slipping(npc->collisionChannel, &x1, &y1, &z1, npc->moveSpeed * arg1, - yaw, npc->collisionHeight, npc->collisionRadius); - if (ret != 0) { - dist1 = dist2D(npc->pos.x, npc->pos.z, x1, z1); + fwdHit = npc_test_move_simple_with_slipping(npc->collisionChannel, + &x1, &y1, &z1, + npc->moveSpeed * time, + yaw, + npc->collisionHeight, + npc->collisionRadius); + + if (fwdHit != 0) { + fwdHitDist = dist2D(npc->pos.x, npc->pos.z, x1, z1); x2 = npc->pos.x; y2 = npc->pos.y; z2 = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x2, &y2, &z2, npc->moveSpeed * arg1, - clamp_angle(yaw + 35.0f), npc->collisionHeight, - npc->collisionRadius) != 0) { - dist2 = dist2D(npc->pos.x, npc->pos.z, x2, z2); + if (npc_test_move_simple_with_slipping(npc->collisionChannel, + &x2, &y2, &z2, npc->moveSpeed * time, + clamp_angle(yaw + 35.0f), + npc->collisionHeight, + npc->collisionRadius) != 0) { + cwHitDist = dist2D(npc->pos.x, npc->pos.z, x2, z2); } x3 = npc->pos.x; y3 = npc->pos.y; z3 = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x3, &y3, &z3, npc->moveSpeed * arg1, - clamp_angle(yaw - 35.0f), npc->collisionHeight, npc->collisionRadius) - != 0) { - dist3 = dist2D(npc->pos.x, npc->pos.z, x3, z3); + if (npc_test_move_simple_with_slipping(npc->collisionChannel, + &x3, &y3, &z3, + npc->moveSpeed * time, + clamp_angle(yaw - 35.0f), + npc->collisionHeight, + npc->collisionRadius) != 0) { + ccwHitDist = dist2D(npc->pos.x, npc->pos.z, x3, z3); } - if ((dist2 < dist1 && dist3 < dist2) || (dist3 < dist1 && dist2 < dist3)) { + if ((cwHitDist < fwdHitDist && ccwHitDist < cwHitDist) || (ccwHitDist < fwdHitDist && cwHitDist < ccwHitDist)) { yaw = npc->yaw; - } else if ((dist1 < dist2 && dist3 < dist1) || (dist3 < dist2 && dist1 < dist3)) { + } else if ((fwdHitDist < cwHitDist && ccwHitDist < fwdHitDist) || (ccwHitDist < cwHitDist && fwdHitDist < ccwHitDist)) { yaw = npc->yaw + 35.0f; - } else if ((dist1 < dist3 && dist2 < dist1) || (dist2 < dist3 && dist1 < dist2)) { + } else if ((fwdHitDist < ccwHitDist && cwHitDist < fwdHitDist) || (cwHitDist < ccwHitDist && fwdHitDist < cwHitDist)) { yaw = npc->yaw - 35.0f; } } @@ -69,14 +79,14 @@ s32 func_8004A784(Npc* npc, f32 arg1, f32* outYaw, f32* outDist1, f32* outDist2, if (outYaw != NULL) { *outYaw = clamp_angle(yaw); } - if (outDist1 != NULL) { - *outDist1 = dist1; + if (outDistFwd != NULL) { + *outDistFwd = fwdHitDist; } - if (outDist2 != NULL) { - *outDist2 = dist2; + if (outDistCW != NULL) { + *outDistCW = cwHitDist; } - if (outDist3 != NULL) { - *outDist3 = dist3; + if (outDistCCW != NULL) { + *outDistCCW = ccwHitDist; } - return ret; + return fwdHit; } diff --git a/src/EA0C10.c b/src/EA0C10.c index 394b7418b2..c18699bb3f 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -11,327 +11,22 @@ const char ascii_EA6D78[] = "kzn_18"; extern s32 D_802466D0[]; void func_8004D8E0(DeadEnemy*); -void func_80240DC4_EA16C4(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +void func_80240DC4_EA16C4(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory); -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_00.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_01.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -//Basically UnkNpcAIFunc26.inc.c, but gPartnerActionStatus.partnerActionState access 0, instead of 3 -s32 N(UnkNpcAIFunc26)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Camera* camera = &gCameras[gCurrentCamID]; - Enemy* enemy2 = get_enemy(enemy->npcID + 1); - f32 phi_f20; - s32 ret = TRUE; - - if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) > enemy2->varTable[2]) { - ret = FALSE; - } - - if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { - phi_f20 = 90.0f; - } else { - phi_f20 = 270.0f; - } - - if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z))) > enemy2->varTable[3]) { - ret = FALSE; - } - - if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - gPlayerStatusPtr->position.y)) { - ret = FALSE; - } - - if (gPartnerActionStatus.partnerActionState == PARTNER_BOW) { - ret = FALSE; - } - - if (gPartnerActionStatus.partnerActionState == PARTNER_SUSHIE) { - ret = FALSE; - } - - return ret; -} - -// Similar to UnkFunc7 -ApiStatus func_802406CC_EA0FCC(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*) script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Enemy* enemy2; - Npc* npc2; - f32 posX, posZ; - - enemy->unk_108.x = npc->pos.x; - enemy->unk_108.y = npc->pos.y; - enemy->unk_108.z = npc->pos.z; - enemy->unk_114 = 0.0001f; - enemy->unk_118 = 0.0001f; - - if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->flags |= NPC_FLAG_2 | NPC_FLAG_100; - enemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - } - - switch (script->functionTemp[0]) { - case 0: - enemy2 = get_enemy(enemy->npcID - 1); - npc2 = get_npc_unsafe(enemy2->npcID); - enemy->unk_07 = 1; - if (enemy2->varTable[0] == 3) { - if (enemy->varTable[15] != 0) { - ai_enemy_play_sound(npc2, enemy->varTable[15], 0); - } - posX = npc2->pos.x; - posZ = npc2->pos.z; - add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw); - - npc->pos.x = posX; - enemy->unk_10.x = npc->pos.x; - - npc->pos.y = npc2->pos.y + enemy->varTable[0]; - enemy->unk_10.y = npc->pos.y; - - npc->pos.z = posZ; - enemy->unk_10.z = npc->pos.z; - - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - enemy->flags &= ~(ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); - npc->duration = 0; - script->functionTemp[0] = 1; - } - break; - case 1: - enemy2 = get_enemy(enemy->npcID - 1); - get_npc_unsafe(enemy2->npcID); - npc->duration++; - if (npc->duration >= enemy->varTable[4]) { - enemy->unk_07 = 0; - } - if (enemy2->varTable[0] == 4) { - enemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - enemy->unk_07 = 1; - script->functionTemp[0] = 0; - } - break; - } - - if (enemy->unk_07 != 0) { - enemy->unk_114 = 7.0f; - enemy->unk_118 = 1.0f; - } - - return ApiStatus_BLOCK; -} - -// Similar to UnkNpcAIFunc27 -ApiStatus func_8024097C_EA127C(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*) script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - enemy->unk_108.x = npc->pos.x; - enemy->unk_108.y = npc->pos.y; - enemy->unk_108.z = npc->pos.z; - enemy->unk_114 = 0.0001f; - enemy->unk_118 = 0.0001f; - - if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | NPC_FLAG_GRAVITY) & ~NPC_FLAG_ENABLE_HIT_SCRIPT; - } else { - npc->flags = (npc->flags & ~NPC_FLAG_GRAVITY) | NPC_FLAG_ENABLE_HIT_SCRIPT; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if (script->functionTemp[0] < 30 && enemy->varTable[0] == 0 && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - // fallthrough - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - // fallthrough - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - // fallthrough - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - // fallthrough - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - // fallthrough - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - break; - } - - return ApiStatus_BLOCK; -} - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -// sqrtf issue - Would be UnkNpcAiFunc46 +// sqrtf issue - Would be PiranhaPlantAI_10 INCLUDE_ASM(s32, "EA0C10", func_80240DC4_EA16C4); -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_11.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_12.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_13.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_14.inc.c" +#include "world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c" -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -ApiStatus func_80241AE0_EA23E0(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*) script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - NpcAISettings* settings = (NpcAISettings*) evt_get_variable(script, *script->ptrReadPos); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 200.0f; - territory.unk_1C = 0; - - // Dead Func that doesn't seem to have an alive counterpart, probably because of the - // difference in the Enemy and DeadEnemy struct. - func_8004D8E0(enemy); - if (enemy->flags & ENEMY_FLAGS_100000) { - enemy->unk_114 = 10.0f; - enemy->unk_118 = 0.7f; - } - - if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - enemy->varTable[0] = 0; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc31)(script, settings, territoryPtr); - /* fallthrough */ - case 1: - N(UnkNpcAIFunc32)(script, settings, territoryPtr); - break; - case 10: - func_80240DC4_EA16C4(script, settings, territoryPtr); - if (script->functionTemp[0] != 11) { - break; - } - case 11: - N(UnkNpcDurationFlagFunc3)(script, settings, territoryPtr); - if (script->functionTemp[0] != 12) { - break; - } - case 12: - N(UnkNpcAIFunc33)(script, settings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - N(UnkNpcDurationFlagFunc2)(script, settings, territoryPtr); - if (script->functionTemp[0] != 14) { - break; - } - case 14: - N(UnkNpcAIFunc30)(script, settings, territoryPtr); - break; - case 99: - func_8004A73C(script); - break; - } - - return ApiStatus_BLOCK; -} - -#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c" - -#include "world/common/DeadUnkNpcAIMainFunc5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" @@ -397,31 +92,5 @@ ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -// Requires data migration -#ifdef NON_MATCHING -ApiStatus func_80242D64_EA3664(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->varTable[2]); - - D_80246894 = npc->currentAnim.w; - npc->currentAnim.w = script->varTable[4]; - - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(s32, "EA0C10", func_80242D64_EA3664); -#endif - -// Requires data migration -#ifdef NON_MATCHING -ApiStatus func_80242DA8_EA36A8(Evt* script, s32 isInitialCall) { - get_npc_unsafe(script->varTable[2])->currentAnim.w = D_80246894; - - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(s32, "EA0C10", func_80242DA8_EA36A8); -#endif +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/EA36E0.c b/src/EA36E0.c index 34f1827132..bf8dea36ab 100644 --- a/src/EA36E0.c +++ b/src/EA36E0.c @@ -13,7 +13,14 @@ ApiStatus N(SpinyTrompHit)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "EA36E0", func_80242E00_EA3700); +ApiStatus N(GetActingPartner)(Evt* script, s32 isInitialCall) { + if (gPartnerActionStatus.partnerActionState != 0) { + script->varTable[0] = gPartnerActionStatus.actingPartner; + } else { + script->varTable[0] = -1; + } + return ApiStatus_DONE2; +} #include "world/common/UnkFunc46.inc.c" diff --git a/src/EA8AE0.c b/src/EA8AE0.c index f7d4aeef9d..533eec9cf0 100644 --- a/src/EA8AE0.c +++ b/src/EA8AE0.c @@ -67,12 +67,7 @@ ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "EA8AE0", func_80241B50_EAA630); - -INCLUDE_ASM(s32, "EA8AE0", func_80241B94_EAA674); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "EA8AE0", func_80241BC0_EAA6A0); diff --git a/src/EB1170.c b/src/EB1170.c index 7a6be739a5..b0cf597268 100644 --- a/src/EB1170.c +++ b/src/EB1170.c @@ -9,7 +9,7 @@ extern s32 func_80059AC8(s32, s32); extern s32 D_802417E4_EB2644; extern s32 D_802417E8_EB2648; extern s32 D_802442D0[]; -extern u32 D_80244494; +extern s32 EB1170_LetterDelivery_SavedNpcAnim; extern s32 D_800B8DEC; #include "world/common/StashVars.inc.c" @@ -66,23 +66,8 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -ApiStatus func_802409F8_EB1858(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->varTable[2]); - - D_80244494 = npc->currentAnim.w; - npc->currentAnim.w = (u32)script->varTable[4]; - return ApiStatus_DONE2; -} - - -ApiStatus func_80240A3C_EB189C(Evt* script, s32 isInitialCall) { - get_npc_unsafe(script->varTable[2])->currentAnim.w = D_80244494; - return ApiStatus_DONE2; -} +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/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 92f4388f1e..66297181da 100644 --- a/src/EB8E90.c +++ b/src/EB8E90.c @@ -5,7 +5,7 @@ #define NAMESPACE EB8E90 -#include "world/common/atomic/enemy/Dead_UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/EC2240.c b/src/EC2240.c index 564bbfffe3..27588eaecf 100644 --- a/src/EC2240.c +++ b/src/EC2240.c @@ -55,18 +55,18 @@ ApiStatus func_80240158_EC2358(Evt* script, s32 isInitialCall) { osSyncPrintf("cccc\n"); } } - npc->currentAnim.w = enemy->animList[2]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_RUN]; npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14); npc_move_heading(npc, 2.0f, npc->yaw); } else if (temp_f4 > 0.2) { npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14); npc->pos.x = sp10; npc->pos.z = sp14; - npc->currentAnim.w = enemy->animList[1]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; } else { npc->pos.x = sp10; npc->pos.z = sp14; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; } return ApiStatus_BLOCK; } diff --git a/src/EC9D00.c b/src/EC9D00.c index 9d0afde07b..3fa5636f16 100644 --- a/src/EC9D00.c +++ b/src/EC9D00.c @@ -5,6 +5,4 @@ #define NAMESPACE EC9D00 -#define gPartnerActionStatus dead_gPartnerActionStatus2 - #include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/ECAA80.c b/src/ECAA80.c index 0a4b1ae632..90d569f273 100644 --- a/src/ECAA80.c +++ b/src/ECAA80.c @@ -1,5 +1,6 @@ #include "dead.h" #include "common.h" +#include "effects.h" #include "dead_structs.h" // Copy of flo_08 (CAFAC0.c) @@ -9,203 +10,9 @@ extern s32 N(ItemChoiceList)[]; extern s32 N(FlowerGuard_ItemChoiceList)[91]; -void func_80241364_ECB064(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory); +void ECAA80_UnkFloAI_Chase(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory); -void func_80240D80_ECAA80(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - f32 temp_f0; - f32 temp_f20; - f64 temp_f2; - f32 phi_f22; - f32 phi_f24; - f32 phi_f26; - s32 phi_s3; - - f32 subroutine_arg8; - f32 subroutine_arg9; - f32 subroutine_argA; - f32 subroutine_argB; - f32 subroutine_argC; - f32 subroutine_argD; - f32 subroutine_argE; - f32 subroutine_argF; - f32 subroutine_arg10; - - npc->duration = npcAISettings->unk_20 / 2 + rand_int(npcAISettings->unk_20 / 2 + 1); - npc->currentAnim.w = enemy->animList[3]; - npc->moveSpeed = npcAISettings->chaseSpeed; - phi_s3 = FALSE; - - temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) + 180.0f); - temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20); - if (npcAISettings->unk_1C.s < fabsf(temp_f0)) { - temp_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - temp_f20 += -npcAISettings->unk_1C.s; - } else { - temp_f20 += npcAISettings->unk_1C.s; - } - } - - npc->yaw = clamp_angle(temp_f20); - - subroutine_arg8 = npc->pos.x; - subroutine_arg9 = npc->pos.y; - subroutine_argA = npc->pos.z; - - temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) + 180.0f); - phi_f22 = 0.0f; - phi_f24 = 0.0f; - phi_f26 = 0.0f; - - if (npc_test_move_simple_without_slipping(npc->collisionChannel, &subroutine_arg8, &subroutine_arg9, &subroutine_argA, npc->moveSpeed * 4.5, temp_f20, - npc->collisionHeight, npc->collisionRadius)) { - phi_f22 = dist2D(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA); - - subroutine_argB = npc->pos.x; - subroutine_argC = npc->pos.y; - subroutine_argD = npc->pos.z; - - if (npc_test_move_simple_without_slipping(npc->collisionChannel, &subroutine_argB, &subroutine_argC, &subroutine_argD, npc->moveSpeed * 4.5, - clamp_angle(temp_f20 + 35.0f), npc->collisionHeight, npc->collisionRadius)) { - phi_f24 = dist2D(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD); - } - - subroutine_argE = npc->pos.x; - subroutine_argF = npc->pos.y; - subroutine_arg10 = npc->pos.z; - - if (npc_test_move_simple_without_slipping(npc->collisionChannel, &subroutine_argE, &subroutine_argF, &subroutine_arg10, npc->moveSpeed * 4.5, - clamp_angle(temp_f20 - 35.0f), npc->collisionHeight, npc->collisionRadius)) { - phi_f26 = dist2D(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10); - } - - dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - - if ((phi_f22 < npc->moveSpeed * 1.5) && (phi_f24 < npc->moveSpeed * 1.5) && (phi_f26 < npc->moveSpeed * 1.5) && - (func_800490B4(territory, enemy, npcAISettings->alertRadius, npcAISettings->unk_10.f, 0))) { - phi_s3 = TRUE; - } - - if (!phi_s3) { - if ((phi_f24 < phi_f22) && (phi_f26 < phi_f24)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA); - } else if ((phi_f24 < phi_f22) && (phi_f24 < phi_f26)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA); - } else if ((phi_f22 < phi_f24) && (phi_f26 < phi_f22)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD); - } else if ((phi_f26 < phi_f24) && (phi_f22 < phi_f26)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD); - } else if ((phi_f22 < phi_f26) && (phi_f24 < phi_f22)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10); - } else if ((phi_f24 < phi_f26) && (phi_f22 < phi_f24)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10); - } - - temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20); - if (npcAISettings->unk_1C.s < fabsf(temp_f0)) { - temp_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - temp_f20 += -npcAISettings->unk_1C.s; - } else { - temp_f20 += npcAISettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(temp_f20); - } - } - if (phi_s3) { - npc->duration = 0xA; - npc->currentAnim.w = enemy->animList[8]; - } - script->functionTemp[0] = 0xD; -} - -INCLUDE_ASM(s32, "ECAA80", func_80241364_ECB064); - -void func_802414C8_ECB1C8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[0] = 0; - } -} - -ApiStatus func_8024150C_ECB20C(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*) script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - - enemy->unk_108.x = npc->pos.x; - enemy->unk_108.y = npc->pos.y; - enemy->unk_108.z = npc->pos.z; - enemy->unk_114 = 0.01f; - enemy->unk_118 = 0.01f; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | NPC_FLAG_GRAVITY) & ~NPC_FLAG_ENABLE_HIT_SCRIPT; - } else { - npc->flags = (npc->flags & ~NPC_FLAG_GRAVITY) | NPC_FLAG_ENABLE_HIT_SCRIPT; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80240D80_ECAA80(script, npcAISettings, territoryPtr); - case 13: - func_80241364_ECB064(script, npcAISettings, territoryPtr); - break; - case 14: - func_802414C8_ECB1C8(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/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" diff --git a/src/ED0310.c b/src/ED0310.c index 15bd90a992..e1254c68a3 100644 --- a/src/ED0310.c +++ b/src/ED0310.c @@ -5,4 +5,4 @@ #define NAMESPACE ED0310 -#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" diff --git a/src/EDEA00.c b/src/EDEA00.c index cc0711866f..6a1fdc2e8f 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -7,158 +7,17 @@ #include "world/common/UnkFunc41.inc.c" -#include "world/common/atomic/enemy/Dead_UnkAI_9.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" const char D_80247B44_EE6504[] = "JUGEMU MOVE"; -s32 func_802416E8_EE00A8(void) { - s32 i; +#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" - for (i = 50; i < 56; i++) { - if (get_enemy(i)->varTable[10] == 0) { - return i; - } - } - - return -1; -} - -void func_80241730_EE00F0(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 temp_f20; - f32 temp_f22; - f32 temp_f24; - f32 var1 = enemy->varTable[4]; - f32 var2 = enemy->varTable[3]; - f32 var3; - - temp_f22 = var1 / 100.0; - temp_f24 = var2 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var3 = enemy->varTable[1]; - temp_f20 = var3 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->moveToPos.y = y + temp_f24; - script->functionTemp[0] = 12; - return; - } - } - script->functionTemp[1]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, - enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, - enemy->territory->wander.wanderSizeZ) != 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } - - if (npc->turnAroundYawAdjustment == 0) { - if (npc->duration > 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (enemy->varTable[0] & 1) { - x = npc->pos.x; - y = temp_f22; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - y += temp_f24; - w = y - temp_f22; - if (w > 2.0) { - temp_f22 += 2.0; - } else if (w < -2.0) { - temp_f22 -= 2.0; - } else { - temp_f22 = y; - } - enemy->varTable[4] = (temp_f22 * 100.0); - } - if (npc->duration > 0) { - return; - } - } - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) { - script->functionTemp[0] = 0; - } - } -} - -void func_80241B94_EE0554(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 var1 = enemy->varTable[3]; - f32 var2; - f32 temp_f20; - f32 temp_f22; - - temp_f22 = var1 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var2 = enemy->varTable[1]; - temp_f20 = var2 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 12; - return; - } - - if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = (rand_int(1000) % 11) + 5; - return; - } - script->functionTemp[0] = 0; - } -} - -INCLUDE_ASM(s32, "EDEA00", func_80241DE4_EE07A4); - -#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c" - -INCLUDE_ASM(s32, "EDEA00", func_80242684_EE1044); - -INCLUDE_ASM(s32, "EDEA00", func_80242AF0_EE14B0); +const char D_80247BB8_EE6578[] = "TOGEZO TYPE1 : NORMAL MOVE"; #include "world/common/UnkFunc42.inc.c" diff --git a/src/EE70C0.c b/src/EE70C0.c index bed36aeb89..3d0dfd9096 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -8,7 +8,7 @@ extern const s32 D_802453E0_EEB990[]; -#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/EED1E0.c b/src/EED1E0.c index 98e554768e..303482679b 100644 --- a/src/EED1E0.c +++ b/src/EED1E0.c @@ -5,8 +5,6 @@ #define NAMESPACE EED1E0 -#define gPartnerActionStatus dead_gPartnerActionStatus2 - #include "world/common/atomic/SuperBlock.inc.c" #include "world/common/UnkFunc44.inc.c" diff --git a/src/EEDF50.c b/src/EEDF50.c index fc02cbe4d4..eb543e35d2 100644 --- a/src/EEDF50.c +++ b/src/EEDF50.c @@ -5,12 +5,7 @@ #define NAMESPACE EEDF50 -#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/UnkNpcAIFunc13.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" -#include "world/common/UnkNpcAIFunc34.inc.c" - -#include "world/common/UnkFunc45.inc.c" - -INCLUDE_ASM(s32, "EEDF50", func_80242780_EEF880); diff --git a/src/EF2680.c b/src/EF2680.c index 0bcd95ee89..95e3169612 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -5,7 +5,7 @@ #define NAMESPACE EF2680 -#include "world/common/atomic/enemy/Dead_UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" s32 func_80241594_EF3BA4(void) { s32 i; @@ -19,7 +19,7 @@ s32 func_80241594_EF3BA4(void) { return -1; } -void func_802415DC_EF3BEC(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void func_802415DC_EF3BEC(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 x, y, z, w; @@ -48,10 +48,10 @@ void func_802415DC_EF3BEC(Evt* script, NpcAISettings* aiSettings, EnemyTerritory npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20); enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - if (aiSettings->unk_14 >= 0) { + if (aiSettings->playerSearchInterval >= 0) { if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); x = npc->pos.x; @@ -99,13 +99,13 @@ void func_802415DC_EF3BEC(Evt* script, NpcAISettings* aiSettings, EnemyTerritory } script->functionTemp[0] = 2; script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) { + if ((aiSettings->unk_AI_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) { script->functionTemp[0] = 0; } } } -void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 x, y, z, w; @@ -130,7 +130,7 @@ void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyTerritory npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); ai_enemy_play_sound(npc, 0x2F4, 0x200000); script->functionTemp[0] = 12; @@ -150,8 +150,4 @@ void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyTerritory INCLUDE_ASM(s32, "EF2680", func_80241C90_EF42A0); - #include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c" - -#include "world/common/DeadUnkNpcAIMainFunc5.inc.c" - -#include "world/common/DeadUnkNpcAIMainFunc6.inc.c" +#include "world/common/enemy/SpinyAI.inc.c" diff --git a/src/battle/battle.c b/src/battle/battle.c index ff645bd8fb..a725769f47 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -469,33 +469,33 @@ void load_demo_battle(u32 index) { switch (mode) { case 0: - gCurrentEncounter.eFirstStrike = 0; - gCurrentEncounter.hitType = 1; + gCurrentEncounter.eFirstStrike = FIRST_STRIKE_NONE; + gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_NONE; gCurrentEncounter.hitTier = 0; gGameStatusPtr->demoFlags |= 0x10; gGameStatusPtr->demoFlags |= 0x20; gGameStatusPtr->demoFlags |= 0x40; break; case 1: - gCurrentEncounter.eFirstStrike = 1; - gCurrentEncounter.hitType = 4; + gCurrentEncounter.eFirstStrike = FIRST_STRIKE_PLAYER; + gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_HAMMER; gCurrentEncounter.hitTier = playerData->hammerLevel; gGameStatusPtr->demoFlags |= 0x10; break; case 2: - gCurrentEncounter.eFirstStrike = 1; - gCurrentEncounter.hitType = 2; + gCurrentEncounter.eFirstStrike = FIRST_STRIKE_PLAYER; + gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_JUMP; gCurrentEncounter.hitTier = playerData->bootsLevel; gGameStatusPtr->demoFlags |= 0x10; break; case 3: - gCurrentEncounter.eFirstStrike = 1; - gCurrentEncounter.hitType = 6; + gCurrentEncounter.eFirstStrike = FIRST_STRIKE_PLAYER; + gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_PARTNER; gGameStatusPtr->demoFlags |= 0x20; break; case 4: - gCurrentEncounter.eFirstStrike = 2; - gCurrentEncounter.hitType = 1; + gCurrentEncounter.eFirstStrike = FIRST_STRIKE_ENEMY; + gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_NONE; gCurrentEncounter.hitTier = 0; gGameStatusPtr->demoFlags |= 0x40; break; diff --git a/src/e0b30_len_b80.c b/src/e0b30_len_b80.c index 6843f64d1e..067f100d15 100644 --- a/src/e0b30_len_b80.c +++ b/src/e0b30_len_b80.c @@ -18,7 +18,11 @@ MusicSettings D_8014F6F0 = { }; s32 gSongsUsingVariationFlag[] = { - SONG_SPECIAL_BATTLE, SONG_TUBBA_BLUBBA_BATTLE, SONG_JR_TROOPA_BATTLE, SONG_YOSHI_KIDS_FOUND, SONG_ITEM_UPGRADE, + SONG_SPECIAL_BATTLE, + SONG_TUBBA_BLUBBA_BATTLE, + SONG_JR_TROOPA_BATTLE, + SONG_YOSHI_KIDS_FOUND, + SONG_ITEM_UPGRADE, SONG_NEW_PARTNER, }; diff --git a/src/encounter_api.c b/src/encounter_api.c index 8f271ed3ad..5329acb4f3 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -797,7 +797,7 @@ ApiStatus func_80045838(Evt* script, s32 isInitialCall) { } ApiStatus func_800458CC(Evt* script, s32 isInitialCall) { - evt_set_variable(script, *script->ptrReadPos, script->owner1.enemy->npcSettings->unk_2A & 8); + evt_set_variable(script, *script->ptrReadPos, script->owner1.enemy->npcSettings->unk_2A & AI_ACTION_08); return ApiStatus_DONE2; } @@ -806,16 +806,16 @@ ApiStatus func_80045900(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); s32 var0 = evt_get_variable(script, *script->ptrReadPos); - enemy->unk_B0 |= ENEMY_AI_FLAGS_4; + enemy->aiFlags |= ENEMY_AI_FLAGS_4; if (var0 == 0) { s32 unk; - if (!(enemy->unk_B0 & ENEMY_AI_FLAGS_10)) { + if (!(enemy->aiFlags & ENEMY_AI_FLAGS_10)) { npc->currentAnim.w = *enemy->animList; } - if (!(enemy->unk_B0 & ENEMY_AI_FLAGS_8)) { + if (!(enemy->aiFlags & ENEMY_AI_FLAGS_8)) { fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 0.0f, -20.0f, 40, &unk); } diff --git a/src/npc.c b/src/npc.c index 0e0fd0f5e8..de1780d36b 100644 --- a/src/npc.c +++ b/src/npc.c @@ -107,7 +107,7 @@ s32 _create_npc(NpcBlueprint* blueprint, s32** animList, s32 skipLoadingAnims) { npc->homePos.y = 0.0f; npc->homePos.z = 0.0f; npc->unk_96 = 0; // TODO: fix - npc->unk_AB = 0; + npc->verticalRenderOffset = 0; npc->alpha = 255; npc->alpha2 = 255; npc->jumpScale = 1.0f; @@ -425,7 +425,7 @@ INCLUDE_ASM(s32, "npc", npc_do_player_collision, Npc* npc); void npc_do_gravity(Npc* npc) { if (npc->flags & NPC_FLAG_GRAVITY) { - if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { + if (npc->flags & NPC_FLAG_JUMPING) { npc->flags &= ~NPC_FLAG_1000; } else { f32 xTemp; @@ -472,7 +472,7 @@ s32 func_800397E8(Npc* npc, f32 arg1) { f32 oldLength; s32 phi_v0; - if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { + if (npc->flags & NPC_FLAG_JUMPING) { npc->flags &= ~NPC_FLAG_1000; return 0; } @@ -547,7 +547,7 @@ void update_npcs(void) { npc->jumpVelocity = 0.0f; npc->moveSpeed = 0.0f; npc->jumpScale = 0.0f; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->flags &= ~NPC_FLAG_JUMPING; } if (!(npc->flags & NPC_FLAG_NO_ANIMS_LOADED)) { @@ -698,7 +698,7 @@ void appendGfx_npc(Npc* npc) { Matrix4f mtx1, mtx2; f32 renderYaw = npc_get_render_yaw(npc); - guTranslateF(mtx1, npc->pos.x, npc->pos.y + npc->unk_AB, npc->pos.z); + guTranslateF(mtx1, npc->pos.x, npc->pos.y + npc->verticalRenderOffset, npc->pos.z); if (npc->flags & NPC_FLAG_UPSIDE_DOWN) { mtx_ident_mirror_y(mtx2); guMtxCatF(mtx2, mtx1, mtx1); @@ -752,7 +752,7 @@ void appendGfx_npc(Npc* npc) { } if (npc->flags & NPC_FLAG_REFLECT_WALL) { - guTranslateF(mtx1, npc->pos.x, npc->pos.y + npc->unk_AB, -npc->pos.z); + guTranslateF(mtx1, npc->pos.x, npc->pos.y + npc->verticalRenderOffset, -npc->pos.z); if (npc->flags & NPC_FLAG_UPSIDE_DOWN) { mtx_ident_mirror_y(mtx2); guMtxCatF(mtx2, mtx1, mtx1); @@ -785,7 +785,7 @@ void appendGfx_npc(Npc* npc) { } if (npc->flags & NPC_FLAG_REFLECT_FLOOR) { - guTranslateF(mtx1, npc->pos.x, -(npc->pos.y + npc->unk_AB), npc->pos.z); + guTranslateF(mtx1, npc->pos.x, -(npc->pos.y + npc->verticalRenderOffset), npc->pos.z); mtx_ident_mirror_y(mtx2); guMtxCatF(mtx2, mtx1, mtx1); diff --git a/src/world/area_arn/arn_02/arn_02.h b/src/world/area_arn/arn_02/arn_02.h index 7883a1345d..76781613b4 100644 --- a/src/world/area_arn/arn_02/arn_02.h +++ b/src/world/area_arn/arn_02/arn_02.h @@ -7,7 +7,7 @@ #define NAMESPACE arn_02 -ApiStatus N(func_80240C90_BDDE40)(Evt *script, s32 isInitialCall); +ApiStatus N(CleftAI_Main)(Evt *script, s32 isInitialCall); extern EvtScript N(main); extern EvtScript N(80241040); diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index e165990b3a..ce12ab479b 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -52,16 +52,16 @@ NpcAISettings N(npcAISettings_802413D0) = { .moveTime = 40, .waitTime = 15, .alertRadius = 150.0f, - .unk_14 = 2, + .playerSearchInterval = 2, .chaseSpeed = 3.3f, - .unk_1C = { .s = 70 }, - .unk_20 = 1, + .chaseTurnRate= 70, + .chaseUpdateInterval = 1, .chaseRadius = 180.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80241400) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_802413D0))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_802413D0))) EVT_RETURN EVT_END }; @@ -80,17 +80,17 @@ NpcAISettings N(npcAISettings_8024144C) = { .moveTime = 30, .waitTime = 30, .alertRadius = 120.0f, - .unk_14 = 3, + .playerSearchInterval = 3, .chaseSpeed = 8.5f, - .unk_1C = { .s = 60 }, - .unk_20 = 3, + .chaseTurnRate= 60, + .chaseUpdateInterval = 3, .chaseRadius = 100.0f, - .unk_28 = { .f = 60.0f }, - .unk_2C = 1, + .chaseOffsetDist = 60.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_8024147C) = { - EVT_CALL(N(func_80240C90_BDDE40), EVT_PTR(N(npcAISettings_8024144C)), 8) + EVT_CALL(N(CleftAI_Main), EVT_PTR(N(npcAISettings_8024144C)), 8) EVT_RETURN EVT_END }; @@ -211,225 +211,4 @@ NpcGroupList N(npcGroupList_80241A9C) = { {}, }; -s32 N(func_80240000_BDD1B0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Camera* camera = &gCameras[gCurrentCamID]; - f32 phi_f20; - s32 ret = FALSE; - - if (func_800493EC(enemy, 0, aiSettings->alertRadius, aiSettings->unk_10.f)) { - ret = TRUE; - } - if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { - phi_f20 = 90.0f; - } else { - phi_f20 = 270.0f; - } - - if (fabsf(get_clamped_angle_diff(phi_f20, - atan2(npc->pos.x, npc->pos.z, - gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z))) > 75.0) { - ret = FALSE; - } - if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { - ret = FALSE; - } - if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { - ret = FALSE; - } - return ret; -} - -#include "world/common/UnkNpcAIFunc18.inc.c" - -void N(func_802401D4_BDD384)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { - npc->currentAnim.w = enemy->animList[9]; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->duration = 12; - script->functionTemp[0] = 2; - } - } - - script->functionTemp[1]--; -} - -#include "world/common/UnkNpcAIFunc21.inc.c" - -#include "world/common/UnkNpcAIFunc20.inc.c" - -#include "world/common/UnkNpcAIFunc22.inc.c" - -#include "world/common/UnkFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc16.inc.c" - -void N(func_80240694_BDD844)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - if (npc->duration % 3 == 0) { - fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z + 2.0f, 0, 0); - } - - npc->duration--; - if (npc->duration <= 0) { - enemy->unk_10.x = npc->pos.x; - enemy->unk_10.y = npc->pos.y; - enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; - npc->moveSpeed = aiSettings->chaseSpeed; - npc->duration = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) / npc->moveSpeed + 0.9; - if (npc->duration < 15) { - npc->duration = 15; - } - script->functionTemp[0] = 0x16; - } -} - -#include "world/common/UnkFunc10.inc.c" - -void N(func_80240984_BDDB34)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -#include "world/common/UnkFunc9.inc.c" - -#include "world/common/UnkNpcAIFunc19.inc.c" - -#include "world/common/UnkNpcAIFunc17.inc.c" - -#include "world/common/UnkDurationCheck.inc.c" - -s32 N(func_80240C90_BDDE40)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - - enemy->varTable[10] = evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if ((u32)script->functionTemp[0] - 12 < 3 && N(func_80240000_BDD1B0)(script, npcAISettings, territoryPtr)) { - script->functionTemp[0] = 20; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc18)(script, npcAISettings, territoryPtr); - case 1: - N(func_802401D4_BDD384)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 2) { - return ApiStatus_BLOCK; - } - case 2: - N(UnkNpcAIFunc21)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 3) { - return ApiStatus_BLOCK; - } - case 3: - N(UnkNpcAIFunc20)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 4) { - return ApiStatus_BLOCK; - } - case 4: - N(UnkNpcAIFunc22)(script, npcAISettings, territoryPtr); - case 5: - N(UnkFunc8)(script, npcAISettings, territoryPtr); - return ApiStatus_BLOCK; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - return ApiStatus_BLOCK; - } - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 14) { - return ApiStatus_BLOCK; - } - case 14: - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[0] = 40; - } - return ApiStatus_BLOCK; - case 20: - N(UnkNpcAIFunc16)(script, npcAISettings, territoryPtr); - case 21: - N(func_80240694_BDD844)(script, npcAISettings, territoryPtr); - return ApiStatus_BLOCK; - case 22: - N(UnkFunc10)(script, npcAISettings, territoryPtr); - return ApiStatus_BLOCK; - case 40: - N(func_80240984_BDDB34)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 41) { - return ApiStatus_BLOCK; - } - case 41: - N(UnkFunc9)(script, npcAISettings, territoryPtr); - return ApiStatus_BLOCK; - case 50: - N(UnkNpcAIFunc19)(script, npcAISettings, territoryPtr); - case 51: - N(UnkNpcAIFunc17)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 52) { - return ApiStatus_BLOCK; - } - case 52: - N(UnkDurationCheck)(script, npcAISettings, territoryPtr); - return ApiStatus_BLOCK; - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/CleftAI.inc.c" diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index d99a3a847a..5e7904b5de 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -73,11 +73,11 @@ NpcAISettings N(npcAISettings_80241BC0) = { .moveTime = 25, .waitTime = 30, .alertRadius = 50.0f, - .unk_10 = { .f = 50.0f }, - .unk_14 = 10, + .alertOffsetDist = 50.0f, + .playerSearchInterval = 10, .chaseRadius = 100.0f, - .unk_28 = { .f = 80.0f }, - .unk_2C = 1, + .chaseOffsetDist = 80.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80241BF0) = { @@ -99,9 +99,9 @@ NpcSettings N(npcSettings_80241C3C) = { .level = 99, }; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" -void N(func_80240E90_BDFC20)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(func_80240E90_BDFC20)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 posX, posY, posZ, posW; @@ -137,7 +137,7 @@ void N(func_80240E90_BDFC20)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit } } -void N(func_80241068_BDFDF8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(func_80241068_BDFDF8)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -149,7 +149,7 @@ void N(func_80241068_BDFDF8)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); } else { script->functionTemp[0] = 4; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; } } } @@ -158,18 +158,18 @@ ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - territory.unk_00 = 0; + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->patrol.detectShape; territory.pointX = enemy->territory->patrol.detect.x; territory.pointZ = enemy->territory->patrol.detect.z; territory.sizeX = enemy->territory->patrol.detectSizeX; territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; if (isInitialCall) { script->functionTemp[0] = 0; @@ -179,17 +179,17 @@ ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); + N(PatrolAI_MoveInit)(script, npcAISettings, territoryPtr); case 1: N(func_80240E90_BDFC20)(script, npcAISettings, territoryPtr); break; case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + N(PatrolAI_LoiterInit)(script, npcAISettings, territoryPtr); case 3: N(func_80241068_BDFDF8)(script, npcAISettings, territoryPtr); break; case 4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); + N(PatrolAI_PostLoiter)(script, npcAISettings, territoryPtr); break; } diff --git a/src/world/area_arn/arn_04/arn_04.h b/src/world/area_arn/arn_04/arn_04.h index 066e42eb19..e0e9b04953 100644 --- a/src/world/area_arn/arn_04/arn_04.h +++ b/src/world/area_arn/arn_04/arn_04.h @@ -7,9 +7,9 @@ #define NAMESPACE arn_04 -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243018_BE67C8)(Evt* script, s32 isInitialCall); +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(CleftAI_Main)(Evt* script, s32 isInitialCall); extern EvtScript N(main); extern EvtScript N(802433D0); diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index b3ea8c744d..d211de6e71 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -40,16 +40,16 @@ NpcAISettings N(npcAISettings_80243660) = { .moveTime = 30, .waitTime = 30, .alertRadius = 130.0f, - .unk_14 = 1, + .playerSearchInterval = 1, .chaseSpeed = 2.5f, - .unk_1C = { .s = 180 }, - .unk_20 = 3, + .chaseTurnRate= 180, + .chaseUpdateInterval = 3, .chaseRadius = 150.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80243690) = { - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_80243660))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_80243660))) EVT_RETURN EVT_END }; @@ -63,26 +63,26 @@ NpcSettings N(npcSettings_802436B0) = { .level = 12, }; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" NpcAISettings N(npcAISettings_802436F4) = { .moveSpeed = 1.8f, .moveTime = 60, .waitTime = 15, .alertRadius = 120.0f, - .unk_14 = 3, + .playerSearchInterval = 3, .chaseSpeed = 4.0f, - .unk_1C = { .s = 5 }, - .unk_20 = 1, + .chaseTurnRate= 5, + .chaseUpdateInterval = 1, .chaseRadius = 150.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80243724) = { @@ -90,7 +90,7 @@ EvtScript N(npcAI_80243724) = { EVT_CALL(SetSelfVar, 5, -850) EVT_CALL(SetSelfVar, 6, 60) EVT_CALL(SetSelfVar, 1, 700) - EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_802436F4))) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(npcAISettings_802436F4))) EVT_RETURN EVT_END }; @@ -110,17 +110,17 @@ NpcAISettings N(npcAISettings_802437C0) = { .moveTime = 30, .waitTime = 30, .alertRadius = 120.0f, - .unk_14 = 3, + .playerSearchInterval = 3, .chaseSpeed = 8.5f, - .unk_1C = { .s = 60 }, - .unk_20 = 3, + .chaseTurnRate= 60, + .chaseUpdateInterval = 3, .chaseRadius = 100.0f, - .unk_28 = { .f = 60.0f }, - .unk_2C = 1, + .chaseOffsetDist = 60.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802437F0) = { - EVT_CALL(N(func_80243018_BE67C8), EVT_PTR(N(npcAISettings_802437C0)), 8) + EVT_CALL(N(CleftAI_Main), EVT_PTR(N(npcAISettings_802437C0)), 8) EVT_RETURN EVT_END }; @@ -292,229 +292,4 @@ EvtScript N(makeEntities) = { EVT_END }; -s32 N(func_80242388_BE5B38)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Camera* camera = &gCameras[gCurrentCamID]; - f32 phi_f20; - s32 ret = FALSE; - - if (func_800493EC(enemy, 0, aiSettings->alertRadius, aiSettings->unk_10.f)) { - ret = TRUE; - } - if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { - phi_f20 = 90.0f; - } else { - phi_f20 = 270.0f; - } - - if (fabsf(get_clamped_angle_diff(phi_f20, - atan2(npc->pos.x, npc->pos.z, - gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z))) > 75.0) { - ret = FALSE; - } - if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { - ret = FALSE; - } - if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { - ret = FALSE; - } - return ret; -} - -#include "world/common/UnkNpcAIFunc18.inc.c" - -void N(func_8024255C_BE5D0C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { - npc->currentAnim.w = enemy->animList[9]; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->duration = 12; - script->functionTemp[0] = 2; - } - } - - script->functionTemp[1]--; -} - -#include "world/common/UnkNpcAIFunc21.inc.c" - -#include "world/common/UnkNpcAIFunc20.inc.c" - -#include "world/common/UnkNpcAIFunc22.inc.c" - -#include "world/common/UnkFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc16.inc.c" - -void N(func_80242A1C_BE61CC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - if (npc->duration % 3 == 0) { - fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z + 2.0f, 0, 0); - } - - npc->duration--; - if (npc->duration <= 0) { - enemy->unk_10.x = npc->pos.x; - enemy->unk_10.y = npc->pos.y; - enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; - npc->moveSpeed = aiSettings->chaseSpeed; - npc->duration = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) / npc->moveSpeed + 0.9; - if (npc->duration < 15) { - npc->duration = 15; - } - script->functionTemp[0] = 0x16; - } -} - -#include "world/common/UnkFunc10.inc.c" - -void N(func_80242D0C_BE64BC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -#include "world/common/UnkFunc9.inc.c" - -#include "world/common/UnkNpcAIFunc19.inc.c" - -#include "world/common/UnkNpcAIFunc17.inc.c" - -#include "world/common/UnkDurationCheck.inc.c" - -ApiStatus N(func_80243018_BE67C8)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - u32 var; - - enemy->varTable[10] = evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags |= 0x200; - npc->flags &= ~0x8; - - } else { - npc->flags &= ~0x200; - npc->flags |= 0x8; - } - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if ((u32)script->functionTemp[0] - 12 < 3 && N(func_80242388_BE5B38)(script, aiSettings, territoryPtr)) { - script->functionTemp[0] = 20; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc18)(script, aiSettings, territoryPtr); - case 1: - N(func_8024255C_BE5D0C)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 2) { - return ApiStatus_BLOCK; - } - case 2: - N(UnkNpcAIFunc21)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 3) { - return ApiStatus_BLOCK; - } - case 3: - N(UnkNpcAIFunc20)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 4) { - return ApiStatus_BLOCK; - } - case 4: - N(UnkNpcAIFunc22)(script, aiSettings, territoryPtr); - case 5: - N(UnkFunc8)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 12: - func_80049F7C(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 13) { - return ApiStatus_BLOCK; - } - case 13: - func_8004A124(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 14) { - return ApiStatus_BLOCK; - } - case 14: - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[0] = 40; - } - return ApiStatus_BLOCK; - case 20: - N(UnkNpcAIFunc16)(script, aiSettings, territoryPtr); - case 21: - N(func_80242A1C_BE61CC)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 22: - N(UnkFunc10)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 40: - N(func_80242D0C_BE64BC)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 41) { - return ApiStatus_BLOCK; - } - case 41: - N(UnkFunc9)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 50: - N(UnkNpcAIFunc19)(script, aiSettings, territoryPtr); - case 51: - N(UnkNpcAIFunc17)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 52) { - return ApiStatus_BLOCK; - } - case 52: - N(UnkDurationCheck)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/CleftAI.inc.c" diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 6a702c8c10..ec80a01df6 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -77,11 +77,11 @@ NpcAISettings N(npcAISettings_802416DC) = { .moveTime = 25, .waitTime = 30, .alertRadius = 50.0f, - .unk_10 = { .f = 50.0f }, - .unk_14 = 10, + .alertOffsetDist = 50.0f, + .playerSearchInterval = 10, .chaseRadius = 100.0f, - .unk_28 = { .f = 80.0f }, - .unk_2C = 1, + .chaseOffsetDist = 80.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_8024170C) = { @@ -320,7 +320,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .id = NPC_BOO0, .settings = &N(npcSettings_8024172C), .pos = { 55.0f, 195.0f, 160.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80241FB8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -351,7 +351,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .id = NPC_BOO1, .settings = &N(npcSettings_80241758), .pos = { 160.0f, 191.0f, 250.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80242008), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -381,7 +381,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .id = NPC_BOO2, .settings = &N(npcSettings_80241758), .pos = { 390.0f, 190.0f, 255.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024202C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -411,7 +411,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .id = NPC_BOO3, .settings = &N(npcSettings_80241758), .pos = { 503.0f, 206.0f, 210.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024212C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -441,7 +441,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .id = NPC_BOO4, .settings = &N(npcSettings_8024172C), .pos = { 350.0f, 185.0f, 197.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802421EC), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -794,7 +794,7 @@ StaticNpc N(npcGroup_802443AC) = { .id = NPC_WORLD_TUBBA, .settings = &N(npcSettings_802416B0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING, .init = &N(init_80244358), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1015,9 +1015,9 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" -void N(func_80240E90_BE8A70)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(func_80240E90_BE8A70)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); f32 posX, posY, posZ, posW; @@ -1053,7 +1053,7 @@ void N(func_80240E90_BE8A70)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit } } -void N(func_80241068_BE8C48)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(func_80241068_BE8C48)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -1065,7 +1065,7 @@ void N(func_80241068_BE8C48)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); } else { script->functionTemp[0] = 4; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; } } } @@ -1074,18 +1074,18 @@ ApiStatus N(func_8024113C_BE8D1C)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Bytecode* args = script->ptrReadPos; Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - territory.unk_00 = 0; + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->patrol.detectShape; territory.pointX = enemy->territory->patrol.detect.x; territory.pointZ = enemy->territory->patrol.detect.z; territory.sizeX = enemy->territory->patrol.detectSizeX; territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; if (isInitialCall) { script->functionTemp[0] = 0; @@ -1095,17 +1095,17 @@ ApiStatus N(func_8024113C_BE8D1C)(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr); + N(PatrolAI_MoveInit)(script, aiSettings, territoryPtr); case 1: N(func_80240E90_BE8A70)(script, aiSettings, territoryPtr); break; case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + N(PatrolAI_LoiterInit)(script, aiSettings, territoryPtr); case 3: N(func_80241068_BE8C48)(script, aiSettings, territoryPtr); break; case 4: - N(UnkNpcAIFunc25)(script, aiSettings, territoryPtr); + N(PatrolAI_PostLoiter)(script, aiSettings, territoryPtr); } enemy->varTable[0] = npc->pos.y; diff --git a/src/world/area_arn/arn_07/arn_07.h b/src/world/area_arn/arn_07/arn_07.h index d88e80851a..0e4465be73 100644 --- a/src/world/area_arn/arn_07/arn_07.h +++ b/src/world/area_arn/arn_07/arn_07.h @@ -31,7 +31,7 @@ ApiStatus N(arn_07_StarSpiritEffectFunc4)(Evt* script, s32 isInitialCall); ApiStatus N(arn_07_StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall); ApiStatus N(arn_07_StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240800_BED5F0)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); +ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall); ApiStatus PostChapter3StatUpdate(Evt* script, s32 isInitialCall); diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index c4b271bfad..b6838e6ae7 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -95,7 +95,7 @@ EvtScript N(makeEntities) = { EVT_END }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -105,12 +105,12 @@ NpcAISettings N(npcAISettings_80243BD8) = { .moveTime = 60, .waitTime = 15, .alertRadius = 120.0f, - .unk_14 = 3, + .playerSearchInterval = 3, .chaseSpeed = 4.0f, - .unk_1C = { .s = 5 }, - .unk_20 = 1, + .chaseTurnRate= 5, + .chaseUpdateInterval = 1, .chaseRadius = 150.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80243C08) = { @@ -118,7 +118,7 @@ EvtScript N(npcAI_80243C08) = { EVT_CALL(SetSelfVar, 5, -850) EVT_CALL(SetSelfVar, 6, 60) EVT_CALL(SetSelfVar, 1, 700) - EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_80243BD8))) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(npcAISettings_80243BD8))) EVT_RETURN EVT_END }; @@ -731,7 +731,7 @@ StaticNpc N(npcGroup_80245D0C)[] = { .id = NPC_WORLD_TUBBA, .settings = &N(npcSettings_80243CF0), .pos = { 309.0f, 0.0f, 11.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_200000, .init = &N(init_80245090), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -761,7 +761,7 @@ StaticNpc N(npcGroup_80245D0C)[] = { .id = NPC_TUBBAS_HEART, .settings = &N(npcSettings_80243CC4), .pos = { -10.0f, 50.0f, -170.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_200000, .init = &N(init_80245058), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -793,7 +793,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .id = NPC_BOO0, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -823,7 +823,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .id = NPC_BOO1, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -853,7 +853,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .id = NPC_BOO2, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -883,7 +883,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .id = NPC_BOO3, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -913,7 +913,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .id = NPC_BOO4, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -943,7 +943,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .id = NPC_BOO5, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_80245104), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -975,7 +975,7 @@ StaticNpc N(npcGroup_80246C8C) = { .id = NPC_WORLD_BOW, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_80245164), .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, @@ -1005,7 +1005,7 @@ StaticNpc N(npcGroup_80246E7C) = { .id = NPC_BOOTLER, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, .init = &N(init_8024519C), .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, @@ -1046,7 +1046,7 @@ StaticNpc N(npcGroup_802470BC) = { .id = NPC_PARAGOOMBA0, .settings = &N(npcSettings_80243C78), .pos = { -216.0f, 60.0f, -10.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024706C), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1083,7 +1083,7 @@ StaticNpc N(npcGroup_802472AC) = { .id = NPC_PARAGOOMBA1, .settings = &N(npcSettings_80243C78), .pos = { 0.0f, 60.0f, 150.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024706C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1120,7 +1120,7 @@ StaticNpc N(npcGroup_8024749C) = { .id = NPC_PARAGOOMBA2, .settings = &N(npcSettings_80243C78), .pos = { 260.0f, 60.0f, 30.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024706C), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1157,7 +1157,7 @@ StaticNpc N(npcGroup_8024768C) = { .id = NPC_WORLD_SKOLAR, .settings = &N(npcSettings_80243D48), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80245C9C), .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, @@ -1203,7 +1203,7 @@ NpcGroupList N(npcGroupList_802478E8) = { {}, }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" ApiStatus PostChapter3StatUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index a1e8aedef3..ae16864e68 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -367,7 +367,7 @@ StaticNpc N(npcGroup_80241448) = { .id = NPC_TUBBAS_HEART, .settings = &N(npcSettings_80241220), .pos = { -23.0f, 75.0f, 31.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80241288), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -397,7 +397,7 @@ StaticNpc N(npcGroup_80241638) = { .id = NPC_YAKKEY, .settings = &N(npcSettings_8024124C), .pos = { 38.0f, 0.0f, 97.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, .init = &N(init_802413E8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_arn/arn_09/events.c b/src/world/area_arn/arn_09/events.c index c3c1047e8f..33eae51707 100644 --- a/src/world/area_arn/arn_09/events.c +++ b/src/world/area_arn/arn_09/events.c @@ -163,7 +163,7 @@ StaticNpc N(npcGroup_80240784) = { .id = 0, .settings = &N(npcSettings_802405D0), .pos = { 0.0f, 25.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80240730), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_arn/arn_10/events.c b/src/world/area_arn/arn_10/events.c index ce10dd9735..77a3444a15 100644 --- a/src/world/area_arn/arn_10/events.c +++ b/src/world/area_arn/arn_10/events.c @@ -100,16 +100,16 @@ NpcAISettings N(npcAISettings_8024047C) = { .moveTime = 40, .waitTime = 15, .alertRadius = 150.0f, - .unk_14 = 2, + .playerSearchInterval = 2, .chaseSpeed = 3.3f, - .unk_1C = { .s = 70 }, - .unk_20 = 1, + .chaseTurnRate= 70, + .chaseUpdateInterval = 1, .chaseRadius = 180.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802404AC) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024047C))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_8024047C))) EVT_RETURN EVT_END }; @@ -183,7 +183,7 @@ StaticNpc N(npcGroup_802407D8) = { .id = 0, .settings = &N(npcSettings_80240450), .pos = { 80.0f, 50.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80240720), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -212,7 +212,7 @@ StaticNpc N(npcGroup_802407D8) = { StaticNpc N(npcGroup_802409C8) = { .id = 1, .settings = &N(npcSettings_802404CC), - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024076C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_arn/arn_11/events.c b/src/world/area_arn/arn_11/events.c index db9113b236..75520271d5 100644 --- a/src/world/area_arn/arn_11/events.c +++ b/src/world/area_arn/arn_11/events.c @@ -275,7 +275,7 @@ StaticNpc N(npcGroup_80240EEC) = { .id = NPC_TUBBAS_HEART, .settings = &N(npcSettings_802406A0), .pos = { 119.0f, 60.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING | NPC_FLAG_40000, .init = &N(init_80240E70), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_arn/arn_12/events.c b/src/world/area_arn/arn_12/events.c index fabcf8304d..91684fa354 100644 --- a/src/world/area_arn/arn_12/events.c +++ b/src/world/area_arn/arn_12/events.c @@ -99,16 +99,16 @@ NpcAISettings N(npcAISettings_8024046C) = { .moveTime = 40, .waitTime = 15, .alertRadius = 150.0f, - .unk_14 = 2, + .playerSearchInterval = 2, .chaseSpeed = 3.3f, - .unk_1C = { .s = 70 }, - .unk_20 = 1, + .chaseTurnRate= 70, + .chaseUpdateInterval = 1, .chaseRadius = 180.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_8024049C) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024046C))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_8024046C))) EVT_RETURN EVT_END }; @@ -183,7 +183,7 @@ StaticNpc N(npcGroup_802407DC) = { .id = 0, .settings = &N(npcSettings_80240440), .pos = { 80.0f, 50.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80240710), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -212,7 +212,7 @@ StaticNpc N(npcGroup_802407DC) = { StaticNpc N(npcGroup_802409CC) = { .id = 1, .settings = &N(npcSettings_802404BC), - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024075C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_arn/arn_13/events.c b/src/world/area_arn/arn_13/events.c index b818d6ee25..43869a0944 100644 --- a/src/world/area_arn/arn_13/events.c +++ b/src/world/area_arn/arn_13/events.c @@ -100,16 +100,16 @@ NpcAISettings N(npcAISettings_8024047C) = { .moveTime = 40, .waitTime = 15, .alertRadius = 150.0f, - .unk_14 = 2, + .playerSearchInterval = 2, .chaseSpeed = 3.3f, - .unk_1C = { .s = 70 }, - .unk_20 = 1, + .chaseTurnRate= 70, + .chaseUpdateInterval = 1, .chaseRadius = 180.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802404AC) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024047C))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_8024047C))) EVT_RETURN EVT_END }; @@ -184,7 +184,7 @@ StaticNpc N(npcGroup_802407EC) = { .id = 0, .settings = &N(npcSettings_80240450), .pos = { 80.0f, 50.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80240720), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -213,7 +213,7 @@ StaticNpc N(npcGroup_802407EC) = { StaticNpc N(npcGroup_802409DC) = { .id = 1, .settings = &N(npcSettings_802404CC), - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024076C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index 9b8501704c..ad331b10da 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -783,7 +783,7 @@ StaticNpc N(npcGroup_802434FC) = { .id = NPC_SENTINEL, .settings = &N(npcSettings_8024066C), .pos = { 0.0f, 0.0f, -1000.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_400000, .init = &N(init_802434EC), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -837,6 +837,6 @@ EvtScript N(makeEntities) = { ApiStatus N(func_80240060_BFA100)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(get_enemy(6)->npcID); - sfx_adjust_env_sound_pos(0x32E, 0, npc->pos.x, npc->pos.y, npc->pos.z); + sfx_adjust_env_sound_pos(SOUND_32E, 0, npc->pos.x, npc->pos.y, npc->pos.z); return ApiStatus_DONE2; } diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 5797dfd910..3c6a08ad0d 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -478,14 +478,14 @@ EvtScript N(makeEntities) = { EVT_END }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; EvtScript N(80244CE8) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING)), TRUE) EVT_RETURN EVT_END }; @@ -495,329 +495,17 @@ NpcAISettings N(npcAISettings_80244D24) = { .moveTime = 90, .waitTime = 30, .alertRadius = 240.0f, - .unk_14 = 1, + .playerSearchInterval = 1, .chaseSpeed = 5.3f, - .unk_1C = { .s = 180 }, - .unk_20 = 1, + .chaseTurnRate= 180, + .chaseUpdateInterval = 1, .chaseRadius = 240.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -void N(func_80241618_BFEE98)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f0; - f32 phi_f20; - - npc->duration--; - if (npc->duration <= 0) { - npc->flags &= ~0x00200000; - npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); - npc->currentAnim.w = enemy->animList[8]; - npc->moveSpeed = aiSettings->chaseSpeed; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0)) { - phi_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - script->functionTemp[0] = 13; - } -} - -void N(func_80241770_BFEFF0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { - npc->duration = 0; - script->functionTemp[0] = 14; - } else { - npc->duration--; - if (npc->duration <= 0) { - npc->flags |= 0x200000; - script->functionTemp[0] = 12; - } - } - } else { - script->functionTemp[0] = 16; - } - -} - -void N(func_80241874_BFF0F4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; - - for (i = 0; i < 4; i++) { - if (i != npc->npcID && (get_enemy(i)->varTable[0] & 0x100)) { - return; - } - } - - enemy->varTable[0] |= 0x100; - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z; - if (!(enemy->varTable[0] & 0x1000)) { - enemy->varTable[0] |= 0x1000; - } - - sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - npc->duration = 0; - script->functionTemp[0] = 15; -} - -void N(func_80241954_BFF1D4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - s32 temp_f8_2; - - sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - enemy->varTable[0] &= ~0x100; - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - script->functionTemp[0] = 16; - } else { - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z + 2.0f; - npc->rotation.y += 25.0f; - if (npc->rotation.y > 360.0) { - npc->rotation.y -= 360.0; - } - temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); - func_802DE894(npc->spriteInstanceID, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); - - posX = gPlayerStatusPtr->position.x; - posY = gPlayerStatusPtr->position.y; - posZ = gPlayerStatusPtr->position.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (fabsf(npc->pos.y - posY) > 24.0) { - npc->pos.y -= 1.8; - } else { - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actingPartner != 9) { - disable_player_input(); - partner_disable_input(); - npc->duration = 0; - script->functionTemp[0] = 20; - } else { - script->functionTemp[0] = 16; - } - } - } -} - -void N(func_80241BF0_BFF470)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - if (enemy->varTable[0] & 0x1000) { - sfx_stop_sound(0x80000011); - enemy->varTable[0] &= ~0x1000; - } - npc->currentAnim.w = enemy->animList[9]; - npc->duration = 20; - script->functionTemp[0] = 17; -} - -void N(func_80241CA8_BFF528)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 tmp = enemy->varTable[3]; - f32 temp_f20 = tmp / 100.0; - s32 var; - - npc->pos.y += 2.5; - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (!(npc->pos.y < (posY + temp_f20))) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc->pos.y = posY + temp_f20; - fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); - npc->duration = 10; - script->functionTemp[0] = 18; - } -} - -void N(func_80241E28_BFF6A8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 30; - } -} - -void N(func_80241E70_BFF6F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration++; - if (npc->duration >= 3) { - if (gPartnerActionStatus.actingPartner != 9) { - npc->duration = 0; - script->functionTemp[0] = 100; - } else { - enable_player_input(); - partner_enable_input(); - script->functionTemp[0] = 16; - } - } -} - -void N(func_80241EF0_BFF770)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - npc->flags &= ~0x00200000; - npc->moveSpeed = 2.0 * aiSettings->moveSpeed; - enemy->varTable[2] = 0; - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[1] = 0x1E; -} - -void N(func_80241F98_BFF818)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX = npc->pos.x; - f32 posY = npc->pos.y; - f32 posZ = npc->pos.z; - f32 posW = 1000.0f; - f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 temp_f20 = sin_deg(enemy->varTable[2]); - s32 var; - s32 var2; - - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f20 * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->moveToPos.y = npc->pos.y; - script->functionTemp[0] = 12; - return; - } - } - - script->functionTemp[1]--; - if (npc->turnAroundYawAdjustment == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - if (posW <= (2.0f * npc->moveSpeed)) { - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - script->functionTemp[0] = 2; - } - } -} - -ApiStatus N(func_802422B0_BFFB30)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 125.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - script->functionTemp[0] = 0; - N(UnkFunc5)(npc, enemy, script, aiSettings); - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 12: - N(func_80241618_BFEE98)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - N(func_80241770_BFEFF0)(script, aiSettings, territoryPtr); - break; - case 14: - N(func_80241874_BFF0F4)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 15) { - break; - } - case 15: - N(func_80241954_BFF1D4)(script, aiSettings, territoryPtr); - break; - case 16: - N(func_80241BF0_BFF470)(script, aiSettings, territoryPtr); - case 17: - N(func_80241CA8_BFF528)(script, aiSettings, territoryPtr); - break; - case 18: - N(func_80241E28_BFF6A8)(script, aiSettings, territoryPtr); - break; - case 20: - N(func_80241E70_BFF6F0)(script, aiSettings, territoryPtr); - break; - case 30: - N(func_80241EF0_BFF770)(script, aiSettings, territoryPtr); - case 31: - N(func_80241F98_BFF818)(script, aiSettings, territoryPtr); - } - - return (script->functionTemp[0] == 100) * ApiStatus_DONE2; -} +#define AI_SENTINEL_FIRST_NPC 0 +#define AI_SENTINEL_LAST_NPC 4 +#include "world/common/enemy/SentinelAI.inc.c" extern const char N(dgb_00_name_hack)[]; @@ -826,7 +514,7 @@ EvtScript N(npcAI_80244D54) = { EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) EVT_CALL(SetSelfVar, 1, 600) - EVT_CALL(N(func_802422B0_BFFB30), EVT_PTR(N(npcAISettings_80244D24))) + EVT_CALL(N(SentinelAI_Main), EVT_PTR(N(npcAISettings_80244D24))) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(2) EVT_LABEL(20) @@ -920,18 +608,18 @@ NpcSettings N(npcSettings_8024526C) = { NpcAISettings N(npcAISettings_80245298) = { .moveSpeed = 4.5f, .alertRadius = 170.0f, - .unk_10 = { .f = 90.0f }, - .unk_14 = 1, + .alertOffsetDist = 90.0f, + .playerSearchInterval = 1, .chaseSpeed = 3.9f, - .unk_1C = { .s = 180 }, - .unk_20 = 2, + .chaseTurnRate= 180, + .chaseUpdateInterval = 2, .chaseRadius = 170.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 1, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802452C8) = { - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_80245298))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_80245298))) EVT_RETURN EVT_END }; @@ -1033,7 +721,7 @@ EvtScript N(init_80245784) = { const char N(dgb_00_name_hack)[] = "dgb_00"; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" #include "world/common/UnkFunc1.inc.c" @@ -1118,7 +806,7 @@ EvtScript N(idle_8024598C) = { EVT_END_THREAD EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FIXED(5.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 259, 167, 0) - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_80245298))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_80245298))) EVT_RETURN EVT_END }; @@ -1203,7 +891,7 @@ StaticNpc N(npcGroup_80246090) = { .id = NPC_SENTINEL0, .settings = &N(npcSettings_8024526C), .pos = { -180.0f, 100.0f, 230.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80245D80), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1234,7 +922,7 @@ StaticNpc N(npcGroup_80246280) = { .id = NPC_SENTINEL1, .settings = &N(npcSettings_8024526C), .pos = { 180.0f, 100.0f, 230.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80245E44), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1265,7 +953,7 @@ StaticNpc N(npcGroup_80246470) = { .id = NPC_SENTINEL2, .settings = &N(npcSettings_8024526C), .pos = { -180.0f, 100.0f, -230.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80245F08), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1296,7 +984,7 @@ StaticNpc N(npcGroup_80246660) = { .id = NPC_SENTINEL3, .settings = &N(npcSettings_8024526C), .pos = { 180.0f, 100.0f, -230.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80245FCC), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_dgb/dgb_01/dgb_01.h b/src/world/area_dgb/dgb_01/dgb_01.h index 4e74cd3dd0..2c7bc62b7a 100644 --- a/src/world/area_dgb/dgb_01/dgb_01.h +++ b/src/world/area_dgb/dgb_01/dgb_01.h @@ -22,8 +22,8 @@ ApiStatus N(func_80240000_BFD880)(void); ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall); ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc1)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802422B0_BFFB30)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); +ApiStatus N(SentinelAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); extern EvtScript N(802449C4); extern EvtScript N(80244AD0); diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 3148b3e092..ca36821ea5 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -2,8 +2,6 @@ #include "sprite/npc/world_clubba.h" #include "message_ids.h" -extern Npc* wPartnerNpc; - enum { NPC_WORLD_CLUBBA0 = 10, NPC_WORLD_CLUBBA1, @@ -22,7 +20,7 @@ MapConfig N(config) = { .main = &N(main), .entryList = &N(entryList), .entryCount = ENTRY_COUNT(N(entryList)), - .tattle = 0x1900C2, + .tattle = { 0x1900C2 }, }; EvtScript N(802414B0) = { @@ -196,14 +194,14 @@ NpcAISettings N(npcAISettings_80241B9C) = { .moveTime = 120, .waitTime = 30, .alertRadius = 85.0f, - .unk_10 = { .f = 65.0f }, - .unk_14 = 5, + .alertOffsetDist = 65.0f, + .playerSearchInterval = 5, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 12, + .chaseTurnRate= 90, + .chaseUpdateInterval = 12, .chaseRadius = 110.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 3, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_80241BCC) = { @@ -211,7 +209,7 @@ EvtScript N(npcAI_80241BCC) = { EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) EVT_CALL(SetSelfVar, 3, 12) - EVT_CALL(N(func_8024061C_C2F1BC), EVT_PTR(N(npcAISettings_80241B9C))) + EVT_CALL(N(WanderMeleeAI_Main), EVT_PTR(N(npcAISettings_80241B9C))) EVT_RETURN EVT_END }; @@ -230,14 +228,14 @@ NpcAISettings N(npcAISettings_80241C68) = { .moveTime = 120, .waitTime = 30, .alertRadius = 100.0f, - .unk_10 = { .f = 40.0f }, - .unk_14 = 10, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 10, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 15, + .chaseTurnRate= 90, + .chaseUpdateInterval = 15, .chaseRadius = 200.0f, - .unk_28 = { .f = 160.0f }, - .unk_2C = 1, + .chaseOffsetDist = 160.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80241C98) = { @@ -245,7 +243,7 @@ EvtScript N(npcAI_80241C98) = { EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) EVT_CALL(SetSelfVar, 3, 18) - EVT_CALL(N(func_802410D4_C2FC74), EVT_PTR(N(npcAISettings_80241C68))) + EVT_CALL(N(ClubbaNappingAI_Main), EVT_PTR(N(npcAISettings_80241C68))) EVT_RETURN EVT_END }; @@ -267,7 +265,7 @@ EvtScript N(npcAI_80241D34) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -286,7 +284,7 @@ StaticNpc N(npcGroup_80241E08)[] = { .id = NPC_WORLD_CLUBBA0, .settings = &N(npcSettings_80241C3C), .pos = { -200.0f, 0.0f, 180.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -323,7 +321,7 @@ StaticNpc N(npcGroup_80241E08)[] = { .id = NPC_WORLD_CLUBBA1, .settings = &N(npcSettings_80241DDC), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -355,7 +353,7 @@ StaticNpc N(npcGroup_802421E8)[] = { .id = NPC_WORLD_CLUBBA2, .settings = &N(npcSettings_80241D08), .pos = { 375.0f, 0.0f, 100.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -391,7 +389,7 @@ StaticNpc N(npcGroup_802421E8)[] = { .id = NPC_WORLD_CLUBBA3, .settings = &N(npcSettings_80241DDC), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -424,380 +422,5 @@ NpcGroupList N(npcGroupList_802425C8) = { {}, }; -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -ApiStatus N(func_8024061C_C2F1BC)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -void N(func_802408D0_C2F470)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } - - if (npc->duration == 1) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 1; - } -} - -void N(func_80240958_C2F4F8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - PlayerData* playerData = get_player_data(); - s32 phi_s2 = FALSE; - s32 var; - f32 posX, posZ; - - if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { - if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || - (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || - (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || - (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || - (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { - phi_s2 = TRUE; - } - - if (playerData->currentPartner == PARTNER_KOOPER) { - if (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_KOOPER_2) { - phi_s2 = TRUE; - } - } - } - - if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || - ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { - posX = npc->pos.x; - posZ = npc->pos.z; - add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); - if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { - phi_s2 = TRUE; - } - } - - if (phi_s2) { - ai_enemy_play_sound(npc, 0xB000000E, 0); - npc->currentAnim.w = enemy->animList[11]; - npc->duration = 10; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 2; - } - - npc->duration++; - if (npc->duration == 27) { - ai_enemy_play_sound(npc, 0xB000000C, 0); - } else if (npc->duration == 57) { - ai_enemy_play_sound(npc, 0xB000000D, 0); - } else if (npc->duration == 59) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration == 60) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - } -} - -void N(func_80240C10_C2F7B0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 1; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - } -} - -void N(func_80240C74_C2F814)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = (rand_int(1000) % 2) + 2; - script->functionTemp[0] = 4; -} - -void N(func_80240D1C_C2F8BC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - return; - } - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - return; - } - - var = enemy->varTable[7]; - if (var == 40) { - npc->duration = 20; - script->functionTemp[0] = var; - } else if (var == 50) { - npc->duration = 25; - script->functionTemp[0] = var; - } - } -} - -void N(func_80240E54_C2F9F4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -void N(func_80240F00_C2FAA0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 15; - enemy->varTable[7] = 50; - script->functionTemp[0] = 3; - } else if (npc->turnAroundYawAdjustment == 0) { - var = npc->yaw; - func_8004A784(npc, 5.0f, &var, 0, 0, 0); - npc->yaw = var; - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} - -void N(func_80241078_C2FC18)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 0; - script->functionTemp[0] = 0; - } - } -} - -ApiStatus N(func_802410D4_C2FC74)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 30; - npc->currentAnim.w = enemy->animList[10]; - npc->flags &= ~0x800; - enemy->varTable[0] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 40; - npc->currentAnim.w = enemy->animList[0]; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - N(func_802408D0_C2F470)(script, npcAISettings, territoryPtr); - break; - case 1: - N(func_80240958_C2F4F8)(script, npcAISettings, territoryPtr); - break; - case 2: - N(func_80240C10_C2F7B0)(script, npcAISettings, territoryPtr); - break; - case 3: - N(func_80240C74_C2F814)(script, npcAISettings, territoryPtr); - break; - case 4: - N(func_80240D1C_C2F8BC)(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - npc->duration = 15; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - break; - case 30: - N(UnkNpcAIFunc6)(script); - if (script->functionTemp[0] != 31) { - break; - } - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - break; - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 40: - N(func_80240E54_C2F9F4)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 41) { - break; - } - case 41: - N(func_80240F00_C2FAA0)(script, npcAISettings, territoryPtr); - break; - case 50: - N(func_80241078_C2FC18)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - return 0; -} +#include "world/common/enemy/WanderMeleeAI.inc.c" +#include "world/common/enemy/ClubbaNappingAI.inc.c" diff --git a/src/world/area_dgb/dgb_02/dgb_02.h b/src/world/area_dgb/dgb_02/dgb_02.h index 6bb36cd456..209d7d744f 100644 --- a/src/world/area_dgb/dgb_02/dgb_02.h +++ b/src/world/area_dgb/dgb_02/dgb_02.h @@ -6,9 +6,9 @@ #define NAMESPACE dgb_02 -ApiStatus N(func_8024061C_C2F1BC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802410D4_C2FC74)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt *script, s32 isInitialCall); +ApiStatus N(WanderMeleeAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802425C8); extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 3bf7342951..4915727369 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -2,8 +2,6 @@ #include "sprite/npc/world_clubba.h" #include "message_ids.h" -extern Npc* wPartnerNpc; - enum { NPC_WORLD_CLUBBA0, NPC_WORLD_CLUBBA1, @@ -425,14 +423,14 @@ NpcAISettings N(npcAISettings_80243A5C) = { .moveTime = 120, .waitTime = 30, .alertRadius = 85.0f, - .unk_10 = { .f = 65.0f }, - .unk_14 = 5, + .alertOffsetDist = 65.0f, + .playerSearchInterval = 5, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 12, + .chaseTurnRate= 90, + .chaseUpdateInterval = 12, .chaseRadius = 110.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 3, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_80243A8C) = { @@ -440,7 +438,7 @@ EvtScript N(npcAI_80243A8C) = { EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) EVT_CALL(SetSelfVar, 3, 12) - EVT_CALL(N(func_8024086C_C31D4C), EVT_PTR(N(npcAISettings_80243A5C))) + EVT_CALL(N(WanderMeleeAI_Main), EVT_PTR(N(npcAISettings_80243A5C))) EVT_RETURN EVT_END }; @@ -459,14 +457,14 @@ NpcAISettings N(npcAISettings_80243B28) = { .moveTime = 20, .waitTime = 30, .alertRadius = 85.0f, - .unk_10 = { .f = 65.0f }, - .unk_14 = 5, + .alertOffsetDist = 65.0f, + .playerSearchInterval = 5, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 12, + .chaseTurnRate= 90, + .chaseUpdateInterval = 12, .chaseRadius = 110.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 3, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_80243B58) = { @@ -474,7 +472,7 @@ EvtScript N(npcAI_80243B58) = { EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) EVT_CALL(SetSelfVar, 3, 12) - EVT_CALL(N(func_802419B0_C32E90), EVT_PTR(N(npcAISettings_80243B28))) + EVT_CALL(N(ClubbaPatrolAI_Main), EVT_PTR(N(npcAISettings_80243B28))) EVT_RETURN EVT_END }; @@ -493,14 +491,14 @@ NpcAISettings N(npcAISettings_80243BF4) = { .moveTime = 120, .waitTime = 30, .alertRadius = 100.0f, - .unk_10 = { .f = 40.0f }, - .unk_14 = 10, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 10, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 15, + .chaseTurnRate= 90, + .chaseUpdateInterval = 15, .chaseRadius = 200.0f, - .unk_28 = { .f = 160.0f }, - .unk_2C = 1, + .chaseOffsetDist = 160.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80243C24) = { @@ -508,7 +506,7 @@ EvtScript N(npcAI_80243C24) = { EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) EVT_CALL(SetSelfVar, 3, 18) - EVT_CALL(N(func_80242480_C33960), EVT_PTR(N(npcAISettings_80243BF4))) + EVT_CALL(N(ClubbaNappingAI_Main), EVT_PTR(N(npcAISettings_80243BF4))) EVT_RETURN EVT_END }; @@ -530,7 +528,7 @@ EvtScript N(npcAI_80243CC0) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -558,7 +556,7 @@ StaticNpc N(npcGroup_80243DE8)[] = { .id = NPC_WORLD_CLUBBA0, .settings = &N(npcSettings_80243AFC), .pos = { 180.0f, 0.0f, -122.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -594,7 +592,7 @@ StaticNpc N(npcGroup_80243DE8)[] = { .id = NPC_WORLD_CLUBBA1, .settings = &N(npcSettings_80243D68), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -626,7 +624,7 @@ StaticNpc N(npcGroup_802441C8)[] = { .id = NPC_WORLD_CLUBBA2, .settings = &N(npcSettings_80243BC8), .pos = { -272.0f, 0.0f, -135.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -662,7 +660,7 @@ StaticNpc N(npcGroup_802441C8)[] = { .id = NPC_WORLD_CLUBBA3, .settings = &N(npcSettings_80243D68), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -694,7 +692,7 @@ StaticNpc N(npcGroup_802445A8)[] = { .id = NPC_WORLD_CLUBBA4, .settings = &N(npcSettings_80243C94), .pos = { -326.0f, 210.0f, 80.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80243D94), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -731,7 +729,7 @@ StaticNpc N(npcGroup_802445A8)[] = { .id = NPC_WORLD_CLUBBA5, .settings = &N(npcSettings_80243D68), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -765,471 +763,10 @@ NpcGroupList N(npcGroupList_80244988) = { {}, }; -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" -#include "world/common/UnkNpcAIFunc8.inc.c" +#include "world/common/enemy/ClubbaPatrolAI.inc.c" -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -ApiStatus N(func_8024086C_C31D4C)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -#include "world/common/atomic/enemy/UnkAI_1.inc.c" - -ApiStatus N(func_802419B0_C32E90)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); - case 1: - N(UnkFunc13)(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc14)(script, npcAISettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, npcAISettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); - case 13: - N(UnkFunc15)(script, npcAISettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -void N(func_80241C7C_C3315C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } - - if (npc->duration == 1) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 1; - } -} - -void N(func_80241D04_C331E4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - PlayerData* playerData = get_player_data(); - s32 phi_s2 = FALSE; - s32 var; - f32 posX, posZ; - - if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { - if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || - (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || - (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || - (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || - (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { - phi_s2 = TRUE; - } - - if (playerData->currentPartner == PARTNER_KOOPER) { - if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { - phi_s2 = TRUE; - } - } - } - - if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || - ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { - posX = npc->pos.x; - posZ = npc->pos.z; - add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); - if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { - phi_s2 = TRUE; - } - } - - if (phi_s2) { - ai_enemy_play_sound(npc, 0xB000000E, 0); - npc->currentAnim.w = enemy->animList[11]; - npc->duration = 10; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 2; - } - - npc->duration++; - if (npc->duration == 27) { - ai_enemy_play_sound(npc, 0xB000000C, 0); - } else if (npc->duration == 57) { - ai_enemy_play_sound(npc, 0xB000000D, 0); - } else if (npc->duration == 59) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration == 60) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - } -} - -void N(func_80241FBC_C3349C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 1; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - } -} - -void N(func_80242020_C33500)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = (rand_int(1000) % 2) + 2; - script->functionTemp[0] = 4; -} - -void N(func_802420C8_C335A8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - return; - } - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - return; - } - - var = enemy->varTable[7]; - if (var == 40) { - npc->duration = 20; - script->functionTemp[0] = var; - } else if (var == 50) { - npc->duration = 25; - script->functionTemp[0] = var; - } - } -} - -void N(func_80242200_C336E0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -void N(func_802422AC_C3378C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 15; - enemy->varTable[7] = 50; - script->functionTemp[0] = 3; - } else if (npc->turnAroundYawAdjustment == 0) { - var = npc->yaw; - func_8004A784(npc, 5.0f, &var, 0, 0, 0); - npc->yaw = var; - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} - -void N(func_80242424_C33904)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 0; - script->functionTemp[0] = 0; - } - } -} - -ApiStatus N(func_80242480_C33960)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 30; - npc->currentAnim.w = enemy->animList[10]; - npc->flags &= ~0x800; - enemy->varTable[0] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 40; - npc->currentAnim.w = enemy->animList[0]; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - N(func_80241C7C_C3315C)(script, npcAISettings, territoryPtr); - break; - case 1: - N(func_80241D04_C331E4)(script, npcAISettings, territoryPtr); - break; - case 2: - N(func_80241FBC_C3349C)(script, npcAISettings, territoryPtr); - break; - case 3: - N(func_80242020_C33500)(script, npcAISettings, territoryPtr); - break; - case 4: - N(func_802420C8_C335A8)(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - npc->duration = 15; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - break; - case 30: - N(UnkNpcAIFunc6)(script); - if (script->functionTemp[0] != 31) { - break; - } - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - break; - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 40: - N(func_80242200_C336E0)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 41) { - break; - } - case 41: - N(func_802422AC_C3378C)(script, npcAISettings, territoryPtr); - break; - case 50: - N(func_80242424_C33904)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/ClubbaNappingAI.inc.c" diff --git a/src/world/area_dgb/dgb_03/dgb_03.h b/src/world/area_dgb/dgb_03/dgb_03.h index d0ee36ff04..c8e7633918 100644 --- a/src/world/area_dgb/dgb_03/dgb_03.h +++ b/src/world/area_dgb/dgb_03/dgb_03.h @@ -8,10 +8,10 @@ ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc12)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024086C_C31D4C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802419B0_C32E90)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242480_C33960)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(WanderMeleeAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(ClubbaPatrolAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 637ce5f08e..37cb3d369b 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -110,14 +110,14 @@ static s32 N(pad_3558)[] = { 0x00000000, 0x00000000, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; EvtScript N(80243578) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING)), TRUE) EVT_RETURN EVT_END }; @@ -127,12 +127,12 @@ NpcAISettings N(npcAISettings_802435B4) = { .moveTime = 90, .waitTime = 30, .alertRadius = 240.0f, - .unk_14 = 1, + .playerSearchInterval = 1, .chaseSpeed = 5.3f, - .unk_1C = { .s = 180 }, - .unk_20 = 1, + .chaseTurnRate= 180, + .chaseUpdateInterval = 1, .chaseRadius = 240.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; extern const char N(dgb_00_name_hack)[]; @@ -142,7 +142,7 @@ EvtScript N(npcAI_802435E4) = { EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) EVT_CALL(SetSelfVar, 1, 600) - EVT_CALL(N(func_80242154_C38684), EVT_PTR(N(npcAISettings_802435B4))) + EVT_CALL(N(SentinelAI_Main), EVT_PTR(N(npcAISettings_802435B4))) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(2) EVT_LABEL(20) @@ -237,7 +237,7 @@ StaticNpc N(npcGroup_80243B28) = { .id = NPC_SENTINEL, .settings = &N(npcSettings_80243AFC), .pos = { 70.0f, -220.0f, 186.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -280,312 +280,9 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -void N(func_802414F8_C37A28)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f0; - f32 phi_f20; - - npc->duration--; - if (npc->duration <= 0) { - npc->flags &= ~0x00200000; - npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); - npc->currentAnim.w = enemy->animList[8]; - npc->moveSpeed = aiSettings->chaseSpeed; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0)) { - phi_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - script->functionTemp[0] = 13; - } -} - -void N(func_80241650_C37B80)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { - npc->duration = 0; - script->functionTemp[0] = 14; - } else { - npc->duration--; - if (npc->duration <= 0) { - npc->flags |= 0x200000; - script->functionTemp[0] = 12; - } - } - } else { - script->functionTemp[0] = 16; - } - -} - -void N(func_80241754_C37C84)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - do { enemy->varTable[0] |= 0x100; npc->pos.x = gPlayerStatusPtr->position.x; } while (0); - npc->pos.z = gPlayerStatusPtr->position.z; - if (!(enemy->varTable[0] & 0x1000)) { - enemy->varTable[0] |= 0x1000; - } - sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - npc->duration = 0; - script->functionTemp[0] = 15; -} - -void N(func_802417F8_C37D28)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - s32 temp_f8_2; - - sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - enemy->varTable[0] &= ~0x100; - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - script->functionTemp[0] = 16; - } else { - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z + 2.0f; - npc->rotation.y += 25.0f; - if (npc->rotation.y > 360.0) { - npc->rotation.y -= 360.0; - } - temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); - func_802DE894(npc->spriteInstanceID, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); - - posX = gPlayerStatusPtr->position.x; - posY = gPlayerStatusPtr->position.y; - posZ = gPlayerStatusPtr->position.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (fabsf(npc->pos.y - posY) > 24.0) { - npc->pos.y -= 1.8; - } else { - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actingPartner != 9) { - disable_player_input(); - partner_disable_input(); - npc->duration = 0; - script->functionTemp[0] = 20; - } else { - script->functionTemp[0] = 16; - } - } - } -} - -void N(func_80241A94_C37FC4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - if (enemy->varTable[0] & 0x1000) { - sfx_stop_sound(0x80000011); - enemy->varTable[0] &= ~0x1000; - } - npc->currentAnim.w = enemy->animList[9]; - npc->duration = 20; - script->functionTemp[0] = 17; -} - -void N(func_80241B4C_C3807C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 tmp = enemy->varTable[3]; - f32 temp_f20 = tmp / 100.0; - s32 var; - - npc->pos.y += 2.5; - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (!(npc->pos.y < (posY + temp_f20))) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc->pos.y = posY + temp_f20; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); - npc->duration = 10; - script->functionTemp[0] = 18; - } -} - -void N(func_80241CCC_C381FC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 30; - } -} - -void N(func_80241D14_C38244)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration++; - if (npc->duration >= 3) { - if (gPartnerActionStatus.actingPartner != 9) { - npc->duration = 0; - script->functionTemp[0] = 100; - } else { - enable_player_input(); - partner_enable_input(); - script->functionTemp[0] = 16; - } - } -} - -void N(func_80241D94_C382C4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - npc->flags &= ~0x00200000; - npc->moveSpeed = 2.0 * aiSettings->moveSpeed; - enemy->varTable[2] = 0; - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[1] = 0x1E; -} - -void N(func_80241E3C_C3836C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX = npc->pos.x; - f32 posY = npc->pos.y; - f32 posZ = npc->pos.z; - f32 posW = 1000.0f; - f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 temp_f20 = sin_deg(enemy->varTable[2]); - s32 var; - s32 var2; - - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f20 * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->moveToPos.y = npc->pos.y; - script->functionTemp[0] = 12; - return; - } - } - - script->functionTemp[1]--; - if (npc->turnAroundYawAdjustment == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - if (posW <= (2.0f * npc->moveSpeed)) { - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - script->functionTemp[0] = 2; - } - } -} - -ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 125.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - script->functionTemp[0] = 0; - N(UnkFunc5)(npc, enemy, script, aiSettings); - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 12: - N(func_802414F8_C37A28)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - N(func_80241650_C37B80)(script, aiSettings, territoryPtr); - break; - case 14: - N(func_80241754_C37C84)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 15) { - break; - } - case 15: - N(func_802417F8_C37D28)(script, aiSettings, territoryPtr); - break; - case 16: - N(func_80241A94_C37FC4)(script, aiSettings, territoryPtr); - case 17: - N(func_80241B4C_C3807C)(script, aiSettings, territoryPtr); - break; - case 18: - N(func_80241CCC_C381FC)(script, aiSettings, territoryPtr); - break; - case 20: - N(func_80241D14_C38244)(script, aiSettings, territoryPtr); - break; - case 30: - N(func_80241D94_C382C4)(script, aiSettings, territoryPtr); - case 31: - N(func_80241E3C_C3836C)(script, aiSettings, territoryPtr); - } - - return (script->functionTemp[0] == 100) * ApiStatus_DONE2; -} +#define AI_SENTINEL_FIRST_NPC 0 +#define AI_SENTINEL_LAST_NPC 0 +#include "world/common/enemy/SentinelAI.inc.c" #include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_dgb/dgb_04/dgb_04.h b/src/world/area_dgb/dgb_04/dgb_04.h index d517284364..16e8203d88 100644 --- a/src/world/area_dgb/dgb_04/dgb_04.h +++ b/src/world/area_dgb/dgb_04/dgb_04.h @@ -6,7 +6,7 @@ #define NAMESPACE dgb_04 -ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall); +ApiStatus N(SentinelAI_Main)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80243D18); extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 5716432411..ad874df5ef 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -2,8 +2,6 @@ #include "sprite/npc/world_clubba.h" #include "message_ids.h" -extern Npc* wPartnerNpc; - enum { NPC_WORLD_CLUBBA0, NPC_WORLD_CLUBBA1, @@ -151,14 +149,14 @@ NpcAISettings N(npcAISettings_802419AC) = { .moveTime = 120, .waitTime = 30, .alertRadius = 100.0f, - .unk_10 = { .f = 40.0f }, - .unk_14 = 10, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 10, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 15, + .chaseTurnRate= 90, + .chaseUpdateInterval = 15, .chaseRadius = 200.0f, - .unk_28 = { .f = 160.0f }, - .unk_2C = 1, + .chaseOffsetDist = 160.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802419DC) = { @@ -166,7 +164,7 @@ EvtScript N(npcAI_802419DC) = { EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) EVT_CALL(SetSelfVar, 3, 18) - EVT_CALL(N(func_80240E80_C3B890), EVT_PTR(N(npcAISettings_802419AC))) + EVT_CALL(N(ClubbaNappingAI_Main), EVT_PTR(N(npcAISettings_802419AC))) EVT_RETURN EVT_END }; @@ -188,7 +186,7 @@ EvtScript N(npcAI_80241A78) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -243,7 +241,7 @@ StaticNpc N(npcGroup_80241B4C)[] = { .id = NPC_WORLD_CLUBBA1, .settings = &N(npcSettings_80241B20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -311,7 +309,7 @@ StaticNpc N(npcGroup_80241F2C)[] = { .id = NPC_WORLD_CLUBBA3, .settings = &N(npcSettings_80241B20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -358,381 +356,5 @@ ApiStatus N(func_80240030_C3AA40)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -void N(func_8024067C_C3B08C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } - - if (npc->duration == 1) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 1; - } -} - -void N(func_80240704_C3B114)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - PlayerData* playerData = get_player_data(); - s32 phi_s2 = FALSE; - s32 var; - f32 posX, posZ; - - if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { - if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || - (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || - (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || - (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || - (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { - phi_s2 = TRUE; - } - - if (playerData->currentPartner == PARTNER_KOOPER) { - if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { - phi_s2 = TRUE; - } - } - } - - if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || - ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { - posX = npc->pos.x; - posZ = npc->pos.z; - add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); - if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { - phi_s2 = TRUE; - } - } - - if (phi_s2) { - ai_enemy_play_sound(npc, 0xB000000E, 0); - npc->currentAnim.w = enemy->animList[11]; - npc->duration = 10; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 2; - } - - npc->duration++; - if (npc->duration == 27) { - ai_enemy_play_sound(npc, 0xB000000C, 0); - } else if (npc->duration == 57) { - ai_enemy_play_sound(npc, 0xB000000D, 0); - } else if (npc->duration == 59) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration == 60) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - } -} - -void N(func_802409BC_C3B3CC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 1; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - } -} - -void N(func_80240A20_C3B430)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = (rand_int(1000) % 2) + 2; - script->functionTemp[0] = 4; -} - -void N(func_80240AC8_C3B4D8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - return; - } - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - return; - } - - var = enemy->varTable[7]; - if (var == 40) { - npc->duration = 20; - script->functionTemp[0] = var; - } else if (var == 50) { - npc->duration = 25; - script->functionTemp[0] = var; - } - } -} - -void N(func_80240C00_C3B610)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -void N(func_80240CAC_C3B6BC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 15; - enemy->varTable[7] = 50; - script->functionTemp[0] = 3; - } else if (npc->turnAroundYawAdjustment == 0) { - var = npc->yaw; - func_8004A784(npc, 5.0f, &var, 0, 0, 0); - npc->yaw = var; - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} - -void N(func_80240E24_C3B834)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 0; - script->functionTemp[0] = 0; - } - } -} - -ApiStatus N(func_80240E80_C3B890)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 30; - npc->currentAnim.w = enemy->animList[10]; - npc->flags &= ~0x800; - enemy->varTable[0] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 40; - npc->currentAnim.w = enemy->animList[0]; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - N(func_8024067C_C3B08C)(script, npcAISettings, territoryPtr); - break; - case 1: - N(func_80240704_C3B114)(script, npcAISettings, territoryPtr); - break; - case 2: - N(func_802409BC_C3B3CC)(script, npcAISettings, territoryPtr); - break; - case 3: - N(func_80240A20_C3B430)(script, npcAISettings, territoryPtr); - break; - case 4: - N(func_80240AC8_C3B4D8)(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - npc->duration = 0xF; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - break; - case 30: - N(UnkNpcAIFunc6)(script); - if (script->functionTemp[0] != 31) { - break; - } - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - break; - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 40: - N(func_80240C00_C3B610)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 41) { - break; - } - case 41: - N(func_80240CAC_C3B6BC)(script, npcAISettings, territoryPtr); - break; - case 50: - N(func_80240E24_C3B834)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_802411D0_C3BBE0)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/ClubbaNappingAI.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" diff --git a/src/world/area_dgb/dgb_05/dgb_05.h b/src/world/area_dgb/dgb_05/dgb_05.h index 543f2c3c96..1f17ea42b5 100644 --- a/src/world/area_dgb/dgb_05/dgb_05.h +++ b/src/world/area_dgb/dgb_05/dgb_05.h @@ -8,8 +8,8 @@ ApiStatus N(func_80240000_C3AA10)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240030_C3AA40)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80240E80_C3B890)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024230C); extern EvtScript N(802417F0); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 1d18a4d053..0e1c0d4d23 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -2,8 +2,6 @@ #include "message_ids.h" #include "sprite/npc/world_clubba.h" -extern Npc* wPartnerNpc; - enum { NPC_WORLD_CLUBBA0, NPC_WORLD_CLUBBA1, @@ -136,14 +134,14 @@ NpcAISettings N(npcAISettings_802418DC) = { .moveTime = 120, .waitTime = 30, .alertRadius = 100.0f, - .unk_10 = { .f = 40.0f }, - .unk_14 = 10, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 10, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 15, + .chaseTurnRate= 90, + .chaseUpdateInterval = 15, .chaseRadius = 200.0f, - .unk_28 = { .f = 160.0f }, - .unk_2C = 1, + .chaseOffsetDist = 160.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_8024190C) = { @@ -151,7 +149,7 @@ EvtScript N(npcAI_8024190C) = { EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) EVT_CALL(SetSelfVar, 3, 18) - EVT_CALL(N(func_80240E20_C3EA10), EVT_PTR(N(npcAISettings_802418DC))) + EVT_CALL(N(ClubbaNappingAI_Main), EVT_PTR(N(npcAISettings_802418DC))) EVT_RETURN EVT_END }; @@ -173,7 +171,7 @@ EvtScript N(npcAI_802419A8) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -192,7 +190,7 @@ StaticNpc N(npcGroup_80241A7C)[] = { .id = NPC_WORLD_CLUBBA0, .settings = &N(npcSettings_8024197C), .pos = { -500.0f, 0.0f, -240.0f }, - .flags = NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -229,7 +227,7 @@ StaticNpc N(npcGroup_80241A7C)[] = { .id = NPC_WORLD_CLUBBA1, .settings = &N(npcSettings_80241A50), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -265,381 +263,6 @@ static const s32 N(pad_1E74)[] = { 0x00000000, 0x00000000 }; -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/ClubbaNappingAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -void N(func_8024061C_C3E20C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } - - if (npc->duration == 1) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 1; - } -} - -void N(func_802406A4_C3E294)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - PlayerData* playerData = get_player_data(); - s32 phi_s2 = FALSE; - s32 var; - f32 posX, posZ; - - if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { - if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || - (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || - (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || - (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || - (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { - phi_s2 = TRUE; - } - - if (playerData->currentPartner == PARTNER_KOOPER) { - if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { - phi_s2 = TRUE; - } - } - } - - if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || - ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { - posX = npc->pos.x; - posZ = npc->pos.z; - add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); - if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { - phi_s2 = TRUE; - } - } - - if (phi_s2) { - ai_enemy_play_sound(npc, 0xB000000E, 0); - npc->currentAnim.w = enemy->animList[11]; - npc->duration = 10; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 2; - } - - npc->duration++; - if (npc->duration == 27) { - ai_enemy_play_sound(npc, 0xB000000C, 0); - } else if (npc->duration == 57) { - ai_enemy_play_sound(npc, 0xB000000D, 0); - } else if (npc->duration == 59) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration == 60) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - } -} - -void N(func_8024095C_C3E54C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 1; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - } -} - -void N(func_802409C0_C3E5B0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = (rand_int(1000) % 2) + 2; - script->functionTemp[0] = 4; -} - -void N(func_80240A68_C3E658)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - return; - } - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - return; - } - - var = enemy->varTable[7]; - if (var == 40) { - npc->duration = 20; - script->functionTemp[0] = var; - } else if (var == 50) { - npc->duration = 25; - script->functionTemp[0] = var; - } - } -} - -void N(func_80240BA0_C3E790)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -void N(func_80240C4C_C3E83C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 15; - enemy->varTable[7] = 50; - script->functionTemp[0] = 3; - } else if (npc->turnAroundYawAdjustment == 0) { - var = npc->yaw; - func_8004A784(npc, 5.0f, &var, 0, 0, 0); - npc->yaw = var; - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} - -void N(func_80240DC4_C3E9B4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 0; - script->functionTemp[0] = 0; - } - } -} - -ApiStatus N(func_80240E20_C3EA10)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 30; - npc->currentAnim.w = enemy->animList[10]; - npc->flags &= ~0x800; - enemy->varTable[0] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 40; - npc->currentAnim.w = enemy->animList[0]; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - N(func_8024061C_C3E20C)(script, npcAISettings, territoryPtr); - break; - case 1: - N(func_802406A4_C3E294)(script, npcAISettings, territoryPtr); - break; - case 2: - N(func_8024095C_C3E54C)(script, npcAISettings, territoryPtr); - break; - case 3: - N(func_802409C0_C3E5B0)(script, npcAISettings, territoryPtr); - break; - case 4: - N(func_80240A68_C3E658)(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - npc->duration = 15; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - break; - case 30: - N(UnkNpcAIFunc6)(script); - if (script->functionTemp[0] != 31) { - break; - } - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - break; - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 40: - N(func_80240BA0_C3E790)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 41) { - break; - } - case 41: - N(func_80240C4C_C3E83C)(script, npcAISettings, territoryPtr); - break; - case 50: - N(func_80240DC4_C3E9B4)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_80241170_C3ED60)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/WanderMeleeAI.inc.c" diff --git a/src/world/area_dgb/dgb_07/dgb_07.h b/src/world/area_dgb/dgb_07/dgb_07.h index b1f0c9c25d..52e5d04394 100644 --- a/src/world/area_dgb/dgb_07/dgb_07.h +++ b/src/world/area_dgb/dgb_07/dgb_07.h @@ -6,8 +6,8 @@ #define NAMESPACE dgb_07 -ApiStatus N(func_80240E20_C3EA10)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt *script, s32 isInitialCall); +ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt *script, s32 isInitialCall); NpcGroupList N(npcGroupList_80241E5C); extern EvtScript N(main); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 232d1cd7e4..9eeaa40917 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -132,18 +132,18 @@ static s32 N(pad_40FC) = { NpcAISettings N(npcAI_80244100) = { .moveSpeed = 4.5f, .alertRadius = 170.0f, - .unk_10 = { .f = 90.0f }, - .unk_14 = 1, + .alertOffsetDist = 90.0f, + .playerSearchInterval = 1, .chaseSpeed = 3.9f, - .unk_1C = { .s = 180 }, - .unk_20 = 2, + .chaseTurnRate= 180, + .chaseUpdateInterval = 2, .chaseRadius = 170.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 1, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 1, }; EvtScript N(80244130) = { - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAI_80244100))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAI_80244100))) EVT_RETURN EVT_END }; @@ -210,14 +210,14 @@ NpcAISettings N(npcAISettings_802442C0) = { .moveTime = 120, .waitTime = 30, .alertRadius = 85.0f, - .unk_10 = { .f = 65.0f }, - .unk_14 = 5, + .alertOffsetDist = 65.0f, + .playerSearchInterval = 5, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 12, + .chaseTurnRate= 90, + .chaseUpdateInterval = 12, .chaseRadius = 110.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 3, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_802442F0) = { @@ -225,7 +225,7 @@ EvtScript N(npcAI_802442F0) = { EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) EVT_CALL(SetSelfVar, 3, 12) - EVT_CALL(N(func_802414AC_C4125C), EVT_PTR(N(npcAISettings_802442C0))) + EVT_CALL(N(WanderMeleeAI_Main), EVT_PTR(N(npcAISettings_802442C0))) EVT_RETURN EVT_END }; @@ -247,7 +247,7 @@ EvtScript N(npcAI_8024438C) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -261,14 +261,14 @@ NpcSettings N(npcSettings_80244434) = { .unk_2A = 8, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; EvtScript N(80244478) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING)), TRUE) EVT_RETURN EVT_END }; @@ -278,12 +278,12 @@ NpcAISettings N(npcAISettings_802444B4) = { .moveTime = 90, .waitTime = 30, .alertRadius = 240.0f, - .unk_14 = 1, + .playerSearchInterval = 1, .chaseSpeed = 5.3f, - .unk_1C = { .s = 180 }, - .unk_20 = 1, + .chaseTurnRate= 180, + .chaseUpdateInterval = 1, .chaseRadius = 240.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; extern const char N(dgb_00_name_hack)[]; @@ -293,7 +293,7 @@ EvtScript N(npcAI_802444E4) = { EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) EVT_CALL(SetSelfVar, 1, 600) - EVT_CALL(N(func_802438F0_C436A0), EVT_PTR(N(npcAISettings_802444B4))) + EVT_CALL(N(SentinelAI_Main), EVT_PTR(N(npcAISettings_802444B4))) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(2) EVT_LABEL(20) @@ -460,7 +460,7 @@ EvtScript N(npcAI_80244D7C) = { EVT_WAIT_FRAMES(8) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAI_80244100))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAI_80244100))) EVT_RETURN EVT_END }; @@ -590,7 +590,7 @@ StaticNpc N(npcGroup_80245290)[] = { .id = NPC_WORLD_CLUBBA1, .settings = &N(npcSettings_80244434), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -659,7 +659,7 @@ StaticNpc N(npcGroup_80245670)[] = { .id = NPC_WORLD_CLUBBA3, .settings = &N(npcSettings_80244434), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -728,7 +728,7 @@ StaticNpc N(npcGroup_80245A50)[] = { .id = NPC_WORLD_CLUBBA5, .settings = &N(npcSettings_80244434), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -879,7 +879,7 @@ StaticNpc N(npcGroup_80246528) = { .id = NPC_WORLD_CLUBBA6, .settings = &N(npcSettings_80244A28), .pos = { 426.0f, 0.0f, 38.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000 | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_400000, .init = &N(init_802464C4), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -988,421 +988,13 @@ EvtScript N(802469E0) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -void N(func_80242C58_C42A08)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f0; - f32 phi_f20; - - npc->duration--; - if (npc->duration <= 0) { - npc->flags &= ~0x00200000; - npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); - npc->currentAnim.w = enemy->animList[8]; - npc->moveSpeed = aiSettings->chaseSpeed; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0)) { - phi_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - script->functionTemp[0] = 13; - } -} - -void N(func_80242DB0_C42B60)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { - npc->duration = 0; - script->functionTemp[0] = 14; - } else { - npc->duration--; - if (npc->duration <= 0) { - npc->flags |= 0x200000; - script->functionTemp[0] = 12; - } - } - } else { - script->functionTemp[0] = 16; - } - -} - -void N(func_80242EB4_C42C64)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; - - for (i = 7; i < 9; i++) { - if ((i != npc->npcID) && (get_enemy(i)->varTable[0] & 0x100)) { - return; - } - } - - enemy->varTable[0] |= 0x100; - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z; - if (!(enemy->varTable[0] & 0x1000)) { - enemy->varTable[0] |= 0x1000; - } - sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - npc->duration = 0; - script->functionTemp[0] = 15; -} - -void N(func_80242F94_C42D44)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - s32 temp_f8_2; - - sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - enemy->varTable[0] &= ~0x100; - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - script->functionTemp[0] = 16; - } else { - PlayerStatus** playerStatus = &gPlayerStatusPtr; - - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z + 2.0f; - npc->rotation.y += 25.0f; - if (npc->rotation.y > 360.0) { - npc->rotation.y -= 360.0; - } - temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); - func_802DE894(npc->spriteInstanceID, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); - - posX = gPlayerStatusPtr->position.x; - posY = gPlayerStatusPtr->position.y; - posZ = gPlayerStatusPtr->position.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (fabsf(npc->pos.y - posY) > 24.0) { - npc->pos.y -= 1.8; - } else { - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actingPartner != 9) { - disable_player_input(); - partner_disable_input(); - npc->duration = 0; - script->functionTemp[0] = 20; - } else { - script->functionTemp[0] = 16; - } - } - } -} - -void N(func_80243230_C42FE0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - if (enemy->varTable[0] & 0x1000) { - sfx_stop_sound(0x80000011); - enemy->varTable[0] &= ~0x1000; - } - npc->currentAnim.w = enemy->animList[9]; - npc->duration = 20; - script->functionTemp[0] = 17; -} - -void N(func_802432E8_C43098)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 tmp = enemy->varTable[3]; - f32 temp_f20 = tmp / 100.0; - s32 var; - - npc->pos.y += 2.5; - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (!(npc->pos.y < (posY + temp_f20))) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc->pos.y = posY + temp_f20; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); - npc->duration = 10; - script->functionTemp[0] = 18; - } -} - -void N(filemenu_update_show_options_right_C43218)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 30; - } -} - -void N(func_802434B0_C43260)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration++; - if (npc->duration >= 3) { - if (gPartnerActionStatus.actingPartner != 9) { - npc->duration = 0; - script->functionTemp[0] = 100; - } else { - enable_player_input(); - partner_enable_input(); - script->functionTemp[0] = 16; - } - } -} - -void N(func_80243530_C432E0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - npc->flags &= ~0x00200000; - npc->moveSpeed = 2.0 * aiSettings->moveSpeed; - enemy->varTable[2] = 0; - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[1] = 0x1E; -} - -void N(func_802435D8_C43388)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX = npc->pos.x; - f32 posY = npc->pos.y; - f32 posZ = npc->pos.z; - f32 posW = 1000.0f; - f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 temp_f20 = sin_deg(enemy->varTable[2]); - s32 var; - s32 var2; - - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f20 * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->moveToPos.y = npc->pos.y; - script->functionTemp[0] = 12; - return; - } - } - - script->functionTemp[1]--; - if (npc->turnAroundYawAdjustment == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - if (posW <= (2.0f * npc->moveSpeed)) { - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - script->functionTemp[0] = 2; - } - } -} - -ApiStatus N(func_802438F0_C436A0)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 125.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - script->functionTemp[0] = 0; - N(UnkFunc5)(npc, enemy, script, npcAISettings); - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr); - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - case 1: - N(UnkNpcAIFunc35)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 2: - N(UnkNpcAIFunc1_copy)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc4)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 12: - N(func_80242C58_C42A08)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - N(func_80242DB0_C42B60)(script, npcAISettings, territoryPtr); - break; - case 14: - N(func_80242EB4_C42C64)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 15) { - break; - } - case 15: - N(func_80242F94_C42D44)(script, npcAISettings, territoryPtr); - break; - case 16: - N(func_80243230_C42FE0)(script, npcAISettings, territoryPtr); - case 17: - N(func_802432E8_C43098)(script, npcAISettings, territoryPtr); - break; - case 18: - N(filemenu_update_show_options_right_C43218)(script, npcAISettings, territoryPtr); - break; - case 20: - N(func_802434B0_C43260)(script, npcAISettings, territoryPtr); - break; - case 30: - N(func_80243530_C432E0)(script, npcAISettings, territoryPtr); - case 31: - N(func_802435D8_C43388)(script, npcAISettings, territoryPtr); - } - - return (script->functionTemp[0] == 100) * ApiStatus_DONE2; -} +#define AI_SENTINEL_FIRST_NPC 7 +#define AI_SENTINEL_LAST_NPC 9 +#include "world/common/enemy/SentinelAI.inc.c" #include "world/common/UnkFunc1.inc.c" @@ -1410,12 +1002,12 @@ ApiStatus N(func_80243B98_C43948)(Evt* script, s32 isInitialCall) { if (get_enemy_safe(9) != 0) { Enemy* enemy = get_enemy(9); enemy->territory->wander.point.x = 2; - enemy->territory->wander.point.y = -0x1C2; + enemy->territory->wander.point.y = -450; enemy->territory->wander.point.z = 0; - enemy->territory->wander.wanderSizeX = 0xAF; - enemy->territory->wander.wanderSizeZ = 0x12C; + enemy->territory->wander.wanderSizeX = 175; + enemy->territory->wander.wanderSizeZ = 300; enemy->territory->wander.moveSpeedOverride = 0; - enemy->territory->wander.wanderShape = 0xAF; + enemy->territory->wander.wanderShape = 175; return ApiStatus_DONE2; } @@ -1425,7 +1017,7 @@ ApiStatus N(func_80243B98_C43948)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80243C10_C439C0)(Evt* script, s32 isInitialCall) { if (get_enemy_safe(9)) { Enemy* enemy = get_enemy(9); - enemy->unk_B0 |= 0x80; + enemy->aiFlags |= 0x80; return ApiStatus_DONE2; } @@ -1433,7 +1025,7 @@ ApiStatus N(func_80243C10_C439C0)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80243C50_C43A00)(Evt* script, s32 isInitialCall) { - ai_enemy_play_sound(get_npc_unsafe(script->owner1.enemy->npcID), 0x32F, 0); + ai_enemy_play_sound(get_npc_unsafe(script->owner1.enemy->npcID), SOUND_32F, 0); return ApiStatus_DONE2; } diff --git a/src/world/area_dgb/dgb_08/dgb_08.h b/src/world/area_dgb/dgb_08/dgb_08.h index d1302f66c6..c1b07340d8 100644 --- a/src/world/area_dgb/dgb_08/dgb_08.h +++ b/src/world/area_dgb/dgb_08/dgb_08.h @@ -7,10 +7,10 @@ #define NAMESPACE dgb_08 ApiStatus N(UnkFunc1)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802438F0_C436A0)(Evt* script, s32 isInitialCall); +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(WanderMeleeAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(SentinelAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243B98_C43948)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243C10_C439C0)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243C50_C43A00)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 14bce9e973..6a8db09a73 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -228,14 +228,14 @@ NpcAISettings N(npcAISettings_802440EC) = { .moveTime = 120, .waitTime = 30, .alertRadius = 85.0f, - .unk_10 = { .f = 65.0f }, - .unk_14 = 5, + .alertOffsetDist = 65.0f, + .playerSearchInterval = 5, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 12, + .chaseTurnRate= 90, + .chaseUpdateInterval = 12, .chaseRadius = 110.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 3, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_8024411C) = { @@ -243,7 +243,7 @@ EvtScript N(npcAI_8024411C) = { EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) EVT_CALL(SetSelfVar, 3, 12) - EVT_CALL(N(func_8024061C_C471FC), EVT_PTR(N(npcAISettings_802440EC))) + EVT_CALL(N(WanderMeleeAI_Main), EVT_PTR(N(npcAISettings_802440EC))) EVT_RETURN EVT_END }; @@ -262,14 +262,14 @@ NpcAISettings N(npcAISettings_802441B8) = { .moveTime = 120, .waitTime = 30, .alertRadius = 100.0f, - .unk_10 = { .f = 40.0f }, - .unk_14 = 10, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 10, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 15, + .chaseTurnRate= 90, + .chaseUpdateInterval = 15, .chaseRadius = 200.0f, - .unk_28 = { .f = 160.0f }, - .unk_2C = 1, + .chaseOffsetDist = 160.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802441E8) = { @@ -277,7 +277,7 @@ EvtScript N(npcAI_802441E8) = { EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) EVT_CALL(SetSelfVar, 3, 18) - EVT_CALL(N(func_802410D4_C47CB4), EVT_PTR(N(npcAISettings_802441B8))) + EVT_CALL(N(ClubbaNappingAI_Main), EVT_PTR(N(npcAISettings_802441B8))) EVT_RETURN EVT_END }; @@ -299,7 +299,7 @@ EvtScript N(npcAI_80244284) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -313,14 +313,14 @@ NpcSettings N(npcSettings_8024432C) = { .unk_2A = 8, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; EvtScript N(80244370) = { EVT_CALL(SetSelfEnemyFlagBits, ((NPC_FLAG_MOTION_BLUR | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000)), TRUE) - EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT)), TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING)), TRUE) EVT_RETURN EVT_END }; @@ -330,12 +330,12 @@ NpcAISettings N(npcAISettings_802443AC) = { .moveTime = 90, .waitTime = 30, .alertRadius = 240.0f, - .unk_14 = 1, + .playerSearchInterval = 1, .chaseSpeed = 5.3f, - .unk_1C = { .s = 180 }, - .unk_20 = 1, + .chaseTurnRate= 180, + .chaseUpdateInterval = 1, .chaseRadius = 240.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; extern const char N(dgb_00_name_hack)[]; @@ -345,7 +345,7 @@ EvtScript N(npcAI_802443DC) = { EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) EVT_CALL(SetSelfVar, 1, 600) - EVT_CALL(N(func_80243578_C4A158), EVT_PTR(N(npcAISettings_802443AC))) + EVT_CALL(N(SentinelAI_Main), EVT_PTR(N(npcAISettings_802443AC))) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT_FRAMES(2) EVT_LABEL(20) @@ -441,7 +441,7 @@ StaticNpc N(npcGroup_80244920)[] = { .id = NPC_WORLD_CLUBBA0, .settings = &N(npcSettings_8024418C), .pos = { -350.0f, 0.0f, 180.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -478,7 +478,7 @@ StaticNpc N(npcGroup_80244920)[] = { .id = NPC_WORLD_CLUBBA1, .settings = &N(npcSettings_8024432C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -520,7 +520,7 @@ StaticNpc N(npcGroup_80244D6C)[] = { .id = NPC_WORLD_CLUBBA2, .settings = &N(npcSettings_80244258), .pos = { 310.0f, 0.0f, 88.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80244D00), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -558,7 +558,7 @@ StaticNpc N(npcGroup_80244D6C)[] = { .id = NPC_WORLD_CLUBBA3, .settings = &N(npcSettings_8024432C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -622,692 +622,12 @@ NpcGroupList N(npcGroupList_8024533C) = { {}, }; -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" +#include "world/common/enemy/ClubbaNappingAI.inc.c" -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -ApiStatus N(func_8024061C_C471FC)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -void N(func_802408D0_C474B0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } - - if (npc->duration == 1) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 1; - } -} - -void N(func_80240958_C47538)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - PlayerData* playerData = get_player_data(); - s32 phi_s2 = FALSE; - s32 var; - f32 posX, posZ; - - if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { - if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || - (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || - (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || - (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || - (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { - phi_s2 = TRUE; - } - - if (playerData->currentPartner == PARTNER_KOOPER) { - if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { - phi_s2 = TRUE; - } - } - } - - if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || - ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { - posX = npc->pos.x; - posZ = npc->pos.z; - add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); - if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { - phi_s2 = TRUE; - } - } - - if (phi_s2) { - ai_enemy_play_sound(npc, 0xB000000E, 0); - npc->currentAnim.w = enemy->animList[11]; - npc->duration = 10; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 2; - } - - npc->duration++; - if (npc->duration == 27) { - ai_enemy_play_sound(npc, 0xB000000C, 0); - } else if (npc->duration == 57) { - ai_enemy_play_sound(npc, 0xB000000D, 0); - } else if (npc->duration == 59) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration == 60) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - } -} - -void N(func_80240C10_C477F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 1; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - } -} - -void N(func_80240C74_C47854)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = (rand_int(1000) % 2) + 2; - script->functionTemp[0] = 4; -} - -void N(func_80240D1C_C478FC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - return; - } - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - return; - } - - var = enemy->varTable[7]; - if (var == 40) { - npc->duration = 20; - script->functionTemp[0] = var; - } else if (var == 50) { - npc->duration = 25; - script->functionTemp[0] = var; - } - } -} - -void N(func_80240E54_C47A34)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -void N(func_80240F00_C47AE0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 15; - enemy->varTable[7] = 50; - script->functionTemp[0] = 3; - } else if (npc->turnAroundYawAdjustment == 0) { - var = npc->yaw; - func_8004A784(npc, 5.0f, &var, 0, 0, 0); - npc->yaw = var; - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} - -void N(func_80241078_C47C58)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 0; - script->functionTemp[0] = 0; - } - } -} - -ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 30; - npc->currentAnim.w = enemy->animList[10]; - npc->flags &= ~0x800; - enemy->varTable[0] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 40; - npc->currentAnim.w = enemy->animList[0]; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - N(func_802408D0_C474B0)(script, npcAISettings, territoryPtr); - break; - case 1: - N(func_80240958_C47538)(script, npcAISettings, territoryPtr); - break; - case 2: - N(func_80240C10_C477F0)(script, npcAISettings, territoryPtr); - break; - case 3: - N(func_80240C74_C47854)(script, npcAISettings, territoryPtr); - break; - case 4: - N(func_80240D1C_C478FC)(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - npc->duration = 15; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - break; - case 30: - N(UnkNpcAIFunc6)(script); - if (script->functionTemp[0] != 31) { - break; - } - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - break; - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 40: - N(func_80240E54_C47A34)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 41) { - break; - } - case 41: - N(func_80240F00_C47AE0)(script, npcAISettings, territoryPtr); - break; - case 50: - N(func_80241078_C47C58)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -void N(func_8024291C_C494FC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 temp_f0; - f32 phi_f20; - - npc->duration--; - if (npc->duration <= 0) { - npc->flags &= ~0x00200000; - npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); - npc->currentAnim.w = enemy->animList[8]; - npc->moveSpeed = aiSettings->chaseSpeed; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0)) { - phi_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - script->functionTemp[0] = 13; - } -} - -void N(func_80242A74_C49654)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { - npc->duration = 0; - script->functionTemp[0] = 14; - } else { - npc->duration--; - if (npc->duration <= 0) { - npc->flags |= 0x200000; - script->functionTemp[0] = 12; - } - } - } else { - script->functionTemp[0] = 16; - } - -} - -void N(func_80242B78_C49758)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - do { enemy->varTable[0] |= 0x100; npc->pos.x = gPlayerStatusPtr->position.x; } while (0); - npc->pos.z = gPlayerStatusPtr->position.z; - if (!(enemy->varTable[0] & 0x1000)) { - enemy->varTable[0] |= 0x1000; - } - sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - npc->duration = 0; - script->functionTemp[0] = 15; -} - -void N(func_80242C1C_C497FC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - s32 temp_f8_2; - - sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - enemy->varTable[0] &= ~0x100; - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - script->functionTemp[0] = 16; - } else { - PlayerStatus** playerStatus = &gPlayerStatusPtr; - - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z + 2.0f; - npc->rotation.y += 25.0f; - if (npc->rotation.y > 360.0) { - npc->rotation.y -= 360.0; - } - temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); - func_802DE894(npc->spriteInstanceID, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); - - posX = gPlayerStatusPtr->position.x; - posY = gPlayerStatusPtr->position.y; - posZ = gPlayerStatusPtr->position.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (fabsf(npc->pos.y - posY) > 24.0) { - npc->pos.y -= 1.8; - } else { - npc->rotation.y = 0.0f; - npc->flags &= ~0x00200000; - if (gPartnerActionStatus.actingPartner != 9) { - disable_player_input(); - partner_disable_input(); - npc->duration = 0; - script->functionTemp[0] = 20; - } else { - script->functionTemp[0] = 16; - } - } - } -} - -void N(func_80242EB8_C49A98)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - if (enemy->varTable[0] & 0x1000) { - sfx_stop_sound(0x80000011); - enemy->varTable[0] &= ~0x1000; - } - npc->currentAnim.w = enemy->animList[9]; - npc->duration = 20; - script->functionTemp[0] = 17; -} - -void N(func_80242F70_C49B50)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 tmp = enemy->varTable[3]; - f32 temp_f20 = tmp / 100.0; - s32 var; - - npc->pos.y += 2.5; - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (!(npc->pos.y < (posY + temp_f20))) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc->pos.y = posY + temp_f20; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); - npc->duration = 10; - script->functionTemp[0] = 18; - } -} - -void N(func_802430F0_C49CD0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 30; - } -} - -void N(func_80243138_C49D18)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration++; - if (npc->duration >= 3) { - if (gPartnerActionStatus.actingPartner != 9) { - npc->duration = 0; - script->functionTemp[0] = 100; - } else { - enable_player_input(); - partner_enable_input(); - script->functionTemp[0] = 16; - } - } -} - -void N(func_802431B8_C49D98)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] &= ~0x100; - npc->flags &= ~0x00200000; - npc->moveSpeed = 2.0 * aiSettings->moveSpeed; - enemy->varTable[2] = 0; - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[1] = 0x1E; -} - -void N(func_80243260_C49E40)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX = npc->pos.x; - f32 posY = npc->pos.y; - f32 posZ = npc->pos.z; - f32 posW = 1000.0f; - f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 temp_f20 = sin_deg(enemy->varTable[2]); - s32 var; - s32 var2; - - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); - } else { - npc->pos.y = temp_f24 + (temp_f20 * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->moveToPos.y = npc->pos.y; - script->functionTemp[0] = 12; - return; - } - } - - script->functionTemp[1]--; - if (npc->turnAroundYawAdjustment == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - if (posW <= (2.0f * npc->moveSpeed)) { - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - script->functionTemp[0] = 2; - } - } -} - -ApiStatus N(func_80243578_C4A158)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 125.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - script->functionTemp[0] = 0; - N(UnkFunc5)(npc, enemy, script, aiSettings); - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] == 12) { - npc->duration = 6; - } - break; - case 12: - N(func_8024291C_C494FC)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - N(func_80242A74_C49654)(script, aiSettings, territoryPtr); - break; - case 14: - N(func_80242B78_C49758)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 15) { - break; - } - case 15: - N(func_80242C1C_C497FC)(script, aiSettings, territoryPtr); - break; - case 16: - N(func_80242EB8_C49A98)(script, aiSettings, territoryPtr); - case 17: - N(func_80242F70_C49B50)(script, aiSettings, territoryPtr); - break; - case 18: - N(func_802430F0_C49CD0)(script, aiSettings, territoryPtr); - break; - case 20: - N(func_80243138_C49D18)(script, aiSettings, territoryPtr); - break; - case 30: - N(func_802431B8_C49D98)(script, aiSettings, territoryPtr); - case 31: - N(func_80243260_C49E40)(script, aiSettings, territoryPtr); - } - - return (script->functionTemp[0] == 100) * ApiStatus_DONE2; -} +#define AI_SENTINEL_FIRST_NPC 0 +#define AI_SENTINEL_LAST_NPC 0 +#include "world/common/enemy/SentinelAI.inc.c" const char N(dgb_00_name_hack)[] = "dgb_00"; diff --git a/src/world/area_dgb/dgb_09/dgb_09.h b/src/world/area_dgb/dgb_09/dgb_09.h index b3c1556c6d..4183543353 100644 --- a/src/world/area_dgb/dgb_09/dgb_09.h +++ b/src/world/area_dgb/dgb_09/dgb_09.h @@ -6,10 +6,10 @@ #define NAMESPACE dgb_09 -ApiStatus N(func_8024061C_C471FC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243578_C4A158)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt *script, s32 isInitialCall); +ApiStatus N(WanderMeleeAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(SentinelAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024533C); extern EvtScript N(80243F6C); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 66e70b5294..e7f842f51c 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -184,7 +184,7 @@ EvtScript N(80241FBC) = { EVT_CALL(SetSelfVar, 1, 5) EVT_CALL(SetSelfVar, 2, 8) EVT_CALL(SetSelfVar, 3, 12) - EVT_CALL(N(func_8024061C_C4FB2C), EVT_PTR(N(D_80241F8C_C5149C))) + EVT_CALL(N(WanderMeleeAI_Main), EVT_PTR(N(D_80241F8C_C5149C))) EVT_RETURN EVT_END }; @@ -202,7 +202,7 @@ EvtScript N(80242058) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -325,14 +325,14 @@ NpcAISettings N(npcAISettings_8024271C) = { .moveTime = 30, .waitTime = 30, .alertRadius = 150.0f, - .unk_10 = { .f = 80.0f }, - .unk_14 = 1, + .alertOffsetDist = 80.0f, + .playerSearchInterval = 1, .chaseSpeed = 3.5f, - .unk_1C = { .s = 180 }, - .unk_20 = 2, + .chaseTurnRate= 180, + .chaseUpdateInterval = 2, .chaseRadius = 160.0f, - .unk_28 = { .f = 80.0f }, - .unk_2C = 1, + .chaseOffsetDist = 80.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_8024274C) = { @@ -340,7 +340,7 @@ EvtScript N(npcAI_8024274C) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, ((NPC_FLAG_GRAVITY)), TRUE) EVT_CALL(SetNpcAnimation, 0, NPC_ANIM_world_tubba_Palette_00_Anim_C) EVT_EXEC(N(802424E8)) - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_8024271C))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_8024271C))) EVT_RETURN EVT_END }; @@ -376,7 +376,7 @@ StaticNpc N(npcGroup_802428C0) = { .id = NPC_WORLD_TUBBA, .settings = &N(npcSettings_8024212C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, .init = &N(init_802427EC), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -464,104 +464,9 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -ApiStatus N(func_8024061C_C4FB2C)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" #include "world/common/UnkFunc1.inc.c" diff --git a/src/world/area_dgb/dgb_15/dgb_15.h b/src/world/area_dgb/dgb_15/dgb_15.h index fc342e9278..d1162d50dc 100644 --- a/src/world/area_dgb/dgb_15/dgb_15.h +++ b/src/world/area_dgb/dgb_15/dgb_15.h @@ -9,9 +9,9 @@ ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall); ApiStatus N(SetEntityFlags100000)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc1)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024061C_C4FB2C)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); +ApiStatus N(WanderMeleeAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80242AB0); extern EvtScript N(80242AD0); diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 45f4072a7c..eac019d790 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -2,8 +2,6 @@ #include "message_ids.h" #include "sprite/npc/world_clubba.h" -extern Npc* wPartnerNpc; - enum { NPC_WORLD_CLUBBA0, NPC_WORLD_CLUBBA1, @@ -152,14 +150,14 @@ NpcAISettings N(npcAISettings_802418AC) = { .moveTime = 120, .waitTime = 30, .alertRadius = 100.0f, - .unk_10 = { .f = 40.0f }, - .unk_14 = 10, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 10, .chaseSpeed = 3.5f, - .unk_1C = { .s = 90 }, - .unk_20 = 15, + .chaseTurnRate= 90, + .chaseUpdateInterval = 15, .chaseRadius = 200.0f, - .unk_28 = { .f = 160.0f }, - .unk_2C = 1, + .chaseOffsetDist = 160.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802418DC) = { @@ -167,7 +165,7 @@ EvtScript N(npcAI_802418DC) = { EVT_CALL(SetSelfVar, 1, 10) EVT_CALL(SetSelfVar, 2, 14) EVT_CALL(SetSelfVar, 3, 18) - EVT_CALL(N(func_80240E20_C53360), EVT_PTR(N(npcAISettings_802418AC))) + EVT_CALL(N(ClubbaNappingAI_Main), EVT_PTR(N(npcAISettings_802418AC))) EVT_RETURN EVT_END }; @@ -189,7 +187,7 @@ EvtScript N(npcAI_80241978) = { EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) EVT_CALL(SetSelfVar, 15, 8389) - EVT_CALL(N(UnkFunc7)) + EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END }; @@ -208,7 +206,7 @@ StaticNpc N(npcGroup_80241A4C)[] = { .id = NPC_WORLD_CLUBBA0, .settings = &N(npcSettings_8024194C), .pos = { -70.0f, 0.0f, -100.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -245,7 +243,7 @@ StaticNpc N(npcGroup_80241A4C)[] = { .id = NPC_WORLD_CLUBBA1, .settings = &N(npcSettings_80241A20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -277,7 +275,7 @@ StaticNpc N(npcGroup_80241E2C)[] = { .id = NPC_WORLD_CLUBBA2, .settings = &N(npcSettings_8024194C), .pos = { 0.0f, 0.0f, -235.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -313,7 +311,7 @@ StaticNpc N(npcGroup_80241E2C)[] = { .id = NPC_WORLD_CLUBBA3, .settings = &N(npcSettings_80241A20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -345,7 +343,7 @@ StaticNpc N(npcGroup_8024220C)[] = { .id = NPC_WORLD_CLUBBA4, .settings = &N(npcSettings_8024194C), .pos = { 70.0f, 0.0f, -100.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -381,7 +379,7 @@ StaticNpc N(npcGroup_8024220C)[] = { .id = NPC_WORLD_CLUBBA5, .settings = &N(npcSettings_80241A20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -413,7 +411,7 @@ StaticNpc N(npcGroup_802425EC)[] = { .id = NPC_WORLD_CLUBBA6, .settings = &N(npcSettings_8024194C), .pos = { 140.0f, 0.0f, -235.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -449,7 +447,7 @@ StaticNpc N(npcGroup_802425EC)[] = { .id = NPC_WORLD_CLUBBA7, .settings = &N(npcSettings_80241A20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -481,7 +479,7 @@ StaticNpc N(npcGroup_802429CC)[] = { .id = NPC_WORLD_CLUBBA8, .settings = &N(npcSettings_8024194C), .pos = { 210.0f, 0.0f, -100.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -517,7 +515,7 @@ StaticNpc N(npcGroup_802429CC)[] = { .id = NPC_WORLD_CLUBBA9, .settings = &N(npcSettings_80241A20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -549,7 +547,7 @@ StaticNpc N(npcGroup_80242DAC)[] = { .id = NPC_WORLD_CLUBBA10, .settings = &N(npcSettings_8024194C), .pos = { 280.0f, 0.0f, -235.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 5, @@ -585,7 +583,7 @@ StaticNpc N(npcGroup_80242DAC)[] = { .id = NPC_WORLD_CLUBBA11, .settings = &N(npcSettings_80241A20), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -622,381 +620,6 @@ NpcGroupList N(npcGroupList_8024318C) = { {}, }; -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/ClubbaNappingAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -void N(func_8024061C_C52B5C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } - - if (npc->duration == 1) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 1; - } -} - -void N(func_802406A4_C52BE4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - PlayerData* playerData = get_player_data(); - s32 phi_s2 = FALSE; - s32 var; - f32 posX, posZ; - - if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { - if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || - (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || - (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || - (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || - (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { - phi_s2 = TRUE; - } - - if (playerData->currentPartner == PARTNER_KOOPER) { - if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { - phi_s2 = TRUE; - } - } - } - - if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || - ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { - posX = npc->pos.x; - posZ = npc->pos.z; - add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); - if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { - phi_s2 = TRUE; - } - } - - if (phi_s2) { - ai_enemy_play_sound(npc, 0xB000000E, 0); - npc->currentAnim.w = enemy->animList[11]; - npc->duration = 10; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 2; - } - - npc->duration++; - if (npc->duration == 27) { - ai_enemy_play_sound(npc, 0xB000000C, 0); - } else if (npc->duration == 57) { - ai_enemy_play_sound(npc, 0xB000000D, 0); - } else if (npc->duration == 59) { - npc->currentAnim.w = enemy->animList[12]; - } else if (npc->duration == 60) { - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - } -} - -void N(func_8024095C_C52E9C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 1; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - } -} - -void N(func_802409C0_C52F00)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = (rand_int(1000) % 2) + 2; - script->functionTemp[0] = 4; -} - -void N(func_80240A68_C52FA8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - return; - } - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - return; - } - - var = enemy->varTable[7]; - if (var == 40) { - npc->duration = 20; - script->functionTemp[0] = var; - } else if (var == 50) { - npc->duration = 25; - script->functionTemp[0] = var; - } - } -} - -void N(func_80240BA0_C530E0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 0x29; - } -} - -void N(func_80240C4C_C5318C)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 15; - enemy->varTable[7] = 50; - script->functionTemp[0] = 3; - } else if (npc->turnAroundYawAdjustment == 0) { - var = npc->yaw; - func_8004A784(npc, 5.0f, &var, 0, 0, 0); - npc->yaw = var; - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} - -void N(func_80240DC4_C53304)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 0; - script->functionTemp[0] = 0; - } - } -} - -ApiStatus N(func_80240E20_C53360)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 30; - npc->currentAnim.w = enemy->animList[10]; - npc->flags &= ~0x800; - enemy->varTable[0] = 0; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 40; - npc->currentAnim.w = enemy->animList[0]; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - if (((u32)script->functionTemp[0] - 10 < 20) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - N(func_8024061C_C52B5C)(script, npcAISettings, territoryPtr); - break; - case 1: - N(func_802406A4_C52BE4)(script, npcAISettings, territoryPtr); - break; - case 2: - N(func_8024095C_C52E9C)(script, npcAISettings, territoryPtr); - break; - case 3: - N(func_802409C0_C52F00)(script, npcAISettings, territoryPtr); - break; - case 4: - N(func_80240A68_C52FA8)(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - npc->duration = 15; - enemy->varTable[7] = 40; - script->functionTemp[0] = 3; - break; - case 30: - N(UnkNpcAIFunc6)(script); - if (script->functionTemp[0] != 31) { - break; - } - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - break; - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 40: - N(func_80240BA0_C530E0)(script, npcAISettings, territoryPtr); - if (script->functionTemp[0] != 41) { - break; - } - case 41: - N(func_80240C4C_C5318C)(script, npcAISettings, territoryPtr); - break; - case 50: - N(func_80240DC4_C53304)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(func_80241170_C536B0)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/WanderMeleeAI.inc.c" diff --git a/src/world/area_dgb/dgb_16/dgb_16.h b/src/world/area_dgb/dgb_16/dgb_16.h index 25490990b0..c7fa576884 100644 --- a/src/world/area_dgb/dgb_16/dgb_16.h +++ b/src/world/area_dgb/dgb_16/dgb_16.h @@ -6,8 +6,8 @@ #define NAMESPACE dgb_16 -ApiStatus N(func_80240E20_C53360)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall); +ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_8024318C); extern EvtScript N(80241780); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 9294a458f6..4f7e11ff91 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -93,18 +93,18 @@ static s32 N(pad_1578)[] = { NpcAISettings N(npcAISettings_80241580) = { .moveSpeed = 4.5f, .alertRadius = 170.0f, - .unk_10 = { .f = 90.0f }, - .unk_14 = 1, + .alertOffsetDist = 90.0f, + .playerSearchInterval = 1, .chaseSpeed = 3.9f, - .unk_1C = { .s = 180 }, - .unk_20 = 2, + .chaseTurnRate= 180, + .chaseUpdateInterval = 2, .chaseRadius = 170.0f, - .unk_28 = { .f = 90.0f }, - .unk_2C = 1, + .chaseOffsetDist = 90.0f, + .unk_AI_2C = 1, }; EvtScript N(802415B0) = { - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_80241580))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_80241580))) EVT_RETURN EVT_END }; @@ -421,7 +421,7 @@ EvtScript N(npcAI_80242834) = { EVT_WAIT_FRAMES(8) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_80241580))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_80241580))) EVT_RETURN EVT_END }; @@ -584,7 +584,7 @@ StaticNpc N(npcGroup_802432D4) = { .id = NPC_WORLD_TUBBA, .settings = &N(npcSettings_802415FC), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, + .flags = NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, .init = &N(init_80242924), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -615,7 +615,7 @@ StaticNpc N(npcGroup_802434C4) = { .id = NPC_YAKKEY, .settings = &N(npcSettings_80241628), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, .init = &N(init_8024329C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -700,7 +700,7 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" #include "world/common/UnkFunc1.inc.c" diff --git a/src/world/area_dgb/dgb_18/dgb_18.h b/src/world/area_dgb/dgb_18/dgb_18.h index 2a3828bb08..b1ae727e3d 100644 --- a/src/world/area_dgb/dgb_18/dgb_18.h +++ b/src/world/area_dgb/dgb_18/dgb_18.h @@ -7,7 +7,7 @@ #define NAMESPACE dgb_18 ApiStatus N(UnkFunc1)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); extern s32** N(varStash); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index ffe8090ddb..43edb0b96e 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -70,7 +70,7 @@ static EffectInstance* N(Quizmo_VannaTEffect); static s8 N(pad_D_8024DFEC)[0x4]; static s32 N(bigArray)[112]; static s8 N(pad_D_8024E1B0)[0x4]; // Probably part of the above -static s32 N(D_8024E1B4); +static s32 N(LetterDelivery_SavedNpcAnim); EntryList N(entryList) = { { -342.0f, 0.0f, 316.0f, 45.0f }, @@ -240,12 +240,12 @@ NpcAISettings N(npcAISettings_80245010) = { .moveSpeed = 1.5f, .moveTime = 60, .waitTime = 30, - .unk_14 = -1, - .unk_2C = 1, + .playerSearchInterval = -1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80245040) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80245010))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80245010))) EVT_RETURN EVT_END }; @@ -262,12 +262,12 @@ NpcAISettings N(npcAISettings_8024508C) = { .moveSpeed = 1.5f, .moveTime = 30, .waitTime = 30, - .unk_14 = -1, - .unk_2C = 1, + .playerSearchInterval = -1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802450BC) = { - EVT_CALL(N(UnkNpcAIMainFunc), EVT_PTR(N(npcAISettings_8024508C))) + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(npcAISettings_8024508C))) EVT_RETURN EVT_END }; @@ -350,7 +350,7 @@ EvtScript N(8024792C) = { EvtScript N(8024797C) = { EVT_LOOP(0) EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) - EVT_CALL(N(UnkYawFunc), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) + EVT_CALL(N(LetterDelivery_CalcLetterPos), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_CALL(SetItemPos, EVT_VAR(0), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_WAIT_FRAMES(1) EVT_END_LOOP @@ -369,7 +369,7 @@ EvtScript N(802479FC) = { EVT_CALL(RemoveKeyItemAt, EVT_VAR(1)) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) - EVT_CALL(N(UnkYawFunc), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) + EVT_CALL(N(LetterDelivery_CalcLetterPos), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_BITWISE_OR_CONST(EVT_VAR(0), 0x50000) EVT_CALL(MakeItemEntity, EVT_VAR(0), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5), 1, 0) EVT_EXEC_GET_TID(N(8024797C), EVT_VAR(10)) @@ -423,7 +423,7 @@ EvtScript N(80247D90) = { EVT_IF_LT(EVT_SAVE_VAR(0), -70) EVT_RETURN EVT_END_IF - EVT_CALL(N(func_80243014_95E214)) + EVT_CALL(N(LetterDelivery_SaveNpcAnim)) EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) EVT_CALL(FindKeyItem, EVT_VAR(5), EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(0), 4) @@ -464,17 +464,18 @@ EvtScript N(80247D90) = { EVT_END_SWITCH EVT_END_IF EVT_END_IF - EVT_CALL(N(func_80243058_95E258)) + EVT_CALL(N(LetterDelivery_RestoreNpcAnim)) EVT_RETURN EVT_END }; s32 N(D_80248088_963288)[] = { - 0x0000004C, 0x00000000, + ITEM_LETTER19, ITEM_NONE }; EvtScript N(80248090) = { - EVT_CALL(N(SetManyVars), 6, 9699589, 9699585, 76, 69, 852105, 852106, 852107, 852108, EVT_PTR(N(D_80248088_963288))) + EVT_CALL(N(LetterDelivery_Init), 6, NPC_ANIM_mouser_Palette_01_Anim_5, NPC_ANIM_mouser_Palette_01_Anim_1, 76, 69, + MESSAGE_ID(0xD,0x89), MESSAGE_ID(0xD,0x8A), MESSAGE_ID(0xD,0x8B), MESSAGE_ID(0xD,0x8C), EVT_PTR(N(D_80248088_963288))) EVT_EXEC_WAIT(N(80247D90)) EVT_RETURN EVT_END @@ -957,7 +958,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_MOUSER0, .settings = &N(npcSettings_80245134), .pos = { -332.0f, 0.0f, 188.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802481F8), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -987,7 +988,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_DRYITE0, .settings = &N(npcSettings_80245060), .pos = { -235.0f, 0.0f, 160.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802483A8), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1018,7 +1019,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_DRYITE1, .settings = &N(npcSettings_80245108), .pos = { -380.0f, 0.0f, -15.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802484E0), .yaw = 61, .dropFlags = NPC_DROP_FLAGS_80, @@ -1048,7 +1049,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_DRYITE2, .settings = &N(npcSettings_80245108), .pos = { 195.0f, 0.0f, -75.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80248AE4), .yaw = 74, .dropFlags = NPC_DROP_FLAGS_80, @@ -1078,7 +1079,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_DRYITE3, .settings = &N(npcSettings_80245108), .pos = { 225.0f, 0.0f, -83.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80248CC8), .yaw = 257, .dropFlags = NPC_DROP_FLAGS_80, @@ -1108,7 +1109,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_ARTIST_TOAD, .settings = &N(npcSettings_80245108), .pos = { 285.0f, 0.0f, -274.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80249168), .yaw = 271, .dropFlags = NPC_DROP_FLAGS_80, @@ -1138,7 +1139,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_MOUSER1, .settings = &N(npcSettings_80245134), .pos = { 31.0f, 0.0f, -374.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024981C), .yaw = 180, .dropFlags = NPC_DROP_FLAGS_80, @@ -1168,7 +1169,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_CHUCK_QUIZMO, .settings = &N(Quizmo_NpcSettings), .pos = { -400.0f, 0.0f, 100.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 00}, .yaw = 263, .dropFlags = NPC_DROP_FLAGS_80, @@ -1198,7 +1199,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_DRYITE4, .settings = &N(npcSettings_80245060), .pos = { -120.0f, 0.0f, 134.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80249ABC), .yaw = 257, .dropFlags = NPC_DROP_FLAGS_80, @@ -1229,7 +1230,7 @@ StaticNpc N(npcGroup_80249B34)[] = { .id = NPC_DRYITE5, .settings = &N(npcSettings_802450DC), .pos = { 40.0f, 0.0f, 105.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80249B10), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1263,7 +1264,7 @@ StaticNpc N(npcGroup_8024AE94)[] = { .id = NPC_THREE_SISTERS0, .settings = &N(npcSettings_80245160), .pos = { -141.0f, 0.0f, -18.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802498C4), .yaw = 62, .dropFlags = NPC_DROP_FLAGS_80, @@ -1293,7 +1294,7 @@ StaticNpc N(npcGroup_8024AE94)[] = { .id = NPC_THREE_SISTERS1, .settings = &N(npcSettings_80245160), .pos = { -124.0f, 0.0f, -61.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802498C4), .yaw = 63, .dropFlags = NPC_DROP_FLAGS_80, @@ -1323,7 +1324,7 @@ StaticNpc N(npcGroup_8024AE94)[] = { .id = NPC_THREE_SISTERS2, .settings = &N(npcSettings_80245160), .pos = { -80.0f, 0.0f, -35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_802498C4), .yaw = 244, .dropFlags = NPC_DROP_FLAGS_80, @@ -1997,7 +1998,7 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" #include "world/common/atomic/Quizmo.inc.c" @@ -2044,8 +2045,8 @@ ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall) { s32 res; if (isInitialCall) { - script->functionTemp[1] = (s32) heap_malloc(0x3C); - ptr = (Unk_Struct_1*) script->functionTemp[1]; + script->functionTempPtr[1] = heap_malloc(0x3C); + ptr = script->functionTempPtr[1]; ptr->unk_00 = temp_s1->unk_00; ptr->unk_04 = temp_s1->unk_04; ptr->unk_08 = temp_s1->unk_08; @@ -2063,7 +2064,7 @@ ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall) { ptr->unk_38 = 0; } - ptr = (Unk_Struct_1*) script->functionTemp[1]; + ptr = script->functionTempPtr[1]; switch (ptr->unk_20) { case 0: res = get_xz_dist_to_player(ptr->unk_00, ptr->unk_08); @@ -2156,22 +2157,7 @@ ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -ApiStatus N(func_80243014_95E214)(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->varTable[2]); - - N(D_8024E1B4) = npc->currentAnim.w; - npc->currentAnim.w = script->varTable[4]; - return ApiStatus_DONE2; -} - -ApiStatus N(func_80243058_95E258)(Evt* script, s32 isInitialCall) { - get_npc_unsafe(script->varTable[2])->currentAnim.w = N(D_8024E1B4); - return ApiStatus_DONE2; -} +#include "world/common/LetterDelivery.inc.c" ApiStatus N(func_80243084_95E284)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_dro/dro_01/dro_01.h b/src/world/area_dro/dro_01/dro_01.h index 5ea3806068..f66301fe55 100644 --- a/src/world/area_dro/dro_01/dro_01.h +++ b/src/world/area_dro/dro_01/dro_01.h @@ -24,7 +24,7 @@ ApiStatus N(Quizmo_NPC_Aux_Impl)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_ShowEntities)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_HideEntities)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_SetCamVfov)(Evt* script, s32 isInitialCall); -ApiStatus N(SetManyVars)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall); ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_HideWorld)(Evt* script, s32 isInitialCall); @@ -32,10 +32,10 @@ ApiStatus N(Quizmo_AddViewRelativeOffset)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_UpdatePartnerPosition)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_SpinPartner)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_SpinPlayer)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkYawFunc)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_ShouldAppear)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_RenderInit)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_FadeInWorld)(Evt* script, s32 isInitialCall); @@ -52,8 +52,8 @@ ApiStatus N(func_80242730_95D930)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242784_95D984)(Evt* script, s32 isInitialCall); ApiStatus N(BigArrayFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243014_95E214)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243058_95E258)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243084_95E284)(Evt* script, s32 isInitialCall); ApiStatus N(GetFloorCollider)(Evt* script, s32 isInitialCall); ApiStatus N(func_802431B4_95E3B4)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index fe306688a5..009b85d56c 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -72,7 +72,7 @@ static D_8024F010_Struct N(D_8024F010)[3]; static s8 N(pad_D_8024F07C)[0x4]; static s32 N(KeyItemChoiceList)[(ITEM_LAST_KEY - ITEM_FIRST_VALID_KEY) + 3]; static s32 N(ItemChoiceList)[(ITEM_LAST_VALID_CONSUMABLE - ITEM_FIRST_CONSUMABLE) + 2]; // extra entry for list terminator -static s32 N(D_8024F3B8); +static s32 N(LetterDelivery_SavedNpcAnim); // DATA @@ -470,12 +470,12 @@ NpcAISettings N(npcAISettings_80247408) = { .moveSpeed = 1.5f, .moveTime = 60, .waitTime = 30, - .unk_14 = -1, - .unk_2C = 1, + .playerSearchInterval = -1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80247438) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80247408))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80247408))) EVT_RETURN EVT_END }; @@ -499,12 +499,12 @@ NpcAISettings N(npcAISettings_802474B0) = { .moveSpeed = 1.5f, .moveTime = 60, .waitTime = 30, - .unk_14 = -1, - .unk_2C = 1, + .playerSearchInterval = -1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802474E0) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_802474B0))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_802474B0))) EVT_RETURN EVT_END }; @@ -1310,7 +1310,7 @@ EvtScript N(interact_8024ADE4) = { EvtScript N(8024B18C) = { EVT_LOOP(0) EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) - EVT_CALL(N(UnkYawFunc), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) + EVT_CALL(N(LetterDelivery_CalcLetterPos), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_CALL(SetItemPos, EVT_VAR(0), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_WAIT_FRAMES(1) EVT_END_LOOP @@ -1329,7 +1329,7 @@ EvtScript N(8024B20C) = { EVT_CALL(RemoveKeyItemAt, EVT_VAR(1)) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(GetNpcPos, NPC_PARTNER, EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) - EVT_CALL(N(UnkYawFunc), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) + EVT_CALL(N(LetterDelivery_CalcLetterPos), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5)) EVT_BITWISE_OR_CONST(EVT_VAR(0), 0x50000) EVT_CALL(MakeItemEntity, EVT_VAR(0), EVT_VAR(3), EVT_VAR(4), EVT_VAR(5), 1, 0) EVT_EXEC_GET_TID(N(8024B18C), EVT_VAR(10)) @@ -1383,7 +1383,7 @@ EvtScript N(8024B5A0) = { EVT_IF_LT(EVT_SAVE_VAR(0), -70) EVT_RETURN EVT_END_IF - EVT_CALL(N(func_802439FC_96CBBC)) + EVT_CALL(N(LetterDelivery_SaveNpcAnim)) EVT_CALL(GetCurrentPartnerID, EVT_VAR(0)) EVT_CALL(FindKeyItem, EVT_VAR(5), EVT_VAR(1)) EVT_IF_EQ(EVT_VAR(0), 4) @@ -1424,7 +1424,7 @@ EvtScript N(8024B5A0) = { EVT_END_SWITCH EVT_END_IF EVT_END_IF - EVT_CALL(N(func_80243A40_96CC00)) + EVT_CALL(N(LetterDelivery_RestoreNpcAnim)) EVT_RETURN EVT_END }; @@ -1434,7 +1434,7 @@ s32 N(D_8024B898_974A58)[] = { }; EvtScript N(8024B8A0) = { - EVT_CALL(N(SetManyVars), 1, 9634308, 9634305, 74, 75, 852117, 852118, 852119, 852120, EVT_PTR(N(D_8024B898_974A58))) + EVT_CALL(N(LetterDelivery_Init), 1, 9634308, 9634305, 74, 75, 852117, 852118, 852119, 852120, EVT_PTR(N(D_8024B898_974A58))) EVT_EXEC_WAIT(N(8024B5A0)) EVT_RETURN EVT_END @@ -1997,7 +1997,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_ARCHEOLOGIST, .settings = &N(npcSettings_80247484), .pos = { -320.0f, 0.0f, -14.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BA50), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -2028,7 +2028,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_DRYITE0, .settings = &N(npcSettings_80247500), .pos = { -20.0f, 0.0f, 40.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BBAC), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -2059,7 +2059,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_DISGUISED_MOUSTAFA, .settings = &N(npcSettings_80247558), .pos = { 245.0f, 0.0f, -35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D04C), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -2089,7 +2089,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_TOAD, .settings = &N(npcSettings_80247584), .pos = { -143.0f, 0.0f, -170.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D790), .yaw = 180, .dropFlags = NPC_DROP_FLAGS_80, @@ -2119,7 +2119,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_WORLD_MERLEE, .settings = &N(npcSettings_80248754), .pos = { -130.0f, 0.0f, -400.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80247A80), .yaw = 180, .dropFlags = NPC_DROP_FLAGS_80, @@ -2149,7 +2149,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_MOUSTAFA, .settings = &N(npcSettings_80247558), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D130), .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, @@ -2179,7 +2179,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_DRYITE1, .settings = &N(npcSettings_8024752C), .pos = { 25.0f, 0.0f, -38.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BCD4), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -2209,7 +2209,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_DRYITE2, .settings = &N(npcSettings_8024752C), .pos = { -375.0f, 0.0f, -10.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BD28), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -2239,7 +2239,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_MOUSER0, .settings = &N(npcSettings_80247558), .pos = { -50.0f, 0.0f, -470.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024BF10), .yaw = 180, .dropFlags = NPC_DROP_FLAGS_80, @@ -2269,7 +2269,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_MOUSER1, .settings = &N(npcSettings_80247558), .pos = { -270.0f, 0.0f, 91.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024C038), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -2299,7 +2299,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_MOUSER2, .settings = &N(npcSettings_80247558), .pos = { 210.0f, 0.0f, -35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_8024D3E8), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -2328,7 +2328,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = { .id = NPC_CHUCK_QUIZMO, .settings = &N(Quizmo_NpcSettings), .pos = { -335.0f, 0.0f, 90.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 01}, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -2553,19 +2553,4 @@ ApiStatus N(func_80243068_96C228)(Evt* script, s32 isInitialCall) { #include "world/common/atomic/ToadHouse.inc.c" -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -ApiStatus N(func_802439FC_96CBBC)(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->varTable[2]); - - N(D_8024F3B8) = npc->currentAnim.w; - npc->currentAnim.w = script->varTable[4]; - return ApiStatus_DONE2; -} - -ApiStatus N(func_80243A40_96CC00)(Evt* script, s32 isInitialCall) { - get_npc_unsafe(script->varTable[2])->currentAnim.w = N(D_8024F3B8); - return ApiStatus_DONE2; -} +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_dro/dro_02/dro_02.h b/src/world/area_dro/dro_02/dro_02.h index ccc60040b0..fdecad6482 100644 --- a/src/world/area_dro/dro_02/dro_02.h +++ b/src/world/area_dro/dro_02/dro_02.h @@ -16,7 +16,7 @@ ApiStatus N(ToadHouse_PutPartnerAway)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_ShowEntities)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_HideEntities)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_SetCamVfov)(Evt* script, s32 isInitialCall); -ApiStatus N(SetManyVars)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall); ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_HideWorld)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_AddViewRelativeOffset)(Evt* script, s32 isInitialCall); @@ -26,7 +26,7 @@ ApiStatus N(Quizmo_FadeInWorld)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_UpdatePartnerPosition)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_SpinPartner)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_SpinPlayer)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkYawFunc)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_ShouldAppear)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_RenderInit)(Evt* script, s32 isInitialCall); ApiStatus N(Quizmo_UpdateRecords)(Evt* script, s32 isInitialCall); @@ -53,8 +53,8 @@ ApiStatus N(ToadHouse_UpdateScreenOverlay)(Evt* script, s32 isInitialCall); ApiStatus N(ToadHouse_CamSetFOV)(Evt* script, s32 isInitialCall); ApiStatus N(ToadHouse_DoesPlayerNeedSleep)(Evt* script, s32 isInitialCall); ApiStatus N(ToadHouse_InitScreenOverlay)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802439FC_96CBBC)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80243A40_96CC00)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall); +ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall); void N(func_8024240C_96B5CC)(Evt *script, s32 isInitialCall); void N(func_80242EAC_96C06C)(Evt *script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 5c5baf0162..b4e48bdc79 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -366,12 +366,12 @@ NpcAISettings N(npcAISettings_8024286C) = { .moveSpeed = 1.5f, .moveTime = 30, .waitTime = 30, - .unk_14 = -1, - .unk_2C = 1, + .playerSearchInterval = -1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_8024289C) = SCRIPT({ - N(UnkNpcAIMainFunc)(N(npcAISettings_8024286C)); + N(PatrolNoAttackAI_Main)(N(npcAISettings_8024286C)); }); NpcSettings N(npcSettings_802428BC) = { @@ -1034,7 +1034,7 @@ StaticNpc N(npcGroup_80244E64) = { .id = NPC_BUBULB0, .settings = &N(npcSettings_80242840), .pos = { -72.0f, 60.0f, -100.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING, .init = &N(init_80243474), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1065,7 +1065,7 @@ StaticNpc N(npcGroup_80245054)[] = { .id = NPC_BUBULB1, .settings = &N(npcSettings_802428BC), .pos = { -59.0f, 0.0f, -40.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243B7C), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1096,7 +1096,7 @@ StaticNpc N(npcGroup_80245054)[] = { .id = NPC_BUBULB2, .settings = &N(npcSettings_802428BC), .pos = { 67.0f, 0.0f, 85.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243BB0), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1127,7 +1127,7 @@ StaticNpc N(npcGroup_80245054)[] = { .id = NPC_BUBULB3, .settings = &N(npcSettings_802428BC), .pos = { 90.0f, 0.0f, 410.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243BE4), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1158,7 +1158,7 @@ StaticNpc N(npcGroup_80245054)[] = { .id = NPC_BUBULB4, .settings = &N(npcSettings_802428BC), .pos = { 200.0f, 0.0f, 430.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243C18), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1191,7 +1191,7 @@ StaticNpc N(npcGroup_80245814) = { .id = NPC_TOLIELUP, .settings = &N(npcSettings_802428E8), .pos = { -400.0f, 0.0f, 190.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_8024414C), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1222,7 +1222,7 @@ StaticNpc N(npcGroup_80245A04) = { .id = NPC_WORLD_KLEVAR, .settings = &N(npcSettings_80242914), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80244BF4), .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, @@ -1252,7 +1252,7 @@ StaticNpc N(npcGroup_80245BF4) = { .id = NPC_LAKILULU, .settings = &N(npcSettings_80242840), .pos = { 198.0f, 0.0f, 363.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80244DD0), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1372,7 +1372,7 @@ StaticNpc N(npcGroup_80246264)[] = { .id = NPC_BUBULB0, .settings = &N(npcSettings_80245E30), .pos = { 144.0f, 0.0f, 374.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, .init = &N(init_80246170), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1401,7 +1401,7 @@ StaticNpc N(npcGroup_80246264)[] = { .id = NPC_BUBULB1, .settings = &N(npcSettings_80245E30), .pos = { 198.0f, 0.0f, 363.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, .init = &N(init_802461E4), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1430,7 +1430,7 @@ StaticNpc N(npcGroup_80246264)[] = { .id = NPC_BUBULB2, .settings = &N(npcSettings_80245E5C), .pos = { 266.0f, 0.0f, 322.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, .init = &N(init_80246224), .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, @@ -2080,7 +2080,7 @@ EvtScript N(makeEntities) = SCRIPT({ } }); -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_flo/flo_00/flo_00.h b/src/world/area_flo/flo_00/flo_00.h index a6b11b81a1..628b09db45 100644 --- a/src/world/area_flo/flo_00/flo_00.h +++ b/src/world/area_flo/flo_00/flo_00.h @@ -10,7 +10,7 @@ ApiStatus N(SyncStatusMenu)(Evt* script, s32 isInitialCall); ApiStatus N(PostChapter6StatUpdate)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_C9DF20)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240ED0_C9EDF0)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240F10_C9EE30)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240F80_C9EEA0)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index ee455f0af2..e0e84e2104 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -904,7 +904,7 @@ StaticNpc N(npcGroup_8024388C) = { .id = NPC_PETUNIA, .settings = &N(npcSettings_80240EDC), .pos = { -30.0f, 0.0f, 100.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80241DA4), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -935,7 +935,7 @@ StaticNpc N(npcGroup_80243A7C) = { .id = NPC_DAYZEE, .settings = &N(npcSettings_80240EB0), .pos = { -233.0f, 0.0f, -217.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80241E10), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -965,7 +965,7 @@ StaticNpc N(npcGroup_80243C6C) = { .id = NPC_MONTY_MOLE0, .settings = &N(npcSettings_80240EB0), .pos = { -100.0f, 0.0f, 210.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024338C), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -995,7 +995,7 @@ StaticNpc N(npcGroup_80243E5C) = { .id = NPC_MONTY_MOLE1, .settings = &N(npcSettings_80240EB0), .pos = { -130.0f, 0.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802434CC), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1025,7 +1025,7 @@ StaticNpc N(npcGroup_8024404C) = { .id = NPC_MONTY_MOLE2, .settings = &N(npcSettings_80240EB0), .pos = { 75.0f, 0.0f, 20.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024360C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1055,7 +1055,7 @@ StaticNpc N(npcGroup_8024423C) = { .id = NPC_MONTY_MOLE3, .settings = &N(npcSettings_80240EB0), .pos = { 71.0f, 0.0f, 200.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_8024374C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1132,18 +1132,18 @@ ApiStatus N(func_80240158_CA73F8)(Evt* script, s32 isInitialCall) { add_vec2D_polar(&sp10, &sp14, 46.0f, clamp); } } - npc->currentAnim.w = enemy->animList[2]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_RUN]; npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14); npc_move_heading(npc, 2.0f, npc->yaw); } else if (temp_f4 > 0.2) { npc->yaw = atan2(npc->pos.x, npc->pos.z, sp10, sp14); npc->pos.x = sp10; npc->pos.z = sp14; - npc->currentAnim.w = enemy->animList[1]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; } else { npc->pos.x = sp10; npc->pos.z = sp14; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; } return ApiStatus_BLOCK; } diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index bbe1069e30..95edeaaf17 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -480,7 +480,7 @@ StaticNpc N(npcGroup_8024291C) = { .id = NPC_POSIE, .settings = &N(npcSettings_80241220), .pos = { -260.0f, 0.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80242428), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 39bf831775..8fb9e5e376 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -192,18 +192,18 @@ NpcAISettings N(npcAISettings_80242EB0) = { .moveTime = 30, .waitTime = 30, .alertRadius = 100.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 3, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 3, .chaseSpeed = 2.4f, - .unk_1C = { .s = 15 }, - .unk_20 = 1, + .chaseTurnRate= 15, + .chaseUpdateInterval = 1, .chaseRadius = 140.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 1, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80242EE0) = { - EVT_CALL(N(func_8024150C_CB024C), EVT_PTR(N(npcAISettings_80242EB0))) + EVT_CALL(N(UnkFloAI_Main), EVT_PTR(N(npcAISettings_80242EB0))) EVT_RETURN EVT_END }; @@ -241,18 +241,18 @@ NpcAISettings N(npcAISettings_8024300C) = { .moveTime = 500, .waitTime = 10, .alertRadius = 50.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 3, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 3, .chaseSpeed = 3.5f, - .unk_1C = { .s = 40 }, - .unk_20 = 3, + .chaseTurnRate= 40, + .chaseUpdateInterval = 3, .chaseRadius = 100.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 1, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_8024303C) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_8024300C))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_8024300C))) EVT_RETURN EVT_END }; @@ -458,7 +458,7 @@ StaticNpc N(npcGroup_80243C48) = { .id = NPC_GATE_FLOWER, .settings = &N(npcSettings_80242FE0), .pos = { -695.0f, 0.0f, -30.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243B20), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -489,7 +489,7 @@ StaticNpc N(npcGroup_80243E38) = { .id = NPC_DAYZEE0, .settings = &N(npcSettings_8024305C), .pos = { 205.0f, 0.0f, -80.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -526,7 +526,7 @@ StaticNpc N(npcGroup_80244028) = { .id = NPC_DAYZEE1, .settings = &N(npcSettings_8024305C), .pos = { 275.0f, 0.0f, -115.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -563,7 +563,7 @@ StaticNpc N(npcGroup_80244218) = { .id = NPC_DAYZEE2, .settings = &N(npcSettings_8024305C), .pos = { -230.0f, 60.0f, -110.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -600,7 +600,7 @@ StaticNpc N(npcGroup_80244408) = { .id = NPC_DAYZEE3, .settings = &N(npcSettings_8024305C), .pos = { -330.0f, 60.0f, -110.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -637,7 +637,7 @@ StaticNpc N(npcGroup_802445F8) = { .id = NPC_DAYZEE4, .settings = &N(npcSettings_8024305C), .pos = { -430.0f, 60.0f, -110.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -674,7 +674,7 @@ StaticNpc N(npcGroup_802447E8) = { .id = NPC_DAYZEE5, .settings = &N(npcSettings_8024305C), .pos = { -530.0f, 60.0f, -110.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -711,7 +711,7 @@ StaticNpc N(npcGroup_802449D8) = { .id = NPC_DAYZEE6, .settings = &N(npcSettings_8024305C), .pos = { -630.0f, 60.0f, -110.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -769,7 +769,7 @@ StaticNpc N(npcGroup_80244CD4) = { .id = NPC_DAYZEE7, .settings = &N(npcSettings_80242FB4), .pos = { 240.0f, 0.0f, -90.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80244BC8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -822,222 +822,7 @@ static s32 N(pad_4F3C) = { 0x00000000, }; -void N(func_80240D80_CAFAC0)(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - f32 temp_f0; - f32 temp_f20; - f64 temp_f2; - f32 phi_f22; - f32 phi_f24; - f32 phi_f26; - s32 phi_s3; - - f32 subroutine_arg8; - f32 subroutine_arg9; - f32 subroutine_argA; - f32 subroutine_argB; - f32 subroutine_argC; - f32 subroutine_argD; - f32 subroutine_argE; - f32 subroutine_argF; - f32 subroutine_arg10; - - npc->duration = npcAISettings->unk_20 / 2 + rand_int(npcAISettings->unk_20 / 2 + 1); - npc->currentAnim.w = enemy->animList[3]; - npc->moveSpeed = npcAISettings->chaseSpeed; - phi_s3 = FALSE; - - temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) + 180.0f); - temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20); - if (npcAISettings->unk_1C.s < fabsf(temp_f0)) { - temp_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - temp_f20 += -npcAISettings->unk_1C.s; - } else { - temp_f20 += npcAISettings->unk_1C.s; - } - } - - npc->yaw = clamp_angle(temp_f20); - - subroutine_arg8 = npc->pos.x; - subroutine_arg9 = npc->pos.y; - subroutine_argA = npc->pos.z; - - temp_f20 = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) + 180.0f); - phi_f22 = 0.0f; - phi_f24 = 0.0f; - phi_f26 = 0.0f; - - if (npc_test_move_simple_without_slipping(npc->collisionChannel, &subroutine_arg8, &subroutine_arg9, &subroutine_argA, npc->moveSpeed * 4.5, temp_f20, - npc->collisionHeight, npc->collisionRadius) != 0) { - phi_f22 = dist2D(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA); - - subroutine_argB = npc->pos.x; - subroutine_argC = npc->pos.y; - subroutine_argD = npc->pos.z; - - if (npc_test_move_simple_without_slipping(npc->collisionChannel, &subroutine_argB, &subroutine_argC, &subroutine_argD, npc->moveSpeed * 4.5, - clamp_angle(temp_f20 + 35.0f), npc->collisionHeight, npc->collisionRadius) != 0) { - phi_f24 = dist2D(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD); - } - - subroutine_argE = npc->pos.x; - subroutine_argF = npc->pos.y; - subroutine_arg10 = npc->pos.z; - - if (npc_test_move_simple_without_slipping(npc->collisionChannel, &subroutine_argE, &subroutine_argF, &subroutine_arg10, npc->moveSpeed * 4.5, - clamp_angle(temp_f20 - 35.0f), npc->collisionHeight, npc->collisionRadius) != 0) { - phi_f26 = dist2D(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10); - } - - dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - - if ((phi_f22 < npc->moveSpeed * 1.5) && (phi_f24 < npc->moveSpeed * 1.5) && (phi_f26 < npc->moveSpeed * 1.5) && - (func_800490B4(territory, enemy, npcAISettings->alertRadius, npcAISettings->unk_10.f, 0) != 0)) { - phi_s3 = TRUE; - } - - if (!phi_s3) { - if ((phi_f24 < phi_f22) && (phi_f26 < phi_f24)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA); - } else if ((phi_f24 < phi_f22) && (phi_f24 < phi_f26)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_arg8, subroutine_argA); - } else if ((phi_f22 < phi_f24) && (phi_f26 < phi_f22)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD); - } else if ((phi_f26 < phi_f24) && (phi_f22 < phi_f26)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argB, subroutine_argD); - } else if ((phi_f22 < phi_f26) && (phi_f24 < phi_f22)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10); - } else if ((phi_f24 < phi_f26) && (phi_f22 < phi_f24)) { - temp_f20 = atan2(npc->pos.x, npc->pos.z, subroutine_argE, subroutine_arg10); - } - - temp_f0 = get_clamped_angle_diff(npc->yaw, temp_f20); - if (npcAISettings->unk_1C.s < fabsf(temp_f0)) { - temp_f20 = npc->yaw; - if (temp_f0 < 0.0f) { - temp_f20 += -npcAISettings->unk_1C.s; - } else { - temp_f20 += npcAISettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(temp_f20); - } - } - if (phi_s3) { - npc->duration = 0xA; - npc->currentAnim.w = enemy->animList[8]; - } - script->functionTemp[0] = 0xD; -} - -void N(func_80241364_CB00A4)(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, npcAISettings->chaseRadius, npcAISettings->unk_28.f, 1) == 0) { - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0] = 14; - } else { - if (npc->currentAnim.w != enemy->animList[8]) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - if (npc->duration > 0) { - npc->duration--; - return; - } else { - script->functionTemp[0] = 12; - } - } -} - -void N(func_802414C8_CB0208)(Evt* script, NpcAISettings* npcAISettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[0] = NULL; - } -} - -ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - N(func_80240D80_CAFAC0)(script, npcAISettings, territoryPtr); - case 13: - N(func_80241364_CB00A4)(script, npcAISettings, territoryPtr); - break; - case 14: - N(func_802414C8_CB0208)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/UnkFloAI.inc.c" #include "world/common/atomic/ItemChoice_PartA.inc.c" diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h index fdf63678e8..3b242ee6d1 100644 --- a/src/world/area_flo/flo_08/flo_08.h +++ b/src/world/area_flo/flo_08/flo_08.h @@ -9,7 +9,7 @@ ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240D40_CAFA80)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkFloAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall); ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index bad3790619..7c64160775 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -421,18 +421,18 @@ NpcAISettings N(npcAISettings_802435B0) = { .moveTime = 500, .waitTime = 10, .alertRadius = 50.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 3, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 3, .chaseSpeed = 3.5f, - .unk_1C = { .s = 40 }, - .unk_20 = 3, + .chaseTurnRate= 40, + .chaseUpdateInterval = 3, .chaseRadius = 100.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 1, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802435E0) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_802435B0))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_802435B0))) EVT_RETURN EVT_END }; @@ -446,7 +446,7 @@ NpcSettings N(npcSettings_80243600) = { .level = 19, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -456,14 +456,14 @@ NpcAISettings N(npcAISettings_80243644) = { .moveTime = 30, .waitTime = 5, .alertRadius = 80.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 2, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 2, .chaseSpeed = 4.5f, - .unk_1C = { .s = 6 }, - .unk_20 = 1, + .chaseTurnRate= 6, + .chaseUpdateInterval = 1, .chaseRadius = 90.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 1, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80243674) = { @@ -471,7 +471,7 @@ EvtScript N(npcAI_80243674) = { EVT_CALL(SetSelfVar, 5, -630) EVT_CALL(SetSelfVar, 6, 50) EVT_CALL(SetSelfVar, 1, 200) - EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_80243644))) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(npcAISettings_80243644))) EVT_RETURN EVT_END }; @@ -543,7 +543,7 @@ StaticNpc N(npcGroup_8024398C) = { .id = NPC_DAYZEE0, .settings = &N(npcSettings_80243600), .pos = { -350.0f, 0.0f, 40.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -580,7 +580,7 @@ StaticNpc N(npcGroup_80243B7C) = { .id = NPC_DAYZEE1, .settings = &N(npcSettings_80243600), .pos = { 260.0f, 0.0f, 75.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -617,7 +617,7 @@ StaticNpc N(npcGroup_80243D6C) = { .id = NPC_BZZAP0, .settings = &N(npcSettings_802436E4), .pos = { -50.0f, 55.0f, 90.0f }, - .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -655,7 +655,7 @@ StaticNpc N(npcGroup_80243F5C) = { .id = NPC_BZZAP1, .settings = &N(npcSettings_80243710), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .init = &N(init_80243954), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index f5c71f72cd..9ed2af2314 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/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" diff --git a/src/world/area_flo/flo_09/flo_09.h b/src/world/area_flo/flo_09/flo_09.h index 0f6c40c771..8e8c65eb64 100644 --- a/src/world/area_flo/flo_09/flo_09.h +++ b/src/world/area_flo/flo_09/flo_09.h @@ -9,9 +9,9 @@ ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CB5000)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); +ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall); -extern f32 N(sixFloats)[]; +extern f32 N(FlyingAI_JumpVels)[]; extern NpcGroupList N(npcGroupList_8024414C); extern EvtScript N(802425DC); extern EvtScript N(802434A8); diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 6a6fd2f658..3dcfa07447 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -757,7 +757,7 @@ StaticNpc N(npcGroup_80243E64) = { .id = NPC_LILY, .settings = &N(npcSettings_80243220), .pos = { 80.0f, -60.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80243D78), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 5617e411c6..0be1c55a6a 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -562,7 +562,7 @@ StaticNpc N(npcGroup_80242CF4)[] = { .id = NPC_LAKITU0, .settings = &N(npcSettings_80241AC0), .pos = { 553.0f, 60.0f, 52.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, .init = &N(init_80242B58), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -599,7 +599,7 @@ StaticNpc N(npcGroup_80242CF4)[] = { .id = NPC_LAKITU1, .settings = &N(npcSettings_80241AC0), .pos = { 553.0f, 60.0f, 52.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, .init = &N(init_80242C38), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 9a1c1b594f..151651c1ec 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -413,7 +413,7 @@ StaticNpc N(npcGroup_802425D8)[] = { .id = NPC_ROSIE0, .settings = &N(npcSettings_80240E30), .pos = { -70.0f, 0.0f, 20.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_400000, .init = &N(init_802423D0), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 3fb3c1a433..ccfeb4b941 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -229,7 +229,7 @@ NpcSettings N(npcSettings_80244100) = { .level = 20, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -239,14 +239,14 @@ NpcAISettings N(npcAISettings_80244144) = { .moveTime = 60, .waitTime = 30, .alertRadius = 60.0f, - .unk_10 = { .f = 50.0f }, - .unk_14 = 3, + .alertOffsetDist = 50.0f, + .playerSearchInterval = 3, .chaseSpeed = 3.5f, - .unk_1C = { .s = 60 }, - .unk_20 = 10, + .chaseTurnRate= 60, + .chaseUpdateInterval = 10, .chaseRadius = 80.0f, - .unk_28 = { .f = 70.0f }, - .unk_2C = 1, + .chaseOffsetDist = 70.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80244174) = { @@ -254,7 +254,7 @@ EvtScript N(npcAI_80244174) = { EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) EVT_CALL(SetSelfVar, 1, 400) - EVT_CALL(N(func_80241DB8_CC55C8), EVT_PTR(N(npcAISettings_80244144))) + EVT_CALL(N(LakituAI_Main), EVT_PTR(N(npcAISettings_80244144))) EVT_RETURN EVT_END }; @@ -273,12 +273,12 @@ NpcAISettings N(npcAISettings_80244210) = { .moveTime = 30, .waitTime = 50, .alertRadius = 60.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 3, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 3, .chaseSpeed = 6.0f, .chaseRadius = 100.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 3, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_80244240) = { @@ -286,7 +286,7 @@ EvtScript N(npcAI_80244240) = { EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) EVT_CALL(SetSelfVar, 7, 4) - EVT_CALL(N(UnkNpcAIMainFunc6), EVT_PTR(N(npcAISettings_80244210))) + EVT_CALL(N(SpinyAI_Main), EVT_PTR(N(npcAISettings_80244210))) EVT_RETURN EVT_END }; @@ -839,7 +839,7 @@ StaticNpc N(npcGroup_80246434) = { .id = NPC_WORLD_LAKILESTER, .settings = &N(npcSettings_80244100), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, .init = &N(init_80246280), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -869,7 +869,7 @@ StaticNpc N(npcGroup_80246624) = { .id = NPC_LAKILULU0, .settings = &N(npcSettings_80244100), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802462D0), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -900,7 +900,7 @@ StaticNpc N(npcGroup_80246814) = { .id = NPC_LAKILULU1, .settings = &N(npcSettings_80244100), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80246370), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -930,7 +930,7 @@ StaticNpc N(npcGroup_80246A04) = { .id = NPC_LAKITU0, .settings = &N(npcSettings_802441E4), .pos = { 335.0f, 90.0f, 45.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802463B0), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -970,7 +970,7 @@ StaticNpc N(npcGroup_80246BF4) = { .id = NPC_LAKITU1, .settings = &N(npcSettings_802441E4), .pos = { -320.0f, 90.0f, 0.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802463B0), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1221,286 +1221,10 @@ NpcGroupList N(npcGroupList_80247984) = { #include "world/common/UnkFunc41.inc.c" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -s32 N(func_802416BC_CC4ECC)(void) { - s32 i; - - for (i = 50; i < 56; i++) { - if (get_enemy(i)->varTable[10] == 0) { - return i; - } - } - - return -1; -} - -void N(func_80241704_CC4F14)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 temp_f20; - f32 temp_f22; - f32 temp_f24; - f32 var1 = enemy->varTable[4]; - f32 var2 = enemy->varTable[3]; - f32 var3; - - temp_f22 = var1 / 100.0; - temp_f24 = var2 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var3 = enemy->varTable[1]; - temp_f20 = var3 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->moveToPos.y = y + temp_f24; - script->functionTemp[0] = 12; - return; - } - } - script->functionTemp[1]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, - enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, - enemy->territory->wander.wanderSizeZ) != 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } - - if (npc->turnAroundYawAdjustment == 0) { - if (npc->duration > 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (enemy->varTable[0] & 1) { - x = npc->pos.x; - y = temp_f22; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - y += temp_f24; - w = y - temp_f22; - if (w > 2.0) { - temp_f22 += 2.0; - } else if (w < -2.0) { - temp_f22 -= 2.0; - } else { - temp_f22 = y; - } - enemy->varTable[4] = (temp_f22 * 100.0); - } - if (npc->duration > 0) { - return; - } - } - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) { - script->functionTemp[0] = 0; - } - } -} - -void N(func_80241B68_CC5378)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 var1 = enemy->varTable[3]; - f32 var2; - f32 temp_f20; - f32 temp_f22; - - temp_f22 = var1 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var2 = enemy->varTable[1]; - temp_f20 = var2 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 12; - return; - } - - if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = (rand_int(1000) % 11) + 5; - return; - } - script->functionTemp[0] = 0; - } -} - -// enemy2 is being copied to a0 -#ifdef NON_EQUIVALENT -ApiStatus N(func_80241DB8_CC55C8)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); - f32 temp_f4; - f32 dist; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 120.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - N(UnkFunc5)(npc, enemy, script, aiSettings); - script->functionTemp[0] = 0; - } - npc->unk_AB = -3; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - - case 1: - N(func_80241704_CC4F14)(script, aiSettings, territoryPtr); - break; - - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - - case 3: - N(func_80241B68_CC5378)(script, aiSettings, territoryPtr); - break; - } - - if (script->functionTemp[0] == 12) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - enemy->varTable[4] = N(func_802416BC_CC4ECC)(); - if (enemy->varTable[4] >= 0) { - Enemy* enemy2 = get_enemy(enemy->varTable[4]); - enemy2->varTable[10] = 1; - enemy2->varTable[11] = enemy->npcID; - npc->duration = 15; - npc->currentAnim.w = 0x490014; - script->functionTemp[0] = 30; - } - } - - switch (script->functionTemp[0]) { - case 12: - N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); - - case 13: - N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); - break; - - case 14: - N(UnkFunc6)(script, aiSettings, territoryPtr); - break; - } - - switch (script->functionTemp[0]) { - case 30: - npc->duration--; - if (npc->duration <= 0) { - get_enemy(enemy->varTable[4])->varTable[10] = 2; - npc->duration = 5; - script->functionTemp[0] = 31; - } - - case 31: - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = 0x490015; - get_enemy(enemy->varTable[4])->varTable[10] = 3; - npc->duration = 10; - script->functionTemp[0] = 32; - } - - case 32: - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 3; - script->functionTemp[0] = 33; - } - - case 33: - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 0; - } - break; - } - - if (((u32)script->functionTemp[0] - 30) < 2) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - dist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, npc->pos.x, npc->pos.z); - if (!is_point_within_region(territoryPtr->shape, territoryPtr->pointX, territoryPtr->pointZ, npc->pos.x, npc->pos.z, - territoryPtr->sizeX, territoryPtr->sizeZ)) { - if ((dist > 30.0) && (npc->turnAroundYawAdjustment == 0)) { - temp_f4 = dist - 20.0; - if (temp_f4 < 0.0) { - temp_f4 = 0.0f; - } - if (temp_f4 > 200.0) { - temp_f4 = 200.0f; - } - npc->moveSpeed = update_lerp(0, aiSettings->moveSpeed, aiSettings->chaseSpeed, temp_f4, 200); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - } - } - - return ApiStatus_BLOCK; -} -#else -INCLUDE_ASM(ApiStatus, "world/area_flo/flo_13/CC3850", flo_13_func_80241DB8_CC55C8, Evt* script, - s32 isInitialCall); -#endif - -#include "world/common/atomic/enemy/UnkAI_6.inc.c" +#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/UnkFunc42.inc.c" diff --git a/src/world/area_flo/flo_13/flo_13.h b/src/world/area_flo/flo_13/flo_13.h index 6faaef6695..8077b593fd 100644 --- a/src/world/area_flo/flo_13/flo_13.h +++ b/src/world/area_flo/flo_13/flo_13.h @@ -8,8 +8,8 @@ ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80241DB8_CC55C8)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall); +ApiStatus N(LakituAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc42)(Evt* script, s32 isInitialCall); ApiStatus N(func_802433C0_CC6BD0)(Evt* script, s32 isInitialCall); ApiStatus N(func_802434D4_CC6CE4)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 3be2fcee8f..8d1793f0d9 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -9,7 +9,7 @@ enum { BSS s32 N(ItemChoiceList)[91]; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -19,14 +19,14 @@ NpcAISettings N(npcAISettings_802444D8) = { .moveTime = 30, .waitTime = 5, .alertRadius = 80.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 2, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 2, .chaseSpeed = 4.5f, - .unk_1C = { .s = 6 }, - .unk_20 = 1, + .chaseTurnRate= 6, + .chaseUpdateInterval = 1, .chaseRadius = 90.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 1, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80244508) = { @@ -34,7 +34,7 @@ EvtScript N(npcAI_80244508) = { EVT_CALL(SetSelfVar, 5, -630) EVT_CALL(SetSelfVar, 6, 50) EVT_CALL(SetSelfVar, 1, 200) - EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_802444D8))) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(npcAISettings_802444D8))) EVT_RETURN EVT_END }; @@ -169,7 +169,7 @@ StaticNpc N(npcGroup_80244B20) = { .id = NPC_BUBULB, .settings = &N(npcSettings_802445A4), .pos = { 617.0f, 0.0f, 108.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_4000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_4000, .init = &N(init_80244ADC), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -200,7 +200,7 @@ StaticNpc N(npcGroup_80244D10) = { .id = NPC_BZZAP, .settings = &N(npcSettings_80244578), .pos = { -175.0f, 55.0f, 15.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -323,7 +323,7 @@ EvtScript N(80245224) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" #include "world/common/atomic/ItemChoice_PartA.inc.c" diff --git a/src/world/area_flo/flo_14/flo_14.h b/src/world/area_flo/flo_14/flo_14.h index 131443193d..2c8a68701e 100644 --- a/src/world/area_flo/flo_14/flo_14.h +++ b/src/world/area_flo/flo_14/flo_14.h @@ -17,7 +17,7 @@ ApiStatus N(func_8024042C_CCB73C)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024046C_CCB77C)(Evt* script, s32 isInitialCall); void N(func_80240504_CCB814)(void); void N(func_802407D4_CCBAE4)(void); -ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); +ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall); ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_15/CD06C0.c b/src/world/area_flo/flo_15/CD06C0.c index dbeb65dd87..988e3c09d2 100644 --- a/src/world/area_flo/flo_15/CD06C0.c +++ b/src/world/area_flo/flo_15/CD06C0.c @@ -282,7 +282,7 @@ StaticNpc N(npcGroup_80240EE0)[] = { .id = NPC_SUN0, .settings = &N(npcSettings_80240300), .pos = { 0.0f, 250.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_400000, .init = &N(init_80240CD0), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -312,7 +312,7 @@ StaticNpc N(npcGroup_80240EE0)[] = { .id = NPC_SUN1, .settings = &N(npcSettings_80240300), .pos = { 0.0f, 250.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_8000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_8000, .init = &N(init_80240DB4), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 29da8bfa8b..223b9ed4df 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -8,7 +8,7 @@ enum { NPC_TUFF_PUFF1, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -18,12 +18,12 @@ NpcAISettings N(npcAISettings_80244028) = { .moveTime = 45, .waitTime = 60, .alertRadius = 100.0f, - .unk_14 = 3, + .playerSearchInterval = 3, .chaseSpeed = 3.6f, - .unk_1C = { .s = 10 }, - .unk_20 = 1, + .chaseTurnRate= 10, + .chaseUpdateInterval = 1, .chaseRadius = 120.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80244058) = { @@ -31,7 +31,7 @@ EvtScript N(npcAI_80244058) = { EVT_CALL(SetSelfVar, 5, 0) EVT_CALL(SetSelfVar, 6, 0) EVT_CALL(SetSelfVar, 1, 600) - EVT_CALL(N(UnkNpcAIMainFunc10), EVT_PTR(N(npcAISettings_80244028))) + EVT_CALL(N(FlyingNoAttackAI_Main), EVT_PTR(N(npcAISettings_80244028))) EVT_RETURN EVT_END }; @@ -49,7 +49,7 @@ StaticNpc N(npcGroup_802440F4) = { .id = NPC_TUFF_PUFF0, .settings = &N(npcSettings_802440C8), .pos = { 440.0f, 145.0f, 15.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 10, @@ -85,7 +85,7 @@ StaticNpc N(npcGroup_802442E4) = { .id = NPC_TUFF_PUFF1, .settings = &N(npcSettings_802440C8), .pos = { 600.0f, 145.0f, 15.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 10, @@ -353,6 +353,6 @@ EvtScript N(802451C4) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_10.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" diff --git a/src/world/area_flo/flo_16/flo_16.h b/src/world/area_flo/flo_16/flo_16.h index 72b6b41275..0b84595348 100644 --- a/src/world/area_flo/flo_16/flo_16.h +++ b/src/world/area_flo/flo_16/flo_16.h @@ -9,7 +9,7 @@ ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CD1E30)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc44)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall); +ApiStatus N(FlyingNoAttackAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242940_CD4770)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_802444D4); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 3000ef09e9..2357bf1d87 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -309,7 +309,7 @@ NpcSettings N(npcSettings_802443D8) = { .level = 99, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -319,14 +319,14 @@ NpcAISettings N(npcAISettings_80244424) = { .moveTime = 60, .waitTime = 30, .alertRadius = 60.0f, - .unk_10 = { .f = 50.0f }, - .unk_14 = 3, + .alertOffsetDist = 50.0f, + .playerSearchInterval = 3, .chaseSpeed = 3.5f, - .unk_1C = { .s = 60 }, - .unk_20 = 10, + .chaseTurnRate= 60, + .chaseUpdateInterval = 10, .chaseRadius = 80.0f, - .unk_28 = { .f = 70.0f }, - .unk_2C = 1, + .chaseOffsetDist = 70.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80244454) = { @@ -334,7 +334,7 @@ EvtScript N(npcAI_80244454) = { EVT_CALL(SetSelfVar, 5, -650) EVT_CALL(SetSelfVar, 6, 30) EVT_CALL(SetSelfVar, 1, 400) - EVT_CALL(N(func_80241C64_CD8F44), EVT_PTR(N(npcAISettings_80244424))) + EVT_CALL(N(LakituAI_Main), EVT_PTR(N(npcAISettings_80244424))) EVT_RETURN EVT_END }; @@ -353,12 +353,12 @@ NpcAISettings N(npcAISettings_802444F0) = { .moveTime = 30, .waitTime = 50, .alertRadius = 60.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 3, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 3, .chaseSpeed = 6.0f, .chaseRadius = 100.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 3, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_80244520) = { @@ -366,7 +366,7 @@ EvtScript N(npcAI_80244520) = { EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) EVT_CALL(SetSelfVar, 7, 4) - EVT_CALL(N(UnkNpcAIMainFunc6), EVT_PTR(N(npcAISettings_802444F0))) + EVT_CALL(N(SpinyAI_Main), EVT_PTR(N(npcAISettings_802444F0))) EVT_RETURN EVT_END }; @@ -401,7 +401,7 @@ StaticNpc N(npcGroup_80244688) = { .id = NPC_LAKITU0, .settings = &N(npcSettings_802444C4), .pos = { -185.0f, 90.0f, 10.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, @@ -440,7 +440,7 @@ StaticNpc N(npcGroup_80244878) = { .id = NPC_LAKITU1, .settings = &N(npcSettings_802444C4), .pos = { 200.0f, 90.0f, -25.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 25, @@ -479,7 +479,7 @@ StaticNpc N(npcGroup_80244A68) = { .id = NPC_SPINY0, .settings = &N(npcSettings_8024465C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), @@ -511,7 +511,7 @@ StaticNpc N(npcGroup_80244C58) = { .id = NPC_SPINY1, .settings = &N(npcSettings_8024465C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), @@ -543,7 +543,7 @@ StaticNpc N(npcGroup_80244E48) = { .id = NPC_SPINY2, .settings = &N(npcSettings_8024465C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), @@ -575,7 +575,7 @@ StaticNpc N(npcGroup_80245038) = { .id = NPC_SPINY3, .settings = &N(npcSettings_8024465C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_4 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .yaw = 0, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), @@ -625,283 +625,7 @@ EvtScript N(makeEntities) = { EVT_END }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -s32 N(func_80241568_CD8848)(void) { - s32 i; - - for (i = 50; i < 54; i++) { - if (get_enemy(i)->varTable[10] == 0) { - return i; - } - } - - return -1; -} - -void N(func_802415B0_CD8890)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 temp_f20; - f32 temp_f22; - f32 temp_f24; - f32 var1 = enemy->varTable[4]; - f32 var2 = enemy->varTable[3]; - f32 var3; - - temp_f22 = var1 / 100.0; - temp_f24 = var2 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var3 = enemy->varTable[1]; - temp_f20 = var3 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->moveToPos.y = y + temp_f24; - script->functionTemp[0] = 12; - return; - } - } - script->functionTemp[1]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, - enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, - enemy->territory->wander.wanderSizeZ) != 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } - - if (npc->turnAroundYawAdjustment == 0) { - if (npc->duration > 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (enemy->varTable[0] & 1) { - x = npc->pos.x; - y = temp_f22; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - y += temp_f24; - w = y - temp_f22; - if (w > 2.0) { - temp_f22 += 2.0; - } else if (w < -2.0) { - temp_f22 -= 2.0; - } else { - temp_f22 = y; - } - enemy->varTable[4] = (temp_f22 * 100.0); - } - if (npc->duration > 0) { - return; - } - } - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) { - script->functionTemp[0] = 0; - } - } -} - -void N(func_80241A14_CD8CF4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 var1 = enemy->varTable[3]; - f32 var2; - f32 temp_f20; - f32 temp_f22; - - temp_f22 = var1 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var2 = enemy->varTable[1]; - temp_f20 = var2 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) != 0) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 12; - return; - } - - if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = (rand_int(1000) % 11) + 5; - return; - } - script->functionTemp[0] = 0; - } -} - -// enemy2 is being copied to a0 -#ifdef NON_EQUIVALENT -ApiStatus N(func_80241C64_CD8F44)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); - f32 temp_f4; - f32 dist; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 120.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - N(UnkFunc5)(npc, enemy, script, aiSettings); - script->functionTemp[0] = 0; - } - npc->unk_AB = -3; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - - case 1: - N(func_802415B0_CD8890)(script, aiSettings, territoryPtr); - break; - - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - - case 3: - N(func_80241A14_CD8CF4)(script, aiSettings, territoryPtr); - break; - } - - if (script->functionTemp[0] == 12) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - enemy->varTable[4] = N(func_80241568_CD8848)(); - if (enemy->varTable[4] >= 0) { - Enemy* enemy2 = get_enemy(enemy->varTable[4]); - enemy2->varTable[10] = 1; - enemy2->varTable[11] = enemy->npcID; - npc->duration = 15; - npc->currentAnim.w = 0x490014; - script->functionTemp[0] = 30; - } - } - - switch (script->functionTemp[0]) { - case 12: - N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); - - case 13: - N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); - break; - - case 14: - N(UnkFunc6)(script, aiSettings, territoryPtr); - break; - } - - switch (script->functionTemp[0]) { - case 30: - npc->duration--; - if (npc->duration <= 0) { - get_enemy(enemy->varTable[4])->varTable[10] = 2; - npc->duration = 5; - script->functionTemp[0] = 31; - } - - case 31: - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = 0x490015; - get_enemy(enemy->varTable[4])->varTable[10] = 3; - npc->duration = 10; - script->functionTemp[0] = 32; - } - - case 32: - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 3; - script->functionTemp[0] = 33; - } - - case 33: - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 0; - } - break; - } - - if (((u32)script->functionTemp[0] - 30) < 2) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - dist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, npc->pos.x, npc->pos.z); - if (!is_point_within_region(territoryPtr->shape, territoryPtr->pointX, territoryPtr->pointZ, npc->pos.x, npc->pos.z, - territoryPtr->sizeX, territoryPtr->sizeZ)) { - if ((dist > 30.0) && (npc->turnAroundYawAdjustment == 0)) { - temp_f4 = dist - 20.0; - if (temp_f4 < 0.0) { - temp_f4 = 0.0f; - } - if (temp_f4 > 200.0) { - temp_f4 = 200.0f; - } - npc->moveSpeed = update_lerp(0, aiSettings->moveSpeed, aiSettings->chaseSpeed, temp_f4, 200); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - } - } - - return ApiStatus_BLOCK; -} -#else -INCLUDE_ASM(ApiStatus, "world/area_flo/flo_17/CD7350", flo_17_func_80241C64_CD8F44, Evt* script, - s32 isInitialCall); -#endif - -#include "world/common/atomic/enemy/UnkAI_6.inc.c" +#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" diff --git a/src/world/area_flo/flo_17/flo_17.h b/src/world/area_flo/flo_17/flo_17.h index 04b3505974..acc0297113 100644 --- a/src/world/area_flo/flo_17/flo_17.h +++ b/src/world/area_flo/flo_17/flo_17.h @@ -7,8 +7,8 @@ #define NAMESPACE flo_17 ApiStatus N(func_80240000_CD72E0)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80241C64_CD8F44)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall); +ApiStatus N(LakituAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240040_CD7320)(Evt *script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80245228); diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index f4af762f1a..80bcc63df5 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -1535,7 +1535,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .id = NPC_LAKITU0, .settings = &N(npcSettings_80243F10), .pos = { 0.0f, 15.0f, 60.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245B90), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1573,7 +1573,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .id = NPC_LAKITU1, .settings = &N(npcSettings_80243F10), .pos = { 65.0f, 15.0f, 60.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245C04), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1611,7 +1611,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .id = NPC_LAKITU2, .settings = &N(npcSettings_80243F10), .pos = { 135.0f, 15.0f, 35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245C78), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1649,7 +1649,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .id = NPC_MAGIKOOPA, .settings = &N(npcSettings_80243F3C), .pos = { -60.0f, 0.0f, 50.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245AA8), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -1687,7 +1687,7 @@ StaticNpc N(npcGroup_80245CEC)[] = { .id = NPC_FLYING_MAGIKOOPA, .settings = &N(npcSettings_80243F3C), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_400000, .init = &N(init_80245B30), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index b00e0827d2..f7333c63e6 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -831,7 +831,7 @@ StaticNpc N(npcGroup_80243804)[] = { .id = NPC_HUFF_N_PUFF0, .settings = &N(npcSettings_802417EC), .pos = { 650.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, .init = &N(init_802435E4), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -861,7 +861,7 @@ StaticNpc N(npcGroup_80243804)[] = { .id = NPC_HUFF_N_PUFF1, .settings = &N(npcSettings_802417EC), .pos = { 650.0f, 100.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, .init = &N(init_80243684), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -891,7 +891,7 @@ StaticNpc N(npcGroup_80243804)[] = { .id = NPC_HUFF_N_PUFF2, .settings = &N(npcSettings_802417EC), .pos = { 650.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, .init = &N(init_8024371C), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -929,7 +929,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF0, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -959,7 +959,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF1, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -989,7 +989,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF2, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1019,7 +1019,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF3, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1049,7 +1049,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF4, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1079,7 +1079,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF5, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1109,7 +1109,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF6, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1139,7 +1139,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF7, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1169,7 +1169,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF8, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1199,7 +1199,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF9, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1229,7 +1229,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF10, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1259,7 +1259,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF11, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1289,7 +1289,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF12, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1319,7 +1319,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF13, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -1349,7 +1349,7 @@ StaticNpc N(npcGroup_80243DDC)[] = { .id = NPC_TUFF_PUFF14, .settings = &N(npcSettings_802417C0), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802437A8), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c index 0543b68e64..737c285108 100644 --- a/src/world/area_flo/flo_22/CEC240.c +++ b/src/world/area_flo/flo_22/CEC240.c @@ -175,7 +175,7 @@ StaticNpc N(npcGroup_80240A04) = { .id = NPC_BZZAP, .settings = &N(npcSettings_80240520), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_80240740), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, @@ -205,7 +205,7 @@ StaticNpc N(npcGroup_80240BF4) = { .id = NPC_DAYZEE, .settings = &N(npcSettings_80240520), .pos = { 0.0f, -1000.0f, 0.0f }, - .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .init = &N(init_802409CC), .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index a932e6bbb0..c2409195c2 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -172,12 +172,12 @@ NpcAISettings N(npcAISettings_80241498) = { .moveTime = 30, .waitTime = 50, .alertRadius = 60.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 3, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 3, .chaseSpeed = 6.0f, .chaseRadius = 100.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 3, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 3, }; EvtScript N(npcAI_802414C8) = { @@ -185,7 +185,7 @@ EvtScript N(npcAI_802414C8) = { EVT_CALL(SetSelfVar, 3, 18) EVT_CALL(SetSelfVar, 5, 3) EVT_CALL(SetSelfVar, 7, 4) - EVT_CALL(N(UnkNpcAIMainFunc5), EVT_PTR(N(npcAISettings_80241498))) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(npcAISettings_80241498))) EVT_RETURN EVT_END }; @@ -353,7 +353,7 @@ StaticNpc N(npcGroup_80241F98) = { .id = NPC_GATE_FLOWER, .settings = &N(npcSettings_802412E0), .pos = { 385.0f, 0.0f, -35.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80241E70), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -384,7 +384,7 @@ StaticNpc N(npcGroup_80242188) = { .id = NPC_SPINY0, .settings = &N(npcSettings_80241538), .pos = { 80.0f, 0.0f, 0.0f }, - .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), @@ -415,7 +415,7 @@ StaticNpc N(npcGroup_80242378) = { .id = NPC_SPINY1, .settings = &N(npcSettings_80241538), .pos = { -320.0f, 0.0f, 0.0f }, - .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = STANDARD_HEART_DROPS(3), @@ -468,6 +468,6 @@ EvtScript N(makeEntities) = { #include "world/common/atomic/MakeConsumableChoice.inc.c" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/atomic/ItemChoice_FlowerGuard.inc.c" diff --git a/src/world/area_flo/flo_23/flo_23.h b/src/world/area_flo/flo_23/flo_23.h index d68b2d5c8a..7490d5ae9f 100644 --- a/src/world/area_flo/flo_23/flo_23.h +++ b/src/world/area_flo/flo_23/flo_23.h @@ -13,7 +13,7 @@ ApiStatus N(func_80240000_CEE260)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall); ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall); +ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(FlowerGuard_SetItemEntityPosition)(Evt* script, s32 isInitialCall); ApiStatus N(FlowerGuard_JudgeItemTastiness)(Evt* script, s32 isInitialCall); ApiStatus N(FlowerGuard_MakeItemList)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 4da88cd5b4..d1e44bbe9e 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -125,7 +125,7 @@ NpcSettings N(npcSettings_802428F0) = { .level = 99, }; -f32 N(sixFloats)[] = { +f32 N(FlyingAI_JumpVels)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -135,12 +135,12 @@ NpcAISettings N(npcAISettings_80242934) = { .moveTime = 45, .waitTime = 60, .alertRadius = 100.0f, - .unk_14 = 3, + .playerSearchInterval = 3, .chaseSpeed = 3.6f, - .unk_1C = { .s = 10 }, - .unk_20 = 1, + .chaseTurnRate= 10, + .chaseUpdateInterval = 1, .chaseRadius = 120.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80242964) = { @@ -148,7 +148,7 @@ EvtScript N(npcAI_80242964) = { EVT_CALL(SetSelfVar, 5, 0) EVT_CALL(SetSelfVar, 6, 0) EVT_CALL(SetSelfVar, 1, 600) - EVT_CALL(N(UnkNpcAIMainFunc10), EVT_PTR(N(npcAISettings_80242934))) + EVT_CALL(N(FlyingNoAttackAI_Main), EVT_PTR(N(npcAISettings_80242934))) EVT_RETURN EVT_END }; @@ -167,14 +167,14 @@ NpcAISettings N(npcAISettings_80242A00) = { .moveTime = 30, .waitTime = 5, .alertRadius = 80.0f, - .unk_10 = { .f = 30.0f }, - .unk_14 = 2, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 2, .chaseSpeed = 4.5f, - .unk_1C = { .s = 6 }, - .unk_20 = 1, + .chaseTurnRate= 6, + .chaseUpdateInterval = 1, .chaseRadius = 90.0f, - .unk_28 = { .f = 30.0f }, - .unk_2C = 1, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80242A30) = { @@ -182,7 +182,7 @@ EvtScript N(npcAI_80242A30) = { EVT_CALL(SetSelfVar, 5, -630) EVT_CALL(SetSelfVar, 6, 50) EVT_CALL(SetSelfVar, 1, 200) - EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_80242A00))) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(npcAISettings_80242A00))) EVT_RETURN EVT_END }; @@ -390,7 +390,7 @@ StaticNpc N(npcGroup_8024368C) = { .id = NPC_GATE_FLOWER, .settings = &N(npcSettings_802428F0), .pos = { 505.0f, 0.0f, -25.0f }, - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, .init = &N(init_80243564), .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, @@ -513,9 +513,9 @@ static s32 N(pad_3CD8)[] = { 0x00000000, 0x00000000, }; -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_10.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" #include "world/common/atomic/ItemChoice_PartA.inc.c" diff --git a/src/world/area_flo/flo_25/flo_25.h b/src/world/area_flo/flo_25/flo_25.h index 545fcdd0c5..51a6105ab4 100644 --- a/src/world/area_flo/flo_25/flo_25.h +++ b/src/world/area_flo/flo_25/flo_25.h @@ -10,8 +10,8 @@ ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CF2BD0)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall); +ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall); +ApiStatus N(FlyingNoAttackAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall); ApiStatus N(BuildItemChoiceList)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index c6ae153590..8acb693a77 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/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_10.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 147259166d..bb8e3b5eaf 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/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_hos/hos_05/A2AAC0.c b/src/world/area_hos/hos_05/A2AAC0.c index 1b304337a2..4ceaef2437 100644 --- a/src/world/area_hos/hos_05/A2AAC0.c +++ b/src/world/area_hos/hos_05/A2AAC0.c @@ -1,17 +1,54 @@ #include "hos_05.h" -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240880_A2AAC0); +void set_model_fog_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, u8 var7, u8 var8, s32 var9, s32 var10); + +ApiStatus func_80240880_A2AAC0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 primR = evt_get_variable(script, *args++); + s32 primG = evt_get_variable(script, *args++); + s32 primB = evt_get_variable(script, *args++); + s32 primA = evt_get_variable(script, *args++); + s32 fogR = evt_get_variable(script, *args++); + s32 fogG = evt_get_variable(script, *args++); + s32 fogB = evt_get_variable(script, *args++); + s32 fogStart = evt_get_variable(script, *args++); + s32 fogEnd = evt_get_variable(script, *args++); + + set_model_fog_color_parameters(primR, primG, primB, primA, fogR, fogG, fogB, fogStart, fogEnd); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802409C4_A2AC04); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240D54_A2AF94); +void func_80240D54_A2AF94(s32 camID, f32 fov) { + Camera* camera = &gCameras[camID]; + camera->vfov = fov * 1.1; +} -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240DA0_A2AFE0); +ApiStatus func_80240DA0_A2AFE0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 camID = evt_get_variable(script, *args++); + f32 fov = evt_get_float_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240DF8_A2B038); + func_80240D54_A2AF94(camID, fov); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240E30_A2B070); +ApiStatus func_80240DF8_A2B038(Evt* script, s32 isInitialCall) { + GameStatus* gameStatus = gGameStatusPtr; + if (gameStatus->creditsViewportMode < 5U) { + gameStatus->creditsViewportMode++; + state_init_intro(); + } + return ApiStatus_DONE1; +} +ApiStatus func_80240E30_A2B070(Evt* script, s32 isInitialCall) { + mdl_set_all_fog_mode(3); + return ApiStatus_DONE2; +} + +// adjusts properties of EmitterVolume:GoldShimmer2 effect INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240E50_A2B090); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240F30_A2B170); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index 1669240ea0..710a176a4f 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -18,13 +18,8 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88); INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802409F8_A39ED8); - -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A3C_A39F1C); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A68_A39F48); diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index 099cd42ac3..5bdbd17bff 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -1,6 +1,6 @@ #include "isk_04.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index cef5f0eba2..4fc8d476be 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_04"; static char* N(exit_str_1) = ""; -#include "world/common/atomic/enemy/UnkAI_3.inc.c" +#include "world/common/enemy/StoneChompAI.inc.c" #include "world/common/UnkFunc53.inc.c" diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index b3adbca34b..83062af973 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index d4ece9dd89..9f99ea637a 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_12"; static char* N(exit_str_1) = ""; -#include "world/common/atomic/enemy/UnkAI_3.inc.c" +#include "world/common/enemy/StoneChompAI.inc.c" #include "world/common/UnkFunc53.inc.c" diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index f39b5e4140..75e34ad9fc 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -3,7 +3,7 @@ static char* N(exit_str_0) = "isk_10"; static char* N(exit_str_1) = ""; -#include "world/common/atomic/enemy/UnkAI_3.inc.c" +#include "world/common/enemy/StoneChompAI.inc.c" #include "world/common/UnkFunc53.inc.c" diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c index a9035388d0..cddf74169c 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_iwa/iwa_00/90CC40.c b/src/world/area_iwa/iwa_00/90CC40.c index c027295423..d8869db5c8 100644 --- a/src/world/area_iwa/iwa_00/90CC40.c +++ b/src/world/area_iwa/iwa_00/90CC40.c @@ -1,4 +1,5 @@ #include "iwa_00.h" +#include "effects.h" static char* N(exit_str_0) = "iwa_10"; static char* N(exit_str_1) = "iwa_01"; @@ -7,4 +8,39 @@ static char* N(exit_str_1) = "iwa_01"; #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_80240118_90CD58); +// slightly modified version of OnDefeatEnemy which uses a spatialized death sound +ApiStatus func_80240118_90CD58(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp; + + if (isInitialCall) { + script->functionTemp[0] = 0; + script->functionTemp[1] = 20; + } + if (script->functionTemp[1] & 1) { + npc->flags &= ~NPC_FLAG_2; + } else { + npc->flags |= NPC_FLAG_2; + } + if (script->functionTemp[1] == 15) { + sfx_play_sound_at_position(SOUND_DEATH, 0, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z); + fx_damage_stars(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0.0f, -1.0f, 0.0f, 0xA); + } + + temp = script->functionTemp[1]; + if (script->functionTemp[1] == 10) { + fx_big_smoke_puff(npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 10.0f); + // odd logic needed to match + if (script->functionTemp[1] == temp) { + spawn_drops(enemy); + } + } + + script->functionTemp[1]--; + if(script->functionTemp[1] == 0) { + return ApiStatus_DONE1; + } else { + return ApiStatus_BLOCK; + } +} diff --git a/src/world/area_iwa/iwa_00/90CEF0.c b/src/world/area_iwa/iwa_00/90CEF0.c index 3d8cc03f6d..ff82dafe96 100644 --- a/src/world/area_iwa/iwa_00/90CEF0.c +++ b/src/world/area_iwa/iwa_00/90CEF0.c @@ -1,3 +1,7 @@ #include "iwa_00.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CEF0", func_802402B0_90CEF0); +ApiStatus func_802402B0_90CEF0(Evt* script, s32 isInitialCall) { + gPlayerStatus.unk_D0 = script->varTablePtr[0]; + gPlayerStatus.flags |= PLAYER_STATUS_FLAGS_10; + return ApiStatus_DONE2; +} diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index 071b9ab7dc..7fd385f459 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -1,57 +1,9 @@ #include "iwa_01.h" -#include "world/common/UnkFunc61.inc.c" +#include "world/common/enemy/MontyMoleAI.inc.c" -#include "world/common/UnkNpcAIFunc48.inc.c" - -#include "world/common/UnkNpcAIFunc49.inc.c" - -#include "world/common/UnkSetDurationFunc.inc.c" - -#include "world/common/UnkNpcAIFunc9.inc.c" - -#include "world/common/UnkDurationCheckNoArgs.inc.c" - -#include "world/common/UnkFunc54.inc.c" - -#include "world/common/UnkFunc55.inc.c" // AI for projectile - -#include "world/common/atomic/enemy/MontyMoleAI.inc.c" - -#include "world/common/UnkNpcAIMainFunc7.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802422C4_911974); - -#include "world/common/UnkNpcAIFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242498_911B48); - -#include "world/common/UnkNpcAIFunc21.inc.c" - -#include "world/common/UnkNpcAIFunc20.inc.c" - -#include "world/common/UnkNpcAIFunc22.inc.c" - -#include "world/common/UnkFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc16.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242958_912008); - -#include "world/common/UnkFunc10.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242C48_9122F8); - -#include "world/common/UnkFunc9.inc.c" - -#include "world/common/UnkNpcAIFunc19.inc.c" - -#include "world/common/UnkNpcAIFunc17.inc.c" - -#define NAMESPACE dup_iwa_01 -#include "world/common/UnkDurationCheck.inc.c" -#define NAMESPACE iwa_01 - -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F54_912604); +#include "world/common/enemy/CleftAI.inc.c" diff --git a/src/world/area_iwa/iwa_01/912960.c b/src/world/area_iwa/iwa_01/912960.c index 05f662983b..9ad40f3c12 100644 --- a/src/world/area_iwa/iwa_01/912960.c +++ b/src/world/area_iwa/iwa_01/912960.c @@ -1,3 +1,7 @@ #include "iwa_01.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/912960", func_802432B0_912960); +ApiStatus func_802432B0_912960(Evt* script, s32 isInitialCall) { + gPlayerStatus.unk_D0 = script->varTablePtr[0]; + gPlayerStatus.flags |= PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE; + return ApiStatus_DONE2; +} diff --git a/src/world/area_iwa/iwa_02/915D70.c b/src/world/area_iwa/iwa_02/915D70.c index edc48a36d2..1b84220863 100644 --- a/src/world/area_iwa/iwa_02/915D70.c +++ b/src/world/area_iwa/iwa_02/915D70.c @@ -3,37 +3,7 @@ static char* N(exit_str_0) = "iwa_01"; static char* N(exit_str_1) = "iwa_04"; -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240000_915D70); - -#include "world/common/UnkNpcAIFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_802401D4_915F44); - -#include "world/common/UnkNpcAIFunc21.inc.c" - -#include "world/common/UnkNpcAIFunc20.inc.c" - -#include "world/common/UnkNpcAIFunc22.inc.c" - -#include "world/common/UnkFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc16.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240694_916404); - -#include "world/common/UnkFunc10.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240984_9166F4); - -#include "world/common/UnkFunc9.inc.c" - -#include "world/common/UnkNpcAIFunc19.inc.c" - -#include "world/common/UnkNpcAIFunc17.inc.c" - -#include "world/common/UnkDurationCheck.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00); +#include "world/common/enemy/CleftAI.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index f60283473f..2a15c718f9 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -11,4 +11,17 @@ static char* N(exit_str_1) = ""; #include "world/common/CheckItemFlags40.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_802402BC_918E6C); +ApiStatus func_802402BC_918E6C(Evt* script, s32 isInitialCall) { + s32 result = -1; + + if (gPlayerStatus.lastGoodPosition.y > 200.0) { + result = 0; + } + if (gPlayerStatus.lastGoodPosition.y < 40.0) { + result = 1; + } + if (result >= 0) { + evt_set_variable(script, GW(9), result); + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_iwa/iwa_03/918EF0.c b/src/world/area_iwa/iwa_03/918EF0.c index 577632dc85..8e5fe295ff 100644 --- a/src/world/area_iwa/iwa_03/918EF0.c +++ b/src/world/area_iwa/iwa_03/918EF0.c @@ -1,35 +1,9 @@ #include "iwa_03.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240340_918EF0); +#include "world/common/enemy/CleftAI.inc.c" -#include "world/common/UnkNpcAIFunc18.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240514_9190C4); - -#include "world/common/UnkNpcAIFunc21.inc.c" - -#include "world/common/UnkNpcAIFunc20.inc.c" - -#include "world/common/UnkNpcAIFunc22.inc.c" - -#include "world/common/UnkFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc16.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_802409D4_919584); - -#include "world/common/UnkFunc10.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240CC4_919874); - -#include "world/common/UnkFunc9.inc.c" - -#include "world/common/UnkNpcAIFunc19.inc.c" - -#include "world/common/UnkNpcAIFunc17.inc.c" - -#include "world/common/UnkDurationCheck.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240FD0_919B80); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80241320_919ED0); +ApiStatus func_80241320_919ED0(Evt* script, s32 isInitialCall) { + gPlayerStatus.unk_D0 = script->varTablePtr[0]; + gPlayerStatus.flags |= PLAYER_STATUS_FLAGS_10; + return ApiStatus_DONE2; +} diff --git a/src/world/area_iwa/iwa_04/91B8E0.c b/src/world/area_iwa/iwa_04/91B8E0.c index aa9ffe5d1b..c706e1ac43 100644 --- a/src/world/area_iwa/iwa_04/91B8E0.c +++ b/src/world/area_iwa/iwa_04/91B8E0.c @@ -3,40 +3,32 @@ static char* N(exit_str_0) = "iwa_02"; static char* N(exit_str_1) = "sbk_99"; -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240000_91B8E0); +ApiStatus func_80240000_91B8E0(Evt* script, s32 isInitialCall) { + s32 status = -1; + + if (gPlayerStatus.lastGoodPosition.y > -100.0) { + status = 0; + } + if (gPlayerStatus.lastGoodPosition.y < -240.0) { + status = 1; + } + if (status >= 0) { + evt_set_variable(script, GW(9), status); + } + + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240080_91B960); +#include "world/common/enemy/CleftAI.inc.c" -#include "world/common/UnkNpcAIFunc18.inc.c" +ApiStatus func_80241060_91C940(Evt* script, s32 isInitialCall) { + gCameras->unk_498 = 1.0f; + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240254_91BB34); - -#include "world/common/UnkNpcAIFunc21.inc.c" - -#include "world/common/UnkNpcAIFunc20.inc.c" - -#include "world/common/UnkNpcAIFunc22.inc.c" - -#include "world/common/UnkFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc16.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240714_91BFF4); - -#include "world/common/UnkFunc10.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240A04_91C2E4); - -#include "world/common/UnkFunc9.inc.c" - -#include "world/common/UnkNpcAIFunc19.inc.c" - -#include "world/common/UnkNpcAIFunc17.inc.c" - -#include "world/common/UnkDurationCheck.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240D10_91C5F0); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80241060_91C940); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_8024107C_91C95C); +ApiStatus func_8024107C_91C95C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Npc* npc = resolve_npc(script, NPC_SELF); + npc->renderYaw = (f32) evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} diff --git a/src/world/area_iwa/iwa_10/91E570.c b/src/world/area_iwa/iwa_10/91E570.c index 0b0228bba7..15c7583e38 100644 --- a/src/world/area_iwa/iwa_10/91E570.c +++ b/src/world/area_iwa/iwa_10/91E570.c @@ -3,4 +3,11 @@ static char* N(exit_str_0) = "iwa_00"; static char* N(exit_str_1) = "iwa_11"; -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E570", func_80240000_91E570); +ApiStatus func_80240000_91E570(Evt* script, s32 isInitialCall) { + if (script->varTable[15] > 720) { + script->varTable[15] = 0; + } + script->varTable[0] = script->varTable[15] * 6; + script->varTable[1] = script->varTable[15] / 2; + return ApiStatus_DONE2; +} diff --git a/src/world/area_iwa/iwa_11/9269F0.c b/src/world/area_iwa/iwa_11/9269F0.c index b89c087e0a..e251e322b1 100644 --- a/src/world/area_iwa/iwa_11/9269F0.c +++ b/src/world/area_iwa/iwa_11/9269F0.c @@ -7,4 +7,10 @@ static char* N(exit_str_3) = "iwa_10\0"; static char* N(exit_str_4) = "kmr_22"; static char* N(exit_str_5) = ""; -INCLUDE_ASM(s32, "world/area_iwa/iwa_11/9269F0", func_80240000_9269F0); +ApiStatus func_80240000_9269F0(Evt* script, s32 isInitialCall) { + if (gGameStatusPtr->pressedButtons & (BUTTON_A | BUTTON_B)) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} diff --git a/src/world/area_iwa/iwa_11/926A10.c b/src/world/area_iwa/iwa_11/926A10.c index e8fe147bcc..71e27852c6 100644 --- a/src/world/area_iwa/iwa_11/926A10.c +++ b/src/world/area_iwa/iwa_11/926A10.c @@ -2,6 +2,16 @@ #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_11/926A10", func_802401B0_926BA0); +ApiStatus func_802401B0_926BA0(Evt* script) { + f32 angle = clamp_angle(script->varTable[2] * -2.4f); + + evt_set_float_variable(script, LW(0), angle); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_iwa/iwa_11/926A10", func_80240208_926BF8); +ApiStatus func_80240208_926BF8(Evt* script, s32 isInitialCall) { + f32 angle = clamp_angle(script->varTable[2] * -2.4f * 0.6f); + + evt_set_float_variable(script, LW(0), angle); + return ApiStatus_DONE2; +} diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index f9c946f954..26a6f6f151 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -1,11 +1,12 @@ #include "jan_00.h" +#include "npc.h" #include "effects.h" #include "world/common/atomic/TexturePan.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240340_B20880); +#include "world/common/HeartPlant_SpawnHeart.inc.c" #include "world/common/StashVars.inc.c" @@ -21,13 +22,8 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C_B20CCC); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802407C4_B20D04); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240ADC_B2101C); - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B20_B21060); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B4C_B2108C); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 78ad43f08b..623ea4d0be 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -7,7 +7,7 @@ static char* N(exit_str_1) = "jan_02"; INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_8024030C_B2833C); -#include "world/common/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" #include "world/common/SetCamera0Flag1000.inc.c" diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 1398026b34..ca08c2a5ca 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -2,7 +2,7 @@ #define CHUCK_QUIZMO_NPC_ID 5 -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 7e6add9efc..8e284c25f9 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -13,7 +13,7 @@ static char* N(exit_str_3) = ""; INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC); -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" static char* N(exit_str_4) = "tik_08"; @@ -39,12 +39,7 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EAC_B37A7C); - -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EF0_B37AC0); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242F1C_B37AEC); diff --git a/src/world/area_jan/jan_05/B4AF10.c b/src/world/area_jan/jan_05/B4AF10.c index 1ce97fdf3e..0fea0d1129 100644 --- a/src/world/area_jan/jan_05/B4AF10.c +++ b/src/world/area_jan/jan_05/B4AF10.c @@ -2,7 +2,6 @@ #include "common/foliage.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_802406DC_B4B14C); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_80240738_B4B1A8); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 9cf07186cd..145a49d224 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_ASM(s32, "world/area_jan/jan_05/B4B260", func_802407F0_B4B260); +#include "world/common/HeartPlant_SpawnHeart.inc.c" -#include "world/common/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" -#include "world/common/atomic/enemy/SpearGuy.inc.c" +#include "world/common/enemy/SpearGuyAI.inc.c" #define NAMESPACE dup_jan_05 #include "common/foliage.inc.c" diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index ecf96d4c27..1215c0f2ab 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/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241554_B53D84); +#include "world/common/HeartPlant_SpawnHeart.inc.c" -#include "world/common/atomic/enemy/SpearGuy.inc.c" +#include "world/common/enemy/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 e7a4f35271..b1d91a23fa 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/atomic/enemy/SpearGuy.inc.c" +#include "world/common/enemy/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index 9685695ba4..9fa34d9f7e 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_ASM(s32, "world/area_jan/jan_08/B5F650", func_802413A0_B5F650); +#include "world/common/HeartPlant_SpawnHeart.inc.c" -#include "world/common/atomic/enemy/SpearGuy.inc.c" +#include "world/common/enemy/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index 9d9d498ce2..1865307220 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/atomic/enemy/SpearGuy.inc.c" +#include "world/common/enemy/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index d0b9209764..0a1e0deea4 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/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_jan/jan_12/B730B0.c b/src/world/area_jan/jan_12/B730B0.c index d3302ad568..76e27ba8b6 100644 --- a/src/world/area_jan/jan_12/B730B0.c +++ b/src/world/area_jan/jan_12/B730B0.c @@ -1,15 +1,10 @@ #include "jan_12.h" +#include "model.h" static char* N(exit_str_0) = "jan_13"; static char* N(exit_str_1) = "jan_06"; -INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_80240000_B730B0); - -INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802400F8_B731A8); - -INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_80240170_B73220); - -INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802401CC_B7327C); +#include "world/common/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 85c2f29f66..dc33ce646b 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/atomic/enemy/SpearGuy.inc.c" +#include "world/common/enemy/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_14/B7A050.c b/src/world/area_jan/jan_14/B7A050.c index 1859d805d6..c0e66bf80e 100644 --- a/src/world/area_jan/jan_14/B7A050.c +++ b/src/world/area_jan/jan_14/B7A050.c @@ -3,13 +3,6 @@ static char* N(exit_str_0) = "jan_15"; static char* N(exit_str_1) = "jan_13"; -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_80240000_B7A050); - -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_802400F8_B7A148); - -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_80240170_B7A1C0); - -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A050", func_802401CC_B7A21C); +#include "world/common/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 894e6090ad..aea68e9a6a 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/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_jan/jan_15/B7D920.c b/src/world/area_jan/jan_15/B7D920.c index 79489a7874..0280f4abed 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_ASM(s32, "world/area_jan/jan_15/B7D920", func_80240000_B7D920); +#include "world/common/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 20c06a027f..20c9e1453b 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -5,7 +5,7 @@ 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/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_jan/jan_22/B851A0.c b/src/world/area_jan/jan_22/B851A0.c index 1f8efa1d57..ac4c92f11d 100644 --- a/src/world/area_jan/jan_22/B851A0.c +++ b/src/world/area_jan/jan_22/B851A0.c @@ -1,16 +1,50 @@ #include "jan_22.h" -INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241020_B851A0); +ApiStatus func_80241020_B851A0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_168, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802410C4_B85244); +ApiStatus func_802410C4_B85244(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_185, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241168_B852E8); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802412E0_B85460); +ApiStatus func_802412E0_B85460(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 posA = evt_get_variable(script, *args++); + s32 ax1 = posA - 17; + s32 ax2 = posA + 17; + s32 posB = evt_get_variable(script, *args++); + s32 bx1 = posB - 17; + s32 bx2 = posB + 17; + + script->varTable[8] = -1; + if (((gPlayerStatus.position.x < ax1) || (ax2 < gPlayerStatus.position.x)) + && ((gPlayerStatus.position.x < bx1) || (bx2 < gPlayerStatus.position.x))) { + script->varTable[8] = gGameStatusPtr->pressedButtons & BUTTON_A; + } + return ApiStatus_DONE2; +} #include "common/foliage.inc.c" - INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_8024160C_B8578C); INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241668_B857E8); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 70f7098359..a55191ef0d 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/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/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 cb36b08bc2..10caaec381 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/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index e3ad732740..112d1bd7f3 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -22,7 +22,7 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/atomic/enemy/UnkAI_4.inc.c" +#include "world/common/enemy/StationaryAI.inc.c" static char* N(exit_str_4) = "nok_02"; static char* N(exit_str_5) = "kmr_03"; @@ -44,13 +44,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426A0_8B2710); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426E4_8B2754); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242710_8B2780); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 98fe4f4aff..b481372b70 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/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index f0f4202ccf..11763c1e34 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/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 06b94b909b..00a9fcea3a 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/atomic/enemy/UnkAI_4.inc.c" +#include "world/common/enemy/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 7595a01ffe..9b882c3dd6 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/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/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_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index a0ffe13971..51fcd1274c 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -4,6 +4,6 @@ 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/atomic/enemy/UnkAI_4.inc.c" +#include "world/common/enemy/StationaryAI.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240DDC_8DAEDC); diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index ea19878476..9d9da6f7af 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -34,18 +34,18 @@ NpcAISettings N(goombaAISettings) = { .moveTime = 30, .waitTime = 30, .alertRadius = 130.0f, - .unk_10 = { .f = 0.0f }, - .unk_14 = 1, + .alertOffsetDist = 0.0f, + .playerSearchInterval = 1, .chaseSpeed = 2.5f, - .unk_1C = { .s = 180 }, - .unk_20 = 3, + .chaseTurnRate= 180, + .chaseUpdateInterval = 3, .chaseRadius = 150.0f, - .unk_28 = { .f = 0.0f }, - .unk_2C = TRUE, + .chaseOffsetDist = 0.0f, + .unk_AI_2C = 1, }; EvtScript kmr_12_GoombaAI = { - EVT_CALL(DoBasicAI, EVT_ADDR(N(goombaAISettings))) + EVT_CALL(BasicAI_Main, EVT_ADDR(N(goombaAISettings))) EVT_RETURN EVT_END }; diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index 4669163b9a..ad1944544f 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index 4e00c158ca..5e4fe337bf 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -1,44 +1,7 @@ #include "kpa_03.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" -#include "world/common/UnkNpcAIFunc47.inc.c" - -#include "world/common/UnkFunc57.inc.c" - -#include "world/common/UnkFunc58.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024119C_A4975C); - -#include "world/common/UnkFunc59.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241368_A49928); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802413CC_A4998C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024150C_A49ACC); - -void func_802416B0_A49C70(Evt* script) { - get_npc_unsafe(script->owner1.enemy->npcID)->duration = 40; - script->functionTemp[0] = 21; -} - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802416EC_A49CAC); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802418AC_A49E6C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241918_A49ED8); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241A4C_A4A00C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241AB4_A4A074); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D20_A4A2E0); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D6C_A4A32C); - -#include "world/common/GetEncounterEnemyIsOwner.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DFC_A4A3BC); +#include "world/common/enemy/MagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_03/A4A410.c b/src/world/area_kpa/kpa_03/A4A410.c index 67ec8970c5..1d149abba3 100644 --- a/src/world/area_kpa/kpa_03/A4A410.c +++ b/src/world/area_kpa/kpa_03/A4A410.c @@ -1,3 +1,13 @@ #include "kpa_03.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A4A410", func_80241E50_A4A410); +ApiStatus func_80241E50_A4A410(Evt* script) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (playerStatus->lastGoodPosition.y >= 0) { + evt_set_variable(script, GW(0), FALSE); + } + if (playerStatus->lastGoodPosition.y <= -280) { + evt_set_variable(script, GW(0), TRUE); + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_kpa/kpa_08/A4CAC0.c b/src/world/area_kpa/kpa_08/A4CAC0.c index fedff1e866..2bdc6affdc 100644 --- a/src/world/area_kpa/kpa_08/A4CAC0.c +++ b/src/world/area_kpa/kpa_08/A4CAC0.c @@ -1,37 +1,3 @@ #include "kpa_08.h" -#include "world/common/UnkNpcAIFunc47.inc.c" - -#include "world/common/UnkFunc57.inc.c" - -#include "world/common/UnkFunc58.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802407F4_A4D214); - -#include "world/common/UnkFunc59.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802409C0_A4D3E0); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240A24_A4D444); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240B64_A4D584); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240D08_A4D728); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240D44_A4D764); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240F04_A4D924); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240F70_A4D990); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802410A4_A4DAC4); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_8024110C_A4DB2C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241378_A4DD98); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802413C4_A4DDE4); - -#include "world/common/GetEncounterEnemyIsOwner.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241454_A4DE74); +#include "world/common/enemy/MagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index aca836bfb3..9a6f6d06ff 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/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index da10684b63..a30be4e593 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -1,41 +1,9 @@ #include "kpa_102.h" -#include "world/common/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/UnkNpcAIFunc47.inc.c" - -#include "world/common/UnkFunc57.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242410_A95B50); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024244C_A95B8C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802425D8_A95D18); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802429C8_A96108); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242ABC_A961FC); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242D00_A96440); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242D3C_A9647C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242F08_A96648); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242F74_A966B4); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802430A8_A967E8); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243198_A968D8); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243270_A969B0); - -#define NAMESPACE dup_kpa_102 -#include "world/common/GetEncounterEnemyIsOwner.inc.c" -#define NAMESPACE kpa_102 - -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024353C_A96C7C); +#include "world/common/enemy/FlyingMagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c index ae1e2070d7..47fef12a40 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index 63d4ea08ea..d8728cae43 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -7,6 +7,6 @@ static char* N(exit_str_1) = "kpa_112"; #include "world/common/UnkFunc12.inc.c" -#include "world/common/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index 4a117fb4fa..47920f2db9 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -4,6 +4,6 @@ #include "world/common/UnkFunc12.inc.c" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 2818f2dc04..9915f76481 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -9,6 +9,6 @@ static char* N(exit_str_3) = ""; #include "world/common/UnkFunc12.inc.c" -#include "world/common/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_130/AA2D20.c b/src/world/area_kpa/kpa_130/AA2D20.c index 805b67e368..be05854da6 100644 --- a/src/world/area_kpa/kpa_130/AA2D20.c +++ b/src/world/area_kpa/kpa_130/AA2D20.c @@ -3,8 +3,4 @@ static char* N(exit_str_0) = "kpa_134"; static char* N(exit_str_1) = "kpa_111"; -INCLUDE_ASM(s32, "world/area_kpa/kpa_130/AA2D20", func_80240000_AA2D20); - -#include "world/common/atomic/enemy/BulletBill.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_130/AA2D20", func_802404AC_AA31CC); +#include "world/common/enemy/BulletBillAI.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index 34dcd283ff..9bf2f2b5af 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/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index 91a37b7e9e..23ae6f4600 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -1,39 +1,5 @@ #include "kpa_51.h" -#include "world/common/UnkNpcAIFunc47.inc.c" +#include "world/common/enemy/MagikoopaAI.inc.c" -#include "world/common/UnkFunc57.inc.c" - -#include "world/common/UnkFunc58.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802407A4_A64834); - -#include "world/common/UnkFunc59.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240970_A64A00); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802409D4_A64A64); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240B14_A64BA4); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240CB8_A64D48); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240CF4_A64D84); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240EB4_A64F44); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240F20_A64FB0); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241054_A650E4); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802410BC_A6514C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241328_A653B8); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241374_A65404); - -#include "world/common/GetEncounterEnemyIsOwner.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494); - -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index 28bfb04093..7b59796b76 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/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index f148793deb..7d3acac941 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -1,35 +1,5 @@ #include "kpa_61.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/UnkNpcAIFunc47.inc.c" - -#include "world/common/UnkFunc57.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802411C4_A6F5A4); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241200_A6F5E0); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024138C_A6F76C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024177C_A6FB5C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241870_A6FC50); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241AB4_A6FE94); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241AF0_A6FED0); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241CBC_A7009C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241D28_A70108); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241E5C_A7023C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241F4C_A7032C); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", update_heroes_start_turn_A70404); - -#include "world/common/GetEncounterEnemyIsOwner.inc.c" - -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422F0_A706D0); +#include "world/common/enemy/FlyingMagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c index 300a076f3c..d93972a923 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index c200bd4eae..fe57dfc06f 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -3,10 +3,6 @@ static char* N(exit_str_0) = "kpa_90"; static char* N(exit_str_1) = ""; -#include "world/common/atomic/enemy/UnkAI_1.inc.c" - -#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c" - -#include "world/common/UnkNpcAIMainFunc8.inc.c" +#include "world/common/enemy/KoopaPatrolAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index e1a98b22fd..e4869c6061 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -1,9 +1,5 @@ #include "kpa_95.h" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" - -#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c" - -#include "world/common/UnkNpcAIMainFunc8.inc.c" +#include "world/common/enemy/KoopaPatrolAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 5d5fe2936f..cd43f81f89 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -1,8 +1,8 @@ #include "kzn_02.h" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_10.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" #include "world/common/StashVars.inc.c" @@ -18,10 +18,5 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242364_C5CAA4); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_8024239C_C5CADC); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426B4_C5CDF4); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426F8_C5CE38); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index e9902f41d3..2e1d29c14a 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -1,38 +1,11 @@ #include "kzn_03.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +// spike top +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024234C_C6305C); +#include "world/common/enemy/PiranhaPlantAI.inc.c" #include "world/common/StashVars.inc.c" @@ -48,10 +21,5 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242934_C63644); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024296C_C6367C); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242C84_C63994); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242CC8_C639D8); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_kzn/kzn_03/C63A10.c b/src/world/area_kzn/kzn_03/C63A10.c index 09e3cb7a5c..42bdb002f7 100644 --- a/src/world/area_kzn/kzn_03/C63A10.c +++ b/src/world/area_kzn/kzn_03/C63A10.c @@ -6,10 +6,33 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D38_C63A48); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242DB0_C63AC0); +ApiStatus func_80242DB0_C63AC0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_168, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242E54_C63B64); +ApiStatus func_80242E54_C63B64(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_185, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242EF8_C63C08); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80243070_C63D80); +ApiStatus func_80243070_C63D80(Evt* script, s32 isInitialCall) { + script->varTable[8] = gGameStatusPtr->pressedButtons & BUTTON_A; + return ApiStatus_DONE2; +} diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 9b1182736d..5283d77a4f 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -5,6 +5,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240720_C6EA50); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802407F4_C6EB24); -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_10.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 3b55d1798e..a35311134e 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -1,37 +1,9 @@ #include "kzn_08.h" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_10.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243C90_C75110); +#include "world/common/enemy/PiranhaPlantAI.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243EE0_C75360); diff --git a/src/world/area_kzn/kzn_09/C77A20.c b/src/world/area_kzn/kzn_09/C77A20.c index 007b5b64ec..fe4aecbb0e 100644 --- a/src/world/area_kzn/kzn_09/C77A20.c +++ b/src/world/area_kzn/kzn_09/C77A20.c @@ -1,9 +1,32 @@ #include "kzn_09.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80240D40_C77A20); +ApiStatus func_80240D40_C77A20(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_168, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80240DE4_C77AC4); +ApiStatus func_80240DE4_C77AC4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_185, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80240E88_C77B68); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80241000_C77CE0); +ApiStatus func_80241000_C77CE0(Evt* script, s32 isInitialCall) { + script->varTable[8] = gGameStatusPtr->pressedButtons & BUTTON_A; + return ApiStatus_DONE2; +} diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index f07685db59..c71d411b90 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -1,37 +1,8 @@ #include "kzn_09.h" -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/PiranhaPlantAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -// Data migration (UnkNpcAIFunc46) -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241A58_C78738); - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454); - -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" @@ -49,10 +20,5 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243644_C7A324); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024367C_C7A35C); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243994_C7A674); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802439D8_C7A6B8); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index d9bbca1b4f..5cb860f546 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -1,8 +1,8 @@ #include "kzn_11.h" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_10.inc.c" +#include "world/common/enemy/FlyingNoAttackAI.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241F4C_C820EC); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 346c348705..5e47defe55 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -1,37 +1,8 @@ #include "kzn_17.h" -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/PiranhaPlantAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -// Data migration (UnkNpcAIFunc46) -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240D48_C867F8); - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514); - -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" @@ -49,10 +20,5 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242934_C883E4); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024296C_C8841C); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242C84_C88734); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242CC8_C88778); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index dc076095a2..53a9d56155 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -38,12 +38,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241800_C8F3B0); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241838_C8F3E8); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B50_C8F700); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B94_C8F744); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241BC0_C8F770); diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index 80c811b218..fddf994021 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -14,13 +14,8 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406A8_C965D8); INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406E0_C96610); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802409F8_C96928); - -INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240A3C_C9696C); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240A68_C96998); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 812f5b7235..a6187a5738 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -23,13 +23,8 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40); - -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D74_7ECA84); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241DA0_7ECAB0); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index f0cea2d436..238b9c14c8 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -1,6 +1,6 @@ #include "mac_00.h" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" static char* N(exit_str_0) = "mac_01"; @@ -27,13 +27,6 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0); #define NAMESPACE dup_mac_00 -#include "world/common/SetManyVars.inc.c" +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" #define NAMESPACE mac_00 - -#define NAMESPACE dup_mac_00 -#include "world/common/UnkYawFunc.inc.c" -#define NAMESPACE mac_00 - -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243AE8_7EE7F8); - -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243B2C_7EE83C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index f20f90ee20..755c939944 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -6,7 +6,7 @@ extern u8 D_80258407_818C87; #include "world/common/UnkMusicFunc.inc.c" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" static char* N(exit_str_0) = "flo_00"; static char* N(exit_str_1) = "kmr_22"; @@ -45,13 +45,8 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D28_8045A8); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078_8048F8); - -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440BC_80493C); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" #include "world/common/GetPlayerCoins.inc.c" diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index c674b67d45..2f75abe4b6 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -2,7 +2,7 @@ #define NAMESPACE dup_mac_01 -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" #define NAMESPACE mac_01 diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 21ce9458c3..3eb5c70a63 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/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" extern s32 N(Quizmo_Worker); extern s32 N(Quizmo_AnswerResult); @@ -36,12 +36,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243088_826348); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802430D0_826390); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243380_826640); - -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433C4_826684); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" #include "world/common/UnkMusicFunc.inc.c" diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 8ed4143018..2f4423375f 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -23,13 +23,8 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B14_833314); - -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B58_833358); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B84_833384); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index d11320366e..bf69594009 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -11,7 +11,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC); -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" extern s32 N(Quizmo_Worker); extern s32 N(Quizmo_AnswerResult); @@ -33,13 +33,8 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A20_854B90); - -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A64_854BD4); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 64076cc66f..7512d62140 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -7,7 +7,7 @@ static char* N(exit_str_3) = ""; #include "world/common/atomic/Pipe.inc.c" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" /* N(GetAvailableGamesCount) */ ApiStatus func_80241170_E0F910(Evt* script, s32 isInitialCall) { diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 62486994e9..1fb6e83c2f 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -1,96 +1,3 @@ #include "mim_01.h" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -ApiStatus func_80241C54_B95094(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* settings = (NpcAISettings*) evt_get_variable(script, *script->ptrReadPos); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 200.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - enemy->varTable[0] = 0; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc31)(script, settings, territoryPtr); - /* fallthrough */ - case 1: - N(UnkNpcAIFunc32)(script, settings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc46)(script, settings, territoryPtr); - if (script->functionTemp[0] != 11) { - break; - } - case 11: - N(UnkNpcDurationFlagFunc3)(script, settings, territoryPtr); - if (script->functionTemp[0] != 12) { - break; - } - case 12: - N(UnkNpcAIFunc33)(script, settings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - N(UnkNpcDurationFlagFunc2)(script, settings, territoryPtr); - if (script->functionTemp[0] != 14) { - break; - } - case 14: - N(UnkNpcAIFunc30)(script, settings, territoryPtr); - break; - case 99: - func_8004A73C(script); - break; - } - - return ApiStatus_BLOCK; -} +#include "world/common/enemy/PiranhaPlantAI.inc.c" diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index a2e0456306..8b0df768a5 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -1,6 +1,6 @@ #include "mim_02.h" -#include "world/common/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index 9e6bdd9e2f..5de77b8dc3 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -1,6 +1,6 @@ #include "mim_04.h" -#include "world/common/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" #include "world/common/StashVars.inc.c" diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index 59356c46f6..6364686025 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -1,31 +1,3 @@ #include "mim_05.h" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802417C4_BA1EF4); +#include "world/common/enemy/PiranhaPlantAI.inc.c" diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 8a420557e0..63da1e8d3a 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -1,33 +1,5 @@ #include "mim_06.h" -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/PiranhaPlantAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241CC4_BA6444); - -#include "world/common/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 0a00ca22ec..6acb9e55a3 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -1,3 +1,3 @@ #include "mim_07.h" -#include "world/common/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 67bba16e64..7e472e0d4a 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -5,36 +5,11 @@ static char* N(exit_str_1) = "mim_05"; #include "world/common/SetForeverForestFog.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240068_BAD9A8); +ApiStatus func_80240068_BAD9A8(Evt* script, s32 isInitialCall) { + script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); + return ApiStatus_DONE2; +} -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242CEC_BB062C); +#include "world/common/enemy/PiranhaPlantAI.inc.c" diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index 09687a2b23..3acd91f3b7 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -7,4 +7,4 @@ static char* N(exit_str_1) = "mim_07"; INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240068_BB2E68); -#include "world/common/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 6d891fb4af..fd4d63d7e3 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -5,7 +5,7 @@ static char* N(exit_str_1) = "nok_02"; #define CHUCK_QUIZMO_NPC_ID 15 -#include "world/common/atomic/enemy/UnkAI_4.inc.c" +#include "world/common/enemy/StationaryAI.inc.c" #include "world/common/atomic/ToadHouse.inc.c" @@ -27,13 +27,8 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802423CC_9C77AC); - -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242410_9C77F0); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024243C_9C781C); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index a50d1967ab..5fa4ff321c 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/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" static char* N(exit_str_0) = "nok_02"; static char* N(exit_str_1) = "obk_09"; @@ -25,13 +25,8 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242F74_9D9F94); - -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FB8_9D9FD8); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" #include "world/common/SwitchToPartner.inc.c" diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index 5b9cee095c..7c43db57cb 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/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 580533a803..436c0cfbd4 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 65a99594a4..c7d22525ec 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -1,9 +1,7 @@ #include "nok_12.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" - -#include "world/common/UnkNpcAIMainFunc8.inc.c" +#include "world/common/enemy/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 164a12bc94..28cecf3ef2 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/atomic/enemy/UnkAI_2.inc.c" +#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 2d3b02ffd0..4d77aca8d5 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -1,18 +1,5 @@ #include "nok_14.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -// todo remove when below are decompiled -static const f32 padding = 0.0f; - -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241E8C_A046CC); - -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241FB4_A047F4); - -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242070_A048B0); - -#include "world/common/UnkDurationCheck.inc.c" - -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802421CC_A04A0C); +#include "world/common/enemy/ParatroopaAI.inc.c" diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 4ade4eae91..2292a87748 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -7,19 +7,6 @@ static char* N(exit_str_3) = ""; #include "world/common/atomic/Pipe.inc.c" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -// todo remove when below are decompiled -static const f32 padding = 0.0f; - -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241FAC_A08EAC); - -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802420D4_A08FD4); - -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80242190_A09090); - -#include "world/common/UnkDurationCheck.inc.c" - -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422EC_A091EC); +#include "world/common/enemy/ParatroopaAI.inc.c" diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index a6245d3f59..b98ec1a4b0 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -14,13 +14,8 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18); INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240EC8_BBE068); - -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240F0C_BBE0AC); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240F38_BBE0D8); diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 6eab66211d..a743b1a415 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -14,10 +14,5 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788); INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240540_BC47C0); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240858_BC4AD8); - -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_8024089C_BC4B1C); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 977f1c79b5..067e3598a8 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -6,19 +6,11 @@ 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_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240970_D9DE40); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802409E0_D9DEB0); +#include "world/common/enemy/StationaryAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240AB0_D9DF80); - -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240BA8_D9E078); - -#include "world/common/atomic/enemy/UnkAI_4.inc.c" - -#include "world/common/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 8bbe91f082..109e9212f7 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -15,20 +15,20 @@ static char* N(exit_str_1) = ""; #include "world/common/SetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4); +ApiStatus func_802402F4_DAD6F4(Evt* script, s32 isInitialCall) { + f32 playerVx = gPlayerStatus.currentSpeed * 5.0f * sin_deg(gPlayerStatus.targetYaw); + f32 playerVz = gPlayerStatus.currentSpeed * 5.0f * -cos_deg(gPlayerStatus.targetYaw); + script->varTable[0] = (gPlayerStatus.position.x + playerVx); + script->varTable[1] = (gPlayerStatus.position.z + playerVz); + + return ApiStatus_DONE2; +} -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241898_DAEC98); - -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241908_DAED08); - -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802419D8_DAEDD8); - -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241AD0_DAEED0); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" +const s32 N(pad_8)[] = { 0, 0 }; static char* N(exit_str_2) = "omo_04"; #include "world/common/SetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 433ea9c199..72028696f2 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -3,23 +3,11 @@ static char* N(exit_str_0) = "omo_17"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240000_DB22C0); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240070_DB2330); +#include "world/common/enemy/GrooveGuyAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240140_DB2400); - -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240238_DB24F8); - -#include "world/common/UnkNpcAIFunc4.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802405BC_DB287C); - -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240780_DB2A40); - -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index d9e190336b..b55fdee82d 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -3,31 +3,11 @@ static char* N(exit_str_0) = "omo_06"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240000_DBD2B0); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240070_DBD320); +#include "world/common/enemy/ShyGuyPatrolAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240140_DBD3F0); - -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240238_DBD4E8); - -#include "world/common/atomic/enemy/UnkAI_1.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802413FC_DBE6AC); - -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024146C_DBE71C); - -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024153C_DBE7EC); - -#define NAMESPACE dup_omo_07 -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" -#define NAMESPACE omo_07 - -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241634_DBE8E4); - -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" #include "world/common/SetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_08/DC4C40.c b/src/world/area_omo/omo_08/DC4C40.c index 1549be2683..47bcef9f11 100644 --- a/src/world/area_omo/omo_08/DC4C40.c +++ b/src/world/area_omo/omo_08/DC4C40.c @@ -1,11 +1,3 @@ #include "omo_08.h" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_80240870_DC4C40); - -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_802408E0_DC4CB0); - -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_802409B0_DC4D80); - -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC4C40", func_80240AA8_DC4E78); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 58bb4f40f7..0d2821b1f1 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -1,30 +1,10 @@ #include "omo_09.h" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802409E0_DCD6B0); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240A50_DCD720); +#include "world/common/enemy/ShyGuyPatrolAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240B20_DCD7F0); - -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240C18_DCD8E8); - -#include "world/common/atomic/enemy/UnkAI_1.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241DDC_DCEAAC); - -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241E4C_DCEB1C); - -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241F1C_DCEBEC); - -#define NAMESPACE dup_omo_09 -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" -#define NAMESPACE omo_09 - -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242014_DCECE4); - -#include "world/common/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 153685f802..8a6a072b4c 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -1,26 +1,33 @@ #include "omo_13.h" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240280_DE2710); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802402F0_DE2780); - -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802403C0_DE2850); - -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802404B8_DE2948); - -#include "world/common/UnkNpcAIFunc4.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_8024083C_DE2CCC); - -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240A00_DE2E90); +#include "world/common/enemy/GrooveGuyAI.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/AddPlayerHandsOffset.inc.c" +// matches, needs data migration +#ifdef NON_MATCHING +ApiStatus func_80240F00_DE3390(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + D_80241C04_DE4094 = FALSE; + } + + if (D_80241C04_DE4094) { + D_80241C04_DE4094 = FALSE; + evt_set_variable(script, *args++, D_80241C08_DE4098); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#else INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390); +#endif INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index aebed9cf99..8cb1e8a52e 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -1,24 +1,12 @@ #include "omo_17.h" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240560_DEF400); +#include "world/common/enemy/ShyGuyWanderAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802405D0_DEF470); +#include "world/common/enemy/GrooveGuyAI.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802406A0_DEF540); +#include "world/common/enemy/FlyingAI.inc.c" -#include "world/common/UnkNpcDurationAnimationFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240798_DEF638); - -#include "world/common/UnkNpcAIFunc4.inc.c" - -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240B1C_DEF9BC); - -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240CE0_DEFB80); - -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -#include "world/common/atomic/enemy/ThrowAttackAI.inc.c" +#include "world/common/enemy/RangedAttackAI.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_osr/osr_00/AACBB0.c b/src/world/area_osr/osr_00/AACBB0.c index 35a27fffb0..8f9c7eea34 100644 --- a/src/world/area_osr/osr_00/AACBB0.c +++ b/src/world/area_osr/osr_00/AACBB0.c @@ -2,6 +2,16 @@ #include "world/common/atomic/UnkFunc27.inc.c" -INCLUDE_ASM(s32, "world/area_osr/osr_00/AACBB0", func_80240678_AACEA8); +ApiStatus func_80240678_AACEA8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 primR = *args++; + s32 primG = *args++; + s32 primB = *args++; + s32 envR = *args++; + s32 envG = *args++; + s32 envB = *args++; + set_model_env_color_parameters(primR, primG, primB, envR, envG, envB); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_osr/osr_00/AACBB0", func_802406E0_AACF10); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index 22d7d655c5..b8d5bbb5f9 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -14,10 +14,5 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240A48_AB0A38); - -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240A8C_AB0A7C); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 41af7d249c..c195f7c29d 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -2,19 +2,9 @@ #include "world/common/atomic/Reflection.inc.c" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/PatrolNoAttackAI.inc.c" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" +#include "world/common/enemy/MeleeHitbox.inc.c" // Requires data migration #ifdef NON_MATCHING @@ -22,24 +12,24 @@ ApiStatus func_802423CC_D8F61C(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - territory.unk_00 = 0; + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->patrol.detectShape; territory.pointX = enemy->territory->patrol.detect.x; territory.pointZ = enemy->territory->patrol.detect.z; territory.sizeX = enemy->territory->patrol.detectSizeX; territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~NPC_FLAG_JUMPING; if (!enemy->territory->patrol.isFlying) { npc->flags |= NPC_FLAG_GRAVITY; npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; @@ -47,69 +37,69 @@ ApiStatus func_802423CC_D8F61C(Evt *script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; } enemy->varTable[0] = 0; } - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { + if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(MeleeHitbox_CanSeePlayer)(script)) { script->functionTemp[0] = 30; } switch (script->functionTemp[0]) { case 0: - pra_35_UnkNpcAIFunc24(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_MoveInit(script, npcAISettings, territoryPtr); // fallthrough case 1: - pra_35_UnkFunc13(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_Move(script, npcAISettings, territoryPtr); break; case 2: - pra_35_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_LoiterInit(script, npcAISettings, territoryPtr); // fallthrough case 3: - pra_35_UnkFunc14(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_Loiter(script, npcAISettings, territoryPtr); break; case 7: - pra_35_UnkNpcAIFunc25(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_PostLoiter(script, npcAISettings, territoryPtr); break; case 5: - pra_35_NpcJumpFunc2(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_JumpInit(script, npcAISettings, territoryPtr); // fallthrough case 11: - pra_35_NpcJumpFunc(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_Jump(script, npcAISettings, territoryPtr); break; case 12: - pra_35_UnkNpcAIFunc13(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_ChaseInit(script, npcAISettings, territoryPtr); // fallthrough case 13: - pra_35_UnkFunc15(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_Chase(script, npcAISettings, territoryPtr); break; case 14: - pra_35_UnkNpcDurationFlagFunc(script, npcAISettings, territoryPtr); + pra_35_PatrolAI_LosePlayer(script, npcAISettings, territoryPtr); break; case 30: - pra_35_UnkNpcAIFunc6(script); + pra_35_MeleeHitbox_30(script); // fallthrough case 31: - pra_35_UnkNpcAIFunc7(script); + pra_35_MeleeHitbox_31(script); if (script->functionTemp[0] != 32) { break; } // fallthrough case 32: - pra_35_UnkNpcAIFunc8(script); + pra_35_MeleeHitbox_32(script); if (script->functionTemp[0] != 33) { break; } // fallthrough case 33: - pra_35_UnkNpcAIFunc5(script); + pra_35_MeleeHitbox_33(script); break; case 99: - func_8004A73C(script); + basic_ai_suspend(script); break; } return ApiStatus_BLOCK; @@ -118,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/UnkNpcAIFunc27.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 86acc38675..5457a70026 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -4,16 +4,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240000_D92F40); #include "world/common/atomic/Reflection.inc.c" -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/MeleeHitbox.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 7778107842..8928757222 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -23,13 +23,8 @@ extern EffectInstance* N(Quizmo_VannaTEffect); #include "world/common/atomic/Quizmo.inc.c" -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A10_CF9580); - -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A54_CF95C4); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" #include "common/GetItemEntityPosition.inc.c" diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index 594949c5f8..7e5d88d7fa 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -3,18 +3,11 @@ static char* N(exit_str_0) = "sam_11"; static char* N(exit_str_1) = "sam_04"; -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240000_D110C0); +ApiStatus func_80240000_D110C0(Evt* script, s32 isInitialCall) { + Npc* temp_v0 = get_npc_unsafe(0); + + script->varTable[0] = atan2(temp_v0->pos.x, temp_v0->pos.z, gPlayerStatus.position.x, gPlayerStatus.position.z); + return ApiStatus_DONE2; +} -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index dbf2bdce19..1286342a48 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -3,35 +3,7 @@ static char* N(exit_str_0) = "sam_04"; static char* N(exit_str_1) = "sam_06"; -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241754_D19F34); +#include "world/common/enemy/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 b2a9754a50..d9c5112c7f 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -1,6 +1,6 @@ #include "sam_06.h" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" #include "world/common/StashVars.inc.c" @@ -20,12 +20,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); #include "world/common/atomic/ToadHouse.inc.c" -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802424C8_D22358); - -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024250C_D2239C); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/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 8c0c96a4eb..85fa403bad 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -13,32 +13,4 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); #include "world/common/UnsetCamera0MoveFlag1.inc.c" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" - -#include "world/common/UnkNpcAIFunc31.inc.c" - -#include "world/common/UnkNpcAIFunc32.inc.c" - -#include "world/common/UnkNpcAIFunc46.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc3.inc.c" - -#include "world/common/UnkNpcAIFunc33.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc2.inc.c" - -#include "world/common/UnkNpcAIFunc30.inc.c" - -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241DA4_D2DAD4); +#include "world/common/enemy/PiranhaPlantAI.inc.c" diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index c24baf85ad..228a3131a2 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -1,21 +1,35 @@ #include "sam_08.h" -#include "world/common/UnkNpcAIFunc6.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" +ApiStatus func_80241610_D31290(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); -#include "world/common/UnkNpcAIFunc8.inc.c" + fx_big_smoke_puff(x, y, z); + + return ApiStatus_DONE2; +} -#include "world/common/UnkNpcAIFunc5.inc.c" +ApiStatus func_802416A4_D31324(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); -#include "world/common/UnkNpcAIFunc26.inc.c" + sfx_adjust_env_sound_pos(0x8000006C, 0, x, y, z); + + return ApiStatus_DONE2; +} -#include "world/common/UnkFunc7.inc.c" +ApiStatus func_8024174C_D313CC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 rumbleFreq = evt_get_variable(script, *args++); + s32 rumbleTime = evt_get_variable(script, *args++); -#include "world/common/UnkNpcAIFunc27.inc.c" - -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80241610_D31290); - -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_802416A4_D31324); - -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_8024174C_D313CC); + start_rumble(rumbleFreq & 0xFF, rumbleTime & 0xFFFF); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index 1c8bbb525a..ed50f3f888 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -1,15 +1,3 @@ #include "sam_10.h" -#include "world/common/UnkNpcAIFunc6.inc.c" - -#include "world/common/UnkNpcAIFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc8.inc.c" - -#include "world/common/UnkNpcAIFunc5.inc.c" - -#include "world/common/UnkNpcAIFunc26.inc.c" - -#include "world/common/UnkFunc7.inc.c" - -#include "world/common/UnkNpcAIFunc27.inc.c" +#include "world/common/enemy/WanderMeleeAI.inc.c" diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index 4c39ddd9de..1980fd43bd 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -8,17 +8,17 @@ NpcAISettings N(npcAISettings_80240300) = { .moveTime = 50, .waitTime = 10, .alertRadius = 250.0f, - .unk_14 = 2, + .playerSearchInterval = 2, .chaseSpeed = 3.5f, - .unk_1C = { .s = 45 }, - .unk_20 = 6, + .chaseTurnRate= 45, + .chaseUpdateInterval = 6, .chaseRadius = 300.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_80240330) = { EVT_CALL(N(SetNpcB5_3)) - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80240300))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80240300))) EVT_RETURN EVT_END }; @@ -36,7 +36,7 @@ StaticNpc N(npcGroup_80240388) = { .id = 0, .settings = &N(npcSettings_8024035C), .pos = { -40.0f, 0.0f, 160.0f }, - .flags = NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_JUMPING, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -73,7 +73,7 @@ StaticNpc N(npcGroup_80240578) = { .id = 1, .settings = &N(npcSettings_8024035C), .pos = { 245.0f, 0.0f, 75.0f }, - .flags = NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_JUMPING, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, diff --git a/src/world/area_sbk/sbk_01/929AD0.c b/src/world/area_sbk/sbk_01/929AD0.c index 4218b11134..507cfd57aa 100644 --- a/src/world/area_sbk/sbk_01/929AD0.c +++ b/src/world/area_sbk/sbk_01/929AD0.c @@ -8,17 +8,17 @@ NpcAISettings N(npcAISettings_80240370) = { .moveTime = 50, .waitTime = 10, .alertRadius = 250.0f, - .unk_14 = 2, + .playerSearchInterval = 2, .chaseSpeed = 3.5f, - .unk_1C = { .s = 45 }, - .unk_20 = 6, + .chaseTurnRate= 45, + .chaseUpdateInterval = 6, .chaseRadius = 300.0f, - .unk_2C = 1, + .unk_AI_2C = 1, }; EvtScript N(npcAI_802403A0) = { EVT_CALL(N(SetNpcB5_3)) - EVT_CALL(DoBasicAI, EVT_PTR(N(npcAISettings_80240370))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80240370))) EVT_RETURN EVT_END }; @@ -36,7 +36,7 @@ StaticNpc N(npcGroup_802403F8) = { .id = 0, .settings = &N(npcSettings_802403CC), .pos = { 205.0f, 0.0f, -60.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 90, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, @@ -73,7 +73,7 @@ StaticNpc N(npcGroup_802405E8) = { .id = 1, .settings = &N(npcSettings_802403CC), .pos = { -200.0f, 0.0f, 180.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, .yaw = 270, .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 15, diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 99e86fd0d7..fb44edf787 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -24,7 +24,11 @@ ApiStatus PostChapter2StatUpdate(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240B98_92AE48); +ApiStatus N(CheckTradeEventTime)(Evt* script, s32 isInitialCall) { + script->varTable[0] = (s32)((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0]; + return ApiStatus_DONE2; +} + ApiStatus GetItemCount(Evt* script, s32 isInitialCall) { script->varTable[0] = get_item_count(); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index ea03fa7f0b..984ea75887 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -13,7 +13,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240000_93F5B0); #include "world/common/SpawnSunEffect.inc.c" -#include "world/common/atomic/enemy/UnkAI_4.inc.c" +#include "world/common/enemy/StationaryAI.inc.c" #include "world/common/StashVars.inc.c" @@ -31,12 +31,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241560_940B10); - -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415A4_940B54); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index 5870276926..ba9a02869f 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -14,10 +14,5 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802403D8_9462A8); INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240410_9462E0); -#include "world/common/SetManyVars.inc.c" - -#include "world/common/UnkYawFunc.inc.c" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240728_9465F8); - -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_8024076C_94663C); +extern s32 N(LetterDelivery_SavedNpcAnim); +#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index df6d6eb4f3..e0d1add4fe 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -19,4 +19,4 @@ ApiStatus func_80241390_87AF70(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/FlyingAI.inc.c" diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index 0bd507e57c..448bed18e2 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -1,25 +1,5 @@ #include "tik_09.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -ApiStatus func_80241204_8833C4(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - EncounterStatus* encounterStatus = &gCurrentEncounter; - s32 enemyCount = 0; - s32 i, j; - - for (i = 0; i < encounterStatus->numEncounters; i++) { - Encounter* temp = encounterStatus->encounterList[i]; - if (temp == NULL) { - continue; - } - for (j = 0; j < temp->count; j++) { - if (temp->enemy[j] != NULL) { - enemyCount++; - } - } - } - - evt_set_variable(script, *args++, enemyCount); - return ApiStatus_DONE2; -} +#include "world/common/GetDefeatedEnemyCount.inc.c" diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index 73e67f270d..69c3f7d112 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c index 704c33354c..3eb22add0e 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c index 80c99ccaab..682f2def7b 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/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index f39607579a..1f46cf03e8 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -2,4 +2,4 @@ #include "world/common/UnkPosFunc2.inc.c" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index be79f59738..8581d11df2 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -1,8 +1,8 @@ #include "trd_01.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_4.inc.c" +#include "world/common/enemy/StationaryAI.inc.c" ApiStatus func_80241630_99DFC0(Evt* script, s32 isInitialCall) { Enemy* owner1 = script->owner1.enemy; diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 636fc62e9c..021275e679 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -1,7 +1,5 @@ #include "trd_02.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" - -#include "world/common/UnkNpcAIMainFunc8.inc.c" +#include "world/common/enemy/KoopaPatrolAI.inc.c" diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c index 0aa1129ffe..593bdf6048 100644 --- a/src/world/area_trd/trd_03/9A46F0.c +++ b/src/world/area_trd/trd_03/9A46F0.c @@ -1,3 +1,3 @@ #include "trd_03.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 2daf778840..455f137b7f 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -1,62 +1,7 @@ #include "trd_04.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_1.inc.c" +#include "world/common/enemy/KoopaPatrolAI.inc.c" -#include "world/common/UnkNpcAIMainFunc8.inc.c" - -#include "world/common/atomic/enemy/UnkAI_9.inc.c" - -// todo remove when below are decompiled -static const f32 padding = 0.0f; - -void func_80243310_9AB700(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Bytecode* args = script->ptrReadPos; - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 yawTemp; - - npc->currentAnim.w = enemy->animList[9]; - npc->jumpVelocity = -5.0f; - npc->jumpScale = 0.15f; - npc->collisionHeight = enemy->varTable[8] / 2; - - dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->moveSpeed = 7.0f; - enemy->unk_10.x = npc->pos.x; - enemy->unk_10.y = npc->pos.y; - enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; - - ai_enemy_play_sound(npc, SOUND_UNUSED_2C1, 0); - yawTemp = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->duration = 12; - npc->yaw = yawTemp; - script->functionTemp[0] = 13; -} - -void func_80243438_9AB828(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->jumpVelocity += npc->jumpScale; - npc->pos.y += npc->jumpVelocity; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - npc->duration--; - - if (npc->duration <= 0) { - enemy->unk_07 = 0; - npc->jumpScale = 0.3f; - npc->jumpVelocity = 0.0f; - npc->moveSpeed = 3.0f; - npc->currentAnim.w = enemy->animList[10]; - script->functionTemp[0] = 14; - } -} - -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802434F4_9AB8E4); - -#include "world/common/UnkDurationCheck.inc.c" - -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243650_9ABA40); +#include "world/common/enemy/ParatroopaAI.inc.c" diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 0c715af2ec..9b48a98d46 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -1,24 +1,31 @@ #include "trd_07.h" -#include "world/common/atomic/enemy/UnkAI_5.inc.c" +#include "world/common/enemy/TackleAI.inc.c" -#include "world/common/atomic/enemy/UnkAI_9.inc.c" +#include "world/common/enemy/ParatroopaAI.inc.c" -// todo remove when below are decompiled -static const f32 padding = 0.0f; +#include "world/common/GetDefeatedEnemyCount.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241FDC_9B895C); +ApiStatus func_80242600_9B8F80(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 posX = evt_get_float_variable(script, *args++); + f32 posZ = evt_get_float_variable(script, *args++); + f32 angle = evt_get_float_variable(script, *args++); + + script->varTable[0] = ((posX + (sin_deg(clamp_angle(gCameras->currentYaw + angle + 270.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; + script->varTable[1] = ((posZ - (cos_deg(clamp_angle(gCameras->currentYaw + angle + 270.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; + script->varTable[2] = ((posX + (sin_deg(clamp_angle(gCameras->currentYaw + angle + 90.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; + script->varTable[3] = ((posZ - (cos_deg(clamp_angle(gCameras->currentYaw + angle + 90.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242104_9B8A84); +ApiStatus func_802427FC_9B917C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 posX = evt_get_variable(script, *args++); + s32 posY = evt_get_variable(script, *args++); + s32 posZ = evt_get_variable(script, *args++); + f32 yaw = evt_get_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802421C0_9B8B40); - -#include "world/common/UnkDurationCheck.inc.c" - -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024231C_9B8C9C); - -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024256C_9B8EEC); - -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242600_9B8F80); - -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802427FC_9B917C); + fx_walking_dust(1, posX, posY + 10, posZ, sin_deg(yaw), -cos_deg(yaw)); + return ApiStatus_DONE2; +} diff --git a/src/world/common/AwaitPlayerNearNpc.inc.c b/src/world/common/AwaitPlayerNearNpc.inc.c index 9bd796d161..b80cb3730f 100644 --- a/src/world/common/AwaitPlayerNearNpc.inc.c +++ b/src/world/common/AwaitPlayerNearNpc.inc.c @@ -4,7 +4,7 @@ ApiStatus N(func_80240814_97BE44)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_safe(script->owner2.npcID); - npc->unk_AB = npc->collisionHeight; + npc->verticalRenderOffset = npc->collisionHeight; npc->pos.y -= (f32) npc->collisionHeight; return ApiStatus_DONE2; @@ -27,7 +27,7 @@ ApiStatus N(func_802408B4_97BEE4)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_safe(script->owner2.npcID); if (isInitialCall) { - npc->unk_AB = 0; + npc->verticalRenderOffset = 0; } if (npc->flags & 0x1000) { diff --git a/src/world/common/DeadUnkNpcAIMainFunc.inc.c b/src/world/common/DeadUnkNpcAIMainFunc.inc.c deleted file mode 100644 index f2ddf66c34..0000000000 --- a/src/world/common/DeadUnkNpcAIMainFunc.inc.c +++ /dev/null @@ -1,98 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "dead_structs.h" - -ApiStatus N(DeadUnkNpcAIMainFunc)(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; - Npc* npc = dead_get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - enemy->unk_108.x = npc->pos.x; - enemy->unk_108.y = npc->pos.y; - enemy->unk_108.z = npc->pos.z; - enemy->unk_114 = 0.0001f; - enemy->unk_118 = 0.0001f; - - if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0x0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); - /* fallthrough */ - case 0x1: - N(UnkFunc13)(script, npcAISettings, territoryPtr); - break; - case 0x2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - /* fallthrough */ - case 0x3: - N(UnkFunc14)(script, npcAISettings, territoryPtr); - break; - case 0x4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); - break; - case 0xA: - N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); - /* fallthrough */ - case 0xB: - N(NpcJumpFunc)(script, npcAISettings, territoryPtr); - break; - case 0xC: - N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); - /* fallthrough */ - case 0xD: - N(UnkFunc15)(script, npcAISettings, territoryPtr); - break; - case 0xE: - N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); - break; - case 0xF: - N(UnkFunc16)(script, npcAISettings, territoryPtr); - break; - case 0x63: - func_8004EB8C(script); - break; - } - return 0; -} diff --git a/src/world/common/DeadUnkNpcAIMainFunc10.inc.c b/src/world/common/DeadUnkNpcAIMainFunc10.inc.c deleted file mode 100644 index fe127cfc40..0000000000 --- a/src/world/common/DeadUnkNpcAIMainFunc10.inc.c +++ /dev/null @@ -1,69 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" -#include "dead_structs.h" - -ApiStatus N(DeadUnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 120.0f; - territory.unk_1C = 0; - - enemy->unk_108.x = npc->pos.x; - enemy->unk_108.y = npc->pos.y; - enemy->unk_108.z = npc->pos.z; - enemy->unk_114 = 0.0001f; - enemy->unk_118 = 0.0001f; - - if (isInitialCall) { - N(UnkFunc5)(npc, enemy, script, aiSettings); - script->functionTemp[0] = 0; - } - npc->unk_AB = -2; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(SixFloatsFunc)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); - case 13: - N(UnkNpcAIFunc34)(script, aiSettings, territoryPtr); - break; - case 20: - N(UnkFunc45)(script, aiSettings, territoryPtr); - break; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/DeadUnkNpcAIMainFunc6.inc.c b/src/world/common/DeadUnkNpcAIMainFunc6.inc.c index dd243f8a78..2480ac4610 100644 --- a/src/world/common/DeadUnkNpcAIMainFunc6.inc.c +++ b/src/world/common/DeadUnkNpcAIMainFunc6.inc.c @@ -2,15 +2,18 @@ #include "common.h" #include "npc.h" #include "effects.h" -#include "dead_structs.h" #include "sprite/npc/bony_beetle.h" -ApiStatus N(DeadUnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); u32 x, y, z; f32 x2, y2, z2, w2; @@ -23,7 +26,7 @@ ApiStatus N(DeadUnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { territory.sizeX = enemy->territory->wander.detectSizeX; territory.sizeZ = enemy->territory->wander.detectSizeZ; territory.unk_18 = 65.0f; - territory.unk_1C = 0; + territory.detectFlags = 0; enemy->unk_108.x = npc->pos.x; enemy->unk_108.y = npc->pos.y; @@ -39,7 +42,7 @@ ApiStatus N(DeadUnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { if (isInitialCall || (enemy->varTable[10] == 100)) { script->functionTemp[0] = 100; npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; enemy->flags |= ENEMY_FLAGS_200000; npc->flags &= ~NPC_FLAG_GRAVITY; @@ -65,7 +68,7 @@ ApiStatus N(DeadUnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { s32 emoteTemp; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; script->functionTemp[1] = 0; script->functionTemp[0] = 200; } @@ -94,7 +97,7 @@ ApiStatus N(DeadUnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { func_800496B8(script, aiSettings, territoryPtr); break; case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + base_PatrolAI_LoiterInit(script, aiSettings, territoryPtr); case 3: func_80049C04(script, aiSettings, territoryPtr); break; diff --git a/src/world/common/DeadUnkNpcAIMainFunc9.inc.c b/src/world/common/DeadUnkNpcAIMainFunc9.inc.c deleted file mode 100644 index af01b1b557..0000000000 --- a/src/world/common/DeadUnkNpcAIMainFunc9.inc.c +++ /dev/null @@ -1,71 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "dead_structs.h" - -ApiStatus N(DeadUnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 120.0f; - territory.unk_1C = 0; - - enemy->unk_108.x = npc->pos.x; - enemy->unk_108.y = npc->pos.y; - enemy->unk_108.z = npc->pos.z; - enemy->unk_114 = 0.0001f; - enemy->unk_118 = 0.0001f; - - if (isInitialCall) { - N(UnkFunc5)(npc, (Enemy*)enemy, script, aiSettings); - } - - npc->unk_AB = -2; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - /* fallthrough */ - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - return 0; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - /* fallthrough */ - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - return 0; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - /* fallthrough */ - case 11: - N(SixFloatsFunc)(script, aiSettings, territoryPtr); - return 0; - case 12: - N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); - return 0; - case 13: - N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); - return 0; - case 14: - N(UnkFunc6)(script, aiSettings, territoryPtr); - /* fallthrough */ - default: - return 0; - } -} diff --git a/src/world/common/GetDefeatedEnemyCount.inc.c b/src/world/common/GetDefeatedEnemyCount.inc.c new file mode 100644 index 0000000000..06b5dfde22 --- /dev/null +++ b/src/world/common/GetDefeatedEnemyCount.inc.c @@ -0,0 +1,23 @@ +#include "common.h" + +ApiStatus N(GetDefeatedEnemyCount)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + EncounterStatus* encounterStatus = &gCurrentEncounter; + s32 enemyCount = 0; + s32 i, j; + + for (i = 0; i < encounterStatus->numEncounters; i++) { + Encounter* temp = encounterStatus->encounterList[i]; + if (temp == NULL) { + continue; + } + for (j = 0; j < temp->count; j++) { + if (temp->enemy[j] != NULL) { + enemyCount++; + } + } + } + + evt_set_variable(script, *args++, enemyCount); + return ApiStatus_DONE2; +} diff --git a/src/world/common/HeartPlant_SpawnHeart.inc.c b/src/world/common/HeartPlant_SpawnHeart.inc.c new file mode 100644 index 0000000000..1dce080aa6 --- /dev/null +++ b/src/world/common/HeartPlant_SpawnHeart.inc.c @@ -0,0 +1,12 @@ +#include "common.h" + +ApiStatus N(HeartPlant_SpawnHeart)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if ((enemy->varTable[0] < 5) && (rand_int(1000) > 300)) { + make_item_entity_nodelay(ITEM_HEART, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z + 5.0, 3, 0); + enemy->varTable[0] += 1; + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/LetterDelivery.inc.c b/src/world/common/LetterDelivery.inc.c new file mode 100644 index 0000000000..d706cb5137 --- /dev/null +++ b/src/world/common/LetterDelivery.inc.c @@ -0,0 +1,58 @@ +#include "common.h" + +//TODO begin with a (guarded) include for GetItem functions: +// #include "world/common/atomic/ItemChoice_PartA.inc.c" + +// extern s32 N(LetterDelivery_SavedNpcAnim); + +ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + script->varTable[2] = evt_get_variable(script, *args++); + script->varTable[3] = evt_get_variable(script, *args++); + script->varTable[4] = evt_get_variable(script, *args++); + script->varTable[5] = evt_get_variable(script, *args++); + script->varTable[6] = evt_get_variable(script, *args++); + script->varTable[7] = evt_get_variable(script, *args++); + script->varTable[8] = evt_get_variable(script, *args++); + script->varTable[9] = evt_get_variable(script, *args++); + script->varTable[10] = evt_get_variable(script, *args++); + script->varTable[11] = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a0 = *args++; + f32 a = evt_get_variable(script, a0); + s32 a1 = *args++; + f32 b = evt_get_variable(script, a1); + s32 a2 = *args++; + f32 c = evt_get_variable(script, a2); + Npc* partner = get_npc_unsafe(NPC_PARTNER); + f32 currentCamYaw = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); + + add_vec2D_polar(&a, &c, 15.0f, partner->yaw); + add_vec2D_polar(&a, &c, 10.0f, currentCamYaw); + + evt_set_variable(script, a0, a); + evt_set_variable(script, a1, b); + evt_set_variable(script, a2, c); + + return ApiStatus_DONE2; +} + +ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(script->varTable[2]); + + N(LetterDelivery_SavedNpcAnim) = npc->currentAnim.w; + npc->currentAnim.w = script->varTable[4]; + return ApiStatus_DONE2; +} + +ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(script->varTable[2]); + + npc->currentAnim.w = N(LetterDelivery_SavedNpcAnim); + return ApiStatus_DONE2; +} diff --git a/src/world/common/NpcJumpFunc.inc.c b/src/world/common/NpcJumpFunc.inc.c deleted file mode 100644 index 9bb0491737..0000000000 --- a/src/world/common/NpcJumpFunc.inc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(NpcJumpFunc)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - - if (!(npc->pos.y > npc->moveToPos.y)) { - npc->pos.y = npc->moveToPos.y; - npc->jumpVelocity = 0.0f; - npc->flags &= ~0x800; - script->functionTemp[0] = 12; - } -} diff --git a/src/world/common/NpcJumpFunc2.inc.c b/src/world/common/NpcJumpFunc2.inc.c deleted file mode 100644 index 07c11960c6..0000000000 --- a/src/world/common/NpcJumpFunc2.inc.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(NpcJumpFunc2)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->currentAnim.w = enemy->animList[4]; - npc->jumpVelocity = 10.0f; - npc->jumpScale = 2.0f; - npc->moveToPos.y = npc->pos.y; - npc->flags |= 0x800; - script->functionTemp[0] = 11; -} diff --git a/src/world/common/NpcJumpFunc3.inc.c b/src/world/common/NpcJumpFunc3.inc.c deleted file mode 100644 index 4da7ada3e9..0000000000 --- a/src/world/common/NpcJumpFunc3.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(NpcJumpFunc3)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->jumpVelocity = 10.0f; - npc->jumpScale = 2.0f; - npc->moveToPos.y = npc->pos.y; - npc->flags |= 0x800; - script->functionTemp[0] = 11; -} diff --git a/src/world/common/PullVine.inc.c b/src/world/common/PullVine.inc.c new file mode 100644 index 0000000000..4efe6b61f6 --- /dev/null +++ b/src/world/common/PullVine.inc.c @@ -0,0 +1,58 @@ +#include "common.h" +#include "model.h" + +ApiStatus N(PullVine_WaitForPlayerGrab)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 modelX, modelY, modelZ; + f32 dx, dy, dz; + f32 dist; + s32 result; + + modelX = evt_get_float_variable(script, *args++); + modelY = evt_get_float_variable(script, *args++) + 15.0f; + modelZ = evt_get_float_variable(script, *args++); + dist = evt_get_float_variable(script, *args++); + dx = script->varTable[0] - modelX; + dy = script->varTable[1] - modelY; + dz = script->varTable[2] - modelZ; + result = 1; + if (!(dx*dx + dy*dy + dz*dz < dist*dist)) { + result = 0; + } + script->varTable[0] = result; + return ApiStatus_DONE2; +} + +ApiStatus N(PullVine_UpdatePosition)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 x1 = evt_get_float_variable(script, *args++); + f32 x2 = evt_get_float_variable(script, *args++); + + evt_set_float_variable(script, *args++, (x2 - x1) / 10.0f); + return ApiStatus_DONE2; +} + +void N(PullVine_apply_shear_mtx)(Matrix4f mtx, f32 f) { + guMtxIdentF(mtx); + mtx[1][0] = f * 0.2; + mtx[1][1] = 1.0f; + mtx[1][2] = 0.0f; +} + +ApiStatus N(PullVine_ShearBushModel)(Evt* script) { + Bytecode* args = script->ptrReadPos; + s32 modelID = evt_get_variable(script, *args++); + s32 modelIndex = get_model_list_index_from_tree_index(modelID); + f32 f = evt_get_float_variable(script, *args++); + Model* mdl = get_model_from_list_index(modelIndex); + Matrix4f mtx; + + if (!(mdl->flags & 0x400)) { + N(PullVine_apply_shear_mtx)(mdl->transformMatrix, f); + mdl->flags |= 0x1400; + } else { + N(PullVine_apply_shear_mtx)(mtx, f); + guMtxCatF(mtx, mdl->transformMatrix, mdl->transformMatrix); + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/SetManyVars.inc.c b/src/world/common/SetManyVars.inc.c deleted file mode 100644 index a10c402dc4..0000000000 --- a/src/world/common/SetManyVars.inc.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(SetManyVars)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - script->varTable[2] = evt_get_variable(script, *args++); - script->varTable[3] = evt_get_variable(script, *args++); - script->varTable[4] = evt_get_variable(script, *args++); - script->varTable[5] = evt_get_variable(script, *args++); - script->varTable[6] = evt_get_variable(script, *args++); - script->varTable[7] = evt_get_variable(script, *args++); - script->varTable[8] = evt_get_variable(script, *args++); - script->varTable[9] = evt_get_variable(script, *args++); - script->varTable[10] = evt_get_variable(script, *args++); - script->varTable[11] = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} diff --git a/src/world/common/SixFloatsFunc.inc.c b/src/world/common/SixFloatsFunc.inc.c deleted file mode 100644 index eeca3064da..0000000000 --- a/src/world/common/SixFloatsFunc.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "npc.h" - -extern f32 N(sixFloats)[]; - -void N(SixFloatsFunc)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(sixFloats)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} - diff --git a/src/world/common/UnkDistFunc.inc.c b/src/world/common/UnkDistFunc.inc.c deleted file mode 100644 index a772376517..0000000000 --- a/src/world/common/UnkDistFunc.inc.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkDistFunc)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim.w = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0] = 14; - } - } -} diff --git a/src/world/common/UnkDurationCheck.inc.c b/src/world/common/UnkDurationCheck.inc.c deleted file mode 100644 index 2fc1cee69f..0000000000 --- a/src/world/common/UnkDurationCheck.inc.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkDurationCheck)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 0; - } -} diff --git a/src/world/common/UnkDurationCheckNoArgs.inc.c b/src/world/common/UnkDurationCheckNoArgs.inc.c deleted file mode 100644 index 1ba6a25564..0000000000 --- a/src/world/common/UnkDurationCheckNoArgs.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -// TODO same as UnkDurationCheck, but removes the extra args since it affects codegen...? -void N(UnkDurationCheckNoArgs)(Evt* script) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 0; - } -} diff --git a/src/world/common/UnkFunc10.inc.c b/src/world/common/UnkFunc10.inc.c deleted file mode 100644 index 21d46c25b3..0000000000 --- a/src/world/common/UnkFunc10.inc.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc10)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ; - s32 phi_s1; - - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - phi_s1 = 0; - if (is_point_within_region(enemy->territory->wander.detectShape, - enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, - npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX, - enemy->territory->wander.detectSizeZ)) { - phi_s1 = 1; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &posX, &posY, &posZ, - 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { - phi_s1 = 1; - } - - npc->duration--; - if (npc->duration <= 0) { - phi_s1 = 1; - } - if (phi_s1) { - script->functionTemp[0] = 4; - enemy->unk_07 = 0; - } -} diff --git a/src/world/common/UnkFunc11.inc.c b/src/world/common/UnkFunc11.inc.c index 87350018fa..7905e35285 100644 --- a/src/world/common/UnkFunc11.inc.c +++ b/src/world/common/UnkFunc11.inc.c @@ -2,23 +2,23 @@ #include "npc.h" ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) { - s32 var = evt_get_variable(script, *script->ptrReadPos); + s32 pushableColliderID = evt_get_variable(script, *script->ptrReadPos); PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus = &gCollisionStatus; - if (((collisionStatus->pushingAgainstWall != var) && (playerStatus->actionState == ACTION_STATE_14)) || + if (((collisionStatus->pushingAgainstWall != pushableColliderID) && (playerStatus->actionState == ACTION_STATE_14)) || playerStatus->enableCollisionOverlapsCheck || playerStatus->inputEnabledCounter) { - set_action_state(0); + set_action_state(ACTION_STATE_IDLE); script->varTable[0] = 0; return ApiStatus_DONE2; } - if (collisionStatus->pushingAgainstWall != var) { + if (collisionStatus->pushingAgainstWall != pushableColliderID) { script->varTable[0] = 0; - } else if ((playerStatus->actionState != ACTION_STATE_14) && (playerStatus->actionState != 1) && - (playerStatus->actionState != 2)) { + } else if ((playerStatus->actionState != ACTION_STATE_14) && (playerStatus->actionState != ACTION_STATE_WALK) && + (playerStatus->actionState != ACTION_STATE_RUN)) { script->varTable[0] = 0; - } else if (playerStatus->animFlags & 1) { + } else if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT) { script->varTable[0] = 0; } else { script->varTable[0] = 1; diff --git a/src/world/common/UnkFunc12.inc.c b/src/world/common/UnkFunc12.inc.c index 4c4f84eba0..e81dcb1fac 100644 --- a/src/world/common/UnkFunc12.inc.c +++ b/src/world/common/UnkFunc12.inc.c @@ -3,7 +3,7 @@ ApiStatus N(UnkFunc12)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - f32 posX, posY, posZ, posW; + f32 posX, posY, posZ, hitDepth; if (script->varTable[5] == 0) { playerStatus->position.x = script->varTable[0]; @@ -14,8 +14,8 @@ ApiStatus N(UnkFunc12)(Evt* script, s32 isInitialCall) { posX = playerStatus->position.x; posY = playerStatus->position.y + 10.0f; posZ = playerStatus->position.z; - posW = 40.0f; - npc_raycast_down_sides(0, &posX, &posY, &posZ, &posW); + hitDepth = 40.0f; + npc_raycast_down_sides(0, &posX, &posY, &posZ, &hitDepth); playerStatus->position.x = posX; playerStatus->position.y = posY; playerStatus->position.z = posZ; diff --git a/src/world/common/UnkFunc13.inc.c b/src/world/common/UnkFunc13.inc.c deleted file mode 100644 index a5dd77ef4c..0000000000 --- a/src/world/common/UnkFunc13.inc.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkFunc13)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - - if (npc->turnAroundYawAdjustment == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2][enemy->territory->patrol.points].x; - z = script->functionTemp[2][enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1] == 0)) { - script->functionTemp[0] = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0] = 4; - } - } - } -} diff --git a/src/world/common/UnkFunc14.inc.c b/src/world/common/UnkFunc14.inc.c deleted file mode 100644 index 5baa70d73f..0000000000 --- a/src/world/common/UnkFunc14.inc.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc14)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0] = 12; - } else { - script->functionTemp[0] = 10; - } - } else if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0] = 4; - } - } - } -} diff --git a/src/world/common/UnkFunc15.inc.c b/src/world/common/UnkFunc15.inc.c deleted file mode 100644 index bdabf79fc2..0000000000 --- a/src/world/common/UnkFunc15.inc.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc15)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0] = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0] = 12; - } - } -} diff --git a/src/world/common/UnkFunc16.inc.c b/src/world/common/UnkFunc16.inc.c deleted file mode 100644 index 07a7cb6c6a..0000000000 --- a/src/world/common/UnkFunc16.inc.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc16)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; - - for (i = script->functionTemp[2]; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2] = i; - break; - } - } - - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1] = 0; - script->functionTemp[0] = 1; -} diff --git a/src/world/common/UnkFunc4.inc.c b/src/world/common/UnkFunc4.inc.c deleted file mode 100644 index 5234497821..0000000000 --- a/src/world/common/UnkFunc4.inc.c +++ /dev/null @@ -1,69 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkFunc4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) - && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0] = 0; - } - } -} diff --git a/src/world/common/UnkFunc45.inc.c b/src/world/common/UnkFunc45.inc.c deleted file mode 100644 index d464aa860a..0000000000 --- a/src/world/common/UnkFunc45.inc.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc45)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - enemy->varTable[2] = 0; - npc->duration = 0; - script->functionTemp[0] = 0; - } -} diff --git a/src/world/common/UnkFunc5.inc.c b/src/world/common/UnkFunc5.inc.c deleted file mode 100644 index 98f93c3373..0000000000 --- a/src/world/common/UnkFunc5.inc.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc5)(Npc* npc, Enemy* enemy, Evt* script, NpcAISettings* aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0] = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1] = aiSettings->unk_14; - enemy->unk_B0 |= ENEMY_AI_FLAGS_10; -} diff --git a/src/world/common/UnkFunc53.inc.c b/src/world/common/UnkFunc53.inc.c index a70946f723..7b6c2f8a7e 100644 --- a/src/world/common/UnkFunc53.inc.c +++ b/src/world/common/UnkFunc53.inc.c @@ -30,7 +30,7 @@ ApiStatus N(UnkFunc53)(Evt* script, s32 isInitialCall) { newNpc->pos.y = npc->pos.y; newNpc->pos.z = npc->pos.z; newNpc->yaw = npc->yaw; - newNpc->unk_AB = 3; + newNpc->verticalRenderOffset = 3; disable_npc_shadow(newNpc); unkIt->unk_04 = 0; unkIt->unk_08 = 0; diff --git a/src/world/common/UnkFunc54.inc.c b/src/world/common/UnkFunc54.inc.c deleted file mode 100644 index 8b85a37c99..0000000000 --- a/src/world/common/UnkFunc54.inc.c +++ /dev/null @@ -1,147 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -typedef struct TempStuff { - /* 0x00 */ f32 unk_00; - /* 0x04 */ char unk_04[0x8]; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; -} TempStuff; // size = 0x?? - -ApiStatus N(UnkFunc54)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - s32 phi_s6 = 0; - f32 x, y, z; - f32 hitDepth; - Npc* npc; - Npc* npc2; - TempStuff* temp_s5; - u32 vt0; - - if (get_enemy_safe(enemy->npcID) != NULL) { - if (enemy->varTable[0] != 5) { - temp_s5 = (TempStuff*)evt_get_variable(script, *args++); - npc = get_npc_unsafe(enemy->npcID); - - if (enemy->varTable[1] & 2) { - npc->unk_AB = npc->collisionHeight / 2; - } - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; - disable_npc_shadow(npc); - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - enemy->varTable[0] = 0; - enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_200000 | - ENEMY_FLAGS_100000 | ENEMY_FLAGS_40; - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - } - - switch (script->functionTemp[0]) { - default: - return 0; - case 0: - npc->flags |= NPC_FLAG_2; - disable_npc_shadow(npc); - enemy->varTable[0] = 0; - script->functionTemp[0] = 1; - // fallthrough - case 1: - vt0 = enemy->varTable[0]; - - if (enemy->varTable[0] == 1) { - enemy->varTable[0] = 2; - npc2 = get_npc_unsafe(enemy->varTable[4]); - npc->pos.x = npc2->pos.x; - npc->pos.z = npc2->pos.z; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, enemy->varTable[3], 270.0f - npc2->renderYaw); - npc->pos.y = npc2->pos.y + enemy->varTable[2]; - enemy->unk_07 = vt0; - enemy->unk_10.x = npc->pos.x; - enemy->unk_10.y = npc->pos.y; - enemy->unk_10.z = npc->pos.z; - npc->rotation.x = 0.0f; - npc->rotation.y = 0.0f; - npc->rotation.z = 0.0f; - npc->moveSpeed = temp_s5->unk_00; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->jumpVelocity = temp_s5->unk_0C; - npc->jumpScale = temp_s5->unk_10; - npc->moveToPos.y = npc2->pos.y; - npc->flags &= ~NPC_FLAG_2; - enable_npc_shadow(npc); - npc->flags |= NPC_FLAG_NO_Y_MOVEMENT; - enemy->flags &= ~(ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH); - npc->duration = 90; - script->functionTemp[0] = 2; - break; - } - return 0; - case 2: - break; - } - - - x = npc->pos.x; - y = npc->pos.y + (npc->collisionHeight * 0.5); - z = npc->pos.z; - if (npc_test_move_taller_with_slipping( - 0, &x, &y, &z, npc->moveSpeed, npc->yaw, npc->collisionRadius, npc->collisionHeight) != 0) - { - phi_s6 = 1; - } - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - hitDepth = 1000.0f; - if ((npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &hitDepth) != 0) && - (hitDepth < fabsf(npc->jumpVelocity)) && - (fabsf(y - npc->moveToPos.y) < 20.0)) - { - npc->pos.y = y; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - phi_s6 = 10; - } - - if (hitDepth < 1.0) { - phi_s6 = 11; - } - npc->duration--; - if (npc->duration <= 0) { - phi_s6 = 20; - } - - if (phi_s6 == 0) { - if (enemy->varTable[1] & 1) { - npc->rotation.z += 40.0; - } - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - } else { - fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); - enemy->varTable[0] = 0; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - npc->jumpVelocity = 0.0f; - npc->flags |= NPC_FLAG_2; - disable_npc_shadow(npc); - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH; - script->functionTemp[0] = 0; - } - } - } - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkFunc55.inc.c b/src/world/common/UnkFunc55.inc.c deleted file mode 100644 index a950d46242..0000000000 --- a/src/world/common/UnkFunc55.inc.c +++ /dev/null @@ -1,112 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -ApiStatus N(UnkFunc55)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Camera* camera = &gCameras[gCurrentCamID]; - s32 phi_s4 = 0; - Npc* npc; - f32 x, y, z; - f32 hitDepth; - f32 temp_f20_2; - f32 temp_f20_3; - f32 temp_f22; - f32 yaw; - s32 cond; - - if (isInitialCall) { - script->functionTemp[0] = 0; - } - - if (get_enemy_safe(enemy->npcID) == NULL) { - evt_set_variable(script, EVT_VAR(0), 0); - return ApiStatus_DONE2; - } - if (enemy->varTable[0] == 5) { - evt_set_variable(script, EVT_VAR(0), 0); - return ApiStatus_DONE2; - } - if (get_enemy_safe(enemy->npcID) == NULL) { - evt_set_variable(script, EVT_VAR(0), 0); - return ApiStatus_DONE2; - } - - npc = get_npc_unsafe(enemy->npcID); - switch (script->functionTemp[0]) { - case 0: - fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0.0f, 0.0f); - yaw = clamp_angle(camera->currentYaw); - temp_f20_2 = clamp_angle(yaw + 180.0); - temp_f22 = clamp_angle(yaw + 90.0); - temp_f20_3 = clamp_angle(temp_f20_2 + 90.0); - if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, gPlayerStatusPtr->currentYaw)) < 180.0) { - npc->yaw = temp_f22; - } else { - npc->yaw = temp_f20_3; - } - npc->duration = 30; - npc->jumpVelocity = 10.0f; - npc->jumpScale = 0.9f; - npc->moveSpeed *= 1.2; - script->functionTemp[0] = 1; - /* fallthrough */ - case 1: - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - if (npc_test_move_simple_with_slipping(0, &x, &y, &z, npc->moveSpeed, npc->yaw, npc->collisionRadius, - npc->collisionHeight) == 0) - { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - phi_s4 = 1; - } - - cond = FALSE; - if (npc->jumpVelocity < 0.0) { - x = npc->pos.x; - y = npc->pos.y + 13.0; - z = npc->pos.z; - hitDepth = fabsf(npc->jumpVelocity) + 16.0; - if ((npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &hitDepth) != 0) && - (hitDepth <= (fabsf(npc->jumpVelocity) + 13.0))) - { - cond = TRUE; - } - } - - if (!cond) { - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - } else { - phi_s4 = 10; - } - - npc->duration--; - if (npc->duration <= 0) { - phi_s4 = 11; - } - - if (phi_s4 != 0) { - fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); - enemy->varTable[0] = 0; - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - npc->pos.y = -1000.0f; - npc->flags |= NPC_FLAG_2; - disable_npc_shadow(npc); - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH; - script->functionTemp[0] = 0; - evt_set_variable(script, EVT_VAR(0), 1); - return ApiStatus_DONE2; - } - if (enemy->varTable[1] & 1) { - npc->rotation.z += 60.0; - } - break; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkFunc58.inc.c b/src/world/common/UnkFunc58.inc.c deleted file mode 100644 index a7b7d57c29..0000000000 --- a/src/world/common/UnkFunc58.inc.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" - -void N(UnkFunc58)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~2; - npc->duration = 0; - script->functionTemp[0] = 1; - } -} diff --git a/src/world/common/UnkFunc59.inc.c b/src/world/common/UnkFunc59.inc.c deleted file mode 100644 index 6fc1f22685..0000000000 --- a/src/world/common/UnkFunc59.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc59)(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - f32 temp_f0 = (rand_int(100) % 2) * 180.0f; - - npc->duration = 15; - npc->moveSpeed = 0.8f; - npc->yaw = temp_f0 + 90.0f; - script->functionTemp[0] = 6; -} diff --git a/src/world/common/UnkFunc6.inc.c b/src/world/common/UnkFunc6.inc.c deleted file mode 100644 index 8b283ecc5e..0000000000 --- a/src/world/common/UnkFunc6.inc.c +++ /dev/null @@ -1,89 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc6)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; - - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim.w = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0] = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0] = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} diff --git a/src/world/common/UnkFunc61.inc.c b/src/world/common/UnkFunc61.inc.c deleted file mode 100644 index 54e7d819e6..0000000000 --- a/src/world/common/UnkFunc61.inc.c +++ /dev/null @@ -1,46 +0,0 @@ -#include "common.h" -#include "npc.h" - -s32 N(UnkFunc61)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Camera* camera = &gCameras[gCurrentCamID]; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32* temp_v0 = (f32*)evt_get_variable(script, *args++); // TODO figure out what this is - f32 angle; - f32 t0; - f32 t1; - s32 i; - - if (func_800493EC(enemy, 0, temp_v0[9], temp_v0[10])) { - if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { - angle = 90.0f; - } else { - angle = 270.0f; - } - - t0 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - t1 = get_clamped_angle_diff(angle, t0); - if (fabsf(t1) > 75.0 || (2.0 * npc->collisionHeight <= fabsf(npc->pos.y - gPlayerStatusPtr->position.y))) { - return -1; - } - if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { - return -1; - } - if (gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { - return -1; - } - - for (i = 0; i < enemy->varTable[3]; i++) { - s32 enemy2ID = enemy->npcID + i + 1; - Enemy* enemy2 = get_enemy(enemy2ID); - - get_npc_unsafe(enemy2ID); - - if (enemy2->varTable[0] == 0) { - return enemy2ID; - } - } - } - return -1; -} diff --git a/src/world/common/UnkFunc7.inc.c b/src/world/common/UnkFunc7.inc.c deleted file mode 100644 index c8b1e409b4..0000000000 --- a/src/world/common/UnkFunc7.inc.c +++ /dev/null @@ -1,74 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkFunc7)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Enemy* enemy2; - Npc* npc2; - f32 posX, posZ; - s32 func; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->flags |= 0x102; - enemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - } - - func = script->functionTemp[0]; - switch (func) { - case 0: - enemy2 = get_enemy(enemy->npcID - 1); - npc2 = get_npc_unsafe(enemy2->npcID); - enemy->unk_07 = 1; - if (enemy2->varTable[0] == 3) { - if (enemy->varTable[15] != 0) { - ai_enemy_play_sound(npc2, enemy->varTable[15], 0); - } - posX = npc2->pos.x; - posZ = npc2->pos.z; - add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->renderYaw); - - npc->pos.x = posX; - enemy->unk_10.x = npc->pos.x; - - npc->pos.y = npc2->pos.y + enemy->varTable[0]; - enemy->unk_10.y = npc->pos.y; - - npc->pos.z = posZ; - enemy->unk_10.z = npc->pos.z; - - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - enemy->flags &= ~(ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); - npc->duration = 0; - script->functionTemp[0] = 1; - } - break; - - case 1: - enemy2 = get_enemy(enemy->npcID - 1); - get_npc_unsafe(enemy2->npcID); - npc->duration++; - if (npc->duration >= enemy->varTable[4]) { - enemy->unk_07 = 0; - } - if (enemy2->varTable[0] == 4) { - enemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - enemy->unk_07 = func; - script->functionTemp[0] = 0; - } - break; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkFunc8.inc.c b/src/world/common/UnkFunc8.inc.c deleted file mode 100644 index 65501a6712..0000000000 --- a/src/world/common/UnkFunc8.inc.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkFunc8)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else { - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->duration = 15; - script->functionTemp[0] = 0x28; - } - } - } -} diff --git a/src/world/common/UnkFunc9.inc.c b/src/world/common/UnkFunc9.inc.c deleted file mode 100644 index 6942ad9cb6..0000000000 --- a/src/world/common/UnkFunc9.inc.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkFunc9)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, - enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->duration = 10; - script->functionTemp[0] = 50; - } else if (npc->turnAroundYawAdjustment == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} diff --git a/src/world/common/UnkNpcAIFunc1.inc.c b/src/world/common/UnkNpcAIFunc1.inc.c deleted file mode 100644 index fb253f9f16..0000000000 --- a/src/world/common/UnkNpcAIFunc1.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc1)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); - npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); - npc->currentAnim.w = *enemy->animList; - script->functionTemp[0] = 3; -} diff --git a/src/world/common/UnkNpcAIFunc10.inc.c b/src/world/common/UnkNpcAIFunc10.inc.c deleted file mode 100644 index a5b21abc62..0000000000 --- a/src/world/common/UnkNpcAIFunc10.inc.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc10)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[0] = 15; - } -} diff --git a/src/world/common/UnkNpcAIFunc11.inc.c b/src/world/common/UnkNpcAIFunc11.inc.c deleted file mode 100644 index a05147d3d8..0000000000 --- a/src/world/common/UnkNpcAIFunc11.inc.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc11)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* arg2) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (func_800490B4(arg2, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 1) == 0) { - s32 something; - - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &something); - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0] = 14; - } else { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - func_8003D660(npc, 1); - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[0] = 12; - } - } -} diff --git a/src/world/common/UnkNpcAIFunc12.inc.c b/src/world/common/UnkNpcAIFunc12.inc.c deleted file mode 100644 index e45bd2f23f..0000000000 --- a/src/world/common/UnkNpcAIFunc12.inc.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc12)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 temp; - f32 f1; - f32 f2; - f32 f3; - - if (npc->duration == enemy->varTable[4] - 1) { - enemy->unk_10.x = npc->pos.x; - enemy->unk_10.y = npc->pos.y; - enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; - } - - f1 = npc->pos.x; - f2 = npc->pos.y; - f3 = npc->pos.z; - - temp = npc_test_move_simple_with_slipping(npc->collisionChannel, &f1, &f2, &f3, npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius); - if (temp == 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - - if ((npc->duration <= 0) || (--npc->duration <= 0) || (temp != 0)) { - enemy->unk_07 = 0; - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 15; - } -} diff --git a/src/world/common/UnkNpcAIFunc13.inc.c b/src/world/common/UnkNpcAIFunc13.inc.c deleted file mode 100644 index c83b2f48f2..0000000000 --- a/src/world/common/UnkNpcAIFunc13.inc.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc13)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 tempAngle; - f32 angleDiff; - - npc->duration = (aiSettings->unk_20 / 2) + rand_int(aiSettings->unk_20 / 2 + 1); - npc->currentAnim.w = enemy->animList[3]; - npc->moveSpeed = aiSettings->chaseSpeed; - - tempAngle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - angleDiff = get_clamped_angle_diff(npc->yaw, tempAngle); - - if (aiSettings->unk_1C.s < fabsf(angleDiff)) { - tempAngle = npc->yaw; - - if (angleDiff < 0.0f) { - tempAngle += -aiSettings->unk_1C.s; - } else { - tempAngle += aiSettings->unk_1C.s; - } - } - - npc->yaw = clamp_angle(tempAngle); - script->functionTemp[0] = 13; -} diff --git a/src/world/common/UnkNpcAIFunc13_2.inc.c b/src/world/common/UnkNpcAIFunc13_2.inc.c deleted file mode 100644 index d926965bb9..0000000000 --- a/src/world/common/UnkNpcAIFunc13_2.inc.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc13_2)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 tempAngle; - f32 angleDiff; - - npc->duration = (aiSettings->unk_14 / 2) + rand_int(aiSettings->unk_14 / 2 + 1); - npc->currentAnim.w = enemy->animList[3]; - npc->moveSpeed = aiSettings->alertRadius; - - tempAngle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - angleDiff = get_clamped_angle_diff(npc->yaw, tempAngle); - - if (aiSettings->unk_10.s < fabsf(angleDiff)) { - tempAngle = npc->yaw; - - if (angleDiff < 0.0f) { - tempAngle += -aiSettings->unk_10.s; - } else { - tempAngle += aiSettings->unk_10.s; - } - } - - npc->yaw = clamp_angle(tempAngle); - script->functionTemp[0] = 13; -} diff --git a/src/world/common/UnkNpcAIFunc14.inc.c b/src/world/common/UnkNpcAIFunc14.inc.c deleted file mode 100644 index 04e74c06e5..0000000000 --- a/src/world/common/UnkNpcAIFunc14.inc.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc14)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 vt5 = enemy->varTable[5]; - f32 jumpVelocity = vt5 / 100.0; - f32 vt6 = enemy->varTable[6]; - f32 jumpScale = vt6 / 100.0; - - npc->currentAnim.w = enemy->animList[8]; - npc->jumpVelocity = jumpVelocity; - npc->jumpScale = jumpScale; - npc->moveSpeed = aiSettings->chaseSpeed; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - - enemy->varTable[2] = 0; - - if (enemy->npcSettings->unk_2A & 2) { - npc->duration = 3; - script->functionTemp[0] = 13; - } else { - npc->duration = 1; - script->functionTemp[0] = 14; - enemy->unk_10.x = npc->pos.x; - enemy->unk_10.y = npc->pos.y; - enemy->unk_10.z = npc->pos.z; - enemy->unk_07 = 1; - } -} diff --git a/src/world/common/UnkNpcAIFunc15.inc.c b/src/world/common/UnkNpcAIFunc15.inc.c deleted file mode 100644 index e9974439a1..0000000000 --- a/src/world/common/UnkNpcAIFunc15.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc15)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* enemy = get_npc_unsafe(script->owner1.enemy->npcID); - - func_80049F7C(script, aiSettings, territory); - enemy->flags |= ENEMY_FLAGS_800; - enemy->jumpVelocity = rand_int(5) + 10.0; - enemy->jumpScale = 1.5f; - enemy->yaw = atan2(enemy->pos.x, enemy->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - enemy->moveSpeed = aiSettings->chaseSpeed; - script->functionTemp[0] = 13; - ai_enemy_play_sound(enemy, 0xB0000017, 0); -} diff --git a/src/world/common/UnkNpcAIFunc16.inc.c b/src/world/common/UnkNpcAIFunc16.inc.c deleted file mode 100644 index d751f2a71a..0000000000 --- a/src/world/common/UnkNpcAIFunc16.inc.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc16)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = enemy->varTable[10]; - npc->currentAnim.w = enemy->animList[13]; - script->functionTemp[0] = 21; -} diff --git a/src/world/common/UnkNpcAIFunc17.inc.c b/src/world/common/UnkNpcAIFunc17.inc.c deleted file mode 100644 index 3d388c95ec..0000000000 --- a/src/world/common/UnkNpcAIFunc17.inc.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc17)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->duration = 8; - npc->currentAnim.w = enemy->animList[14]; - script->functionTemp[0] = 52; - } -} diff --git a/src/world/common/UnkNpcAIFunc18.inc.c b/src/world/common/UnkNpcAIFunc18.inc.c deleted file mode 100644 index f8c4d520fa..0000000000 --- a/src/world/common/UnkNpcAIFunc18.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc18)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - disable_npc_shadow(npc); - npc->collisionHeight = 22; - npc->collisionRadius = 24; - script->functionTemp[1] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[8]; - script->functionTemp[0] = 1; -} diff --git a/src/world/common/UnkNpcAIFunc19.inc.c b/src/world/common/UnkNpcAIFunc19.inc.c deleted file mode 100644 index 0d3874539b..0000000000 --- a/src/world/common/UnkNpcAIFunc19.inc.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc19)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } - - if (npc->turnAroundYawAdjustment == 0 && npc->duration <= 0) { - npc->duration = 8; - npc->currentAnim.w = enemy->animList[11]; - script->functionTemp[0] = 51; - } -} diff --git a/src/world/common/UnkNpcAIFunc1_copy.inc.c b/src/world/common/UnkNpcAIFunc1_copy.inc.c deleted file mode 100644 index 8810a43392..0000000000 --- a/src/world/common/UnkNpcAIFunc1_copy.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc1_copy)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); - npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); - npc->currentAnim.w = *enemy->animList; - script->functionTemp[0] = 3; -} diff --git a/src/world/common/UnkNpcAIFunc2.inc.c b/src/world/common/UnkNpcAIFunc2.inc.c deleted file mode 100644 index f4807214ec..0000000000 --- a/src/world/common/UnkNpcAIFunc2.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc2)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - PlayerStatus* playerStatus = gPlayerStatusPtr; - - npc->duration = 0; - npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); - npc->currentAnim.w = enemy->animList[8]; - script->functionTemp[0] = 11; -} diff --git a/src/world/common/UnkNpcAIFunc20.inc.c b/src/world/common/UnkNpcAIFunc20.inc.c deleted file mode 100644 index 259c7078e5..0000000000 --- a/src/world/common/UnkNpcAIFunc20.inc.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc20)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - npc->collisionHeight = 26; - npc->collisionRadius = 24; - script->functionTemp[0] = 4; - } -} diff --git a/src/world/common/UnkNpcAIFunc21.inc.c b/src/world/common/UnkNpcAIFunc21.inc.c deleted file mode 100644 index 4fddb8561d..0000000000 --- a/src/world/common/UnkNpcAIFunc21.inc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc21)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - enable_npc_shadow(npc); - npc->currentAnim.w = enemy->animList[10]; - npc->duration = 8; - script->functionTemp[0] = 3; - } -} diff --git a/src/world/common/UnkNpcAIFunc22.inc.c b/src/world/common/UnkNpcAIFunc22.inc.c deleted file mode 100644 index 0e144e36f6..0000000000 --- a/src/world/common/UnkNpcAIFunc22.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc22)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[1] = rand_int(1000) % 2 + 2; - script->functionTemp[0] = 5; -} diff --git a/src/world/common/UnkNpcAIFunc23.inc.c b/src/world/common/UnkNpcAIFunc23.inc.c deleted file mode 100644 index 0d98d284bd..0000000000 --- a/src/world/common/UnkNpcAIFunc23.inc.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc23)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1] = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0] = 1; -} diff --git a/src/world/common/UnkNpcAIFunc24.inc.c b/src/world/common/UnkNpcAIFunc24.inc.c deleted file mode 100644 index 5cffb0caf7..0000000000 --- a/src/world/common/UnkNpcAIFunc24.inc.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc24)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1] = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2] = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2] = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0] = 1; -} diff --git a/src/world/common/UnkNpcAIFunc25.inc.c b/src/world/common/UnkNpcAIFunc25.inc.c deleted file mode 100644 index 92c4a7fa1d..0000000000 --- a/src/world/common/UnkNpcAIFunc25.inc.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc25)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2]++; - if (script->functionTemp[2] >= enemy->territory->patrol.numPoints) { - script->functionTemp[2] = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0] = 1; -} diff --git a/src/world/common/UnkNpcAIFunc26.inc.c b/src/world/common/UnkNpcAIFunc26.inc.c deleted file mode 100644 index b4d1760ae2..0000000000 --- a/src/world/common/UnkNpcAIFunc26.inc.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "common.h" -#include "npc.h" - -s32 N(UnkNpcAIFunc26)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Camera* camera = &gCameras[gCurrentCamID]; - Enemy* enemy2 = get_enemy(enemy->npcID + 1); - f32 phi_f20; - s32 ret = TRUE; - - if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) > enemy2->varTable[2]) { - ret = FALSE; - } - - if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { - phi_f20 = 90.0f; - } else { - phi_f20 = 270.0f; - } - - if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z))) > enemy2->varTable[3]) { - ret = FALSE; - } - - if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - gPlayerStatusPtr->position.y)) { - ret = FALSE; - } - - if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { - ret = FALSE; - } - - if (gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { - ret = FALSE; - } - - return ret; -} diff --git a/src/world/common/UnkNpcAIFunc27.inc.c b/src/world/common/UnkNpcAIFunc27.inc.c deleted file mode 100644 index c91ed9d4f4..0000000000 --- a/src/world/common/UnkNpcAIFunc27.inc.c +++ /dev/null @@ -1,87 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkNpcAIFunc27)(Evt *script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); - case 3: - func_80049C04(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIFunc28.inc.c b/src/world/common/UnkNpcAIFunc28.inc.c deleted file mode 100644 index fe603bf4b0..0000000000 --- a/src/world/common/UnkNpcAIFunc28.inc.c +++ /dev/null @@ -1,87 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkNpcAIFunc28)(Evt *script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->wander.isFlying) { - npc->flags = (npc->flags | 0x200) & ~0x8; - } else { - npc->flags = (npc->flags & ~0x200) | 0x8; - } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - enemy->varTable[0] = 0; - } - - if ((script->functionTemp[0] < 30) && (enemy->varTable[0] == 0) && N(UnkNpcAIFunc26)(script)) { - script->functionTemp[0] = 30; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, npcAISettings, territoryPtr); - case 1: - func_800496B8(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc4)(script, npcAISettings, territoryPtr); - case 3: - N(UnkNpcAIFunc29)(script, npcAISettings, territoryPtr); - break; - case 10: - func_80049E3C(script, npcAISettings, territoryPtr); - case 11: - func_80049ECC(script, npcAISettings, territoryPtr); - break; - case 12: - func_80049F7C(script, npcAISettings, territoryPtr); - case 13: - func_8004A124(script, npcAISettings, territoryPtr); - break; - case 14: - func_8004A3E8(script, npcAISettings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc6)(script); - case 31: - N(UnkNpcAIFunc7)(script); - if (script->functionTemp[0] != 32) { - break; - } - case 32: - N(UnkNpcAIFunc8)(script); - if (script->functionTemp[0] != 33) { - break; - } - case 33: - N(UnkNpcAIFunc5)(script); - break; - case 99: - func_8004A73C(script); - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIFunc29.inc.c b/src/world/common/UnkNpcAIFunc29.inc.c deleted file mode 100644 index e5a2f3ea14..0000000000 --- a/src/world/common/UnkNpcAIFunc29.inc.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc29)(Evt *script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 d100; - - if (enemy->varTable[0] == 0) { - if (rand_int(100) >= 50) { - enemy->varTable[0] = 3; - } else { - enemy->varTable[0] = 1; - } - set_npc_yaw(npc, 270.0f); - } - - switch (enemy->varTable[0]) { - case 1: - enemy->varTable[0] = 2; - enemy->varTable[1] = 0; - npc->currentAnim.w = 0x42000F; - case 2: - enemy->varTable[1]++; - if (enemy->varTable[1] > 50) { - enemy->varTable[0] = 5; - } - break; - case 3: - enemy->varTable[0] = 4; - enemy->varTable[1] = 0; - npc->currentAnim.w = 0x420010; - case 4: - enemy->varTable[1]++; - if (enemy->varTable[1] == 0x19) { - npc->yaw = 90.0f; - } - if (enemy->varTable[1] > 60) { - enemy->varTable[0] = 5; - } - break; - case 5: - enemy->varTable[0] = 6; - enemy->varTable[1] = 0; - npc->currentAnim.w = 0x420003; - fx_sweat(0, npc->pos.x, npc->pos.y, npc->pos.z, npc->collisionHeight, 0, 0xA); - case 6: - enemy->varTable[1]++; - if (enemy->varTable[1] > 10) { - d100 = rand_int(100); - - if (d100 < 90) { - enemy->varTable[0] = 7; - } else if (d100 >= 95) { - enemy->varTable[0] = 3; - } else { - enemy->varTable[0] = 1; - } - } - break; - } - - if (enemy->varTable[0] == 7) { - script->functionTemp[0] = 0; - } -} diff --git a/src/world/common/UnkNpcAIFunc3.inc.c b/src/world/common/UnkNpcAIFunc3.inc.c deleted file mode 100644 index 8836f6faf7..0000000000 --- a/src/world/common/UnkNpcAIFunc3.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc3)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->duration = 0; - script->functionTemp[0] = 14; - } - } -} diff --git a/src/world/common/UnkNpcAIFunc34.inc.c b/src/world/common/UnkNpcAIFunc34.inc.c deleted file mode 100644 index 41c603be13..0000000000 --- a/src/world/common/UnkNpcAIFunc34.inc.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc34)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - s32 flag; - f32 temp_f6; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) { - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 30; - script->functionTemp[0] = 20; - enemy->varTable[9] = 30; - return; - } - - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - flag = 0; - if (!(npc->flags & 8)) { - x = npc->pos.x; - y = npc->pos.y + npc->collisionHeight; - z = npc->pos.z; - w = npc->collisionHeight + 3.0; - if ((npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) { - flag = 1; - } - } - - if (flag) { - npc->pos.y = y + 1.0; - } else { - temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0); - if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) { - temp_f6 = -temp_f6; - npc->pos.y += temp_f6 * 0.06; - } - } - if (npc->duration > 0) { - npc->duration--; - return; - } - script->functionTemp[0] = 12; -} diff --git a/src/world/common/UnkNpcAIFunc35.inc.c b/src/world/common/UnkNpcAIFunc35.inc.c deleted file mode 100644 index 855253e386..0000000000 --- a/src/world/common/UnkNpcAIFunc35.inc.c +++ /dev/null @@ -1,147 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc35)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 cond = FALSE; - f32 vt7 = (f32)enemy->varTable[7] / 100.0; - f32 vt3 = (f32)enemy->varTable[3] / 100.0; - f32 vt4 = (f32)enemy->varTable[4] / 100.0; - f32 vt1 = (f32)enemy->varTable[1] / 100.0; - f32 posX, posY, posZ, posW; - f32 temp_f24; - - enemy->varTable[4] = npc->pos.y * 100.0; - - temp_f24 = vt3 + vt7; - - if ((enemy->varTable[0] & 0x11) == 1) { - if (npc->flags & 8) { - if (vt1 < temp_f24 - npc->pos.y) { - enemy->varTable[0] |= 0x10; - } - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - if (vt1 < (vt3 - posW)) { - enemy->varTable[0] |= 0x10; - } - } - } - - if ((enemy->varTable[0] & 0x11) == 0x11) { - f64 test; - f32 yTemp; - - do { - if (npc->flags & 8) { - yTemp = temp_f24; - test = vt4 + ((temp_f24 - vt4) * 0.09); - npc->pos.y = test; - } else { - posX = npc->pos.x; - posY = vt4; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - - yTemp = posY; - yTemp += vt3; - test = vt4 + ((yTemp - vt4) * 0.09); - npc->pos.y = test; - } - - if (fabsf(yTemp - npc->pos.y) < 1.0) { - npc->pos.y = yTemp; - enemy->varTable[0] &= ~0x10; - } - } while (0); // required to match - } else { - f32 vt1temp = vt1; // required to match - - if (enemy->varTable[1] > 0) { - f32 sinTemp = sin_deg(enemy->varTable[2]); - s32 hit; - - if (npc->flags & 8) { - hit = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - hit = npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); - } - - if (hit) { - npc->pos.y = posY + vt3 + (sinTemp * vt1temp); - } else { - npc->pos.y = temp_f24 + (sinTemp * vt1temp); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - } - - if (enemy->varTable[9] <= 0) { - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (gPlayerStatusPtr->position.y < (npc->pos.y + npc->collisionHeight) + 10.0 && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) - { - s32 emoteTemp; - - fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &emoteTemp); - npc->moveToPos.y = npc->pos.y; - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - } else { - enemy->varTable[9]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, - enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); - if (npc->moveSpeed < posW) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - cond = TRUE; - } - } - - if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | cond) { - if (npc->turnAroundYawAdjustment != 0) { - return; - } - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - - enemy->varTable[4] = npc->pos.y * 100.0; - if (aiSettings->moveTime > 0) { - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if (aiSettings->unk_2C <= 0 || aiSettings->waitTime <= 0 || script->functionTemp[1] < 3) { - script->functionTemp[0] = 0; - } - } - } -} diff --git a/src/world/common/UnkNpcAIFunc36.inc.c b/src/world/common/UnkNpcAIFunc36.inc.c deleted file mode 100644 index 377de51677..0000000000 --- a/src/world/common/UnkNpcAIFunc36.inc.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc36)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z; - - func_800495A0(script, aiSettings, territory); - npc->flags |= NPC_FLAG_NO_Y_MOVEMENT; - npc->jumpVelocity = (rand_int(45) / 10.0) + 8.0; - npc->jumpScale = 1.5f; - ai_enemy_play_sound(npc, 0xB0000017, 0); - - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, - enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ) != 0) - { - s32 i; - - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - - for (i = 0; i < 6; i++) { - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 25.0f, - npc->yaw, npc->collisionHeight, npc->collisionRadius)) - { - npc->yaw += 30.0; - } else { - break; - } - } - } else { - npc->yaw = clamp_angle(npc->yaw + rand_int(60) - 30.0f); - } -} diff --git a/src/world/common/UnkNpcAIFunc37.inc.c b/src/world/common/UnkNpcAIFunc37.inc.c deleted file mode 100644 index 223748dd72..0000000000 --- a/src/world/common/UnkNpcAIFunc37.inc.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc37)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1] <= 0) { - do { - script->functionTemp[1] = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) != 0) { - s32 emoteTemp; - - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - return; - } - } while (0); // required to match - } - script->functionTemp[1]--; - } - - if (npc->moveSpeed > 0.0) { - f32 collRadius; - f32 collHeight; - f32 moveSpeed; - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - moveSpeed = npc->moveSpeed; - collHeight = npc->collisionHeight; - collRadius = npc->collisionRadius; - - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &posX, &posY, &posZ, moveSpeed, npc->yaw, collHeight, - collRadius * 1.2) == 0) - { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } else { - npc->moveSpeed = 0.0f; - } - } - - if (npc->jumpVelocity < 0.0) { - posX = npc->pos.x; - posY = npc->pos.y + 13.0; - posZ = npc->pos.z; - posW = fabsf(npc->jumpVelocity) + 16.0; - - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW) != 0 && - posW <= fabsf(npc->jumpVelocity) + 13.0) - { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - - if (aiSettings->unk_2C <= 0) { - script->functionTemp[0] = 0; - } else if (aiSettings->moveTime <= 0) { - script->functionTemp[0] = 0; - } else if (script->functionTemp[1] == 0) { - script->functionTemp[0] = 0; - } - return; - } - } - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; -} diff --git a/src/world/common/UnkNpcAIFunc38.inc.c b/src/world/common/UnkNpcAIFunc38.inc.c deleted file mode 100644 index 78bbfbc1a9..0000000000 --- a/src/world/common/UnkNpcAIFunc38.inc.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc38)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (aiSettings->unk_14 >= 0 && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0) != 0) { - s32 emoteTemp; - - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 12; - } else if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0] = 0; - } - } - } -} diff --git a/src/world/common/UnkNpcAIFunc39.inc.c b/src/world/common/UnkNpcAIFunc39.inc.c deleted file mode 100644 index f92f42c0a1..0000000000 --- a/src/world/common/UnkNpcAIFunc39.inc.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc39)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 sp34; - - if (npc->moveSpeed > 0.0) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &posX, &posY, &posZ, npc->moveSpeed, npc->yaw, - npc->collisionHeight, npc->collisionRadius)) - { - npc->moveSpeed = 0.0f; - } else { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - } - - if (npc->jumpVelocity < 0.0) { - posX = npc->pos.x; - sp34 = 100.0f; - posZ = npc->pos.z; - posW = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &posX, &sp34, &posZ, &posW); - - posX = npc->pos.x; - posY = npc->pos.y + 13.0; - posZ = npc->pos.z; - posW = fabsf(npc->jumpVelocity) + 16.0; - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW) && posW <= fabsf(npc->jumpVelocity) + 13.0) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0.0f, 0.0f); - script->functionTemp[0] = 12; - - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) { - s32 emoteTemp; - - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); - npc->duration = 25; - script->functionTemp[0] = 14; - } - return; - } - } - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; -} diff --git a/src/world/common/UnkNpcAIFunc4.inc.c b/src/world/common/UnkNpcAIFunc4.inc.c deleted file mode 100644 index da353bf0c0..0000000000 --- a/src/world/common/UnkNpcAIFunc4.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = 0; - set_npc_yaw(npc, 270.0f); - enemy->varTable[0] = 0; - script->functionTemp[0] = 3; -} diff --git a/src/world/common/UnkNpcAIFunc40.inc.c b/src/world/common/UnkNpcAIFunc40.inc.c deleted file mode 100644 index 690ee1f177..0000000000 --- a/src/world/common/UnkNpcAIFunc40.inc.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc40)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - func_800495A0(script, aiSettings, territory); - npc->jumpVelocity = rand_int(5) + 8.0; - npc->jumpScale = 1.5f; -} - -void N(UnkNpcAIFunc41)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - func_80049F7C(script, aiSettings, territory); - npc->jumpVelocity = rand_int(5) + 5.0; - npc->jumpScale = 1.5f; -} diff --git a/src/world/common/UnkNpcAIFunc42.inc.c b/src/world/common/UnkNpcAIFunc42.inc.c deleted file mode 100644 index 734f35f69d..0000000000 --- a/src/world/common/UnkNpcAIFunc42.inc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc42)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->alertRadius * 0.3; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - script->functionTemp[1] = 0; - script->functionTemp[0] = 16; -} diff --git a/src/world/common/UnkNpcAIFunc43.inc.c b/src/world/common/UnkNpcAIFunc43.inc.c deleted file mode 100644 index 5e0d045c3c..0000000000 --- a/src/world/common/UnkNpcAIFunc43.inc.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc43)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->currentAnim.w = enemy->animList[0]; - script->functionTemp[0] = 1; - - if (enemy->flags & ENEMY_FLAGS_100000) { - npc->yaw = enemy->varTable[0]; - } - - if (enemy->territory->wander.moveSpeedOverride <= 0) { - npc->moveSpeed = aiSettings->alertRadius; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } -} diff --git a/src/world/common/UnkNpcAIFunc44.inc.c b/src/world/common/UnkNpcAIFunc44.inc.c deleted file mode 100644 index 47f25f778c..0000000000 --- a/src/world/common/UnkNpcAIFunc44.inc.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc44)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (aiSettings->waitTime >= 0 && (func_800490B4(territory, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 0) != 0)) { - s32 emoteTemp; - - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0] = 12; - } else { - script->functionTemp[0] = 10; - } - } -} diff --git a/src/world/common/UnkNpcAIFunc45.inc.c b/src/world/common/UnkNpcAIFunc45.inc.c deleted file mode 100644 index 6aca37e712..0000000000 --- a/src/world/common/UnkNpcAIFunc45.inc.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc45)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (aiSettings->waitTime >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->waitTime; - if (func_800490B4(territory, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 0) != 0) { - s32 emoteTemp; - - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, (f32) npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0] = 10; - } else { - script->functionTemp[0] = 12; - } - return; - } - } - script->functionTemp[1]--; - } - - if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) < npc->moveSpeed) { - npc->pos.x = enemy->territory->wander.point.x; - npc->pos.z = enemy->territory->wander.point.z; - npc->yaw = enemy->territory->wander.wanderSizeX; - script->functionTemp[0] = 0; - } - - if (npc->turnAroundYawAdjustment == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} - diff --git a/src/world/common/UnkNpcAIFunc47.inc.c b/src/world/common/UnkNpcAIFunc47.inc.c deleted file mode 100644 index 73e9387ce1..0000000000 --- a/src/world/common/UnkNpcAIFunc47.inc.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "common.h" -#include "npc.h" - -// TODO apiStatus? -s32 N(UnkNpcAIFunc47)(Evt* script, f32 arg1, f32 arg2, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Camera* camera = &gCameras[gCurrentCamID]; - - if (func_800490B4(territory, enemy, arg1, arg2, 0)) { - f32 angle; - f32 t1; - - if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { - angle = 90.0f; - } else { - angle = 270.0f; - } - - t1 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - if (fabsf(get_clamped_angle_diff(angle, t1)) > 75.0) { - return -1; - } - - t1 = atan2(0.0f, npc->pos.y, fabsf(npc->pos.x - gPlayerStatusPtr->position.x), gPlayerStatusPtr->position.y); - if (fabsf(t1 - 90.0) > 70.0) { - return -1; - } - - if (gPartnerActionStatus.actingPartner == PARTNER_BOW || gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { - return -1; - } - - if ((get_enemy(enemy->npcID + 1)->varTable[0] == 0)) { - return 1; - } - } - - return -1; -} diff --git a/src/world/common/UnkNpcAIFunc48.inc.c b/src/world/common/UnkNpcAIFunc48.inc.c deleted file mode 100644 index b906563225..0000000000 --- a/src/world/common/UnkNpcAIFunc48.inc.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc48)(Evt* script, f32 arg1, f32 arg2, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (func_800490B4(territory, enemy, arg1, arg2, 1) == 0) { - s32 sp28; - - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); - npc->currentAnim.w = enemy->animList[0]; - npc->duration = 20; - script->functionTemp[0] = 33; - } else { - s32 npcID = N(UnkFunc61)(script); - - if (npcID != NPC_SELF && get_enemy(npcID)->varTable[0] == 0 && npc->turnAroundYawAdjustment == 0) { - npc->currentAnim.w = enemy->animList[8]; - npc->duration = enemy->varTable[1]; - script->functionTemp[0] = 30; - } - } -} diff --git a/src/world/common/UnkNpcAIFunc49.inc.c b/src/world/common/UnkNpcAIFunc49.inc.c deleted file mode 100644 index 80233a2d32..0000000000 --- a/src/world/common/UnkNpcAIFunc49.inc.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc49)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 npcID; - - npc->duration--; - if (npc->duration <= 0) { - npcID = N(UnkFunc61)(script); - if (npcID < 0) { - s32 sp28; - - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); - npc->currentAnim.w = enemy->animList[0]; - } else { - Enemy* enemy2; - - npc->currentAnim.w = enemy->animList[9]; - enemy2 = get_enemy(npcID); - enemy2->varTable[4] = enemy->npcID; - enemy2->varTable[0] = 1; - } - npc->duration = enemy->varTable[2]; - script->functionTemp[0] = 33; - } -} diff --git a/src/world/common/UnkNpcAIFunc5.inc.c b/src/world/common/UnkNpcAIFunc5.inc.c deleted file mode 100644 index f68fac08ce..0000000000 --- a/src/world/common/UnkNpcAIFunc5.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc5)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - enemy->varTable[0] = 0; - script->functionTemp[0] = 12; - } -} diff --git a/src/world/common/UnkNpcAIFunc6.inc.c b/src/world/common/UnkNpcAIFunc6.inc.c deleted file mode 100644 index f82496f515..0000000000 --- a/src/world/common/UnkNpcAIFunc6.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc6)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - enemy->varTable[0] = 1; - if (npc->turnAroundYawAdjustment == 0) { - enemy->varTable[0] = 2; - npc->duration = enemy->varTable[1]; - npc->currentAnim.w = enemy->animList[8]; - script->functionTemp[0] = 31; - } -} diff --git a/src/world/common/UnkNpcAIFunc7.inc.c b/src/world/common/UnkNpcAIFunc7.inc.c deleted file mode 100644 index 7a813abe27..0000000000 --- a/src/world/common/UnkNpcAIFunc7.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc7)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - enemy->varTable[0] = 3; - npc->duration = enemy->varTable[2]; - npc->currentAnim.w = enemy->animList[9]; - script->functionTemp[0] = 32; - } -} diff --git a/src/world/common/UnkNpcAIFunc8.inc.c b/src/world/common/UnkNpcAIFunc8.inc.c deleted file mode 100644 index 127cb577d6..0000000000 --- a/src/world/common/UnkNpcAIFunc8.inc.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(UnkNpcAIFunc8)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - enemy->varTable[0] = 4; - npc->currentAnim.w = enemy->animList[0]; - npc->duration = enemy->varTable[3]; - if (enemy->varTable[3] >= 8) { - s32 something; - - fx_emote(EMOTE_FRUSTRATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, enemy->varTable[3] - 1, &something); - } - script->functionTemp[0] = 33; - } -} diff --git a/src/world/common/UnkNpcAIFunc9.inc.c b/src/world/common/UnkNpcAIFunc9.inc.c deleted file mode 100644 index dd24ed3fad..0000000000 --- a/src/world/common/UnkNpcAIFunc9.inc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcAIFunc9)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Enemy* enemy2 = get_enemy(enemy->npcID + 1); - Npc* npc2 = get_npc_unsafe(enemy2->npcID); - - npc->yaw = atan2(npc->pos.x, npc->pos.z, npc2->pos.x, npc2->pos.z); - if (enemy2->varTable[0] == 0) { - npc->currentAnim.w = enemy->animList[0]; - npc->duration = enemy->varTable[2]; - script->functionTemp[0] = 33; - } -} diff --git a/src/world/common/UnkNpcAIMainFunc.inc.c b/src/world/common/UnkNpcAIMainFunc.inc.c deleted file mode 100644 index cc1701eab1..0000000000 --- a/src/world/common/UnkNpcAIMainFunc.inc.c +++ /dev/null @@ -1,86 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); - f32 posX, posY, posZ, posW; - - territory.unk_00 = 0; - territory.shape = enemy->territory->patrol.detectShape; - territory.pointX = enemy->territory->patrol.detect.x; - territory.pointZ = enemy->territory->patrol.detect.z; - territory.sizeX = enemy->territory->patrol.detectSizeX; - territory.sizeZ = enemy->territory->patrol.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~0x800; - if (!enemy->territory->patrol.isFlying) { - npc->flags = (npc->flags | 0x200) & ~8; - } else { - npc->flags = (npc->flags & ~0x200) | 8; - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = 100.0f; - - if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { - npc->pos.y = posY; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); - case 1: - N(UnkFunc13)(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc14)(script, npcAISettings, territoryPtr); - break; - case 4: - N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, npcAISettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); - case 13: - N(UnkFunc15)(script, npcAISettings, territoryPtr); - break; - case 14: - N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); - break; - case 15: - N(UnkFunc16)(script, npcAISettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - } - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIMainFunc10.inc.c b/src/world/common/UnkNpcAIMainFunc10.inc.c deleted file mode 100644 index e58da2f8bf..0000000000 --- a/src/world/common/UnkNpcAIMainFunc10.inc.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -ApiStatus N(UnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 120.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - N(UnkFunc5)(npc, enemy, script, aiSettings); - script->functionTemp[0] = 0; - } - npc->unk_AB = -2; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(SixFloatsFunc)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); - case 13: - N(UnkNpcAIFunc34)(script, aiSettings, territoryPtr); - break; - case 20: - N(UnkFunc45)(script, aiSettings, territoryPtr); - break; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIMainFunc2.inc.c b/src/world/common/UnkNpcAIMainFunc2.inc.c deleted file mode 100644 index 66a170b308..0000000000 --- a/src/world/common/UnkNpcAIMainFunc2.inc.c +++ /dev/null @@ -1,69 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkNpcAIMainFunc2)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr; - - enemy->varTable[10] = evt_get_variable(script, *args++); - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - territoryPtr = &territory; - - if (isInitialCall) { - script->functionTemp[0] = 0; - npc->duration = 0; - script->functionTemp[1] = 0; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - npc->flags &= ~NPC_FLAG_GRAVITY; - npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; - - enemy->unk_B0 |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); - if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc36)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc37)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - if (script->functionTemp[0] != 3) { - break; - } - case 3: - N(UnkNpcAIFunc38)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc15)(script, aiSettings, territoryPtr); - case 13: - N(UnkNpcAIFunc39)(script, aiSettings, territoryPtr); - break; - case 14: - N(UnkDurationCheck)(script, aiSettings, territoryPtr); - break; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIMainFunc3.inc.c b/src/world/common/UnkNpcAIMainFunc3.inc.c deleted file mode 100644 index 1847d3df31..0000000000 --- a/src/world/common/UnkNpcAIMainFunc3.inc.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkNpcAIMainFunc3)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - npc->duration = 0; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - npc->flags &= ~NPC_FLAG_GRAVITY; - npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; - script->functionTemp[1] = 0; - script->functionTemp[0] = 0; - if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc40)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc37)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkNpcAIFunc38)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc41)(script, aiSettings, territoryPtr); - case 13: - N(UnkNpcAIFunc39)(script, aiSettings, territoryPtr); - break; - case 14: - N(UnkDurationCheck)(script, aiSettings, territoryPtr); - break; - } - return 0; -} diff --git a/src/world/common/UnkNpcAIMainFunc4.inc.c b/src/world/common/UnkNpcAIMainFunc4.inc.c deleted file mode 100644 index db16d0903d..0000000000 --- a/src/world/common/UnkNpcAIMainFunc4.inc.c +++ /dev/null @@ -1,75 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkNpcAIMainFunc4)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - enemy->varTable[0] = npc->yaw; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - - if (!(enemy->territory->wander.isFlying)) { - npc->flags |= NPC_FLAG_GRAVITY; - npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; - } else { - npc->flags &= ~NPC_FLAG_GRAVITY; - npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 15; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc43)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc44)(script, aiSettings, territoryPtr); - break; - case 10: - N(NpcJumpFunc3)(script, aiSettings, territoryPtr); - case 11: - N(NpcJumpFunc)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc13_2)(script, aiSettings, territoryPtr); - case 13: - N(UnkNpcAIFunc11)(script, aiSettings, territoryPtr); - break; - case 14: - N(UnkNpcAIFunc10)(script, aiSettings, territoryPtr); - break; - case 15: - N(UnkNpcAIFunc42)(script, aiSettings, territoryPtr); - case 16: - N(UnkNpcAIFunc45)(script, aiSettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - break; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIMainFunc5.inc.c b/src/world/common/UnkNpcAIMainFunc5.inc.c deleted file mode 100644 index 07f955ea7f..0000000000 --- a/src/world/common/UnkNpcAIMainFunc5.inc.c +++ /dev/null @@ -1,135 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - enemy->varTable[6] = npc->collisionHeight; - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - enemy->unk_B0 |= ENEMY_AI_FLAGS_8; - } - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - enemy->unk_07 = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - npc->collisionHeight = enemy->varTable[6]; - enemy->varTable[9] = 0; - - if (!enemy->territory->wander.isFlying) { - npc->flags |= NPC_FLAG_GRAVITY; - npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; - } else { - npc->flags &= ~NPC_FLAG_GRAVITY; - npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - s32 emoteTemp; - - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - } - - if (enemy->varTable[9] > 0) { - enemy->varTable[9]--; - if (enemy->varTable[9] == 0) { - if (npc->currentAnim.w == 0x55002E || npc->currentAnim.w == 0x55002F) { - npc->currentAnim.w = 0x55000C; - } - } else { - return ApiStatus_BLOCK; - } - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, aiSettings, territoryPtr); - npc->collisionHeight = enemy->varTable[6]; - case 1: - func_800496B8(script, aiSettings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); - if (enemy->varTable[7] == 6) { - if (rand_int(100) < 33) { - if (enemy->varTable[8] != 0) { - enemy->varTable[8] = 0; - enemy->unk_B5 = 0; - npc->currentAnim.w = 0x55002F; - } else { - enemy->varTable[8] = 1; - enemy->unk_B5 = 1; - npc->currentAnim.w = 0x55002E; - } - enemy->varTable[9] = 7; - return ApiStatus_BLOCK; - } - } - case 3: - func_80049C04(script, aiSettings, territoryPtr); - break; - case 12: - N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); - case 13: - N(UnkDistFunc)(script, aiSettings, territoryPtr); - break; - case 14: - N(UnkNpcAIFunc12)(script, aiSettings, territoryPtr); - break; - case 15: - N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); - break; - case 99: - func_8004A73C(script); - break; - } - - if (enemy->varTable[7] == 6) { - if (enemy->varTable[8] != 0) { - enemy->unk_B5 = 1; - } else { - enemy->unk_B5 = 0; - } - if (enemy->varTable[8] != 0) { - switch (npc->currentAnim.w - 0x550004) { - case 0: - case 8: - case 10: - case 12: - case 14: - case 18: - case 20: - npc->currentAnim.w++; - break; - } - } - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIMainFunc7.inc.c b/src/world/common/UnkNpcAIMainFunc7.inc.c deleted file mode 100644 index 95ffa01add..0000000000 --- a/src/world/common/UnkNpcAIMainFunc7.inc.c +++ /dev/null @@ -1,100 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -ApiStatus N(UnkNpcAIMainFunc7)(Evt* script, s32 isInitialCall) { - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - NpcAISettings* settings = (NpcAISettings*) evt_get_variable(script, *args++); - f32 dist; - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 40.0f; - territory.unk_1C = 0; - - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; - - if (!enemy->territory->wander.isFlying) { - npc->flags |= NPC_FLAG_GRAVITY; - npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; - } else { - npc->flags &= ~NPC_FLAG_GRAVITY; - npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - enemy->flags &= ~ENEMY_FLAGS_40000000; - } - - switch (script->functionTemp[0]) { - case 0: - func_800495A0(script, settings, territoryPtr); - /* fallthrough */ - case 1: - func_800496B8(script, settings, territoryPtr); - break; - case 2: - base_UnkNpcAIFunc1(script, settings, territoryPtr); - /* fallthrough */ - case 3: - func_80049C04(script, settings, territoryPtr); - break; - case 10: - func_80049E3C(script, settings, territoryPtr); - /* fallthrough */ - case 11: - func_80049ECC(script, settings, territoryPtr); - break; - case 12: - dist = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - if (enemy->varTable[0] == 0 || enemy->varTable[0] < dist) { - N(UnkNpcAIFunc48)(script, settings->chaseRadius, settings->unk_28.f, territoryPtr); - if (script->functionTemp[0] != 12) { - break; - } - } - func_80049F7C(script, settings, territoryPtr); - /* fallthrough */ - case 13: - func_8004A124(script, settings, territoryPtr); - break; - case 14: - func_8004A3E8(script, settings, territoryPtr); - break; - case 30: - N(UnkNpcAIFunc49(script)); - break; - case 31: - N(UnkSetDurationFunc(script)); - break; - case 32: - N(UnkNpcAIFunc9(script)); - break; - case 33: - N(UnkDurationCheckNoArgs(script)); - break; - case 99: - func_8004A73C(script); - break; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcAIMainFunc9.inc.c b/src/world/common/UnkNpcAIMainFunc9.inc.c deleted file mode 100644 index e936ad0d00..0000000000 --- a/src/world/common/UnkNpcAIMainFunc9.inc.c +++ /dev/null @@ -1,63 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); - - territory.unk_00 = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detect.x; - territory.pointZ = enemy->territory->wander.detect.z; - territory.sizeX = enemy->territory->wander.detectSizeX; - territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 120.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - N(UnkFunc5)(npc, enemy, script, aiSettings); - } - - npc->unk_AB = -2; - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(SixFloatsFunc)(script, aiSettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); - break; - case 13: - N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); - break; - case 14: - N(UnkFunc6)(script, aiSettings, territoryPtr); - break; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkNpcDurationAnimationFunc.inc.c b/src/world/common/UnkNpcDurationAnimationFunc.inc.c deleted file mode 100644 index d3baaaf309..0000000000 --- a/src/world/common/UnkNpcDurationAnimationFunc.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcDurationAnimationFunc)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration == 0) { - npc->currentAnim.w = *enemy->animList; - script->functionTemp[0] = 0; - } -} diff --git a/src/world/common/UnkNpcDurationFlagFunc.inc.c b/src/world/common/UnkNpcDurationFlagFunc.inc.c deleted file mode 100644 index 6d7adb579f..0000000000 --- a/src/world/common/UnkNpcDurationFlagFunc.inc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkNpcDurationFlagFunc)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration == 0) { - if (enemy->unk_B0 & ENEMY_AI_FLAGS_80) { - script->functionTemp[0] = 15; - } else { - script->functionTemp[0] = 0; - } - } -} diff --git a/src/world/common/UnkSetDurationFunc.inc.c b/src/world/common/UnkSetDurationFunc.inc.c deleted file mode 100644 index a02f631ba5..0000000000 --- a/src/world/common/UnkSetDurationFunc.inc.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(UnkSetDurationFunc)(Evt* script) { - Enemy* enemy = script->owner1.enemy; - - get_npc_unsafe(enemy->npcID)->duration = enemy->varTable[2]; - script->functionTemp[0] = 33; -} diff --git a/src/world/common/UnkYawFunc.inc.c b/src/world/common/UnkYawFunc.inc.c deleted file mode 100644 index 6abfacc54f..0000000000 --- a/src/world/common/UnkYawFunc.inc.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkYawFunc)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a0 = *args++; - f32 a = evt_get_variable(script, a0); - s32 a1 = *args++; - f32 b = evt_get_variable(script, a1); - s32 a2 = *args++; - f32 c = evt_get_variable(script, a2); - Npc* partner = get_npc_unsafe(NPC_PARTNER); - f32 currentCamYaw = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); - - add_vec2D_polar(&a, &c, 15.0f, partner->yaw); - add_vec2D_polar(&a, &c, 10.0f, currentCamYaw); - - evt_set_variable(script, a0, a); - evt_set_variable(script, a1, b); - evt_set_variable(script, a2, c); - - return ApiStatus_DONE2; -} diff --git a/src/world/common/atomic/QuizmoData.inc.c b/src/world/common/atomic/QuizmoData.inc.c index ff48516361..9922eab3c0 100644 --- a/src/world/common/atomic/QuizmoData.inc.c +++ b/src/world/common/atomic/QuizmoData.inc.c @@ -678,12 +678,12 @@ NpcAISettings N(Quizmo_NpcAISettings) = { .moveSpeed = 0.7f, .moveTime = 30, .waitTime = 20, - .unk_14 = -1, - .unk_2C = 1, + .playerSearchInterval = -1, + .unk_AI_2C = 1, }; EvtScript N(EVS_Quizmo_Npc_AI) = { - EVT_CALL(DoBasicAI, EVT_PTR(N(Quizmo_NpcAISettings))) + EVT_CALL(BasicAI_Main, EVT_PTR(N(Quizmo_NpcAISettings))) EVT_RETURN EVT_END }; @@ -696,7 +696,7 @@ NpcSettings N(Quizmo_NpcSettings) = { .otherAI = &N(EVS_Quizmo_NPC_OtherAI), .onInteract = &N(EVS_Quizmo_NPC_Interact), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .level = 99, }; @@ -709,7 +709,7 @@ NpcSettings N(Quizmo_AltNpcSettings) = { .onInteract = &N(EVS_Quizmo_NPC_Interact), .ai = &N(EVS_Quizmo_Npc_AI), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, .level = 99, .unk_2A = 16, }; diff --git a/src/world/common/atomic/enemy/BulletBill.inc.c b/src/world/common/atomic/enemy/BulletBill.inc.c deleted file mode 100644 index a31e327afc..0000000000 --- a/src/world/common/atomic/enemy/BulletBill.inc.c +++ /dev/null @@ -1,121 +0,0 @@ -#include "common.h" -#include "effects.h" - -ApiStatus N(BulletBill_Think)(Evt* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *script->ptrReadPos); - s32 hitDetected = FALSE; - s32 done = FALSE; - - Npc* launcher; - f32 nextX; - f32 nextZ; - f32 deltaY; - - if (isInitialCall || enemy->varTable[0] == 0x64) { - script->functionTemp[0] = 0; - npc->duration = 0; - enemy->unk_B0 |= ENEMY_AI_FLAGS_8; - enemy->flags |= 0x200000; - npc->flags |= 0x40000; - enemy->varTable[0] = 0; - enemy->varTable[1] = -1; - } - - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 != 0) { - return 0; - } - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - } - - switch (script->functionTemp[0]) { - case 0: - npc->pos.x = 0.0f; - npc->pos.y = -1000.0f; - npc->pos.z = 0.0f; - npc->rotation.y = 0.0f; - npc->duration = 0; - npc->flags |= 2; - npc->flags &= ~0x400; - disable_npc_shadow(npc); - enemy->varTable[0] = 0; - script->functionTemp[0] = 1; - // fallthrough - case 1: - if (enemy->varTable[0] != 2) { - break; - } - enemy->varTable[0] = 3; - launcher = get_npc_unsafe(get_enemy(enemy->varTable[1])->npcID); - npc->flags &= -3; - npc->pos.x = launcher->pos.x; - npc->pos.y = launcher->pos.y + 11.0; - npc->pos.z = launcher->pos.z + 1.0; - npc->yaw = launcher->yaw; - npc->moveSpeed = aiSettings->chaseSpeed; - npc->currentAnim.w = enemy->animList[2]; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 25.0f, npc->yaw); - if (npc->yaw < 180.0f) { - npc->renderYaw = 180.0f; - } else { - npc->renderYaw = 0.0f; - } - npc->currentAnim.w = enemy->animList[3]; - npc->duration = 300; - npc->flags |= 0x10400; - enable_npc_shadow(npc); - script->functionTemp[0] = 2; - // fallthrough - case 2: - deltaY = (npc->pos.y - gPlayerStatusPtr->position.y); - if (!(deltaY > 190.0) && !(deltaY < -120.0)) { - nextX = npc->pos.x; - nextZ = npc->pos.z; - add_vec2D_polar(&nextX, &nextZ, npc->moveSpeed, npc->yaw); - - if (npc->yaw < 180.0f) { - if (enemy->varTable[2] <= nextX) { - hitDetected = TRUE; - } - } else { - if (nextX <= enemy->varTable[2]) { - hitDetected = TRUE; - } - } - - if (hitDetected) { - npc->currentAnim.w = enemy->animList[7]; - ai_enemy_play_sound(npc, 0xB0000018, 0); - fx_ring_blast(0, npc->pos.x, npc->pos.y + 5.0f, npc->pos.z + 1.0f, 0.05f, 0x14); - fx_smoke_burst(0, npc->pos.x, npc->pos.y + 5.0f, npc->pos.z + 0.0f, 1.2f, 0x19); - npc->duration = 1; - script->functionTemp[0] = 3; - } else { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } - if (script->functionTemp[0] == 3) { - npc->duration--; - if (npc->duration <= 0) { - done = TRUE; - } - } - } else { - done = TRUE; - } - break; - - case 3: - npc->duration--; - if (npc->duration <= 0) { - done = TRUE; - } - break; - } - if (done != 0) { - enemy->varTable[0] = 0x64; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/atomic/enemy/Dead_UnkAI_1.inc.c b/src/world/common/atomic/enemy/Dead_UnkAI_1.inc.c deleted file mode 100644 index e22830b60c..0000000000 --- a/src/world/common/atomic/enemy/Dead_UnkAI_1.inc.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "world/common/UnkNpcAIFunc24.inc.c" - -#include "world/common/UnkFunc13.inc.c" - -#include "world/common/UnkNpcAIFunc1.inc.c" - -#include "world/common/UnkFunc14.inc.c" - -#include "world/common/UnkNpcAIFunc25.inc.c" - -#include "world/common/NpcJumpFunc2.inc.c" - -#include "world/common/NpcJumpFunc.inc.c" - -#include "world/common/UnkNpcAIFunc13.inc.c" - -#include "world/common/UnkFunc15.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc.inc.c" - -#include "world/common/UnkFunc16.inc.c" - -#include "world/common/DeadUnkNpcAIMainFunc.inc.c" diff --git a/src/world/common/atomic/enemy/Dead_UnkAI_9.inc.c b/src/world/common/atomic/enemy/Dead_UnkAI_9.inc.c deleted file mode 100644 index 9824f0e43f..0000000000 --- a/src/world/common/atomic/enemy/Dead_UnkAI_9.inc.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "world/common/UnkNpcAIFunc23.inc.c" - -#include "world/common/UnkNpcAIFunc35.inc.c" - -#include "world/common/UnkNpcAIFunc1.inc.c" - -#include "world/common/UnkFunc4.inc.c" - -#include "world/common/UnkNpcAIFunc2.inc.c" - -#include "world/common/SixFloatsFunc.inc.c" - -#include "world/common/UnkNpcAIFunc14.inc.c" - -#include "world/common/UnkNpcAIFunc3.inc.c" - -#include "world/common/UnkFunc6.inc.c" - -#include "world/common/UnkFunc5.inc.c" - -#include "world/common/DeadUnkNpcAIMainFunc9.inc.c" diff --git a/src/world/common/atomic/enemy/SpearGuy.inc.c b/src/world/common/atomic/enemy/SpearGuy.inc.c deleted file mode 100644 index 3a3bdd450b..0000000000 --- a/src/world/common/atomic/enemy/SpearGuy.inc.c +++ /dev/null @@ -1,23 +0,0 @@ - - -// 4 includes -#include "world/common/UnkNpcAIFunc4.inc.c" - -// unique to this enemy -#include "world/common/UnkNpcAIFunc29.inc.c" - -// 25 includes -#include "world/common/UnkNpcAIFunc6.inc.c" -#include "world/common/UnkNpcAIFunc7.inc.c" -#include "world/common/UnkNpcAIFunc8.inc.c" -#include "world/common/UnkNpcAIFunc5.inc.c" - -// 24 includes -#include "world/common/UnkNpcAIFunc26.inc.c" -#include "world/common/UnkFunc7.inc.c" - -// 16 includes -#include "world/common/UnkNpcAIFunc27.inc.c" - -// unique to this enemy -#include "world/common/UnkNpcAIFunc28.inc.c" diff --git a/src/world/common/atomic/enemy/ThrowAttackAI.inc.c b/src/world/common/atomic/enemy/ThrowAttackAI.inc.c deleted file mode 100644 index 36ddc5aaa4..0000000000 --- a/src/world/common/atomic/enemy/ThrowAttackAI.inc.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "world/common/UnkFunc61.inc.c" - -#include "world/common/UnkNpcAIFunc48.inc.c" - -#include "world/common/UnkNpcAIFunc49.inc.c" - -#include "world/common/UnkSetDurationFunc.inc.c" - -#include "world/common/UnkNpcAIFunc9.inc.c" - -#include "world/common/UnkDurationCheckNoArgs.inc.c" - -#include "world/common/UnkFunc54.inc.c" - -#include "world/common/UnkFunc55.inc.c" - -#include "world/common/UnkNpcAIMainFunc7.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_1.inc.c b/src/world/common/atomic/enemy/UnkAI_1.inc.c deleted file mode 100644 index 670f7212d0..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_1.inc.c +++ /dev/null @@ -1,32 +0,0 @@ -// stand in one place, chase the player on sight -// if the player is lost, do not attempt to return home - -// see: goomba in arn_04, Tubbla Blubba -// included in many maps where it goes unused - -#include "world/common/UnkNpcAIFunc24.inc.c" - -#include "world/common/UnkFunc13.inc.c" - -// found in 9 files -#include "world/common/UnkNpcAIFunc1.inc.c" - -#include "world/common/UnkFunc14.inc.c" - -#include "world/common/UnkNpcAIFunc25.inc.c" - -#include "world/common/NpcJumpFunc2.inc.c" - -// shared -#include "world/common/NpcJumpFunc.inc.c" - -// found in 4 files -#include "world/common/UnkNpcAIFunc13.inc.c" - -#include "world/common/UnkFunc15.inc.c" - -#include "world/common/UnkNpcDurationFlagFunc.inc.c" - -#include "world/common/UnkFunc16.inc.c" - -#include "world/common/UnkNpcAIMainFunc.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_10.inc.c b/src/world/common/atomic/enemy/UnkAI_10.inc.c deleted file mode 100644 index b7e8688790..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_10.inc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "world/common/UnkNpcAIFunc13.inc.c" - -#include "world/common/UnkNpcAIFunc34.inc.c" - -#include "world/common/UnkFunc45.inc.c" - -#include "world/common/UnkNpcAIMainFunc10.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_2.inc.c b/src/world/common/atomic/enemy/UnkAI_2.inc.c deleted file mode 100644 index bbf404ec4e..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_2.inc.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "world/common/UnkNpcAIFunc36.inc.c" - -#include "world/common/UnkNpcAIFunc37.inc.c" - -// used in 38 files -//#include "world/common/UnkNpcAIFunc1.inc.c" -void N(UnkNpcAIFunc1)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); - npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); - npc->currentAnim.w = *enemy->animList; - script->functionTemp[0] = 3; -} - -#include "world/common/UnkNpcAIFunc38.inc.c" - -#include "world/common/UnkNpcAIFunc15.inc.c" - -#include "world/common/UnkNpcAIFunc39.inc.c" - -// used in 11 files -// #include "world/common/UnkDurationCheck.inc.c" -void N(UnkDurationCheck)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); - - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[0] = 0; - } -} - -#include "world/common/UnkNpcAIMainFunc2.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_3.inc.c b/src/world/common/atomic/enemy/UnkAI_3.inc.c deleted file mode 100644 index 5c21f49cc2..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_3.inc.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "world/common/atomic/enemy/UnkAI_2.inc.c" - -#include "world/common/UnkNpcAIFunc40.inc.c" - -#include "world/common/UnkNpcAIMainFunc3.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_4.inc.c b/src/world/common/atomic/enemy/UnkAI_4.inc.c deleted file mode 100644 index 3db3f1d5d3..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_4.inc.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "world/common/UnkNpcAIFunc43.inc.c" - -#include "world/common/UnkNpcAIFunc44.inc.c" - -#include "world/common/NpcJumpFunc3.inc.c" - -// shared -#include "world/common/NpcJumpFunc.inc.c" - -#include "world/common/UnkNpcAIFunc13_2.inc.c" - -#include "world/common/UnkNpcAIFunc11.inc.c" - -#include "world/common/UnkNpcAIFunc10.inc.c" - -#include "world/common/UnkNpcAIFunc42.inc.c" - -#include "world/common/UnkNpcAIFunc45.inc.c" - -#include "world/common/UnkNpcAIMainFunc4.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_5.inc.c b/src/world/common/atomic/enemy/UnkAI_5.inc.c deleted file mode 100644 index b7c7e567e8..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_5.inc.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c" - -#include "world/common/UnkNpcAIMainFunc5.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_6.inc.c b/src/world/common/atomic/enemy/UnkAI_6.inc.c deleted file mode 100644 index f7a47c489a..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_6.inc.c +++ /dev/null @@ -1,5 +0,0 @@ -// include an entire different AI -#include "world/common/atomic/enemy/UnkAI_5.inc.c" - -// unique to this file -#include "world/common/UnkNpcAIMainFunc6.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_9.inc.c b/src/world/common/atomic/enemy/UnkAI_9.inc.c deleted file mode 100644 index 23ee2ac7fb..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_9.inc.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "world/common/UnkNpcAIFunc23.inc.c" - -#include "world/common/UnkNpcAIFunc35.inc.c" - -#include "world/common/UnkNpcAIFunc1_copy.inc.c" - -#include "world/common/UnkFunc4.inc.c" - -#include "world/common/UnkNpcAIFunc2.inc.c" - -#include "world/common/SixFloatsFunc.inc.c" - -#include "world/common/UnkNpcAIFunc14.inc.c" - -#include "world/common/UnkNpcAIFunc3.inc.c" - -#include "world/common/UnkFunc6.inc.c" - -#include "world/common/UnkFunc5.inc.c" - -#include "world/common/UnkNpcAIMainFunc9.inc.c" diff --git a/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c b/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c deleted file mode 100644 index 76e5f7554a..0000000000 --- a/src/world/common/atomic/enemy/UnkAI_StateHandlers_A.inc.c +++ /dev/null @@ -1,7 +0,0 @@ - -// used with UnkAI 5, 6, and 8 -// all functions only used here -#include "world/common/set_script_owner_npc_anim.inc.c" -#include "world/common/UnkDistFunc.inc.c" -#include "world/common/UnkNpcAIFunc12.inc.c" -#include "world/common/set_script_owner_npc_col_height.inc.c" diff --git a/src/world/common/enemy/BulletBillAI.inc.c b/src/world/common/enemy/BulletBillAI.inc.c new file mode 100644 index 0000000000..200c86c720 --- /dev/null +++ b/src/world/common/enemy/BulletBillAI.inc.c @@ -0,0 +1,227 @@ +#include "common.h" +#include "effects.h" + +#define FIRST_BULLET_NPCID 50 +#define LAST_BULLET_NPCID 59 + +enum AiStateBulletBill { + AI_STATE_BULLET_INIT = 0, + AI_STATE_BULLET_READY = 1, + AI_STATE_BULLET_FIRED = 2, + AI_STATE_BULLET_HIT = 3, +}; + +enum AiStateBillBlaster { + AI_STATE_BLASTER_INIT = 0, + AI_STATE_BLASTER_PREPARE = 10, + AI_STATE_BLASTER_FIRE = 11, + AI_STATE_BLASTER_COOLDOWN = 12, +}; + +#define AI_VAR_BULLET_BLASTER varTable[1] // npcID of bullet's blaster +#define AI_VAR_BULLET_RANGE varTable[2] // limiting x position of bullets + +#define AI_VAR_BLASTER_BULLET varTable[0] // npcID of blaster's last bullet +#define AI_VAR_BLASTER_RANGE varTable[1] // limiting x position of bullets + +static s32 N(BillBlasterAI_GetIdleBulletNpcID)(void) { + s32 i; + + for (i = FIRST_BULLET_NPCID; i <= LAST_BULLET_NPCID; i++) { + if (get_enemy(i)->VAR_PROJECTILE_HITBOX_STATE == PROJECTILE_HITBOX_STATE_NONE) { + return i; + } + } + + return -1; +} + +ApiStatus N(BulletBillAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *script->ptrReadPos); + s32 hitDetected = FALSE; + s32 done = FALSE; + Npc* blasterNpc; + f32 nextX, nextZ; + f32 deltaY; + + if (isInitialCall || enemy->VAR_PROJECTILE_HITBOX_STATE == PROJECTILE_HITBOX_STATE_DONE) { + script->AI_TEMP_STATE = AI_STATE_BULLET_INIT; + npc->duration = 0; + enemy->aiFlags |= ENEMY_AI_FLAGS_8; + enemy->flags |= ENEMY_FLAGS_200000; + npc->flags |= NPC_FLAG_40000; + enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_NONE; + enemy->AI_VAR_BULLET_BLASTER = -1; + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused != 0) { + return 0; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_BULLET_INIT: + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + npc->rotation.y = 0.0f; + npc->duration = 0; + npc->flags |= NPC_FLAG_2; + npc->flags &= ~NPC_FLAG_LOCK_ANIMS; + disable_npc_shadow(npc); + enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_NONE; + script->AI_TEMP_STATE = AI_STATE_BULLET_READY; + // fallthrough + case AI_STATE_BULLET_READY: + if (enemy->VAR_PROJECTILE_HITBOX_STATE != PROJECTILE_HITBOX_STATE_PRE) { + break; + } + enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_ACTIVE; + blasterNpc = get_npc_unsafe(get_enemy(enemy->AI_VAR_BULLET_BLASTER)->npcID); + npc->flags &= ~NPC_FLAG_2; + npc->pos.x = blasterNpc->pos.x; + npc->pos.y = blasterNpc->pos.y + 11.0; + npc->pos.z = blasterNpc->pos.z + 1.0; + npc->yaw = blasterNpc->yaw; + npc->moveSpeed = aiSettings->chaseSpeed; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_RUN]; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 25.0f, npc->yaw); + if (npc->yaw < 180.0f) { + npc->renderYaw = 180.0f; + } else { + npc->renderYaw = 0.0f; + } + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_CHASE]; + npc->duration = 300; + npc->flags |= (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_LOCK_ANIMS); + enable_npc_shadow(npc); + script->AI_TEMP_STATE = AI_STATE_BULLET_FIRED; + // fallthrough + case AI_STATE_BULLET_FIRED: + deltaY = (npc->pos.y - gPlayerStatusPtr->position.y); + if ((deltaY > 190.0) || (deltaY < -120.0)) { + done = TRUE; + break; + } + + nextX = npc->pos.x; + nextZ = npc->pos.z; + add_vec2D_polar(&nextX, &nextZ, npc->moveSpeed, npc->yaw); + if (npc->yaw < 180.0f) { + if (enemy->AI_VAR_BULLET_RANGE <= nextX) { + hitDetected = TRUE; + } + } else { + if (nextX <= enemy->AI_VAR_BULLET_RANGE) { + hitDetected = TRUE; + } + } + + if (hitDetected) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_HIT]; + ai_enemy_play_sound(npc, SOUND_B0000018, 0); + fx_ring_blast(0, npc->pos.x, npc->pos.y + 5.0f, npc->pos.z + 1.0f, 0.05f, 20); + fx_smoke_burst(0, npc->pos.x, npc->pos.y + 5.0f, npc->pos.z + 0.0f, 1.2f, 25); + npc->duration = 1; + script->AI_TEMP_STATE = AI_STATE_BULLET_HIT; + } else { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + if (script->AI_TEMP_STATE != AI_STATE_BULLET_HIT) { + break; + } + // fallthrough + case AI_STATE_BULLET_HIT: + npc->duration--; + if (npc->duration <= 0) { + done = TRUE; + } + break; + } + if (done != 0) { + enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_DONE; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(BillBlasterAI_Main)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + s32 bulletNpcID; + Enemy* bulletEnemy; + f32 deltaY; + + if (isInitialCall) { + script->AI_TEMP_STATE = AI_STATE_BLASTER_INIT; + npc->duration = 30; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + enemy->flags |= ENEMY_FLAGS_200000; + disable_npc_shadow(npc); + } + + deltaY = npc->pos.y - gPlayerStatusPtr->position.y; + if ((deltaY > 190.0) || (deltaY < -80.0)) { + return ApiStatus_BLOCK; + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + if (enemy->aiPaused != 0) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_BLASTER_INIT: + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = AI_STATE_BLASTER_PREPARE; + } + break; + case AI_STATE_BLASTER_PREPARE: + bulletNpcID = N(BillBlasterAI_GetIdleBulletNpcID)(); + enemy->AI_VAR_BLASTER_BULLET = bulletNpcID; + if (bulletNpcID > 0) { + bulletEnemy = get_enemy(bulletNpcID); + bulletEnemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_INIT; + bulletEnemy->AI_VAR_BULLET_BLASTER = enemy->npcID; + bulletEnemy->AI_VAR_BULLET_RANGE = enemy->AI_VAR_BLASTER_RANGE; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + npc->duration = 10; + script->AI_TEMP_STATE = AI_STATE_BLASTER_FIRE; + } else { + npc->duration = (rand_int(1000) % 60) + 40; + script->AI_TEMP_STATE =AI_STATE_BLASTER_INIT; + } + break; + case AI_STATE_BLASTER_FIRE: + npc->duration--; + if (npc->duration > 0) { + break; + } + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + bulletEnemy = get_enemy(enemy->AI_VAR_BLASTER_BULLET); + bulletEnemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_PRE; + ai_enemy_play_sound(npc, SOUND_328, 0x200000); + npc->duration = 5; + script->AI_TEMP_STATE = AI_STATE_BLASTER_COOLDOWN; + // fallthrough + case AI_STATE_BLASTER_COOLDOWN: + npc->duration--; + if (npc->duration <= 0) { + npc->duration = (rand_int(1000) % 60) + 40; + script->AI_TEMP_STATE = AI_STATE_BLASTER_INIT; + } + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/CleftAI.inc.c b/src/world/common/enemy/CleftAI.inc.c new file mode 100644 index 0000000000..61cccd35b5 --- /dev/null +++ b/src/world/common/enemy/CleftAI.inc.c @@ -0,0 +1,406 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +enum AiStateCleft { + AI_STATE_CLEFT_HIDING_INIT = 0, + AI_STATE_CLEFT_HIDING = 1, + AI_STATE_CLEFT_PRE_AMBUSH = 2, + AI_STATE_CLEFT_AMBUSH = 3, + AI_STATE_CLEFT_FIND_PLAYER_INIT = 4, + AI_STATE_CLEFT_FIND_PLAYER = 5, + AI_STATE_CLEFT_CHASE_INIT = 12, + AI_STATE_CLEFT_CHASE = 13, + AI_STATE_CLEFT_CHASE_COOLDOWN = 14, + AI_STATE_CLEFT_REV_UP_INIT = 20, + AI_STATE_CLEFT_REV_UP = 21, + AI_STATE_CLEFT_TACKLE = 22, + AI_STATE_CLEFT_LOSE_PLAYER = 40, + AI_STATE_RETURN_HOME = 41, + AI_STATE_CLEFT_DISGUISE_INIT = 50, + AI_STATE_CLEFT_DISGUISE = 51, + AI_STATE_CLEFT_POST_DISGUISE = 52 +}; + +s32 N(CleftAI_CanSeePlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Camera* camera = &gCameras[gCurrentCamID]; + f32 playerX, playerZ; + f32 angle; + s32 seesPlayer = FALSE; + + if (ai_check_player_dist(enemy, 0, aiSettings->alertRadius, aiSettings->alertOffsetDist)) { + seesPlayer = TRUE; + } + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + angle = 90.0f; + } else { + angle = 270.0f; + } + + playerX = gPlayerStatusPtr->position.x; + playerZ = gPlayerStatusPtr->position.z; + if (fabsf(get_clamped_angle_diff(angle, atan2(npc->pos.x, npc->pos.z, playerX, playerZ))) > 75.0) { + seesPlayer = FALSE; + } + if (fabsf(npc->pos.y - gPlayerStatusPtr->position.y) >= 40.0f) { + seesPlayer = FALSE; + } + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { + seesPlayer = FALSE; + } + return seesPlayer; +} + +void N(CleftAI_HidingInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + disable_npc_shadow(npc); + npc->collisionHeight = 22; + npc->collisionRadius = 24; + script->functionTemp[1] = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[8]; + script->AI_TEMP_STATE = AI_STATE_CLEFT_HIDING; +} + +void N(CleftAI_Hiding)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(volume, enemy, aiSettings->alertRadius * 0.85, aiSettings->alertOffsetDist, FALSE)) { + npc->currentAnim.w = enemy->animList[9]; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->duration = 12; + script->AI_TEMP_STATE = AI_STATE_CLEFT_PRE_AMBUSH; + } + } + + script->functionTemp[1]--; +} + +void N(CleftAI_PreAmbush)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enable_npc_shadow(npc); + npc->currentAnim.w = enemy->animList[10]; + npc->duration = 8; + script->AI_TEMP_STATE = AI_STATE_CLEFT_AMBUSH; + } +} + +void N(CleftAI_Ambush)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->collisionHeight = 26; + npc->collisionRadius = 24; + script->AI_TEMP_STATE = AI_STATE_CLEFT_FIND_PLAYER_INIT; + } +} + +void N(CleftAI_FindPlayerInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + script->functionTemp[1] = rand_int(1000) % 2 + 2; + script->AI_TEMP_STATE = AI_STATE_CLEFT_FIND_PLAYER; +} + +void N(CleftAI_FindPlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (basic_ai_check_player_dist(volume, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->AI_TEMP_STATE = AI_STATE_CLEFT_CHASE_INIT; + } else { + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1]--; + if (script->functionTemp[1] > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + } else { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->duration = 15; + script->AI_TEMP_STATE = AI_STATE_CLEFT_LOSE_PLAYER; + } + } + } +} + +void N(CleftAI_RevUpInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = enemy->varTable[10]; + npc->currentAnim.w = enemy->animList[13]; + script->AI_TEMP_STATE = AI_STATE_CLEFT_REV_UP; +} + +void N(CleftAI_RevUp)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + if (npc->duration % 3 == 0) { + fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z + 2.0f, 0, 0); + } + + npc->duration--; + if (npc->duration <= 0) { + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + enemy->unk_07 = 1; + npc->moveSpeed = aiSettings->chaseSpeed; + npc->duration = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.z) / npc->moveSpeed + 0.9; + if (npc->duration < 15) { + npc->duration = 15; + } + script->AI_TEMP_STATE = AI_STATE_CLEFT_TACKLE; + } +} + +void N(CleftAI_Tackle)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ; + s32 phi_s1 = FALSE; + + func_8003D660(npc, 1); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + + if (is_point_within_region(enemy->territory->wander.detectShape, + enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.detectSizeX, enemy->territory->wander.detectSizeZ)) { + phi_s1 = TRUE; + } + + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, + &posX, &posY, &posZ, + 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { + phi_s1 = TRUE; + } + + npc->duration--; + if (npc->duration <= 0) { + phi_s1 = TRUE; + } + if (phi_s1) { + script->AI_TEMP_STATE = AI_STATE_CLEFT_FIND_PLAYER_INIT; + enemy->unk_07 = 0; + } +} + +void N(CleftAI_LosePlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; + if (enemy->territory->wander.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } + script->AI_TEMP_STATE = AI_STATE_RETURN_HOME; + } +} + +void N(CleftAI_ReturnHome)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (basic_ai_check_player_dist(volume, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->AI_TEMP_STATE = AI_STATE_CLEFT_CHASE_INIT; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->duration = 10; + script->AI_TEMP_STATE = AI_STATE_CLEFT_DISGUISE_INIT; + } else if (npc->turnAroundYawAdjustment == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} + +void N(CleftAI_DisguiseInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->turnAroundYawAdjustment == 0 && npc->duration <= 0) { + npc->duration = 8; + npc->currentAnim.w = enemy->animList[11]; + script->AI_TEMP_STATE = AI_STATE_CLEFT_DISGUISE; + } +} + +void N(CleftAI_Disguise)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 8; + npc->currentAnim.w = enemy->animList[14]; + script->AI_TEMP_STATE = AI_STATE_CLEFT_POST_DISGUISE; + } +} + +void N(CleftAI_PostDisguise)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = AI_STATE_CLEFT_HIDING_INIT; + } +} + +s32 N(CleftAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + EnemyDetectVolume curVolume; + EnemyDetectVolume* volume = &curVolume; + + enemy->varTable[10] = evt_get_variable(script, *args++); + + curVolume.skipPlayerDetectChance = 0; + curVolume.shape = enemy->territory->wander.detectShape; + curVolume.pointX = enemy->territory->wander.detect.x; + curVolume.pointZ = enemy->territory->wander.detect.z; + curVolume.sizeX = enemy->territory->wander.detectSizeX; + curVolume.sizeZ = enemy->territory->wander.detectSizeZ; + curVolume.halfHeight = 40.0f; + curVolume.detectFlags = 0; + + if (isInitialCall) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + npc->duration = 0; + + npc->flags &= ~NPC_FLAG_JUMPING; + if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + if (((script->AI_TEMP_STATE == AI_STATE_CLEFT_CHASE_INIT) + || (script->AI_TEMP_STATE == AI_STATE_CLEFT_CHASE) + || (script->AI_TEMP_STATE == AI_STATE_CLEFT_CHASE_COOLDOWN)) + && N(CleftAI_CanSeePlayer)(script, npcAISettings, volume)) { + script->AI_TEMP_STATE = 20; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_CLEFT_HIDING_INIT: + N(CleftAI_HidingInit)(script, npcAISettings, volume); + case AI_STATE_CLEFT_HIDING: + N(CleftAI_Hiding)(script, npcAISettings, volume); + if (script->AI_TEMP_STATE != AI_STATE_CLEFT_PRE_AMBUSH) { + return ApiStatus_BLOCK; + } + case AI_STATE_CLEFT_PRE_AMBUSH: + N(CleftAI_PreAmbush)(script, npcAISettings, volume); + if (script->AI_TEMP_STATE != AI_STATE_CLEFT_AMBUSH) { + return ApiStatus_BLOCK; + } + case AI_STATE_CLEFT_AMBUSH: + N(CleftAI_Ambush)(script, npcAISettings, volume); + if (script->AI_TEMP_STATE != AI_STATE_CLEFT_FIND_PLAYER_INIT) { + return ApiStatus_BLOCK; + } + case AI_STATE_CLEFT_FIND_PLAYER_INIT: + N(CleftAI_FindPlayerInit)(script, npcAISettings, volume); + case AI_STATE_CLEFT_FIND_PLAYER: + N(CleftAI_FindPlayer)(script, npcAISettings, volume); + return ApiStatus_BLOCK; + + case AI_STATE_CLEFT_CHASE_INIT: + basic_ai_chase_init(script, npcAISettings, volume); + if (script->AI_TEMP_STATE != AI_STATE_CLEFT_CHASE) { + return ApiStatus_BLOCK; + } + case AI_STATE_CLEFT_CHASE: + basic_ai_chase(script, npcAISettings, volume); + if (script->AI_TEMP_STATE != AI_STATE_CLEFT_CHASE_COOLDOWN) { + return ApiStatus_BLOCK; + } + case AI_STATE_CLEFT_CHASE_COOLDOWN: + npc->duration--; + if (npc->duration == 0) { + script->AI_TEMP_STATE = AI_STATE_CLEFT_LOSE_PLAYER; + } + return ApiStatus_BLOCK; + + case AI_STATE_CLEFT_REV_UP_INIT: + N(CleftAI_RevUpInit)(script, npcAISettings, volume); + case AI_STATE_CLEFT_REV_UP: + N(CleftAI_RevUp)(script, npcAISettings, volume); + return ApiStatus_BLOCK; + + case AI_STATE_CLEFT_TACKLE: + N(CleftAI_Tackle)(script, npcAISettings, volume); + return ApiStatus_BLOCK; + + case AI_STATE_CLEFT_LOSE_PLAYER: + N(CleftAI_LosePlayer)(script, npcAISettings, volume); + if (script->AI_TEMP_STATE != AI_STATE_RETURN_HOME) { + return ApiStatus_BLOCK; + } + case AI_STATE_RETURN_HOME: + N(CleftAI_ReturnHome)(script, npcAISettings, volume); + return ApiStatus_BLOCK; + + case AI_STATE_CLEFT_DISGUISE_INIT: + N(CleftAI_DisguiseInit)(script, npcAISettings, volume); + case AI_STATE_CLEFT_DISGUISE: + N(CleftAI_Disguise)(script, npcAISettings, volume); + if (script->AI_TEMP_STATE != AI_STATE_CLEFT_POST_DISGUISE) { + return ApiStatus_BLOCK; + } + case AI_STATE_CLEFT_POST_DISGUISE: + N(CleftAI_PostDisguise)(script, npcAISettings, volume); + return ApiStatus_BLOCK; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/ClubbaNappingAI.inc.c b/src/world/common/enemy/ClubbaNappingAI.inc.c new file mode 100644 index 0000000000..8c65b18812 --- /dev/null +++ b/src/world/common/enemy/ClubbaNappingAI.inc.c @@ -0,0 +1,311 @@ +#include "common.h" +#include "world/partners.h" + +// prerequisites +#include "world/common/enemy/MeleeHitbox.inc.c" + +enum AiStateNappingClubba { + AI_STATE_NAPPING_CLUBBA_INIT = 0, + AI_STATE_NAPPING_CLUBBA_SLEEP = 1, + AI_STATE_NAPPING_CLUBBA_WAKE_UP = 2, + AI_STATE_NAPPING_CLUBBA_LOITER_INIT = 3, + AI_STATE_NAPPING_CLUBBA_LOITER = 4, + AI_STATE_NAPPING_CLUBBA_50 = 50, +}; + +void N(ClubbaNappingAI_Init)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->duration == 1) { + npc->currentAnim.w = enemy->animList[12]; + } else if (npc->duration <= 0) { + npc->currentAnim.w = enemy->animList[10]; + npc->duration = 0; + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_SLEEP; + } +} + +void N(ClubbaNappingAI_Sleep)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + PlayerData* playerData = get_player_data(); + s32 shouldWakeUp = FALSE; + s32 emoteTemp; + f32 posX, posZ; + + if (basic_ai_check_player_dist(territory, enemy, 80.0f, 0.0f, 0)) { + if ( gPlayerStatusPtr->actionState == ACTION_STATE_RUN + || gPlayerStatusPtr->actionState == ACTION_STATE_SPIN + || gPlayerStatusPtr->actionState == ACTION_STATE_JUMP + || gPlayerStatusPtr->actionState == ACTION_STATE_GROUND_POUND + || gPlayerStatusPtr->actionState == ACTION_STATE_ULTRA_POUND + || gPlayerStatusPtr->actionState == ACTION_STATE_STEP_DOWN_LAND + || gPlayerStatusPtr->actionState == ACTION_STATE_LAND + || gPlayerStatusPtr->actionState == ACTION_STATE_HAMMER + || gPlayerStatusPtr->actionState == ACTION_STATE_13 + || gPlayerStatusPtr->actionState == ACTION_STATE_25) { + shouldWakeUp = TRUE; + } + + if (playerData->currentPartner == PARTNER_KOOPER) { + if (gPartnerActionStatus.partnerActionState == playerData->currentPartner) { + shouldWakeUp = TRUE; + } + } + } + + if (((playerData->currentPartner == PARTNER_GOOMBARIO) && (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE)) || + ((playerData->currentPartner == PARTNER_BOMBETTE) && (gPartnerActionStatus.partnerActionState == PARTNER_ACTION_BOMBETTE_2))) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); + if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { + shouldWakeUp = TRUE; + } + } + + if (shouldWakeUp) { + ai_enemy_play_sound(npc, 0xB000000E, 0); + npc->currentAnim.w = enemy->animList[11]; + npc->duration = 10; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_WAKE_UP; + } + + npc->duration++; + if (npc->duration == 27) { + ai_enemy_play_sound(npc, 0xB000000C, 0); + } else if (npc->duration == 57) { + ai_enemy_play_sound(npc, 0xB000000D, 0); + } else if (npc->duration == 59) { + npc->currentAnim.w = enemy->animList[12]; + } else if (npc->duration == 60) { + npc->currentAnim.w = enemy->animList[10]; + npc->duration = 0; + } +} + +void N(ClubbaNappingAI_WakeUp)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 1; + enemy->AI_VAR_NEXT_STATE = AI_RETURN_HOME_INIT; + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_LOITER_INIT; + } +} + +void N(ClubbaNappingAI_LoiterInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + script->functionTemp[1] = (rand_int(1000) % 2) + 2; // chose random number 2-3 + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_LOITER; +} + +void N(ClubbaNappingAI_Loiter)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 nextState; + + // try to catch sight of player + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + return; + } + + npc->duration--; + if (npc->duration <= 0) { + // try to turn around and check the other direction + script->functionTemp[1]--; + if (script->functionTemp[1] > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + return; + } + + // didnt see player, continue to next state + nextState = enemy->AI_VAR_NEXT_STATE; + if (nextState == AI_RETURN_HOME_INIT) { + npc->duration = 20; + script->AI_TEMP_STATE = nextState; + } else if (nextState == AI_STATE_NAPPING_CLUBBA_50) { + npc->duration = 25; + script->AI_TEMP_STATE = nextState; + } + } +} + +void N(ClubbaNappingAI_ReturnHomeInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; + if (enemy->territory->wander.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } + script->AI_TEMP_STATE = AI_RETURN_HOME; + } +} + +void N(ClubbaNappingAI_ReturnHome)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 currentYaw; + + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, + enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = 15; + enemy->AI_VAR_NEXT_STATE = AI_STATE_NAPPING_CLUBBA_50; + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_LOITER_INIT; + } else if (npc->turnAroundYawAdjustment == 0) { + currentYaw = npc->yaw; + ai_check_fwd_collisions(npc, 5.0f, ¤tYaw, 0, 0, 0); + npc->yaw = currentYaw; + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} + +void N(ClubbaNappingAI_FallAsleep)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (npc->turnAroundYawAdjustment == 0) { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 0; + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_INIT; + } + } +} + +ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 40.0f; + territory.detectFlags = 0; + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_INIT; + npc->duration = 30; + npc->currentAnim.w = enemy->animList[10]; + npc->flags &= ~NPC_FLAG_JUMPING; + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | NPC_FLAG_GRAVITY) & ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags = (npc->flags & ~NPC_FLAG_GRAVITY) | NPC_FLAG_ENABLE_HIT_SCRIPT; + } + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->AI_TEMP_STATE_AFTER_SUSPEND = AI_RETURN_HOME_INIT; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + if (script->AI_TEMP_STATE >= AI_STATE_ALERT_INIT + && script->AI_TEMP_STATE < AI_STATE_MELEE_HITBOX_INIT + && enemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_NONE + && N(MeleeHitbox_CanSeePlayer)(script)) { + script->AI_TEMP_STATE = AI_STATE_MELEE_HITBOX_INIT; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_NAPPING_CLUBBA_INIT: + N(ClubbaNappingAI_Init)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_NAPPING_CLUBBA_SLEEP: + N(ClubbaNappingAI_Sleep)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_NAPPING_CLUBBA_WAKE_UP: + N(ClubbaNappingAI_WakeUp)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_NAPPING_CLUBBA_LOITER_INIT: + N(ClubbaNappingAI_LoiterInit)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_NAPPING_CLUBBA_LOITER: + N(ClubbaNappingAI_Loiter)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + basic_ai_chase_init(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_CHASE) { + break; + } + case AI_STATE_CHASE: + basic_ai_chase(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + // LOSE PLAYER + basic_ai_lose_player(script, npcAISettings, territoryPtr); + npc->duration = 15; + enemy->AI_VAR_NEXT_STATE = AI_RETURN_HOME_INIT; + script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_LOITER_INIT; + break; + case AI_STATE_MELEE_HITBOX_INIT: // pre swing + N(MeleeHitbox_30)(script); + if (script->AI_TEMP_STATE != AI_STATE_MELEE_HITBOX_PRE) { + break; + } + case AI_STATE_MELEE_HITBOX_PRE: // raise club + N(MeleeHitbox_31)(script); + if (script->AI_TEMP_STATE != AI_STATE_MELEE_HITBOX_ACTIVE) { + break; + } + case AI_STATE_MELEE_HITBOX_ACTIVE: // swing club + N(MeleeHitbox_32)(script); + break; + case AI_STATE_MELEE_HITBOX_MISS: + N(MeleeHitbox_33)(script); + break; + case AI_RETURN_HOME_INIT: + // START RETURN HOME + N(ClubbaNappingAI_ReturnHomeInit)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_RETURN_HOME) { + break; + } + case AI_RETURN_HOME: + // RETURN HOME + N(ClubbaNappingAI_ReturnHome)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_NAPPING_CLUBBA_50: + // WAIT TO NAP + N(ClubbaNappingAI_FallAsleep)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/ClubbaPatrolAI.inc.c b/src/world/common/enemy/ClubbaPatrolAI.inc.c new file mode 100644 index 0000000000..3751def0df --- /dev/null +++ b/src/world/common/enemy/ClubbaPatrolAI.inc.c @@ -0,0 +1,104 @@ +#include "common.h" +#include "world/partners.h" + +// prerequisites +#include "world/common/enemy/MeleeHitbox.inc.c" +#include "world/common/enemy/States_PatrolAI.inc.c" + +ApiStatus N(ClubbaPatrolAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = AI_STATE_PATROL_INIT; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags |= 0x200; + npc->flags &= ~0x8; + } else { + npc->flags &= ~0x200; + npc->flags |= 0x8; + } + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->functionTemp[1] = AI_STATE_PATROL_INIT; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + enemy->varTable[0] = 0; + } + + if ((script->AI_TEMP_STATE < AI_STATE_MELEE_HITBOX_INIT) && (enemy->varTable[0] == 0) && N(MeleeHitbox_CanSeePlayer)(script)) { + script->AI_TEMP_STATE = AI_STATE_MELEE_HITBOX_INIT; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_PATROL_INIT: + N(PatrolAI_MoveInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_PATROL: + N(PatrolAI_Move)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + N(PatrolAI_LoiterInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_LOITER: + N(PatrolAI_Loiter)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOITER_POST: + N(PatrolAI_PostLoiter)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_ALERT_INIT: + N(PatrolAI_JumpInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_ALERT: + N(PatrolAI_Jump)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + N(PatrolAI_ChaseInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_CHASE: + N(PatrolAI_Chase)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + N(PatrolAI_LosePlayer)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_MELEE_HITBOX_INIT: + N(MeleeHitbox_30)(script); + // fallthrough + case AI_STATE_MELEE_HITBOX_PRE: + N(MeleeHitbox_31)(script); + if (script->functionTemp[0] != AI_STATE_MELEE_HITBOX_ACTIVE) { + break; + } + // fallthrough + case AI_STATE_MELEE_HITBOX_ACTIVE: + N(MeleeHitbox_32)(script); + if (script->functionTemp[0] != AI_STATE_MELEE_HITBOX_MISS) { + break; + } + // fallthrough + case AI_STATE_MELEE_HITBOX_MISS: + N(MeleeHitbox_33)(script); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/FlyingAI.inc.c b/src/world/common/enemy/FlyingAI.inc.c new file mode 100644 index 0000000000..999a42c592 --- /dev/null +++ b/src/world/common/enemy/FlyingAI.inc.c @@ -0,0 +1,511 @@ +// This AI is used by: +// - Paragoomba + variants +// - Paratroopa + variants +// - Sky Guy +// - Bzzap + +#ifndef _AI_FLYING_INC_ +#define _AI_FLYING_INC_ 0 + +#include "common.h" +#include "npc.h" +#include "effects.h" +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +extern f32 N(FlyingAI_JumpVels)[]; + +void N(FlyingAI_WanderInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + } else { + npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); + } + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; + script->functionTemp[1] = 0; + if (enemy->territory->wander.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } + enemy->varTable[4] = npc->pos.y * 100.0; + script->functionTemp[0] = AI_STATE_WANDER; +} + +void N(FlyingAI_Wander)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 cond = FALSE; + f32 vt7 = (f32)enemy->varTable[7] / 100.0; + f32 vt3 = (f32)enemy->varTable[3] / 100.0; + f32 vt4 = (f32)enemy->varTable[4] / 100.0; + f32 vt1 = (f32)enemy->varTable[1] / 100.0; + f32 posX, posY, posZ, posW; + f32 temp_f24; + + enemy->varTable[4] = npc->pos.y * 100.0; + + temp_f24 = vt3 + vt7; + + if ((enemy->varTable[0] & 0x11) == 1) { + if (npc->flags & 8) { + if (vt1 < temp_f24 - npc->pos.y) { + enemy->varTable[0] |= 0x10; + } + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); + if (vt1 < (vt3 - posW)) { + enemy->varTable[0] |= 0x10; + } + } + } + + if ((enemy->varTable[0] & 0x11) == 0x11) { + f64 test; + f32 yTemp; + + do { + if (npc->flags & 8) { + yTemp = temp_f24; + test = vt4 + ((temp_f24 - vt4) * 0.09); + npc->pos.y = test; + } else { + posX = npc->pos.x; + posY = vt4; + posZ = npc->pos.z; + posW = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); + + yTemp = posY; + yTemp += vt3; + test = vt4 + ((yTemp - vt4) * 0.09); + npc->pos.y = test; + } + + if (fabsf(yTemp - npc->pos.y) < 1.0) { + npc->pos.y = yTemp; + enemy->varTable[0] &= ~0x10; + } + } while (0); // required to match + } else { + f32 vt1temp = vt1; // required to match + + if (enemy->varTable[1] > 0) { + f32 sinTemp = sin_deg(enemy->varTable[2]); + s32 hit; + + if (npc->flags & 8) { + hit = FALSE; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + hit = npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); + } + + if (hit) { + npc->pos.y = posY + vt3 + (sinTemp * vt1temp); + } else { + npc->pos.y = temp_f24 + (sinTemp * vt1temp); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + } + + if (enemy->varTable[9] <= 0) { + if (aiSettings->playerSearchInterval >= 0) { + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (gPlayerStatusPtr->position.y < (npc->pos.y + npc->collisionHeight) + 10.0 && + basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) + { + s32 emoteTemp; + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &emoteTemp); + npc->moveToPos.y = npc->pos.y; + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + + if (enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; + } else { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + return; + } + } + script->functionTemp[1]--; + } + } else { + enemy->varTable[9]--; + } + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, + enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); + if (npc->moveSpeed < posW) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + cond = TRUE; + } + } + + if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | cond) { + if (npc->turnAroundYawAdjustment != 0) { + return; + } + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + enemy->varTable[4] = npc->pos.y * 100.0; + if (aiSettings->moveTime > 0) { + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + script->AI_TEMP_STATE = AI_STATE_LOITER_INIT; + script->functionTemp[1] = (rand_int(1000) % 3) + 2; + if (aiSettings->unk_AI_2C <= 0 || aiSettings->waitTime <= 0 || script->functionTemp[1] < 3) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } + } + } +} + +void N(FlyingAI_LoiterInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim.w = *enemy->animList; + script->functionTemp[0] = 3; +} + +void N(FlyingAI_Loiter)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 hoverHeight = (f32)enemy->varTable[3] / 100.0; + f32 temp_f26 = hoverHeight + (f32)((f32)enemy->varTable[7] / 100.0); + s32 var; + + if (npc->duration > 0) { + npc->duration--; + } + + if (enemy->varTable[1] > 0) { + f32 undulateAmplitude = (f32)enemy->varTable[1] / 100.0; + f32 undulateAmount = sin_deg(enemy->varTable[2]); + s32 hitResult; + + if (npc->flags & NPC_FLAG_ENABLE_HIT_SCRIPT) { + hitResult = 0; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + hitResult = npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); + } + + if (hitResult) { + npc->pos.y = posY + hoverHeight + (undulateAmount * undulateAmplitude); + } else { + npc->pos.y = temp_f26 + (undulateAmount * undulateAmplitude); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + + if (enemy->varTable[9] <= 0) { + if ((gPlayerStatusPtr->position.y < npc->pos.y + npc->collisionHeight + 10.0) + && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->moveToPos.y = npc->pos.y; + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + if (enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; + } else { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + return; + } + } else { + enemy->varTable[9]--; + } + + if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) { + script->functionTemp[1]--; + if (script->functionTemp[1] > 0) { + if (!(enemy->npcSettings->unk_2A & AI_ACTION_LOOK_AROUND_DURING_LOITER)) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + } + npc->duration = (rand_int(1000) % 11) + 5; + } else { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } + } +} + +void N(FlyingAI_JumpInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + PlayerStatus* playerStatus = gPlayerStatusPtr; + + npc->duration = 0; + npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + script->functionTemp[0] = AI_STATE_ALERT; +} + +void N(FlyingAI_Jump)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->pos.y += N(FlyingAI_JumpVels)[npc->duration++]; + if (npc->duration >= 5) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } +} + +void N(FlyingAI_ChaseInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 jumpVelocity = (f32)enemy->varTable[5] / 100.0; + f32 jumpScale = (f32)enemy->varTable[6] / 100.0; + + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + npc->jumpVelocity = jumpVelocity; + npc->jumpScale = jumpScale; + npc->moveSpeed = aiSettings->chaseSpeed; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + + enemy->varTable[2] = 0; + + if (enemy->npcSettings->unk_2A & AI_ACTION_02) { + npc->duration = 3; + script->AI_TEMP_STATE = AI_STATE_CHASE; + } else { + npc->duration = 1; + script->AI_TEMP_STATE = AI_STATE_LOSE_PLAYER; + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + enemy->unk_07 = 1; + } +} + +void N(FlyingAI_Chase)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + if (npc->turnAroundYawAdjustment == 0) { + npc->duration = 0; + script->AI_TEMP_STATE = AI_STATE_LOSE_PLAYER; + } + } +} + +void N(FlyingAI_LosePlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 deltaAngle; + f32 temp_f20; + f32 temp_f22; + f32 temp_f2; + s32 phi_v0; + f32 angle; + f32 a = enemy->varTable[3]; + f32 b = enemy->varTable[7]; + + npc->jumpVelocity += npc->jumpScale; + temp_f20 = a / 100.0; + temp_f22 = b / 100.0; + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + + if (npc->jumpVelocity >= 0.0) { + npc->pos.y += npc->jumpVelocity; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_HIT]; + enemy->unk_07 = 0; + if (!(npc->flags & NPC_FLAG_ENABLE_HIT_SCRIPT)) { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + phi_v0 = npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); + } else { + phi_v0 = FALSE; + } + if (phi_v0) { + temp_f2 = posY + temp_f20; + if (temp_f2 <= npc->pos.y) { + npc->pos.y = temp_f2; + script->functionTemp[0] = 0; + } + } else if (npc->pos.y >= npc->moveToPos.y) { + script->functionTemp[0] = 0; + } + } else if (npc->jumpVelocity < 0.0) { + npc->duration++; + if (npc->duration >= aiSettings->chaseUpdateInterval) { + npc->duration = 0; + angle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + deltaAngle = get_clamped_angle_diff(npc->yaw, angle); + if (aiSettings->chaseTurnRate < fabsf(deltaAngle)) { + angle = npc->yaw; + if (deltaAngle < 0.0f) { + angle += -aiSettings->chaseTurnRate; + } else { + angle += aiSettings->chaseTurnRate; + } + } + npc->yaw = clamp_angle(angle); + } + + if (npc->flags & 8) { + if (npc->pos.y + npc->jumpVelocity < temp_f22) { + npc->pos.y = temp_f22; + npc->jumpVelocity = 0.0f; + } else { + npc->pos.y += npc->jumpVelocity; + } + return; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { + if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { + npc->jumpVelocity = 0.0f; + npc->pos.y = posY; + } else { + npc->pos.y += npc->jumpVelocity; + } + return; + } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { + npc->pos.y = npc->pos.y + npc->jumpVelocity; + return; + } + npc->jumpVelocity = 0.0f; + } +} + +void N(FlyingAI_Init)(Npc* npc, Enemy* enemy, Evt* script, NpcAISettings* aiSettings) { + f32 posX, posY, posZ, depth; + + script->functionTemp[0] = 0; + npc->duration = 0; + + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_JUMPING; + if (enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + depth = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &depth); + enemy->varTable[2] = 0; + enemy->varTable[9] = 0; + enemy->varTable[3] = (depth * 100.0) + 0.5; + enemy->varTable[7] = (posY * 100.0) + 0.5; + script->functionTemp[1] = aiSettings->playerSearchInterval; + enemy->aiFlags |= ENEMY_AI_FLAGS_10; +} + +ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 120.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + #endif + + if (isInitialCall) { + #ifdef _DEAD_H_ + N(FlyingAI_Init)(npc, (Enemy*)enemy, script, aiSettings); + #else + N(FlyingAI_Init)(npc, enemy, script, aiSettings); + #endif + } + + npc->verticalRenderOffset = -2; + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused != 0) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_WANDER_INIT: + N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); + case AI_STATE_WANDER: + N(FlyingAI_Wander)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + N(FlyingAI_LoiterInit)(script, aiSettings, territoryPtr); + case AI_STATE_LOITER: + N(FlyingAI_Loiter)(script, aiSettings, territoryPtr); + break; + case AI_STATE_ALERT_INIT: + N(FlyingAI_JumpInit)(script, aiSettings, territoryPtr); + case AI_STATE_ALERT: + N(FlyingAI_Jump)(script, aiSettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + N(FlyingAI_ChaseInit)(script, aiSettings, territoryPtr); + break; + case AI_STATE_CHASE: + N(FlyingAI_Chase)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + N(FlyingAI_LosePlayer)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} + +#endif diff --git a/src/world/common/enemy/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/FlyingMagikoopaAI.inc.c new file mode 100644 index 0000000000..e35362a285 --- /dev/null +++ b/src/world/common/enemy/FlyingMagikoopaAI.inc.c @@ -0,0 +1,378 @@ +#include "common.h" +#include "npc.h" + +#include "world/common/enemy/MagikoopaSpellAI.inc.c" + +void N(FlyingMagikoopaAI_10)(Evt* script, NpcAISettings* arg1, EnemyDetectVolume* arg2) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = 30; + script->AI_TEMP_STATE = 11; +} + +void N(FlyingMagikoopaAI_11)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* volume) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 basePosY = (f32)enemy->varTable[1] / 100.0; + s32 emoteTemp; + + npc->pos.y = basePosY + sin_deg(enemy->varTable[0]) * 6.0; + enemy->varTable[0] = clamp_angle(enemy->varTable[0] + 10); + + if (N(MagikoopaAI_CanShootSpell)(script, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, volume) == 1) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->duration = 50; + script->AI_TEMP_STATE = 20; + } else { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 5; + script->AI_TEMP_STATE = 15; + } + } +} + +enum MagikoopaMoveResult { + RESULT_SEARCHING = 0, + RESULT_OK_BLOCKED = 1, + RESULT_OK_CLEAR = 2, + RESULT_NONE_FOUND = 3 +}; + +void N(FlyingMagikoopaAI_15)(Evt* arg0, NpcAISettings* arg1, EnemyDetectVolume* arg2) { + f32 dist; + f32 distToHit; + f32 randomDist; + f32 baseYaw; + s32 isCCW; + f32 moveDist; + s32 angleAdjust; + + Enemy* enemy = arg0->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ; + s32 result = RESULT_SEARCHING; + s32 iterations = 0; + + npc->duration--; + if (npc->duration <= 0) { + randomDist = rand_int(30) + 180.0; + isCCW = FALSE; + if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) - iterations; + moveDist = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + if(randomDist > moveDist) { + randomDist = moveDist; + } + } else { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + if (npc->yaw < 180.0) { + baseYaw = (rand_int(10) + 90.0) - 5.0; + } else { + baseYaw = (rand_int(10) + 270.0) - 5.0; + } + angleAdjust = iterations * 5; + while(1) { + if (isCCW) { + npc->yaw = baseYaw + angleAdjust; + } else { + npc->yaw = baseYaw - angleAdjust; + } + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + if (npc_test_move_taller_with_slipping(0, &posX, &posY, &posZ, + randomDist, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { + moveDist = dist2D(npc->pos.x, npc->pos.z, posX, posZ); + distToHit = moveDist; + if (distToHit > 160.0) { + if (distToHit < randomDist) { + randomDist = distToHit; + } + result = RESULT_OK_BLOCKED; + } + } else { + result = RESULT_OK_CLEAR; + } + + if (result != RESULT_SEARCHING) { + break; + } + + if (!isCCW) { + isCCW = TRUE; + } else { + angleAdjust += 5; + iterations += 1; + isCCW = FALSE; + } + + if (iterations >= 7) { + result = RESULT_NONE_FOUND; + } + } + } + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, randomDist, npc->yaw); + npc->moveToPos.x = posX; + npc->moveToPos.y = npc->pos.y; + npc->moveToPos.z = posZ; + enemy->varTable[4] = npc->pos.x * 100.0; + enemy->varTable[6] = npc->pos.z * 100.0; + enemy->varTable[3] = rand_int(10) + 35; + npc->duration = 0; + npc->moveSpeed = 3.0f; + npc->jumpVelocity = 1.4f; + npc->jumpScale = 0.2f; + arg0->functionTemp[0] = 0x10; + } +} + +void N(FlyingMagikoopaAI_16)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 basePosY = (f32)enemy->varTable[1] / 100.0; + + enemy->varTable[0] = clamp_angle(enemy->varTable[0] + 10); + npc->pos.y = basePosY + sin_deg(enemy->varTable[0]) * 6.0; + + if (npc->turnAroundYawAdjustment == 0) { + enemy->varTable[5] = npc->pos.y * 100.0; + script->functionTemp[0] = 17; + } +} + +void N(FlyingMagikoopaAI_17)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 limitY = (f32)enemy->varTable[1] / 100.0; + f32 basePosY = (f32)enemy->varTable[5] / 100.0; + f32 startX = (f32)enemy->varTable[4] / 100.0; + f32 startZ = (f32)enemy->varTable[6] / 100.0; + f32 lerpX = update_lerp(EASING_SIN_OUT, startX, npc->moveToPos.x, npc->duration, enemy->varTable[3]); + f32 lerpZ = update_lerp(EASING_SIN_OUT, startZ, npc->moveToPos.z, npc->duration, enemy->varTable[3]); + + npc->pos.x = lerpX; + npc->pos.z = lerpZ; + npc->pos.y = basePosY + sin_deg((s32)(npc->duration * (180.0 / (f32)enemy->varTable[3])) + 180) * 25.0; + + npc->duration++; + if (npc->duration == (enemy->varTable[3] - 8)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + } + if (limitY <= npc->pos.y) { + npc->pos.y = limitY; + enemy->varTable[0] = 0; + script->functionTemp[0] = 10; + } else if (npc->duration >= enemy->varTable[3]) { + if (enemy->varTable[0] >= 180.0) { + if (enemy->varTable[0] < 270.0) { + enemy->varTable[0] = clamp_angle(540 - enemy->varTable[0]); + } + } + script->functionTemp[0] = 10; + } +} + +void N(FlyingMagikoopaAI_20)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = 40; + script->functionTemp[0] = 21; +} + +void N(FlyingMagikoopaAI_21)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ; + s32 emoteTemp; + + npc->duration--; + if (npc->duration == 0) { + npc->currentAnim.w = enemy->animList[0]; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &emoteTemp); + npc->currentAnim.w = enemy->animList[0]; + npc->duration = 15; + script->functionTemp[0] = 50; + } else if ((N(MagikoopaAI_CanShootSpell)(script, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, territory) == 1) && (npc->turnAroundYawAdjustment == 0)) { + ai_enemy_play_sound(npc, 0x20D4, 0); + npc->currentAnim.w = enemy->animList[8]; + posX = npc->pos.x; + posY = npc->pos.y + 29.0f; + posZ = npc->pos.z + 1.0f; + add_vec2D_polar(&posX, &posZ, 30.0f, 270.0f - npc->renderYaw); + fx_gather_energy_pink(0, posX, posY, posZ, 0.1f, 13); + npc->duration = 15; + script->functionTemp[0] = 22; + } +} + +void N(FlyingMagikoopaAI_22)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim.w = enemy->animList[9]; + npc->duration = 7; + script->functionTemp[0] = 0x17; + } +} + +void N(FlyingMagikoopaAI_23)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp_s1; + s32 emoteTemp; + + npc->duration--; + if (npc->duration <= 0) { + temp_s1 = N(MagikoopaAI_CanShootSpell)(script, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, territory); + if (temp_s1 != 1) { + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &emoteTemp); + npc->currentAnim.w = enemy->animList[0]; + npc->duration = 15; + script->functionTemp[0] = 50; + } else { + ai_enemy_play_sound(npc, SOUND_SPELL_CAST2, 0); + get_enemy(enemy->npcID + 1)->varTable[0] = temp_s1; + npc->duration = 20; + script->functionTemp[0] = 24; + } + } +} + +void N(FlyingMagikoopaAI_24)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 basePosY = (f32)enemy->varTable[1] / 100.0; + + npc->pos.y = basePosY + sin_deg(enemy->varTable[0]) * 6.0; + enemy->varTable[0] = clamp_angle(enemy->varTable[0] + 10); + + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim.w = enemy->animList[0]; + npc->duration = 3; + script->AI_TEMP_STATE = 50; + } +} + +void N(FlyingMagikoopaAI_50)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 basePosY = (f32)enemy->varTable[1] / 100.0; + + npc->pos.y = basePosY + sin_deg(enemy->varTable[0]) * 6.0; + enemy->varTable[0] = clamp_angle(enemy->varTable[0] + 10); + + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = 10; + } +} + +ApiStatus N(FlyingMagikoopaAI_Main)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 120.0f; + territory.detectFlags = 0; + + if (isInitialCall) { + npc->flags &= ~0x200; + npc->flags |= 0x8; + npc->flags |= 0x200000; + enemy->flags |= 0x200000; + enemy->varTable[1] = npc->pos.y * 100.0; + enemy->varTable[0] = 0; + enemy->varTable[2] = 0; + npc->duration = 0; + script->AI_TEMP_STATE = 10; + } + + npc->verticalRenderOffset = -5; + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused != 0) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->AI_TEMP_STATE) { + case 10: + N(FlyingMagikoopaAI_10)(script, aiSettings, territoryPtr); + // fallthrough + case 11: + N(FlyingMagikoopaAI_11)(script, aiSettings, territoryPtr); + break; + case 15: + N(FlyingMagikoopaAI_15)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != 16) { + break; + } + case 16: + N(FlyingMagikoopaAI_16)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != 17) { + break; + } + case 17: + N(FlyingMagikoopaAI_17)(script, aiSettings, territoryPtr); + break; + case 20: + N(FlyingMagikoopaAI_20)(script, aiSettings, territoryPtr); + break; + case 21: + N(FlyingMagikoopaAI_21)(script, aiSettings, territoryPtr); + break; + case 22: + N(FlyingMagikoopaAI_22)(script, aiSettings, territoryPtr); + break; + case 23: + N(FlyingMagikoopaAI_23)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != 24) { + break; + } + case 24: + N(FlyingMagikoopaAI_24)(script, aiSettings, territoryPtr); + break; + case 50: + N(FlyingMagikoopaAI_50)(script, aiSettings, territoryPtr); + break; + } + return ApiStatus_BLOCK; +} + +ApiStatus N(FlyingMagikoopaAI_OnHitInit)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + + evt_set_variable(script, EVT_VAR(0), gCurrentEncounter.currentEnemy == enemy); + return ApiStatus_DONE2; +} + +ApiStatus N(FlyingMagikoopaAI_OnHit)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (enemy->varTable[0] == 2) { + npc->jumpVelocity = 0.0f; + npc->moveSpeed = 0.0f; + } + return ApiStatus_DONE2; +} + diff --git a/src/world/common/enemy/FlyingNoAttackAI.inc.c b/src/world/common/enemy/FlyingNoAttackAI.inc.c new file mode 100644 index 0000000000..6f55e876ba --- /dev/null +++ b/src/world/common/enemy/FlyingNoAttackAI.inc.c @@ -0,0 +1,172 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +// This AI is used by: +// - Lava Bubble +// - Ruff Puff +// - Ember + +void N(FlyingNoAttackAI_12)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 tempAngle; + f32 angleDiff; + + npc->duration = (aiSettings->chaseUpdateInterval / 2) + rand_int(aiSettings->chaseUpdateInterval / 2 + 1); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_CHASE]; + npc->moveSpeed = aiSettings->chaseSpeed; + + tempAngle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + angleDiff = get_clamped_angle_diff(npc->yaw, tempAngle); + + if (aiSettings->chaseTurnRate < fabsf(angleDiff)) { + tempAngle = npc->yaw; + + if (angleDiff < 0.0f) { + tempAngle += -aiSettings->chaseTurnRate; + } else { + tempAngle += aiSettings->chaseTurnRate; + } + } + + npc->yaw = clamp_angle(tempAngle); + script->functionTemp[0] = 13; +} + +void N(FlyingNoAttackAI_13)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 x, y, z, w; + s32 var; + s32 flag; + f32 temp_f6; + + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1) == 0) { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = 30; + script->functionTemp[0] = 20; + enemy->varTable[9] = 30; + return; + } + + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + flag = 0; + if (!(npc->flags & 8)) { + x = npc->pos.x; + y = npc->pos.y + npc->collisionHeight; + z = npc->pos.z; + w = npc->collisionHeight + 3.0; + if ((npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w) != 0) && (w < npc->collisionHeight)) { + flag = 1; + } + } + + if (flag) { + npc->pos.y = y + 1.0; + } else { + temp_f6 = npc->pos.y - (gPlayerStatusPtr->position.y + 6.0); + if ((temp_f6 < 0.0) || (temp_f6 > 4.0)) { + temp_f6 = -temp_f6; + npc->pos.y += temp_f6 * 0.06; + } + } + if (npc->duration > 0) { + npc->duration--; + return; + } + script->functionTemp[0] = 12; +} + +void N(FlyingNoAttackAI_20)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + enemy->varTable[2] = 0; + npc->duration = 0; + script->functionTemp[0] = 0; + } +} + +ApiStatus N(FlyingNoAttackAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 120.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + #endif + + if (isInitialCall) { + #ifdef _DEAD_H_ + N(FlyingAI_Init)(npc, (Enemy*)enemy, script, aiSettings); + #else + N(FlyingAI_Init)(npc, enemy, script, aiSettings); + #endif + + script->functionTemp[0] = 0; + } + npc->verticalRenderOffset = -2; + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->functionTemp[0]) { + case 0: + N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); + case 1: + N(FlyingAI_Wander)(script, aiSettings, territoryPtr); + break; + case 2: + N(FlyingAI_LoiterInit)(script, aiSettings, territoryPtr); + case 3: + N(FlyingAI_Loiter)(script, aiSettings, territoryPtr); + break; + case 10: + N(FlyingAI_JumpInit)(script, aiSettings, territoryPtr); + case 11: + N(FlyingAI_Jump)(script, aiSettings, territoryPtr); + break; + case 12: + N(FlyingNoAttackAI_12)(script, aiSettings, territoryPtr); + case 13: + N(FlyingNoAttackAI_13)(script, aiSettings, territoryPtr); + break; + case 20: + N(FlyingNoAttackAI_20)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/enemy/GrooveGuyAI.inc.c b/src/world/common/enemy/GrooveGuyAI.inc.c new file mode 100644 index 0000000000..a7fd19d618 --- /dev/null +++ b/src/world/common/enemy/GrooveGuyAI.inc.c @@ -0,0 +1,155 @@ +#include "common.h" +#include "npc.h" + +void N(GrooveGuyAI_02)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = 0; + set_npc_yaw(npc, 270.0f); + enemy->varTable[0] = 0; + script->functionTemp[0] = 3; +} + +void N(GrooveGuyAI_03)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe((s32) enemy->npcID); + s32 phase; + + switch (enemy->varTable[0]) { + case 0: + enemy->varTable[0] = 1; + enemy->varTable[1] = 0; + npc->currentAnim.w = 0x3C000C; + set_npc_yaw(npc, 270.0f); + npc->rotation.y = 0.0f; + // fallthrough + case 1: + phase = enemy->varTable[1] % 16; + if (phase < 4) { + npc->currentAnim.w = 0x3C000C; + } else if (phase < 8) { + npc->currentAnim.w = 0x3C000B; + } else if (phase < 12) { + npc->currentAnim.w = 0x3C000C; + } else if (phase < 16) { + npc->currentAnim.w = 0x3C000D; + } + enemy->varTable[1]++; + if (enemy->varTable[1] >= 0x41) { + enemy->varTable[0] = 2; + } + break; + case 2: + enemy->varTable[0] = 3; + enemy->varTable[1] = 0; + npc->rotation.y = 0.0f; + npc->currentAnim.w = 0x3C000C; + // fallthrough + case 3: + npc->rotation.y += 35.0; + if (npc->rotation.y > 360.0) { + npc->rotation.y -= 360.0; + } + enemy->varTable[1]++; + if (enemy->varTable[1] >= 0x2E) { + enemy->varTable[0] = 4; + } + break; + } + if (enemy->varTable[0] == 4) { + npc->rotation.y = 0.0f; + set_npc_yaw(npc, 270.0f); + script->functionTemp[0] = 0; + } +} + +ApiStatus N(GrooveGuyAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + Bytecode* args = script->ptrReadPos; + NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args++); + f32 posX; + f32 posY; + f32 posZ; + f32 hitDepth; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + if (isInitialCall || enemy->aiFlags & 4) { + script->functionTemp[0] = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + + npc->flags &= ~NPC_FLAG_JUMPING; + if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & 4) { + script->functionTemp[0] = 0x63; + script->functionTemp[1] = 0; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0] = 0xC; + } + enemy->aiFlags &= ~4; + enemy->flags &= ~0x40000000; + + hitDepth = 100.0f; + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0]) { + case 0x0: + basic_ai_wander_init(script, aiSettings, territoryPtr); + // fallthrough + case 0x1: + basic_ai_wander(script, aiSettings, territoryPtr); + break; + case 0x2: + N(GrooveGuyAI_02)(script, aiSettings, territoryPtr); + // fallthrough + case 0x3: + N(GrooveGuyAI_03)(script, aiSettings, territoryPtr); + break; + case 0xA: + basic_ai_found_player_jump_init(script, aiSettings, territoryPtr); + // fallthrough + case 0xB: + basic_ai_found_player_jump(script, aiSettings, territoryPtr); + break; + case 0xC: + basic_ai_chase_init(script, aiSettings, territoryPtr); + // fallthrough + case 0xD: + basic_ai_chase(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0xE) { + break; + } + case 0xE: + basic_ai_lose_player(script, aiSettings, territoryPtr); + break; + case 0x63: + basic_ai_suspend(script); + break; + } + return 0; +} diff --git a/src/world/common/enemy/HoppingAI.inc.c b/src/world/common/enemy/HoppingAI.inc.c new file mode 100644 index 0000000000..d4165caa7d --- /dev/null +++ b/src/world/common/enemy/HoppingAI.inc.c @@ -0,0 +1,289 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +void N(HoppingAI_HopInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 x, y, z; + s32 i; + + basic_ai_wander_init(script, aiSettings, territory); + npc->flags |= NPC_FLAG_JUMPING; + npc->jumpVelocity = (rand_int(45) / 10.0) + 8.0; + npc->jumpScale = 1.5f; + ai_enemy_play_sound(npc, SOUND_B0000017, 0); + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, + enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) + { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + + for (i = 0; i < 6; i++) { + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 25.0f, + npc->yaw, npc->collisionHeight, npc->collisionRadius)) + { + npc->yaw += 30.0; + } else { + break; + } + } + } else { + npc->yaw = clamp_angle(npc->yaw + rand_int(60) - 30.0f); + } +} + +void N(HoppingAI_Hop)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, hitDepth; + + if (aiSettings->playerSearchInterval >= 0) { + if (script->functionTemp[1] <= 0) { + do { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) { + s32 emoteTemp; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->AI_TEMP_STATE = 12; + return; + } + } while (0); // required to match + } + script->functionTemp[1]--; + } + + if (npc->moveSpeed > 0.0) { + f32 collRadius; + f32 collHeight; + f32 moveSpeed; + + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + moveSpeed = npc->moveSpeed; + collHeight = npc->collisionHeight; + collRadius = npc->collisionRadius; + + if (!npc_test_move_simple_with_slipping(npc->collisionChannel, + &posX, &posY, &posZ, + moveSpeed, npc->yaw, collHeight, collRadius * 1.2)) + { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + npc->moveSpeed = 0.0f; + } + } + + if (npc->jumpVelocity < 0.0) { + posX = npc->pos.x; + posY = npc->pos.y + 13.0; + posZ = npc->pos.z; + hitDepth = fabsf(npc->jumpVelocity) + 16.0; + + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth) && + hitDepth <= fabsf(npc->jumpVelocity) + 13.0) + { + npc->jumpVelocity = 0.0f; + npc->pos.y = posY; + npc->flags &= ~NPC_FLAG_JUMPING; + script->AI_TEMP_STATE = 2; + script->functionTemp[1] = (rand_int(1000) % 3) + 2; + + if (aiSettings->unk_AI_2C <= 0) { + script->AI_TEMP_STATE = 0; + } else if (aiSettings->moveTime <= 0) { + script->AI_TEMP_STATE = 0; + } else if (script->functionTemp[1] == 0) { + script->AI_TEMP_STATE = 0; + } + return; + } + } + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; +} + +void N(HoppingAI_LoiterInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + script->AI_TEMP_STATE = 3; +} + +void N(HoppingAI_Loiter)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (aiSettings->playerSearchInterval >= 0 && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0) != 0) { + s32 emoteTemp; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->AI_TEMP_STATE = 12; + } else if (npc->turnAroundYawAdjustment == 0) { + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1]--; + if (script->functionTemp[1] > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = (rand_int(1000) % 11) + 5; + } else { + script->AI_TEMP_STATE = 0; + } + } + } +} + +void N(HoppingAI_ChaseInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* enemy = get_npc_unsafe(script->owner1.enemy->npcID); + + basic_ai_chase_init(script, aiSettings, territory); + enemy->flags |= ENEMY_FLAGS_800; + enemy->jumpVelocity = rand_int(5) + 10.0; + enemy->jumpScale = 1.5f; + enemy->yaw = atan2(enemy->pos.x, enemy->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->moveSpeed = aiSettings->chaseSpeed; + script->AI_TEMP_STATE = 13; + ai_enemy_play_sound(enemy, SOUND_B0000017, 0); +} + +void N(HoppingAI_Chase)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ; + f32 groundY, hitDepth; + s32 emoteTemp; + + if (npc->moveSpeed > 0.0) { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &posX, &posY, &posZ, npc->moveSpeed, npc->yaw, + npc->collisionHeight, npc->collisionRadius)) + { + npc->moveSpeed = 0.0f; + } else { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + } + + if (npc->jumpVelocity < 0.0) { + posX = npc->pos.x; + groundY = 100.0f; + posZ = npc->pos.z; + hitDepth = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &posX, &groundY, &posZ, &hitDepth); + + posX = npc->pos.x; + posY = npc->pos.y + 13.0; + posZ = npc->pos.z; + hitDepth = fabsf(npc->jumpVelocity) + 16.0; + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth) && hitDepth <= fabsf(npc->jumpVelocity) + 13.0) { + npc->jumpVelocity = 0.0f; + npc->pos.y = posY; + npc->flags &= ~NPC_FLAG_JUMPING; + fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0.0f, 0.0f); + script->functionTemp[0] = 12; + + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1) == 0) { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + npc->duration = 25; + script->functionTemp[0] = 14; + } + return; + } + } + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; +} + +void N(HoppingAI_LosePlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = 0; + } +} + +ApiStatus N(HoppingAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr; + + enemy->varTable[10] = evt_get_variable(script, *args++); + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; + territoryPtr = &territory; + + if (isInitialCall) { + script->AI_TEMP_STATE = AI_STATE_HOP_INIT; + npc->duration = 0; + script->functionTemp[1] = 0; + npc->flags &= ~NPC_FLAG_JUMPING; + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + + enemy->aiFlags |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); + if (enemy->flags & ENEMY_FLAGS_40000000) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused != 0) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_HOP_INIT: + N(HoppingAI_HopInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_HOP: + N(HoppingAI_Hop)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + N(HoppingAI_LoiterInit)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_LOITER) { + break; + } + // fallthrough + case AI_STATE_LOITER: + N(HoppingAI_Loiter)(script, aiSettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + N(HoppingAI_ChaseInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_CHASE: + N(HoppingAI_Chase)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + N(HoppingAI_LosePlayer)(script, aiSettings, territoryPtr); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkNpcAIMainFunc8.inc.c b/src/world/common/enemy/KoopaPatrolAI.inc.c similarity index 57% rename from src/world/common/UnkNpcAIMainFunc8.inc.c rename to src/world/common/enemy/KoopaPatrolAI.inc.c index 3e126ece81..20438d37e4 100644 --- a/src/world/common/UnkNpcAIMainFunc8.inc.c +++ b/src/world/common/enemy/KoopaPatrolAI.inc.c @@ -2,34 +2,38 @@ #include "npc.h" #include "effects.h" -ApiStatus N(UnkNpcAIMainFunc8)(Evt* script, s32 isInitialCall) { +#include "world/common/enemy/PatrolNoAttackAI.inc.c" + +#include "world/common/enemy/States_TackleAI.inc.c" + +ApiStatus N(KoopaPatrolAI_Main)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* settings = (NpcAISettings*) evt_get_variable(script, *args++); - territoryPtr->unk_00 = 0; - territoryPtr->shape = enemy->territory->patrol.detectShape; - territoryPtr->pointX = enemy->territory->patrol.detect.x; - territoryPtr->pointZ = enemy->territory->patrol.detect.z; - territoryPtr->sizeX = enemy->territory->patrol.detectSizeX; - territoryPtr->sizeZ = enemy->territory->patrol.detectSizeZ; - territoryPtr->unk_18 = 100.0f; - territoryPtr->unk_1C = 0; + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; if (isInitialCall) { enemy->varTable[6] = npc->collisionHeight; - enemy->unk_B0 |= ENEMY_AI_FLAGS_8; + enemy->aiFlags |= ENEMY_AI_FLAGS_8; } - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { npc->duration = 0; script->functionTemp[0] = 0; enemy->unk_07 = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~NPC_FLAG_JUMPING; npc->collisionHeight = enemy->varTable[6]; enemy->unk_B5 = 0; enemy->varTable[8] = 0; @@ -42,13 +46,13 @@ ApiStatus N(UnkNpcAIMainFunc8)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { s32 emoteTemp; script->functionTemp[0] = 99; script->functionTemp[1] = 0; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; @@ -57,24 +61,24 @@ ApiStatus N(UnkNpcAIMainFunc8)(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - N(UnkNpcAIFunc24)(script, settings, territoryPtr); + N(PatrolAI_MoveInit)(script, settings, territoryPtr); npc->collisionHeight = enemy->varTable[6]; - /* fallthrough */ + // fallthrough case 1: - N(UnkFunc13)(script, settings, territoryPtr); + N(PatrolAI_Move)(script, settings, territoryPtr); break; case 2: - N(UnkNpcAIFunc1)(script, settings, territoryPtr); - /* fallthrough */ + N(PatrolAI_LoiterInit)(script, settings, territoryPtr); + // fallthrough case 3: - N(UnkFunc14)(script, settings, territoryPtr); + N(PatrolAI_Loiter)(script, settings, territoryPtr); break; case 4: - N(UnkNpcAIFunc25)(script, settings, territoryPtr); + N(PatrolAI_PostLoiter)(script, settings, territoryPtr); break; case 12: N(set_script_owner_npc_anim)(script, settings, territoryPtr); - /* fallthrough */ + // fallthrough case 13: N(UnkDistFunc)(script, settings, territoryPtr); break; @@ -85,7 +89,7 @@ ApiStatus N(UnkNpcAIMainFunc8)(Evt* script, s32 isInitialCall) { N(set_script_owner_npc_col_height)(script, settings, territoryPtr); break; case 99: - func_8004A73C(script); + basic_ai_suspend(script); break; } return ApiStatus_BLOCK; diff --git a/src/world/common/enemy/LakituAI.inc.c b/src/world/common/enemy/LakituAI.inc.c new file mode 100644 index 0000000000..e4ff9c85aa --- /dev/null +++ b/src/world/common/enemy/LakituAI.inc.c @@ -0,0 +1,314 @@ +#include "common.h" +#include "npc.h" +#include "sprite/npc/lakitu.h" + +// required include args +#ifndef AI_LAKITU_FIRST_SPINY_ID +#error AI_LAKITU_FIRST_SPINY_ID must be defined for LakituAI +#define AI_LAKITU_FIRST_SPINY_ID 0 +#endif +#ifndef AI_LAKITU_LAST_SPINY_ID +#error AI_LAKITU_LAST_SPINY_ID must be defined for LakituAI +#define AI_LAKITU_LAST_SPINY_ID 0 +#endif + +// prerequisites +#include "world/common/enemy/FlyingAI.inc.c" + +s32 N(LakituAI_GetAvailableSpiny)(void) { + s32 npcID; + + for (npcID = AI_LAKITU_FIRST_SPINY_ID; npcID <= AI_LAKITU_LAST_SPINY_ID; npcID++) { + if (get_enemy(npcID)->varTable[10] == 0) { + return npcID; + } + } + + return -1; +} + +void N(LakituAI_Wander)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 x, y, z, w; + s32 emoteTemp; + f32 temp_f20; + f32 temp_f22; + f32 temp_f24; + f32 var1 = enemy->varTable[4]; + f32 var2 = enemy->varTable[3]; + f32 var3; + + temp_f22 = var1 / 100.0; + temp_f24 = var2 / 100.0; + if (npc->duration > 0) { + npc->duration--; + } + var3 = enemy->varTable[1]; + temp_f20 = var3 / 100.0; + + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + w = 1000.0f; + + npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); + npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20); + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); + + if (aiSettings->playerSearchInterval >= 0) { + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) != 0) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + w = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); + npc->moveToPos.y = y + temp_f24; + script->functionTemp[0] = 12; + return; + } + } + script->functionTemp[1]--; + } + + if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, + enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, + enemy->territory->wander.wanderSizeZ) != 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + } + + if (npc->turnAroundYawAdjustment == 0) { + if (npc->duration > 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (enemy->varTable[0] & 1) { + x = npc->pos.x; + y = temp_f22; + z = npc->pos.z; + w = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); + y += temp_f24; + w = y - temp_f22; + if (w > 2.0) { + temp_f22 += 2.0; + } else if (w < -2.0) { + temp_f22 -= 2.0; + } else { + temp_f22 = y; + } + enemy->varTable[4] = (temp_f22 * 100.0); + } + if (npc->duration > 0) { + return; + } + } + script->functionTemp[0] = 2; + script->functionTemp[1] = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_AI_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) { + script->functionTemp[0] = 0; + } + } +} + +void N(LakituAI_Loiter)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, hitDepth; + s32 emoteTemp; + f32 var1 = enemy->varTable[3]; + f32 var2; + f32 temp_f20; + f32 temp_f22; + + temp_f22 = var1 / 100.0; + if (npc->duration > 0) { + npc->duration--; + } + var2 = enemy->varTable[1]; + temp_f20 = var2 / 100.0; + + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + hitDepth = 1000.0f; + + npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth); + npc->pos.y = posY + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1) != 0) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + return; + } + + if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) { + script->functionTemp[1]--; + if (script->functionTemp[1] > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = (rand_int(1000) % 11) + 5; + return; + } + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } +} + +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +s32 N(LakituAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); + Enemy* spinyEnemy; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 120.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + #endif + + if (isInitialCall) { + #ifdef _DEAD_H_ + N(FlyingAI_Init)(npc, (Enemy*)enemy, script, aiSettings); + #else + N(FlyingAI_Init)(npc, enemy, script, aiSettings); + #endif + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } + npc->verticalRenderOffset = -3; + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused != 0) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_WANDER_INIT: + N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_WANDER: + N(LakituAI_Wander)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + N(FlyingAI_LoiterInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_LOITER: + N(LakituAI_Loiter)(script, aiSettings, territoryPtr); + break; + } + + if (script->AI_TEMP_STATE == AI_STATE_CHASE_INIT) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->varTable[4] = N(LakituAI_GetAvailableSpiny)(); + if (enemy->varTable[4] >= 0) { + spinyEnemy = get_enemy(enemy->varTable[4]); + spinyEnemy->varTable[10] = 1; + spinyEnemy->varTable[11] = enemy->npcID; + npc->duration = 15; + npc->currentAnim.w = NPC_ANIM_lakitu_Palette_00_Anim_14; + script->AI_TEMP_STATE = 30; + } + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_CHASE_INIT: + N(FlyingAI_ChaseInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_CHASE: + N(FlyingAI_Chase)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + N(FlyingAI_LosePlayer)(script, aiSettings, territoryPtr); + break; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_PROJECTILE_HITBOX_30: + npc->duration--; + if (npc->duration > 0) { + break; + } + spinyEnemy = get_enemy(enemy->varTable[4]); + spinyEnemy->varTable[10] = 2; + npc->duration = 5; + script->AI_TEMP_STATE = AI_STATE_PROJECTILE_HITBOX_31; + // fallthrough + case AI_STATE_PROJECTILE_HITBOX_31: + npc->duration--; + if (npc->duration > 0) { + break; + } + npc->currentAnim.w = NPC_ANIM_lakitu_Palette_00_Anim_15; + spinyEnemy = get_enemy(enemy->varTable[4]); + spinyEnemy->varTable[10] = 3; + npc->duration = 10; + script->AI_TEMP_STATE = AI_STATE_PROJECTILE_HITBOX_32; + // fallthrough + case AI_STATE_PROJECTILE_HITBOX_32: + npc->duration--; + if (npc->duration > 0) { + break; + } + npc->duration = 3; + script->AI_TEMP_STATE = AI_STATE_PROJECTILE_HITBOX_33; + // fallthrough + case AI_STATE_PROJECTILE_HITBOX_33: + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } + break; + } + + if (script->AI_TEMP_STATE == AI_STATE_PROJECTILE_HITBOX_30 || script->AI_TEMP_STATE == AI_STATE_PROJECTILE_HITBOX_31) { + f32 playerDist; + f32 lerpDist; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + playerDist = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, npc->pos.x, npc->pos.z); + if (!is_point_within_region(territoryPtr->shape, + territoryPtr->pointX, territoryPtr->pointZ, + npc->pos.x, npc->pos.z, + territoryPtr->sizeX, territoryPtr->sizeZ)) { + if ((playerDist > 30.0) && (npc->turnAroundYawAdjustment == 0)) { + lerpDist = playerDist - 20.0; + if (lerpDist < 0.0) { + lerpDist = 0.0f; + } + if (lerpDist > 200.0) { + lerpDist = 200.0f; + } + npc->moveSpeed = update_lerp(EASING_LINEAR, aiSettings->moveSpeed, aiSettings->chaseSpeed, lerpDist, 200); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + } + } + + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/enemy/MagikoopaAI.inc.c b/src/world/common/enemy/MagikoopaAI.inc.c new file mode 100644 index 0000000000..a05b7e93fe --- /dev/null +++ b/src/world/common/enemy/MagikoopaAI.inc.c @@ -0,0 +1,342 @@ +#include "common.h" +#include "npc.h" +#include "sprite.h" + +typedef struct MagikoopaTeleportAnim { + f32 scaleX; + f32 scaleY; + u8 alpha; +} MagikoopaTeleportAnim; + +extern MagikoopaTeleportAnim N(MagikoopaAI_TeleportAnim)[]; + +#include "world/common/enemy/MagikoopaSpellAI.inc.c" + +void N(MagikoopaAI_00)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~2; + npc->duration = 0; + script->AI_TEMP_STATE = 1; + } +} + +void N(MagikoopaAI_01)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + npc->scale.x = N(MagikoopaAI_TeleportAnim)[npc->duration].scaleX; + npc->scale.y = N(MagikoopaAI_TeleportAnim)[npc->duration].scaleY; + npc->alpha = N(MagikoopaAI_TeleportAnim)[npc->duration].alpha; + + npc->duration++; + if (npc->duration == 4) { + disable_npc_shadow(npc); + enemy->flags |= 0x1F100000; + } + + if (N(MagikoopaAI_TeleportAnim)[npc->duration].alpha == 0) { + npc->alpha = 0xFF; + npc->scale.x = 1.0f; + npc->scale.y = 1.0f; + npc->scale.z = 1.0f; + npc->flags |= 2; + script->AI_TEMP_STATE = 5; + } +} + +void N(MagikoopaAI_05)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + f32 angle = (rand_int(100) % 2) * 180.0f; + + npc->duration = 15; + npc->moveSpeed = 0.8f; + npc->yaw = angle + 90.0f; + script->AI_TEMP_STATE = 6; +} + +void N(MagikoopaAI_06)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = 10; + } +} + +void N(MagikoopaAI_10)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 dist = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + f32 posX, posY, posZ; + + enemy->varTable[0] = 1; + npc->currentAnim.w = enemy->animList[8]; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->flags &= ~2; + npc->scale.x = 0.1f; + npc->scale.y = 0.1f; + npc->scale.z = 0.1f; + if ((npc->flags & 8) == 0) { + posX = npc->pos.x; + dist = 200.0f; + posZ = npc->pos.z; + posY = npc->pos.y + 100.0; + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &dist) != 0) { + npc->pos.y = posY; + } + } + npc->duration = 0; + script->AI_TEMP_STATE = 0xB; +} + +void N(MagikoopaAI_11)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe((s32) enemy->npcID); + f32 scale; + s16 alpha; + + if (enemy->varTable[0] == 0) { + alpha = (npc->duration * 15) + 130; + } else { + alpha = (npc->duration * 15) + 30; + } + if (alpha > 0xFF) { + alpha = 0xFF; + } + npc->alpha = alpha; + + npc->scale.x = ((f32)npc->duration * 0.1) + 0.4; + if (npc->scale.x > 1.0) { + npc->scale.x = 1.0f; + } + npc->scale.y = npc->scale.x; + npc->scale.z = npc->scale.x; + + npc->duration++; + if (npc->duration == 5) { + enable_npc_shadow(npc); + enemy->flags &= 0xE0EFFFFF; + } + if (enemy->varTable[0] == 0) { + if (npc->duration >= 20) { + func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); + npc->alpha = 0xFF; + npc->scale.x = 1.0f; + npc->scale.y = 1.0f; + npc->scale.z = 1.0f; + script->AI_TEMP_STATE = 20; + } + } else if (npc->duration >= 10) { + npc->alpha = 0xFF; + npc->scale.x = 1.0f; + npc->scale.y = 1.0f; + npc->scale.z = 1.0f; + script->AI_TEMP_STATE = 20; + } +} + +void N(MagikoopaAI_20)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = 40; + script->AI_TEMP_STATE = 21; +} + +void N(MagikoopaAI_21)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ; + s32 emoteTemp; + + npc->duration--; + if (npc->duration == 0) { + npc->currentAnim.w = enemy->animList[0]; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &emoteTemp); + npc->currentAnim.w = enemy->animList[0]; + npc->duration = 0xF; + script->AI_TEMP_STATE = 0; + return; + } + if (N(MagikoopaAI_CanShootSpell)(script, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, territory) == 1) { + ai_enemy_play_sound(npc, SOUND_SPELL_CAST1, 0); + npc->currentAnim.w = enemy->animList[8]; + posX = npc->pos.x; + posY = npc->pos.y + 32.0f; + posZ = npc->pos.z + 1.0f; + add_vec2D_polar(&posX, &posZ, 17.0f, 270.0f - npc->renderYaw); + fx_gather_energy_pink(0, posX, posY, posZ, 0.1f, 0xD); + npc->duration = 0xF; + script->AI_TEMP_STATE = 0x16; + } +} + +void N(MagikoopaAI_22)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* temp_s0 = script->owner1.enemy; + Npc* temp_v0 = get_npc_unsafe(temp_s0->npcID); + + temp_v0->duration--; + if (temp_v0->duration <= 0) { + temp_v0->currentAnim.w = temp_s0->animList[9]; + temp_v0->duration = 9; + script->AI_TEMP_STATE = 0x17; + } +} + +void N(MagikoopaAI_23)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 projectileEnemy; + s32 emoteTemp; + + npc->duration--; + if (npc->duration <= 0) { + projectileEnemy = N(MagikoopaAI_CanShootSpell)(script, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, territory); + if (projectileEnemy != 1) { + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xC, &emoteTemp); + npc->currentAnim.w = enemy->animList[0]; + npc->duration = 15; + script->AI_TEMP_STATE = 0; + } else { + ai_enemy_play_sound(npc, SOUND_SPELL_CAST2, 0); + get_enemy(enemy->npcID + 1)->varTable[0] = projectileEnemy; + npc->duration = 0x14; + script->AI_TEMP_STATE = 0x18; + } + } +} + +void N(MagikoopaAI_24)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim.w = enemy->animList[0]; + npc->duration = 3; + script->AI_TEMP_STATE = 0; + } +} + +ApiStatus N(MagikoopaAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + Bytecode* args = script->ptrReadPos; + NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args++); + f32 posX; + f32 posY; + f32 posZ; + f32 hitDepth; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; + + if (isInitialCall || (enemy->aiFlags & 4)) { + npc->currentAnim.w = enemy->animList[0]; + npc->flags &= ~0x800; + npc->flags |= 0x200000; + enemy->flags |= 0x200000; + npc->duration = 0; + if ((enemy->aiFlags & 4) != 0) { + enemy->aiFlags &= ~4; + npc->alpha = 0xFF; + npc->duration = 0x14; + npc->scale.x = 1.0f; + npc->scale.y = 1.0f; + npc->scale.z = 1.0f; + } + script->AI_TEMP_STATE = 0; + } + + switch (script->AI_TEMP_STATE) { + case 0: + N(MagikoopaAI_00)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != 1) { + break; + } + // fallthrough + case 1: + N(MagikoopaAI_01)(script, aiSettings, territoryPtr); + break; + case 5: + N(MagikoopaAI_05)(script, aiSettings, territoryPtr); + // fallthrough + case 6: + N(MagikoopaAI_06)(script, aiSettings, territoryPtr); + break; + case 10: + N(MagikoopaAI_10)(script, aiSettings, territoryPtr); + // fallthrough + case 11: + N(MagikoopaAI_11)(script, aiSettings, territoryPtr); + break; + case 20: + N(MagikoopaAI_20)(script, aiSettings, territoryPtr); + break; + case 21: + N(MagikoopaAI_21)(script, aiSettings, territoryPtr); + break; + case 22: + N(MagikoopaAI_22)(script, aiSettings, territoryPtr); + break; + case 23: + N(MagikoopaAI_23)(script, aiSettings, territoryPtr); + break; + case 24: + N(MagikoopaAI_24)(script, aiSettings, territoryPtr); + break; + } + return ApiStatus_BLOCK; +} + +ApiStatus N(MagikoopaAI_OnPlayerWon)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->alpha = 255; + func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); + return ApiStatus_DONE2; +} + +ApiStatus N(MagikoopaAI_OnPlayerFled)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->alpha = 255; + npc->currentAnim.w = enemy->animList[2]; + npc->duration = 0; + script->functionTemp[0] = 0; + return ApiStatus_DONE2; +} + +ApiStatus N(MagikoopaAI_OnHitInit)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + + evt_set_variable(script, EVT_VAR(0), gCurrentEncounter.currentEnemy == enemy); + return ApiStatus_DONE2; +} + +ApiStatus N(MagikoopaAI_OnHit)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (enemy->varTable[0] == 2) { + npc->jumpVelocity = 0.0f; + npc->moveSpeed = 0.0f; + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc57.inc.c b/src/world/common/enemy/MagikoopaSpellAI.inc.c similarity index 75% rename from src/world/common/UnkFunc57.inc.c rename to src/world/common/enemy/MagikoopaSpellAI.inc.c index 96a1133b5e..10aae71b61 100644 --- a/src/world/common/UnkFunc57.inc.c +++ b/src/world/common/enemy/MagikoopaSpellAI.inc.c @@ -1,7 +1,44 @@ #include "common.h" #include "effects.h" -ApiStatus N(UnkFunc57)(Evt* script, s32 isInitialCall) { +s32 N(MagikoopaAI_CanShootSpell)(Evt* script, f32 arg1, f32 arg2, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Camera* camera = &gCameras[gCurrentCamID]; + + if (basic_ai_check_player_dist(territory, enemy, arg1, arg2, 0)) { + f32 angle; + f32 t1; + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + angle = 90.0f; + } else { + angle = 270.0f; + } + + t1 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + if (fabsf(get_clamped_angle_diff(angle, t1)) > 75.0) { + return -1; + } + + t1 = atan2(0.0f, npc->pos.y, fabsf(npc->pos.x - gPlayerStatusPtr->position.x), gPlayerStatusPtr->position.y); + if (fabsf(t1 - 90.0) > 70.0) { + return -1; + } + + if (gPartnerActionStatus.actingPartner == PARTNER_BOW || gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { + return -1; + } + + if ((get_enemy(enemy->npcID + 1)->varTable[0] == 0)) { + return 1; + } + } + + return -1; +} + +ApiStatus N(MagikoopaAI_SpellMain)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc sp20; Npc* sp20Ptr = &sp20; @@ -11,7 +48,7 @@ ApiStatus N(UnkFunc57)(Evt* script, s32 isInitialCall) { f32 t1; f32 t2; - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { script->functionTemp[0] = 0; npc1->duration = 0; npc1->flags |= NPC_FLAG_200000 | NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; @@ -19,8 +56,8 @@ ApiStatus N(UnkFunc57)(Evt* script, s32 isInitialCall) { ENEMY_FLAGS_200000 | ENEMY_FLAGS_40; npc1->scale.x = 0.4f; npc1->scale.y = 0.4f; - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; } } diff --git a/src/world/common/enemy/MeleeHitbox.inc.c b/src/world/common/enemy/MeleeHitbox.inc.c new file mode 100644 index 0000000000..c181022bf4 --- /dev/null +++ b/src/world/common/enemy/MeleeHitbox.inc.c @@ -0,0 +1,192 @@ +#ifndef _AI_MELEE_HITBOX_INC_ +#define _AI_MELEE_HITBOX_INC_ 0 + +#include "common.h" +#include "effects.h" + +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +void N(MeleeHitbox_30)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_INIT; + // if flipping, wait for it to finish + if (npc->turnAroundYawAdjustment == 0) { + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_PRE; + npc->duration = enemy->AI_VAR_MELEE_PRE_TIME; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + script->AI_TEMP_STATE = AI_STATE_MELEE_HITBOX_PRE; + } +} + +void N(MeleeHitbox_31)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_ACTIVE; + npc->duration = enemy->AI_VAR_MELEE_HIT_TIME; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_HIT]; + script->AI_TEMP_STATE = AI_STATE_MELEE_HITBOX_ACTIVE; + } +} + +void N(MeleeHitbox_32)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + npc->duration--; + if (npc->duration <= 0) { + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_POST; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = enemy->AI_VAR_MELEE_MISS_TIME; + if (enemy->AI_VAR_MELEE_MISS_TIME >= 8) { + fx_emote(EMOTE_FRUSTRATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, enemy->AI_VAR_MELEE_MISS_TIME - 1, &emoteTemp); + } + script->AI_TEMP_STATE = AI_STATE_MELEE_HITBOX_MISS; + } +} + +void N(MeleeHitbox_33)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } +} + +s32 N(MeleeHitbox_CanSeePlayer)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Camera* camera = &gCameras[gCurrentCamID]; + Enemy* hitboxEnemy = get_enemy(enemy->npcID + 1); + f32 angle; + s32 ret = TRUE; + + if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) > hitboxEnemy->AI_VAR_HITNPC_2) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + angle = 90.0f; + } else { + angle = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(angle, atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.z))) > hitboxEnemy->AI_VAR_HITNPC_3) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - gPlayerStatusPtr->position.y)) { + ret = FALSE; + } + + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { + ret = FALSE; + } + + if (gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { + ret = FALSE; + } + + return ret; +} + +ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* hitboxEnemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* hitboxEnemy = script->owner1.enemy; + #endif + Npc* hitboxNpc = get_npc_unsafe(hitboxEnemy->npcID); + Enemy* baseEnemy; + Npc* baseNpc; + f32 posX, posZ; + + #ifdef _DEAD_H_ + hitboxEnemy->unk_108.x = hitboxNpc->pos.x; + hitboxEnemy->unk_108.y = hitboxNpc->pos.y; + hitboxEnemy->unk_108.z = hitboxNpc->pos.z; + hitboxEnemy->unk_114 = 0.0001f; + hitboxEnemy->unk_118 = 0.0001f; + #endif + + if (isInitialCall || (hitboxEnemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->functionTemp[0] = 0; + hitboxNpc->duration = 0; + hitboxNpc->flags |= (NPC_FLAG_2 | NPC_FLAG_100); + hitboxEnemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; + hitboxNpc->pos.x = 0.0f; + hitboxNpc->pos.y = -1000.0f; + hitboxNpc->pos.z = 0.0f; + if (hitboxEnemy->aiFlags & ENEMY_AI_FLAGS_4) { + hitboxEnemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + } + + switch (script->AI_TEMP_STATE) { + case 0: + baseEnemy = get_enemy(hitboxEnemy->npcID - 1); + baseNpc = get_npc_unsafe(baseEnemy->npcID); + hitboxEnemy->unk_07 = 1; + if (baseEnemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_ACTIVE) { + if (hitboxEnemy->AI_VAR_HITNPC_SOUND != 0) { + ai_enemy_play_sound(baseNpc, hitboxEnemy->AI_VAR_HITNPC_SOUND, 0); + } + posX = baseNpc->pos.x; + posZ = baseNpc->pos.z; + add_vec2D_polar(&posX, &posZ, hitboxEnemy->AI_VAR_HITNPC_DIST, 270.0f - baseNpc->renderYaw); + + hitboxNpc->pos.x = posX; + hitboxEnemy->unk_10.x = hitboxNpc->pos.x; + + hitboxNpc->pos.y = baseNpc->pos.y + hitboxEnemy->AI_VAR_HITNPC_YOFFSET; + hitboxEnemy->unk_10.y = hitboxNpc->pos.y; + + hitboxNpc->pos.z = posZ; + hitboxEnemy->unk_10.z = hitboxNpc->pos.z; + + hitboxNpc->yaw = atan2(hitboxNpc->pos.x, hitboxNpc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + hitboxEnemy->flags &= ~(ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); + hitboxNpc->duration = 0; + script->functionTemp[0] = 1; + } + break; + case 1: + baseEnemy = get_enemy(hitboxEnemy->npcID - 1); + get_npc_unsafe(baseEnemy->npcID); + hitboxNpc->duration++; + if (hitboxNpc->duration >= hitboxEnemy->AI_VAR_HITNPC_4) { + hitboxEnemy->unk_07 = 0; + } + if (baseEnemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_POST) { + hitboxEnemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; + hitboxNpc->pos.x = 0.0f; + hitboxNpc->pos.y = -1000.0f; + hitboxNpc->pos.z = 0.0f; + hitboxEnemy->unk_07 = 1; + script->functionTemp[0] = 0; + } + break; + } + + #ifdef _DEAD_H_ + if (hitboxEnemy->unk_07 != 0) { + hitboxEnemy->unk_114 = 7.0f; + hitboxEnemy->unk_118 = 1.0f; + } + #endif + + return ApiStatus_BLOCK; +} + +#endif diff --git a/src/world/common/atomic/enemy/MontyMoleAI.inc.c b/src/world/common/enemy/MontyMoleAI.inc.c similarity index 66% rename from src/world/common/atomic/enemy/MontyMoleAI.inc.c rename to src/world/common/enemy/MontyMoleAI.inc.c index 700bec37d5..0b0d9c83c3 100644 --- a/src/world/common/atomic/enemy/MontyMoleAI.inc.c +++ b/src/world/common/enemy/MontyMoleAI.inc.c @@ -2,6 +2,9 @@ #include "npc.h" #include "sprite/npc/monty_mole.h" +// prerequisites +#include "world/common/enemy/ProjectileHitbox.inc.c" + // ensure state handlers conform to expected signature static AIStateHandler N(MontyMoleAI_Init); static AIStateHandler N(MontyMoleAI_Wander); @@ -26,7 +29,7 @@ enum AiStateMontyMole { #define MONTY_MOLE_UNK_NPC_FLAGS 0x1F100000 -static s32 N(MontyMoleAI_CanAttack)(Evt* script, EnemyTerritoryThing* territory, f32 radius, f32 arg3) { +static s32 N(MontyMoleAI_CanAttack)(Evt* script, EnemyDetectVolume* territory, f32 radius, f32 arg3) { Camera* cam; Enemy* enemy; Npc* npc; @@ -36,7 +39,7 @@ static s32 N(MontyMoleAI_CanAttack)(Evt* script, EnemyTerritoryThing* territory, enemy = script->owner1.enemy; npc = get_npc_unsafe(enemy->npcID); cam = &gCameras[gCurrentCamID]; - retVal = func_800490B4(territory, enemy, radius * 1.1, arg3, 0) != 0; + retVal = basic_ai_check_player_dist(territory, enemy, radius * 1.1, arg3, 0) != 0; // check npc facing angle for sight of player angle = 270.0f; if (clamp_angle(get_clamped_angle_diff(cam->currentYaw, npc->yaw)) < 180.0) { @@ -60,7 +63,7 @@ static s32 N(MontyMoleAI_CanAttack)(Evt* script, EnemyTerritoryThing* territory, return retVal; } -static void N(MontyMoleAI_Init)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +static void N(MontyMoleAI_Init)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -74,10 +77,10 @@ static void N(MontyMoleAI_Init)(Evt* script, NpcAISettings* aiSettings, EnemyTer enemy->flags |= MONTY_MOLE_UNK_NPC_FLAGS; npc->flags |= NPC_FLAG_2; script->functionTemp[1] = 0; - script->functionTemp[0] = AI_STATE_MOLE_WANDER; + script->AI_TEMP_STATE = AI_STATE_MOLE_WANDER; } -static void N(MontyMoleAI_Wander)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +static void N(MontyMoleAI_Wander)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Npc dummyNpc; @@ -98,14 +101,14 @@ static void N(MontyMoleAI_Wander)(Evt* script, NpcAISettings* aiSettings, EnemyT npc_move_heading(npc, npc->moveSpeed, npc->yaw); } if (npc->flags & NPC_FLAG_4000) { - script->functionTemp[0] = AI_STATE_MOLE_INIT; + script->AI_TEMP_STATE = AI_STATE_MOLE_INIT; } - if (aiSettings->unk_14 >= 0) { + if (aiSettings->playerSearchInterval >= 0) { if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->unk_14; - if (N(MontyMoleAI_CanAttack)(script, territory, aiSettings->alertRadius, aiSettings->unk_10.f)) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (N(MontyMoleAI_CanAttack)(script, territory, aiSettings->alertRadius, aiSettings->alertOffsetDist)) { npc->duration = 0; - script->functionTemp[0] = AI_STATE_MOLE_PRE_SURFACE; + script->AI_TEMP_STATE = AI_STATE_MOLE_PRE_SURFACE; return; } } @@ -117,22 +120,23 @@ static void N(MontyMoleAI_Wander)(Evt* script, NpcAISettings* aiSettings, EnemyT } npc->duration--; if (npc->duration == 0) { - script->functionTemp[0] = AI_STATE_MOLE_INIT; + script->AI_TEMP_STATE = AI_STATE_MOLE_INIT; } } -static void N(MontyMoleAI_PreSurface)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); +static void N(MontyMoleAI_PreSurface)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); ai_enemy_play_sound(npc, SOUND_MOLE_SURFACE, 0); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_10; // emerge from ground npc->duration = 10; - script->functionTemp[0] = AI_STATE_MOLE_SURFACE; + script->AI_TEMP_STATE = AI_STATE_MOLE_SURFACE; } -static void N(MontyMoleAI_Surface)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +static void N(MontyMoleAI_Surface)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -143,31 +147,31 @@ static void N(MontyMoleAI_Surface)(Evt* script, NpcAISettings* aiSettings, Enemy if (npc->duration <= 0) { npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_18; // get and throw rock npc->duration = 10; - script->functionTemp[0] = AI_STATE_MOLE_DRAW_ROCK; + script->AI_TEMP_STATE = AI_STATE_MOLE_DRAW_ROCK; } } -static void N(MontyMoleAI_DrawRock)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc; +static void N(MontyMoleAI_DrawRock)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); s32 emoteOut; - npc = get_npc_unsafe(script->owner1.enemy->npcID); npc->duration--; if ((npc->duration) <= 0) { - if (!N(MontyMoleAI_CanAttack)(script, territory, aiSettings->alertRadius * 1.1, aiSettings->unk_10.f)) { + if (!N(MontyMoleAI_CanAttack)(script, territory, aiSettings->alertRadius * 1.1, aiSettings->alertOffsetDist)) { fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteOut); npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_1; // cancel attack npc->duration = 30; - script->functionTemp[0] = AI_STATE_MOLE_PRE_BURROW; + script->AI_TEMP_STATE = AI_STATE_MOLE_PRE_BURROW; } else { npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_1B; // throw rock npc->duration = 15; - script->functionTemp[0] = AI_STATE_MOLE_THROW_ROCK; + script->AI_TEMP_STATE = AI_STATE_MOLE_THROW_ROCK; } } } -static void N(MontyMoleAI_ThrowRock)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +static void N(MontyMoleAI_ThrowRock)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* moleEnemy; Enemy* rockEnemy; Npc* moleNpc; @@ -190,23 +194,24 @@ static void N(MontyMoleAI_ThrowRock)(Evt* script, NpcAISettings* aiSettings, Ene moleNpc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_1; } moleNpc->duration = 15; - script->functionTemp[0] = AI_STATE_MOLE_PRE_BURROW; + script->AI_TEMP_STATE = AI_STATE_MOLE_PRE_BURROW; } } -static void N(MontyMoleAI_PreBurrow)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); +static void N(MontyMoleAI_PreBurrow)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); npc->duration--; if (npc->duration <= 0) { ai_enemy_play_sound(npc, SOUND_MOLE_DIG, 0); npc->duration = 11; npc->currentAnim.w = NPC_ANIM_monty_mole_Palette_00_Anim_11; // retreat into ground - script->functionTemp[0] = AI_STATE_MOLE_BURROW; + script->AI_TEMP_STATE = AI_STATE_MOLE_BURROW; } } -static void N(MontyMoleAI_Burrow)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +static void N(MontyMoleAI_Burrow)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -216,7 +221,7 @@ static void N(MontyMoleAI_Burrow)(Evt* script, NpcAISettings* aiSettings, EnemyT } if (npc->duration <= 0) { npc->flags |= NPC_FLAG_2; - script->functionTemp[0] = AI_STATE_MOLE_INIT; + script->AI_TEMP_STATE = AI_STATE_MOLE_INIT; } } @@ -224,65 +229,65 @@ ApiStatus N(MontyMoleAI_Main)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - EnemyTerritoryThing tempTerritory; - EnemyTerritoryThing* territory = &tempTerritory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - territory->unk_00 = 0; - territory->shape = enemy->territory->wander.detectShape; - territory->pointX = enemy->territory->wander.detect.x; - territory->pointZ = enemy->territory->wander.detect.z; - territory->sizeX = enemy->territory->wander.detectSizeX; - territory->sizeZ = enemy->territory->wander.detectSizeZ; - territory->unk_18 = 65.0f; - territory->unk_1C = 0; + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; if (isInitialCall) { - script->functionTemp[0] = AI_STATE_MOLE_INIT; + script->AI_TEMP_STATE = AI_STATE_MOLE_INIT; npc->duration = 0; - npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT); - enemy->unk_B0 |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); + npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING); + enemy->aiFlags |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { - if (enemy->unk_B4 == 0) { - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused == 0) { + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; } else { return ApiStatus_BLOCK; } } - - switch (script->functionTemp[0]) { - case AI_STATE_MOLE_INIT: - N(MontyMoleAI_Init)(script, aiSettings, territory); - // fallthrough - case AI_STATE_MOLE_WANDER: - N(MontyMoleAI_Wander)(script, aiSettings, territory); - return ApiStatus_BLOCK; - case AI_STATE_MOLE_PRE_SURFACE: - N(MontyMoleAI_PreSurface)(script, aiSettings, territory); - // fallthrough - case AI_STATE_MOLE_SURFACE: - N(MontyMoleAI_Surface)(script, aiSettings, territory); - if (script->functionTemp[0] != AI_STATE_MOLE_DRAW_ROCK) { + + switch (script->AI_TEMP_STATE) { + case AI_STATE_MOLE_INIT: + N(MontyMoleAI_Init)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_MOLE_WANDER: + N(MontyMoleAI_Wander)(script, aiSettings, territoryPtr); return ApiStatus_BLOCK; - } // else fallthrough - case AI_STATE_MOLE_DRAW_ROCK: - N(MontyMoleAI_DrawRock)(script, aiSettings, territory); - if (script->functionTemp[0] != AI_STATE_MOLE_THROW_ROCK) { + case AI_STATE_MOLE_PRE_SURFACE: + N(MontyMoleAI_PreSurface)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_MOLE_SURFACE: + N(MontyMoleAI_Surface)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_MOLE_DRAW_ROCK) { + return ApiStatus_BLOCK; + } // else fallthrough + case AI_STATE_MOLE_DRAW_ROCK: + N(MontyMoleAI_DrawRock)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_MOLE_THROW_ROCK) { + return ApiStatus_BLOCK; + } // else fallthrough + case AI_STATE_MOLE_THROW_ROCK: + N(MontyMoleAI_ThrowRock)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_MOLE_UNUSED) { + return ApiStatus_BLOCK; + } // else fallthrough + case AI_STATE_MOLE_PRE_BURROW: + N(MontyMoleAI_PreBurrow)(script, aiSettings, territoryPtr); return ApiStatus_BLOCK; - } // else fallthrough - case AI_STATE_MOLE_THROW_ROCK: - N(MontyMoleAI_ThrowRock)(script, aiSettings, territory); - if (script->functionTemp[0] != AI_STATE_MOLE_UNUSED) { + case AI_STATE_MOLE_BURROW: + N(MontyMoleAI_Burrow)(script, aiSettings, territoryPtr); return ApiStatus_BLOCK; - } // else fallthrough - case AI_STATE_MOLE_PRE_BURROW: - N(MontyMoleAI_PreBurrow)(script, aiSettings, territory); - return ApiStatus_BLOCK; - case AI_STATE_MOLE_BURROW: - N(MontyMoleAI_Burrow)(script, aiSettings, territory); - return ApiStatus_BLOCK; } return ApiStatus_BLOCK; } diff --git a/src/world/common/enemy/ParatroopaAI.inc.c b/src/world/common/enemy/ParatroopaAI.inc.c new file mode 100644 index 0000000000..76bf91f77b --- /dev/null +++ b/src/world/common/enemy/ParatroopaAI.inc.c @@ -0,0 +1,185 @@ +#include "common.h" + +// prerequisites +#include "world/common/enemy/FlyingAI.inc.c" + +// ai-specific states +enum AiStateParatroopa { + AI_STATE_PARATROOPA_WINDUP = 12, + AI_STATE_PARATROOPA_DIVE = 13, + AI_STATE_PARATROOPA_OVERSHOOT = 14, + AI_STATE_PARATROOPA_RESET = 15 +}; + +void N(ParatroopaAI_Windup)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 yawTemp; + + npc->currentAnim.w = enemy->animList[9]; + npc->jumpVelocity = -5.0f; + npc->jumpScale = 0.15f; + npc->collisionHeight = enemy->varTable[8] / 2; + + dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->moveSpeed = 7.0f; + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + enemy->unk_07 = 1; + + ai_enemy_play_sound(npc, SOUND_UNUSED_2C1, 0); + yawTemp = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->duration = 12; + npc->yaw = yawTemp; + script->AI_TEMP_STATE = AI_STATE_PARATROOPA_DIVE; +} + +void N(ParatroopaAI_Dive)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->jumpVelocity += npc->jumpScale; + npc->pos.y += npc->jumpVelocity; + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + npc->duration--; + + if (npc->duration <= 0) { + enemy->unk_07 = 0; + npc->jumpScale = 0.3f; + npc->jumpVelocity = 0.0f; + npc->moveSpeed = 3.0f; + npc->currentAnim.w = enemy->animList[10]; + script->AI_TEMP_STATE = AI_STATE_PARATROOPA_OVERSHOOT; + } +} + +void N(ParatroopaAI_Overshoot)(Evt *script, NpcAISettings *arg1, EnemyDetectVolume *arg2) +{ + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 overshootAmtRaw = enemy->varTable[3]; + f32 posX, posY, posZ, hitDepth; + f32 endOvershootHeight; + f32 overshootAmt; + + npc->jumpVelocity += npc->jumpScale; + npc->pos.y += npc->jumpVelocity; + overshootAmt = overshootAmtRaw / 100.0; + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + hitDepth = 1000.0f; + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth)) { + endOvershootHeight = posY + overshootAmt; + } else { + endOvershootHeight = overshootAmt; + } + + if (!(npc->pos.y < endOvershootHeight)) { + npc->duration = 10; + npc->currentAnim.w = enemy->animList[11]; + npc->collisionHeight = enemy->varTable[8]; + script->AI_TEMP_STATE = AI_STATE_PARATROOPA_RESET; + } +} + +void N(ParatroopaAI_Reset)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } +} + +ApiStatus N(ParatroopaAI_Main)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 120.0f; + territory.detectFlags = 0; + + if (isInitialCall) { + N(FlyingAI_Init)(npc, enemy, script, aiSettings); + enemy->varTable[8] = npc->collisionHeight; + script->AI_TEMP_STATE = 0; + } + + npc->verticalRenderOffset = -3; + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiPaused != 0) { + return ApiStatus_BLOCK; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_WANDER_INIT: + N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_WANDER: + N(FlyingAI_Wander)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != 2) { + break; + } + // fallthrough + case AI_STATE_LOITER_INIT: + N(FlyingAI_LoiterInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_LOITER: + N(FlyingAI_Loiter)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_ALERT_INIT) { + break; + } + // fallthrough + case AI_STATE_ALERT_INIT: + N(FlyingAI_JumpInit)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_ALERT) { + break; + } + // fallthrough + case AI_STATE_ALERT: + N(FlyingAI_Jump)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PARATROOPA_WINDUP) { + break; + } + // fallthrough + case AI_STATE_PARATROOPA_WINDUP: + N(ParatroopaAI_Windup)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PARATROOPA_DIVE) { + break; + } + // fallthrough + case AI_STATE_PARATROOPA_DIVE: + N(ParatroopaAI_Dive)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PARATROOPA_OVERSHOOT) { + break; + } + // fallthrough + case AI_STATE_PARATROOPA_OVERSHOOT: + N(ParatroopaAI_Overshoot)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PARATROOPA_RESET) { + break; + } + // fallthrough + case AI_STATE_PARATROOPA_RESET: + N(ParatroopaAI_Reset)(script, aiSettings, territoryPtr); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/PatrolNoAttackAI.inc.c b/src/world/common/enemy/PatrolNoAttackAI.inc.c new file mode 100644 index 0000000000..7e797f701a --- /dev/null +++ b/src/world/common/enemy/PatrolNoAttackAI.inc.c @@ -0,0 +1,113 @@ +#include "common.h" +#include "npc.h" + +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +// prerequisites +#include "world/common/enemy/States_PatrolAI.inc.c" + +ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + f32 posX, posY, posZ, posW; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + #endif + + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_PATROL_INIT; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + + npc->flags &= ~NPC_FLAG_JUMPING; + if (!enemy->territory->patrol.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->functionTemp[1] = 0; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_PATROL_INIT: + N(PatrolAI_MoveInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_PATROL: + N(PatrolAI_Move)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + N(PatrolAI_LoiterInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_LOITER: + N(PatrolAI_Loiter)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOITER_POST: + N(PatrolAI_PostLoiter)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_ALERT_INIT: + N(PatrolAI_JumpInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_ALERT: + N(PatrolAI_Jump)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + N(PatrolAI_ChaseInit)(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_CHASE: + N(PatrolAI_Chase)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + N(PatrolAI_LosePlayer)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_PATROL_15: + N(PatrolNoAttackAI_15)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/PiranhaPlantAI.inc.c b/src/world/common/enemy/PiranhaPlantAI.inc.c new file mode 100644 index 0000000000..458b6bf685 --- /dev/null +++ b/src/world/common/enemy/PiranhaPlantAI.inc.c @@ -0,0 +1,12 @@ +// hitbox enemy +#include "world/common/enemy/WanderMeleeAI.inc.c" + +// visual enemy +#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" +#include "world/common/enemy/wip/PiranhaPlantAI_11.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_12.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_13.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_14.inc.c" +#include "world/common/enemy/wip/PiranhaPlantAI_Main.inc.c" diff --git a/src/world/common/enemy/ProjectileHitbox.inc.c b/src/world/common/enemy/ProjectileHitbox.inc.c new file mode 100644 index 0000000000..4509e1bded --- /dev/null +++ b/src/world/common/enemy/ProjectileHitbox.inc.c @@ -0,0 +1,377 @@ +#ifndef _AI_PROJECTILE_HITBOX_INC_ +#define _AI_PROJECTILE_HITBOX_INC_ 0 + +#include "common.h" +#include "npc.h" +#include "effects.h" + +s32 N(ProjectileHitbox_GetUsableProjectileID)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Camera* camera = &gCameras[gCurrentCamID]; + Npc* npc = get_npc_unsafe(enemy->npcID); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + f32 facingAngle; + f32 angleToPlayer; + f32 deltaAngle; + s32 i; + + if (ai_check_player_dist(enemy, 0, aiSettings->chaseRadius, aiSettings->chaseOffsetDist)) { + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + facingAngle = 90.0f; + } else { + facingAngle = 270.0f; + } + + angleToPlayer = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + deltaAngle = get_clamped_angle_diff(facingAngle, angleToPlayer); + if (fabsf(deltaAngle) > 75.0 || (2.0 * npc->collisionHeight <= fabsf(npc->pos.y - gPlayerStatusPtr->position.y))) { + return -1; + } + if (gPartnerActionStatus.actingPartner == PARTNER_BOW) { + return -1; + } + if (gPartnerActionStatus.actingPartner == PARTNER_SUSHIE) { + return -1; + } + + // choose the first idle projectile hitbox + for (i = 0; i < enemy->AI_PROJECTILE_AMMO_COUNT; i++) { + s32 projectileNpcID = enemy->npcID + i + 1; + Enemy* projectileEnemy = get_enemy(projectileNpcID); + + get_npc_unsafe(projectileNpcID); + + if (projectileEnemy->VAR_PROJECTILE_HITBOX_STATE == 0) { + return projectileNpcID; + } + } + } + return -1; +} + +void N(UnkNpcAIFunc48)(Evt* script, f32 arg1, f32 arg2, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (basic_ai_check_player_dist(territory, enemy, arg1, arg2, 1) == 0) { + s32 sp28; + + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp28); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = 20; + script->functionTemp[0] = 33; + } else { + s32 npcID = N(ProjectileHitbox_GetUsableProjectileID)(script); + + if (npcID != NPC_SELF && get_enemy(npcID)->varTable[0] == 0 && npc->turnAroundYawAdjustment == 0) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + npc->duration = enemy->varTable[1]; + script->functionTemp[0] = 30; + } + } +} + +void N(ProjectileHitbox_30)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 npcID; + + npc->duration--; + if (npc->duration <= 0) { + npcID = N(ProjectileHitbox_GetUsableProjectileID)(script); + if (npcID < 0) { + s32 emoteTemp; + + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + } else { + Enemy* hitboxEnemy; + + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_HIT]; + hitboxEnemy = get_enemy(npcID); + hitboxEnemy->varTable[4] = enemy->npcID; + hitboxEnemy->varTable[0] = 1; + } + npc->duration = enemy->varTable[2]; + script->functionTemp[0] = AI_STATE_PROJECTILE_HITBOX_33; + } +} + +void N(ProjectileHitbox_31)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + + get_npc_unsafe(enemy->npcID)->duration = enemy->varTable[2]; + script->functionTemp[0] = AI_STATE_PROJECTILE_HITBOX_33; +} + +void N(ProjectileHitbox_32)(Evt* script) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + Npc* npc2 = get_npc_unsafe(enemy2->npcID); + + npc->yaw = atan2(npc->pos.x, npc->pos.z, npc2->pos.x, npc2->pos.z); + if (enemy2->varTable[0] == 0) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = enemy->varTable[2]; + script->functionTemp[0] = AI_STATE_PROJECTILE_HITBOX_33; + } +} + +// TODO same as ParatroopaAI_Reset, but removes the extra args since it affects codegen...? +void N(ProjectileHitbox_33)(Evt* script) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[0] = AI_STATE_WANDER_INIT; + } +} + +ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + s32 phi_s6 = 0; + f32 x, y, z; + f32 hitDepth; + Npc* npc; + Npc* npc2; + NpcAISettings* aiSettings; + u32 vt0; + + if (get_enemy_safe(enemy->npcID) != NULL) { + if (enemy->varTable[0] != 5) { + aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); + npc = get_npc_unsafe(enemy->npcID); + + if (enemy->varTable[1] & 2) { + npc->verticalRenderOffset = npc->collisionHeight / 2; + } + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->functionTemp[0] = 0; + npc->duration = 0; + npc->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; + disable_npc_shadow(npc); + npc->flags &= ~NPC_FLAG_JUMPING; + enemy->varTable[0] = 0; + enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | + ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_200000 | + ENEMY_FLAGS_100000 | ENEMY_FLAGS_40; + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + } + + switch (script->functionTemp[0]) { + default: + return 0; + case 0: + npc->flags |= NPC_FLAG_2; + disable_npc_shadow(npc); + enemy->varTable[0] = 0; + script->functionTemp[0] = 1; + // fallthrough + case 1: + vt0 = enemy->varTable[0]; + + if (enemy->varTable[0] == 1) { + enemy->varTable[0] = 2; + npc2 = get_npc_unsafe(enemy->varTable[4]); + npc->pos.x = npc2->pos.x; + npc->pos.z = npc2->pos.z; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, enemy->varTable[3], 270.0f - npc2->renderYaw); + npc->pos.y = npc2->pos.y + enemy->varTable[2]; + enemy->unk_07 = vt0; + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + npc->rotation.x = 0.0f; + npc->rotation.y = 0.0f; + npc->rotation.z = 0.0f; + npc->moveSpeed = aiSettings->moveSpeed; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + npc->jumpVelocity = aiSettings->alertRadius; + npc->jumpScale = aiSettings->alertOffsetDist; + npc->moveToPos.y = npc2->pos.y; + npc->flags &= ~NPC_FLAG_2; + enable_npc_shadow(npc); + npc->flags |= NPC_FLAG_JUMPING; + enemy->flags &= ~(ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | + ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH); + npc->duration = 90; + script->functionTemp[0] = 2; + break; + } + return 0; + case 2: + break; + } + + x = npc->pos.x; + y = npc->pos.y + (npc->collisionHeight * 0.5); + z = npc->pos.z; + if (npc_test_move_taller_with_slipping( + 0, &x, &y, &z, npc->moveSpeed, npc->yaw, npc->collisionRadius, npc->collisionHeight) != 0) + { + phi_s6 = 1; + } + + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + hitDepth = 1000.0f; + if ((npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &hitDepth) != 0) && + (hitDepth < fabsf(npc->jumpVelocity)) && + (fabsf(y - npc->moveToPos.y) < 20.0)) + { + npc->pos.y = y; + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + phi_s6 = 10; + } + + if (hitDepth < 1.0) { + phi_s6 = 11; + } + npc->duration--; + if (npc->duration <= 0) { + phi_s6 = 20; + } + + if (phi_s6 == 0) { + if (enemy->varTable[1] & 1) { + npc->rotation.z += 40.0; + } + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + } else { + fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); + enemy->varTable[0] = 0; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + npc->jumpVelocity = 0.0f; + npc->flags |= NPC_FLAG_2; + disable_npc_shadow(npc); + npc->flags &= ~NPC_FLAG_JUMPING; + enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | + ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH; + script->functionTemp[0] = 0; + } + } + } + return ApiStatus_BLOCK; +} + +ApiStatus N(ProjectileAI_Reflect)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Camera* camera = &gCameras[gCurrentCamID]; + s32 phi_s4 = 0; + Npc* npc; + f32 x, y, z; + f32 hitDepth; + f32 temp_f20_2; + f32 temp_f20_3; + f32 temp_f22; + f32 yaw; + s32 cond; + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + if (get_enemy_safe(enemy->npcID) == NULL) { + evt_set_variable(script, EVT_VAR(0), 0); + return ApiStatus_DONE2; + } + if (enemy->varTable[0] == 5) { + evt_set_variable(script, EVT_VAR(0), 0); + return ApiStatus_DONE2; + } + if (get_enemy_safe(enemy->npcID) == NULL) { + evt_set_variable(script, EVT_VAR(0), 0); + return ApiStatus_DONE2; + } + + npc = get_npc_unsafe(enemy->npcID); + switch (script->functionTemp[0]) { + case 0: + fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0.0f, 0.0f); + yaw = clamp_angle(camera->currentYaw); + temp_f20_2 = clamp_angle(yaw + 180.0); + temp_f22 = clamp_angle(yaw + 90.0); + temp_f20_3 = clamp_angle(temp_f20_2 + 90.0); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, gPlayerStatusPtr->currentYaw)) < 180.0) { + npc->yaw = temp_f22; + } else { + npc->yaw = temp_f20_3; + } + npc->duration = 30; + npc->jumpVelocity = 10.0f; + npc->jumpScale = 0.9f; + npc->moveSpeed *= 1.2; + script->functionTemp[0] = 1; + // fallthrough + case 1: + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + if (npc_test_move_simple_with_slipping(0, &x, &y, &z, npc->moveSpeed, npc->yaw, npc->collisionRadius, + npc->collisionHeight) == 0) + { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + phi_s4 = 1; + } + + cond = FALSE; + if (npc->jumpVelocity < 0.0) { + x = npc->pos.x; + y = npc->pos.y + 13.0; + z = npc->pos.z; + hitDepth = fabsf(npc->jumpVelocity) + 16.0; + if ((npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &hitDepth) != 0) && + (hitDepth <= (fabsf(npc->jumpVelocity) + 13.0))) + { + cond = TRUE; + } + } + + if (!cond) { + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + } else { + phi_s4 = 10; + } + + npc->duration--; + if (npc->duration <= 0) { + phi_s4 = 11; + } + + if (phi_s4 != 0) { + fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); + enemy->varTable[0] = 0; + npc->pos.x = 0.0f; + npc->pos.z = 0.0f; + npc->pos.y = -1000.0f; + npc->flags |= NPC_FLAG_2; + disable_npc_shadow(npc); + npc->flags &= ~NPC_FLAG_JUMPING; + enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | + ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH; + script->functionTemp[0] = 0; + evt_set_variable(script, EVT_VAR(0), 1); + return ApiStatus_DONE2; + } + if (enemy->varTable[1] & 1) { + npc->rotation.z += 60.0; + } + break; + } + return ApiStatus_BLOCK; +} + +#endif diff --git a/src/world/common/enemy/RangedAttackAI.inc.c b/src/world/common/enemy/RangedAttackAI.inc.c new file mode 100644 index 0000000000..5fff574dbc --- /dev/null +++ b/src/world/common/enemy/RangedAttackAI.inc.c @@ -0,0 +1,109 @@ +// Used by: +// - Monty Mole +// - Spy Guy +// - Dry Bones +// - Hammer Bros + +#include "common.h" +#include "npc.h" +#include "effects.h" + +// prerequisites +#include "world/common/enemy/ProjectileHitbox.inc.c" + +ApiStatus N(RangedAttackAI_Main)(Evt* script, s32 isInitialCall) { + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + NpcAISettings* settings = (NpcAISettings*) evt_get_variable(script, *args++); + f32 dist; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 40.0f; + territory.detectFlags = 0; + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~NPC_FLAG_JUMPING; + + if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->functionTemp[1] = 0; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_WANDER_INIT: + basic_ai_wander_init(script, settings, territoryPtr); + // fallthrough + case AI_STATE_WANDER: + basic_ai_wander(script, settings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + basic_ai_loiter_init(script, settings, territoryPtr); + // fallthrough + case AI_STATE_LOITER: + basic_ai_loiter(script, settings, territoryPtr); + break; + case AI_STATE_ALERT_INIT: + basic_ai_found_player_jump_init(script, settings, territoryPtr); + // fallthrough + case AI_STATE_ALERT: + basic_ai_found_player_jump(script, settings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + dist = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + if (enemy->varTable[0] == 0 || enemy->varTable[0] < dist) { + N(UnkNpcAIFunc48)(script, settings->chaseRadius, settings->chaseOffsetDist, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_CHASE_INIT) { + break; + } + } + basic_ai_chase_init(script, settings, territoryPtr); + // fallthrough + case AI_STATE_CHASE: + basic_ai_chase(script, settings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + basic_ai_lose_player(script, settings, territoryPtr); + break; + case AI_STATE_PROJECTILE_HITBOX_30: + N(ProjectileHitbox_30(script)); + break; + case AI_STATE_PROJECTILE_HITBOX_31: + N(ProjectileHitbox_31(script)); + break; + case AI_STATE_PROJECTILE_HITBOX_32: + N(ProjectileHitbox_32(script)); + break; + case AI_STATE_PROJECTILE_HITBOX_33: + N(ProjectileHitbox_33(script)); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/SentinelAI.inc.c b/src/world/common/enemy/SentinelAI.inc.c new file mode 100644 index 0000000000..e81d1a6caf --- /dev/null +++ b/src/world/common/enemy/SentinelAI.inc.c @@ -0,0 +1,361 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" +#include "sprite.h" + +// required include args +#ifndef AI_SENTINEL_FIRST_NPC +#error AI_SENTINEL_FIRST_NPC must be defined for SentinelAI.inc.c +#define AI_SENTINEL_FIRST_NPC 0 +#endif +#ifndef AI_SENTINEL_LAST_NPC +#error AI_SENTINEL_LAST_NPC must be defined for SentinelAI.inc.c +#define AI_SENTINEL_LAST_NPC 0 +#endif + +// prerequisites +#include "world/common/enemy/FlyingAI.inc.c" + +enum AiStateSentinel { + AI_STATE_SENTINEL_WANDER_INIT = 0, + AI_STATE_SENTINEL_WANDER = 1, + AI_STATE_SENTINEL_LOITER_INIT = 2, + AI_STATE_SENTINEL_LOITER = 3, + AI_STATE_SENTINEL_CHASE_INIT = 12, + AI_STATE_SENTINEL_CHASE = 13, + AI_STATE_SENTINEL_DESCEND_INIT = 14, + AI_STATE_SENTINEL_DESCEND = 15, + AI_STATE_SENTINEL_LOSE_PLAYER_INIT = 16, + AI_STATE_SENTINEL_LOSE_PLAYER = 17, + AI_STATE_SENTINEL_POST_LOSE_PLAYER = 18, + AI_STATE_SENTINEL_GRAB_PLAYER = 20, + AI_STATE_SENTINEL_RETURN_HOME_INIT = 30, + AI_STATE_SENTINEL_RETURN_HOME = 31, + AI_STATE_SENTINEL_CAUGHT_PLAYER = 100 +}; + +#define SENTINEL_AI_FLAG_CHASING 0x100 // use to ensure only one sentinel can 'attack' at a time +#define SENTINEL_AI_FLAG_PLAYING_SOUND 0x1000 // use to force looping sound to stop + +#define SENTINEL_AI_DESCEND_RATE 1.8 + +void N(SentinelAI_ChaseInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 deltaAngle; + f32 angle; + + npc->duration--; + if (npc->duration <= 0) { + npc->flags &= ~NPC_FLAG_200000; + npc->duration = aiSettings->chaseUpdateInterval / 2 + rand_int(aiSettings->chaseUpdateInterval / 2 + 1); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + npc->moveSpeed = aiSettings->chaseSpeed; + angle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + deltaAngle = get_clamped_angle_diff(npc->yaw, angle); + if (aiSettings->chaseTurnRate < fabsf(deltaAngle)) { + angle = npc->yaw; + if (deltaAngle < 0.0f) { + angle += -aiSettings->chaseTurnRate; + } else { + angle += aiSettings->chaseTurnRate; + } + } + npc->yaw = clamp_angle(angle); + script->AI_TEMP_STATE = AI_STATE_SENTINEL_CHASE; + } +} + +void N(SentinelAI_Chase)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { + npc->duration = 0; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_DESCEND_INIT; + } else { + npc->duration--; + if (npc->duration <= 0) { + npc->flags |= NPC_FLAG_200000; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_CHASE_INIT; + } + } + } else { + script->AI_TEMP_STATE = AI_STATE_SENTINEL_LOSE_PLAYER_INIT; + } +} + +void N(SentinelAI_DescendInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 i; + + for (i = AI_SENTINEL_FIRST_NPC; i < AI_SENTINEL_LAST_NPC; i++) { + if (i != npc->npcID && (get_enemy(i)->varTable[0] & SENTINEL_AI_FLAG_CHASING)) { + return; + } + } + + enemy->varTable[0] |= SENTINEL_AI_FLAG_CHASING; + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.z = gPlayerStatusPtr->position.z; + if (!(enemy->varTable[0] & SENTINEL_AI_FLAG_PLAYING_SOUND)) { + enemy->varTable[0] |= SENTINEL_AI_FLAG_PLAYING_SOUND; + } + sfx_play_sound_at_position(SOUND_80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + npc->duration = 0; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_DESCEND; +} + +void N(SentinelAI_Descend)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, hitDepth; + s32 color; + + sfx_adjust_env_sound_pos(SOUND_80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + if (!basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { + enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; + npc->rotation.y = 0.0f; + npc->flags &= ~NPC_FLAG_200000; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_LOSE_PLAYER_INIT; + } else { + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.z = gPlayerStatusPtr->position.z + 2.0f; + npc->rotation.y += 25.0f; + if (npc->rotation.y > 360.0) { + npc->rotation.y -= 360.0; + } + color = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); + func_802DE894(npc->spriteInstanceID, 6, color, color, color, 255, 0); + + posX = gPlayerStatusPtr->position.x; + posY = gPlayerStatusPtr->position.y; + posZ = gPlayerStatusPtr->position.z; + hitDepth = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth); + if (fabsf(npc->pos.y - posY) > 24.0) { + npc->pos.y -= SENTINEL_AI_DESCEND_RATE; + } else { + npc->rotation.y = 0.0f; + npc->flags &= ~NPC_FLAG_200000; + if (gPartnerActionStatus.actingPartner != PARTNER_BOW) { + disable_player_input(); + partner_disable_input(); + npc->duration = 0; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_GRAB_PLAYER; + } else { + script->AI_TEMP_STATE = AI_STATE_SENTINEL_LOSE_PLAYER_INIT; + } + } + } +} + +void N(SentinelAI_LosePlayerInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; + func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); + if (enemy->varTable[0] & SENTINEL_AI_FLAG_PLAYING_SOUND) { + sfx_stop_sound(SOUND_80000011); + enemy->varTable[0] &= ~SENTINEL_AI_FLAG_PLAYING_SOUND; + } + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_HIT]; + npc->duration = 20; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_LOSE_PLAYER; +} + +void N(SentinelAI_LosePlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 idleHeight = (f32)enemy->varTable[3] / 100.0; + s32 emoteTemp; + + npc->pos.y += 2.5; + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &posW); + if (!(npc->pos.y < posY + idleHeight)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc->pos.y = posY + idleHeight; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &emoteTemp); + npc->duration = 10; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_POST_LOSE_PLAYER; + } +} + +void N(SentinelAI_PostLosePlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->AI_TEMP_STATE = AI_STATE_SENTINEL_RETURN_HOME_INIT; + } +} + +void N(SentinelAI_GrabPlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration++; + if (npc->duration >= 3) { + if (gPartnerActionStatus.actingPartner != PARTNER_BOW) { + npc->duration = 0; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_CAUGHT_PLAYER; + } else { + enable_player_input(); + partner_enable_input(); + script->AI_TEMP_STATE = AI_STATE_SENTINEL_LOSE_PLAYER_INIT; + } + } +} + +void N(SentinelAI_ReturnHomeInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; + npc->flags &= ~NPC_FLAG_200000; + npc->moveSpeed = 2.0 * aiSettings->moveSpeed; + enemy->varTable[2] = 0; + enemy->varTable[4] = npc->pos.y * 100.0; + script->functionTemp[1] = 30; +} + +void N(SentinelAI_ReturnHome)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX = npc->pos.x; + f32 posY = npc->pos.y; + f32 posZ = npc->pos.z; + f32 hitDepth = 1000.0f; + f32 idleHeight = (f32)enemy->varTable[3] / 100.0; + f32 temp_f24 = idleHeight + (f32)((f32)enemy->varTable[7] / 100.0); + f32 undulateAmplitude = (f32)enemy->varTable[1] / 100.0; + f32 undulateAmount = sin_deg(enemy->varTable[2]); + s32 emoteTemp; + + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth)) { + npc->pos.y = posY + idleHeight + (undulateAmount * undulateAmplitude); + } else { + npc->pos.y = temp_f24 + (undulateAmount * undulateAmplitude); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->alertOffsetDist * 0.5, 0)) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->moveToPos.y = npc->pos.y; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_CHASE_INIT; + return; + } + } + + script->functionTemp[1]--; + if (npc->turnAroundYawAdjustment == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + hitDepth = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + if (hitDepth <= (2.0f * npc->moveSpeed)) { + script->functionTemp[1] = (rand_int(1000) % 3) + 2; + script->AI_TEMP_STATE = AI_STATE_SENTINEL_LOITER_INIT; + } + } +} + +ApiStatus N(SentinelAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* aiSettings =(NpcAISettings*) evt_get_variable(script, *args); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 125.0f; + territory.detectFlags = 0; + + if (isInitialCall) { + script->AI_TEMP_STATE = AI_STATE_SENTINEL_WANDER_INIT; + N(FlyingAI_Init)(npc, enemy, script, aiSettings); + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_SENTINEL_WANDER_INIT: + N(FlyingAI_WanderInit)(script, aiSettings, territoryPtr); + func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); + // fallthrough + case AI_STATE_SENTINEL_WANDER: + N(FlyingAI_Wander)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE == AI_STATE_SENTINEL_CHASE_INIT) { + npc->duration = 6; + } + break; + case AI_STATE_SENTINEL_LOITER_INIT: + N(FlyingAI_LoiterInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_SENTINEL_LOITER: + N(FlyingAI_Loiter)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE == AI_STATE_SENTINEL_CHASE_INIT) { + npc->duration = 6; + } + break; + case AI_STATE_SENTINEL_CHASE_INIT: + N(SentinelAI_ChaseInit)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_SENTINEL_CHASE) { + break; + } + // fallthrough + case AI_STATE_SENTINEL_CHASE: + N(SentinelAI_Chase)(script, aiSettings, territoryPtr); + break; + case AI_STATE_SENTINEL_DESCEND_INIT: + N(SentinelAI_DescendInit)(script, aiSettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_SENTINEL_DESCEND) { + break; + } + // fallthrough + case AI_STATE_SENTINEL_DESCEND: + N(SentinelAI_Descend)(script, aiSettings, territoryPtr); + break; + case AI_STATE_SENTINEL_LOSE_PLAYER_INIT: + N(SentinelAI_LosePlayerInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_SENTINEL_LOSE_PLAYER: + N(SentinelAI_LosePlayer)(script, aiSettings, territoryPtr); + break; + case AI_STATE_SENTINEL_POST_LOSE_PLAYER: + N(SentinelAI_PostLosePlayer)(script, aiSettings, territoryPtr); + break; + case AI_STATE_SENTINEL_GRAB_PLAYER: + N(SentinelAI_GrabPlayer)(script, aiSettings, territoryPtr); + break; + case AI_STATE_SENTINEL_RETURN_HOME_INIT: + N(SentinelAI_ReturnHomeInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_SENTINEL_RETURN_HOME: + N(SentinelAI_ReturnHome)(script, aiSettings, territoryPtr); + break; + } + + if (script->AI_TEMP_STATE == AI_STATE_SENTINEL_CAUGHT_PLAYER) { + return ApiStatus_DONE2; // when player is caught, relinquish control to the AI evt script + } else { + return ApiStatus_BLOCK; + } +} diff --git a/src/world/common/enemy/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ShyGuyPatrolAI.inc.c new file mode 100644 index 0000000000..55690c3a84 --- /dev/null +++ b/src/world/common/enemy/ShyGuyPatrolAI.inc.c @@ -0,0 +1,166 @@ +#include "common.h" +#include "npc.h" + +#include "world/common/enemy/PatrolNoAttackAI.inc.c" + +void N(ShyGuyPatrolAI_14)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territoryPtr) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->moveSpeed *= 0.6; + npc->currentAnim.w = enemy->animList[12]; + npc->duration = 5; + script->functionTemp[0] = 0xF; +} + +void N(ShyGuyPatrolAI_15)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe((s32) enemy->npcID); + f32 yaw = npc->yaw; + + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + npc->duration--; + if (npc->duration == 0) { + npc->moveSpeed *= 0.6; + + npc->currentAnim.w = enemy->animList[11]; + npc->duration = 10; + script->functionTemp[0] = 16; + } +} + +void N(ShyGuyPatrolAI_16)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 yaw = npc->yaw; + + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + npc->duration--; + if (npc->duration == 0) { + npc->duration = 30; + script->functionTemp[0] = 17; + } +} + +void N(ShyGuyPatrolAI_17)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + npc->currentAnim.w = *enemy->animList; + script->functionTemp[0] = 0; + } +} + +ApiStatus N(ShyGuyPatrolAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + Bytecode* args = script->ptrReadPos; + NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args++); + f32 posX; + f32 posY; + f32 posZ; + f32 hitDepth; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + if (isInitialCall || enemy->aiFlags & 4) { + script->functionTemp[0] = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + + npc->flags &= ~NPC_FLAG_JUMPING; + if (!enemy->territory->patrol.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & 4) { + script->functionTemp[0] = 0x63; + script->functionTemp[1] = 0; + enemy->aiFlags &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0] = 0xC; + enemy->flags &= ~0x40000000; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + hitDepth = 100.0f; + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0]) { + case 0x0: + N(PatrolAI_MoveInit)(script, aiSettings, territoryPtr); + // fallthrough + case 0x1: + N(PatrolAI_Move)(script, aiSettings, territoryPtr); + break; + case 0x2: + N(PatrolAI_LoiterInit)(script, aiSettings, territoryPtr); + // fallthrough + case 0x3: + N(PatrolAI_Loiter)(script, aiSettings, territoryPtr); + break; + case 0x4: + N(PatrolAI_PostLoiter)(script, aiSettings, territoryPtr); + break; + case 0xA: + N(PatrolAI_JumpInit)(script, aiSettings, territoryPtr); + // fallthrough + case 0xB: + N(PatrolAI_Jump)(script, aiSettings, territoryPtr); + break; + case 0xC: + N(PatrolAI_ChaseInit)(script, aiSettings, territoryPtr); + // fallthrough + case 0xD: + N(PatrolAI_Chase)(script, aiSettings, territoryPtr); + break; + case 0xE: + N(ShyGuyPatrolAI_14)(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0xF) { + break; + } + case 0xF: + N(ShyGuyPatrolAI_15)(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0x10) { + break; + } + case 0x10: + N(ShyGuyPatrolAI_16)(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0x11) { + break; + } + case 0x11: + N(ShyGuyPatrolAI_17)(script, aiSettings, territoryPtr); + break; + case 0x63: + basic_ai_suspend(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ShyGuyWanderAI.inc.c new file mode 100644 index 0000000000..62ce37a1bb --- /dev/null +++ b/src/world/common/enemy/ShyGuyWanderAI.inc.c @@ -0,0 +1,169 @@ +#include "common.h" +#include "npc.h" + +void N(ShyGuyWanderAI_14)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territoryPtr) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->moveSpeed *= 0.6; + npc->currentAnim.w = enemy->animList[12]; + npc->duration = 5; + script->functionTemp[0] = 0xF; +} + +void N(ShyGuyWanderAI_15)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe((s32) enemy->npcID); + f32 yaw = npc->yaw; + + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + npc->duration--; + if (npc->duration == 0) { + npc->moveSpeed *= 0.6; + + npc->currentAnim.w = enemy->animList[11]; + npc->duration = 10; + script->functionTemp[0] = 16; + } +} + +void N(ShyGuyWanderAI_16)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 yaw = npc->yaw; + + if (ai_check_fwd_collisions(npc, npc->moveSpeed, &yaw, NULL, NULL, NULL) == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + npc->duration--; + if (npc->duration == 0) { + npc->duration = 30; + script->functionTemp[0] = 17; + } +} + +void N(ShyGuyWanderAI_17)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + npc->currentAnim.w = *enemy->animList; + script->functionTemp[0] = 0; + } +} + +ApiStatus N(ShyGuyWanderAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + Bytecode* args = script->ptrReadPos; + NpcAISettings* aiSettings = (NpcAISettings*) evt_get_variable(script, *args++); + f32 posX; + f32 posY; + f32 posZ; + f32 hitDepth; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + if (isInitialCall || enemy->aiFlags & 4) { + script->functionTemp[0] = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + + npc->flags &= ~NPC_FLAG_JUMPING; + if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & 4) { + script->functionTemp[0] = 0x63; + script->functionTemp[1] = 0; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0] = 0xC; + } + enemy->aiFlags &= ~4; + enemy->flags &= ~0x40000000; + + hitDepth = 100.0f; + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + if (npc_raycast_down_sides(npc->collisionChannel, &posX, &posY, &posZ, &hitDepth)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0]) { + case 0x0: + basic_ai_wander_init(script, aiSettings, territoryPtr); + // fallthrough + case 0x1: + basic_ai_wander(script, aiSettings, territoryPtr); + break; + case 0x2: + basic_ai_loiter_init(script, aiSettings, territoryPtr); + // fallthrough + case 0x3: + basic_ai_loiter(script, aiSettings, territoryPtr); + break; + case 0xA: + basic_ai_found_player_jump_init(script, aiSettings, territoryPtr); + // fallthrough + case 0xB: + basic_ai_found_player_jump(script, aiSettings, territoryPtr); + break; + case 0xC: + basic_ai_chase_init(script, aiSettings, territoryPtr); + // fallthrough + case 0xD: + basic_ai_chase(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0xE) { + break; + } + // fallthrough + case 0xE: + N(ShyGuyWanderAI_14)(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0xF) { + break; + } + // fallthrough + case 0xF: + N(ShyGuyWanderAI_15)(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0x10) { + break; + } + // fallthrough + case 0x10: + N(ShyGuyWanderAI_16)(script, aiSettings, territoryPtr); + if (script->functionTemp[0] != 0x11) { + break; + } + // fallthrough + case 0x11: + N(ShyGuyWanderAI_17)(script, aiSettings, territoryPtr); + break; + case 0x63: + basic_ai_suspend(script); + break; + } + + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/enemy/SpearGuyAI.inc.c b/src/world/common/enemy/SpearGuyAI.inc.c new file mode 100644 index 0000000000..ca34c3498f --- /dev/null +++ b/src/world/common/enemy/SpearGuyAI.inc.c @@ -0,0 +1,176 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" +#include "sprite/npc/jungle_guy.h" + +void N(SpearGuyAI_LoiterInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = 0; + set_npc_yaw(npc, 270.0f); + enemy->varTable[0] = 0; + script->AI_TEMP_STATE = AI_STATE_LOITER; +} + +void N(SpearGuyAI_Loiter)(Evt *script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 d100; + + if (enemy->varTable[0] == 0) { + if (rand_int(100) >= 50) { + enemy->varTable[0] = 3; + } else { + enemy->varTable[0] = 1; + } + set_npc_yaw(npc, 270.0f); + } + + switch (enemy->varTable[0]) { + case 1: + enemy->varTable[0] = 2; + enemy->varTable[1] = 0; + npc->currentAnim.w = NPC_ANIM_jungle_guy_Palette_00_Anim_F; + case 2: + enemy->varTable[1]++; + if (enemy->varTable[1] > 50) { + enemy->varTable[0] = 5; + } + break; + case 3: + enemy->varTable[0] = 4; + enemy->varTable[1] = 0; + npc->currentAnim.w = NPC_ANIM_jungle_guy_Palette_00_Anim_10; + case 4: + enemy->varTable[1]++; + if (enemy->varTable[1] == 25) { + npc->yaw = 90.0f; + } + if (enemy->varTable[1] > 60) { + enemy->varTable[0] = 5; + } + break; + case 5: + enemy->varTable[0] = 6; + enemy->varTable[1] = 0; + npc->currentAnim.w = NPC_ANIM_jungle_guy_Palette_00_Anim_3; + fx_sweat(0, npc->pos.x, npc->pos.y, npc->pos.z, npc->collisionHeight, 0, 10); + case 6: + enemy->varTable[1]++; + if (enemy->varTable[1] > 10) { + d100 = rand_int(100); + + if (d100 < 90) { + enemy->varTable[0] = 7; + } else if (d100 >= 95) { + enemy->varTable[0] = 3; + } else { + enemy->varTable[0] = 1; + } + } + break; + } + + if (enemy->varTable[0] == 7) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } +} + +// prerequisites +#include "world/common/enemy/WanderMeleeAI.inc.c" + +ApiStatus N(SpearGuyAI_Main)(Evt *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + + npc->flags &= ~NPC_FLAG_JUMPING; + if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->AI_TEMP_STATE_AFTER_SUSPEND = AI_STATE_WANDER_INIT; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + enemy->varTable[0] = 0; + } + + if ((script->AI_TEMP_STATE < AI_STATE_MELEE_HITBOX_INIT) && (enemy->varTable[0] == 0) && N(MeleeHitbox_CanSeePlayer)(script)) { + script->AI_TEMP_STATE = AI_STATE_MELEE_HITBOX_INIT; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_WANDER_INIT: + basic_ai_wander_init(script, npcAISettings, territoryPtr); + case AI_STATE_WANDER: + basic_ai_wander(script, npcAISettings, territoryPtr); + break; + + case AI_STATE_LOITER_INIT: + N(SpearGuyAI_LoiterInit)(script, npcAISettings, territoryPtr); + case AI_STATE_LOITER: + N(SpearGuyAI_Loiter)(script, npcAISettings, territoryPtr); + break; + + case AI_STATE_ALERT_INIT: + basic_ai_found_player_jump_init(script, npcAISettings, territoryPtr); + case AI_STATE_ALERT: + basic_ai_found_player_jump(script, npcAISettings, territoryPtr); + break; + + case AI_STATE_CHASE_INIT: + basic_ai_chase_init(script, npcAISettings, territoryPtr); + case AI_STATE_CHASE: + basic_ai_chase(script, npcAISettings, territoryPtr); + break; + + case AI_STATE_LOSE_PLAYER: + basic_ai_lose_player(script, npcAISettings, territoryPtr); + break; + + case AI_STATE_MELEE_HITBOX_INIT: + N(MeleeHitbox_30)(script); + case AI_STATE_MELEE_HITBOX_PRE: + N(MeleeHitbox_31)(script); + if (script->AI_TEMP_STATE != AI_STATE_MELEE_HITBOX_ACTIVE) { + break; + } + case AI_STATE_MELEE_HITBOX_ACTIVE: + N(MeleeHitbox_32)(script); + if (script->AI_TEMP_STATE != AI_STATE_MELEE_HITBOX_MISS) { + break; + } + case AI_STATE_MELEE_HITBOX_MISS: + N(MeleeHitbox_33)(script); + break; + + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkNpcAIMainFunc6.inc.c b/src/world/common/enemy/SpinyAI.inc.c similarity index 78% rename from src/world/common/UnkNpcAIMainFunc6.inc.c rename to src/world/common/enemy/SpinyAI.inc.c index b60f3861f7..02a148dd79 100644 --- a/src/world/common/UnkNpcAIMainFunc6.inc.c +++ b/src/world/common/enemy/SpinyAI.inc.c @@ -1,37 +1,54 @@ +// spiny AI + #include "common.h" #include "npc.h" #include "effects.h" -ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { +// prerequisites +#include "world/common/enemy/TackleAI.inc.c" + +ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else Enemy* enemy = script->owner1.enemy; + #endif Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); u32 x, y, z; f32 x2, y2, z2, w2; Npc* npc2; - territory.unk_00 = 0; + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; territory.pointX = enemy->territory->wander.detect.x; territory.pointZ = enemy->territory->wander.detect.z; territory.sizeX = enemy->territory->wander.detectSizeX; territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 65.0f; - territory.unk_1C = 0; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + #endif if (isInitialCall) { enemy->varTable[6] = npc->collisionHeight; - enemy->unk_B0 |= ENEMY_AI_FLAGS_8; + enemy->aiFlags |= ENEMY_AI_FLAGS_8; } if (isInitialCall || (enemy->varTable[10] == 100)) { - script->functionTemp[0] = 100; + script->AI_TEMP_STATE = 100; npc->duration = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~NPC_FLAG_JUMPING; enemy->flags |= ENEMY_FLAGS_200000; npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; @@ -42,33 +59,32 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { npc->pos.z = 0.0f; } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { npc->duration = 0; npc->collisionHeight = enemy->varTable[6]; - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; - if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + if (npc->flags & NPC_FLAG_JUMPING) { npc->currentAnim.w = 0x4A0018; npc->moveSpeed = 0.0f; npc->jumpVelocity = 0.0f; npc->jumpScale = 1.0f; - script->functionTemp[0] = 102; + script->AI_TEMP_STATE = 102; } else { s32 emoteTemp; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; script->functionTemp[1] = 0; - script->functionTemp[0] = 200; + script->AI_TEMP_STATE = 200; } } get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &x, &y, &z); - if (script->functionTemp[0] < 100 && x + 50 >= 421) { - script->functionTemp[0] = 110; + if (script->AI_TEMP_STATE < 100 && x + 50 >= 421) { + script->AI_TEMP_STATE = 110; } - switch (script->functionTemp[0]) { + switch (script->AI_TEMP_STATE) { case 0: - func_800495A0(script, aiSettings, territoryPtr); + basic_ai_wander_init(script, aiSettings, territoryPtr); npc->collisionHeight = enemy->varTable[6]; if (enemy->varTable[13] != 0) { if (npc->pos.y <= 0.0) { @@ -79,15 +95,15 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; } } - func_800496B8(script, aiSettings, territoryPtr); + basic_ai_wander(script, aiSettings, territoryPtr); break; case 1: - func_800496B8(script, aiSettings, territoryPtr); + basic_ai_wander(script, aiSettings, territoryPtr); break; case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + basic_ai_loiter_init(script, aiSettings, territoryPtr); case 3: - func_80049C04(script, aiSettings, territoryPtr); + basic_ai_loiter(script, aiSettings, territoryPtr); break; case 12: N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); @@ -119,7 +135,7 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->renderYaw = 0.0f; npc->currentAnim.w = 0x4A0018; - script->functionTemp[0] = 101; + script->AI_TEMP_STATE = 101; case 101: if (enemy->varTable[10] != 3) { break; @@ -129,8 +145,8 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { npc->moveSpeed = 2.5f; npc->jumpVelocity = 8.0f; npc->jumpScale = 0.8f; - npc->flags |= NPC_FLAG_NO_Y_MOVEMENT; - script->functionTemp[0] = 102; + npc->flags |= NPC_FLAG_JUMPING; + script->AI_TEMP_STATE = 102; case 102: if (npc->moveSpeed > 0.0) { x2 = npc->pos.x; @@ -173,12 +189,12 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } npc->flags |= NPC_FLAG_40000; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->flags &= ~NPC_FLAG_JUMPING; npc->jumpVelocity = 0.0f; npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); npc->currentAnim.w = 0x4A001A; npc->duration = 3; - script->functionTemp[0] = 103; + script->AI_TEMP_STATE = 103; break; } } @@ -190,7 +206,7 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { if (npc->duration <= 0) { npc->flags &= ~NPC_FLAG_40000; npc->currentAnim.w = 0x4A0001; - script->functionTemp[0] = 0; + script->AI_TEMP_STATE = 0; } break; case 110: @@ -200,17 +216,18 @@ ApiStatus N(UnkNpcAIMainFunc6)(Evt* script, s32 isInitialCall) { npc->pos.y = -1000.0f; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_2; npc->flags &= ~NPC_FLAG_GRAVITY; - script->functionTemp[0] = 111; + script->AI_TEMP_STATE = 111; case 111: npc->duration--; if (npc->duration <= 0) { enemy->varTable[10] = 0; - script->functionTemp[0] = 100; + script->AI_TEMP_STATE = 100; } break; case 200: - func_8004A73C(script); + basic_ai_suspend(script); break; } return ApiStatus_BLOCK; } + diff --git a/src/world/common/enemy/States_PatrolAI.inc.c b/src/world/common/enemy/States_PatrolAI.inc.c new file mode 100644 index 0000000000..c590ce6617 --- /dev/null +++ b/src/world/common/enemy/States_PatrolAI.inc.c @@ -0,0 +1,265 @@ +#ifndef _AI_PATROL_INC_ +#define _AI_PATROL_INC_ 0 + +#include "common.h" +#include "npc.h" +#include "effects.h" + +// selects the next patrol point +void N(PatrolAI_MoveInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 ret; + f32 max; + f32 posX; + f32 posZ; + s32 i; + s32 j; + s32 x, z; + + script->functionTemp[1] = 0; + max = 32767.0f; + posX = npc->pos.x; + posZ = npc->pos.z; + script->AI_PATROL_GOAL_INDEX = 0; + + for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { + //TODO strange match -- index and array are backwards! + x = i[enemy->territory->patrol.points].x; + z = i[enemy->territory->patrol.points].z; + ret = dist2D(posX, posZ, x, z); + if (ret < max) { + max = ret; + script->AI_PATROL_GOAL_INDEX = j; + } + } + + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; + if (enemy->territory->patrol.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; + } + + script->AI_TEMP_STATE = AI_STATE_PATROL; +} + +void N(PatrolAI_Move)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 x, z; + s32 emoteTemp; + + if (aiSettings->playerSearchInterval >= 0) { + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + if (enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; + } else { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + return; + } + } + script->functionTemp[1]--; + } + + if (npc->turnAroundYawAdjustment == 0) { + if (npc->moveSpeed < 4.0) { + func_8003D660(npc, 0); + } else { + func_8003D660(npc, 1); + } + //TODO strange match -- index and array are backwards! + x = script->AI_PATROL_GOAL_INDEX[enemy->territory->patrol.points].x; + z = script->AI_PATROL_GOAL_INDEX[enemy->territory->patrol.points].z; + npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { + script->AI_TEMP_STATE = AI_STATE_LOITER_INIT; + script->functionTemp[1] = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_AI_2C <= 0) || (aiSettings->moveTime <= 0) || + (aiSettings->waitTime <= 0) || (script->functionTemp[1] == 0)) { + script->AI_TEMP_STATE = AI_STATE_LOITER_POST; + } + if (rand_int(10000) % 100 < aiSettings->moveTime) { + script->AI_TEMP_STATE = AI_STATE_LOITER_POST; + } + } + } +} + +// identical to basic_ai_loiter_init +void N(PatrolAI_LoiterInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + script->AI_TEMP_STATE = AI_STATE_LOITER; +} + + +void N(PatrolAI_Loiter)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + if ((aiSettings->playerSearchInterval >= 0) && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &emoteTemp); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + if (!(enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER)) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } else { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; + } + return; + } + + // look around randomly + if (npc->turnAroundYawAdjustment == 0) { + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[1]--; + if (script->functionTemp[1] != 0) { + if (!(enemy->npcSettings->unk_2A & AI_ACTION_LOOK_AROUND_DURING_LOITER)) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + } + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + } else { + script->AI_TEMP_STATE = AI_STATE_LOITER_POST; + } + } + } +} + +void N(PatrolAI_PostLoiter)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + script->functionTemp[2]++; + if (script->functionTemp[2] >= enemy->territory->patrol.numPoints) { + script->functionTemp[2] = 0; + } + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; + if (enemy->territory->patrol.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; + } + script->AI_TEMP_STATE = AI_STATE_PATROL; +} + +void N(PatrolAI_JumpInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_JUMP]; + npc->jumpVelocity = 10.0f; + npc->jumpScale = 2.0f; + npc->moveToPos.y = npc->pos.y; + npc->flags |= NPC_FLAG_JUMPING; + script->functionTemp[0] = AI_STATE_ALERT; +} + +void N(PatrolAI_Jump)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + + if (!(npc->pos.y > npc->moveToPos.y)) { + npc->pos.y = npc->moveToPos.y; + npc->jumpVelocity = 0.0f; + npc->flags &= ~NPC_FLAG_JUMPING; + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } +} + +void N(PatrolAI_ChaseInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 angle; + f32 angleDiff; + + npc->duration = (aiSettings->chaseUpdateInterval / 2) + rand_int(aiSettings->chaseUpdateInterval / 2 + 1); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_CHASE]; + npc->moveSpeed = aiSettings->chaseSpeed; + + angle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + angleDiff = get_clamped_angle_diff(npc->yaw, angle); + + if (aiSettings->chaseTurnRate < fabsf(angleDiff)) { + angle = npc->yaw; + + if (angleDiff < 0.0f) { + angle += -aiSettings->chaseTurnRate; + } else { + angle += aiSettings->chaseTurnRate; + } + } + + npc->yaw = clamp_angle(angle); + script->functionTemp[0] = 13; +} + +ApiStatus N(PatrolAI_Chase)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + if (!basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = 25; + script->AI_TEMP_STATE = AI_STATE_LOSE_PLAYER; + } else { + func_8003D660(npc, 1); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->duration > 0) { + npc->duration--; + } else { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + } +} + +void N(PatrolAI_LosePlayer)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + if (enemy->aiFlags & ENEMY_AI_FLAGS_80) { + script->AI_TEMP_STATE = AI_STATE_PATROL_15; + } else { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } + } +} + +void N(PatrolNoAttackAI_15)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 i; + + // get next patrol point + for (i = script->AI_PATROL_GOAL_INDEX; i < enemy->territory->patrol.numPoints; i++) { + if (i[enemy->territory->patrol.points].y <= npc->pos.y) { + script->AI_PATROL_GOAL_INDEX = i; + break; + } + } + + npc->moveSpeed = aiSettings->moveSpeed; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; + script->functionTemp[1] = 0; + script->AI_TEMP_STATE = AI_STATE_PATROL; +} + +#endif diff --git a/src/world/common/enemy/States_TackleAI.inc.c b/src/world/common/enemy/States_TackleAI.inc.c new file mode 100644 index 0000000000..1564d53a73 --- /dev/null +++ b/src/world/common/enemy/States_TackleAI.inc.c @@ -0,0 +1,93 @@ +#ifndef _AI_TACKLE_STATES_INC_ +#define _AI_TACKLE_STATES_INC_ 0 + +#include "common.h" +#include "npc.h" + +// used with KoopaPatrolAI, TackleAI, SpinyAI +// all functions only used here + +void N(set_script_owner_npc_anim)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + npc->duration = enemy->varTable[2]; + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->AI_TEMP_STATE = 13; +} + + +ApiStatus N(UnkDistFunc)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + if (npc->turnAroundYawAdjustment == 0) { + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_HIT]; + npc->moveSpeed = aiSettings->chaseSpeed; + if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { + npc->collisionHeight = enemy->varTable[6] / 2; + } + npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; + if (npc->duration < enemy->varTable[3]) { + npc->duration = enemy->varTable[3]; + } + enemy->varTable[4] = npc->duration; + script->functionTemp[0] = 14; + } + } +} + +void N(UnkNpcAIFunc12)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp; + f32 f1; + f32 f2; + f32 f3; + + if (npc->duration == enemy->varTable[4] - 1) { + enemy->unk_10.x = npc->pos.x; + enemy->unk_10.y = npc->pos.y; + enemy->unk_10.z = npc->pos.z; + enemy->unk_07 = 1; + } + + f1 = npc->pos.x; + f2 = npc->pos.y; + f3 = npc->pos.z; + + temp = npc_test_move_simple_with_slipping(npc->collisionChannel, &f1, &f2, &f3, npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius); + if (temp == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + + if ((npc->duration <= 0) || (--npc->duration <= 0) || (temp != 0)) { + enemy->unk_07 = 0; + npc->currentAnim.w = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0] = 15; + } +} + +void N(set_script_owner_npc_col_height)(Evt* script, NpcAISettings* aiSettings, + EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration++; + if (npc->duration == 3) { + npc->collisionHeight = enemy->varTable[6]; + } + + if (npc->duration < enemy->varTable[5]) { + return; + } + + npc->collisionHeight = enemy->varTable[6]; + script->functionTemp[0] = 0; +} + +#endif diff --git a/src/world/common/enemy/StationaryAI.inc.c b/src/world/common/enemy/StationaryAI.inc.c new file mode 100644 index 0000000000..7e1cefc052 --- /dev/null +++ b/src/world/common/enemy/StationaryAI.inc.c @@ -0,0 +1,276 @@ +// Used in: +// - kmr_02 Toad +// - kmr_07 GoombaBros +// - kmr_11 GoombaBros/King +// - sbk_30 (unused) +// - trd_01 Bombomb <-- only real use case! +// - nok_01 (unused) +// - omo_02 (unused) + +typedef struct StationaryAISettings { + /* 0x00 */ f32 unk_00; + /* 0x04 */ s32 unk_04; + /* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames) + /* 0x0C */ f32 chaseSpeed; + /* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing + /* 0x14 */ s32 chaseUpdateInterval; // how often to re-run chase init and re-acquire player position (frames) + /* 0x18 */ f32 chaseRadius; + /* 0x1C */ f32 chaseOffsetDist; // offset along npc->yaw of the test point for alert volume overlap, creates directionality to enemy 'sight' + /* 0x20 */ s32 unk_20; +} StationaryAISettings; // size = 0x24 + +// custom states for this AI +enum AiStateStationary { + AI_STATE_STATIONARY_IDLE_INIT = 0, + AI_STATE_STATIONARY_IDLE = 1, + AI_STATE_STATIONARY_RETURN_HOME_INIT = 15, + AI_STATE_STATIONARY_RETURN_HOME = 16 +}; + +#include "common.h" +#include "npc.h" +#include "effects.h" + +void N(StationaryAI_IdleInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE; + + if (enemy->flags & ENEMY_FLAGS_100000) { + npc->yaw = enemy->varTable[0]; + } + + if (enemy->territory->wander.moveSpeedOverride <= 0) { + npc->moveSpeed = aiSettings->chaseSpeed; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } +} + +void N(StationaryAI_Idle)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + if (aiSettings->playerSearchInterval >= 0 && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + + if (!(enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER)) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } else { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; + } + } +} + +void N(StationaryAI_AlertInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->jumpVelocity = 10.0f; + npc->jumpScale = 2.0f; + npc->moveToPos.y = npc->pos.y; + npc->flags |= NPC_FLAG_JUMPING; + script->AI_TEMP_STATE = AI_STATE_ALERT; +} + +void N(StationaryAI_Alert)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + + if (!(npc->pos.y > npc->moveToPos.y)) { + npc->pos.y = npc->moveToPos.y; + npc->jumpVelocity = 0.0f; + npc->flags &= ~NPC_FLAG_JUMPING; + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } +} + +void N(StationaryAI_ChaseInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 tempAngle; + f32 angleDiff; + + npc->duration = (aiSettings->chaseUpdateInterval / 2) + rand_int(aiSettings->chaseUpdateInterval / 2 + 1); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_CHASE]; + npc->moveSpeed = aiSettings->chaseSpeed; + + tempAngle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + angleDiff = get_clamped_angle_diff(npc->yaw, tempAngle); + + if (aiSettings->chaseTurnRate < fabsf(angleDiff)) { + tempAngle = npc->yaw; + + if (angleDiff < 0.0f) { + tempAngle += -aiSettings->chaseTurnRate; + } else { + tempAngle += aiSettings->chaseTurnRate; + } + } + + npc->yaw = clamp_angle(tempAngle); + script->AI_TEMP_STATE = AI_STATE_CHASE; +} + +void N(StationaryAI_Chase)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* arg2) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + if (!basic_ai_check_player_dist(arg2, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = 25; + script->AI_TEMP_STATE = AI_STATE_LOSE_PLAYER; + } else { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + func_8003D660(npc, 1); + npc->duration--; + if (npc->duration == 0) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + } +} + +void N(StationaryAI_LosePlayer)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + script->AI_TEMP_STATE = AI_STATE_STATIONARY_RETURN_HOME_INIT; + } +} + +void N(StationaryAI_ReturnHomeInit)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_WALK]; + if (enemy->territory->wander.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->chaseSpeed * 0.3; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } + script->functionTemp[1] = 0; + script->AI_TEMP_STATE = AI_STATE_STATIONARY_RETURN_HOME; +} + +void N(StationaryAI_ReturnHome)(Evt* script, StationaryAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + if (aiSettings->playerSearchInterval >= 0) { + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = aiSettings->playerSearchInterval; + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, (f32) npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + if (enemy->npcSettings->unk_2A & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; + } else { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + return; + } + } + script->functionTemp[1]--; + } + + if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) < npc->moveSpeed) { + npc->pos.x = enemy->territory->wander.point.x; + npc->pos.z = enemy->territory->wander.point.z; + npc->yaw = enemy->territory->wander.wanderSizeX; + script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE_INIT; + } + + if (npc->turnAroundYawAdjustment == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} + +ApiStatus N(StationaryAI_Main)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + StationaryAISettings* aiSettings = (StationaryAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE_INIT; + npc->duration = 0; + enemy->varTable[0] = npc->yaw; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~NPC_FLAG_JUMPING; + + if (!(enemy->territory->wander.isFlying)) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->functionTemp[1] = 15; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_STATIONARY_IDLE_INIT: + N(StationaryAI_IdleInit)(script, aiSettings, territoryPtr); + case AI_STATE_STATIONARY_IDLE: + N(StationaryAI_Idle)(script, aiSettings, territoryPtr); + break; + + case AI_STATE_ALERT_INIT: + N(StationaryAI_AlertInit)(script, aiSettings, territoryPtr); + case AI_STATE_ALERT: + N(StationaryAI_Alert)(script, aiSettings, territoryPtr); + break; + + case AI_STATE_CHASE_INIT: + N(StationaryAI_ChaseInit)(script, aiSettings, territoryPtr); + case AI_STATE_CHASE: + N(StationaryAI_Chase)(script, aiSettings, territoryPtr); + break; + + case AI_STATE_LOSE_PLAYER: + N(StationaryAI_LosePlayer)(script, aiSettings, territoryPtr); + break; + + case AI_STATE_STATIONARY_RETURN_HOME_INIT: + N(StationaryAI_ReturnHomeInit)(script, aiSettings, territoryPtr); + case AI_STATE_STATIONARY_RETURN_HOME: + N(StationaryAI_ReturnHome)(script, aiSettings, territoryPtr); + break; + + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/StoneChompAI.inc.c b/src/world/common/enemy/StoneChompAI.inc.c new file mode 100644 index 0000000000..55013020b6 --- /dev/null +++ b/src/world/common/enemy/StoneChompAI.inc.c @@ -0,0 +1,74 @@ +#include "world/common/enemy/HoppingAI.inc.c" + +void N(StoneChompAI_HopInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + basic_ai_wander_init(script, aiSettings, territory); + npc->jumpVelocity = rand_int(5) + 8.0; + npc->jumpScale = 1.5f; +} + +void N(StoneChompAI_ChaseInit)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { + Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); + + basic_ai_chase_init(script, aiSettings, territory); + npc->jumpVelocity = rand_int(5) + 5.0; + npc->jumpScale = 1.5f; +} + +ApiStatus N(StoneChompAI_Main)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; + + if (isInitialCall) { + npc->duration = 0; + npc->flags &= ~NPC_FLAG_JUMPING; + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + script->functionTemp[1] = 0; + script->AI_TEMP_STATE = AI_STATE_HOP_INIT; + if (enemy->flags & ENEMY_FLAGS_40000000) { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_HOP_INIT: + N(StoneChompAI_HopInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_HOP: + N(HoppingAI_Hop)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + N(HoppingAI_LoiterInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_LOITER: + N(HoppingAI_Loiter)(script, aiSettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + N(StoneChompAI_ChaseInit)(script, aiSettings, territoryPtr); + // fallthrough + case AI_STATE_CHASE: + N(HoppingAI_Chase)(script, aiSettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + N(HoppingAI_LosePlayer)(script, aiSettings, territoryPtr); + break; + } + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/DeadUnkNpcAIMainFunc5.inc.c b/src/world/common/enemy/TackleAI.inc.c similarity index 74% rename from src/world/common/DeadUnkNpcAIMainFunc5.inc.c rename to src/world/common/enemy/TackleAI.inc.c index efa675df35..6c79141ee4 100644 --- a/src/world/common/DeadUnkNpcAIMainFunc5.inc.c +++ b/src/world/common/enemy/TackleAI.inc.c @@ -1,46 +1,56 @@ -#include "dead.h" +// TackleAI +// used by Koopas, Koopatrols, Spinys, Buzzy Beetles + #include "common.h" #include "npc.h" #include "effects.h" -#include "dead_structs.h" #include "sprite/npc/bony_beetle.h" -ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*) script->owner1.enemy; +// prerequisites +#include "world/common/enemy/States_TackleAI.inc.c" + +ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - EnemyTerritoryThing territory; - EnemyTerritoryThing* territoryPtr = &territory; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); - territory.unk_00 = 0; + territory.skipPlayerDetectChance = 0; territory.shape = enemy->territory->wander.detectShape; territory.pointX = enemy->territory->wander.detect.x; territory.pointZ = enemy->territory->wander.detect.z; territory.sizeX = enemy->territory->wander.detectSizeX; territory.sizeZ = enemy->territory->wander.detectSizeZ; - territory.unk_18 = 100.0f; - territory.unk_1C = 0; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; + #ifdef _DEAD_H_ enemy->unk_108.x = npc->pos.x; enemy->unk_108.y = npc->pos.y; enemy->unk_108.z = npc->pos.z; enemy->unk_114 = 0.01f; enemy->unk_118 = 0.01f; + #endif if (isInitialCall) { enemy->varTable[6] = npc->collisionHeight; enemy->varTable[8] = 0; enemy->unk_B5 = 0; - enemy->unk_B0 |= ENEMY_AI_FLAGS_8; + enemy->aiFlags |= ENEMY_AI_FLAGS_8; } - if (isInitialCall || (enemy->unk_B0 & ENEMY_AI_FLAGS_4)) { - script->functionTemp[0] = 0; + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = 0; npc->duration = 0; enemy->unk_07 = 0; - npc->currentAnim.w = enemy->animList[0]; - npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~NPC_FLAG_JUMPING; npc->collisionHeight = enemy->varTable[6]; enemy->varTable[9] = 0; @@ -52,15 +62,15 @@ ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->unk_B0 & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { s32 emoteTemp; - script->functionTemp[0] = 99; + script->AI_TEMP_STATE = 99; script->functionTemp[1] = 0; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); - enemy->unk_B0 &= ~ENEMY_AI_FLAGS_4; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { - script->functionTemp[0] = 12; + script->AI_TEMP_STATE = 12; enemy->flags &= ~ENEMY_FLAGS_40000000; } } @@ -78,15 +88,15 @@ ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { } } - switch (script->functionTemp[0]) { + switch (script->AI_TEMP_STATE) { case 0: - func_800495A0(script, aiSettings, territoryPtr); + basic_ai_wander_init(script, aiSettings, territoryPtr); npc->collisionHeight = enemy->varTable[6]; case 1: - func_800496B8(script, aiSettings, territoryPtr); + basic_ai_wander(script, aiSettings, territoryPtr); break; case 2: - base_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + basic_ai_loiter_init(script, aiSettings, territoryPtr); if (enemy->varTable[7] == 6) { if (rand_int(100) < 33) { if (enemy->varTable[8] != 0) { @@ -103,7 +113,7 @@ ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { } } case 3: - func_80049C04(script, aiSettings, territoryPtr); + basic_ai_loiter(script, aiSettings, territoryPtr); break; case 12: N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); @@ -117,7 +127,7 @@ ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { N(set_script_owner_npc_col_height)(script, aiSettings, territoryPtr); break; case 99: - func_8004A73C(script); + basic_ai_suspend(script); break; } @@ -144,3 +154,4 @@ ApiStatus N(DeadUnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } + diff --git a/src/world/common/enemy/UnkFloAI.inc.c b/src/world/common/enemy/UnkFloAI.inc.c new file mode 100644 index 0000000000..8fa486ec56 --- /dev/null +++ b/src/world/common/enemy/UnkFloAI.inc.c @@ -0,0 +1,238 @@ +#include "common.h" +#include "npc.h" +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +void N(UnkFloAI_ChaseInit)(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + f32 deltaYaw; + f32 yawFwd; + f32 distFwd; + f32 distCW; + f32 distCCW; + f32 distToPlayer; + s32 detectedPlayer; + + f32 posXFwd; + f32 posYFwd; + f32 posZFwd; + f32 posXCW; + f32 posYCW; + f32 posZCW; + f32 posXCCW; + f32 posYCCW; + f32 posZCCW; + + npc->duration = npcAISettings->chaseUpdateInterval / 2 + rand_int(npcAISettings->chaseUpdateInterval / 2 + 1); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_CHASE]; + npc->moveSpeed = npcAISettings->chaseSpeed; + detectedPlayer = FALSE; + + yawFwd = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.z) + 180.0f); + deltaYaw = get_clamped_angle_diff(npc->yaw, yawFwd); + if (npcAISettings->chaseTurnRate < fabsf(deltaYaw)) { + yawFwd = npc->yaw; + if (deltaYaw < 0.0f) { + yawFwd += -npcAISettings->chaseTurnRate; + } else { + yawFwd += npcAISettings->chaseTurnRate; + } + } + + npc->yaw = clamp_angle(yawFwd); + + posXFwd = npc->pos.x; + posYFwd = npc->pos.y; + posZFwd = npc->pos.z; + + yawFwd = clamp_angle(atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) + 180.0f); + distFwd = 0.0f; + distCW = 0.0f; + distCCW = 0.0f; + + if (npc_test_move_simple_without_slipping(npc->collisionChannel, + &posXFwd, &posYFwd, &posZFwd, npc->moveSpeed * 4.5, + yawFwd, npc->collisionHeight, npc->collisionRadius)) { + distFwd = dist2D(npc->pos.x, npc->pos.z, posXFwd, posZFwd); + + // check 'whisker' 35 degrees CW + posXCW = npc->pos.x; + posYCW = npc->pos.y; + posZCW = npc->pos.z; + if (npc_test_move_simple_without_slipping(npc->collisionChannel, + &posXCW, &posYCW, &posZCW, npc->moveSpeed * 4.5, + clamp_angle(yawFwd + 35.0f), npc->collisionHeight, npc->collisionRadius)) { + distCW = dist2D(npc->pos.x, npc->pos.z, posXCW, posZCW); + } + + // check 'whisker' 35 degrees CCW + posXCCW = npc->pos.x; + posYCCW = npc->pos.y; + posZCCW = npc->pos.z; + if (npc_test_move_simple_without_slipping(npc->collisionChannel, + &posXCCW, &posYCCW, &posZCCW, npc->moveSpeed * 4.5, + clamp_angle(yawFwd - 35.0f), npc->collisionHeight, npc->collisionRadius)) { + distCCW = dist2D(npc->pos.x, npc->pos.z, posXCCW, posZCCW); + } + + // unused + distToPlayer = dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + + if ((distFwd < npc->moveSpeed * 1.5) && (distCW < npc->moveSpeed * 1.5) && (distCCW < npc->moveSpeed * 1.5) && + (basic_ai_check_player_dist(territory, enemy, npcAISettings->alertRadius, npcAISettings->alertOffsetDist, 0))) { + detectedPlayer = TRUE; + } + + if (!detectedPlayer) { + if ((distCW < distFwd) && (distCCW < distCW)) { + yawFwd = atan2(npc->pos.x, npc->pos.z, posXFwd, posZFwd); + } else if ((distCW < distFwd) && (distCW < distCCW)) { + yawFwd = atan2(npc->pos.x, npc->pos.z, posXFwd, posZFwd); + } else if ((distFwd < distCW) && (distCCW < distFwd)) { + yawFwd = atan2(npc->pos.x, npc->pos.z, posXCW, posZCW); + } else if ((distCCW < distCW) && (distFwd < distCCW)) { + yawFwd = atan2(npc->pos.x, npc->pos.z, posXCW, posZCW); + } else if ((distFwd < distCCW) && (distCW < distFwd)) { + yawFwd = atan2(npc->pos.x, npc->pos.z, posXCCW, posZCCW); + } else if ((distCW < distCCW) && (distFwd < distCW)) { + yawFwd = atan2(npc->pos.x, npc->pos.z, posXCCW, posZCCW); + } + + deltaYaw = get_clamped_angle_diff(npc->yaw, yawFwd); + if (npcAISettings->chaseTurnRate < fabsf(deltaYaw)) { + yawFwd = npc->yaw; + if (deltaYaw < 0.0f) { + yawFwd += -npcAISettings->chaseTurnRate; + } else { + yawFwd += npcAISettings->chaseTurnRate; + } + } + npc->yaw = clamp_angle(yawFwd); + } + } + if (detectedPlayer) { + npc->duration = 10; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; + } + script->AI_TEMP_STATE = AI_STATE_CHASE; +} + +void N(UnkFloAI_Chase)(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 emoteTemp; + + if (!basic_ai_check_player_dist(territory, enemy, npcAISettings->chaseRadius, npcAISettings->chaseOffsetDist, 1)) { + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->duration = 25; + script->AI_TEMP_STATE = AI_STATE_LOSE_PLAYER; + } else { + if (npc->currentAnim.w != enemy->animList[ENEMY_ANIM_MELEE_PRE]) { + if (npc->moveSpeed < 4.0) { + func_8003D660(npc, 0); + } else { + func_8003D660(npc, 1); + } + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } + if (npc->duration > 0) { + npc->duration--; + return; + } + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } +} + +void N(UnkFloAI_LosePlayer)(Evt* script, NpcAISettings* npcAISettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + } +} + +ApiStatus N(UnkFloAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 100.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.01f; + enemy->unk_118 = 0.01f; + #endif + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->functionTemp[0] = AI_STATE_WANDER_INIT; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->functionTemp[0] = AI_STATE_SUSPEND; + script->functionTemp[1] = AI_STATE_WANDER_INIT; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + } + + switch (script->functionTemp[0]) { + case AI_STATE_WANDER_INIT: + basic_ai_wander_init(script, npcAISettings, territoryPtr); + case AI_STATE_WANDER: + basic_ai_wander(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + basic_ai_loiter_init(script, npcAISettings, territoryPtr); + case AI_STATE_LOITER: + basic_ai_loiter(script, npcAISettings, territoryPtr); + break; + case AI_STATE_ALERT_INIT: + basic_ai_found_player_jump_init(script, npcAISettings, territoryPtr); + case AI_STATE_ALERT: + basic_ai_found_player_jump(script, npcAISettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + N(UnkFloAI_ChaseInit)(script, npcAISettings, territoryPtr); + case AI_STATE_CHASE: + N(UnkFloAI_Chase)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + N(UnkFloAI_LosePlayer)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/enemy/WanderMeleeAI.inc.c b/src/world/common/enemy/WanderMeleeAI.inc.c new file mode 100644 index 0000000000..66b69e761d --- /dev/null +++ b/src/world/common/enemy/WanderMeleeAI.inc.c @@ -0,0 +1,122 @@ +// Used by: +// - Clubba + White Clubba +// - Spear Guy +// - Piranha Plant +// - Putrid Piranha + Frost Piranha + +#include "common.h" +#include "npc.h" + +// prerequisites +#include "world/common/enemy/MeleeHitbox.inc.c" + +ApiStatus N(WanderMeleeAI_Main)(Evt *script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 65.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + enemy->unk_108.x = npc->pos.x; + enemy->unk_108.y = npc->pos.y; + enemy->unk_108.z = npc->pos.z; + enemy->unk_114 = 0.0001f; + enemy->unk_118 = 0.0001f; + #endif + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + + npc->flags &= ~NPC_FLAG_JUMPING; + if (!enemy->territory->wander.isFlying) { + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + } else { + npc->flags &= ~NPC_FLAG_GRAVITY; + npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; + } + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->functionTemp[1] = AI_STATE_WANDER_INIT; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; + } + + if (script->AI_TEMP_STATE < AI_STATE_MELEE_HITBOX_INIT + && enemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_NONE + && N(MeleeHitbox_CanSeePlayer)(script)) { + script->AI_TEMP_STATE = AI_STATE_MELEE_HITBOX_INIT; + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_WANDER_INIT: + basic_ai_wander_init(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_WANDER: + basic_ai_wander(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOITER_INIT: + basic_ai_loiter_init(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_LOITER: + basic_ai_loiter(script, npcAISettings, territoryPtr); + break; + case AI_STATE_ALERT_INIT: + basic_ai_found_player_jump_init(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_ALERT: + basic_ai_found_player_jump(script, npcAISettings, territoryPtr); + break; + case AI_STATE_CHASE_INIT: + basic_ai_chase_init(script, npcAISettings, territoryPtr); + // fallthrough + case AI_STATE_CHASE: + basic_ai_chase(script, npcAISettings, territoryPtr); + break; + case AI_STATE_LOSE_PLAYER: + basic_ai_lose_player(script, npcAISettings, territoryPtr); + break; + case AI_STATE_MELEE_HITBOX_INIT: + N(MeleeHitbox_30)(script); + // fallthrough + case AI_STATE_MELEE_HITBOX_PRE: + N(MeleeHitbox_31)(script); + if (script->AI_TEMP_STATE != AI_STATE_MELEE_HITBOX_ACTIVE) { + break; + } + // fallthrough + case AI_STATE_MELEE_HITBOX_ACTIVE: + N(MeleeHitbox_32)(script); + if (script->AI_TEMP_STATE != AI_STATE_MELEE_HITBOX_MISS) { + break; + } + // fallthrough + case AI_STATE_MELEE_HITBOX_MISS: + N(MeleeHitbox_33)(script); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c b/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c new file mode 100644 index 0000000000..6a5f415629 --- /dev/null +++ b/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c @@ -0,0 +1,82 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +#ifdef _DEAD_H_ +#include "dead_structs.h" +#endif + +ApiStatus N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { + DeadEnemy* enemy = (DeadEnemy*) script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + NpcAISettings* settings = (NpcAISettings*) evt_get_variable(script, *script->ptrReadPos); + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 200.0f; + territory.detectFlags = 0; + + // Dead Func that doesn't seem to have an alive counterpart, probably because of the + // difference in the Enemy and DeadEnemy struct. + func_8004D8E0(enemy); + if (enemy->flags & ENEMY_FLAGS_100000) { + enemy->unk_114 = 10.0f; + enemy->unk_118 = 0.7f; + } + + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->functionTemp[0] = 0; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + enemy->varTable[0] = 0; + + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->functionTemp[0] = 99; + script->functionTemp[1] = 0; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + } + + switch (script->functionTemp[0]) { + case 0: + N(PiranhaPlantAI_00)(script, settings, territoryPtr); + /* fallthrough */ + case 1: + N(PiranhaPlantAI_01)(script, settings, territoryPtr); + break; + case 10: + func_80240DC4_EA16C4(script, settings, territoryPtr); + if (script->functionTemp[0] != 11) { + break; + } + case 11: + N(PiranhaPlantAI_11)(script, settings, territoryPtr); + if (script->functionTemp[0] != 12) { + break; + } + case 12: + N(PiranhaPlantAI_12)(script, settings, territoryPtr); + if (script->functionTemp[0] != 13) { + break; + } + case 13: + N(PiranhaPlantAI_13)(script, settings, territoryPtr); + if (script->functionTemp[0] != 14) { + break; + } + case 14: + N(PiranhaPlantAI_14)(script, settings, territoryPtr); + break; + case 99: + basic_ai_suspend(script); + break; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkNpcAIFunc31.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_00.inc.c similarity index 67% rename from src/world/common/UnkNpcAIFunc31.inc.c rename to src/world/common/enemy/wip/PiranhaPlantAI_00.inc.c index 273de2c328..0ba1e40624 100644 --- a/src/world/common/UnkNpcAIFunc31.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_00.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "effects.h" -void N(UnkNpcAIFunc31)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(PiranhaPlantAI_00)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -10,7 +10,7 @@ void N(UnkNpcAIFunc31)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi npc->duration--; } else { enemy->varTable[0] = 0; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; script->functionTemp[1] = 0; script->functionTemp[0] = 1; } diff --git a/src/world/common/UnkNpcAIFunc32.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c similarity index 53% rename from src/world/common/UnkNpcAIFunc32.inc.c rename to src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c index 48b925b08d..c9a9d323f0 100644 --- a/src/world/common/UnkNpcAIFunc32.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c @@ -2,16 +2,16 @@ #include "npc.h" #include "effects.h" -void N(UnkNpcAIFunc32)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(PiranhaPlantAI_01)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 temp; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { ai_enemy_play_sound(npc, 802, 0); fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); - ai_enemy_play_sound(npc, 756, 0x200000); - npc->currentAnim.w = enemy->animList[8]; + ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_PRE]; npc->duration = enemy->varTable[8]; script->functionTemp[0] = 10; } diff --git a/src/world/common/UnkNpcAIFunc46.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c similarity index 96% rename from src/world/common/UnkNpcAIFunc46.inc.c rename to src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c index fb4d0f93ce..805e376087 100644 --- a/src/world/common/UnkNpcAIFunc46.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c @@ -1,8 +1,7 @@ #include "common.h" #include "npc.h" -// Might be something like the check for the general territory area of a burried mole and when to surface? -void N(UnkNpcAIFunc46)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(PiranhaPlantAI_10)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 phi_s7 = FALSE; @@ -180,7 +179,7 @@ void N(UnkNpcAIFunc46)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); ai_enemy_play_sound(npc, SOUND_MOLE_SURFACE, 0); - npc->currentAnim.w = enemy->animList[9]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_MELEE_HIT]; npc->duration = enemy->varTable[10]; script->functionTemp[0] = 11; } diff --git a/src/world/common/UnkNpcDurationFlagFunc3.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c similarity index 80% rename from src/world/common/UnkNpcDurationFlagFunc3.inc.c rename to src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c index a26d109b9a..690b763c07 100644 --- a/src/world/common/UnkNpcDurationFlagFunc3.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c @@ -1,7 +1,6 @@ #include "common.h" -#include "npc.h" -void N(UnkNpcDurationFlagFunc3)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(PiranhaPlantAI_11)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc33.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_12.inc.c similarity index 79% rename from src/world/common/UnkNpcAIFunc33.inc.c rename to src/world/common/enemy/wip/PiranhaPlantAI_12.inc.c index 1777b0d48c..e2b86a38ba 100644 --- a/src/world/common/UnkNpcAIFunc33.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_12.inc.c @@ -2,7 +2,7 @@ #include "npc.h" #include "effects.h" -void N(UnkNpcAIFunc33)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(PiranhaPlantAI_12)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 temp; @@ -17,7 +17,7 @@ void N(UnkNpcAIFunc33)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi if (npc->duration >= enemy->varTable[12]) { enemy->varTable[0] = 4; npc->duration = 8; - npc->currentAnim.w = enemy->animList[0]; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; fx_emote(EMOTE_FRUSTRATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); script->functionTemp[0] = 13; } diff --git a/src/world/common/UnkNpcDurationFlagFunc2.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_13.inc.c similarity index 71% rename from src/world/common/UnkNpcDurationFlagFunc2.inc.c rename to src/world/common/enemy/wip/PiranhaPlantAI_13.inc.c index 69602b9fdd..3e08192062 100644 --- a/src/world/common/UnkNpcDurationFlagFunc2.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_13.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -void N(UnkNpcDurationFlagFunc2)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(PiranhaPlantAI_13)(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/common/UnkNpcAIFunc30.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_14.inc.c similarity index 63% rename from src/world/common/UnkNpcAIFunc30.inc.c rename to src/world/common/enemy/wip/PiranhaPlantAI_14.inc.c index 29f6a2d7f1..d9a897985e 100644 --- a/src/world/common/UnkNpcAIFunc30.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_14.inc.c @@ -2,14 +2,14 @@ #include "npc.h" #include "effects.h" -void N(UnkNpcAIFunc30)(Evt *script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +void N(PiranhaPlantAI_14)(Evt *script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 retVal; npc->duration--; if (npc->duration == 0) { - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0) == 0) { + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) == 0) { fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1, 2, -20, 15, &retVal); } npc->duration = 0; diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c new file mode 100644 index 0000000000..c8015e15f8 --- /dev/null +++ b/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c @@ -0,0 +1,82 @@ +#include "common.h" +#include "npc.h" + +s32 N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + EnemyDetectVolume* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.halfHeight = 200.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + // Dead Func that doesn't seem to have an alive counterpart, probably because of the + // difference in the Enemy and DeadEnemy struct. + func_8004D8E0(enemy); + if (enemy->flags & ENEMY_FLAGS_100000) { + enemy->unk_114 = 10.0f; + enemy->unk_118 = 0.7f; + } + #endif + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + script->AI_TEMP_STATE = AI_STATE_PIRANHA_PLANT_00; + npc->duration = 0; + npc->currentAnim.w = enemy->animList[ENEMY_ANIM_IDLE]; + + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; + if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->functionTemp[1] = AI_STATE_PIRANHA_PLANT_00; + enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + } + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_PIRANHA_PLANT_00: + N(PiranhaPlantAI_00)(script, npcAISettings, territoryPtr); + case AI_STATE_PIRANHA_PLANT_01: + N(PiranhaPlantAI_01)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_PIRANHA_PLANT_10: + N(PiranhaPlantAI_10)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_11) { + break; + } + case AI_STATE_PIRANHA_PLANT_11: + N(PiranhaPlantAI_11)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_12) { + break; + } + case AI_STATE_PIRANHA_PLANT_12: + N(PiranhaPlantAI_12)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_13) { + break; + } + case AI_STATE_PIRANHA_PLANT_13: + N(PiranhaPlantAI_13)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_14) { + break; + } + case AI_STATE_PIRANHA_PLANT_14: + N(PiranhaPlantAI_14)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/set_script_owner_npc_anim.inc.c b/src/world/common/set_script_owner_npc_anim.inc.c deleted file mode 100644 index 8e78ec5950..0000000000 --- a/src/world/common/set_script_owner_npc_anim.inc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(set_script_owner_npc_anim)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->currentAnim.w = enemy->animList[8]; - npc->duration = enemy->varTable[2]; - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - script->functionTemp[0] = 13; -} diff --git a/src/world/common/set_script_owner_npc_col_height.inc.c b/src/world/common/set_script_owner_npc_col_height.inc.c deleted file mode 100644 index e15d9bb3fe..0000000000 --- a/src/world/common/set_script_owner_npc_col_height.inc.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(set_script_owner_npc_col_height)(Evt* script, NpcAISettings* aiSettings, - EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration++; - if (npc->duration == 3) { - npc->collisionHeight = enemy->varTable[6]; - } - - if (npc->duration < enemy->varTable[5]) { - return; - } - - npc->collisionHeight = enemy->varTable[6]; - script->functionTemp[0] = 0; -} diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index f3c9272a51..8a0dae25e2 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -278,7 +278,7 @@ void world_bombette_pre_battle(Npc* bombette) { D_802BE928 = 0; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_JUMPING; bombette->jumpVelocity = 0.0f; - bombette->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + bombette->flags &= ~NPC_FLAG_JUMPING; set_action_state(ACTION_STATE_IDLE); partner_clear_player_tracking(bombette); diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 8b5dc7c7a1..108f2b5d7a 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -239,7 +239,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { } D_802BE0C0 = TRUE; - bow->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_GRAVITY); + bow->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_GRAVITY); partnerActionStatus->partnerActionState = 1; partnerActionStatus->actingPartner = 9; playerStatus->flags |= PLAYER_STATUS_FLAGS_8000; diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index fbac57f680..947a4744ec 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -168,7 +168,7 @@ s32 world_goombario_can_pause(Npc* goombario) { return FALSE; } - if ((goombario->flags & (NPC_FLAG_1000 | NPC_FLAG_NO_Y_MOVEMENT)) != NPC_FLAG_1000) { + if ((goombario->flags & (NPC_FLAG_1000 | NPC_FLAG_JUMPING)) != NPC_FLAG_1000) { return new_var = 0; do { } while (new_var); // why though } diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 242c86a699..0273ae4a4a 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -572,7 +572,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { D_802BEB40_31CB60 = 0; kooper->flags |= NPC_FLAG_100; - kooper->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40); + kooper->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_40); partnerActionStatus->actingPartner = PARTNER_NONE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; kooper->jumpVelocity = 0.0f; @@ -696,7 +696,7 @@ void world_kooper_pre_battle(Npc* kooper) { playerStatus->flags &= ~PLAYER_STATUS_FLAGS_JUMPING; kooper->jumpVelocity = 0.0f; - kooper->flags &= ~NPC_FLAG_NO_Y_MOVEMENT; + kooper->flags &= ~NPC_FLAG_JUMPING; kooper->flags &= ~NPC_FLAG_40; sfx_stop_sound(0x284); diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 304c753bad..c0624deeb6 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -188,7 +188,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { } else { partnerActionStatus->partnerAction_unk_1 = 0; set_action_state(ACTION_STATE_RIDE); - parakarry->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_GRAVITY); + parakarry->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_GRAVITY); D_802BEBB0 = 1; gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_1; parakarry->currentAnim.w = 0x40009; @@ -235,7 +235,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { D_802BEBB8 = 1; D_802BEBB0 = 1; gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_1; - parakarry->flags &= ~(NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_GRAVITY); + parakarry->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_GRAVITY); parakarry->flags |= NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT; partnerActionStatus->actingPartner = PARTNER_PARAKARRY; partnerActionStatus->partnerActionState = PARTNER_ACTION_PARAKARRY_HOVER; diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 1c9b17b5f3..1770c0795d 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -11,17 +11,17 @@ dead_clamp_angle = 0x8002AE14; dead_ai_enemy_play_sound = 0x8004D800; dead_add_vec2D_polar = 0x8002B28C; dead_evt_get_variable = 0x802D4E8C; -func_8004D9C0 = 0x8004D9C0; -func_8004DAD8 = 0x8004DAD8; -func_8004DF64 = 0x8004DF64; -func_8004E024 = 0x8004E024; -func_8004E25C = 0x8004E25C; -func_8004E2EC = 0x8004E2EC; -func_8004E39C = 0x8004E39C; -func_8004E544 = 0x8004E544; -func_8004E808 = 0x8004E808; -func_8004EB8C = 0x8004EB8C; -func_8004D1A4 = 0x8004D1A4; +dead_basic_ai_wander_init = 0x8004D9C0; +dead_basic_ai_wander = 0x8004DAD8; +dead_basic_ai_loiter_init = 0x8004DF64; +dead_basic_ai_loiter = 0x8004E024; +dead_basic_ai_found_player_jump_init = 0x8004E25C; +dead_basic_ai_found_player_jump = 0x8004E2EC; +dead_basic_ai_chase_init = 0x8004E39C; +dead_basic_ai_chase = 0x8004E544; +dead_basic_ai_lose_player = 0x8004E808; +dead_basic_ai_suspend = 0x8004EB8C; +dead_basic_ai_check_player_dist = 0x8004D1A4; dead_npc_move_heading = 0x8003E424; dead_sqrtf = 0x80067040; dead_npc_test_move_simple_with_slipping = 0x800E5304; @@ -33,6 +33,7 @@ dead_get_npc_safe = 0x8003E534; // get_npc_safe dead_heap_malloc = 0x8002BFD4; dead_general_heap_malloc = 0x8002BF18; dead_heap_free = 0x8002C01C; +dead_func_80041080 = 0x80041080; dead_evt_set_variable = 0x802D5468; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; diff --git a/ver/us/asm/data/16A680.data.s b/ver/us/asm/data/16A680.data.s index 231d2becda..14571d3dc6 100644 --- a/ver/us/asm/data/16A680.data.s +++ b/ver/us/asm/data/16A680.data.s @@ -3,7 +3,7 @@ .section .data dlabel filemenu_hudElemScripts -.word 0x802423DC, nok_02_Quizmo_SetVannaAnim_Wave, 0x8024248C, 0x802424E4, D_8024253C_AB46AC, 0x80242594, dgb_16_npcGroup_802425EC, 0x80242408, flo_14_updateTexturePan_80242460, 0x802424B8, 0x80242510, D_80242568_A4EF88, 0x802425C0, D_80242618_9800E8, 0x802422D4, 0x80242300, mac_02_Quizmo_SetCamVfov, omo_09_UnkFunc61, func_80242384_833B84, D_802423B0 +.word 0x802423DC, nok_02_Quizmo_SetVannaAnim_Wave, 0x8024248C, 0x802424E4, D_8024253C_AB46AC, 0x80242594, dgb_16_npcGroup_802425EC, 0x80242408, flo_14_updateTexturePan_80242460, 0x802424B8, 0x80242510, D_80242568_filemenu, 0x802425C0, D_80242618_9800E8, 0x802422D4, 0x80242300, mac_02_Quizmo_SetCamVfov, omo_09_ProjectileHitbox_GetUsableProjectileID, func_80242384_833B84, D_802423B0 dlabel D_80249E70 .word 0x00000102, 0x02030405, 0x06000001, 0x02020306, 0x06060000, 0x01020203, 0x06060600, 0x00010202, 0x03060606, 0x00000102, 0x02030606, 0x06000000 diff --git a/ver/us/asm/data/EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s index 8000c77075..c8b0da695f 100644 --- a/ver/us/asm/data/EA3A80.data.s +++ b/ver/us/asm/data/EA3A80.data.s @@ -60,13 +60,13 @@ dlabel D_80243B68_EA4468 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80243B98_EA4498 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000009, 0x00000009, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, 0x8004930C, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, 0x8004930C, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241AE0_EA23E0, D_80243B68_EA4468, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000009, 0x00000009, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, 0x8004930C, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, 0x8004930C, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, EA0C10_PiranhaPlantAI_Main, D_80243B68_EA4468, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243C6C_EA456C .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80243B98_EA4498, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000 dlabel D_80243C98_EA4598 -.word 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, 0x8004930C, 0x00000004, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_802406CC_EA0FCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800486A0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, 0x800497E4, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800990BC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, 0x8004930C, 0x00000004, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, EA0C10_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800486A0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, 0x800497E4, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800990BC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243DA4_EA46A4 .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80243C98_EA4598, 0x00000000, 0x00000000, D_80243AAC_EA43AC, 0x00000000, 0x00000000, 0x00110000 @@ -75,22 +75,22 @@ dlabel D_80243DD0_EA46D0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243E00_EA4700 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, EA0C10_DeadUnkNpcAIMainFunc5, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E70_EA4770 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243EA0_EA47A0 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000003, 0x00000043, 0x00000002, EA0C10_DeadUnkNpcAIMainFunc5, D_80243E70_EA4770, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000003, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243E70_EA4770, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F10_EA4810 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80243F40_EA4840 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000008, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000006, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000006, 0x00000043, 0x00000002, EA0C10_DeadUnkNpcAIMainFunc5, D_80243F10_EA4810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000008, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000006, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000006, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243F10_EA4810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FB0_EA48B0 -.word 0x00000043, 0x00000001, EA0C10_func_80240814_97BE44, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, EA0C10_AwaitPlayerNearNpc, 0x00000043, 0x00000002, 0x80049630, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, EA0C10_func_802408B4_97BEE4, 0x00000043, 0x00000002, 0x80049630, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, EA0C10_DeadUnkNpcAIMainFunc5, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243E00_EA4700, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243FB0_EA48B0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, EA0C10_func_80240814_97BE44, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, EA0C10_AwaitPlayerNearNpc, 0x00000043, 0x00000002, 0x80049630, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, EA0C10_func_802408B4_97BEE4, 0x00000043, 0x00000002, 0x80049630, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, EA0C10_TackleAI_Main, D_80243DD0_EA46D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243E00_EA4700, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243FB0_EA48B0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000 dlabel D_802440FC_EA49FC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243EA0_EA47A0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243F40_EA4840, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00190000 @@ -111,25 +111,25 @@ dlabel D_802441C0_EA4AC0 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244354_EA4C54 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802443D4_EA4CD4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 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, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 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, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802446F8_EA4FF8 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244768_EA5068 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242D64_EA3664, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_802446F8_EA4FF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242DA8_EA36A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_802446F8_EA4FF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A60_EA5360 .word 0x00000054, 0x00000000 dlabel D_80244A68_EA5368 -.word 0x00000043, 0x0000000B, EA0C10_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EA0C10_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244AB8_EA53B8 -.word 0x00000043, 0x0000000B, EA0C10_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EA0C10_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244A60_EA5360, 0x00000046, 0x00000001, D_80244768_EA5068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B08_EA5408 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -177,4 +177,4 @@ dlabel D_80245D88_EA6688 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245DC8_EA66C8 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245BC0_EA64C0, 0xFE363C8A, 0x00000044, 0x00000001, D_80244BA8_EA54A8, 0x00000045, 0x00000002, D_80245D88_EA6688, 0xFD050F8A, 0x00000043, 0x00000002, 0x802E37A0, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000001, EA36E0_UnkFunc46, 0x00000043, 0x00000004, EA36E0_UnkFunc51, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, 0x802D6D84, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, EA36E0_UnkFunc49, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, func_80243054_EA3954, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244BFC_EA54FC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EA36E0_UnkFunc47, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, filemenu_set_cursor_goal_pos_EA3700, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245920_EA6220, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, 0x802E3908, 0x8000001B, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x000000EF, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDB9, 0x00000024, 0x00000002, 0xFE363C82, 0x000000A5, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80245BC0_EA64C0, 0xFE363C8A, 0x00000044, 0x00000001, D_80244BA8_EA54A8, 0x00000045, 0x00000002, D_80245D88_EA6688, 0xFD050F8A, 0x00000043, 0x00000002, 0x802E37A0, 0x8000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFDB9, 0x000002EE, 0x0000010E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000001, EA36E0_UnkFunc46, 0x00000043, 0x00000004, EA36E0_UnkFunc51, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000027, 0x00000002, 0xFD050F80, 0x00000014, 0x00000043, 0x00000005, 0x802D6C60, 0x0000001B, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000006, 0x802D6D84, 0x0000001B, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001C, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, EA36E0_UnkFunc49, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001C, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000043, 0x00000001, func_80243054_EA3954, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C83, 0x00000014, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000003, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x000001AE, 0x00000044, 0x00000001, D_80244BFC_EA54FC, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000276, 0x00000049, 0x00000001, 0xFD050F8A, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000006, 0x000001E4, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000002, 0x00000020, 0x00000020, 0x00000001, 0x0000000A, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8680, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000000A, 0xF24A814D, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, EA36E0_UnkFunc47, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000050, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, EA36E0_GetActingPartner, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000044, 0x00000001, D_80245920_EA6220, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000020, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, 0x802E3908, 0x8000001B, 0x00000043, 0x00000003, 0x802D6788, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001C, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EAA810.data.s b/ver/us/asm/data/EAA810.data.s index ec068dff60..e74e9efecf 100644 --- a/ver/us/asm/data/EAA810.data.s +++ b/ver/us/asm/data/EAA810.data.s @@ -159,22 +159,22 @@ dlabel D_80243DE0_EAC8C0 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F74_EACA54 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FF4_EACAD4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 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, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 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, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244318_EACDF8 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244388_EACE68 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B50_EAA630, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80244318_EACDF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B94_EAA674, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80244318_EACDF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244680_EAD160 .word 0x00000054, 0x00000000 dlabel D_80244688_EAD168 -.word 0x00000043, 0x0000000B, EA8AE0_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_EAD160, 0x00000046, 0x00000001, D_80244388_EACE68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EA8AE0_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_EAD160, 0x00000046, 0x00000001, D_80244388_EACE68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802446D8_EAD1B8 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EB1920.data.s b/ver/us/asm/data/EB1920.data.s index 8a255dc0de..d610945809 100644 --- a/ver/us/asm/data/EB1920.data.s +++ b/ver/us/asm/data/EB1920.data.s @@ -66,22 +66,22 @@ dlabel D_802417EC_EB264C .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241980_EB27E0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241A00_EB2860 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 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, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 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, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D24_EB2B84 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D94_EB2BF4 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802409F8_EB1858, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80241D24_EB2B84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240A3C_EB189C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80241D24_EB2B84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024208C_EB2EEC .word 0x00000054, 0x00000000 dlabel D_80242094_EB2EF4 -.word 0x00000043, 0x0000000B, EB1170_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_EB2EEC, 0x00000046, 0x00000001, D_80241D94_EB2BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, EB1170_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_EB2EEC, 0x00000046, 0x00000001, D_80241D94_EB2BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420E4_EB2F44 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EBA260.data.s b/ver/us/asm/data/EBA260.data.s index 1deaeaeedc..a09c7f8a4b 100644 --- a/ver/us/asm/data/EBA260.data.s +++ b/ver/us/asm/data/EBA260.data.s @@ -51,7 +51,7 @@ dlabel D_8024289C_EBB6EC .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802428CC_EBB71C -.word 0x00000043, 0x00000002, EB8E90_DeadUnkNpcAIMainFunc, D_8024289C_EBB6EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, EB8E90_PatrolNoAttackAI_Main, D_8024289C_EBB6EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802428EC_EBB73C .word 0x00000000, 0x002A001C, 0x00000000, 0x00000000, D_802428CC_EBB71C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/ECBC10.data.s b/ver/us/asm/data/ECBC10.data.s index 8ea367b171..4fc7076014 100644 --- a/ver/us/asm/data/ECBC10.data.s +++ b/ver/us/asm/data/ECBC10.data.s @@ -51,7 +51,7 @@ dlabel D_80242EE0_ECCBE0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41F00000, 0x00000003, 0x4019999A, 0x0000000F, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80242F10_ECCC10 -.word 0x00000043, 0x00000002, func_8024150C_ECB20C, D_80242EE0_ECCBE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, ECAA80_UnkFloAI_Main, D_80242EE0_ECCBE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F30_ECCC30 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/ED1840.data.s b/ver/us/asm/data/ED1840.data.s index 47b98eb264..7780477b45 100644 --- a/ver/us/asm/data/ED1840.data.s +++ b/ver/us/asm/data/ED1840.data.s @@ -92,14 +92,14 @@ dlabel D_80243610_ED3600 dlabel D_80243630_ED3620 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80243610_ED3600, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 -dlabel ED0310_sixFloats +dlabel ED0310_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80243674_ED3664 .word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 dlabel D_802436A4_ED3694 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, ED0310_DeadUnkNpcAIMainFunc9, D_80243674_ED3664, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, ED0310_FlyingAI_Main, D_80243674_ED3664, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243714_ED3704 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802436A4_ED3694, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/EE20E0.data.s b/ver/us/asm/data/EE20E0.data.s index 75540ad3bf..1632054cb7 100644 --- a/ver/us/asm/data/EE20E0.data.s +++ b/ver/us/asm/data/EE20E0.data.s @@ -41,14 +41,14 @@ dlabel D_80243E9C_EE285C dlabel D_802441B0_EE2B70 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 -dlabel EDEA00_sixFloats +dlabel EDEA00_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802441F4_EE2BB4 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42700000, 0x42480000, 0x00000003, 0x40600000, 0x0000003C, 0x0000000A, 0x42A00000, 0x428C0000, 0x00000001 dlabel D_80244224_EE2BE4 -.word 0x0000005A, 0x00000001, D_80247B44_EE6504, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, func_80241DE4_EE07A4, D_802441F4_EE2BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000005A, 0x00000001, D_80247B44_EE6504, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, EDEA00_LakituAI_Main, D_802441F4_EE2BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442A0_EE2C60 .word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_80244224_EE2BE4, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 @@ -57,7 +57,7 @@ dlabel D_802442CC_EE2C8C .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_802442FC_EE2CBC -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x0000005A, 0x00000001, 0x80247BB8, 0x00000043, 0x00000002, func_80242AF0_EE14B0, D_802442CC_EE2C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x0000005A, 0x00000001, 0x80247BB8, 0x00000043, 0x00000002, EDEA00_SpinyAI_Main, D_802442CC_EE2C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244378_EE2D38 .word 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x00000064, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x800499B0, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EE8970.data.s b/ver/us/asm/data/EE8970.data.s index 9384ddf63f..c88eb28199 100644 --- a/ver/us/asm/data/EE8970.data.s +++ b/ver/us/asm/data/EE8970.data.s @@ -65,14 +65,14 @@ dlabel D_80243B4C_EEA0FC dlabel D_80243EA8_EEA458 .word 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000021, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000022, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000023, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD26, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE2A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD26, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE2A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEE8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEE8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFE363C83, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242C30_EE91E0, 0x00000043, 0x00000002, 0x802D6400, 0x00000060, 0x00000024, 0x00000002, 0xFE363C83, 0x00000060, 0x00000024, 0x00000002, 0xFE363C84, 0x00000061, 0x00000024, 0x00000002, 0xFE363C85, 0x00000062, 0x00000024, 0x00000002, 0xFE363C86, 0x00000063, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000002, 0x802D6400, 0x00000052, 0x00000024, 0x00000002, 0xFE363C83, 0x00000052, 0x00000024, 0x00000002, 0xFE363C84, 0x00000053, 0x00000024, 0x00000002, 0xFE363C85, 0x00000054, 0x00000024, 0x00000002, 0xFE363C86, 0x00000055, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000002, 0x802D6400, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000002, 0x802D6400, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005D, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80242EDC_EE948C, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002711, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002712, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002713, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002714, 0x00000043, 0x00000003, 0x802D63A8, 0x0000007C, 0x00002715, 0x00000043, 0x00000003, 0x802D6708, 0x0000007B, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000007C, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002711, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002712, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002713, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002714, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00002715, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00002711, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002712, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002713, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002714, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00002715, 0x00000044, 0x00000001, D_80243B4C_EEA0FC, 0x00000043, 0x00000004, 0x802D711C, 0x00000000, 0x0000007B, 0x00000001, 0x00000043, 0x00000004, 0x802D6920, 0x00000001, func_80240504_EE6AB4, 0x00000000, 0x00000043, 0x00000004, 0x802D657C, 0x0000007B, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002711, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002712, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002713, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002714, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D657C, 0x00002715, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802D711C, 0x00000001, 0x00000039, 0x00000001, 0x00000043, 0x00000004, 0x802D6920, 0x00000002, func_802407D4_EE6D84, 0x00000000, 0x00000043, 0x00000004, 0x802D657C, 0x00000039, 0x00000002, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 -dlabel EE70C0_sixFloats +dlabel EE70C0_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244508_EEAAB8 .word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 dlabel D_80244538_EEAAE8 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, EE70C0_DeadUnkNpcAIMainFunc9, D_80244508_EEAAB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, EE70C0_FlyingAI_Main, D_80244508_EEAAB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802445A8_EEAB58 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244538_EEAAE8, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/EEFAD0.data.s b/ver/us/asm/data/EEFAD0.data.s index 4fb59ccd76..45e44e7351 100644 --- a/ver/us/asm/data/EEFAD0.data.s +++ b/ver/us/asm/data/EEFAD0.data.s @@ -62,14 +62,14 @@ dlabel D_80243EE0_EF0FE0 dlabel D_80243FA4_EF10A4 .word 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, D_80243EE0_EF0FE0, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FB, 0x00000043, 0x00000002, 0x8011A804, D_80243928_EF0A28, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8EE0, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, D_80243E10_EF0F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 -dlabel EEDF50_sixFloats +dlabel EEDF50_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244088_EF1188 .word 0x3F800000, 0x0000002D, 0x0000003C, 0x42C80000, 0x00000000, 0x00000003, 0x40666666, 0x0000000A, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_802440B8_EF11B8 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80242780_EEF880, D_80244088_EF1188, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000258, 0x00000043, 0x00000002, EEDF50_FlyingNoAttackAI_Main, D_80244088_EF1188, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244128_EF1228 .word 0x00000000, 0x0018001C, 0x00000000, 0x00000000, D_802440B8_EF11B8, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/EF58E0.data.s b/ver/us/asm/data/EF58E0.data.s index ac21b32598..b57e7e492e 100644 --- a/ver/us/asm/data/EF58E0.data.s +++ b/ver/us/asm/data/EF58E0.data.s @@ -32,7 +32,7 @@ dlabel D_80244080_EF6690 dlabel D_80244334_EF6944 .word 0x00000024, 0x00000002, 0xFE363C84, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000026, 0x00000044, 0x00000001, D_80244080_EF6690, 0x00000024, 0x00000002, 0xFE363C84, 0x00000024, 0x00000024, 0x00000002, 0xFE363C85, 0x00000013, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000044, 0x00000001, D_80244080_EF6690, 0x00000024, 0x00000002, 0xFE363C84, 0x00000025, 0x00000024, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8E, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000028, 0x00000044, 0x00000001, D_80244080_EF6690, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel EF2680_sixFloats +dlabel EF2680_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802444D4_EF6AE4 @@ -48,7 +48,7 @@ dlabel D_802445A0_EF6BB0 .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_802445D0_EF6BE0 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x00000043, 0x00000002, EF2680_DeadUnkNpcAIMainFunc6, D_802445A0_EF6BB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x00000043, 0x00000002, EF2680_SpinyAI_Main, D_802445A0_EF6BB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244640_EF6C50 .word 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x00000064, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x800499B0, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_02/A1A6A0.data.s b/ver/us/asm/data/world/area_hos/hos_02/A1A6A0.data.s index a689d32483..d8e1a2626c 100644 --- a/ver/us/asm/data/world/area_hos/hos_02/A1A6A0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_02/A1A6A0.data.s @@ -5,14 +5,14 @@ dlabel D_80244480_A1A6A0 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel hos_02_sixFloats +dlabel hos_02_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802444A8_A1A6C8 .word 0x3F4CCCCD, 0x00000064, 0x00000000, 0x42B40000, 0x00000000, 0x00000004, 0x40733333, 0x0000000A, 0x00000001, 0x42C80000, 0x00000000, 0x00000001 dlabel D_802444D8_A1A6F8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000002, hos_02_UnkNpcAIMainFunc10, D_802444A8_A1A6C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000002, hos_02_FlyingNoAttackAI_Main, D_802444A8_A1A6C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244548_A1A768 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802444D8_A1A6F8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00180000 diff --git a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s index 59fdd81ac4..dafc406db8 100644 --- a/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_03/A1F3C0.data.s @@ -62,14 +62,14 @@ dlabel D_802456A0_A207A0 dlabel D_802456B4_A207B4 .word 0xC3F40000, 0x420C0000, 0x43A20000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245640_A20740, 0x00000047, 0x00000005, D_80245054_A20154, 0x00001000, 0x0000003B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245054_A20154, 0x00100000, D_80245654_A20754, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802456A0_A207A0, 0x00000047, 0x00000005, D_80245054_A20154, 0x00001000, 0x0000003C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245054_A20154, 0x00100000, D_802456B4_A207B4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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 hos_03_sixFloats +dlabel hos_03_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_8024580C_A2090C .word 0x3F99999A, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024583C_A2093C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, hos_03_UnkNpcAIMainFunc9, D_8024580C_A2090C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_8024583C_A2093C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_8024583C_A2093C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_8024583C_A2093C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, hos_03_FlyingAI_Main, D_8024580C_A2090C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_8024583C_A2093C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_8024583C_A2093C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_8024583C_A2093C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 dlabel D_80245930_A20A30 .word D_80247248_A22348, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80245C68_A20D68, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s index 731e19b0be..48e8d3cfdd 100644 --- a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s +++ b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s @@ -66,7 +66,7 @@ dlabel D_8024A59C_A2569C .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024A5CC_A256CC -.word 0x00000043, 0x00000002, DoBasicAI, D_8024A59C_A2569C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024A59C_A2569C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A5EC_A256EC .word 0x00AF0001, 0x0023001C, D_8024A48C_A2558C, D_8024A500_A25600, 0x00000000, 0x00000000, D_8024A580_A25680, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_8024A48C_A2558C, D_8024A500_A25600, D_8024A5CC_A256CC, 0x00000000, D_8024A580_A25680, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s index 2e20287cf6..e08e351fde 100644 --- a/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s +++ b/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s @@ -24,22 +24,22 @@ dlabel D_80242C74_A3C154 .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, dup_hos_06_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_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E08_A3C2E8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E88_A3C368 -.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, hos_06_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 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_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 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_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431AC_A3C68C .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024321C_A3C6FC -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802409F8_A39ED8, 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_802431AC_A3C68C, 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_80242C0C_A3C0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240A3C_A39F1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_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_802431AC_A3C68C, 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_80242C0C_A3C0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243514_A3C9F4 .word 0x0000003B, 0x00000000 dlabel D_8024351C_A3C9FC -.word 0x00000043, 0x0000000B, hos_06_SetManyVars, 0x00000001, 0x00B20004, 0x00B20001, 0x0000003B, 0x00000000, 0x000A0058, 0x000A0059, 0x000A005A, 0x000A005B, D_80243514_A3C9F4, 0x00000046, 0x00000001, D_8024321C_A3C6FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, hos_06_LetterDelivery_Init, 0x00000001, 0x00B20004, 0x00B20001, 0x0000003B, 0x00000000, 0x000A0058, 0x000A0059, 0x000A005A, 0x000A005B, D_80243514_A3C9F4, 0x00000046, 0x00000001, D_8024321C_A3C6FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024356C_A3CA4C .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80242C0C_A3C0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_02/9793F0.data.s b/ver/us/asm/data/world/area_isk/isk_02/9793F0.data.s index 7e4095f5f7..f46a66e743 100644 --- a/ver/us/asm/data/world/area_isk/isk_02/9793F0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_02/9793F0.data.s @@ -6,7 +6,7 @@ dlabel D_80240CE0_9793F0 .word 0x3FE66666, 0x00000028, 0x0000000A, 0x42C80000, 0x00000000, 0x00000003, 0x40400000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240D10_979420 -.word 0x00000043, 0x00000001, isk_02_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240CE0_9793F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_02_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240CE0_9793F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D3C_97944C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240D10_979420, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s b/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s index 4a21e15fd8..6ecb9d539f 100644 --- a/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s +++ b/ver/us/asm/data/world/area_isk/isk_04/97CB60.data.s @@ -6,22 +6,22 @@ dlabel D_80241530_97CB60 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241560_97CB90 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415D0_97CC00 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241600_97CC30 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_802415D0_97CC00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_802415D0_97CC00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241670_97CCA0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802416A0_97CCD0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_80241670_97CCA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_80241670_97CCA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241710_97CD40 -.word 0x00000043, 0x00000001, isk_04_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_04_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_04_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_UnkNpcAIMainFunc5, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_04_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_04_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_04_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_04_TackleAI_Main, D_80241530_97CB60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241804_97CE34 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241560_97CB90, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241710_97CD40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241600_97CC30, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802416A0_97CCD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s b/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s index 52937499dd..0d2386d36c 100644 --- a/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s +++ b/ver/us/asm/data/world/area_isk/isk_05/97FE50.data.s @@ -9,7 +9,7 @@ dlabel D_8024239C_97FE6C .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 dlabel D_802423CC_97FE9C -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_97ECC8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_05_UnkNpcAIMainFunc3, D_8024239C_97FE6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_97ECC8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_05_StoneChompAI_Main, D_8024239C_97FE6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024243C_97FF0C .word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s b/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s index d98b6888ba..3c4ce246ac 100644 --- a/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s @@ -6,7 +6,7 @@ dlabel D_80240860_982CA0 .word 0x3FE66666, 0x00000028, 0x0000000A, 0x42C80000, 0x00000000, 0x00000003, 0x40400000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240890_982CD0 -.word 0x00000043, 0x00000001, isk_07_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240860_982CA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_07_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240860_982CA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408BC_982CFC .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240890_982CD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s b/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s index da45df8d39..860cd0bb40 100644 --- a/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s +++ b/ver/us/asm/data/world/area_isk/isk_08/985B00.data.s @@ -6,22 +6,22 @@ dlabel D_80240CD0_985B00 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240D00_985B30 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D70_985BA0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240DA0_985BD0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240D70_985BA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240D70_985BA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E10_985C40 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240E40_985C70 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240E10_985C40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240E10_985C40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EB0_985CE0 -.word 0x00000043, 0x00000001, isk_08_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_08_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_08_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_UnkNpcAIMainFunc5, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_08_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_08_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_08_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_08_TackleAI_Main, D_80240CD0_985B00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FA4_985DD4 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240D00_985B30, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EB0_985CE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240DA0_985BD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80240E40_985C70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s b/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s index 3ae13fbc90..dfb9023c5a 100644 --- a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s +++ b/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s @@ -12,7 +12,7 @@ dlabel D_8024247C_991C5C .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 dlabel D_802424AC_991C8C -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_9909D8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_13_UnkNpcAIMainFunc3, D_8024247C_991C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_9909D8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_13_StoneChompAI_Main, D_8024247C_991C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024251C_991CFC .word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_14/994860.data.s b/ver/us/asm/data/world/area_isk/isk_14/994860.data.s index 27d7f0552d..178082eb29 100644 --- a/ver/us/asm/data/world/area_isk/isk_14/994860.data.s +++ b/ver/us/asm/data/world/area_isk/isk_14/994860.data.s @@ -9,7 +9,7 @@ dlabel D_8024214C_99487C .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40A9999A, 0x00000046, 0x0000000A, 0x43FA0000, 0x00000000, 0x00000001 dlabel D_8024217C_9948AC -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_993928, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_14_UnkNpcAIMainFunc3, D_8024214C_99487C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802411F8_993928, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, isk_14_StoneChompAI_Main, D_8024214C_99487C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421EC_99491C .word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s b/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s index 7ce62135e9..57a1db31f9 100644 --- a/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s +++ b/ver/us/asm/data/world/area_isk/isk_18/998B90.data.s @@ -6,22 +6,22 @@ dlabel D_80240C20_998B90 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240C50_998BC0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CC0_998C30 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240CF0_998C60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240CC0_998C30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240CC0_998C30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D60_998CD0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240D90_998D00 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240D60_998CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240D60_998CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E00_998D70 -.word 0x00000043, 0x00000001, isk_18_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_18_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_18_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_UnkNpcAIMainFunc5, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, isk_18_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, isk_18_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, isk_18_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, isk_18_TackleAI_Main, D_80240C20_998B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EF4_998E64 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240C50_998BC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s b/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s index 45f90a15d8..2a030d33c4 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s @@ -36,7 +36,7 @@ dlabel D_802408AC_90D4EC .word 0x3FE66666, 0x0000001E, 0x0000001E, 0x42B40000, 0x428C0000, 0x00000002, 0x40400000, 0x0000005A, 0x00000019, 0x42F00000, 0x428C0000, 0x00000001 dlabel D_802408DC_90D51C -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, D_802408AC_90D4EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, BasicAI_Main, D_802408AC_90D4EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B28_90D768 .word 0x00000000, 0x00180016, D_80240790_90D3D0, 0x00000000, D_802408DC_90D51C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001 @@ -54,7 +54,7 @@ dlabel D_80240C9C_90D8DC .word 0x3FE66666, 0x0000001E, 0x0000001E, 0x42B40000, 0x428C0000, 0x00000002, 0x40400000, 0x0000005A, 0x00000019, 0x42F00000, 0x428C0000, 0x00000001 dlabel D_80240CCC_90D90C -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000082, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DoBasicAI, D_80240C9C_90D8DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000082, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, BasicAI_Main, D_80240C9C_90D8DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F74_90DBB4 .word 0x00000000, 0x00180016, D_80240B80_90D7C0, 0x00000000, D_80240CCC_90D90C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001 diff --git a/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s b/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s index 8998c264ae..24a2d5d0b3 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s @@ -18,13 +18,13 @@ dlabel D_802440D4_913784 .word 0x4104CCCD, 0x00000000, 0x00000000, 0x40200000, 0x3ECCCCCD, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244104_9137B4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000011, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000011, 0x00000043, 0x00000002, iwa_01_UnkFunc54, D_802440D4_913784, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000011, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000011, 0x00000043, 0x00000002, iwa_01_ProjectileAI_Main, D_802440D4_913784, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244174_913824 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244184_913834 -.word 0x00000043, 0x00000001, iwa_01_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244174_913824, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, iwa_01_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244104_9137B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, iwa_01_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244174_913824, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, iwa_01_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244104_9137B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244358_913A08 .word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80244104_9137B4, D_80244184_913834, 0x00000000, D_80243F20_9135D0, 0x00000000, 0x00000000, 0x00000008 @@ -39,7 +39,7 @@ dlabel D_802444A0_913B50 .word 0x3FE66666, 0x0000001E, 0x0000001E, 0x42B40000, 0x428C0000, 0x00000002, 0x40400000, 0x0000005A, 0x00000019, 0x42F00000, 0x428C0000, 0x00000001 dlabel D_802444D0_913B80 -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, D_802444A0_913B50, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, D_80244384_913A34, 0x00000000, D_802444D0_913B80, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001, 0x00000000, 0x00180016, D_80244420_913AD0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00080001 +.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, BasicAI_Main, D_802444A0_913B50, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, D_80244384_913A34, 0x00000000, D_802444D0_913B80, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001, 0x00000000, 0x00180016, D_80244420_913AD0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00080001 dlabel D_80244774_913E24 .word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -51,7 +51,7 @@ dlabel D_80244890_913F40 .word 0x3FE66666, 0x0000001E, 0x0000001E, 0x42B40000, 0x428C0000, 0x00000002, 0x40400000, 0x0000005A, 0x00000019, 0x42F00000, 0x428C0000, 0x00000001 dlabel D_802448C0_913F70 -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000082, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DoBasicAI, D_80244890_913F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000082, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, BasicAI_Main, D_80244890_913F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B68_914218 .word 0x00000000, 0x00180016, D_80244774_913E24, 0x00000000, D_802448C0_913F70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001 @@ -63,7 +63,7 @@ dlabel D_80244BC0_914270 .word 0x3F800000, 0x0000001E, 0x0000001E, 0x42F00000, 0x00000000, 0x00000003, 0x40E00000, 0x0000003C, 0x00000005, 0x42C80000, 0x42700000, 0x00000001 dlabel D_80244BF0_9142A0 -.word 0x00000043, 0x00000003, func_80242F54_912604, D_80244BC0_914270, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, iwa_01_CleftAI_Main, D_80244BC0_914270, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244C14_9142C4 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244BF0_9142A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s b/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s index f65a03a748..f48e661659 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s @@ -12,7 +12,7 @@ dlabel D_802415CC_91733C .word 0x3FE66666, 0x0000001E, 0x0000001E, 0x42B40000, 0x428C0000, 0x00000002, 0x40400000, 0x0000005A, 0x00000019, 0x42F00000, 0x428C0000, 0x00000001 dlabel D_802415FC_91736C -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, D_802415CC_91733C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, D_802414B0_917220, 0x00000000, D_802415FC_91736C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001, 0x00000000, 0x00180016, D_8024154C_9172BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00080001 +.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, BasicAI_Main, D_802415CC_91733C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, D_802414B0_917220, 0x00000000, D_802415FC_91736C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001, 0x00000000, 0x00180016, D_8024154C_9172BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00080001 dlabel D_802418A0_917610 .word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -24,7 +24,7 @@ dlabel D_802419BC_91772C .word 0x3FE66666, 0x0000001E, 0x0000001E, 0x42B40000, 0x428C0000, 0x00000002, 0x40400000, 0x0000005A, 0x00000019, 0x42F00000, 0x428C0000, 0x00000001 dlabel D_802419EC_91775C -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000082, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DoBasicAI, D_802419BC_91772C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000082, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C83, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, BasicAI_Main, D_802419BC_91772C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C94_917A04 .word 0x00000000, 0x00180016, D_802418A0_917610, 0x00000000, D_802419EC_91775C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001 @@ -36,7 +36,7 @@ dlabel D_80241CEC_917A5C .word 0x3F800000, 0x0000001E, 0x0000001E, 0x42F00000, 0x00000000, 0x00000003, 0x40E00000, 0x0000003C, 0x00000005, 0x42C80000, 0x42700000, 0x00000001 dlabel D_80241D1C_917A8C -.word 0x00000043, 0x00000003, func_80240C90_916A00, D_80241CEC_917A5C, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, iwa_02_CleftAI_Main, D_80241CEC_917A5C, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D40_917AB0 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80241D1C_917A8C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_03/91A6B0.data.s b/ver/us/asm/data/world/area_iwa/iwa_03/91A6B0.data.s index 88747d2d5a..5ab75cd77d 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_03/91A6B0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_03/91A6B0.data.s @@ -12,7 +12,7 @@ dlabel D_80241C1C_91A7CC .word 0x3FE66666, 0x0000001E, 0x0000001E, 0x42B40000, 0x428C0000, 0x00000002, 0x40400000, 0x0000005A, 0x00000019, 0x42F00000, 0x428C0000, 0x00000001 dlabel D_80241C4C_91A7FC -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, D_80241C1C_91A7CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0x00000050, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F000E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00000020, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000002, BasicAI_Main, D_80241C1C_91A7CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E98_91AA48 .word 0x00000000, 0x00180016, D_80241B00_91A6B0, 0x00000000, D_80241C4C_91A7FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00080001 @@ -24,7 +24,7 @@ dlabel D_80241EF0_91AAA0 .word 0x3F800000, 0x0000001E, 0x0000001E, 0x42F00000, 0x00000000, 0x00000003, 0x40E00000, 0x0000003C, 0x00000005, 0x42C80000, 0x42700000, 0x00000001 dlabel D_80241F20_91AAD0 -.word 0x00000043, 0x00000003, func_80240FD0_919B80, D_80241EF0_91AAA0, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, iwa_03_CleftAI_Main, D_80241EF0_91AAA0, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F44_91AAF4 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80241F20_91AAD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_04/91CFA0.data.s b/ver/us/asm/data/world/area_iwa/iwa_04/91CFA0.data.s index 88e2cc8688..efab327666 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_04/91CFA0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_04/91CFA0.data.s @@ -6,7 +6,7 @@ dlabel D_802416C0_91CFA0 .word 0x3F800000, 0x0000001E, 0x0000001E, 0x42F00000, 0x00000000, 0x00000003, 0x40E00000, 0x0000003C, 0x00000005, 0x42C80000, 0x42700000, 0x00000001 dlabel D_802416F0_91CFD0 -.word 0x00000043, 0x00000003, func_80240D10_91C5F0, D_802416C0_91CFA0, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, iwa_04_CleftAI_Main, D_802416C0_91CFA0, 0x00000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241714_91CFF4 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802416F0_91CFD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s b/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s index e7e1fa3bae..3a683fa472 100644 --- a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s @@ -18,7 +18,7 @@ dlabel D_80242260_B227A0 .word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242290_B227D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242290_B227D0 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240340_B20880, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80242260_B227A0, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, jan_00_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80242260_B227A0, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024239C_B228DC .word 0x00000000, 0x0014001C, D_80242214_B22754, D_80242290_B227D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -39,22 +39,22 @@ dlabel D_80242434_B22974 .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, jan_00_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_8024078C_B20CCC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802407C4_B20D04, 0xFE363C80, 0x0000004E, 0x00000006, D_80242434_B22974, 0x00000010, 0x00000000, D_80247AF0_CCB300, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240738_B20C78, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802425C8_B22B08 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_00_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242648_B22B88 -.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, jan_00_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802425C8_B22B08, 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_8024078C_B20CCC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, jan_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802425C8_B22B08, 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_8024078C_B20CCC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024296C_B22EAC .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802407C4_B20D04, 0xFE363C80, 0x0000004E, 0x00000006, D_80242648_B22B88, 0x00000010, 0x00000000, D_80247AF0_CCB300, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240738_B20C78, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802429DC_B22F1C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240ADC_B2101C, 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_8024296C_B22EAC, 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_802423CC_B2290C, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240B20_B21060, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_00_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_8024296C_B22EAC, 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_802423CC_B2290C, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_00_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242CD4_B23214 .word 0x00000054, 0x00000000 dlabel D_80242CDC_B2321C -.word 0x00000043, 0x0000000B, jan_00_SetManyVars, 0x00000001, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x0010001D, 0x0010001E, 0x0010001F, 0x00100020, D_80242CD4_B23214, 0x00000046, 0x00000001, D_802429DC_B22F1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, jan_00_LetterDelivery_Init, 0x00000001, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x0010001D, 0x0010001E, 0x0010001F, 0x00100020, D_80242CD4_B23214, 0x00000046, 0x00000001, D_802429DC_B22F1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242D2C_B2326C .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802423CC_B2290C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s b/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s index edc20be331..1497abd1a3 100644 --- a/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_01/B299B0.data.s @@ -6,7 +6,7 @@ dlabel D_80241980_B299B0 .word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001 dlabel D_802419B0_B299E0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_01_UnkNpcAIMainFunc2, D_80241980_B299B0, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_01_HoppingAI_Main, D_80241980_B299B0, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802419EC_B29A1C .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802419B0_B299E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s index cb0ca8de1a..3b00dfaaa6 100644 --- a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s +++ b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s @@ -9,7 +9,7 @@ dlabel D_80242FCC_B2F43C .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80242FFC_B2F46C -.word 0x00000043, 0x00000002, jan_02_UnkNpcAIMainFunc, D_80242FCC_B2F43C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, jan_02_PatrolNoAttackAI_Main, D_80242FCC_B2F43C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024301C_B2F48C .word 0x00000000, 0x00300020, 0x00000000, 0x00000000, D_80242FFC_B2F46C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -21,7 +21,7 @@ dlabel D_8024304C_B2F4BC .word 0x00000000 dlabel D_80243050_B2F4C0 -.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, jan_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241540_B2D9B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_DCCB30, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, jan_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241540_B2D9B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_jan_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel jan_02_Quizmo_varStash .word 0x00000000 @@ -90,7 +90,7 @@ dlabel D_80245764_B31BD4 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80245794_B31C04 -.word 0x00000043, 0x00000002, DoBasicAI, D_80245764_B31BD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80245764_B31BD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802457B4_B31C24 .word 0x00AF0001, 0x0023001C, D_80245654_B31AC4, D_802456C8_B31B38, 0x00000000, 0x00000000, D_80245748_B31BB8, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80245654_B31AC4, D_802456C8_B31B38, D_80245794_B31C04, 0x00000000, D_80245748_B31BB8, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s index 0417995668..23830415bc 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s @@ -30,7 +30,7 @@ dlabel D_80244BB4_B39784 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244BE4_B397B4 -.word 0x00000043, 0x00000002, jan_03_UnkNpcAIMainFunc, D_80244BB4_B39784, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, jan_03_PatrolNoAttackAI_Main, D_80244BB4_B39784, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244C04_B397D4 .word 0x00000000, 0x00300020, 0x00000000, 0x00000000, D_80244BE4_B397B4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -39,7 +39,7 @@ dlabel D_80244C5C_B3982C .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244C8C_B3985C -.word 0x00000043, 0x00000002, jan_03_UnkNpcAIMainFunc, D_80244C5C_B3982C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, jan_03_PatrolNoAttackAI_Main, D_80244C5C_B3982C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244CAC_B3987C .word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_80244C8C_B3985C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -207,34 +207,34 @@ dlabel D_80249CE4_B3E8B4 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80249D14_B3E8E4 -.word 0x00000043, 0x00000002, DoBasicAI, D_80249CE4_B3E8B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80249CE4_B3E8B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249D34_B3E904 .word 0x00AF0001, 0x0023001C, D_80249BD4_B3E7A4, D_80249C48_B3E818, 0x00000000, 0x00000000, D_80249CC8_B3E898, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80249BD4_B3E7A4, D_80249C48_B3E818, D_80249D14_B3E8E4, 0x00000000, D_80249CC8_B3E898, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 dlabel D_80249D8C_B3E95C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249E0C_B3E9DC -.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, jan_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80249D8C_B3E95C, 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_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80249D8C_B3E95C, 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_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A130_B3ED00 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_80249E0C_B3E9DC, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A1A0_B3ED70 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242EAC_B37A7C, 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_8024A130_B3ED00, 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_80247768_B3C338, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242EF0_B37AC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_03_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_8024A130_B3ED00, 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_80247768_B3C338, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A498_B3F068 .word 0x0000004F, 0x00000000 dlabel D_8024A4A0_B3F070 -.word 0x00000043, 0x0000000B, jan_03_SetManyVars, 0x00000006, 0x00970404, 0x00970401, 0x0000004F, 0x00000050, 0x00100079, 0x0010007A, 0x0010007B, 0x0010007C, D_8024A498_B3F068, 0x00000046, 0x00000001, D_8024A1A0_B3ED70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, jan_03_LetterDelivery_Init, 0x00000006, 0x00970404, 0x00970401, 0x0000004F, 0x00000050, 0x00100079, 0x0010007A, 0x0010007B, 0x0010007C, D_8024A498_B3F068, 0x00000046, 0x00000001, D_8024A1A0_B3ED70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A4F0_B3F0C0 .word 0x00000054, 0x00000000 dlabel D_8024A4F8_B3F0C8 -.word 0x00000043, 0x0000000B, jan_03_SetManyVars, 0x0000000F, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x0010001D, 0x0010001E, 0x0010001F, 0x00100020, D_8024A4F0_B3F0C0, 0x00000046, 0x00000001, D_8024A1A0_B3ED70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, jan_03_LetterDelivery_Init, 0x0000000F, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x0010001D, 0x0010001E, 0x0010001F, 0x00100020, D_8024A4F0_B3F0C0, 0x00000046, 0x00000001, D_8024A1A0_B3ED70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A548_B3F118 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s index a2c7f3c61b..419d685e9f 100644 --- a/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s +++ b/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s @@ -24,7 +24,7 @@ dlabel D_80244CA4_B4F714 .word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244CD4_B4F744, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244CD4_B4F744 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802407F0_B4B260, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244CA4_B4F714, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, jan_05_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244CA4_B4F714, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244DE0_B4F850 .word 0x00000000, 0x0014001C, D_80244C58_B4F6C8, D_80244CD4_B4F744, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -48,7 +48,7 @@ dlabel D_8024508C_B4FAFC .word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001 dlabel D_802450BC_B4FB2C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_05_UnkNpcAIMainFunc2, D_8024508C_B4FAFC, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_05_HoppingAI_Main, D_8024508C_B4FAFC, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802450F8_B4FB68 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802450BC_B4FB2C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 @@ -66,13 +66,13 @@ dlabel D_80245210_B4FC80 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_80245240_B4FCB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_05_UnkNpcAIFunc28, D_80245210_B4FC80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_05_SpearGuyAI_Main, D_80245210_B4FC80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802452B0_B4FD20 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80245240_B4FCB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 dlabel D_802452DC_B4FD4C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_05_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245384_B4FDF4 .word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_802452DC_B4FD4C, 0x00000000, 0x00000000, D_80245154_B4FBC4, 0x00000000, 0x00000000, 0x00100008 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s b/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s index a5300a71ac..b991f6f661 100644 --- a/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s +++ b/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s @@ -6,7 +6,7 @@ dlabel D_80244AF0_B57320 .word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001 dlabel D_80244B20_B57350 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_06_UnkNpcAIMainFunc2, D_80244AF0_B57320, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_06_HoppingAI_Main, D_80244AF0_B57320, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B5C_B5738C .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244B20_B57350, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 @@ -18,7 +18,7 @@ dlabel D_80244BD4_B57404 .word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244C04_B57434, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244C04_B57434 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241554_B53D84, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244BD4_B57404, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, jan_06_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244BD4_B57404, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244D10_B57540 .word 0x00000000, 0x0014001C, D_80244B88_B573B8, D_80244C04_B57434, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -45,13 +45,13 @@ dlabel D_802450A8_B578D8 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_802450D8_B57908 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_06_UnkNpcAIFunc28, D_802450A8_B578D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_06_SpearGuyAI_Main, D_802450A8_B578D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245148_B57978 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802450D8_B57908, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 dlabel D_80245174_B579A4 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_06_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_06_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024521C_B57A4C .word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80245174_B579A4, 0x00000000, 0x00000000, D_80244FEC_B5781C, 0x00000000, 0x00000000, 0x00100008 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s index 9c32c8eb8c..11ce2b645c 100644 --- a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s @@ -15,13 +15,13 @@ dlabel D_80241574_B5ADE4 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_802415A4_B5AE14 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_07_UnkNpcAIFunc28, D_80241574_B5ADE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_07_SpearGuyAI_Main, D_80241574_B5ADE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241614_B5AE84 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802415A4_B5AE14, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 dlabel D_80241640_B5AEB0 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_07_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416E8_B5AF58 .word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80241640_B5AEB0, 0x00000000, 0x00000000, D_802414B8_B5AD28, 0x00000000, 0x00000000, 0x00100008 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s b/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s index 68e684924d..6cb917e137 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s @@ -24,7 +24,7 @@ dlabel D_80244B44_B62DF4 .word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244B74_B62E24, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B74_B62E24 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802413A0_B5F650, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244B44_B62DF4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, jan_08_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244B44_B62DF4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244C80_B62F30 .word 0x00000000, 0x0014001C, D_80244AF8_B62DA8, D_80244B74_B62E24, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -57,13 +57,13 @@ dlabel D_80245018_B632C8 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_80245048_B632F8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_08_UnkNpcAIFunc28, D_80245018_B632C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_08_SpearGuyAI_Main, D_80245018_B632C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802450B8_B63368 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80245048_B632F8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 dlabel D_802450E4_B63394 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_08_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024518C_B6343C .word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_802450E4_B63394, 0x00000000, 0x00000000, D_80244F5C_B6320C, 0x00000000, 0x00000000, 0x00100008 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s index a639d7dbab..0da7b7a0ad 100644 --- a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s @@ -219,13 +219,13 @@ dlabel D_80244FB8_B6AA68 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_80244FE8_B6AA98 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_09_UnkNpcAIFunc28, D_80244FB8_B6AA68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_09_SpearGuyAI_Main, D_80244FB8_B6AA68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245058_B6AB08 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80244FE8_B6AA98, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 dlabel D_80245084_B6AB34 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_09_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_09_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024512C_B6ABDC .word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80245084_B6AB34, 0x00000000, 0x00000000, D_80244EFC_B6A9AC, 0x00000000, 0x00000000, 0x00100008 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s b/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s index 8dc3e098ba..f01ecfd76f 100644 --- a/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s +++ b/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s @@ -15,7 +15,7 @@ dlabel D_80241B50_B6DEE0 .word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001 dlabel D_80241B80_B6DF10 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_10_UnkNpcAIMainFunc2, D_80241B50_B6DEE0, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_10_HoppingAI_Main, D_80241B50_B6DEE0, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BBC_B6DF4C .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241B80_B6DF10, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s b/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s index 983f13827e..5345e1b62a 100644 --- a/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s +++ b/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s @@ -18,10 +18,10 @@ dlabel D_802413C0_B74470 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024337C, 0x00000046, 0x00000001, 0x80242C80, 0x00000044, 0x00000001, D_80242098_B75148, 0x00000044, 0x00000001, 0x80242BD4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241378_B74428, 0x00000044, 0x00000001, EnterWalk, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414F0_B745A0 -.word 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C87, 0xFFFFFFEC, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_80240000_B730B0, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0xFE363C85, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000004, func_802400F8_B731A8, 0xFE363C80, 0xF24A3E80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0xFE363C86, 0xFE363C81, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A3E80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, func_802400F8_B731A8, 0xFE363C80, 0xF24ACA80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C87, 0xFFFFFFEC, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, jan_12_PullVine_WaitForPlayerGrab, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0xFE363C85, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000004, jan_12_PullVine_UpdatePosition, 0xFE363C80, 0xF24A3E80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0xFE363C86, 0xFE363C81, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A3E80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, jan_12_PullVine_UpdatePosition, 0xFE363C80, 0xF24ACA80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D90_B74E40 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001E, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802401CC_B7327C, 0x0000001C, 0xFE363C86, 0x00000043, 0x00000003, func_802401CC_B7327C, 0x0000001E, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001E, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_12_PullVine_ShearBushModel, 0x0000001C, 0xFE363C86, 0x00000043, 0x00000003, jan_12_PullVine_ShearBushModel, 0x0000001E, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F58_B75008 .word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000044, 0x00000001, D_80241D90_B74E40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s b/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s index 2967fe70ed..c992583b0b 100644 --- a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s +++ b/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s @@ -15,13 +15,13 @@ dlabel D_80242DFC_B75EAC .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 dlabel D_80242E2C_B75EDC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_12_UnkNpcAIFunc28, D_80242DFC_B75EAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_12_SpearGuyAI_Main, D_80242DFC_B75EAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E9C_B75F4C .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80242E2C_B75EDC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 dlabel D_80242EC8_B75F78 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_12_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_12_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F70_B76020 .word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80242EC8_B75F78, 0x00000000, 0x00000000, D_80242D40_B75DF0, 0x00000000, 0x00000000, 0x00100008 diff --git a/ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s b/ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s index 30fb4f6c01..3d6a72bc36 100644 --- a/ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s @@ -3,10 +3,10 @@ .section .data dlabel D_80241570_B7B5C0 -.word 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C87, 0xFFFFFFEC, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_80240000_B7A050, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0xFE363C85, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000004, func_802400F8_B7A148, 0xFE363C80, 0xF24A3E80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0xFE363C86, 0xFE363C81, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A3E80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, func_802400F8_B7A148, 0xFE363C80, 0xF24ACA80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C87, 0xFFFFFFEC, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, jan_14_PullVine_WaitForPlayerGrab, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0xFE363C85, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000004, jan_14_PullVine_UpdatePosition, 0xFE363C80, 0xF24A3E80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0xFE363C86, 0xFE363C81, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A3E80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, jan_14_PullVine_UpdatePosition, 0xFE363C80, 0xF24ACA80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E10_B7BE60 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000E, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000037, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000039, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802401CC_B7A21C, 0x00000037, 0xFE363C86, 0x00000043, 0x00000003, func_802401CC_B7A21C, 0x00000039, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000E, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000037, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000039, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_14_PullVine_ShearBushModel, 0x00000037, 0xFE363C86, 0x00000043, 0x00000003, jan_14_PullVine_ShearBushModel, 0x00000039, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FD8_B7C028 .word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F81, 0xF24A8080, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s b/ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s index c999323ffd..0c01506194 100644 --- a/ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s @@ -6,7 +6,7 @@ dlabel D_80243270_B7D2C0 .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40900000, 0x00000046, 0x0000000A, 0x43480000, 0x00000000, 0x00000001 dlabel D_802432A0_B7D2F0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_14_UnkNpcAIMainFunc2, D_80243270_B7D2C0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802432A0_B7D2F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_14_HoppingAI_Main, D_80243270_B7D2C0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802432A0_B7D2F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 dlabel D_80243308_B7D358 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s b/ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s index d02de46c3d..d06668b7ee 100644 --- a/ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s @@ -12,7 +12,7 @@ dlabel D_80240664_B7DF84 .word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240694_B7DFB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240694_B7DFB4 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240000_B7D920, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80240664_B7DF84, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, jan_15_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80240664_B7DF84, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407A0_B7E0C0 .word 0x00000000, 0x0014001C, D_80240618_B7DF38, D_80240694_B7DFB4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s index b9b1fdfa03..2f4ee0867e 100644 --- a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s @@ -48,7 +48,7 @@ dlabel D_8024240C_B8658C .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024243C_B865BC -.word 0x00000043, 0x00000002, jan_22_UnkNpcAIMainFunc, D_8024240C_B8658C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, jan_22_PatrolNoAttackAI_Main, D_8024240C_B8658C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024245C_B865DC .word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_8024243C_B865BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s b/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s index 391d6c5908..ab838caca0 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_00/ABC3D0.data.s @@ -33,7 +33,7 @@ dlabel D_8024184C_ABCADC .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024187C_ABCB0C -.word 0x00000043, 0x00000002, kkj_00_UnkNpcAIMainFunc, D_8024184C_ABCADC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kkj_00_PatrolNoAttackAI_Main, D_8024184C_ABCADC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024189C_ABCB2C .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024187C_ABCB0C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024187C_ABCB0C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s b/ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s index 70f09834fb..a2a9a430f6 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_01/AC67E0.data.s @@ -6,7 +6,7 @@ dlabel D_80241670_AC67E0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802416A0_AC6810 -.word 0x00000043, 0x00000002, DoBasicAI, D_80241670_AC67E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80241670_AC67E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416C0_AC6830 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_802416A0_AC6810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_802416A0_AC6810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -15,7 +15,7 @@ dlabel D_80241718_AC6888 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80241748_AC68B8 -.word 0x00000043, 0x00000002, kkj_01_UnkNpcAIMainFunc, D_80241718_AC6888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kkj_01_PatrolNoAttackAI_Main, D_80241718_AC6888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241768_AC68D8 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80241748_AC68B8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80241748_AC68B8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s b/ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s index ebb1ab66a9..c1b4c5d96c 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_02/AC9160.data.s @@ -6,7 +6,7 @@ dlabel D_80240440_AC9160 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80240470_AC9190 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240440_AC9160, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240440_AC9160, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240490_AC91B0 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80240470_AC9190, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80240470_AC9190, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s index fa91ccd0d3..a7ac53f4f5 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s @@ -9,7 +9,7 @@ dlabel D_80241F14_AF4BB4 .word 0x00000000 dlabel D_80241F18_AF4BB8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, tik_07_sixFloats, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, tik_07_FlyingAI_JumpVels, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420AC_AF4D4C .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s index 2471114c11..2a0cc07d41 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s @@ -12,7 +12,7 @@ dlabel D_802449D0_8B4A40 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244A00_8B4A70 -.word 0x00000043, 0x00000002, DoBasicAI, D_802449D0_8B4A40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80244A00_8B4A70, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802449D0_8B4A40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80244A00_8B4A70, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_80244A4C_8B4ABC .word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 @@ -30,7 +30,7 @@ dlabel D_80244B2C_8B4B9C .word D_80244A4C_8B4ABC, D_80244A84_8B4AF4, D_80244ABC_8B4B2C, D_80244AF4_8B4B64 dlabel D_80244B3C_8B4BAC -.word 0x40000000, 0x0000000F, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, D_80244B3C_8B4BAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x40000000, 0x0000000F, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, BasicAI_Main, D_80244B3C_8B4BAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B8C_8B4BFC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80257D20, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s index c2f65380ea..f79f7d28a9 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s @@ -69,7 +69,7 @@ dlabel D_80247B50_8B7BC0 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80247B80_8B7BF0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80247B50_8B7BC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80247B50_8B7BC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247BA0_8B7C10 .word 0x00AF0001, 0x0023001C, D_80247A40_8B7AB0, D_80247AB4_8B7B24, 0x00000000, 0x00000000, D_80247B34_8B7BA4, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80247A40_8B7AB0, D_80247AB4_8B7B24, D_80247B80_8B7BF0, 0x00000000, D_80247B34_8B7BA4, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 @@ -78,7 +78,7 @@ dlabel D_80247BF8_8B7C68 .word 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x43960000, 0x00000000, 0x0000001E dlabel D_80247C1C_8B7C8C -.word 0x00000043, 0x00000002, kmr_02_UnkNpcAIMainFunc4, D_80247BF8_8B7C68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_02_StationaryAI_Main, D_80247BF8_8B7C68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247C3C_8B7CAC .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80247C1C_8B7C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80247C1C_8B7C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -87,7 +87,7 @@ dlabel D_80247C94_8B7D04 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80247CC4_8B7D34 -.word 0x00000043, 0x00000002, DoBasicAI, D_80247C94_8B7D04, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80247C94_8B7D04, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247CE4_8B7D54 .word 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80247CC4_8B7D34, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -99,7 +99,7 @@ dlabel D_80247D3C_8B7DAC .word 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x43960000, 0x00000000, 0x0000001E dlabel D_80247D60_8B7DD0 -.word 0x00000043, 0x00000002, kmr_02_UnkNpcAIMainFunc4, D_80247D3C_8B7DAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_02_StationaryAI_Main, D_80247D3C_8B7DAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247D80_8B7DF0 .word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, D_80247D60_8B7DD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 @@ -135,34 +135,34 @@ dlabel D_802480BC_8B812C .word 0x40000000, 0x0000000F, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802480EC_8B815C -.word 0x00000043, 0x00000002, DoBasicAI, D_802480BC_8B812C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802480BC_8B812C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024810C_8B817C .word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248154_8B81C4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802481D4_8B8244 -.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, kmr_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 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_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 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_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802484F8_8B8568 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248568_8B85D8 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802426A0_8B2710, 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_802484F8_8B8568, 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_802455D4_8B5644, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802426E4_8B2754, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802484F8_8B8568, 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_802455D4_8B5644, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248860_8B88D0 .word 0x00000040, 0x00000000 dlabel D_80248868_8B88D8 -.word 0x00000043, 0x0000000B, kmr_02_SetManyVars, 0x00000003, 0x00A00004, 0x00A00001, 0x00000040, 0x00000046, 0x000B006F, 0x000B0070, 0x000B0071, 0x000B0072, D_80248860_8B88D0, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kmr_02_LetterDelivery_Init, 0x00000003, 0x00A00004, 0x00A00001, 0x00000040, 0x00000046, 0x000B006F, 0x000B0070, 0x000B0071, 0x000B0072, D_80248860_8B88D0, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802488B8_8B8928 .word 0x00000052, 0x00000000 dlabel D_802488C0_8B8930 -.word 0x00000043, 0x0000000B, kmr_02_SetManyVars, 0x00000003, 0x00A00004, 0x00A00001, 0x00000052, 0x00000000, 0x000B0073, 0x000B0074, 0x000B0075, 0x000B0076, D_802488B8_8B8928, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kmr_02_LetterDelivery_Init, 0x00000003, 0x00A00004, 0x00A00001, 0x00000052, 0x00000000, 0x000B0073, 0x000B0074, 0x000B0075, 0x000B0076, D_802488B8_8B8928, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248910_8B8980 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000114, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000003, AddBadge, 0x00000114, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -171,7 +171,7 @@ dlabel D_80248978_8B89E8 .word 0x00000037, 0x00000000 dlabel D_80248980_8B89F0 -.word 0x00000043, 0x0000000B, kmr_02_SetManyVars, 0x00000000, 0x009D0008, 0x009D0001, 0x00000037, 0x00000000, 0x000B0045, 0x000B0046, 0x000B0047, 0x000B0048, D_80248978_8B89E8, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kmr_02_LetterDelivery_Init, 0x00000000, 0x009D0008, 0x009D0001, 0x00000037, 0x00000000, 0x000B0045, 0x000B0046, 0x000B0047, 0x000B0048, D_80248978_8B89E8, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802489D0_8B8A40 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -354,7 +354,7 @@ dlabel D_802513F0_8C1460 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80251420_8C1490 -.word 0x00000043, 0x00000002, DoBasicAI, D_802513F0_8C1460, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80251420_8C1490, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802513F0_8C1460, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80251420_8C1490, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_8025146C_8C14DC .word 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s index a383ee38c0..b3a7c8ad94 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s @@ -21,7 +21,7 @@ dlabel D_80255630_8C56A0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80255660_8C56D0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80255630_8C56A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80255660_8C56D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80255630_8C56A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80255660_8C56D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_802556AC_8C571C .word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 @@ -42,7 +42,7 @@ dlabel D_8025579C_8C580C .word 0x40000000, 0x0000000F, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802557CC_8C583C -.word 0x00000043, 0x00000002, DoBasicAI, D_8025579C_8C580C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8025579C_8C580C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802557EC_8C585C .word 0x43EC8000, 0x43160000, 0x43968000, 0x436A0000, 0x42A00000, 0x43480000, 0x42380000, 0x43160000, 0x43340000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_05/8CF880.data.s b/ver/us/asm/data/world/area_kmr/kmr_05/8CF880.data.s index 0182d7e5db..f6697bc3a6 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_05/8CF880.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_05/8CF880.data.s @@ -15,19 +15,19 @@ dlabel D_80241AB0_8CFB20 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80241AE0_8CFB50 -.word 0x00000043, 0x00000002, DoBasicAI, D_80241AB0_8CFB20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80241AB0_8CFB20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B00_8CFB70 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80241AE0_8CFB50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 -dlabel kmr_05_sixFloats +dlabel kmr_05_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80241B44_8CFBB4 .word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001 dlabel D_80241B74_8CFBE4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_05_UnkNpcAIMainFunc9, D_80241B44_8CFBB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_05_FlyingAI_Main, D_80241B44_8CFBB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BE4_8CFC54 .word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_80241B74_8CFBE4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060002 @@ -36,7 +36,7 @@ dlabel D_80241C10_8CFC80 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80241C40_8CFCB0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80241C10_8CFC80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80241C10_8CFC80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C60_8CFCD0 .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80241C40_8CFCB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_06/8D3340.data.s b/ver/us/asm/data/world/area_kmr/kmr_06/8D3340.data.s index 9f97770987..fec71ceeee 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_06/8D3340.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_06/8D3340.data.s @@ -15,19 +15,19 @@ dlabel D_80242040_8D3550 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80242070_8D3580 -.word 0x00000043, 0x00000002, DoBasicAI, D_80242040_8D3550, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80242040_8D3550, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242090_8D35A0 .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80242070_8D3580, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel kmr_06_sixFloats +dlabel kmr_06_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802420D4_8D35E4 .word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001 dlabel D_80242104_8D3614 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_06_UnkNpcAIMainFunc9, D_802420D4_8D35E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_06_FlyingAI_Main, D_802420D4_8D35E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242174_8D3684 .word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_80242104_8D3614, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060002 diff --git a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s index 89a44e8c7e..ed3e5b7c41 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s @@ -18,7 +18,7 @@ dlabel D_80240E90_8D4C50 .word 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240EB4_8D4C74 -.word 0x00000043, 0x00000002, kmr_07_UnkNpcAIMainFunc4, D_80240E90_8D4C50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_07_StationaryAI_Main, D_80240E90_8D4C50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240ED4_8D4C94 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80240EB4_8D4C74, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_09/8D73C0.data.s b/ver/us/asm/data/world/area_kmr/kmr_09/8D73C0.data.s index cb5ec6e64a..cfdef0bda3 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_09/8D73C0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_09/8D73C0.data.s @@ -15,19 +15,19 @@ dlabel D_802417F0_8D75F0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80241820_8D7620 -.word 0x00000043, 0x00000002, DoBasicAI, D_802417F0_8D75F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802417F0_8D75F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241840_8D7640 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80241820_8D7620, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 -dlabel kmr_09_sixFloats +dlabel kmr_09_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80241884_8D7684 .word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001 dlabel D_802418B4_8D76B4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_09_UnkNpcAIMainFunc9, D_80241884_8D7684, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, kmr_09_FlyingAI_Main, D_80241884_8D7684, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241924_8D7724 .word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_802418B4_8D76B4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060002 diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s index f3403d238d..4e393acfad 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s @@ -6,7 +6,7 @@ dlabel D_80244300_8DE400 .word 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80244324_8DE424 -.word 0x00000043, 0x00000002, kmr_11_UnkNpcAIMainFunc4, D_80244300_8DE400, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kmr_11_StationaryAI_Main, D_80244300_8DE400, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244344_8DE444 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80244324_8DE424, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s index 3cdf398858..faf1f2b04e 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s @@ -6,22 +6,22 @@ dlabel D_80240E10_A47D70 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240E40_A47DA0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EB0_A47E10 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80240EE0_A47E40 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240EB0_A47E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240EB0_A47E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F50_A47EB0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80240F80_A47EE0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240F50_A47EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240F50_A47EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FF0_A47F50 -.word 0x00000043, 0x00000001, kpa_01_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_01_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_01_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_UnkNpcAIMainFunc5, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240E40_A47DA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240FF0_A47F50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EE0_A47E40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 +.word 0x00000043, 0x00000001, kpa_01_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_01_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_01_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240E40_A47DA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240FF0_A47F50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EE0_A47E40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80241168_A480C8 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80240F80_A47EE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s index 28adc56830..d8395abe0a 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s @@ -6,7 +6,7 @@ dlabel D_80242190_A4A750 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802421C0_A4A780 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_80242190_A4A750, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_80242190_A4A750, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242230_A4A7F0 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802421C0_A4A780, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 @@ -15,27 +15,27 @@ dlabel D_8024225C_A4A81C .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_8024228C_A4A84C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422FC_A4A8BC .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_8024232C_A4A8EC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_802422FC_A4A8BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_802422FC_A4A8BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024239C_A4A95C .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802423CC_A4A98C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_8024239C_A4A95C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_8024239C_A4A95C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024243C_A4A9FC -.word 0x00000043, 0x00000001, kpa_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_UnkNpcAIMainFunc5, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024228C_A4A84C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024243C_A4A9FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024232C_A4A8EC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 +.word 0x00000043, 0x00000001, kpa_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024228C_A4A84C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024243C_A4A9FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024232C_A4A8EC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_802425B4_A4AB74 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802423CC_A4A98C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 -dlabel D_802425E0_A4ABA0 +dlabel kpa_03_MagikoopaAI_TeleportAnim .float 0.8 dlabel D_802425E4_A4ABA4 @@ -48,13 +48,13 @@ dlabel D_80242664_A4AC24 .word 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40400000, 0x0000005A, 0x0000000F, 0x43480000, 0x00000000, 0x00000001 dlabel D_80242694_A4AC54 -.word 0x00000043, 0x00000002, func_80241AB4_A4A074, D_80242664_A4AC24, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kpa_03_MagikoopaAI_Main, D_80242664_A4AC24, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802426B4_A4AC74 .word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242740_A4AD00 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241D20_A4A2E0, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, func_80241D6C_A4A32C, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802427C0_A4AD80 .word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80242694_A4AC54, D_802426B4_A4AC74, 0x00000000, D_80242740_A4AD00, 0x00000000, 0x00000000, 0x001A0000 @@ -69,10 +69,10 @@ dlabel D_80242844_A4AE04 .word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024287C_A4AE3C -.word 0x00000043, 0x00000001, kpa_03_UnkFunc57, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_03_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242898_A4AE58 -.word 0x00000043, 0x00000001, kpa_03_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241DFC_A4A3BC, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802428EC_A4AEAC .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s b/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s index f1b33fb007..a65a1d6a56 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80241CF0_A4E710 +dlabel kpa_08_MagikoopaAI_TeleportAnim .float 0.8 dlabel D_80241CF4_A4E714 @@ -15,13 +15,13 @@ dlabel D_80241D74_A4E794 .word 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40400000, 0x0000005A, 0x0000000F, 0x43480000, 0x00000000, 0x00000001 dlabel D_80241DA4_A4E7C4 -.word 0x00000043, 0x00000002, func_8024110C_A4DB2C, D_80241D74_A4E794, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kpa_08_MagikoopaAI_Main, D_80241D74_A4E794, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DC4_A4E7E4 .word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E50_A4E870 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241378_A4DD98, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, func_802413C4_A4DDE4, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241ED0_A4E8F0 .word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80241DA4_A4E7C4, D_80241DC4_A4E7E4, 0x00000000, D_80241E50_A4E870, 0x00000000, 0x00000000, 0x001A0000 @@ -36,10 +36,10 @@ dlabel D_80241F54_A4E974 .word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F8C_A4E9AC -.word 0x00000043, 0x00000001, kpa_08_UnkFunc57, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_08_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FA8_A4E9C8 -.word 0x00000043, 0x00000001, kpa_08_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241454_A4DE74, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FFC_A4EA1C .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s b/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s index e2fcedd046..31cb3a3a6e 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s @@ -9,7 +9,7 @@ dlabel D_80241C60_A50C60 .word 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001 dlabel D_80241C90_A50C90 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, kpa_09_UnkNpcAIMainFunc7, D_80241C60_A50C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, kpa_09_RangedAttackAI_Main, D_80241C60_A50C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D00_A50D00 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, D_80241C90_A50C90, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001E0000 @@ -18,13 +18,13 @@ dlabel D_80241D2C_A50D2C .word 0x40F00000, 0x00000000, 0x00000000, 0x3F8CCCCD, 0x3E3851EC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241D5C_A50D5C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, kpa_09_UnkFunc54, D_80241D2C_A50D2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, kpa_09_ProjectileAI_Main, D_80241D2C_A50D2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DCC_A50DCC .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DDC_A50DDC -.word 0x00000043, 0x00000001, kpa_09_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241DCC_A50DCC, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_09_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241D5C_A50D5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_09_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241DCC_A50DCC, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_09_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241D5C_A50D5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FA4_A50FA4 .word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241D5C_A50D5C, D_80241DDC_A50DDC, 0x00000000, D_80241B90_A50B90, 0x00000000, 0x00000000, 0x00000008 diff --git a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s b/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s index e918217508..e4dc0a4b7a 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s @@ -9,7 +9,7 @@ dlabel D_80244020_A97760 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 dlabel D_80244050_A97790 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_102_UnkNpcAIMainFunc7, D_80244020_A97760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_102_RangedAttackAI_Main, D_80244020_A97760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802440C0_A97800 .word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80244050_A97790, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 @@ -18,13 +18,13 @@ dlabel D_802440EC_A9782C .word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024411C_A9785C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_102_UnkFunc54, D_802440EC_A9782C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_102_ProjectileAI_Main, D_802440EC_A9782C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244178_A978B8 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244188_A978C8 -.word 0x00000043, 0x00000001, kpa_102_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244178_A978B8, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_102_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024411C_A9785C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_102_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244178_A978B8, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_102_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024411C_A9785C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244350_A97A90 .word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_8024411C_A9785C, D_80244188_A978C8, 0x00000000, D_80243F50_A97690, 0x00000000, 0x00000000, 0x00000008 @@ -36,7 +36,7 @@ dlabel D_80244384_A97AC4 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802443B4_A97AF4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_102_UnkNpcAIMainFunc5, D_80244384_A97AC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_102_TackleAI_Main, D_80244384_A97AC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244424_A97B64 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802443B4_A97AF4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 @@ -45,7 +45,7 @@ dlabel D_80244450_A97B90 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42C80000, 0x41A00000, 0x00000003, 0x40A00000, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 dlabel D_80244480_A97BC0 -.word 0x00000043, 0x00000002, func_80243270_A969B0, D_80244450_A97B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kpa_102_FlyingMagikoopaAI_Main, D_80244450_A97B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802444A0_A97BE0 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -63,10 +63,10 @@ dlabel D_802445C0_A97D00 .word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802445F8_A97D38 -.word 0x00000043, 0x00000001, kpa_102_UnkFunc57, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_102_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244614_A97D54 -.word 0x00000043, 0x00000001, dup_kpa_102_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024353C_A96C7C, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_102_FlyingMagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_102_FlyingMagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244668_A97DA8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00560000, 0x00000000, D_80244588_A97CC8, 0x00000000, D_802445F8_A97D38, D_80244614_A97D54, 0x00000000, D_80244668_A97DA8, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s index 99709065d5..8d4cadb190 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s @@ -6,7 +6,7 @@ dlabel D_80241570_A53E30 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802415A0_A53E60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_11_UnkNpcAIMainFunc5, D_80241570_A53E30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_11_TackleAI_Main, D_80241570_A53E30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241610_A53ED0 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802415A0_A53E60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s b/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s index 2d9c2f5e23..2a96c7178e 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s @@ -18,7 +18,7 @@ dlabel D_80241E90_A9B420 .word 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001 dlabel D_80241EC0_A9B450 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, kpa_111_UnkNpcAIMainFunc7, D_80241E90_A9B420, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, kpa_111_RangedAttackAI_Main, D_80241E90_A9B420, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F30_A9B4C0 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, D_80241EC0_A9B450, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001E0000 @@ -27,13 +27,13 @@ dlabel D_80241F5C_A9B4EC .word 0x40F00000, 0x00000000, 0x00000000, 0x3F8CCCCD, 0x3E3851EC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241F8C_A9B51C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, kpa_111_UnkFunc54, D_80241F5C_A9B4EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, kpa_111_ProjectileAI_Main, D_80241F5C_A9B4EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FFC_A9B58C .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024200C_A9B59C -.word 0x00000043, 0x00000001, kpa_111_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FFC_A9B58C, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_111_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241F8C_A9B51C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_111_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FFC_A9B58C, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_111_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241F8C_A9B51C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421D4_A9B764 .word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241F8C_A9B51C, D_8024200C_A9B59C, 0x00000000, D_80241DC0_A9B350, 0x00000000, 0x00000000, 0x00000008 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s index 8d806e6fe9..a19d30dc2f 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s @@ -15,22 +15,22 @@ dlabel D_80241740_A9E370 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241770_A9E3A0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417E0_A9E410 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241810_A9E440 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_802417E0_A9E410, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_802417E0_A9E410, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241880_A9E4B0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802418B0_A9E4E0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_80241880_A9E4B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_80241880_A9E4B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241920_A9E550 -.word 0x00000043, 0x00000001, kpa_113_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_113_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_113_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_UnkNpcAIMainFunc5, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241770_A9E3A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241920_A9E550, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241810_A9E440, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 +.word 0x00000043, 0x00000001, kpa_113_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_113_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_113_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241770_A9E3A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241920_A9E550, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241810_A9E440, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80241A98_A9E6C8 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802418B0_A9E4E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s b/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s index c40f4c527c..e8710b0205 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s @@ -9,7 +9,7 @@ dlabel D_80241EB0_AA0BF0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 dlabel D_80241EE0_AA0C20 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_115_UnkNpcAIMainFunc7, D_80241EB0_AA0BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_115_RangedAttackAI_Main, D_80241EB0_AA0BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F50_AA0C90 .word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80241EE0_AA0C20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 @@ -18,13 +18,13 @@ dlabel D_80241F7C_AA0CBC .word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241FAC_AA0CEC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_115_UnkFunc54, D_80241F7C_AA0CBC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_115_ProjectileAI_Main, D_80241F7C_AA0CBC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242008_AA0D48 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242018_AA0D58 -.word 0x00000043, 0x00000001, kpa_115_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242008_AA0D48, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_115_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FAC_AA0CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_115_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242008_AA0D48, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_115_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FAC_AA0CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421E0_AA0F20 .word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241FAC_AA0CEC, D_80242018_AA0D58, 0x00000000, D_80241DE0_AA0B20, 0x00000000, 0x00000000, 0x00000008 diff --git a/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s b/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s index ffce129a62..296d0554f5 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s @@ -6,25 +6,25 @@ dlabel D_80240B50_AA3870 .word 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240B74_AA3894 -.word 0x00000043, 0x00000002, func_802404AC_AA31CC, D_80240B50_AA3870, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kpa_130_BillBlasterAI_Main, D_80240B50_AA3870, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B94_AA38B4 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80240BC4_AA38E4 -.word 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, kpa_130_BulletBill_Think, D_80240B94_AA38B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, kpa_130_BulletBillAI_Main, D_80240B94_AA38B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C24_AA3944 .word 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240C48_AA3968 -.word 0x00000043, 0x00000002, func_802404AC_AA31CC, D_80240C24_AA3944, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kpa_130_BillBlasterAI_Main, D_80240C24_AA3944, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C68_AA3988 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40E9999A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80240C98_AA39B8 -.word 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, kpa_130_BulletBill_Think, D_80240C68_AA3988, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, kpa_130_BulletBillAI_Main, D_80240C68_AA3988, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CF8_AA3A18 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s index 065ae94b1a..fb2db06b88 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s @@ -21,7 +21,7 @@ dlabel D_80241EC0_A62890 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 dlabel D_80241EF0_A628C0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_50_UnkNpcAIMainFunc7, D_80241EC0_A62890, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_50_RangedAttackAI_Main, D_80241EC0_A62890, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F60_A62930 .word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80241EF0_A628C0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 @@ -30,13 +30,13 @@ dlabel D_80241F8C_A6295C .word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241FBC_A6298C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_50_UnkFunc54, D_80241F8C_A6295C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_50_ProjectileAI_Main, D_80241F8C_A6295C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242018_A629E8 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242028_A629F8 -.word 0x00000043, 0x00000001, kpa_50_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242018_A629E8, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_50_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FBC_A6298C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_50_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242018_A629E8, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_50_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FBC_A6298C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421F0_A62BC0 .word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241FBC_A6298C, D_80242028_A629F8, 0x00000000, D_80241DF0_A627C0, 0x00000000, 0x00000000, 0x00000008 @@ -48,7 +48,7 @@ dlabel D_80242224_A62BF4 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80242254_A62C24 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_50_UnkNpcAIMainFunc5, D_80242224_A62BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_50_TackleAI_Main, D_80242224_A62BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422C4_A62C94 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242254_A62C24, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s index 38b085540f..45c5885cc1 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s @@ -2,7 +2,7 @@ .section .data -dlabel D_80242050_A660E0 +dlabel kpa_51_MagikoopaAI_TeleportAnim .float 0.8 dlabel D_80242054_A660E4 @@ -15,13 +15,13 @@ dlabel D_802420D4_A66164 .word 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40400000, 0x0000005A, 0x0000000F, 0x43480000, 0x00000000, 0x00000001 dlabel D_80242104_A66194 -.word 0x00000043, 0x00000002, func_802410BC_A6514C, D_802420D4_A66164, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kpa_51_MagikoopaAI_Main, D_802420D4_A66164, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242124_A661B4 .word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421B0_A66240 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80241328_A653B8, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, func_80241374_A65404, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242230_A662C0 .word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80242104_A66194, D_80242124_A661B4, 0x00000000, D_802421B0_A66240, 0x00000000, 0x00000000, 0x001A0000 @@ -36,10 +36,10 @@ dlabel D_802422B4_A66344 .word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422EC_A6637C -.word 0x00000043, 0x00000001, kpa_51_UnkFunc57, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_51_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242308_A66398 -.word 0x00000043, 0x00000001, kpa_51_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241404_A65494, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024235C_A663EC .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -51,7 +51,7 @@ dlabel D_80242470_A66500 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_802424A0_A66530 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_51_UnkNpcAIMainFunc5, D_80242470_A66500, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_51_TackleAI_Main, D_80242470_A66500, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242510_A665A0 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802424A0_A66530, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s b/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s index eda2ae16dd..dfb727972b 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s @@ -9,7 +9,7 @@ dlabel D_80241B10_A68C10 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 dlabel D_80241B40_A68C40 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_52_UnkNpcAIMainFunc7, D_80241B10_A68C10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_52_RangedAttackAI_Main, D_80241B10_A68C10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BB0_A68CB0 .word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80241B40_A68C40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 @@ -18,13 +18,13 @@ dlabel D_80241BDC_A68CDC .word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241C0C_A68D0C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_52_UnkFunc54, D_80241BDC_A68CDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_52_ProjectileAI_Main, D_80241BDC_A68CDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C68_A68D68 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C78_A68D78 -.word 0x00000043, 0x00000001, kpa_52_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C68_A68D68, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_52_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C0C_A68D0C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_52_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C68_A68D68, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_52_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241C0C_A68D0C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E40_A68F40 .word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241C0C_A68D0C, D_80241C78_A68D78, 0x00000000, D_80241A40_A68B40, 0x00000000, 0x00000000, 0x00000008 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s index 98fac4bcbc..d7c2260490 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s @@ -6,7 +6,7 @@ dlabel D_80242C00_A70FE0 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80242C30_A71010 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_61_UnkNpcAIMainFunc5, D_80242C00_A70FE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_61_TackleAI_Main, D_80242C00_A70FE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242CA0_A71080 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242C30_A71010, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 @@ -15,7 +15,7 @@ dlabel D_80242CCC_A710AC .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42C80000, 0x41A00000, 0x00000003, 0x40A00000, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 dlabel D_80242CFC_A710DC -.word 0x00000043, 0x00000002, btl_state_update_begin_player_turn_A70404, D_80242CCC_A710AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, kpa_61_FlyingMagikoopaAI_Main, D_80242CCC_A710AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242D1C_A710FC .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -33,10 +33,10 @@ dlabel D_80242E3C_A7121C .word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E74_A71254 -.word 0x00000043, 0x00000001, kpa_61_UnkFunc57, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_61_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E90_A71270 -.word 0x00000043, 0x00000001, kpa_61_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802422F0_A706D0, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_61_FlyingMagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_61_FlyingMagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242EE4_A712C4 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00560000, 0x00000000, D_80242E04_A711E4, 0x00000000, D_80242E74_A71254, D_80242E90_A71270, 0x00000000, D_80242EE4_A712C4, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s b/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s index e55ec7ccc0..dbf9cd2682 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_70/A75B70.data.s @@ -6,7 +6,7 @@ dlabel D_80241300_A75B70 .word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80241330_A75BA0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_70_UnkNpcAIMainFunc5, D_80241300_A75B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_70_TackleAI_Main, D_80241300_A75B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413A0_A75C10 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80241330_A75BA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s b/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s index f1973c8bd7..9e08188e04 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s @@ -9,7 +9,7 @@ dlabel D_80240AAC_A7AFAC .word 0x40A00000, 0x00000001, 0x00000000, 0x3F800000, 0x00000000, 0x00000001, 0x40C00000, 0x0000000A, 0x00000001, 0x3F800000, 0x00000000, 0x00000001 dlabel D_80240ADC_A7AFDC -.word 0x00000043, 0x00000002, DoBasicAI, D_80240AAC_A7AFAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240AAC_A7AFAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240AFC_A7AFFC .word 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80240ADC_A7AFDC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050000 @@ -18,7 +18,7 @@ dlabel D_80240B28_A7B028 .word 0x40A00000, 0x00000001, 0x00000000, 0x3F800000, 0x00000000, 0x00000001, 0x40C00000, 0x0000000A, 0x00000001, 0x3F800000, 0x00000000, 0x00000001 dlabel D_80240B58_A7B058 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240B28_A7B028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240B28_A7B028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B78_A7B078 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80240B58_A7B058, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00120000 @@ -27,7 +27,7 @@ dlabel D_80240BA4_A7B0A4 .word 0x40A00000, 0x00000001, 0x00000000, 0x3F800000, 0x00000000, 0x00000001, 0x40C00000, 0x0000000A, 0x00000001, 0x3F800000, 0x00000000, 0x00000001 dlabel D_80240BD4_A7B0D4 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240BA4_A7B0A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240BA4_A7B0A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BF4_A7B0F4 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80240BD4_A7B0D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000E0000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s index da61afc1bc..ec3e4dc8c8 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s @@ -12,7 +12,7 @@ dlabel D_80241D64_A887B4 .word 0x3F800000, 0x00000022, 0x00000032, 0x42B40000, 0x42480000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42700000, 0x00000001 dlabel D_80241D94_A887E4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, kpa_91_UnkNpcAIMainFunc8, D_80241D64_A887B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, kpa_91_KoopaPatrolAI_Main, D_80241D64_A887B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DF0_A88840 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80241D94_A887E4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s b/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s index 3846cb844b..05ca6cc132 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s @@ -12,7 +12,7 @@ dlabel D_80241F74_A8E9F4 .word 0x3F800000, 0x00000022, 0x00000032, 0x42B40000, 0x42480000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42700000, 0x00000001 dlabel D_80241FA4_A8EA24 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, kpa_95_UnkNpcAIMainFunc8, D_80241F74_A8E9F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, kpa_95_KoopaPatrolAI_Main, D_80241F74_A8E9F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242000_A8EA80 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80241FA4_A8EA24, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s index 68a49e551d..13fc21aa93 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_02/C5D9B0.data.s @@ -50,14 +50,14 @@ dlabel D_802440D0_C5E810 dlabel D_80244128_C5E868 .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002B, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002C, 0x00000021, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000023, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF97, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000006E, 0x000000D7, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_802403DC_C5AB1C, 0xFE363C84, 0x0000002B, 0x0000002C, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000043, 0x00000002, kzn_02_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000056, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF97, 0x000000D7, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000004, func_802403DC_C5AB1C, 0xFE363C84, 0x0000002B, 0x0000002C, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000002, func_802403B0_C5AAF0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000043, 0x00000002, kzn_02_GetFloorCollider, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000055, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x00000024, 0x00000002, 0xF4ACD480, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD483, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD485, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x00000009, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243834_C5DF74, 0x00000080, 0x0000001F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243834_C5DF74, 0x00000080, 0x00000020, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x0000000D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x0000000F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243914_C5E054, 0x00000080, 0x00000023, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243914_C5E054, 0x00000080, 0x00000024, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x00000011, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000028, 0x00000013, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_802439F4_C5E134, 0x00000080, 0x00000027, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_802439F4_C5E134, 0x00000080, 0x00000028, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002F, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000030, 0x0000001D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000031, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243AD4_C5E214, 0x00000080, 0x0000002F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243AD4_C5E214, 0x00000080, 0x00000030, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000033, 0x0000001A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000034, 0x00000019, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243BB4_C5E2F4, 0x00000080, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243BB4_C5E2F4, 0x00000080, 0x00000034, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000037, 0x00000016, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000038, 0x00000015, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243C94_C5E3D4, 0x00000080, 0x00000037, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80243C94_C5E3D4, 0x00000080, 0x00000038, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80243F18_C5E658, 0x00000044, 0x00000001, D_80243F70_C5E6B0, 0x00000044, 0x00000001, D_80243FC8_C5E708, 0x00000044, 0x00000001, D_80244020_C5E760, 0x00000044, 0x00000001, D_80244078_C5E7B8, 0x00000044, 0x00000001, D_802440D0_C5E810, 0x00000044, 0x00000001, D_80244128_C5E868, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel kzn_02_sixFloats +dlabel kzn_02_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244918_C5F058 .word 0x3F4CCCCD, 0x00000064, 0x00000000, 0x42B40000, 0x00000000, 0x00000004, 0x404CCCCD, 0x0000000A, 0x00000001, 0x42C80000, 0x00000000, 0x00000001 dlabel D_80244948_C5F088 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_02_UnkNpcAIMainFunc10, D_80244918_C5F058, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_02_FlyingNoAttackAI_Main, D_80244918_C5F058, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802449B8_C5F0F8 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244948_C5F088, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 @@ -78,25 +78,25 @@ dlabel D_80244A78_C5F1B8 .word 0x00000000 dlabel D_80244A7C_C5F1BC -.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, kzn_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242364_C5CAA4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024239C_C5CADC, 0xFE363C80, 0x0000004E, 0x00000006, D_80244A7C_C5F1BC, 0x00000010, 0x00000000, D_802465D0_915C80, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242310_C5CA50, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242364_C5CAA4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024239C_C5CADC, 0xFE363C80, 0x0000004E, 0x00000006, D_80244A7C_C5F1BC, 0x00000010, 0x00000000, D_802465D0_kzn_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242310_C5CA50, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244C10_C5F350 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244C90_C5F3D0 -.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, kzn_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244C10_C5F350, 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_80242364_C5CAA4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244C10_C5F350, 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_80242364_C5CAA4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244FB4_C5F6F4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024239C_C5CADC, 0xFE363C80, 0x0000004E, 0x00000006, D_80244C90_C5F3D0, 0x00000010, 0x00000000, D_802465D0_915C80, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242310_C5CA50, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024239C_C5CADC, 0xFE363C80, 0x0000004E, 0x00000006, D_80244C90_C5F3D0, 0x00000010, 0x00000000, D_802465D0_kzn_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242310_C5CA50, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245024_C5F764 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802426B4_C5CDF4, 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_80244FB4_C5F6F4, 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_80244A14_C5F154, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802426F8_C5CE38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80244FB4_C5F6F4, 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_80244A14_C5F154, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024531C_C5FA5C .word 0x00000054, 0x00000000 dlabel D_80245324_C5FA64 -.word 0x00000043, 0x0000000B, kzn_02_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024531C_C5FA5C, 0x00000046, 0x00000001, D_80245024_C5F764, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kzn_02_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024531C_C5FA5C, 0x00000046, 0x00000001, D_80245024_C5F764, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245374_C5FAB4 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244A14_C5F154, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s index 30b762bfef..548085e362 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s @@ -6,22 +6,22 @@ dlabel D_80243AA0_C647B0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243AD0_C647E0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_03_TackleAI_Main, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243B40_C64850 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243B70_C64880 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243B40_C64850, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_03_TackleAI_Main, D_80243B40_C64850, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243BE0_C648F0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80243C10_C64920 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243BE0_C648F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_03_TackleAI_Main, D_80243BE0_C648F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243C80_C64990 -.word 0x00000043, 0x00000001, kzn_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_03_UnkNpcAIMainFunc5, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243AD0_C647E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243C80_C64990, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, kzn_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_03_TackleAI_Main, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243AD0_C647E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243C80_C64990, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 dlabel D_80243DCC_C64ADC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243B70_C64880, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243C10_C64920, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 @@ -33,13 +33,13 @@ dlabel D_80243EE0_C64BF0 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80243F10_C64C20 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_8024234C_C6305C, D_80243EE0_C64BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, kzn_03_PiranhaPlantAI_Main, D_80243EE0_C64BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FE4_C64CF4 .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80243F10_C64C20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80244010_C64D20 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_03_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_03_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024411C_C64E2C .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80244010_C64D20, 0x00000000, 0x00000000, D_80243E24_C64B34, 0x00000000, 0x00000000, 0x00110000 @@ -63,25 +63,25 @@ dlabel D_80244208_C64F18 .word 0x00000000 dlabel D_8024420C_C64F1C -.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, kzn_03_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_80242934_C63644, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024296C_C6367C, 0xFE363C80, 0x0000004E, 0x00000006, D_8024420C_C64F1C, 0x00000010, 0x00000000, D_80247420_C7E100, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C635F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_03_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_80242934_C63644, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024296C_C6367C, 0xFE363C80, 0x0000004E, 0x00000006, D_8024420C_C64F1C, 0x00000010, 0x00000000, D_80247420_kzn_03, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C635F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802443A0_C650B0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244420_C65130 -.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, kzn_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802443A0_C650B0, 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_80242934_C63644, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802443A0_C650B0, 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_80242934_C63644, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244744_C65454 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024296C_C6367C, 0xFE363C80, 0x0000004E, 0x00000006, D_80244420_C65130, 0x00000010, 0x00000000, D_80247420_C7E100, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C635F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024296C_C6367C, 0xFE363C80, 0x0000004E, 0x00000006, D_80244420_C65130, 0x00000010, 0x00000000, D_80247420_kzn_03, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C635F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802447B4_C654C4 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242C84_C63994, 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_80244744_C65454, 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_802441A4_C64EB4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242CC8_C639D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_03_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_80244744_C65454, 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_802441A4_C64EB4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244AAC_C657BC .word 0x00000054, 0x00000000 dlabel D_80244AB4_C657C4 -.word 0x00000043, 0x0000000B, kzn_03_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244AAC_C657BC, 0x00000046, 0x00000001, D_802447B4_C654C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kzn_03_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244AAC_C657BC, 0x00000046, 0x00000001, D_802447B4_C654C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B04_C65814 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802441A4_C64EB4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_07/C70EC0.data.s b/ver/us/asm/data/world/area_kzn/kzn_07/C70EC0.data.s index 061c9313cb..2cc8d99b11 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_07/C70EC0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_07/C70EC0.data.s @@ -2,14 +2,14 @@ .section .data -dlabel kzn_07_sixFloats +dlabel kzn_07_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80242BA8_C70ED8 .word 0x3F4CCCCD, 0x00000064, 0x00000000, 0x42B40000, 0x00000000, 0x00000004, 0x404CCCCD, 0x0000000A, 0x00000001, 0x42C80000, 0x00000000, 0x00000001 dlabel D_80242BD8_C70F08 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_07_UnkNpcAIMainFunc10, D_80242BA8_C70ED8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_07_FlyingNoAttackAI_Main, D_80242BA8_C70ED8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242C48_C70F78 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80242BD8_C70F08, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s index 5196c1b09c..fcc6fbf9a8 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s @@ -14,14 +14,14 @@ dlabel D_80244C1C_C7609C dlabel D_80244CFC_C7617C .word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000EF, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF84060AC, 0x00000001, 0x00000046, 0x00000001, D_80244C1C_C7609C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000078, 0x00000064, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF84060AC, 0x00000043, 0x00000002, AssignScript, D_80244CFC_C7617C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel kzn_08_sixFloats +dlabel kzn_08_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244DB8_C76238 .word 0x3F4CCCCD, 0x00000064, 0x00000000, 0x42B40000, 0x00000000, 0x00000004, 0x404CCCCD, 0x0000000A, 0x00000001, 0x42C80000, 0x00000000, 0x00000001 dlabel D_80244DE8_C76268 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_08_UnkNpcAIMainFunc10, D_80244DB8_C76238, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244DE8_C76268, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_08_FlyingNoAttackAI_Main, D_80244DB8_C76238, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244DE8_C76268, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80244E84_C76304 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -30,13 +30,13 @@ dlabel D_80244F40_C763C0 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244F70_C763F0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80243C90_C75110, D_80244F40_C763C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, kzn_08_PiranhaPlantAI_Main, D_80244F40_C763C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245044_C764C4 .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80244F70_C763F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80245070_C764F0 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_08_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024517C_C765FC .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80245070_C764F0, 0x00000000, 0x00000000, D_80244E84_C76304, 0x00000000, 0x00000000, 0x00110000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s index 6d0ac03db6..bee7c8843c 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s @@ -21,13 +21,13 @@ dlabel D_80244C38_C7B918 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244C68_C7B948 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80242774_C79454, D_80244C38_C7B918, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, kzn_09_PiranhaPlantAI_Main, D_80244C38_C7B918, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244D3C_C7BA1C .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80244C68_C7B948, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80244D68_C7BA48 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_09_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_09_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244E74_C7BB54 .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80244D68_C7BA48, 0x00000000, 0x00000000, D_80244B7C_C7B85C, 0x00000000, 0x00000000, 0x00110000 @@ -36,22 +36,22 @@ dlabel D_80244EA0_C7BB80 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244ED0_C7BBB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_09_TackleAI_Main, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244F40_C7BC20 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244F70_C7BC50 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244F40_C7BC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_09_TackleAI_Main, D_80244F40_C7BC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244FE0_C7BCC0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80245010_C7BCF0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244FE0_C7BCC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_09_TackleAI_Main, D_80244FE0_C7BCC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245080_C7BD60 -.word 0x00000043, 0x00000001, kzn_09_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_09_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_09_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_09_UnkNpcAIMainFunc5, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244ED0_C7BBB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80245080_C7BD60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, kzn_09_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_09_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_09_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_09_TackleAI_Main, D_80244EA0_C7BB80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244ED0_C7BBB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80245080_C7BD60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 dlabel D_802451CC_C7BEAC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244F70_C7BC50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80245010_C7BCF0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 @@ -75,22 +75,22 @@ dlabel D_802452BC_C7BF9C .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, kzn_09_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_80243644_C7A324, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024367C_C7A35C, 0xFE363C80, 0x0000004E, 0x00000006, D_802452BC_C7BF9C, 0x00000010, 0x00000000, D_802474A0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802435F0_C7A2D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245450_C7C130 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_09_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_09_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802454D0_C7C1B0 -.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, kzn_09_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245450_C7C130, 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_80243644_C7A324, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_09_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245450_C7C130, 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_80243644_C7A324, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802457F4_C7C4D4 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024367C_C7A35C, 0xFE363C80, 0x0000004E, 0x00000006, D_802454D0_C7C1B0, 0x00000010, 0x00000000, D_802474A0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802435F0_C7A2D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245864_C7C544 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80243994_C7A674, 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_802457F4_C7C4D4, 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_80245254_C7BF34, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802439D8_C7A6B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_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_802457F4_C7C4D4, 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_80245254_C7BF34, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245B5C_C7C83C .word 0x00000054, 0x00000000 dlabel D_80245B64_C7C844 -.word 0x00000043, 0x0000000B, kzn_09_SetManyVars, 0x00000000, 0x00B6000B, 0x00B6000B, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80245B5C_C7C83C, 0x00000046, 0x00000001, D_80245864_C7C544, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kzn_09_LetterDelivery_Init, 0x00000000, 0x00B6000B, 0x00B6000B, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80245B5C_C7C83C, 0x00000046, 0x00000001, D_80245864_C7C544, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245BB4_C7C894 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245254_C7BF34, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_11/C83870.data.s b/ver/us/asm/data/world/area_kzn/kzn_11/C83870.data.s index 6cc7eeede8..95d25905df 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_11/C83870.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_11/C83870.data.s @@ -2,14 +2,14 @@ .section .data -dlabel kzn_11_sixFloats +dlabel kzn_11_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802436E8_C83888 .word 0x3F4CCCCD, 0x00000064, 0x00000000, 0x42B40000, 0x00000000, 0x00000004, 0x404CCCCD, 0x0000000A, 0x00000001, 0x42C80000, 0x00000000, 0x00000001 dlabel D_80243718_C838B8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_11_UnkNpcAIMainFunc10, D_802436E8_C83888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, kzn_11_FlyingNoAttackAI_Main, D_802436E8_C83888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243788_C83928 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243718_C838B8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s index 6752efd4a3..f1e585f877 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s @@ -12,13 +12,13 @@ dlabel D_80243A88_C89538 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80243AB8_C89568 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241A64_C87514, D_80243A88_C89538, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, kzn_17_PiranhaPlantAI_Main, D_80243A88_C89538, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243B8C_C8963C .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80243AB8_C89568, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 dlabel D_80243BB8_C89668 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_17_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_17_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243CC4_C89774 .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80243BB8_C89668, 0x00000000, 0x00000000, D_802439CC_C8947C, 0x00000000, 0x00000000, 0x00110000 @@ -27,22 +27,22 @@ dlabel D_80243CF0_C897A0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243D20_C897D0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_17_TackleAI_Main, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243D90_C89840 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80243DC0_C89870 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243D90_C89840, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kzn_17_TackleAI_Main, D_80243D90_C89840, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E30_C898E0 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_80243E60_C89910 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243E30_C898E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kzn_17_TackleAI_Main, D_80243E30_C898E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243ED0_C89980 -.word 0x00000043, 0x00000001, kzn_17_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_17_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_17_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_17_UnkNpcAIMainFunc5, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243D20_C897D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243ED0_C89980, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 +.word 0x00000043, 0x00000001, kzn_17_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_17_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_17_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kzn_17_TackleAI_Main, D_80243CF0_C897A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243D20_C897D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243ED0_C89980, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 dlabel D_8024401C_C89ACC .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80243DC0_C89870, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243E60_C89910, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 @@ -63,25 +63,25 @@ dlabel D_802440E0_C89B90 .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, kzn_17_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_80242934_C883E4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024296C_C8841C, 0xFE363C80, 0x0000004E, 0x00000006, D_802440E0_C89B90, 0x00000010, 0x00000000, D_802465F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C88390, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244274_C89D24 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_17_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442F4_C89DA4 -.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, kzn_17_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244274_C89D24, 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_80242934_C883E4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244274_C89D24, 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_80242934_C883E4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244618_C8A0C8 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024296C_C8841C, 0xFE363C80, 0x0000004E, 0x00000006, D_802442F4_C89DA4, 0x00000010, 0x00000000, D_802465F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C88390, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244688_C8A138 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242C84_C88734, 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_80244618_C8A0C8, 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_80244078_C89B28, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242CC8_C88778, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_17_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_80244618_C8A0C8, 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_80244078_C89B28, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_17_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244980_C8A430 .word 0x00000054, 0x00000000 dlabel D_80244988_C8A438 -.word 0x00000043, 0x0000000B, kzn_17_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244980_C8A430, 0x00000046, 0x00000001, D_80244688_C8A138, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kzn_17_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244980_C8A430, 0x00000046, 0x00000001, D_80244688_C8A138, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802449D8_C8A488 -.word 0x00000043, 0x0000000B, kzn_17_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244980_C8A430, 0x00000046, 0x00000001, D_80244688_C8A138, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kzn_17_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E8, 0x001000E9, 0x001000EA, 0x001000EB, D_80244980_C8A430, 0x00000046, 0x00000001, D_80244688_C8A138, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A28_C8A4D8 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244078_C89B28, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s b/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s index 5ae7a3ef5a..0b18393bd1 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_19/C90BF0.data.s @@ -111,22 +111,22 @@ dlabel D_80243DE0_C91990 .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, kzn_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_C8F3B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_C8F3E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_C91990, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_C8F35C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F74_C91B24 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_19_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FF4_C91BA4 -.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, kzn_19_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_C91B24, 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_80241800_C8F3B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_C91B24, 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_80241800_C8F3B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244318_C91EC8 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_C8F3E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_C91BA4, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_C8F35C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244388_C91F38 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B50_C8F700, 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_80244318_C91EC8, 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_80243D78_C91928, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B94_C8F744, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_19_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_80244318_C91EC8, 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_80243D78_C91928, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_19_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244680_C92230 .word 0x00000054, 0x00000000 dlabel D_80244688_C92238 -.word 0x00000043, 0x0000000B, kzn_19_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_C92230, 0x00000046, 0x00000001, D_80244388_C91F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kzn_19_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_80244680_C92230, 0x00000046, 0x00000001, D_80244388_C91F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802446D8_C92288 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243D78_C91928, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s b/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s index 87d7f71a8e..c1aea611db 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_20/C97600.data.s @@ -24,22 +24,22 @@ dlabel D_802417EC_C9771C .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, kzn_20_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_802406A8_C965D8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_C96610, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_C9771C, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_C96584, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241980_C978B0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_20_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kzn_20_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241A00_C97930 -.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, kzn_20_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_C978B0, 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_802406A8_C965D8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kzn_20_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_C978B0, 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_802406A8_C965D8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D24_C97C54 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_C96610, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_C97930, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_C96584, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D94_C97CC4 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802409F8_C96928, 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_80241D24_C97C54, 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_80241784_C976B4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240A3C_C9696C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_20_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_80241D24_C97C54, 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_80241784_C976B4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_20_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024208C_C97FBC .word 0x00000054, 0x00000000 dlabel D_80242094_C97FC4 -.word 0x00000043, 0x0000000B, kzn_20_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_C97FBC, 0x00000046, 0x00000001, D_80241D94_C97CC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, kzn_20_LetterDelivery_Init, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, D_8024208C_C97FBC, 0x00000046, 0x00000001, D_80241D94_C97CC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420E4_C98014 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80241784_C976B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s index dbd12cca0f..d40bbdb647 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s @@ -78,7 +78,7 @@ dlabel D_80248340_7F3050 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80248370_7F3080 -.word 0x00000043, 0x00000002, DoBasicAI, D_80248340_7F3050, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80248340_7F3050, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248390_7F30A0 .word 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, 0x00000000, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, D_80248370_7F3080, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 @@ -102,22 +102,22 @@ dlabel D_802486B8_7F33C8 .word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248708_7F3418 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248788_7F3498 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 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_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 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_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248AAC_7F37BC .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248B1C_7F382C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241D30_7ECA40, 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_80248AAC_7F37BC, 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_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241D74_7ECA84, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_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_80248AAC_7F37BC, 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_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248E14_7F3B24 .word 0x00000039, 0x00000000 dlabel D_80248E1C_7F3B2C -.word 0x00000043, 0x0000000B, mac_00_SetManyVars, 0x00000000, 0x00A90004, 0x00A90001, 0x00000039, 0x00000000, 0x00020011, 0x00020012, 0x00020013, 0x00020014, D_80248E14_7F3B24, 0x00000046, 0x00000001, D_80248B1C_7F382C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_00_LetterDelivery_Init, 0x00000000, 0x00A90004, 0x00A90001, 0x00000039, 0x00000000, 0x00020011, 0x00020012, 0x00020013, 0x00020014, D_80248E14_7F3B24, 0x00000046, 0x00000001, D_80248B1C_7F382C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248E6C_7F3B7C .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s index af7c76175e..f5b5c4b25a 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s @@ -6,7 +6,7 @@ dlabel D_8024EB40_7F9850 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024EB70_7F9880 -.word 0x00000043, 0x00000002, DoBasicAI, D_8024EB40_7F9850, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024EB40_7F9850, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024EB90_7F98A0 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024EB70_7F9880, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024EB70_7F9880, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -15,7 +15,7 @@ dlabel D_8024EBE8_7F98F8 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024EC18_7F9928 -.word 0x00000043, 0x00000002, mac_00_UnkNpcAIMainFunc, D_8024EBE8_7F98F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, mac_00_PatrolNoAttackAI_Main, D_8024EBE8_7F98F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024EC38_7F9948 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024EC18_7F9928, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024EC18_7F9928, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -39,22 +39,22 @@ dlabel D_8024ED54_7F9A64 .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, dup_mac_00_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_80243798_7EE4A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024ED54_7F9A64, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024EEE8_7F9BF8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024EF68_7F9C78 -.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, dup_mac_00_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024EEE8_7F9BF8, 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_80243798_7EE4A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024EEE8_7F9BF8, 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_80243798_7EE4A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F28C_7F9F9C .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024EF68_7F9C78, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F2FC_7FA00C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80243AE8_7EE7F8, 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_8024F28C_7F9F9C, 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_8024ECEC_7F99FC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80243B2C_7EE83C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dup_mac_00_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_8024F28C_7F9F9C, 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_8024ECEC_7F99FC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dup_mac_00_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F5F4_7FA304 .word 0x0000004B, 0x00000000 dlabel D_8024F5FC_7FA30C -.word 0x00000043, 0x0000000B, dup_mac_00_SetManyVars, 0x0000000D, 0x00840004, 0x00840001, 0x0000004B, 0x0000004C, 0x000200FF, 0x00020100, 0x00020101, 0x00020102, D_8024F5F4_7FA304, 0x00000046, 0x00000001, D_8024F2FC_7FA00C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF256FA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A82E7, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x000000E6, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000007, 0xF24A8080, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00830003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFFFFFF47, 0xFFFFFED9, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00830001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF1F, 0xFFFFFED4, 0x00000050, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000008, 0x00000001, 0x00000032, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00830004, 0x00830001, 0x00000000, 0x0002007E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, dup_mac_00_LetterDelivery_Init, 0x0000000D, 0x00840004, 0x00840001, 0x0000004B, 0x0000004C, 0x000200FF, 0x00020100, 0x00020101, 0x00020102, D_8024F5F4_7FA304, 0x00000046, 0x00000001, D_8024F2FC_7FA00C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF256FA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A82E7, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x000000E6, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000007, 0xF24A8080, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00830003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFFFFFF47, 0xFFFFFED9, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00830001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF1F, 0xFFFFFED4, 0x00000050, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF1F, 0x00000000, 0xFFFFFED4, 0x00000008, 0x00000001, 0x00000032, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00830004, 0x00830001, 0x00000000, 0x0002007E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F944_7FA654 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C80, 0x0002007F, 0x00000018, 0x00000001, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C80, 0x00020080, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000024, 0x00000002, 0xFE363C80, 0x00020081, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00020082, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00020083, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00020084, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C73, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00020085, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C74, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00020086, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00020087, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00020088, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00020089, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0002008A, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0002008B, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0002008C, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0002008D, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0002008E, 0x0000001B, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0001002C, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7FD1A0.data.s b/ver/us/asm/data/world/area_mac/mac_00/7FD1A0.data.s index 20d91ea50a..185cbcfe30 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7FD1A0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7FD1A0.data.s @@ -12,7 +12,7 @@ dlabel D_80252514_7FD224 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80252544_7FD254 -.word 0x00000043, 0x00000002, DoBasicAI, D_80252514_7FD224, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80252514_7FD224, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80252564_7FD274 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80252544_7FD254, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80252544_7FD254, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s index 790bfff1ef..03d679aea5 100644 --- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s @@ -6,7 +6,7 @@ dlabel D_80248970_8091F0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802489A0_809220 -.word 0x00000043, 0x00000002, DoBasicAI, D_80248970_8091F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80248970_8091F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802489C0_809240 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_802489A0_809220, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_802489A0_809220, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -15,7 +15,7 @@ dlabel D_80248A18_809298 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80248A48_8092C8 -.word 0x00000043, 0x00000002, mac_01_UnkNpcAIMainFunc, D_80248A18_809298, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, mac_01_PatrolNoAttackAI_Main, D_80248A18_809298, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248A68_8092E8 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80248A48_8092C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80248A48_8092C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -111,7 +111,7 @@ dlabel D_8024B1B0_80BA30 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024B1E0_80BA60 -.word 0x00000043, 0x00000002, DoBasicAI, D_8024B1B0_80BA30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024B1B0_80BA30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024B200_80BA80 .word 0x00AF0001, 0x0023001C, D_8024B0A0_80B920, D_8024B114_80B994, 0x00000000, 0x00000000, D_8024B194_80BA14, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_8024B0A0_80B920, D_8024B114_80B994, D_8024B1E0_80BA60, 0x00000000, D_8024B194_80BA14, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 @@ -201,22 +201,22 @@ dlabel D_8024DA90_80E310 .word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DAE0_80E360 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DB60_80E3E0 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 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_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 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_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DE84_80E704 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DEF4_80E774 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80244078_8048F8, 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_8024DE84_80E704, 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_80248C34_8094B4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802440BC_80493C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_01_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_8024DE84_80E704, 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_80248C34_8094B4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024E1EC_80EA6C .word 0x00000036, 0x00000000 dlabel D_8024E1F4_80EA74 -.word 0x00000043, 0x0000000B, mac_01_SetManyVars, 0x00000000, 0x00A50004, 0x00A50001, 0x00000036, 0x00000000, 0x00030043, 0x00030044, 0x00030045, 0x00030046, D_8024E1EC_80EA6C, 0x00000046, 0x00000001, D_8024DEF4_80E774, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_01_LetterDelivery_Init, 0x00000000, 0x00A50004, 0x00A50001, 0x00000036, 0x00000000, 0x00030043, 0x00030044, 0x00030045, 0x00030046, D_8024E1EC_80EA6C, 0x00000046, 0x00000001, D_8024DEF4_80E774, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024E244_80EAC4 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000087, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -225,7 +225,7 @@ dlabel D_8024E2C0_80EB40 .word 0x0000003E, 0x00000000 dlabel D_8024E2C8_80EB48 -.word 0x00000043, 0x0000000B, mac_01_SetManyVars, 0x00000012, 0x00A80004, 0x00A80001, 0x0000003E, 0x00000000, 0x00030078, 0x00030079, 0x0003007A, 0x0003007B, D_8024E2C0_80EB40, 0x00000046, 0x00000001, D_8024DEF4_80E774, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_01_LetterDelivery_Init, 0x00000012, 0x00A80004, 0x00A80001, 0x0000003E, 0x00000000, 0x00030078, 0x00030079, 0x0003007A, 0x0003007B, D_8024E2C0_80EB40, 0x00000046, 0x00000001, D_8024DEF4_80E774, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024E318_80EB98 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -234,7 +234,7 @@ dlabel D_8024E37C_80EBFC .word 0x00000054, 0x00000000 dlabel D_8024E384_80EC04 -.word 0x00000043, 0x0000000B, mac_01_SetManyVars, 0x00000013, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x000300E0, 0x000300E1, 0x000300E2, 0x000300E3, D_8024E37C_80EBFC, 0x00000046, 0x00000001, D_8024DEF4_80E774, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_01_LetterDelivery_Init, 0x00000013, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x000300E0, 0x000300E1, 0x000300E2, 0x000300E3, D_8024E37C_80EBFC, 0x00000046, 0x00000001, D_8024DEF4_80E774, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024E3D4_80EC54 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -633,7 +633,7 @@ dlabel D_8025F16C_81F9EC .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8025F19C_81FA1C -.word 0x00000043, 0x00000002, dup_mac_01_UnkNpcAIMainFunc, D_8025F16C_81F9EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8025F19C_81FA1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8025F19C_81FA1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, dup_mac_01_PatrolNoAttackAI_Main, D_8025F16C_81F9EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8025F19C_81FA1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8025F19C_81FA1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_8025F214_81FA94 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s index 94884b2ad2..c9fd03d3ec 100644 --- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s +++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s @@ -18,7 +18,7 @@ dlabel D_80245F40_829200 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80245F70_829230 -.word 0x00000043, 0x00000002, DoBasicAI, D_80245F40_829200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80245F40_829200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245F90_829250 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80245F70_829230, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80245F70_829230, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -27,7 +27,7 @@ dlabel D_80245FE8_8292A8 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80246018_8292D8 -.word 0x00000043, 0x00000002, mac_02_UnkNpcAIMainFunc, D_80245FE8_8292A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80246018_8292D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80246018_8292D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, mac_02_PatrolNoAttackAI_Main, D_80245FE8_8292A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80246018_8292D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80246018_8292D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_80246090_829350 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -108,7 +108,7 @@ dlabel D_802486D0_82B990 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80248700_82B9C0 -.word 0x00000043, 0x00000002, DoBasicAI, D_802486D0_82B990, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, 0x00000000, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, D_80248700_82B9C0, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802486D0_82B990, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, 0x00000000, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, D_80248700_82B9C0, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 dlabel D_80248778_82BA38 .word 0x00000000 @@ -174,22 +174,22 @@ dlabel D_8024A0D4_82D394 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A034_82D2F4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000002D, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF14, 0x00000014, 0xFFFFFEC2, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AA0001, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x0000000B, 0x00000002, 0xF8405C99, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AA0006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A1B4_82D474 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A234_82D4F4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A558_82D818 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A5C8_82D888 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, filemenu_update_show_name_input_826640, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024A558_82D818, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802433C4_826684, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024A558_82D818, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A8C0_82DB80 .word 0x0000003C, 0x00000000 dlabel D_8024A8C8_82DB88 -.word 0x00000043, 0x0000000B, mac_02_SetManyVars, 0x00000001, 0x00AB0004, 0x00AB0001, 0x0000003C, 0x00000000, 0x00040036, 0x00040037, 0x00040038, 0x00000000, D_8024A8C0_82DB80, 0x00000046, 0x00000001, D_8024A5C8_82D888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_02_LetterDelivery_Init, 0x00000001, 0x00AB0004, 0x00AB0001, 0x0000003C, 0x00000000, 0x00040036, 0x00040037, 0x00040038, 0x00000000, D_8024A8C0_82DB80, 0x00000046, 0x00000001, D_8024A5C8_82D888, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A918_82DBD8 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AB0004, 0x00AB0001, 0x00000000, 0x00040039, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00AB0006, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00AB0006, 0x00AB0006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00AB0001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s index 17f7c06fe9..28b1e2034b 100644 --- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s @@ -12,7 +12,7 @@ dlabel D_802464EC_837CEC .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024651C_837D1C -.word 0x00000043, 0x00000002, DoBasicAI, D_802464EC_837CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802464EC_837CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024653C_837D3C .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024651C_837D1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -96,7 +96,7 @@ dlabel D_80248BC4_83A3C4 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80248BF4_83A3F4 -.word 0x00000043, 0x00000002, DoBasicAI, D_80248BC4_83A3C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, 0x00000000, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, D_80248BF4_83A3F4, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80248BC4_83A3C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, 0x00000000, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, D_80248BF4_83A3F4, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 dlabel D_80248C6C_83A46C .word 0x00000000 @@ -108,22 +108,22 @@ dlabel D_80248C74_83A474 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_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_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248E08_83A608 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248E88_83A688 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 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_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 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_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802491AC_83A9AC .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024921C_83AA1C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B14_833314, 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_802491AC_83A9AC, 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_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B58_833358, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_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_802491AC_83A9AC, 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_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249514_83AD14 .word 0x0000004E, 0x00000000 dlabel D_8024951C_83AD1C -.word 0x00000043, 0x0000000B, mac_03_SetManyVars, 0x00000005, 0x00860004, 0x00860001, 0x0000004E, 0x00000000, 0x00050049, 0x0005004A, 0x0005004B, 0x0005004C, D_80249514_83AD14, 0x00000046, 0x00000001, D_8024921C_83AA1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_03_LetterDelivery_Init, 0x00000005, 0x00860004, 0x00860001, 0x0000004E, 0x00000000, 0x00050049, 0x0005004A, 0x0005004B, 0x0005004C, D_80249514_83AD14, 0x00000046, 0x00000001, D_8024921C_83AA1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024956C_83AD6C .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00860304, 0x00860301, 0x00000000, 0x0005004D, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0x0000004F, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -132,7 +132,7 @@ dlabel D_802495F0_83ADF0 .word 0x00000050, 0x00000000 dlabel D_802495F8_83ADF8 -.word 0x00000043, 0x0000000B, mac_03_SetManyVars, 0x00000005, 0x00860004, 0x00860001, 0x00000050, 0x00000000, 0x0005004E, 0x0005004F, 0x00050050, 0x00050051, D_802495F0_83ADF0, 0x00000046, 0x00000001, D_8024921C_83AA1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_03_LetterDelivery_Init, 0x00000005, 0x00860004, 0x00860001, 0x00000050, 0x00000000, 0x0005004E, 0x0005004F, 0x00050050, 0x00050051, D_802495F0_83ADF0, 0x00000046, 0x00000001, D_8024921C_83AA1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249648_83AE48 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00860304, 0x00860301, 0x00000000, 0x00050052, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000051, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0x00000051, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s index 6ba8283571..93ac3c96ec 100644 --- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s @@ -6,7 +6,7 @@ dlabel D_80243DE0_8469B0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80243E10_8469E0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80243DE0_8469B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80243DE0_8469B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E30_846A00 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80243E10_8469E0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80243E10_8469E0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -93,7 +93,7 @@ dlabel D_80246568_849138 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80246598_849168 -.word 0x00000043, 0x00000002, DoBasicAI, D_80246568_849138, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80246568_849138, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802465B8_849188 .word 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, 0x00000000, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, D_80246598_849168, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_mac/mac_04/8508F0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8508F0.data.s index 6373c1e141..836b5e6948 100644 --- a/ver/us/asm/data/world/area_mac/mac_04/8508F0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_04/8508F0.data.s @@ -6,7 +6,7 @@ dlabel D_8024DD20_8508F0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_8024DD50_850920 -.word 0x00000043, 0x00000002, DoBasicAI, D_8024DD20_8508F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024DD50_850920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024DD50_850920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024DD20_8508F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024DD50_850920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024DD50_850920, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_8024DDC8_850998 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000C8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2443A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000015, 0x00860004, 0x00860006, 0x00000000, 0x000A0070, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x8024F570, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s index 5d2b5953bf..e16c2664c2 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s @@ -15,7 +15,7 @@ dlabel D_80244F84_8570F4 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244FB4_857124 -.word 0x00000043, 0x00000002, mac_05_UnkNpcAIMainFunc, D_80244F84_8570F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80244FB4_857124, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80244FB4_857124, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, mac_05_PatrolNoAttackAI_Main, D_80244F84_8570F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80244FB4_857124, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80244FB4_857124, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_8024502C_85719C .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00300020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -87,7 +87,7 @@ dlabel D_80247630_8597A0 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80247660_8597D0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80247630_8597A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80247630_8597A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247680_8597F0 .word 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, 0x00000000, 0x00000000, D_80247614_859784, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, D_80247660_8597D0, 0x00000000, D_80247614_859784, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 @@ -111,28 +111,28 @@ dlabel D_802479A8_859B18 .word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802479F8_859B68 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247A78_859BE8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247D9C_859F0C .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247E0C_859F7C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242A20_854B90, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80247D9C_859F0C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242A64_854BD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80247D9C_859F0C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248104_85A274 .word 0x00000048, 0x00000000 dlabel D_8024810C_85A27C -.word 0x00000043, 0x0000000B, mac_05_SetManyVars, 0x00000002, 0x008D0002, 0x008D0001, 0x00000048, 0x00000049, 0x00070064, 0x00070065, 0x00070066, 0x00070067, D_80248104_85A274, 0x00000046, 0x00000001, D_80247E0C_859F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_05_LetterDelivery_Init, 0x00000002, 0x008D0002, 0x008D0001, 0x00000048, 0x00000049, 0x00070064, 0x00070065, 0x00070066, 0x00070067, D_80248104_85A274, 0x00000046, 0x00000001, D_80247E0C_859F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024815C_85A2CC .word 0x00000054, 0x00000000 dlabel D_80248164_85A2D4 -.word 0x00000043, 0x0000000B, mac_05_SetManyVars, 0x00000001, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x00070085, 0x00070086, 0x00070087, 0x00070088, D_8024815C_85A2CC, 0x00000046, 0x00000001, D_80247E0C_859F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, mac_05_LetterDelivery_Init, 0x00000001, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x00070085, 0x00070086, 0x00070087, 0x00070088, D_8024815C_85A2CC, 0x00000046, 0x00000001, D_80247E0C_859F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802481B4_85A324 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_00/E111A0.data.s b/ver/us/asm/data/world/area_mgm/mgm_00/E111A0.data.s index c61ef4df69..a37418c116 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_00/E111A0.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_00/E111A0.data.s @@ -6,7 +6,7 @@ dlabel D_80242A00_E111A0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80242A30_E111D0 -.word 0x00000043, 0x00000002, mgm_00_UnkNpcAIMainFunc, D_80242A00_E111A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, mgm_00_PatrolNoAttackAI_Main, D_80242A00_E111A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A50_E111F0 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80242A30_E111D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80242A30_E111D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s index f4b0e9136f..0b80a9466e 100644 --- a/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s @@ -36,13 +36,13 @@ dlabel D_80243F6C_B973AC .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80243F9C_B973DC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241C54_B95094, D_80243F6C_B973AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_01_PiranhaPlantAI_Main, D_80243F6C_B973AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244070_B974B0 .word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_80243F9C_B973DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 dlabel D_8024409C_B974DC -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_01_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_01_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802441A8_B975E8 .word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_8024409C_B974DC, 0x00000000, 0x00000000, D_80243EB0_B972F0, 0x00000000, 0x00000000, 0x000B0008 diff --git a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s b/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s index 1ec6862bed..33d6e055ab 100644 --- a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s @@ -24,7 +24,7 @@ dlabel D_8024160C_B9920C .word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 dlabel D_8024163C_B9923C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_02_UnkNpcAIMainFunc2, D_8024160C_B9920C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_02_HoppingAI_Main, D_8024160C_B9920C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241678_B99278 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024163C_B9923C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x0000001B, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s index 4a9f5b12d4..4a78cdc492 100644 --- a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s @@ -6,7 +6,7 @@ dlabel D_80242540_B9FEA0 .word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 dlabel D_80242570_B9FED0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_04_UnkNpcAIMainFunc2, D_80242540_B9FEA0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_04_HoppingAI_Main, D_80242540_B9FEA0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802425AC_B9FF0C .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80242570_B9FED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 diff --git a/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s b/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s index c0b285f64e..2508b329cf 100644 --- a/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s +++ b/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s @@ -9,13 +9,13 @@ dlabel D_8024340C_BA3B3C .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024343C_BA3B6C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_802417C4_BA1EF4, D_8024340C_BA3B3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_05_PiranhaPlantAI_Main, D_8024340C_BA3B3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243510_BA3C40 .word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_8024343C_BA3B6C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 dlabel D_8024353C_BA3C6C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_05_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243648_BA3D78 .word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_8024353C_BA3C6C, 0x00000000, 0x00000000, D_80243350_BA3A80, 0x00000000, 0x00000000, 0x000B0008 diff --git a/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s b/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s index c789aa9a90..e6b413afae 100644 --- a/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s +++ b/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s @@ -9,13 +9,13 @@ dlabel D_80244AAC_BA922C .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244ADC_BA925C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241CC4_BA6444, D_80244AAC_BA922C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_06_PiranhaPlantAI_Main, D_80244AAC_BA922C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244BB0_BA9330 .word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_80244ADC_BA925C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 dlabel D_80244BDC_BA935C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_06_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_06_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244CE8_BA9468 .word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_80244BDC_BA935C, 0x00000000, 0x00000000, D_802449F0_BA9170, 0x00000000, 0x00000000, 0x000B0008 @@ -24,7 +24,7 @@ dlabel D_80244D14_BA9494 .word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 dlabel D_80244D44_BA94C4 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_06_UnkNpcAIMainFunc2, D_80244D14_BA9494, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_06_HoppingAI_Main, D_80244D14_BA9494, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244D80_BA9500 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244D44_BA94C4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s index ba4ea777ee..b34a69deaf 100644 --- a/ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s @@ -6,7 +6,7 @@ dlabel D_80242880_BAC9C0 .word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 dlabel D_802428B0_BAC9F0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_07_UnkNpcAIMainFunc2, D_80242880_BAC9C0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_07_HoppingAI_Main, D_80242880_BAC9C0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802428EC_BACA2C .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802428B0_BAC9F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s index 257d58b1c8..9694050a76 100644 --- a/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s +++ b/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s @@ -2,14 +2,14 @@ .section .data -dlabel mim_08_sixFloats +dlabel mim_08_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802443D8_BB1D18 .word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 dlabel D_80244408_BB1D48 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, mim_08_UnkNpcAIMainFunc9, D_802443D8_BB1D18, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, mim_08_FlyingAI_Main, D_802443D8_BB1D18, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244478_BB1DB8 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244408_BB1D48, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 @@ -21,13 +21,13 @@ dlabel D_80244560_BB1EA0 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244590_BB1ED0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80242CEC_BB062C, D_80244560_BB1EA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_08_PiranhaPlantAI_Main, D_80244560_BB1EA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244664_BB1FA4 .word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_80244590_BB1ED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 dlabel D_80244690_BB1FD0 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_08_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024479C_BB20DC .word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_80244690_BB1FD0, 0x00000000, 0x00000000, D_802444A4_BB1DE4, 0x00000000, 0x00000000, 0x000B0008 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s index 8e70ebde99..e5eb1fc77a 100644 --- a/ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s +++ b/ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s @@ -30,7 +30,7 @@ dlabel D_802428DC_BB56DC .word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 dlabel D_8024290C_BB570C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_09_UnkNpcAIMainFunc2, D_802428DC_BB56DC, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_09_HoppingAI_Main, D_802428DC_BB56DC, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242948_BB5748 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024290C_BB570C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s index 5ce02f0604..0ff5e2079a 100644 --- a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s @@ -6,7 +6,7 @@ dlabel D_80243600_9C89E0 .word 0x3F800000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF dlabel D_80243630_9C8A10 -.word 0x00000043, 0x00000002, DoBasicAI, D_80243600_9C89E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80243600_9C89E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243650_9C8A30 .word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80243630_9C8A10, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 @@ -15,7 +15,7 @@ dlabel D_8024367C_9C8A5C .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802436AC_9C8A8C -.word 0x00000043, 0x00000002, DoBasicAI, D_8024367C_9C8A5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024367C_9C8A5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802436CC_9C8AAC .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802436AC_9C8A8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x002A0018, 0x00000000, 0x00000000, D_802436AC_9C8A8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x002A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -171,7 +171,7 @@ dlabel D_802484C4_9CD8A4 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_802484F4_9CD8D4 -.word 0x00000043, 0x00000002, DoBasicAI, D_802484C4_9CD8A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802484C4_9CD8A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248514_9CD8F4 .word 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, 0x00000000, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, D_802484F4_9CD8D4, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 @@ -186,34 +186,34 @@ dlabel D_80248574_9CD954 .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, nok_01_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_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248708_9CDAE8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248788_9CDB68 -.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, nok_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 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_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 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_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248AAC_9CDE8C .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248B1C_9CDEFC -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802423CC_9C77AC, 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_80248AAC_9CDE8C, 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_80245F48_9CB328, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242410_9C77F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_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_80248AAC_9CDE8C, 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_80245F48_9CB328, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248E14_9CE1F4 .word 0x00000047, 0x00000000 dlabel D_80248E1C_9CE1FC -.word 0x00000043, 0x0000000B, nok_01_SetManyVars, 0x00000000, 0x008F0007, 0x008F0002, 0x00000047, 0x00000048, 0x000C0009, 0x000C000A, 0x000C000B, 0x000C000C, D_80248E14_9CE1F4, 0x00000046, 0x00000001, D_80248B1C_9CDEFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, nok_01_LetterDelivery_Init, 0x00000000, 0x008F0007, 0x008F0002, 0x00000047, 0x00000048, 0x000C0009, 0x000C000A, 0x000C000B, 0x000C000C, D_80248E14_9CE1F4, 0x00000046, 0x00000001, D_80248B1C_9CDEFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248E6C_9CE24C .word 0x00000049, 0x00000000 dlabel D_80248E74_9CE254 -.word 0x00000043, 0x0000000B, nok_01_SetManyVars, 0x00000000, 0x008F0007, 0x008F0002, 0x00000049, 0x0000004A, 0x000C000D, 0x000C000E, 0x000C000F, 0x000C0010, D_80248E6C_9CE24C, 0x00000046, 0x00000001, D_80248B1C_9CDEFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, nok_01_LetterDelivery_Init, 0x00000000, 0x008F0007, 0x008F0002, 0x00000049, 0x0000004A, 0x000C000D, 0x000C000E, 0x000C000F, 0x000C0010, D_80248E6C_9CE24C, 0x00000046, 0x00000001, D_80248B1C_9CDEFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248EC4_9CE2A4 .word 0x00000038, 0x00000000 dlabel D_80248ECC_9CE2AC -.word 0x00000043, 0x0000000B, nok_01_SetManyVars, 0x00000008, 0x00830004, 0x00830001, 0x00000038, 0x00000000, 0x000C0039, 0x000C003A, 0x000C003B, 0x000C003C, D_80248EC4_9CE2A4, 0x00000046, 0x00000001, D_80248B1C_9CDEFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, nok_01_LetterDelivery_Init, 0x00000008, 0x00830004, 0x00830001, 0x00000038, 0x00000000, 0x000C0039, 0x000C003A, 0x000C003B, 0x000C003C, D_80248EC4_9CE2A4, 0x00000046, 0x00000001, D_80248B1C_9CDEFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248F1C_9CE2FC .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s index 1bf69d87f5..e4f63f14a2 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s @@ -6,7 +6,7 @@ dlabel D_80246E70_9DDE90 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80246EA0_9DDEC0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80246E70_9DDE90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80246E70_9DDE90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246EC0_9DDEE0 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80246EA0_9DDEC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x002A0018, 0x00000000, 0x00000000, D_80246EA0_9DDEC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -15,7 +15,7 @@ dlabel D_80246F18_9DDF38 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80246F48_9DDF68 -.word 0x00000043, 0x00000002, nok_02_UnkNpcAIMainFunc, D_80246F18_9DDF38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, nok_02_PatrolNoAttackAI_Main, D_80246F18_9DDF38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246F68_9DDF88 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80246F48_9DDF68, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x002A0018, 0x00000000, 0x00000000, D_80246F48_9DDF68, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -105,7 +105,7 @@ dlabel D_80249648_9E0668 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80249678_9E0698 -.word 0x00000043, 0x00000002, DoBasicAI, D_80249648_9E0668, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80249648_9E0668, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249698_9E06B8 .word 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, 0x00000000, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, D_80249678_9E0698, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 @@ -126,22 +126,22 @@ dlabel D_8024988C_9E08AC .word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802498D4_9E08F4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249954_9E0974 -.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, nok_02_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 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_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 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_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249C78_9E0C98 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249CE8_9E0D08 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242F74_9D9F94, 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_80249C78_9E0C98, 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_802470CC_9DE0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80242FB8_9D9FD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80249C78_9E0C98, 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_802470CC_9DE0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249FE0_9E1000 .word 0x00000054, 0x00000000 dlabel D_80249FE8_9E1008 -.word 0x00000043, 0x0000000B, nok_02_SetManyVars, 0x00000007, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x000C0097, 0x000C0098, 0x000C0099, 0x000C009A, D_80249FE0_9E1000, 0x00000046, 0x00000001, D_80249CE8_9E0D08, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, nok_02_LetterDelivery_Init, 0x00000007, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x000C0097, 0x000C0098, 0x000C0099, 0x000C009A, D_80249FE0_9E1000, 0x00000046, 0x00000001, D_80249CE8_9E0D08, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A038_9E1058 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_03/9ECBD0.data.s b/ver/us/asm/data/world/area_nok/nok_03/9ECBD0.data.s index 628c3f7cf2..8bce39e444 100644 --- a/ver/us/asm/data/world/area_nok/nok_03/9ECBD0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_03/9ECBD0.data.s @@ -6,7 +6,7 @@ dlabel D_802413E0_9ECBD0 .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40900000, 0x00000046, 0x0000000A, 0x43480000, 0x00000000, 0x00000001 dlabel D_80241410_9ECC00 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, nok_03_UnkNpcAIMainFunc2, D_802413E0_9ECBD0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, nok_03_HoppingAI_Main, D_802413E0_9ECBD0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024144C_9ECC3C .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241410_9ECC00, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s b/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s index 9febf83714..40e5ee195e 100644 --- a/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s +++ b/ver/us/asm/data/world/area_nok/nok_11/9F7180.data.s @@ -6,25 +6,25 @@ dlabel D_80242740_9F7180 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80242770_9F71B0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80242740_9F7180, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80242770_9F71B0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80242740_9F7180, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80242770_9F71B0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 dlabel D_802427BC_9F71FC .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_802427EC_9F722C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_11_UnkNpcAIMainFunc5, D_802427BC_9F71FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_11_TackleAI_Main, D_802427BC_9F71FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024285C_9F729C .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802427EC_9F722C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel nok_11_sixFloats +dlabel nok_11_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802428A0_9F72E0 .word 0x3FCCCCCD, 0x0000003C, 0x0000001E, 0x42A00000, 0x00000000, 0x00000005, 0x400CCCCD, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000001 dlabel D_802428D0_9F7310 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, nok_11_UnkNpcAIMainFunc9, D_802428A0_9F72E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFE0C, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000015, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000244, 0x00000043, 0x00000002, nok_11_FlyingAI_Main, D_802428A0_9F72E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242940_9F7380 .word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_802428D0_9F7310, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060002 @@ -33,7 +33,7 @@ dlabel D_8024296C_9F73AC .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_8024299C_9F73DC -.word 0x00000043, 0x00000002, DoBasicAI, D_8024296C_9F73AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024296C_9F73AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802429BC_9F73FC .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_8024299C_9F73DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s b/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s index e85beb46e7..56e4c8c37f 100644 --- a/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s +++ b/ver/us/asm/data/world/area_nok/nok_12/9FE000.data.s @@ -24,7 +24,7 @@ dlabel D_80244200_9FE9F0 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80244230_9FEA20 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_12_UnkNpcAIMainFunc5, D_80244200_9FE9F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_12_TackleAI_Main, D_80244200_9FE9F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442A0_9FEA90 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80244230_9FEA20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -33,7 +33,7 @@ dlabel D_802442CC_9FEABC .word 0x3FC00000, 0x00000019, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40E00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_802442FC_9FEAEC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, nok_12_UnkNpcAIMainFunc8, D_802442CC_9FEABC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, nok_12_KoopaPatrolAI_Main, D_802442CC_9FEABC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244358_9FEB48 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802442FC_9FEAEC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -42,7 +42,7 @@ dlabel D_80244384_9FEB74 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_802443B4_9FEBA4 -.word 0x00000043, 0x00000002, DoBasicAI, D_80244384_9FEB74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80244384_9FEB74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802443D4_9FEBC4 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_802443B4_9FEBA4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 @@ -51,7 +51,7 @@ dlabel D_80244400_9FEBF0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80244430_9FEC20 -.word 0x00000043, 0x00000002, DoBasicAI, D_80244400_9FEBF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80244400_9FEBF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244450_9FEC40 .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80244430_9FEC20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -60,7 +60,7 @@ dlabel D_8024447C_9FEC6C .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_802444AC_9FEC9C -.word 0x00000043, 0x00000002, nok_12_UnkNpcAIMainFunc, D_8024447C_9FEC6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_802444AC_9FEC9C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 +.word 0x00000043, 0x00000002, nok_12_PatrolNoAttackAI_Main, D_8024447C_9FEC6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_802444AC_9FEC9C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 dlabel D_802444F8_9FECE8 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0027000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFA6, 0x00000000, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFFBF, 0x00000000, 0xFFFFFF88, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00270006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00270001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244430_9FEC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_13/A02420.data.s b/ver/us/asm/data/world/area_nok/nok_13/A02420.data.s index 9dc524d2ff..3ed26e2fb5 100644 --- a/ver/us/asm/data/world/area_nok/nok_13/A02420.data.s +++ b/ver/us/asm/data/world/area_nok/nok_13/A02420.data.s @@ -6,7 +6,7 @@ dlabel D_80241E20_A02420 .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40900000, 0x00000046, 0x0000000A, 0x43480000, 0x00000000, 0x00000001 dlabel D_80241E50_A02450 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, nok_03_UnkNpcAIMainFunc2, D_80241E20_A02420, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, nok_03_HoppingAI_Main, D_80241E20_A02420, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E8C_A0248C .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241E50_A02450, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000, 0x00000001, D_80241E8C_A0248C, 0x432F0000, 0x00000000, 0xC3870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000B4, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x33320002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000AF, 0x00000000, 0xFFFFFEF2, 0x00000046, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000AF, 0x00000000, 0xFFFFFEF2, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s b/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s index c65a7aa060..9c368b8e45 100644 --- a/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s +++ b/ver/us/asm/data/world/area_nok/nok_14/A06110.data.s @@ -6,7 +6,7 @@ dlabel D_802438D0_A06110 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80243900_A06140 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_14_UnkNpcAIMainFunc5, D_802438D0_A06110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_14_TackleAI_Main, D_802438D0_A06110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243970_A061B0 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243900_A06140, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -15,19 +15,19 @@ dlabel D_8024399C_A061DC .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_802439CC_A0620C -.word 0x00000043, 0x00000002, DoBasicAI, D_8024399C_A061DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024399C_A061DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802439EC_A0622C .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_802439CC_A0620C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel nok_14_sixFloats +dlabel nok_14_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80243A30_A06270 .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41A00000, 0x0000000A, 0x40266666, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 dlabel D_80243A60_A062A0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_802421CC_A04A0C, D_80243A30_A06270, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, nok_14_ParatroopaAI_Main, D_80243A30_A06270, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243AD0_A06310 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80243A60_A062A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060001 diff --git a/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s b/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s index 9dbd092875..95e6893d02 100644 --- a/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s +++ b/ver/us/asm/data/world/area_nok/nok_15/A0AB90.data.s @@ -6,19 +6,19 @@ dlabel D_80243C90_A0AB90 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80243CC0_A0ABC0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_15_UnkNpcAIMainFunc5, D_80243C90_A0AB90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, nok_15_TackleAI_Main, D_80243C90_A0AB90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243D30_A0AC30 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243CC0_A0ABC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel nok_15_sixFloats +dlabel nok_15_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80243D74_A0AC74 .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41A00000, 0x0000000A, 0x40266666, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 dlabel D_80243DA4_A0ACA4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_802422EC_A091EC, D_80243D74_A0AC74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, nok_15_ParatroopaAI_Main, D_80243D74_A0AC74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E14_A0AD14 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80243DA4_A0ACA4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060001 @@ -27,7 +27,7 @@ dlabel D_80243E40_A0AD40 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80243E70_A0AD70 -.word 0x00000043, 0x00000002, DoBasicAI, D_80243E40_A0AD40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80243E70_A0AD70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80243E40_A0AD40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80243E70_A0AD70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 dlabel D_80243EBC_A0ADBC .word 0x00000000, D_80243D30_A0AC30, 0xC3E10000, 0x00000000, 0xC2340000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008A, 0x00030000, 0x00A60007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0xFFFFFE3E, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE3E, 0x00000000, 0xFFFFFFD3, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s index 76245f2638..444a9eb892 100644 --- a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s @@ -6,7 +6,7 @@ dlabel D_80244000_BC11A0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244030_BC11D0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80244000_BC11A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80244000_BC11A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244050_BC11F0 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80244030_BC11D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -33,22 +33,22 @@ dlabel D_8024415C_BC12FC .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, obk_01_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_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_8024415C_BC12FC, 0x00000010, 0x00000000, flo_08_tree1, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802442F0_BC1490 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244370_BC1510 -.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, obk_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802442F0_BC1490, 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_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802442F0_BC1490, 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_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244694_BC1834 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_80244370_BC1510, 0x00000010, 0x00000000, flo_08_tree1, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244704_BC18A4 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240EC8_BBE068, 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_80244694_BC1834, 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_802440F4_BC1294, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240F0C_BBE0AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, obk_01_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_80244694_BC1834, 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_802440F4_BC1294, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, obk_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802449FC_BC1B9C .word 0x00000045, 0x00000000 dlabel D_80244A04_BC1BA4 -.word 0x00000043, 0x0000000B, obk_01_SetManyVars, 0x00000004, 0x00950004, 0x00950001, 0x00000045, 0x0000004E, 0x000E0067, 0x000E0068, 0x000E0069, 0x000E006A, D_802449FC_BC1B9C, 0x00000046, 0x00000001, D_80244704_BC18A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, obk_01_LetterDelivery_Init, 0x00000004, 0x00950004, 0x00950001, 0x00000045, 0x0000004E, 0x000E0067, 0x000E0068, 0x000E0069, 0x000E006A, D_802449FC_BC1B9C, 0x00000046, 0x00000001, D_80244704_BC18A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A54_BC1BF4 .short 0x0032, 0x003C, 0x00C8, 0x00F0 diff --git a/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s b/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s index e787ffe841..67ea359075 100644 --- a/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s +++ b/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s @@ -21,22 +21,22 @@ dlabel D_80242F38_BC71B8 .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, obk_03_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_80240508_BC4788, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242F38_BC71B8, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802430CC_BC734C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024314C_BC73CC -.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, obk_03_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802430CC_BC734C, 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_80240508_BC4788, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802430CC_BC734C, 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_80240508_BC4788, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243470_BC76F0 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024314C_BC73CC, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802434E0_BC7760 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240858_BC4AD8, 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_80243470_BC76F0, 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_80242ED0_BC7150, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024089C_BC4B1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, obk_03_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_80243470_BC76F0, 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_80242ED0_BC7150, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, obk_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802437D8_BC7A58 .word 0x00000041, 0x00000000 dlabel D_802437E0_BC7A60 -.word 0x00000043, 0x0000000B, obk_03_SetManyVars, 0x00000000, 0x00950004, 0x00950001, 0x00000041, 0x00000000, 0x000E005D, 0x000E005E, 0x000E005F, 0x000E0060, D_802437D8_BC7A58, 0x00000046, 0x00000001, D_802434E0_BC7760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, obk_03_LetterDelivery_Init, 0x00000000, 0x00950004, 0x00950001, 0x00000041, 0x00000000, 0x000E005D, 0x000E005E, 0x000E005F, 0x000E0060, D_802437D8_BC7A58, 0x00000046, 0x00000001, D_802434E0_BC7760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243830_BC7AB0 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80242ED0_BC7150, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s index ec71c9ae91..9dbf5e8d0f 100644 --- a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s @@ -6,13 +6,13 @@ dlabel D_80244800_DA1CD0 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80244830_DA1D00 -.word 0x00000043, 0x00000002, func_80240BA8_D9E078, D_80244800_DA1CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80244830_DA1D00, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000002, omo_02_ShyGuyWanderAI_Main, D_80244800_DA1CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80244830_DA1D00, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_8024487C_DA1D4C .word 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x43200000, 0x42480000, 0x00000001 dlabel D_802448A0_DA1D70 -.word 0x00000043, 0x00000002, omo_02_UnkNpcAIMainFunc4, D_8024487C_DA1D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802448A0_DA1D70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000002, omo_02_StationaryAI_Main, D_8024487C_DA1D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802448A0_DA1D70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_802448EC_DA1DBC .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 @@ -24,7 +24,7 @@ dlabel D_802449E8_DA1EB8 .word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 dlabel D_80244A18_DA1EE8 -.word 0x00000043, 0x00000001, omo_02_SetNpcB5_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_02_UnkNpcAIMainFunc7, D_802449E8_DA1EB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, omo_02_SetNpcB5_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_02_RangedAttackAI_Main, D_802449E8_DA1EB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A94_DA1F64 .word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80244A18_DA1EE8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 @@ -33,13 +33,13 @@ dlabel D_80244AC0_DA1F90 .word 0x41000000, 0x00000000, 0x00000000, 0x40800000, 0x3F000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244AF0_DA1FC0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_02_UnkFunc54, D_80244AC0_DA1F90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_02_ProjectileAI_Main, D_80244AC0_DA1F90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B60_DA2030 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B70_DA2040 -.word 0x00000043, 0x00000001, omo_02_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244B60_DA2030, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_02_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244AF0_DA1FC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, omo_02_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244B60_DA2030, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_02_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244AF0_DA1FC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244D38_DA2208 .word 0x00000000, 0x00070007, 0x00000000, 0x00000000, D_80244AF0_DA1FC0, D_80244B70_DA2040, 0x00000000, D_80244918_DA1DE8, 0x00000000, 0x00000000, 0x00000008 diff --git a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s index e3237bf8ee..39c340c4cf 100644 --- a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s @@ -62,14 +62,14 @@ dlabel D_80242AF0_DAFEF0 dlabel D_80242B1C_DAFF1C .word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000047E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FDF, 0x00000043, 0x00000002, AssignScript, D_8024277C_DAFB7C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFC84, 0x00000000, 0xFFFFFF83, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E8_DAFDE8, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFCB1, 0x00000000, 0x00000062, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A14_DAFE14, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD2E, 0x00000000, 0xFFFFFFB8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A40_DAFE40, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD79, 0x00000050, 0x0000003E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A6C_DAFE6C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFDA1, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A98_DAFE98, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFE2D, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC4_DAFEC4, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0x000002C8, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AF0_DAFEF0, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000023F, 0x0000003C, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE0, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000002F9, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE1, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x00000375, 0x0000008C, 0xFFFFFF92, 0x00000000, 0x00000084, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE2, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x0000006E, 0xFFFFFF84, 0x00000011, 0xF8405FE3, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000082, 0xFFFFFF84, 0x00000011, 0xF8405FE4, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000096, 0xFFFFFF84, 0x00000011, 0xF8405FE5, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD83, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FE6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD9A, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDAE, 0x000000DC, 0x0000003E, 0x00000011, 0xF8405FE8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDC2, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDD6, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FEA, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000078, 0x000000B4, 0xFFFFFFB0, 0x00000011, 0xF8405FEC, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFFA6, 0x00000000, 0xFFFFFF83, 0x00000011, 0xF8405FED, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel omo_04_sixFloats +dlabel omo_04_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80242F08_DB0308 .word 0x3FE66666, 0x00000000, 0x00000000, 0x42F00000, 0x41F00000, 0x00000003, 0x40800000, 0x0000003C, 0x00000003, 0x43160000, 0x41F00000, 0x00000001 dlabel D_80242F38_DB0338 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_04_UnkNpcAIMainFunc9, D_80242F08_DB0308, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_04_FlyingAI_Main, D_80242F08_DB0308, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242FA8_DB03A8 .word 0x00000000, 0x00190016, 0x00000000, 0x00000000, D_80242F38_DB0338, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 @@ -78,7 +78,7 @@ dlabel D_80242FD4_DB03D4 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80243004_DB0404 -.word 0x00000043, 0x00000002, func_80241AD0_DAEED0, D_80242FD4_DB03D4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_04_ShyGuyWanderAI_Main, D_80242FD4_DB03D4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243024_DB0424 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80243004_DB0404, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 diff --git a/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s b/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s index 5b1f068656..9a4bdafec0 100644 --- a/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s +++ b/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s @@ -24,25 +24,25 @@ dlabel D_80242E90_DB5150 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80242EC0_DB5180 -.word 0x00000043, 0x00000002, func_80240238_DB24F8, D_80242E90_DB5150, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80242EC0_DB5180, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000002, omo_05_ShyGuyWanderAI_Main, D_80242E90_DB5150, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80242EC0_DB5180, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_80242F0C_DB51CC .word 0x3FD9999A, 0x00000050, 0x00000001, 0x42C80000, 0x00000000, 0x00000004, 0x40900000, 0x00000014, 0x00000001, 0x430C0000, 0x00000000, 0x00000001 dlabel D_80242F3C_DB51FC -.word 0x00000043, 0x00000002, func_80240780_DB2A40, D_80242F0C_DB51CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_05_GrooveGuyAI_Main, D_80242F0C_DB51CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F5C_DB521C .word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80242F3C_DB51FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0001 -dlabel omo_05_sixFloats +dlabel omo_05_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80242FA0_DB5260 .word 0x3FE66666, 0x00000000, 0x00000000, 0x42F00000, 0x41F00000, 0x00000003, 0x40800000, 0x0000003C, 0x00000003, 0x43160000, 0x41F00000, 0x00000001 dlabel D_80242FD0_DB5290 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_05_UnkNpcAIMainFunc9, D_80242FA0_DB5260, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00190016, 0x00000000, 0x00000000, D_80242FD0_DB5290, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_05_FlyingAI_Main, D_80242FA0_DB5260, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00190016, 0x00000000, 0x00000000, D_80242FD0_DB5290, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_8024306C_DB532C .word 0x00000000, 0x0044003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s b/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s index 4798a17374..c5a8c42a57 100644 --- a/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s +++ b/ver/us/asm/data/world/area_omo/omo_07/DC0B80.data.s @@ -6,28 +6,28 @@ dlabel D_802438D0_DC0B80 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80243900_DC0BB0 -.word 0x00000043, 0x00000002, func_80240238_DBD4E8, D_802438D0_DC0B80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80243900_DC0BB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000002, omo_07_ShyGuyWanderAI_Main, D_802438D0_DC0B80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80243900_DC0BB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_8024394C_DC0BFC .word 0x40000000, 0x0000003C, 0x00000000, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x43200000, 0x42480000, 0x00000001 dlabel D_8024397C_DC0C2C -.word 0x00000043, 0x00000002, func_80241634_DBE8E4, D_8024394C_DC0BFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_07_ShyGuyPatrolAI_Main, D_8024394C_DC0BFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024399C_DC0C4C -.word 0x00000043, 0x00000002, omo_07_UnkNpcAIMainFunc, D_8024394C_DC0BFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_07_PatrolNoAttackAI_Main, D_8024394C_DC0BFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802439BC_DC0C6C .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_8024397C_DC0C2C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_8024399C_DC0C4C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 -dlabel omo_07_sixFloats +dlabel omo_07_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80243A2C_DC0CDC .word 0x3FE66666, 0x00000000, 0x00000000, 0x42F00000, 0x41F00000, 0x00000003, 0x40800000, 0x0000003C, 0x00000003, 0x43160000, 0x41F00000, 0x00000001 dlabel D_80243A5C_DC0D0C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_07_UnkNpcAIMainFunc9, D_80243A2C_DC0CDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_07_FlyingAI_Main, D_80243A2C_DC0CDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243ACC_DC0D7C .word 0x00000000, 0x00190016, 0x00000000, 0x00000000, D_80243A5C_DC0D0C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DCBA10.data.s b/ver/us/asm/data/world/area_omo/omo_08/DCBA10.data.s index c3b75ab120..54ddd9062f 100644 --- a/ver/us/asm/data/world/area_omo/omo_08/DCBA10.data.s +++ b/ver/us/asm/data/world/area_omo/omo_08/DCBA10.data.s @@ -12,7 +12,7 @@ dlabel D_8024767C_DCBA4C .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_802476AC_DCBA7C -.word 0x00000043, 0x00000002, btl_restore_world_cameras_DC4E78, D_8024767C_DCBA4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_08_ShyGuyWanderAI_Main, D_8024767C_DCBA4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802476CC_DCBA9C .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802476AC_DCBA7C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s index f12ecfa57d..3a9f2911e2 100644 --- a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s +++ b/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s @@ -6,7 +6,7 @@ dlabel D_80247480_DD4150 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_802474B0_DD4180 -.word 0x00000043, 0x00000002, func_80240C18_DCD8E8, D_80247480_DD4150, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_09_ShyGuyWanderAI_Main, D_80247480_DD4150, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802474D0_DD41A0 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802474B0_DD4180, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 @@ -15,16 +15,16 @@ dlabel D_802474FC_DD41CC .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_8024752C_DD41FC -.word 0x00000043, 0x00000002, DoBasicAI, D_802474FC_DD41CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_8024752C_DD41FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802474FC_DD41CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_8024752C_DD41FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0000 dlabel D_80247578_DD4248 .word 0x40000000, 0x0000003C, 0x00000000, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x43200000, 0x42480000, 0x00000001 dlabel D_802475A8_DD4278 -.word 0x00000043, 0x00000002, func_80242014_DCECE4, D_80247578_DD4248, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_09_ShyGuyPatrolAI_Main, D_80247578_DD4248, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802475C8_DD4298 -.word 0x00000043, 0x00000002, omo_09_UnkNpcAIMainFunc, D_80247578_DD4248, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_09_PatrolNoAttackAI_Main, D_80247578_DD4248, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802475E8_DD42B8 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802475A8_DD4278, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802475C8_DD4298, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 @@ -36,7 +36,7 @@ dlabel D_80247710_DD43E0 .word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 dlabel D_80247740_DD4410 -.word 0x00000043, 0x00000001, omo_09_SetNpcB5_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_09_UnkNpcAIMainFunc7, D_80247710_DD43E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, omo_09_SetNpcB5_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_09_RangedAttackAI_Main, D_80247710_DD43E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802477BC_DD448C .word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80247740_DD4410, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 @@ -45,13 +45,13 @@ dlabel D_802477E8_DD44B8 .word 0x41000000, 0x00000000, 0x00000000, 0x40800000, 0x3F000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80247818_DD44E8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_09_UnkFunc54, D_802477E8_DD44B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_09_ProjectileAI_Main, D_802477E8_DD44B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247888_DD4558 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247898_DD4568 -.word 0x00000043, 0x00000001, omo_09_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80247888_DD4558, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_09_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80247818_DD44E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, omo_09_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80247888_DD4558, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_09_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80247818_DD44E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247A60_DD4730 .word 0x00000000, 0x00070007, 0x00000000, 0x00000000, D_80247818_DD44E8, D_80247898_DD4568, 0x00000000, D_80247640_DD4310, 0x00000000, 0x00000000, 0x00000008 @@ -63,7 +63,7 @@ dlabel D_80247AB8_DD4788 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80247AE8_DD47B8 -.word 0x00000043, 0x00000001, dup_omo_09_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80247AB8_DD4788, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, dup_omo_09_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80247AB8_DD4788, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247B14_DD47E4 .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80247AE8_DD47B8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDEE80.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDEE80.data.s index e52ab51e0d..afb0b691fb 100644 --- a/ver/us/asm/data/world/area_omo/omo_11/DDEE80.data.s +++ b/ver/us/asm/data/world/area_omo/omo_11/DDEE80.data.s @@ -6,7 +6,7 @@ dlabel D_80242650_DDEE80 .word 0x40400000, 0x0000001E, 0x0000003C, 0x42C80000, 0x41F00000, 0x00000004, 0x40A00000, 0x00000008, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80242680_DDEEB0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80242650_DDEE80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80242650_DDEE80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802426A0_DDEED0 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80242680_DDEEB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s index ac6633ce05..bda99b64d6 100644 --- a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s +++ b/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s @@ -6,7 +6,7 @@ dlabel D_80241AE0_DE3F70 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80241B10_DE3FA0 -.word 0x00000043, 0x00000002, func_802404B8_DE2948, D_80241AE0_DE3F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_13_ShyGuyWanderAI_Main, D_80241AE0_DE3F70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B30_DE3FC0 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80241B10_DE3FA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 @@ -15,7 +15,7 @@ dlabel D_80241B5C_DE3FEC .word 0x3FD9999A, 0x00000050, 0x00000001, 0x42C80000, 0x00000000, 0x00000004, 0x40900000, 0x00000014, 0x00000001, 0x430C0000, 0x00000000, 0x00000001 dlabel D_80241B8C_DE401C -.word 0x00000043, 0x00000002, func_80240A00_DE2E90, D_80241B5C_DE3FEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, omo_13_GrooveGuyAI_Main, D_80241B5C_DE3FEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BAC_DE403C .word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80241B8C_DE401C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0001 diff --git a/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s b/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s index 1eb8a18d4b..4c78969307 100644 --- a/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s @@ -6,28 +6,28 @@ dlabel D_80246010_DF4EB0 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x41F00000, 0x00000004, 0x40800000, 0x00000006, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_80246040_DF4EE0 -.word 0x00000043, 0x00000002, func_80240798_DEF638, D_80246010_DF4EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80246040_DF4EE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000002, omo_17_ShyGuyWanderAI_Main, D_80246010_DF4EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80246040_DF4EE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_8024608C_DF4F2C .word 0x40400000, 0x0000001E, 0x0000003C, 0x42C80000, 0x41F00000, 0x00000004, 0x40A00000, 0x00000008, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 dlabel D_802460BC_DF4F5C -.word 0x00000043, 0x00000002, DoBasicAI, D_8024608C_DF4F2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802460BC_DF4F5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024608C_DF4F2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802460BC_DF4F5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 dlabel D_80246108_DF4FA8 .word 0x3FD9999A, 0x00000050, 0x00000001, 0x42C80000, 0x00000000, 0x00000004, 0x40900000, 0x00000014, 0x00000001, 0x430C0000, 0x00000000, 0x00000001 dlabel D_80246138_DF4FD8 -.word 0x00000043, 0x00000002, func_80240CE0_DEFB80, D_80246108_DF4FA8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80246138_DF4FD8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0001 +.word 0x00000043, 0x00000002, omo_17_GrooveGuyAI_Main, D_80246108_DF4FA8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80246138_DF4FD8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0001 -dlabel omo_17_sixFloats +dlabel omo_17_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_8024619C_DF503C .word 0x3FE66666, 0x00000000, 0x00000000, 0x42F00000, 0x41F00000, 0x00000003, 0x40800000, 0x0000003C, 0x00000003, 0x43160000, 0x41F00000, 0x00000001 dlabel D_802461CC_DF506C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_17_UnkNpcAIMainFunc9, D_8024619C_DF503C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00190016, 0x00000000, 0x00000000, D_802461CC_DF506C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_17_FlyingAI_Main, D_8024619C_DF503C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00190016, 0x00000000, 0x00000000, D_802461CC_DF506C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_80246268_DF5108 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -36,19 +36,19 @@ dlabel D_80246338_DF51D8 .word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 dlabel D_80246368_DF5208 -.word 0x00000043, 0x00000001, omo_17_SetNpcB5_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_17_UnkNpcAIMainFunc7, D_80246338_DF51D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80246368_DF5208, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 +.word 0x00000043, 0x00000001, omo_17_SetNpcB5_3, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, omo_17_RangedAttackAI_Main, D_80246338_DF51D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80246368_DF5208, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000 dlabel D_80246410_DF52B0 .word 0x41000000, 0x00000000, 0x00000000, 0x40800000, 0x3F000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80246440_DF52E0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_17_UnkFunc54, D_80246410_DF52B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000D, 0x00000043, 0x00000002, omo_17_ProjectileAI_Main, D_80246410_DF52B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802464B0_DF5350 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802464C0_DF5360 -.word 0x00000043, 0x00000001, omo_17_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802464B0_DF5350, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_17_UnkFunc55, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80246440_DF52E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00070007, 0x00000000, 0x00000000, D_80246440_DF52E0, D_802464C0_DF5360, 0x00000000, D_80246268_DF5108, 0x00000000, 0x00000000, 0x00000008 +.word 0x00000043, 0x00000001, omo_17_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802464B0_DF5350, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, omo_17_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80246440_DF52E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00070007, 0x00000000, 0x00000000, D_80246440_DF52E0, D_802464C0_DF5360, 0x00000000, D_80246268_DF5108, 0x00000000, 0x00000000, 0x00000008 dlabel D_802466B4_DF5554 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s b/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s index 2f33e33bfb..c0bc3e7e5e 100644 --- a/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s +++ b/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s @@ -21,22 +21,22 @@ dlabel D_80241224_AB1214 .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, osr_01_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_802406F8_AB06E8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241224_AB1214, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413B8_AB13A8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241438_AB1428 -.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, osr_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802413B8_AB13A8, 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_802406F8_AB06E8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802413B8_AB13A8, 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_802406F8_AB06E8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024175C_AB174C .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241438_AB1428, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417CC_AB17BC -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240A48_AB0A38, 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_8024175C_AB174C, 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_802411BC_AB11AC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240A8C_AB0A7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x000A006F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x80242178, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, osr_01_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_8024175C_AB174C, 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_802411BC_AB11AC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, osr_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x000A006F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x80242178, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C18_AB1C08 .word 0x00000046, 0x00000000 dlabel D_80241C20_AB1C10 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C80, 0x00090000, 0x00000018, 0x00000001, 0xFFFFFF9A, 0x00000024, 0x00000002, 0xFE363C80, 0x00090001, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000024, 0x00000002, 0xFE363C80, 0x00090002, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090003, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090004, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00090005, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090007, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00090009, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000A, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000B, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000C, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000D, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000E, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000F, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000043, 0x0000000B, osr_01_SetManyVars, 0x00000000, 0x00830004, 0x00830001, 0x00000046, 0x00000047, 0x00090010, 0x00090011, 0x00090012, 0x00090013, D_80241C18_AB1C08, 0x00000046, 0x00000001, D_802417CC_AB17BC, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C80, 0x00090000, 0x00000018, 0x00000001, 0xFFFFFF9A, 0x00000024, 0x00000002, 0xFE363C80, 0x00090001, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000024, 0x00000002, 0xFE363C80, 0x00090002, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090003, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090004, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00090005, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090007, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00090008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00090009, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000A, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000B, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000C, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000D, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000E, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0009000F, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000043, 0x0000000B, osr_01_LetterDelivery_Init, 0x00000000, 0x00830004, 0x00830001, 0x00000046, 0x00000047, 0x00090010, 0x00090011, 0x00090012, 0x00090013, D_80241C18_AB1C08, 0x00000046, 0x00000001, D_802417CC_AB17BC, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241EC0_AB1EB0 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241C20_AB1C10, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s b/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s index f0858b5bc4..caebc61442 100644 --- a/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s +++ b/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s @@ -18,7 +18,7 @@ dlabel D_8024363C_D9088C .word 0x00000000, 0x00240022, 0x00000000, 0x00000000, D_802435CC_D9081C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000 dlabel D_80243668_D908B8 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, pra_35_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, pra_35_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243710_D90960 .word 0x00000000, 0x000E0010, 0x00000000, 0x00000000, D_80243668_D908B8, 0x00000000, 0x00000000, D_802434B0_D90700, 0x00000000, 0x00000000, 0x00170008 @@ -27,7 +27,7 @@ dlabel D_8024373C_D9098C .word 0x40000000, 0x00000000, 0x00000000, 0x42C80000, 0x00000000, 0x00000004, 0x40600000, 0x0000001E, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_8024376C_D909BC -.word 0x00000043, 0x00000002, pra_35_UnkNpcAIMainFunc, D_8024373C_D9098C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, pra_35_PatrolNoAttackAI_Main, D_8024373C_D9098C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024378C_D909DC .word 0x00000000, 0x001E001E, 0x00000000, 0x00000000, D_8024376C_D909BC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000 diff --git a/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s b/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s index 687f5b1e8a..e3ccf927c0 100644 --- a/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s @@ -24,7 +24,7 @@ dlabel D_80241560_D92C60 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000004, 0x40600000, 0x0000001E, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80241590_D92C90 -.word 0x00000043, 0x00000002, DoBasicAI, D_80241560_D92C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80241560_D92C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415B0_D92CB0 .word 0x00000000, 0x001E001E, 0x00000000, 0x00000000, D_80241590_D92C90, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000 diff --git a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s b/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s index de84533d2e..7ada05c34d 100644 --- a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s +++ b/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s @@ -30,13 +30,13 @@ dlabel D_80241F1C_D94E5C .word 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001 dlabel D_80241F4C_D94E8C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, pra_37_UnkNpcAIFunc27, D_80241F1C_D94E5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, pra_37_WanderMeleeAI_Main, D_80241F1C_D94E5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FBC_D94EFC .word 0x00000000, 0x00240022, 0x00000000, 0x00000000, D_80241F4C_D94E8C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000 dlabel D_80241FE8_D94F28 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, pra_37_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, pra_37_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242090_D94FD0 .word 0x00000000, 0x000E0010, 0x00000000, 0x00000000, D_80241FE8_D94F28, 0x00000000, 0x00000000, D_80241E30_D94D70, 0x00000000, 0x00000000, 0x00170008 diff --git a/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s b/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s index 6b40fb67a3..327fbc12d6 100644 --- a/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s +++ b/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s @@ -36,7 +36,7 @@ dlabel D_80241DE8_D99678 .word 0x40000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x00000004, 0x40600000, 0x0000001E, 0x00000003, 0x43160000, 0x00000000, 0x00000001 dlabel D_80241E18_D996A8 -.word 0x00000043, 0x00000002, DoBasicAI, D_80241DE8_D99678, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80241DE8_D99678, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E38_D996C8 .word 0x00000000, 0x001E001E, 0x00000000, 0x00000000, D_80241E18_D996A8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000 diff --git a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s index 1d3267f12f..4d5a5291dd 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s @@ -105,7 +105,7 @@ dlabel D_80243654_CFB1C4 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80243684_CFB1F4 -.word 0x00000043, 0x00000002, DoBasicAI, D_80243654_CFB1C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80243654_CFB1C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802436A4_CFB214 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80243684_CFB1F4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -174,28 +174,28 @@ dlabel D_80245C18_CFD788 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80245C48_CFD7B8 -.word 0x00000043, 0x00000002, DoBasicAI, D_80245C18_CFD788, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80245C18_CFD788, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245C68_CFD7D8 .word 0x00AF0001, 0x0023001C, D_80245B08_CFD678, D_80245B7C_CFD6EC, 0x00000000, 0x00000000, D_80245BFC_CFD76C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80245B08_CFD678, D_80245B7C_CFD6EC, D_80245C48_CFD7B8, 0x00000000, D_80245BFC_CFD76C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 dlabel D_80245CC0_CFD830 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245D40_CFD8B0 -.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, sam_01_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245CC0_CFD830, 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_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245CC0_CFD830, 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_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246064_CFDBD4 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_80245D40_CFD8B0, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802460D4_CFDC44 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241A10_CF9580, 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_80246064_CFDBD4, 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_802435F4_CFB164, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241A54_CF95C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_01_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_80246064_CFDBD4, 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_802435F4_CFB164, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802463CC_CFDF3C .word 0x0000003A, 0x00000000 dlabel D_802463D4_CFDF44 -.word 0x00000043, 0x0000000B, sam_01_SetManyVars, 0x00000000, 0x00CE0004, 0x00CE0001, 0x0000003A, 0x00000000, 0x00120041, 0x00120042, 0x00120043, 0x00120044, D_802463CC_CFDF3C, 0x00000046, 0x00000001, D_802460D4_CFDC44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, sam_01_LetterDelivery_Init, 0x00000000, 0x00CE0004, 0x00CE0001, 0x0000003A, 0x00000000, 0x00120041, 0x00120042, 0x00120043, 0x00120044, D_802463CC_CFDF3C, 0x00000046, 0x00000001, D_802460D4_CFDC44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246424_CFDF94 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s index 9bd253c065..03c5fee08f 100644 --- a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s @@ -78,7 +78,7 @@ dlabel D_80246A8C_D0C1BC .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80246ABC_D0C1EC -.word 0x00000043, 0x00000002, DoBasicAI, D_80246A8C_D0C1BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80246A8C_D0C1BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246ADC_D0C20C .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80246ABC_D0C1EC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -156,7 +156,7 @@ dlabel D_802490E0_D0E810 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80249110_D0E840 -.word 0x00000043, 0x00000002, DoBasicAI, D_802490E0_D0E810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802490E0_D0E810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249130_D0E860 .word 0x00AF0001, 0x0023001C, D_80248FD0_D0E700, D_80249044_D0E774, 0x00000000, 0x00000000, D_802490C4_D0E7F4, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248FD0_D0E700, D_80249044_D0E774, D_80249110_D0E840, 0x00000000, D_802490C4_D0E7F4, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 diff --git a/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s b/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s index d729ffed99..8dc4a9287c 100644 --- a/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s +++ b/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s @@ -33,13 +33,13 @@ dlabel D_802419AC_D12A6C .word 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001 dlabel D_802419DC_D12A9C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, sam_03_UnkNpcAIFunc27, D_802419AC_D12A6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, sam_03_WanderMeleeAI_Main, D_802419AC_D12A6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241A4C_D12B0C .word 0x00000000, 0x00300024, 0x00000000, 0x00000000, D_802419DC_D12A9C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000 dlabel D_80241A78_D12B38 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_03_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_03_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B20_D12BE0 .word 0x00000000, 0x00200016, 0x00000000, 0x00000000, D_80241A78_D12B38, 0x00000000, 0x00000000, D_802418F0_D129B0, 0x00000000, 0x00000000, 0x00160008 diff --git a/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s b/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s index 0b8d1c3f77..f54d423d08 100644 --- a/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s +++ b/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s @@ -15,13 +15,13 @@ dlabel D_80242234_D1AA14 .word 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001 dlabel D_80242264_D1AA44 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, sam_05_UnkNpcAIFunc27, D_80242234_D1AA14, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, sam_05_WanderMeleeAI_Main, D_80242234_D1AA14, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422D4_D1AAB4 .word 0x00000000, 0x00300024, 0x00000000, 0x00000000, D_80242264_D1AA44, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000 dlabel D_80242300_D1AAE0 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_05_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802423A8_D1AB88 .word 0x00000000, 0x00200016, 0x00000000, 0x00000000, D_80242300_D1AAE0, 0x00000000, 0x00000000, D_80242178_D1A958, 0x00000000, 0x00000000, 0x00160008 @@ -36,13 +36,13 @@ dlabel D_802423F8_D1ABD8 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242428_D1AC08 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241754_D19F34, D_802423F8_D1ABD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, sam_05_PiranhaPlantAI_Main, D_802423F8_D1ABD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802424FC_D1ACDC .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80242428_D1AC08, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000 dlabel D_80242528_D1AD08 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, sam_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, sam_05_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242634_D1AE14 .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80242528_D1AD08, 0x00000000, 0x00000000, D_80242178_D1A958, 0x00000000, 0x00000000, 0x00160000 diff --git a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s index e85faa7623..ff256d6f94 100644 --- a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s +++ b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s @@ -6,13 +6,13 @@ dlabel D_80243FC0_D23E50 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80243FF0_D23E80 -.word 0x00000043, 0x00000002, DoBasicAI, D_80243FC0_D23E50, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80243FF0_D23E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80243FF0_D23E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80243FC0_D23E50, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80243FF0_D23E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80243FF0_D23E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 dlabel D_80244068_D23EF8 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244098_D23F28 -.word 0x00000043, 0x00000002, DoBasicAI, D_80244068_D23EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80244068_D23EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802440B8_D23F48 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80244098_D23F28, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -21,7 +21,7 @@ dlabel D_802440E4_D23F74 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244114_D23FA4 -.word 0x00000043, 0x00000002, DoBasicAI, D_802440E4_D23F74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802440E4_D23F74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244134_D23FC4 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80244114_D23FA4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -29,14 +29,14 @@ dlabel D_80244134_D23FC4 dlabel D_80244160_D23FF0 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 -dlabel sam_06_sixFloats +dlabel sam_06_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802441D0_D24060 .word 0x3F99999A, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244200_D24090 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, sam_06_UnkNpcAIMainFunc9, D_802441D0_D24060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244200_D24090, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, sam_06_FlyingAI_Main, D_802441D0_D24060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244200_D24090, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 dlabel D_8024429C_D2412C .word 0x00000000, 0x00140014, 0x00000000, 0x00000000, D_80244200_D24090, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80244200_D24090, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -141,22 +141,22 @@ dlabel D_80246A94_D26924 .word 0x00000043, 0x00000004, sam_06_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80249A50_D298E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, sam_06_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, sam_06_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024693C_D267CC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80249AB0_D29940, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_06_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802468C4_D26754, 0x00000013, 0x00000000, 0x00000043, 0x00000002, sam_06_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, sam_06_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249D1C_D29BAC, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, sam_06_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246E3C_D26CCC -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246EBC_D26D4C -.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, sam_06_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80246E3C_D26CCC, 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_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80246E3C_D26CCC, 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_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802471E0_D27070 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_80246EBC_D26D4C, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247250_D270E0 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802424C8_D22358, 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_802471E0_D27070, 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_802443D4_D24264, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024250C_D2239C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_06_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_802471E0_D27070, 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_802443D4_D24264, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_06_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247548_D273D8 .word 0x00000051, 0x00000000 dlabel D_80247550_D273E0 -.word 0x00000043, 0x0000000B, sam_06_SetManyVars, 0x00000003, 0x009B0104, 0x009B0101, 0x00000051, 0x00000052, 0x001200FE, 0x001200FF, 0x00120100, 0x00120101, D_80247548_D273D8, 0x00000046, 0x00000001, D_80247250_D270E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, sam_06_LetterDelivery_Init, 0x00000003, 0x009B0104, 0x009B0101, 0x00000051, 0x00000052, 0x001200FE, 0x001200FF, 0x00120100, 0x00120101, D_80247548_D273D8, 0x00000046, 0x00000001, D_80247250_D270E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802475A0_D27430 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000004A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F4, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F5, 0x0000001B, 0x00000001, 0x00000059, 0x0000000A, 0x00000002, 0xF840612B, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F6, 0x00000024, 0x00000002, 0xF840612B, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00D20004, 0x00D20001, 0x00000000, 0x001200F7, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s b/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s index 993a7105d6..beebad9b94 100644 --- a/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s @@ -9,13 +9,13 @@ dlabel D_80242D4C_D2EA7C .word 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001 dlabel D_80242D7C_D2EAAC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, sam_07_UnkNpcAIFunc27, D_80242D4C_D2EA7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, sam_07_WanderMeleeAI_Main, D_80242D4C_D2EA7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242DEC_D2EB1C .word 0x00000000, 0x00300024, 0x00000000, 0x00000000, D_80242D7C_D2EAAC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000 dlabel D_80242E18_D2EB48 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_07_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242EC0_D2EBF0 .word 0x00000000, 0x00200016, 0x00000000, 0x00000000, D_80242E18_D2EB48, 0x00000000, 0x00000000, D_80242C90_D2E9C0, 0x00000000, 0x00000000, 0x00160008 @@ -27,13 +27,13 @@ dlabel D_80242F10_D2EC40 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242F40_D2EC70 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241DA4_D2DAD4, D_80242F10_D2EC40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, sam_07_PiranhaPlantAI_Main, D_80242F10_D2EC40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243014_D2ED44 .word 0x00000000, 0x00320024, 0x00000000, 0x00000000, D_80242F40_D2EC70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000 dlabel D_80243040_D2ED70 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, sam_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, sam_07_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024314C_D2EE7C .word 0x00000000, 0x0014001C, 0x00000000, 0x00000000, D_80243040_D2ED70, 0x00000000, 0x00000000, D_80242C90_D2E9C0, 0x00000000, 0x00000000, 0x00160000 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s b/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s index 3cdbd694cb..a4661e4aa8 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s @@ -18,13 +18,13 @@ dlabel D_80242344_D31FC4 .word 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001 dlabel D_80242374_D31FF4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, sam_08_UnkNpcAIFunc27, D_80242344_D31FC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, sam_08_WanderMeleeAI_Main, D_80242344_D31FC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802423E4_D32064 .word 0x00000000, 0x00240022, 0x00000000, 0x00000000, D_80242374_D31FF4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000 dlabel D_80242410_D32090 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, sam_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, sam_08_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802424B8_D32138 .word 0x00000000, 0x000E0010, 0x00000000, 0x00000000, D_80242410_D32090, 0x00000000, 0x00000000, D_80242258_D31ED8, 0x00000000, 0x00000000, 0x00170008 diff --git a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s index 6865a50cc6..0a11286133 100644 --- a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s +++ b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s @@ -30,13 +30,13 @@ dlabel D_8024266C_D39E6C .word 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001 dlabel D_8024269C_D39E9C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, sam_10_UnkNpcAIFunc27, D_8024266C_D39E6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, sam_10_WanderMeleeAI_Main, D_8024266C_D39E6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024270C_D39F0C .word 0x00000000, 0x00240022, 0x00000000, 0x00000000, D_8024269C_D39E9C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000 dlabel D_80242738_D39F38 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, sam_10_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, sam_10_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802427E0_D39FE0 .word 0x00000000, 0x000E0010, 0x00000000, 0x00000000, D_80242738_D39F38, 0x00000000, 0x00000000, D_80242580_D39D80, 0x00000000, 0x00000000, 0x00170008 diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s index cca92d3538..eb1fd14c95 100644 --- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s +++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s @@ -99,7 +99,7 @@ dlabel D_80244E20_D3F3F0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244E50_D3F420 -.word 0x00000043, 0x00000002, DoBasicAI, D_80244E20_D3F3F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80244E20_D3F3F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244E70_D3F440 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80244E50_D3F420, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 @@ -183,7 +183,7 @@ dlabel D_802474F8_D41AC8 .word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80247528_D41AF8 -.word 0x00000043, 0x00000002, DoBasicAI, D_802474F8_D41AC8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802474F8_D41AC8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247548_D41B18 .word 0x00AF0001, 0x0023001C, D_802473E8_D419B8, D_8024745C_D41A2C, 0x00000000, 0x00000000, D_802474DC_D41AAC, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802473E8_D419B8, D_8024745C_D41A2C, D_80247528_D41AF8, 0x00000000, D_802474DC_D41AAC, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 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 index cad792c45c..5f23be814a 100644 --- 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 @@ -36,7 +36,7 @@ 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, func_80240B98_92AE48, 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 +.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 diff --git a/ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s b/ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s index 2a3cf38388..1587678c26 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s @@ -6,7 +6,7 @@ dlabel D_80240370_92FC20 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_802403A0_92FC50 -.word 0x00000043, 0x00000001, sbk_03_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240370_92FC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_03_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_92FC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802403CC_92FC7C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_92FC50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s b/ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s index 6e797dbb78..eca2b37ab4 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s @@ -6,7 +6,7 @@ dlabel D_80240370_930840 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_802403A0_930870 -.word 0x00000043, 0x00000001, sbk_04_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240370_930840, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_04_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_930840, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802403CC_93089C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_930870, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s b/ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s index 21e0327c04..1e4b80b2b1 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s @@ -6,7 +6,7 @@ dlabel D_80240440_931130 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240470_931160 -.word 0x00000043, 0x00000001, sbk_05_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240440_931130, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_05_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240440_931130, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024049C_93118C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240470_931160, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s b/ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s index 65d614843e..370bf711bc 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s @@ -9,7 +9,7 @@ dlabel D_802406C8_932C88 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802406F8_932CB8 -.word 0x00000043, 0x00000002, DoBasicAI, D_802406C8_932C88, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802406C8_932C88, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240718_932CD8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240630_932BF0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s b/ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s index 8e61652f11..567a8af9e7 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s @@ -9,7 +9,7 @@ dlabel D_80240588_9345C8 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802405B8_9345F8 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240588_9345C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_9345C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405D8_934618 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_934530, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -21,7 +21,7 @@ dlabel D_80240850_934890 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240880_9348C0 -.word 0x00000043, 0x00000001, sbk_11_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240850_934890, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_11_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_934890, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408AC_9348EC .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_9348C0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s b/ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s index 06ecaad8d2..42f3979391 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s @@ -6,7 +6,7 @@ dlabel D_802403F0_935130 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240420_935160 -.word 0x00000043, 0x00000001, sbk_12_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_802403F0_935130, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_12_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802403F0_935130, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024044C_93518C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240420_935160, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s index f61a74f947..a6e490bac7 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s @@ -9,7 +9,7 @@ dlabel D_80240588_935D68 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802405B8_935D98 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240588_935D68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_935D68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405D8_935DB8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_935CD0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -21,7 +21,7 @@ dlabel D_80240850_936030 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240880_936060 -.word 0x00000043, 0x00000001, sbk_13_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240850_936030, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_13_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_936030, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408AC_93608C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_936060, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s index 54ee72cf4b..de790f07ba 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s @@ -6,7 +6,7 @@ dlabel D_802403F0_9370C0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240420_9370F0 -.word 0x00000043, 0x00000001, sbk_15_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_802403F0_9370C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_15_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802403F0_9370C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024044C_93711C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240420_9370F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s index 4b9d48cd55..1f57b39f46 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s @@ -9,7 +9,7 @@ dlabel D_802408D8_938E68 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240908_938E98 -.word 0x00000043, 0x00000002, DoBasicAI, D_802408D8_938E68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802408D8_938E68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240928_938EB8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240840_938DD0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s b/ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s index a651535877..594a90904e 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s @@ -30,7 +30,7 @@ dlabel D_80240588_939EB8 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802405B8_939EE8 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240588_939EB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_939EB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405D8_939F08 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_939E20, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -42,7 +42,7 @@ dlabel D_80240850_93A180 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240880_93A1B0 -.word 0x00000043, 0x00000001, sbk_22_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240850_93A180, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_22_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_93A180, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408AC_93A1DC .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_93A1B0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s index 3e9bd18953..89c165dcfb 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s @@ -9,7 +9,7 @@ dlabel D_80240828_93B458 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240858_93B488 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240828_93B458, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240828_93B458, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240878_93B4A8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240790_93B3C0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240858_93B488, EnemyNpcHit, 0x00000000, D_80240878_93B4A8, 0x00000000, 0x00000000, 0x00090005, 0x00000043, 0x00000008, MakeEntity, 0x802EA5D0, 0x00000154, 0x0000003C, 0xFFFFFF56, 0x00000000, 0x00000103, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s b/ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s index 1851f37016..a008fdb0af 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s @@ -9,7 +9,7 @@ dlabel D_802407B8_93CA38 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802407E8_93CA68 -.word 0x00000043, 0x00000002, DoBasicAI, D_802407B8_93CA38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802407B8_93CA38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240808_93CA88 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240720_93C9A0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s b/ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s index 5f5a3ddd1a..330f2dde5a 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s @@ -9,7 +9,7 @@ dlabel D_80240758_93E428 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240788_93E458 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240758_93E428, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240758_93E428, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407A8_93E478 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802406C0_93E390, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -21,7 +21,7 @@ dlabel D_80240A20_93E6F0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240A50_93E720 -.word 0x00000043, 0x00000001, sbk_26_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240A20_93E6F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_26_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240A20_93E6F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240A7C_93E74C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240A50_93E720, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 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 index f3b2b3564f..c2d6ffe2ba 100644 --- 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 @@ -60,22 +60,22 @@ 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, 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_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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_UnkYawFunc, 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 +.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, func_80241560_940B10, 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, func_802415A4_940B54, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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_SetManyVars, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x000D004A, 0x000D004B, 0x000D004C, 0x000D004D, D_80242A84_942034, 0x00000046, 0x00000001, D_8024278C_941D3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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 diff --git a/ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s b/ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s index 503c5f1774..6f19b65951 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s @@ -9,7 +9,7 @@ dlabel D_80240568_944568 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240598_944598 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240568_944568, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240568_944568, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405B8_9445B8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404D0_9444D0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s b/ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s index 5a2ec861de..6a5e842b24 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s @@ -33,7 +33,7 @@ dlabel D_802405F8_945058 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240628_945088 -.word 0x00000043, 0x00000002, DoBasicAI, D_802405F8_945058, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802405F8_945058, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240648_9450A8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240560_944FC0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -45,7 +45,7 @@ dlabel D_802408C0_945320 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_802408F0_945350 -.word 0x00000043, 0x00000001, sbk_32_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_802408C0_945320, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_32_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802408C0_945320, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024091C_94537C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802408F0_945350, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s b/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s index c905c10027..556b2efbcb 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s @@ -42,22 +42,22 @@ dlabel D_80240E08_946CD8 .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_34_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_802403D8_9462A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240410_9462E0, 0xFE363C80, 0x0000004E, 0x00000006, D_80240E08_946CD8, 0x00000010, 0x00000000, sbk_34_802427E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240384_946254, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F9C_946E6C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_34_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_34_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024101C_946EEC -.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_34_UnkYawFunc, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80240F9C_946E6C, 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_802403D8_9462A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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_34_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80240F9C_946E6C, 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_802403D8_9462A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241340_947210 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240410_9462E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024101C_946EEC, 0x00000010, 0x00000000, sbk_34_802427E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240384_946254, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413B0_947280 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240728_9465F8, 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_80241340_947210, 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_80240DA0_946C70, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024076C_94663C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_34_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_80241340_947210, 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_80240DA0_946C70, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_34_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416A8_947578 .word 0x0000003D, 0x00000000 dlabel D_802416B0_947580 -.word 0x00000043, 0x0000000B, sbk_34_SetManyVars, 0x00000000, 0x00B90002, 0x00B90001, 0x0000003D, 0x00000000, 0x000D005B, 0x000D005C, 0x000D005D, 0x000D005E, D_802416A8_947578, 0x00000046, 0x00000001, D_802413B0_947280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x0000000B, sbk_34_LetterDelivery_Init, 0x00000000, 0x00B90002, 0x00B90001, 0x0000003D, 0x00000000, 0x000D005B, 0x000D005C, 0x000D005D, 0x000D005E, D_802416A8_947578, 0x00000046, 0x00000001, D_802413B0_947280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241700_9475D0 .word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80240DA0_946C70, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s b/ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s index b923eb674f..ba8ef39ef7 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s @@ -30,7 +30,7 @@ dlabel D_802407A8_948E58 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802407D8_948E88 -.word 0x00000043, 0x00000002, DoBasicAI, D_802407A8_948E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802407A8_948E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407F8_948EA8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240710_948DC0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s b/ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s index 94e2f5336d..d724ee28e0 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s @@ -9,7 +9,7 @@ dlabel D_802404F8_94B898 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240528_94B8C8 -.word 0x00000043, 0x00000002, DoBasicAI, D_802404F8_94B898, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802404F8_94B898, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240548_94B8E8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240460_94B800, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s index 3565029ec0..b834743f08 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s @@ -9,7 +9,7 @@ dlabel D_80240568_94CA78 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240598_94CAA8 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240568_94CA78, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240568_94CA78, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405B8_94CAC8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404D0_94C9E0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s b/ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s index fbd404ebc4..ad2594cbab 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s @@ -9,7 +9,7 @@ dlabel D_80240588_94DB28 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802405B8_94DB58 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240588_94DB28, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_94DB28, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405D8_94DB78 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_94DA90, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -21,7 +21,7 @@ dlabel D_80240850_94DDF0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240880_94DE20 -.word 0x00000043, 0x00000001, sbk_44_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240850_94DDF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_44_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_94DDF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408AC_94DE4C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_94DE20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s b/ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s index b649bb6e4d..f44e107c3c 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s @@ -9,7 +9,7 @@ dlabel D_80240768_94F108 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_80240798_94F138 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240768_94F108, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240768_94F108, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407B8_94F158 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802406D0_94F070, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -21,7 +21,7 @@ dlabel D_80240A30_94F3D0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240A60_94F400 -.word 0x00000043, 0x00000001, sbk_46_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240A30_94F3D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_46_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240A30_94F3D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240A8C_94F42C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240A60_94F400, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s b/ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s index b86549a77f..a742b3c7ba 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s @@ -9,7 +9,7 @@ dlabel D_80240588_950EF8 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802405B8_950F28 -.word 0x00000043, 0x00000002, DoBasicAI, D_80240588_950EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_950EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405D8_950F48 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_950E60, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -21,7 +21,7 @@ dlabel D_80240850_9511C0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240880_9511F0 -.word 0x00000043, 0x00000001, sbk_51_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240850_9511C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_51_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_9511C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408AC_95121C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_9511F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s b/ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s index 48c30c0632..a91a1ecce0 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s @@ -6,7 +6,7 @@ dlabel D_802403F0_951ED0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240420_951F00 -.word 0x00000043, 0x00000001, sbk_53_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_802403F0_951ED0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_53_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802403F0_951ED0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024044C_951F2C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240420_951F00, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s b/ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s index 71572b45f7..0c7296c38d 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s @@ -6,7 +6,7 @@ dlabel D_80240640_953090 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240670_9530C0 -.word 0x00000043, 0x00000001, sbk_55_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240640_953090, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_55_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240640_953090, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024069C_9530EC .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240670_9530C0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s b/ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s index 84b92aa258..4383c12f41 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s @@ -6,7 +6,7 @@ dlabel D_80240300_956CF0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_80240330_956D20 -.word 0x00000043, 0x00000001, sbk_60_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240300_956CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_60_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240300_956CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024035C_956D4C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240330_956D20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s index 7fe1c8af78..f7f7d3f149 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s @@ -6,7 +6,7 @@ dlabel D_80240370_9576C0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_802403A0_9576F0 -.word 0x00000043, 0x00000001, sbk_62_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240370_9576C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_62_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_9576C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802403CC_95771C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_9576F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s index 01c2d3028d..855e135dd8 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s @@ -6,7 +6,7 @@ dlabel D_80240370_9580E0 .word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 dlabel D_802403A0_958110 -.word 0x00000043, 0x00000001, sbk_63_SetNpcB5_3, 0x00000043, 0x00000002, DoBasicAI, D_80240370_9580E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, sbk_63_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_9580E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802403CC_95813C .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_958110, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s index 9cf5d1e960..f9232e3958 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s @@ -9,7 +9,7 @@ dlabel D_802406C8_959378 .word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 dlabel D_802406F8_9593A8 -.word 0x00000043, 0x00000002, DoBasicAI, D_802406C8_959378, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802406C8_959378, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240718_9593C8 .word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240630_9592E0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s b/ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s index 381a1c8963..73314319b6 100644 --- a/ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s @@ -6,7 +6,7 @@ dlabel D_80242CB0_8746E0 .word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 dlabel D_80242CE0_874710 -.word 0x00000043, 0x00000002, DoBasicAI, D_80242CB0_8746E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80242CB0_8746E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242D00_874730 .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80242CE0_874710, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/876A50.data.s b/ver/us/asm/data/world/area_tik/tik_05/876A50.data.s index 806f9646dc..b8927b3b38 100644 --- a/ver/us/asm/data/world/area_tik/tik_05/876A50.data.s +++ b/ver/us/asm/data/world/area_tik/tik_05/876A50.data.s @@ -6,7 +6,7 @@ dlabel D_80241C90_876A50 .word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 dlabel D_80241CC0_876A80 -.word 0x00000043, 0x00000002, DoBasicAI, D_80241C90_876A50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80241C90_876A50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CE0_876AA0 .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80241CC0_876A80, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87E890.data.s b/ver/us/asm/data/world/area_tik/tik_07/87E890.data.s index c1c53c1ab0..914b600309 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87E890.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87E890.data.s @@ -2,14 +2,14 @@ .section .data -dlabel tik_07_sixFloats +dlabel tik_07_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244CC8_87E8A8 .word 0x40000000, 0x00000000, 0x00000000, 0x42A00000, 0x00000000, 0x00000005, 0x40400000, 0x0000000A, 0x00000002, 0x42C80000, 0x00000000, 0x00000001 dlabel D_80244CF8_87E8D8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFCAE, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000003C, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, tik_07_UnkNpcAIMainFunc9, D_80244CC8_87E8A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFCAE, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000003C, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, tik_07_FlyingAI_Main, D_80244CC8_87E8A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244D68_87E948 .word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_80244CF8_87E8D8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s b/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s index 87b2123694..84f0ee6c09 100644 --- a/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s +++ b/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s @@ -6,7 +6,7 @@ dlabel D_802438C0_885A80 .word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 dlabel D_802438F0_885AB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_09_UnkNpcAIMainFunc5, D_802438C0_885A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_09_TackleAI_Main, D_802438C0_885A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243960_885B20 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802438F0_885AB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 @@ -15,7 +15,7 @@ dlabel D_8024398C_885B4C .word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000003C, 0x00000019, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243A6C_885C2C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241204_8833C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF8405D30, 0x00000001, 0x00000044, 0x00000001, D_80243520_8856E0, 0x00000044, 0x00000001, D_8024398C_885B4C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, tik_09_GetDefeatedEnemyCount, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF8405D30, 0x00000001, 0x00000044, 0x00000001, D_80243520_8856E0, 0x00000044, 0x00000001, D_8024398C_885B4C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243B20_885CE0 .word 0x0000000A, 0x00000002, 0xF8405D30, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80243A6C_885C2C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s index d2606a8e18..20da61a713 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s @@ -33,22 +33,22 @@ dlabel D_80244430_88D000 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244460_88D030 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802444D0_88D0A0 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 dlabel D_80244500_88D0D0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_802444D0_88D0A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_802444D0_88D0A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244570_88D140 .word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 dlabel D_802445A0_88D170 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_80244570_88D140, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_80244570_88D140, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244610_88D1E0 -.word 0x00000043, 0x00000001, tik_12_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, tik_12_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, tik_12_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_UnkNpcAIMainFunc5, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, tik_12_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, tik_12_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, tik_12_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244704_88D2D4 .word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244460_88D030, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244610_88D1E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244500_88D0D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802445A0_88D170, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s b/ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s index aa034fdec4..02c471b9b1 100644 --- a/ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s @@ -6,7 +6,7 @@ dlabel D_802415C0_896CA0 .word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 dlabel D_802415F0_896CD0 -.word 0x00000043, 0x00000002, DoBasicAI, D_802415C0_896CA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_802415C0_896CA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241610_896CF0 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_802415F0_896CD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 @@ -15,7 +15,7 @@ dlabel D_8024163C_896D1C .word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 dlabel D_8024166C_896D4C -.word 0x00000043, 0x00000002, DoBasicAI, D_8024163C_896D1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_8024163C_896D1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024168C_896D6C .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_8024166C_896D4C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s b/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s index 41ab2e5886..463c1c7104 100644 --- a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s +++ b/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s @@ -6,7 +6,7 @@ dlabel D_80242EB0_89D200 .word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 dlabel D_80242EE0_89D230 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_20_UnkNpcAIMainFunc5, D_80242EB0_89D200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_20_TackleAI_Main, D_80242EB0_89D200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F50_89D2A0 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242EE0_89D230, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s index a4f55c7525..cf8e1c7fb0 100644 --- a/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s +++ b/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s @@ -6,7 +6,7 @@ dlabel D_80242F70_8A5340 .word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 dlabel D_80242FA0_8A5370 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, tik_23_UnkNpcAIMainFunc5, D_80242F70_8A5340, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, tik_23_TackleAI_Main, D_80242F70_8A5340, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243010_8A53E0 .word 0x00000000, 0x00150016, 0x00000000, 0x00000000, D_80242FA0_8A5370, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s index c13001ea9c..099ddaca9b 100644 --- a/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s +++ b/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s @@ -6,7 +6,7 @@ dlabel D_80241FA0_8A7A20 .word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 dlabel D_80241FD0_8A7A50 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_24_UnkNpcAIMainFunc5, D_80241FA0_8A7A20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_24_TackleAI_Main, D_80241FA0_8A7A20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242040_8A7AC0 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80241FD0_8A7A50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s b/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s index 6d884e349d..2f288dce81 100644 --- a/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s +++ b/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s @@ -6,7 +6,7 @@ dlabel D_802433F0_99FD80 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80243420_99FDB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_01_UnkNpcAIMainFunc5, D_802433F0_99FD80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_01_TackleAI_Main, D_802433F0_99FD80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243490_99FE20 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243420_99FDB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -15,7 +15,7 @@ dlabel D_802434BC_99FE4C .word 0x42DC0000, 0x42820000, 0x00000008, 0x4059999A, 0x00000078, 0x00000002, 0x42DC0000, 0x42820000, 0x00000001 dlabel D_802434E0_99FE70 -.word 0x00000043, 0x00000002, trd_01_UnkNpcAIMainFunc4, D_802434BC_99FE4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, trd_01_StationaryAI_Main, D_802434BC_99FE4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243500_99FE90 .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_802434E0_99FE70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s index e14f5e9def..8314809430 100644 --- a/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s @@ -6,7 +6,7 @@ dlabel D_80242AD0_9A3AB0 .word 0x3FC00000, 0x0000003C, 0x0000000A, 0x42DC0000, 0x42820000, 0x00000008, 0x4059999A, 0x00000078, 0x00000002, 0x42DC0000, 0x42820000, 0x00000001 dlabel D_80242B00_9A3AE0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80242AD0_9A3AB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80242AD0_9A3AB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B20_9A3B00 .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_80242B00_9A3AE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -15,13 +15,13 @@ dlabel D_80242B4C_9A3B2C .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80242B7C_9A3B5C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_02_UnkNpcAIMainFunc5, D_80242B4C_9A3B2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242B7C_9A3B5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_02_TackleAI_Main, D_80242B4C_9A3B2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242B7C_9A3B5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 dlabel D_80242C18_9A3BF8 .word 0x3FC00000, 0x00000019, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40E00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80242C48_9A3C28 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, trd_02_UnkNpcAIMainFunc8, D_80242C18_9A3BF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, trd_02_KoopaPatrolAI_Main, D_80242C18_9A3BF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242CA4_9A3C84 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242C48_9A3C28, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s index cc896bae29..5a0210152f 100644 --- a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s @@ -6,7 +6,7 @@ dlabel D_80241AA0_9A60F0 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80241AD0_9A6120 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_03_UnkNpcAIMainFunc5, D_80241AA0_9A60F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_03_TackleAI_Main, D_80241AA0_9A60F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B40_9A6190 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80241AD0_9A6120, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -18,7 +18,7 @@ dlabel D_80241B98_9A61E8 .word 0x3FC00000, 0x0000003C, 0x0000000A, 0x42DC0000, 0x42820000, 0x00000008, 0x4059999A, 0x00000078, 0x00000002, 0x42DC0000, 0x42820000, 0x00000001 dlabel D_80241BC8_9A6218 -.word 0x00000043, 0x00000002, DoBasicAI, D_80241B98_9A61E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_80241BC8_9A6218, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240ABC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD30, 0x00000000, 0x0000004B, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD44, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660305, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFDC6, 0x00000000, 0xFFFFFFC7, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDA1, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000140, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDA1, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A84E7, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFDD5, 0x00000014, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660314, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00290109, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00290101, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000036, 0x0000026B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x00000028, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000000C, 0x00000000, 0xFE363C80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000036, 0x0000026C, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFDDA, 0x00000046, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660314, 0x00660304, 0x00000005, 0x000C00D3, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C3, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000002D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000002F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD79, 0x00000000, 0x00000050, 0x00000046, 0x00000001, D_80240ED8_9A5528, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x00000004, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066031E, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660314, 0x00660304, 0x00000000, 0x000C00D4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660302, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000173, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000174, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFED4, 0x00000046, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000044, 0x00000001, 0x80240B04, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80241B98_9A61E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_80241BC8_9A6218, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240ABC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD30, 0x00000000, 0x0000004B, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD44, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660305, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFDC6, 0x00000000, 0xFFFFFFC7, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDA1, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000140, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDA1, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A84E7, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFDD5, 0x00000014, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660314, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00290109, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00290101, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000036, 0x0000026B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x00000028, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000000C, 0x00000000, 0xFE363C80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000036, 0x0000026C, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFDDA, 0x00000046, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660314, 0x00660304, 0x00000005, 0x000C00D3, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C3, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000002D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000002F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD79, 0x00000000, 0x00000050, 0x00000046, 0x00000001, D_80240ED8_9A5528, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x00000004, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066031E, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660314, 0x00660304, 0x00000000, 0x000C00D4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660302, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000173, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000174, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFED4, 0x00000046, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000044, 0x00000001, 0x80240B04, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242334_9A6984 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s b/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s index 6261ebe4e5..c4e3198f19 100644 --- a/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s +++ b/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s @@ -6,7 +6,7 @@ dlabel D_80245570_9AD960 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_802455A0_9AD990 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_04_UnkNpcAIMainFunc5, D_80245570_9AD960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_04_TackleAI_Main, D_80245570_9AD960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245610_9ADA00 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802455A0_9AD990, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 @@ -15,19 +15,19 @@ dlabel D_8024563C_9ADA2C .word 0x3FC00000, 0x00000019, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40E00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_8024566C_9ADA5C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, trd_04_UnkNpcAIMainFunc8, D_8024563C_9ADA2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, trd_04_KoopaPatrolAI_Main, D_8024563C_9ADA2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802456C8_9ADAB8 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_8024566C_9ADA5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel trd_04_sixFloats +dlabel trd_04_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_8024570C_9ADAFC .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41A00000, 0x0000000A, 0x40266666, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 dlabel D_8024573C_9ADB2C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80243650_9ABA40, D_8024570C_9ADAFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, trd_04_ParatroopaAI_Main, D_8024570C_9ADAFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802457AC_9ADB9C .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_8024573C_9ADB2C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060001 diff --git a/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s b/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s index 1f8676bc76..db401aaeaa 100644 --- a/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s @@ -6,7 +6,7 @@ dlabel D_80244830_9B5FC0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 dlabel D_80244860_9B5FF0 -.word 0x00000043, 0x00000002, DoBasicAI, D_80244830_9B5FC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, BasicAI_Main, D_80244830_9B5FC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244880_9B6010 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80244860_9B5FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x002A0018, 0x00000000, 0x00000000, D_80244860_9B5FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, EnableNpcAI, 0x00000010, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00660118, 0x00660118, 0x00000000, 0x000C010C, 0x00000043, 0x00000003, EnableNpcAI, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000003, GotoMap, 0x802451D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s b/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s index 6b1908fd5c..48b4c264d3 100644 --- a/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s +++ b/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s @@ -6,25 +6,25 @@ dlabel D_80242DE0_9B9760 .word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 dlabel D_80242E10_9B9790 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_07_UnkNpcAIMainFunc5, D_80242DE0_9B9760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_07_TackleAI_Main, D_80242DE0_9B9760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E80_9B9800 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242E10_9B9790, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel trd_07_sixFloats +dlabel trd_07_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80242EC4_9B9844 .word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41A00000, 0x0000000A, 0x40266666, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 dlabel D_80242EF4_9B9874 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_8024231C_9B8C9C, D_80242EC4_9B9844, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, trd_07_ParatroopaAI_Main, D_80242EC4_9B9844, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F64_9B98E4 .word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242EF4_9B9874, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060001 dlabel D_80242F90_9B9910 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024256C_9B8EEC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF8405E1A, 0x00000001, 0x00000044, 0x00000001, 0x8024475C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, trd_07_GetDefeatedEnemyCount, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF8405E1A, 0x00000001, 0x00000044, 0x00000001, 0x8024475C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243070_9B99F0 .word 0x00000043, 0x00000002, SetSelfEnemyFlags, 0x00800000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242F90_9B9910, 0x0000000A, 0x00000002, 0xF8405E1A, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242D64_EA3664.s b/ver/us/asm/nonmatchings/EA0C10/func_80242D64_EA3664.s deleted file mode 100644 index 9772bb9117..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242D64_EA3664.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D64_EA3664 -/* EA3664 80242D64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA3668 80242D68 AFB00010 */ sw $s0, 0x10($sp) -/* EA366C 80242D6C 0080802D */ daddu $s0, $a0, $zero -/* EA3670 80242D70 AFBF0014 */ sw $ra, 0x14($sp) -/* EA3674 80242D74 0C00F92F */ jal dead_get_npc_unsafe -/* EA3678 80242D78 8E04008C */ lw $a0, 0x8c($s0) -/* EA367C 80242D7C 0040282D */ daddu $a1, $v0, $zero -/* EA3680 80242D80 8E040094 */ lw $a0, 0x94($s0) -/* EA3684 80242D84 8CA30028 */ lw $v1, 0x28($a1) -/* EA3688 80242D88 ACA40028 */ sw $a0, 0x28($a1) -/* EA368C 80242D8C 8FBF0014 */ lw $ra, 0x14($sp) -/* EA3690 80242D90 8FB00010 */ lw $s0, 0x10($sp) -/* EA3694 80242D94 24020002 */ addiu $v0, $zero, 2 -/* EA3698 80242D98 3C018024 */ lui $at, %hi(D_80246894) -/* EA369C 80242D9C AC236894 */ sw $v1, %lo(D_80246894)($at) -/* EA36A0 80242DA0 03E00008 */ jr $ra -/* EA36A4 80242DA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242DA8_EA36A8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242DA8_EA36A8.s deleted file mode 100644 index 9b11b7e7ed..0000000000 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242DA8_EA36A8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DA8_EA36A8 -/* EA36A8 80242DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EA36AC 80242DAC AFBF0010 */ sw $ra, 0x10($sp) -/* EA36B0 80242DB0 0C00F92F */ jal dead_get_npc_unsafe -/* EA36B4 80242DB4 8C84008C */ lw $a0, 0x8c($a0) -/* EA36B8 80242DB8 3C038024 */ lui $v1, %hi(D_80246894) -/* EA36BC 80242DBC 8C636894 */ lw $v1, %lo(D_80246894)($v1) -/* EA36C0 80242DC0 AC430028 */ sw $v1, 0x28($v0) -/* EA36C4 80242DC4 8FBF0010 */ lw $ra, 0x10($sp) -/* EA36C8 80242DC8 24020002 */ addiu $v0, $zero, 2 -/* EA36CC 80242DCC 03E00008 */ jr $ra -/* EA36D0 80242DD0 27BD0018 */ addiu $sp, $sp, 0x18 -/* EA36D4 80242DD4 00000000 */ nop -/* EA36D8 80242DD8 00000000 */ nop -/* EA36DC 80242DDC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s b/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s deleted file mode 100644 index bd74fe9700..0000000000 --- a/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_set_cursor_goal_pos_EA3700 -/* EA3700 80242E00 3C038011 */ lui $v1, %hi(dead_gPartnerActionStatus2) -/* EA3704 80242E04 24637160 */ addiu $v1, $v1, %lo(dead_gPartnerActionStatus2) -/* EA3708 80242E08 80620000 */ lb $v0, ($v1) -/* EA370C 80242E0C 10400004 */ beqz $v0, .L80242E20 -/* EA3710 80242E10 2402FFFF */ addiu $v0, $zero, -1 -/* EA3714 80242E14 80620003 */ lb $v0, 3($v1) -/* EA3718 80242E18 08090B89 */ j .L80242E24 -/* EA371C 80242E1C AC820084 */ sw $v0, 0x84($a0) -.L80242E20: -/* EA3720 80242E20 AC820084 */ sw $v0, 0x84($a0) -.L80242E24: -/* EA3724 80242E24 03E00008 */ jr $ra -/* EA3728 80242E28 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241B50_EAA630.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241B50_EAA630.s deleted file mode 100644 index 70851331a2..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241B50_EAA630.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B50_EAA630 -/* EAA630 80241B50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EAA634 80241B54 AFB00010 */ sw $s0, 0x10($sp) -/* EAA638 80241B58 0080802D */ daddu $s0, $a0, $zero -/* EAA63C 80241B5C AFBF0014 */ sw $ra, 0x14($sp) -/* EAA640 80241B60 0C00F92F */ jal dead_get_npc_unsafe -/* EAA644 80241B64 8E04008C */ lw $a0, 0x8c($s0) -/* EAA648 80241B68 0040282D */ daddu $a1, $v0, $zero -/* EAA64C 80241B6C 8E040094 */ lw $a0, 0x94($s0) -/* EAA650 80241B70 8CA30028 */ lw $v1, 0x28($a1) -/* EAA654 80241B74 ACA40028 */ sw $a0, 0x28($a1) -/* EAA658 80241B78 8FBF0014 */ lw $ra, 0x14($sp) -/* EAA65C 80241B7C 8FB00010 */ lw $s0, 0x10($sp) -/* EAA660 80241B80 24020002 */ addiu $v0, $zero, 2 -/* EAA664 80241B84 3C018025 */ lui $at, %hi(D_8024854C) -/* EAA668 80241B88 AC23854C */ sw $v1, %lo(D_8024854C)($at) -/* EAA66C 80241B8C 03E00008 */ jr $ra -/* EAA670 80241B90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241B94_EAA674.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241B94_EAA674.s deleted file mode 100644 index 32447e31ff..0000000000 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241B94_EAA674.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B94_EAA674 -/* EAA674 80241B94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EAA678 80241B98 AFBF0010 */ sw $ra, 0x10($sp) -/* EAA67C 80241B9C 0C00F92F */ jal dead_get_npc_unsafe -/* EAA680 80241BA0 8C84008C */ lw $a0, 0x8c($a0) -/* EAA684 80241BA4 3C038025 */ lui $v1, %hi(D_8024854C) -/* EAA688 80241BA8 8C63854C */ lw $v1, %lo(D_8024854C)($v1) -/* EAA68C 80241BAC AC430028 */ sw $v1, 0x28($v0) -/* EAA690 80241BB0 8FBF0010 */ lw $ra, 0x10($sp) -/* EAA694 80241BB4 24020002 */ addiu $v0, $zero, 2 -/* EAA698 80241BB8 03E00008 */ jr $ra -/* EAA69C 80241BBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s b/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s deleted file mode 100644 index d2f77482fa..0000000000 --- a/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241364_ECB064 -/* ECB064 80241364 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* ECB068 80241368 AFB3003C */ sw $s3, 0x3c($sp) -/* ECB06C 8024136C 0080982D */ daddu $s3, $a0, $zero -/* ECB070 80241370 AFBF0040 */ sw $ra, 0x40($sp) -/* ECB074 80241374 AFB20038 */ sw $s2, 0x38($sp) -/* ECB078 80241378 AFB10034 */ sw $s1, 0x34($sp) -/* ECB07C 8024137C AFB00030 */ sw $s0, 0x30($sp) -/* ECB080 80241380 8E720148 */ lw $s2, 0x148($s3) -/* ECB084 80241384 00A0882D */ daddu $s1, $a1, $zero -/* ECB088 80241388 86440008 */ lh $a0, 8($s2) -/* ECB08C 8024138C 0C00F92F */ jal dead_get_npc_unsafe -/* ECB090 80241390 00C0802D */ daddu $s0, $a2, $zero -/* ECB094 80241394 0200202D */ daddu $a0, $s0, $zero -/* ECB098 80241398 0240282D */ daddu $a1, $s2, $zero -/* ECB09C 8024139C 24030001 */ addiu $v1, $zero, 1 -/* ECB0A0 802413A0 AFA30010 */ sw $v1, 0x10($sp) -/* ECB0A4 802413A4 8E260024 */ lw $a2, 0x24($s1) -/* ECB0A8 802413A8 8E270028 */ lw $a3, 0x28($s1) -/* ECB0AC 802413AC 0C013469 */ jal func_8004D1A4 -/* ECB0B0 802413B0 0040802D */ daddu $s0, $v0, $zero -/* ECB0B4 802413B4 1440001D */ bnez $v0, .L8024142C -/* ECB0B8 802413B8 24040002 */ addiu $a0, $zero, 2 -/* ECB0BC 802413BC 0200282D */ daddu $a1, $s0, $zero -/* ECB0C0 802413C0 0000302D */ daddu $a2, $zero, $zero -/* ECB0C4 802413C4 860300A8 */ lh $v1, 0xa8($s0) -/* ECB0C8 802413C8 3C013F80 */ lui $at, 0x3f80 -/* ECB0CC 802413CC 44810000 */ mtc1 $at, $f0 -/* ECB0D0 802413D0 3C014000 */ lui $at, 0x4000 -/* ECB0D4 802413D4 44811000 */ mtc1 $at, $f2 -/* ECB0D8 802413D8 3C01C1A0 */ lui $at, 0xc1a0 -/* ECB0DC 802413DC 44812000 */ mtc1 $at, $f4 -/* ECB0E0 802413E0 2402000F */ addiu $v0, $zero, 0xf -/* ECB0E4 802413E4 AFA2001C */ sw $v0, 0x1c($sp) -/* ECB0E8 802413E8 44833000 */ mtc1 $v1, $f6 -/* ECB0EC 802413EC 00000000 */ nop -/* ECB0F0 802413F0 468031A0 */ cvt.s.w $f6, $f6 -/* ECB0F4 802413F4 44073000 */ mfc1 $a3, $f6 -/* ECB0F8 802413F8 27A20028 */ addiu $v0, $sp, 0x28 -/* ECB0FC 802413FC AFA20020 */ sw $v0, 0x20($sp) -/* ECB100 80241400 E7A00010 */ swc1 $f0, 0x10($sp) -/* ECB104 80241404 E7A20014 */ swc1 $f2, 0x14($sp) -/* ECB108 80241408 0C01D444 */ jal dead_fx_emote -/* ECB10C 8024140C E7A40018 */ swc1 $f4, 0x18($sp) -/* ECB110 80241410 8E4200CC */ lw $v0, 0xcc($s2) -/* ECB114 80241414 8C430000 */ lw $v1, ($v0) -/* ECB118 80241418 24020019 */ addiu $v0, $zero, 0x19 -/* ECB11C 8024141C A602008E */ sh $v0, 0x8e($s0) -/* ECB120 80241420 2402000E */ addiu $v0, $zero, 0xe -/* ECB124 80241424 0809052A */ j .L802414A8 -/* ECB128 80241428 AE030028 */ sw $v1, 0x28($s0) -.L8024142C: -/* ECB12C 8024142C 8E4200CC */ lw $v0, 0xcc($s2) -/* ECB130 80241430 8E030028 */ lw $v1, 0x28($s0) -/* ECB134 80241434 8C420020 */ lw $v0, 0x20($v0) -/* ECB138 80241438 10620014 */ beq $v1, $v0, .L8024148C -/* ECB13C 8024143C 00000000 */ nop -/* ECB140 80241440 C6000018 */ lwc1 $f0, 0x18($s0) -/* ECB144 80241444 3C014010 */ lui $at, 0x4010 -/* ECB148 80241448 44811800 */ mtc1 $at, $f3 -/* ECB14C 8024144C 44801000 */ mtc1 $zero, $f2 -/* ECB150 80241450 46000021 */ cvt.d.s $f0, $f0 -/* ECB154 80241454 4622003C */ c.lt.d $f0, $f2 -/* ECB158 80241458 00000000 */ nop -/* ECB15C 8024145C 45000003 */ bc1f .L8024146C -/* ECB160 80241460 0000282D */ daddu $a1, $zero, $zero -/* ECB164 80241464 0809051D */ j .L80241474 -/* ECB168 80241468 0200202D */ daddu $a0, $s0, $zero -.L8024146C: -/* ECB16C 8024146C 0200202D */ daddu $a0, $s0, $zero -/* ECB170 80241470 24050001 */ addiu $a1, $zero, 1 -.L80241474: -/* ECB174 80241474 0C010420 */ jal func_80041080 -/* ECB178 80241478 00000000 */ nop -/* ECB17C 8024147C 8E050018 */ lw $a1, 0x18($s0) -/* ECB180 80241480 8E06000C */ lw $a2, 0xc($s0) -/* ECB184 80241484 0C00F909 */ jal dead_npc_move_heading -/* ECB188 80241488 0200202D */ daddu $a0, $s0, $zero -.L8024148C: -/* ECB18C 8024148C 8602008E */ lh $v0, 0x8e($s0) -/* ECB190 80241490 9603008E */ lhu $v1, 0x8e($s0) -/* ECB194 80241494 18400003 */ blez $v0, .L802414A4 -/* ECB198 80241498 2462FFFF */ addiu $v0, $v1, -1 -/* ECB19C 8024149C 0809052B */ j .L802414AC -/* ECB1A0 802414A0 A602008E */ sh $v0, 0x8e($s0) -.L802414A4: -/* ECB1A4 802414A4 2402000C */ addiu $v0, $zero, 0xc -.L802414A8: -/* ECB1A8 802414A8 AE620070 */ sw $v0, 0x70($s3) -.L802414AC: -/* ECB1AC 802414AC 8FBF0040 */ lw $ra, 0x40($sp) -/* ECB1B0 802414B0 8FB3003C */ lw $s3, 0x3c($sp) -/* ECB1B4 802414B4 8FB20038 */ lw $s2, 0x38($sp) -/* ECB1B8 802414B8 8FB10034 */ lw $s1, 0x34($sp) -/* ECB1BC 802414BC 8FB00030 */ lw $s0, 0x30($sp) -/* ECB1C0 802414C0 03E00008 */ jr $ra -/* ECB1C4 802414C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s deleted file mode 100644 index f3d696e3f4..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s +++ /dev/null @@ -1,352 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DE4_EE07A4 -/* EE07A4 80241DE4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* EE07A8 80241DE8 AFB40050 */ sw $s4, 0x50($sp) -/* EE07AC 80241DEC 0080A02D */ daddu $s4, $a0, $zero -/* EE07B0 80241DF0 AFBF005C */ sw $ra, 0x5c($sp) -/* EE07B4 80241DF4 AFB60058 */ sw $s6, 0x58($sp) -/* EE07B8 80241DF8 AFB50054 */ sw $s5, 0x54($sp) -/* EE07BC 80241DFC AFB3004C */ sw $s3, 0x4c($sp) -/* EE07C0 80241E00 AFB20048 */ sw $s2, 0x48($sp) -/* EE07C4 80241E04 AFB10044 */ sw $s1, 0x44($sp) -/* EE07C8 80241E08 AFB00040 */ sw $s0, 0x40($sp) -/* EE07CC 80241E0C F7B40060 */ sdc1 $f20, 0x60($sp) -/* EE07D0 80241E10 8E930148 */ lw $s3, 0x148($s4) -/* EE07D4 80241E14 86640008 */ lh $a0, 8($s3) -/* EE07D8 80241E18 8E90000C */ lw $s0, 0xc($s4) -/* EE07DC 80241E1C 0C00F92F */ jal dead_get_npc_unsafe -/* EE07E0 80241E20 00A0882D */ daddu $s1, $a1, $zero -/* EE07E4 80241E24 0280202D */ daddu $a0, $s4, $zero -/* EE07E8 80241E28 8E050000 */ lw $a1, ($s0) -/* EE07EC 80241E2C 0C0B53A3 */ jal dead_evt_get_variable -/* EE07F0 80241E30 0040902D */ daddu $s2, $v0, $zero -/* EE07F4 80241E34 AFA00020 */ sw $zero, 0x20($sp) -/* EE07F8 80241E38 8E6300D0 */ lw $v1, 0xd0($s3) -/* EE07FC 80241E3C 8C630030 */ lw $v1, 0x30($v1) -/* EE0800 80241E40 AFA30024 */ sw $v1, 0x24($sp) -/* EE0804 80241E44 8E6300D0 */ lw $v1, 0xd0($s3) -/* EE0808 80241E48 8C63001C */ lw $v1, 0x1c($v1) -/* EE080C 80241E4C AFA30028 */ sw $v1, 0x28($sp) -/* EE0810 80241E50 8E6300D0 */ lw $v1, 0xd0($s3) -/* EE0814 80241E54 8C630024 */ lw $v1, 0x24($v1) -/* EE0818 80241E58 AFA3002C */ sw $v1, 0x2c($sp) -/* EE081C 80241E5C 8E6300D0 */ lw $v1, 0xd0($s3) -/* EE0820 80241E60 8C630028 */ lw $v1, 0x28($v1) -/* EE0824 80241E64 AFA30030 */ sw $v1, 0x30($sp) -/* EE0828 80241E68 8E6300D0 */ lw $v1, 0xd0($s3) -/* EE082C 80241E6C 3C0142F0 */ lui $at, 0x42f0 -/* EE0830 80241E70 44810000 */ mtc1 $at, $f0 -/* EE0834 80241E74 8C63002C */ lw $v1, 0x2c($v1) -/* EE0838 80241E78 E7A00038 */ swc1 $f0, 0x38($sp) -/* EE083C 80241E7C A7A0003C */ sh $zero, 0x3c($sp) -/* EE0840 80241E80 AFA30034 */ sw $v1, 0x34($sp) -/* EE0844 80241E84 C6400038 */ lwc1 $f0, 0x38($s2) -/* EE0848 80241E88 E6600108 */ swc1 $f0, 0x108($s3) -/* EE084C 80241E8C C640003C */ lwc1 $f0, 0x3c($s2) -/* EE0850 80241E90 27B50020 */ addiu $s5, $sp, 0x20 -/* EE0854 80241E94 E660010C */ swc1 $f0, 0x10c($s3) -/* EE0858 80241E98 3C0138D1 */ lui $at, 0x38d1 -/* EE085C 80241E9C 3421B717 */ ori $at, $at, 0xb717 -/* EE0860 80241EA0 44810000 */ mtc1 $at, $f0 -/* EE0864 80241EA4 C6420040 */ lwc1 $f2, 0x40($s2) -/* EE0868 80241EA8 0040B02D */ daddu $s6, $v0, $zero -/* EE086C 80241EAC E6600114 */ swc1 $f0, 0x114($s3) -/* EE0870 80241EB0 E6600118 */ swc1 $f0, 0x118($s3) -/* EE0874 80241EB4 12200007 */ beqz $s1, .L80241ED4 -/* EE0878 80241EB8 E6620110 */ swc1 $f2, 0x110($s3) -/* EE087C 80241EBC 0240202D */ daddu $a0, $s2, $zero -/* EE0880 80241EC0 0260282D */ daddu $a1, $s3, $zero -/* EE0884 80241EC4 0280302D */ daddu $a2, $s4, $zero -/* EE0888 80241EC8 0C0904EB */ jal EDEA00_UnkFunc5 -/* EE088C 80241ECC 02C0382D */ daddu $a3, $s6, $zero -/* EE0890 80241ED0 AE800070 */ sw $zero, 0x70($s4) -.L80241ED4: -/* EE0894 80241ED4 2402FFFD */ addiu $v0, $zero, -3 -/* EE0898 80241ED8 A24200AB */ sb $v0, 0xab($s2) -/* EE089C 80241EDC 8E6300B0 */ lw $v1, 0xb0($s3) -/* EE08A0 80241EE0 30620004 */ andi $v0, $v1, 4 -/* EE08A4 80241EE4 10400007 */ beqz $v0, .L80241F04 -/* EE08A8 80241EE8 00000000 */ nop -/* EE08AC 80241EEC 826200B4 */ lb $v0, 0xb4($s3) -/* EE08B0 80241EF0 144000F4 */ bnez $v0, .L802422C4 -/* EE08B4 80241EF4 0000102D */ daddu $v0, $zero, $zero -/* EE08B8 80241EF8 2402FFFB */ addiu $v0, $zero, -5 -/* EE08BC 80241EFC 00621024 */ and $v0, $v1, $v0 -/* EE08C0 80241F00 AE6200B0 */ sw $v0, 0xb0($s3) -.L80241F04: -/* EE08C4 80241F04 8E830070 */ lw $v1, 0x70($s4) -/* EE08C8 80241F08 24020001 */ addiu $v0, $zero, 1 -/* EE08CC 80241F0C 10620011 */ beq $v1, $v0, .L80241F54 -/* EE08D0 80241F10 28620002 */ slti $v0, $v1, 2 -/* EE08D4 80241F14 10400005 */ beqz $v0, .L80241F2C -/* EE08D8 80241F18 24020002 */ addiu $v0, $zero, 2 -/* EE08DC 80241F1C 10600009 */ beqz $v1, .L80241F44 -/* EE08E0 80241F20 2402000C */ addiu $v0, $zero, 0xc -/* EE08E4 80241F24 080907E5 */ j .L80241F94 -/* EE08E8 80241F28 00000000 */ nop -.L80241F2C: -/* EE08EC 80241F2C 1062000F */ beq $v1, $v0, .L80241F6C -/* EE08F0 80241F30 24020003 */ addiu $v0, $zero, 3 -/* EE08F4 80241F34 10620012 */ beq $v1, $v0, .L80241F80 -/* EE08F8 80241F38 0280202D */ daddu $a0, $s4, $zero -/* EE08FC 80241F3C 080907E3 */ j .L80241F8C -/* EE0900 80241F40 00000000 */ nop -.L80241F44: -/* EE0904 80241F44 0280202D */ daddu $a0, $s4, $zero -/* EE0908 80241F48 02C0282D */ daddu $a1, $s6, $zero -/* EE090C 80241F4C 0C090071 */ jal EDEA00_UnkNpcAIFunc23 -/* EE0910 80241F50 02A0302D */ daddu $a2, $s5, $zero -.L80241F54: -/* EE0914 80241F54 0280202D */ daddu $a0, $s4, $zero -/* EE0918 80241F58 02C0282D */ daddu $a1, $s6, $zero -/* EE091C 80241F5C 0C0905CC */ jal func_80241730_EE00F0 -/* EE0920 80241F60 02A0302D */ daddu $a2, $s5, $zero -/* EE0924 80241F64 080907E3 */ j .L80241F8C -/* EE0928 80241F68 00000000 */ nop -.L80241F6C: -/* EE092C 80241F6C 0280202D */ daddu $a0, $s4, $zero -/* EE0930 80241F70 02C0282D */ daddu $a1, $s6, $zero -/* EE0934 80241F74 0C090267 */ jal EDEA00_UnkNpcAIFunc1 -/* EE0938 80241F78 02A0302D */ daddu $a2, $s5, $zero -/* EE093C 80241F7C 0280202D */ daddu $a0, $s4, $zero -.L80241F80: -/* EE0940 80241F80 02C0282D */ daddu $a1, $s6, $zero -/* EE0944 80241F84 0C0906E5 */ jal func_80241B94_EE0554 -/* EE0948 80241F88 02A0302D */ daddu $a2, $s5, $zero -.L80241F8C: -/* EE094C 80241F8C 8E830070 */ lw $v1, 0x70($s4) -/* EE0950 80241F90 2402000C */ addiu $v0, $zero, 0xc -.L80241F94: -/* EE0954 80241F94 1462001A */ bne $v1, $v0, .L80242000 -/* EE0958 80241F98 00000000 */ nop -/* EE095C 80241F9C C64C0038 */ lwc1 $f12, 0x38($s2) -/* EE0960 80241FA0 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE0964 80241FA4 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE0968 80241FA8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* EE096C 80241FAC 8C460028 */ lw $a2, 0x28($v0) -/* EE0970 80241FB0 0C00ABDC */ jal fio_validate_header_checksums -/* EE0974 80241FB4 8C470030 */ lw $a3, 0x30($v0) -/* EE0978 80241FB8 0C0905BA */ jal func_802416E8_EE00A8 -/* EE097C 80241FBC E640000C */ swc1 $f0, 0xc($s2) -/* EE0980 80241FC0 0440000F */ bltz $v0, .L80242000 -/* EE0984 80241FC4 AE62007C */ sw $v0, 0x7c($s3) -/* EE0988 80241FC8 0C010ABD */ jal dead_get_enemy -/* EE098C 80241FCC 0040202D */ daddu $a0, $v0, $zero -/* EE0990 80241FD0 3C030049 */ lui $v1, 0x49 -/* EE0994 80241FD4 0040202D */ daddu $a0, $v0, $zero -/* EE0998 80241FD8 24020001 */ addiu $v0, $zero, 1 -/* EE099C 80241FDC AC820094 */ sw $v0, 0x94($a0) -/* EE09A0 80241FE0 86620008 */ lh $v0, 8($s3) -/* EE09A4 80241FE4 34630014 */ ori $v1, $v1, 0x14 -/* EE09A8 80241FE8 AC820098 */ sw $v0, 0x98($a0) -/* EE09AC 80241FEC 2402000F */ addiu $v0, $zero, 0xf -/* EE09B0 80241FF0 A642008E */ sh $v0, 0x8e($s2) -/* EE09B4 80241FF4 2402001E */ addiu $v0, $zero, 0x1e -/* EE09B8 80241FF8 AE430028 */ sw $v1, 0x28($s2) -/* EE09BC 80241FFC AE820070 */ sw $v0, 0x70($s4) -.L80242000: -/* EE09C0 80242000 8E830070 */ lw $v1, 0x70($s4) -/* EE09C4 80242004 2402000D */ addiu $v0, $zero, 0xd -/* EE09C8 80242008 10620010 */ beq $v1, $v0, .L8024204C -/* EE09CC 8024200C 2862000E */ slti $v0, $v1, 0xe -/* EE09D0 80242010 10400005 */ beqz $v0, .L80242028 -/* EE09D4 80242014 2402000C */ addiu $v0, $zero, 0xc -/* EE09D8 80242018 10620008 */ beq $v1, $v0, .L8024203C -/* EE09DC 8024201C 2410001F */ addiu $s0, $zero, 0x1f -/* EE09E0 80242020 0809081E */ j .L80242078 -/* EE09E4 80242024 00000000 */ nop -.L80242028: -/* EE09E8 80242028 2402000E */ addiu $v0, $zero, 0xe -/* EE09EC 8024202C 1062000D */ beq $v1, $v0, .L80242064 -/* EE09F0 80242030 0280202D */ daddu $a0, $s4, $zero -/* EE09F4 80242034 0809081C */ j .L80242070 -/* EE09F8 80242038 00000000 */ nop -.L8024203C: -/* EE09FC 8024203C 0280202D */ daddu $a0, $s4, $zero -/* EE0A00 80242040 02C0282D */ daddu $a1, $s6, $zero -/* EE0A04 80242044 0C0903A1 */ jal EDEA00_UnkNpcAIFunc14 -/* EE0A08 80242048 02A0302D */ daddu $a2, $s5, $zero -.L8024204C: -/* EE0A0C 8024204C 0280202D */ daddu $a0, $s4, $zero -/* EE0A10 80242050 02C0282D */ daddu $a1, $s6, $zero -/* EE0A14 80242054 0C0903EE */ jal EDEA00_UnkNpcAIFunc3 -/* EE0A18 80242058 02A0302D */ daddu $a2, $s5, $zero -/* EE0A1C 8024205C 0809081C */ j .L80242070 -/* EE0A20 80242060 00000000 */ nop -.L80242064: -/* EE0A24 80242064 02C0282D */ daddu $a1, $s6, $zero -/* EE0A28 80242068 0C090407 */ jal EDEA00_UnkFunc6 -/* EE0A2C 8024206C 02A0302D */ daddu $a2, $s5, $zero -.L80242070: -/* EE0A30 80242070 8E830070 */ lw $v1, 0x70($s4) -/* EE0A34 80242074 2410001F */ addiu $s0, $zero, 0x1f -.L80242078: -/* EE0A38 80242078 1070001B */ beq $v1, $s0, .L802420E8 -/* EE0A3C 8024207C 28620020 */ slti $v0, $v1, 0x20 -/* EE0A40 80242080 10400005 */ beqz $v0, .L80242098 -/* EE0A44 80242084 2402001E */ addiu $v0, $zero, 0x1e -/* EE0A48 80242088 1062000A */ beq $v1, $v0, .L802420B4 -/* EE0A4C 8024208C 00000000 */ nop -/* EE0A50 80242090 08090859 */ j .L80242164 -/* EE0A54 80242094 00000000 */ nop -.L80242098: -/* EE0A58 80242098 24020020 */ addiu $v0, $zero, 0x20 -/* EE0A5C 8024209C 10620022 */ beq $v1, $v0, .L80242128 -/* EE0A60 802420A0 24020021 */ addiu $v0, $zero, 0x21 -/* EE0A64 802420A4 10620029 */ beq $v1, $v0, .L8024214C -/* EE0A68 802420A8 00000000 */ nop -/* EE0A6C 802420AC 08090859 */ j .L80242164 -/* EE0A70 802420B0 00000000 */ nop -.L802420B4: -/* EE0A74 802420B4 9642008E */ lhu $v0, 0x8e($s2) -/* EE0A78 802420B8 2442FFFF */ addiu $v0, $v0, -1 -/* EE0A7C 802420BC A642008E */ sh $v0, 0x8e($s2) -/* EE0A80 802420C0 00021400 */ sll $v0, $v0, 0x10 -/* EE0A84 802420C4 1C400027 */ bgtz $v0, .L80242164 -/* EE0A88 802420C8 00000000 */ nop -/* EE0A8C 802420CC 0C010ABD */ jal dead_get_enemy -/* EE0A90 802420D0 8E64007C */ lw $a0, 0x7c($s3) -/* EE0A94 802420D4 24030002 */ addiu $v1, $zero, 2 -/* EE0A98 802420D8 AC430094 */ sw $v1, 0x94($v0) -/* EE0A9C 802420DC 24020005 */ addiu $v0, $zero, 5 -/* EE0AA0 802420E0 A642008E */ sh $v0, 0x8e($s2) -/* EE0AA4 802420E4 AE900070 */ sw $s0, 0x70($s4) -.L802420E8: -/* EE0AA8 802420E8 9642008E */ lhu $v0, 0x8e($s2) -/* EE0AAC 802420EC 2442FFFF */ addiu $v0, $v0, -1 -/* EE0AB0 802420F0 A642008E */ sh $v0, 0x8e($s2) -/* EE0AB4 802420F4 00021400 */ sll $v0, $v0, 0x10 -/* EE0AB8 802420F8 1C40001A */ bgtz $v0, .L80242164 -/* EE0ABC 802420FC 3C020049 */ lui $v0, 0x49 -/* EE0AC0 80242100 34420015 */ ori $v0, $v0, 0x15 -/* EE0AC4 80242104 AE420028 */ sw $v0, 0x28($s2) -/* EE0AC8 80242108 0C010ABD */ jal dead_get_enemy -/* EE0ACC 8024210C 8E64007C */ lw $a0, 0x7c($s3) -/* EE0AD0 80242110 24030003 */ addiu $v1, $zero, 3 -/* EE0AD4 80242114 AC430094 */ sw $v1, 0x94($v0) -/* EE0AD8 80242118 2402000A */ addiu $v0, $zero, 0xa -/* EE0ADC 8024211C A642008E */ sh $v0, 0x8e($s2) -/* EE0AE0 80242120 24020020 */ addiu $v0, $zero, 0x20 -/* EE0AE4 80242124 AE820070 */ sw $v0, 0x70($s4) -.L80242128: -/* EE0AE8 80242128 9642008E */ lhu $v0, 0x8e($s2) -/* EE0AEC 8024212C 2442FFFF */ addiu $v0, $v0, -1 -/* EE0AF0 80242130 A642008E */ sh $v0, 0x8e($s2) -/* EE0AF4 80242134 00021400 */ sll $v0, $v0, 0x10 -/* EE0AF8 80242138 1C40000A */ bgtz $v0, .L80242164 -/* EE0AFC 8024213C 24020003 */ addiu $v0, $zero, 3 -/* EE0B00 80242140 A642008E */ sh $v0, 0x8e($s2) -/* EE0B04 80242144 24020021 */ addiu $v0, $zero, 0x21 -/* EE0B08 80242148 AE820070 */ sw $v0, 0x70($s4) -.L8024214C: -/* EE0B0C 8024214C 9642008E */ lhu $v0, 0x8e($s2) -/* EE0B10 80242150 2442FFFF */ addiu $v0, $v0, -1 -/* EE0B14 80242154 A642008E */ sh $v0, 0x8e($s2) -/* EE0B18 80242158 00021400 */ sll $v0, $v0, 0x10 -/* EE0B1C 8024215C 58400001 */ blezl $v0, .L80242164 -/* EE0B20 80242160 AE800070 */ sw $zero, 0x70($s4) -.L80242164: -/* EE0B24 80242164 8E820070 */ lw $v0, 0x70($s4) -/* EE0B28 80242168 2442FFE2 */ addiu $v0, $v0, -0x1e -/* EE0B2C 8024216C 2C420002 */ sltiu $v0, $v0, 2 -/* EE0B30 80242170 10400054 */ beqz $v0, .L802422C4 -/* EE0B34 80242174 0000102D */ daddu $v0, $zero, $zero -/* EE0B38 80242178 3C108010 */ lui $s0, %hi(dead_gPlayerStatusPtr) -/* EE0B3C 8024217C 2610FC90 */ addiu $s0, $s0, %lo(dead_gPlayerStatusPtr) -/* EE0B40 80242180 C64C0038 */ lwc1 $f12, 0x38($s2) -/* EE0B44 80242184 8E020000 */ lw $v0, ($s0) -/* EE0B48 80242188 C64E0040 */ lwc1 $f14, 0x40($s2) -/* EE0B4C 8024218C 8C460028 */ lw $a2, 0x28($v0) -/* EE0B50 80242190 0C00ABDC */ jal fio_validate_header_checksums -/* EE0B54 80242194 8C470030 */ lw $a3, 0x30($v0) -/* EE0B58 80242198 8E460038 */ lw $a2, 0x38($s2) -/* EE0B5C 8024219C 8E470040 */ lw $a3, 0x40($s2) -/* EE0B60 802421A0 8E020000 */ lw $v0, ($s0) -/* EE0B64 802421A4 E640000C */ swc1 $f0, 0xc($s2) -/* EE0B68 802421A8 C44C0028 */ lwc1 $f12, 0x28($v0) -/* EE0B6C 802421AC 0C00AC71 */ jal dead_dist2D -/* EE0B70 802421B0 C44E0030 */ lwc1 $f14, 0x30($v0) -/* EE0B74 802421B4 C6A20008 */ lwc1 $f2, 8($s5) -/* EE0B78 802421B8 468010A0 */ cvt.s.w $f2, $f2 -/* EE0B7C 802421BC 44051000 */ mfc1 $a1, $f2 -/* EE0B80 802421C0 C6A2000C */ lwc1 $f2, 0xc($s5) -/* EE0B84 802421C4 468010A0 */ cvt.s.w $f2, $f2 -/* EE0B88 802421C8 44061000 */ mfc1 $a2, $f2 -/* EE0B8C 802421CC C6420040 */ lwc1 $f2, 0x40($s2) -/* EE0B90 802421D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* EE0B94 802421D4 C6A20010 */ lwc1 $f2, 0x10($s5) -/* EE0B98 802421D8 468010A0 */ cvt.s.w $f2, $f2 -/* EE0B9C 802421DC E7A20014 */ swc1 $f2, 0x14($sp) -/* EE0BA0 802421E0 C6A20014 */ lwc1 $f2, 0x14($s5) -/* EE0BA4 802421E4 468010A0 */ cvt.s.w $f2, $f2 -/* EE0BA8 802421E8 E7A20018 */ swc1 $f2, 0x18($sp) -/* EE0BAC 802421EC 8EA40004 */ lw $a0, 4($s5) -/* EE0BB0 802421F0 8E470038 */ lw $a3, 0x38($s2) -/* EE0BB4 802421F4 0C013431 */ jal dead_is_point_within_region -/* EE0BB8 802421F8 46000506 */ mov.s $f20, $f0 -/* EE0BBC 802421FC 14400031 */ bnez $v0, .L802422C4 -/* EE0BC0 80242200 0000102D */ daddu $v0, $zero, $zero -/* EE0BC4 80242204 3C01403E */ lui $at, 0x403e -/* EE0BC8 80242208 44810800 */ mtc1 $at, $f1 -/* EE0BCC 8024220C 44800000 */ mtc1 $zero, $f0 -/* EE0BD0 80242210 4600A0A1 */ cvt.d.s $f2, $f20 -/* EE0BD4 80242214 4622003C */ c.lt.d $f0, $f2 -/* EE0BD8 80242218 00000000 */ nop -/* EE0BDC 8024221C 45000029 */ bc1f .L802422C4 -/* EE0BE0 80242220 00000000 */ nop -/* EE0BE4 80242224 8642008C */ lh $v0, 0x8c($s2) -/* EE0BE8 80242228 54400026 */ bnel $v0, $zero, .L802422C4 -/* EE0BEC 8024222C 0000102D */ daddu $v0, $zero, $zero -/* EE0BF0 80242230 3C014034 */ lui $at, 0x4034 -/* EE0BF4 80242234 44810800 */ mtc1 $at, $f1 -/* EE0BF8 80242238 44800000 */ mtc1 $zero, $f0 -/* EE0BFC 8024223C 00000000 */ nop -/* EE0C00 80242240 46201001 */ sub.d $f0, $f2, $f0 -/* EE0C04 80242244 44801000 */ mtc1 $zero, $f2 -/* EE0C08 80242248 44801800 */ mtc1 $zero, $f3 -/* EE0C0C 8024224C 46200120 */ cvt.s.d $f4, $f0 -/* EE0C10 80242250 46002021 */ cvt.d.s $f0, $f4 -/* EE0C14 80242254 4622003C */ c.lt.d $f0, $f2 -/* EE0C18 80242258 00000000 */ nop -/* EE0C1C 8024225C 45000002 */ bc1f .L80242268 -/* EE0C20 80242260 00000000 */ nop -/* EE0C24 80242264 44802000 */ mtc1 $zero, $f4 -.L80242268: -/* EE0C28 80242268 3C014069 */ lui $at, 0x4069 -/* EE0C2C 8024226C 44811800 */ mtc1 $at, $f3 -/* EE0C30 80242270 44801000 */ mtc1 $zero, $f2 -/* EE0C34 80242274 46002021 */ cvt.d.s $f0, $f4 -/* EE0C38 80242278 4620103C */ c.lt.d $f2, $f0 -/* EE0C3C 8024227C 00000000 */ nop -/* EE0C40 80242280 45000003 */ bc1f .L80242290 -/* EE0C44 80242284 240200C8 */ addiu $v0, $zero, 0xc8 -/* EE0C48 80242288 3C014348 */ lui $at, 0x4348 -/* EE0C4C 8024228C 44812000 */ mtc1 $at, $f4 -.L80242290: -/* EE0C50 80242290 AFA20010 */ sw $v0, 0x10($sp) -/* EE0C54 80242294 8EC50000 */ lw $a1, ($s6) -/* EE0C58 80242298 8EC60018 */ lw $a2, 0x18($s6) -/* EE0C5C 8024229C 4600218D */ trunc.w.s $f6, $f4 -/* EE0C60 802422A0 44073000 */ mfc1 $a3, $f6 -/* EE0C64 802422A4 0C00ADA9 */ jal dead_update_lerp -/* EE0C68 802422A8 0000202D */ daddu $a0, $zero, $zero -/* EE0C6C 802422AC 44050000 */ mfc1 $a1, $f0 -/* EE0C70 802422B0 8E46000C */ lw $a2, 0xc($s2) -/* EE0C74 802422B4 0240202D */ daddu $a0, $s2, $zero -/* EE0C78 802422B8 0C00F909 */ jal dead_npc_move_heading -/* EE0C7C 802422BC AC850018 */ sw $a1, 0x18($a0) -/* EE0C80 802422C0 0000102D */ daddu $v0, $zero, $zero -.L802422C4: -/* EE0C84 802422C4 8FBF005C */ lw $ra, 0x5c($sp) -/* EE0C88 802422C8 8FB60058 */ lw $s6, 0x58($sp) -/* EE0C8C 802422CC 8FB50054 */ lw $s5, 0x54($sp) -/* EE0C90 802422D0 8FB40050 */ lw $s4, 0x50($sp) -/* EE0C94 802422D4 8FB3004C */ lw $s3, 0x4c($sp) -/* EE0C98 802422D8 8FB20048 */ lw $s2, 0x48($sp) -/* EE0C9C 802422DC 8FB10044 */ lw $s1, 0x44($sp) -/* EE0CA0 802422E0 8FB00040 */ lw $s0, 0x40($sp) -/* EE0CA4 802422E4 D7B40060 */ ldc1 $f20, 0x60($sp) -/* EE0CA8 802422E8 03E00008 */ jr $ra -/* EE0CAC 802422EC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s deleted file mode 100644 index 7b3b3cd37a..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s +++ /dev/null @@ -1,320 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247B58_EE6518 -.word .L80242ABC_EE147C, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242ABC_EE147C, .L80242AC8_EE1488, .L80242ABC_EE147C, .L80242AC8_EE1488, .L80242ABC_EE147C, .L80242AC8_EE1488, .L80242ABC_EE147C, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242AC8_EE1488, .L80242ABC_EE147C, .L80242AC8_EE1488, .L80242ABC_EE147C, 0 - -.section .text - -glabel func_80242684_EE1044 -/* EE1044 80242684 27BDFF90 */ addiu $sp, $sp, -0x70 -/* EE1048 80242688 AFB3005C */ sw $s3, 0x5c($sp) -/* EE104C 8024268C 0080982D */ daddu $s3, $a0, $zero -/* EE1050 80242690 AFBF0068 */ sw $ra, 0x68($sp) -/* EE1054 80242694 AFB50064 */ sw $s5, 0x64($sp) -/* EE1058 80242698 AFB40060 */ sw $s4, 0x60($sp) -/* EE105C 8024269C AFB20058 */ sw $s2, 0x58($sp) -/* EE1060 802426A0 AFB10054 */ sw $s1, 0x54($sp) -/* EE1064 802426A4 AFB00050 */ sw $s0, 0x50($sp) -/* EE1068 802426A8 8E710148 */ lw $s1, 0x148($s3) -/* EE106C 802426AC 86240008 */ lh $a0, 8($s1) -/* EE1070 802426B0 0C00F92F */ jal dead_get_npc_unsafe -/* EE1074 802426B4 00A0802D */ daddu $s0, $a1, $zero -/* EE1078 802426B8 8E63000C */ lw $v1, 0xc($s3) -/* EE107C 802426BC 0260202D */ daddu $a0, $s3, $zero -/* EE1080 802426C0 8C650000 */ lw $a1, ($v1) -/* EE1084 802426C4 0C0B53A3 */ jal dead_evt_get_variable -/* EE1088 802426C8 0040902D */ daddu $s2, $v0, $zero -/* EE108C 802426CC AFA00028 */ sw $zero, 0x28($sp) -/* EE1090 802426D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* EE1094 802426D4 8C630030 */ lw $v1, 0x30($v1) -/* EE1098 802426D8 AFA3002C */ sw $v1, 0x2c($sp) -/* EE109C 802426DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* EE10A0 802426E0 8C63001C */ lw $v1, 0x1c($v1) -/* EE10A4 802426E4 AFA30030 */ sw $v1, 0x30($sp) -/* EE10A8 802426E8 8E2300D0 */ lw $v1, 0xd0($s1) -/* EE10AC 802426EC 8C630024 */ lw $v1, 0x24($v1) -/* EE10B0 802426F0 AFA30034 */ sw $v1, 0x34($sp) -/* EE10B4 802426F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* EE10B8 802426F8 8C630028 */ lw $v1, 0x28($v1) -/* EE10BC 802426FC AFA30038 */ sw $v1, 0x38($sp) -/* EE10C0 80242700 8E2300D0 */ lw $v1, 0xd0($s1) -/* EE10C4 80242704 3C0142C8 */ lui $at, 0x42c8 -/* EE10C8 80242708 44810000 */ mtc1 $at, $f0 -/* EE10CC 8024270C 8C63002C */ lw $v1, 0x2c($v1) -/* EE10D0 80242710 E7A00040 */ swc1 $f0, 0x40($sp) -/* EE10D4 80242714 A7A00044 */ sh $zero, 0x44($sp) -/* EE10D8 80242718 AFA3003C */ sw $v1, 0x3c($sp) -/* EE10DC 8024271C C6400038 */ lwc1 $f0, 0x38($s2) -/* EE10E0 80242720 E6200108 */ swc1 $f0, 0x108($s1) -/* EE10E4 80242724 C640003C */ lwc1 $f0, 0x3c($s2) -/* EE10E8 80242728 27B50028 */ addiu $s5, $sp, 0x28 -/* EE10EC 8024272C E620010C */ swc1 $f0, 0x10c($s1) -/* EE10F0 80242730 3C013C23 */ lui $at, 0x3c23 -/* EE10F4 80242734 3421D70A */ ori $at, $at, 0xd70a -/* EE10F8 80242738 44810000 */ mtc1 $at, $f0 -/* EE10FC 8024273C C6420040 */ lwc1 $f2, 0x40($s2) -/* EE1100 80242740 0040A02D */ daddu $s4, $v0, $zero -/* EE1104 80242744 E6200114 */ swc1 $f0, 0x114($s1) -/* EE1108 80242748 E6200118 */ swc1 $f0, 0x118($s1) -/* EE110C 8024274C 12000009 */ beqz $s0, .L80242774 -/* EE1110 80242750 E6220110 */ swc1 $f2, 0x110($s1) -/* EE1114 80242754 864300A8 */ lh $v1, 0xa8($s2) -/* EE1118 80242758 8E2200B0 */ lw $v0, 0xb0($s1) -/* EE111C 8024275C AE20008C */ sw $zero, 0x8c($s1) -/* EE1120 80242760 A22000B5 */ sb $zero, 0xb5($s1) -/* EE1124 80242764 34420008 */ ori $v0, $v0, 8 -/* EE1128 80242768 AE230084 */ sw $v1, 0x84($s1) -/* EE112C 8024276C 080909E1 */ j .L80242784 -/* EE1130 80242770 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242774: -/* EE1134 80242774 8E2200B0 */ lw $v0, 0xb0($s1) -/* EE1138 80242778 30420004 */ andi $v0, $v0, 4 -/* EE113C 8024277C 10400047 */ beqz $v0, .L8024289C -/* EE1140 80242780 00000000 */ nop -.L80242784: -/* EE1144 80242784 AE600070 */ sw $zero, 0x70($s3) -/* EE1148 80242788 A640008E */ sh $zero, 0x8e($s2) -/* EE114C 8024278C 8E2300CC */ lw $v1, 0xcc($s1) -/* EE1150 80242790 2404F7FF */ addiu $a0, $zero, -0x801 -/* EE1154 80242794 A2200007 */ sb $zero, 7($s1) -/* EE1158 80242798 8E420000 */ lw $v0, ($s2) -/* EE115C 8024279C 8C630000 */ lw $v1, ($v1) -/* EE1160 802427A0 00441024 */ and $v0, $v0, $a0 -/* EE1164 802427A4 AE420000 */ sw $v0, ($s2) -/* EE1168 802427A8 AE430028 */ sw $v1, 0x28($s2) -/* EE116C 802427AC 96220086 */ lhu $v0, 0x86($s1) -/* EE1170 802427B0 A64200A8 */ sh $v0, 0xa8($s2) -/* EE1174 802427B4 8E2200D0 */ lw $v0, 0xd0($s1) -/* EE1178 802427B8 AE200090 */ sw $zero, 0x90($s1) -/* EE117C 802427BC 8C420034 */ lw $v0, 0x34($v0) -/* EE1180 802427C0 14400006 */ bnez $v0, .L802427DC -/* EE1184 802427C4 2403FDFF */ addiu $v1, $zero, -0x201 -/* EE1188 802427C8 8E420000 */ lw $v0, ($s2) -/* EE118C 802427CC 2403FFF7 */ addiu $v1, $zero, -9 -/* EE1190 802427D0 34420200 */ ori $v0, $v0, 0x200 -/* EE1194 802427D4 080909FA */ j .L802427E8 -/* EE1198 802427D8 00431024 */ and $v0, $v0, $v1 -.L802427DC: -/* EE119C 802427DC 8E420000 */ lw $v0, ($s2) -/* EE11A0 802427E0 00431024 */ and $v0, $v0, $v1 -/* EE11A4 802427E4 34420008 */ ori $v0, $v0, 8 -.L802427E8: -/* EE11A8 802427E8 AE420000 */ sw $v0, ($s2) -/* EE11AC 802427EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* EE11B0 802427F0 30420004 */ andi $v0, $v0, 4 -/* EE11B4 802427F4 1040001E */ beqz $v0, .L80242870 -/* EE11B8 802427F8 24040002 */ addiu $a0, $zero, 2 -/* EE11BC 802427FC 0240282D */ daddu $a1, $s2, $zero -/* EE11C0 80242800 0000302D */ daddu $a2, $zero, $zero -/* EE11C4 80242804 24020063 */ addiu $v0, $zero, 0x63 -/* EE11C8 80242808 AE620070 */ sw $v0, 0x70($s3) -/* EE11CC 8024280C AE600074 */ sw $zero, 0x74($s3) -/* EE11D0 80242810 864300A8 */ lh $v1, 0xa8($s2) -/* EE11D4 80242814 3C013F80 */ lui $at, 0x3f80 -/* EE11D8 80242818 44810000 */ mtc1 $at, $f0 -/* EE11DC 8024281C 3C014000 */ lui $at, 0x4000 -/* EE11E0 80242820 44811000 */ mtc1 $at, $f2 -/* EE11E4 80242824 3C01C1A0 */ lui $at, 0xc1a0 -/* EE11E8 80242828 44812000 */ mtc1 $at, $f4 -/* EE11EC 8024282C 24020028 */ addiu $v0, $zero, 0x28 -/* EE11F0 80242830 AFA2001C */ sw $v0, 0x1c($sp) -/* EE11F4 80242834 44833000 */ mtc1 $v1, $f6 -/* EE11F8 80242838 00000000 */ nop -/* EE11FC 8024283C 468031A0 */ cvt.s.w $f6, $f6 -/* EE1200 80242840 44073000 */ mfc1 $a3, $f6 -/* EE1204 80242844 27A20048 */ addiu $v0, $sp, 0x48 -/* EE1208 80242848 AFA20020 */ sw $v0, 0x20($sp) -/* EE120C 8024284C E7A00010 */ swc1 $f0, 0x10($sp) -/* EE1210 80242850 E7A20014 */ swc1 $f2, 0x14($sp) -/* EE1214 80242854 0C01D444 */ jal dead_fx_emote -/* EE1218 80242858 E7A40018 */ swc1 $f4, 0x18($sp) -/* EE121C 8024285C 8E2200B0 */ lw $v0, 0xb0($s1) -/* EE1220 80242860 2403FFFB */ addiu $v1, $zero, -5 -/* EE1224 80242864 00431024 */ and $v0, $v0, $v1 -/* EE1228 80242868 08090A27 */ j .L8024289C -/* EE122C 8024286C AE2200B0 */ sw $v0, 0xb0($s1) -.L80242870: -/* EE1230 80242870 8E220000 */ lw $v0, ($s1) -/* EE1234 80242874 3C034000 */ lui $v1, 0x4000 -/* EE1238 80242878 00431024 */ and $v0, $v0, $v1 -/* EE123C 8024287C 10400007 */ beqz $v0, .L8024289C -/* EE1240 80242880 3C03BFFF */ lui $v1, 0xbfff -/* EE1244 80242884 2402000C */ addiu $v0, $zero, 0xc -/* EE1248 80242888 AE620070 */ sw $v0, 0x70($s3) -/* EE124C 8024288C 8E220000 */ lw $v0, ($s1) -/* EE1250 80242890 3463FFFF */ ori $v1, $v1, 0xffff -/* EE1254 80242894 00431024 */ and $v0, $v0, $v1 -/* EE1258 80242898 AE220000 */ sw $v0, ($s1) -.L8024289C: -/* EE125C 8024289C 8E220090 */ lw $v0, 0x90($s1) -/* EE1260 802428A0 1840000C */ blez $v0, .L802428D4 -/* EE1264 802428A4 2442FFFF */ addiu $v0, $v0, -1 -/* EE1268 802428A8 14400087 */ bnez $v0, .L80242AC8_EE1488 -/* EE126C 802428AC AE220090 */ sw $v0, 0x90($s1) -/* EE1270 802428B0 3C03FFAA */ lui $v1, 0xffaa -/* EE1274 802428B4 8E420028 */ lw $v0, 0x28($s2) -/* EE1278 802428B8 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* EE127C 802428BC 00431021 */ addu $v0, $v0, $v1 -/* EE1280 802428C0 2C420002 */ sltiu $v0, $v0, 2 -/* EE1284 802428C4 10400003 */ beqz $v0, .L802428D4 -/* EE1288 802428C8 3C020055 */ lui $v0, 0x55 -/* EE128C 802428CC 3442000C */ ori $v0, $v0, 0xc -/* EE1290 802428D0 AE420028 */ sw $v0, 0x28($s2) -.L802428D4: -/* EE1294 802428D4 8E630070 */ lw $v1, 0x70($s3) -/* EE1298 802428D8 2402000C */ addiu $v0, $zero, 0xc -/* EE129C 802428DC 10620048 */ beq $v1, $v0, .L80242A00 -/* EE12A0 802428E0 2862000D */ slti $v0, $v1, 0xd -/* EE12A4 802428E4 1040000F */ beqz $v0, .L80242924 -/* EE12A8 802428E8 24100001 */ addiu $s0, $zero, 1 -/* EE12AC 802428EC 1070001E */ beq $v1, $s0, .L80242968 -/* EE12B0 802428F0 28620002 */ slti $v0, $v1, 2 -/* EE12B4 802428F4 10400005 */ beqz $v0, .L8024290C -/* EE12B8 802428F8 24020002 */ addiu $v0, $zero, 2 -/* EE12BC 802428FC 10600015 */ beqz $v1, .L80242954 -/* EE12C0 80242900 0260202D */ daddu $a0, $s3, $zero -/* EE12C4 80242904 08090A97 */ j .L80242A5C -/* EE12C8 80242908 00000000 */ nop -.L8024290C: -/* EE12CC 8024290C 1062001C */ beq $v1, $v0, .L80242980 -/* EE12D0 80242910 24020003 */ addiu $v0, $zero, 3 -/* EE12D4 80242914 10620035 */ beq $v1, $v0, .L802429EC -/* EE12D8 80242918 0260202D */ daddu $a0, $s3, $zero -/* EE12DC 8024291C 08090A97 */ j .L80242A5C -/* EE12E0 80242920 00000000 */ nop -.L80242924: -/* EE12E4 80242924 2402000E */ addiu $v0, $zero, 0xe -/* EE12E8 80242928 1062003F */ beq $v1, $v0, .L80242A28 -/* EE12EC 8024292C 0062102A */ slt $v0, $v1, $v0 -/* EE12F0 80242930 14400038 */ bnez $v0, .L80242A14 -/* EE12F4 80242934 0260202D */ daddu $a0, $s3, $zero -/* EE12F8 80242938 2402000F */ addiu $v0, $zero, 0xf -/* EE12FC 8024293C 10620040 */ beq $v1, $v0, .L80242A40 -/* EE1300 80242940 24020063 */ addiu $v0, $zero, 0x63 -/* EE1304 80242944 10620043 */ beq $v1, $v0, .L80242A54 -/* EE1308 80242948 00000000 */ nop -/* EE130C 8024294C 08090A97 */ j .L80242A5C -/* EE1310 80242950 00000000 */ nop -.L80242954: -/* EE1314 80242954 0280282D */ daddu $a1, $s4, $zero -/* EE1318 80242958 0C013670 */ jal func_8004D9C0 -/* EE131C 8024295C 02A0302D */ daddu $a2, $s5, $zero -/* EE1320 80242960 96220086 */ lhu $v0, 0x86($s1) -/* EE1324 80242964 A64200A8 */ sh $v0, 0xa8($s2) -.L80242968: -/* EE1328 80242968 0260202D */ daddu $a0, $s3, $zero -/* EE132C 8024296C 0280282D */ daddu $a1, $s4, $zero -/* EE1330 80242970 0C0136B6 */ jal func_8004DAD8 -/* EE1334 80242974 02A0302D */ daddu $a2, $s5, $zero -/* EE1338 80242978 08090A97 */ j .L80242A5C -/* EE133C 8024297C 00000000 */ nop -.L80242980: -/* EE1340 80242980 0260202D */ daddu $a0, $s3, $zero -/* EE1344 80242984 0280282D */ daddu $a1, $s4, $zero -/* EE1348 80242988 0C0137D9 */ jal func_8004DF64 -/* EE134C 8024298C 02A0302D */ daddu $a2, $s5, $zero -/* EE1350 80242990 8E230088 */ lw $v1, 0x88($s1) -/* EE1354 80242994 24020006 */ addiu $v0, $zero, 6 -/* EE1358 80242998 14620014 */ bne $v1, $v0, .L802429EC -/* EE135C 8024299C 0260202D */ daddu $a0, $s3, $zero -/* EE1360 802429A0 0C00AB3B */ jal dead_rand_int -/* EE1364 802429A4 24040064 */ addiu $a0, $zero, 0x64 -/* EE1368 802429A8 28420021 */ slti $v0, $v0, 0x21 -/* EE136C 802429AC 5040000F */ beql $v0, $zero, .L802429EC -/* EE1370 802429B0 0260202D */ daddu $a0, $s3, $zero -/* EE1374 802429B4 8E22008C */ lw $v0, 0x8c($s1) -/* EE1378 802429B8 10400005 */ beqz $v0, .L802429D0 -/* EE137C 802429BC 3C020055 */ lui $v0, 0x55 -/* EE1380 802429C0 3442002F */ ori $v0, $v0, 0x2f -/* EE1384 802429C4 AE20008C */ sw $zero, 0x8c($s1) -/* EE1388 802429C8 08090A77 */ j .L802429DC -/* EE138C 802429CC A22000B5 */ sb $zero, 0xb5($s1) -.L802429D0: -/* EE1390 802429D0 3442002E */ ori $v0, $v0, 0x2e -/* EE1394 802429D4 AE30008C */ sw $s0, 0x8c($s1) -/* EE1398 802429D8 A23000B5 */ sb $s0, 0xb5($s1) -.L802429DC: -/* EE139C 802429DC AE420028 */ sw $v0, 0x28($s2) -/* EE13A0 802429E0 24020007 */ addiu $v0, $zero, 7 -/* EE13A4 802429E4 08090AB2 */ j .L80242AC8_EE1488 -/* EE13A8 802429E8 AE220090 */ sw $v0, 0x90($s1) -.L802429EC: -/* EE13AC 802429EC 0280282D */ daddu $a1, $s4, $zero -/* EE13B0 802429F0 0C013809 */ jal func_8004E024 -/* EE13B4 802429F4 02A0302D */ daddu $a2, $s5, $zero -/* EE13B8 802429F8 08090A97 */ j .L80242A5C -/* EE13BC 802429FC 00000000 */ nop -.L80242A00: -/* EE13C0 80242A00 0260202D */ daddu $a0, $s3, $zero -/* EE13C4 80242A04 0280282D */ daddu $a1, $s4, $zero -/* EE13C8 80242A08 0C0908BC */ jal EDEA00_set_script_owner_npc_anim -/* EE13CC 80242A0C 02A0302D */ daddu $a2, $s5, $zero -/* EE13D0 80242A10 0260202D */ daddu $a0, $s3, $zero -.L80242A14: -/* EE13D4 80242A14 0280282D */ daddu $a1, $s4, $zero -/* EE13D8 80242A18 0C0908DB */ jal EDEA00_UnkDistFunc -/* EE13DC 80242A1C 02A0302D */ daddu $a2, $s5, $zero -/* EE13E0 80242A20 08090A97 */ j .L80242A5C -/* EE13E4 80242A24 00000000 */ nop -.L80242A28: -/* EE13E8 80242A28 0260202D */ daddu $a0, $s3, $zero -/* EE13EC 80242A2C 0280282D */ daddu $a1, $s4, $zero -/* EE13F0 80242A30 0C090928 */ jal EDEA00_UnkNpcAIFunc12 -/* EE13F4 80242A34 02A0302D */ daddu $a2, $s5, $zero -/* EE13F8 80242A38 08090A97 */ j .L80242A5C -/* EE13FC 80242A3C 00000000 */ nop -.L80242A40: -/* EE1400 80242A40 0280282D */ daddu $a1, $s4, $zero -/* EE1404 80242A44 0C090981 */ jal EDEA00_set_script_owner_npc_col_height -/* EE1408 80242A48 02A0302D */ daddu $a2, $s5, $zero -/* EE140C 80242A4C 08090A97 */ j .L80242A5C -/* EE1410 80242A50 00000000 */ nop -.L80242A54: -/* EE1414 80242A54 0C013AE3 */ jal func_8004EB8C -/* EE1418 80242A58 0260202D */ daddu $a0, $s3, $zero -.L80242A5C: -/* EE141C 80242A5C 8E230088 */ lw $v1, 0x88($s1) -/* EE1420 80242A60 24020006 */ addiu $v0, $zero, 6 -/* EE1424 80242A64 14620019 */ bne $v1, $v0, .L80242ACC -/* EE1428 80242A68 0000102D */ daddu $v0, $zero, $zero -/* EE142C 80242A6C 8E22008C */ lw $v0, 0x8c($s1) -/* EE1430 80242A70 10400003 */ beqz $v0, .L80242A80 -/* EE1434 80242A74 24020001 */ addiu $v0, $zero, 1 -/* EE1438 80242A78 08090AA1 */ j .L80242A84 -/* EE143C 80242A7C A22200B5 */ sb $v0, 0xb5($s1) -.L80242A80: -/* EE1440 80242A80 A22000B5 */ sb $zero, 0xb5($s1) -.L80242A84: -/* EE1444 80242A84 8E22008C */ lw $v0, 0x8c($s1) -/* EE1448 80242A88 1040000F */ beqz $v0, .L80242AC8_EE1488 -/* EE144C 80242A8C 3C03FFAA */ lui $v1, 0xffaa -/* EE1450 80242A90 8E420028 */ lw $v0, 0x28($s2) -/* EE1454 80242A94 3463FFFC */ ori $v1, $v1, 0xfffc -/* EE1458 80242A98 00431821 */ addu $v1, $v0, $v1 -/* EE145C 80242A9C 2C620015 */ sltiu $v0, $v1, 0x15 -/* EE1460 80242AA0 10400009 */ beqz $v0, .L80242AC8_EE1488 -/* EE1464 80242AA4 00031080 */ sll $v0, $v1, 2 -/* EE1468 80242AA8 3C018024 */ lui $at, %hi(jtbl_80247B58_EE6518) -/* EE146C 80242AAC 00220821 */ addu $at, $at, $v0 -/* EE1470 80242AB0 8C227B58 */ lw $v0, %lo(jtbl_80247B58_EE6518)($at) -/* EE1474 80242AB4 00400008 */ jr $v0 -/* EE1478 80242AB8 00000000 */ nop -.L80242ABC_EE147C: -/* EE147C 80242ABC 8E420028 */ lw $v0, 0x28($s2) -/* EE1480 80242AC0 24420001 */ addiu $v0, $v0, 1 -/* EE1484 80242AC4 AE420028 */ sw $v0, 0x28($s2) -.L80242AC8_EE1488: -/* EE1488 80242AC8 0000102D */ daddu $v0, $zero, $zero -.L80242ACC: -/* EE148C 80242ACC 8FBF0068 */ lw $ra, 0x68($sp) -/* EE1490 80242AD0 8FB50064 */ lw $s5, 0x64($sp) -/* EE1494 80242AD4 8FB40060 */ lw $s4, 0x60($sp) -/* EE1498 80242AD8 8FB3005C */ lw $s3, 0x5c($sp) -/* EE149C 80242ADC 8FB20058 */ lw $s2, 0x58($sp) -/* EE14A0 80242AE0 8FB10054 */ lw $s1, 0x54($sp) -/* EE14A4 80242AE4 8FB00050 */ lw $s0, 0x50($sp) -/* EE14A8 80242AE8 03E00008 */ jr $ra -/* EE14AC 80242AEC 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s deleted file mode 100644 index 34a27be5c0..0000000000 --- a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s +++ /dev/null @@ -1,634 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247BB0_EE6570 -.double 180.0, 1.3362052230687696e+98, 1.680557229813803e+122, 1.2934576819307836e+74, 3.85307767486332e+107, 0.0 - -.section .text - -glabel func_80242AF0_EE14B0 -/* EE14B0 80242AF0 27BDFF68 */ addiu $sp, $sp, -0x98 -/* EE14B4 80242AF4 AFB5007C */ sw $s5, 0x7c($sp) -/* EE14B8 80242AF8 0080A82D */ daddu $s5, $a0, $zero -/* EE14BC 80242AFC AFBF0080 */ sw $ra, 0x80($sp) -/* EE14C0 80242B00 AFB40078 */ sw $s4, 0x78($sp) -/* EE14C4 80242B04 AFB30074 */ sw $s3, 0x74($sp) -/* EE14C8 80242B08 AFB20070 */ sw $s2, 0x70($sp) -/* EE14CC 80242B0C AFB1006C */ sw $s1, 0x6c($sp) -/* EE14D0 80242B10 AFB00068 */ sw $s0, 0x68($sp) -/* EE14D4 80242B14 F7B60090 */ sdc1 $f22, 0x90($sp) -/* EE14D8 80242B18 F7B40088 */ sdc1 $f20, 0x88($sp) -/* EE14DC 80242B1C 8EB20148 */ lw $s2, 0x148($s5) -/* EE14E0 80242B20 86440008 */ lh $a0, 8($s2) -/* EE14E4 80242B24 0C00F92F */ jal dead_get_npc_unsafe -/* EE14E8 80242B28 00A0802D */ daddu $s0, $a1, $zero -/* EE14EC 80242B2C 8EA3000C */ lw $v1, 0xc($s5) -/* EE14F0 80242B30 02A0202D */ daddu $a0, $s5, $zero -/* EE14F4 80242B34 8C650000 */ lw $a1, ($v1) -/* EE14F8 80242B38 0C0B53A3 */ jal dead_evt_get_variable -/* EE14FC 80242B3C 0040882D */ daddu $s1, $v0, $zero -/* EE1500 80242B40 AFA00028 */ sw $zero, 0x28($sp) -/* EE1504 80242B44 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE1508 80242B48 8C630030 */ lw $v1, 0x30($v1) -/* EE150C 80242B4C AFA3002C */ sw $v1, 0x2c($sp) -/* EE1510 80242B50 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE1514 80242B54 8C63001C */ lw $v1, 0x1c($v1) -/* EE1518 80242B58 AFA30030 */ sw $v1, 0x30($sp) -/* EE151C 80242B5C 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE1520 80242B60 8C630024 */ lw $v1, 0x24($v1) -/* EE1524 80242B64 AFA30034 */ sw $v1, 0x34($sp) -/* EE1528 80242B68 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE152C 80242B6C 8C630028 */ lw $v1, 0x28($v1) -/* EE1530 80242B70 AFA30038 */ sw $v1, 0x38($sp) -/* EE1534 80242B74 8E4300D0 */ lw $v1, 0xd0($s2) -/* EE1538 80242B78 3C014282 */ lui $at, 0x4282 -/* EE153C 80242B7C 44810000 */ mtc1 $at, $f0 -/* EE1540 80242B80 8C63002C */ lw $v1, 0x2c($v1) -/* EE1544 80242B84 E7A00040 */ swc1 $f0, 0x40($sp) -/* EE1548 80242B88 A7A00044 */ sh $zero, 0x44($sp) -/* EE154C 80242B8C AFA3003C */ sw $v1, 0x3c($sp) -/* EE1550 80242B90 C6200038 */ lwc1 $f0, 0x38($s1) -/* EE1554 80242B94 E6400108 */ swc1 $f0, 0x108($s2) -/* EE1558 80242B98 C620003C */ lwc1 $f0, 0x3c($s1) -/* EE155C 80242B9C 27B40028 */ addiu $s4, $sp, 0x28 -/* EE1560 80242BA0 E640010C */ swc1 $f0, 0x10c($s2) -/* EE1564 80242BA4 3C0138D1 */ lui $at, 0x38d1 -/* EE1568 80242BA8 3421B717 */ ori $at, $at, 0xb717 -/* EE156C 80242BAC 44810000 */ mtc1 $at, $f0 -/* EE1570 80242BB0 C6220040 */ lwc1 $f2, 0x40($s1) -/* EE1574 80242BB4 0040982D */ daddu $s3, $v0, $zero -/* EE1578 80242BB8 E6400114 */ swc1 $f0, 0x114($s2) -/* EE157C 80242BBC E6400118 */ swc1 $f0, 0x118($s2) -/* EE1580 80242BC0 12000007 */ beqz $s0, .L80242BE0 -/* EE1584 80242BC4 E6420110 */ swc1 $f2, 0x110($s2) -/* EE1588 80242BC8 8E4200B0 */ lw $v0, 0xb0($s2) -/* EE158C 80242BCC 862300A8 */ lh $v1, 0xa8($s1) -/* EE1590 80242BD0 34420008 */ ori $v0, $v0, 8 -/* EE1594 80242BD4 AE430084 */ sw $v1, 0x84($s2) -/* EE1598 80242BD8 08090AFC */ j .L80242BF0 -/* EE159C 80242BDC AE4200B0 */ sw $v0, 0xb0($s2) -.L80242BE0: -/* EE15A0 80242BE0 8E430094 */ lw $v1, 0x94($s2) -/* EE15A4 80242BE4 24020064 */ addiu $v0, $zero, 0x64 -/* EE15A8 80242BE8 1462001C */ bne $v1, $v0, .L80242C5C -/* EE15AC 80242BEC 00000000 */ nop -.L80242BF0: -/* EE15B0 80242BF0 24020064 */ addiu $v0, $zero, 0x64 -/* EE15B4 80242BF4 2404F7FF */ addiu $a0, $zero, -0x801 -/* EE15B8 80242BF8 AEA20070 */ sw $v0, 0x70($s5) -/* EE15BC 80242BFC A620008E */ sh $zero, 0x8e($s1) -/* EE15C0 80242C00 8E4300CC */ lw $v1, 0xcc($s2) -/* EE15C4 80242C04 8E220000 */ lw $v0, ($s1) -/* EE15C8 80242C08 3C01C47A */ lui $at, 0xc47a -/* EE15CC 80242C0C 44810000 */ mtc1 $at, $f0 -/* EE15D0 80242C10 8C630000 */ lw $v1, ($v1) -/* EE15D4 80242C14 00441024 */ and $v0, $v0, $a0 -/* EE15D8 80242C18 AE220000 */ sw $v0, ($s1) -/* EE15DC 80242C1C AE230028 */ sw $v1, 0x28($s1) -/* EE15E0 80242C20 8E420000 */ lw $v0, ($s2) -/* EE15E4 80242C24 3C030020 */ lui $v1, 0x20 -/* EE15E8 80242C28 00431025 */ or $v0, $v0, $v1 -/* EE15EC 80242C2C AE420000 */ sw $v0, ($s2) -/* EE15F0 80242C30 8E220000 */ lw $v0, ($s1) -/* EE15F4 80242C34 2403FDFF */ addiu $v1, $zero, -0x201 -/* EE15F8 80242C38 00431024 */ and $v0, $v0, $v1 -/* EE15FC 80242C3C 34420008 */ ori $v0, $v0, 8 -/* EE1600 80242C40 AE220000 */ sw $v0, ($s1) -/* EE1604 80242C44 2402FFFF */ addiu $v0, $zero, -1 -/* EE1608 80242C48 AE400094 */ sw $zero, 0x94($s2) -/* EE160C 80242C4C AE420098 */ sw $v0, 0x98($s2) -/* EE1610 80242C50 AE200038 */ sw $zero, 0x38($s1) -/* EE1614 80242C54 E620003C */ swc1 $f0, 0x3c($s1) -/* EE1618 80242C58 AE200040 */ sw $zero, 0x40($s1) -.L80242C5C: -/* EE161C 80242C5C 8E4200B0 */ lw $v0, 0xb0($s2) -/* EE1620 80242C60 30420004 */ andi $v0, $v0, 4 -/* EE1624 80242C64 10400030 */ beqz $v0, .L80242D28 -/* EE1628 80242C68 2403FFFB */ addiu $v1, $zero, -5 -/* EE162C 80242C6C A620008E */ sh $zero, 0x8e($s1) -/* EE1630 80242C70 96420086 */ lhu $v0, 0x86($s2) -/* EE1634 80242C74 A62200A8 */ sh $v0, 0xa8($s1) -/* EE1638 80242C78 8E4200B0 */ lw $v0, 0xb0($s2) -/* EE163C 80242C7C 00431024 */ and $v0, $v0, $v1 -/* EE1640 80242C80 AE4200B0 */ sw $v0, 0xb0($s2) -/* EE1644 80242C84 8E220000 */ lw $v0, ($s1) -/* EE1648 80242C88 30420800 */ andi $v0, $v0, 0x800 -/* EE164C 80242C8C 1040000A */ beqz $v0, .L80242CB8 -/* EE1650 80242C90 3C02004A */ lui $v0, 0x4a -/* EE1654 80242C94 3C013F80 */ lui $at, 0x3f80 -/* EE1658 80242C98 44810000 */ mtc1 $at, $f0 -/* EE165C 80242C9C 34420018 */ ori $v0, $v0, 0x18 -/* EE1660 80242CA0 AE220028 */ sw $v0, 0x28($s1) -/* EE1664 80242CA4 24020066 */ addiu $v0, $zero, 0x66 -/* EE1668 80242CA8 AE200018 */ sw $zero, 0x18($s1) -/* EE166C 80242CAC AE20001C */ sw $zero, 0x1c($s1) -/* EE1670 80242CB0 08090B49 */ j .L80242D24 -/* EE1674 80242CB4 E6200014 */ swc1 $f0, 0x14($s1) -.L80242CB8: -/* EE1678 80242CB8 24040002 */ addiu $a0, $zero, 2 -/* EE167C 80242CBC 0220282D */ daddu $a1, $s1, $zero -/* EE1680 80242CC0 0000302D */ daddu $a2, $zero, $zero -/* EE1684 80242CC4 862300A8 */ lh $v1, 0xa8($s1) -/* EE1688 80242CC8 3C013F80 */ lui $at, 0x3f80 -/* EE168C 80242CCC 44810000 */ mtc1 $at, $f0 -/* EE1690 80242CD0 3C014000 */ lui $at, 0x4000 -/* EE1694 80242CD4 44811000 */ mtc1 $at, $f2 -/* EE1698 80242CD8 3C01C1A0 */ lui $at, 0xc1a0 -/* EE169C 80242CDC 44812000 */ mtc1 $at, $f4 -/* EE16A0 80242CE0 24020028 */ addiu $v0, $zero, 0x28 -/* EE16A4 80242CE4 AFA2001C */ sw $v0, 0x1c($sp) -/* EE16A8 80242CE8 44834000 */ mtc1 $v1, $f8 -/* EE16AC 80242CEC 00000000 */ nop -/* EE16B0 80242CF0 46804220 */ cvt.s.w $f8, $f8 -/* EE16B4 80242CF4 44074000 */ mfc1 $a3, $f8 -/* EE16B8 80242CF8 27A20048 */ addiu $v0, $sp, 0x48 -/* EE16BC 80242CFC AFA20020 */ sw $v0, 0x20($sp) -/* EE16C0 80242D00 E7A00010 */ swc1 $f0, 0x10($sp) -/* EE16C4 80242D04 E7A20014 */ swc1 $f2, 0x14($sp) -/* EE16C8 80242D08 0C01D444 */ jal dead_fx_emote -/* EE16CC 80242D0C E7A40018 */ swc1 $f4, 0x18($sp) -/* EE16D0 80242D10 8E4200CC */ lw $v0, 0xcc($s2) -/* EE16D4 80242D14 8C420000 */ lw $v0, ($v0) -/* EE16D8 80242D18 AE220028 */ sw $v0, 0x28($s1) -/* EE16DC 80242D1C 240200C8 */ addiu $v0, $zero, 0xc8 -/* EE16E0 80242D20 AEA00074 */ sw $zero, 0x74($s5) -.L80242D24: -/* EE16E4 80242D24 AEA20070 */ sw $v0, 0x70($s5) -.L80242D28: -/* EE16E8 80242D28 27A2004C */ addiu $v0, $sp, 0x4c -/* EE16EC 80242D2C AFA20010 */ sw $v0, 0x10($sp) -/* EE16F0 80242D30 27A20050 */ addiu $v0, $sp, 0x50 -/* EE16F4 80242D34 AFA20014 */ sw $v0, 0x14($sp) -/* EE16F8 80242D38 27A20054 */ addiu $v0, $sp, 0x54 -/* EE16FC 80242D3C AFA20018 */ sw $v0, 0x18($sp) -/* EE1700 80242D40 8E250038 */ lw $a1, 0x38($s1) -/* EE1704 80242D44 8E26003C */ lw $a2, 0x3c($s1) -/* EE1708 80242D48 8E270040 */ lw $a3, 0x40($s1) -/* EE170C 80242D4C 0C00BF2F */ jal dead_get_screen_coords -/* EE1710 80242D50 0000202D */ daddu $a0, $zero, $zero -/* EE1714 80242D54 8EA20070 */ lw $v0, 0x70($s5) -/* EE1718 80242D58 28420064 */ slti $v0, $v0, 0x64 -/* EE171C 80242D5C 10400007 */ beqz $v0, .L80242D7C -/* EE1720 80242D60 00000000 */ nop -/* EE1724 80242D64 8FA2004C */ lw $v0, 0x4c($sp) -/* EE1728 80242D68 24420032 */ addiu $v0, $v0, 0x32 -/* EE172C 80242D6C 2C4201A5 */ sltiu $v0, $v0, 0x1a5 -/* EE1730 80242D70 14400002 */ bnez $v0, .L80242D7C -/* EE1734 80242D74 2402006E */ addiu $v0, $zero, 0x6e -/* EE1738 80242D78 AEA20070 */ sw $v0, 0x70($s5) -.L80242D7C: -/* EE173C 80242D7C 8EA30070 */ lw $v1, 0x70($s5) -/* EE1740 80242D80 2402000F */ addiu $v0, $zero, 0xf -/* EE1744 80242D84 1062006B */ beq $v1, $v0, .L80242F34 -/* EE1748 80242D88 28620010 */ slti $v0, $v1, 0x10 -/* EE174C 80242D8C 10400016 */ beqz $v0, .L80242DE8 -/* EE1750 80242D90 24020003 */ addiu $v0, $zero, 3 -/* EE1754 80242D94 10620051 */ beq $v1, $v0, .L80242EDC -/* EE1758 80242D98 28620004 */ slti $v0, $v1, 4 -/* EE175C 80242D9C 10400009 */ beqz $v0, .L80242DC4 -/* EE1760 80242DA0 24020001 */ addiu $v0, $zero, 1 -/* EE1764 80242DA4 10620044 */ beq $v1, $v0, .L80242EB8 -/* EE1768 80242DA8 28620002 */ slti $v0, $v1, 2 -/* EE176C 80242DAC 50400048 */ beql $v0, $zero, .L80242ED0 -/* EE1770 80242DB0 02A0202D */ daddu $a0, $s5, $zero -/* EE1774 80242DB4 50600027 */ beql $v1, $zero, .L80242E54 -/* EE1778 80242DB8 02A0202D */ daddu $a0, $s5, $zero -/* EE177C 80242DBC 08090CFA */ j .L802433E8 -/* EE1780 80242DC0 00000000 */ nop -.L80242DC4: -/* EE1784 80242DC4 2402000D */ addiu $v0, $zero, 0xd -/* EE1788 80242DC8 1062004D */ beq $v1, $v0, .L80242F00 -/* EE178C 80242DCC 2862000E */ slti $v0, $v1, 0xe -/* EE1790 80242DD0 10400052 */ beqz $v0, .L80242F1C -/* EE1794 80242DD4 2402000C */ addiu $v0, $zero, 0xc -/* EE1798 80242DD8 10620046 */ beq $v1, $v0, .L80242EF4 -/* EE179C 80242DDC 02A0202D */ daddu $a0, $s5, $zero -/* EE17A0 80242DE0 08090CFA */ j .L802433E8 -/* EE17A4 80242DE4 00000000 */ nop -.L80242DE8: -/* EE17A8 80242DE8 24020067 */ addiu $v0, $zero, 0x67 -/* EE17AC 80242DEC 10620158 */ beq $v1, $v0, .L80243350 -/* EE17B0 80242DF0 28620068 */ slti $v0, $v1, 0x68 -/* EE17B4 80242DF4 10400009 */ beqz $v0, .L80242E1C -/* EE17B8 80242DF8 24020065 */ addiu $v0, $zero, 0x65 -/* EE17BC 80242DFC 1062008F */ beq $v1, $v0, .L8024303C -/* EE17C0 80242E00 28620066 */ slti $v0, $v1, 0x66 -/* EE17C4 80242E04 104000A9 */ beqz $v0, .L802430AC -/* EE17C8 80242E08 24020064 */ addiu $v0, $zero, 0x64 -/* EE17CC 80242E0C 1062004F */ beq $v1, $v0, .L80242F4C -/* EE17D0 80242E10 24020002 */ addiu $v0, $zero, 2 -/* EE17D4 80242E14 08090CFA */ j .L802433E8 -/* EE17D8 80242E18 00000000 */ nop -.L80242E1C: -/* EE17DC 80242E1C 2404006F */ addiu $a0, $zero, 0x6f -/* EE17E0 80242E20 10640166 */ beq $v1, $a0, .L802433BC -/* EE17E4 80242E24 28620070 */ slti $v0, $v1, 0x70 -/* EE17E8 80242E28 10400005 */ beqz $v0, .L80242E40 -/* EE17EC 80242E2C 2402006E */ addiu $v0, $zero, 0x6e -/* EE17F0 80242E30 10620156 */ beq $v1, $v0, .L8024338C -/* EE17F4 80242E34 2402001E */ addiu $v0, $zero, 0x1e -/* EE17F8 80242E38 08090CFA */ j .L802433E8 -/* EE17FC 80242E3C 00000000 */ nop -.L80242E40: -/* EE1800 80242E40 240200C8 */ addiu $v0, $zero, 0xc8 -/* EE1804 80242E44 10620166 */ beq $v1, $v0, .L802433E0 -/* EE1808 80242E48 00000000 */ nop -/* EE180C 80242E4C 08090CFA */ j .L802433E8 -/* EE1810 80242E50 00000000 */ nop -.L80242E54: -/* EE1814 80242E54 0260282D */ daddu $a1, $s3, $zero -/* EE1818 80242E58 0C013670 */ jal func_8004D9C0 -/* EE181C 80242E5C 0280302D */ daddu $a2, $s4, $zero -/* EE1820 80242E60 96420086 */ lhu $v0, 0x86($s2) -/* EE1824 80242E64 A62200A8 */ sh $v0, 0xa8($s1) -/* EE1828 80242E68 8E4200A0 */ lw $v0, 0xa0($s2) -/* EE182C 80242E6C 10400013 */ beqz $v0, .L80242EBC -/* EE1830 80242E70 02A0202D */ daddu $a0, $s5, $zero -/* EE1834 80242E74 C620003C */ lwc1 $f0, 0x3c($s1) -/* EE1838 80242E78 44801000 */ mtc1 $zero, $f2 -/* EE183C 80242E7C 44801800 */ mtc1 $zero, $f3 -/* EE1840 80242E80 46000021 */ cvt.d.s $f0, $f0 -/* EE1844 80242E84 4622003E */ c.le.d $f0, $f2 -/* EE1848 80242E88 00000000 */ nop -/* EE184C 80242E8C 45000005 */ bc1f .L80242EA4 -/* EE1850 80242E90 2403FDFF */ addiu $v1, $zero, -0x201 -/* EE1854 80242E94 8E220000 */ lw $v0, ($s1) -/* EE1858 80242E98 00431024 */ and $v0, $v0, $v1 -/* EE185C 80242E9C 08090BAD */ j .L80242EB4 -/* EE1860 80242EA0 34420008 */ ori $v0, $v0, 8 -.L80242EA4: -/* EE1864 80242EA4 8E220000 */ lw $v0, ($s1) -/* EE1868 80242EA8 2403FFF7 */ addiu $v1, $zero, -9 -/* EE186C 80242EAC 34420200 */ ori $v0, $v0, 0x200 -/* EE1870 80242EB0 00431024 */ and $v0, $v0, $v1 -.L80242EB4: -/* EE1874 80242EB4 AE220000 */ sw $v0, ($s1) -.L80242EB8: -/* EE1878 80242EB8 02A0202D */ daddu $a0, $s5, $zero -.L80242EBC: -/* EE187C 80242EBC 0260282D */ daddu $a1, $s3, $zero -/* EE1880 80242EC0 0C0136B6 */ jal func_8004DAD8 -/* EE1884 80242EC4 0280302D */ daddu $a2, $s4, $zero -/* EE1888 80242EC8 08090CFA */ j .L802433E8 -/* EE188C 80242ECC 00000000 */ nop -.L80242ED0: -/* EE1890 80242ED0 0260282D */ daddu $a1, $s3, $zero -/* EE1894 80242ED4 0C0137D9 */ jal func_8004DF64 -/* EE1898 80242ED8 0280302D */ daddu $a2, $s4, $zero -.L80242EDC: -/* EE189C 80242EDC 02A0202D */ daddu $a0, $s5, $zero -/* EE18A0 80242EE0 0260282D */ daddu $a1, $s3, $zero -/* EE18A4 80242EE4 0C013809 */ jal func_8004E024 -/* EE18A8 80242EE8 0280302D */ daddu $a2, $s4, $zero -/* EE18AC 80242EEC 08090CFA */ j .L802433E8 -/* EE18B0 80242EF0 00000000 */ nop -.L80242EF4: -/* EE18B4 80242EF4 0260282D */ daddu $a1, $s3, $zero -/* EE18B8 80242EF8 0C0908BC */ jal EDEA00_set_script_owner_npc_anim -/* EE18BC 80242EFC 0280302D */ daddu $a2, $s4, $zero -.L80242F00: -/* EE18C0 80242F00 02A0202D */ daddu $a0, $s5, $zero -/* EE18C4 80242F04 0260282D */ daddu $a1, $s3, $zero -/* EE18C8 80242F08 0C0908DB */ jal EDEA00_UnkDistFunc -/* EE18CC 80242F0C 0280302D */ daddu $a2, $s4, $zero -/* EE18D0 80242F10 96420086 */ lhu $v0, 0x86($s2) -/* EE18D4 80242F14 08090CFA */ j .L802433E8 -/* EE18D8 80242F18 A62200A8 */ sh $v0, 0xa8($s1) -.L80242F1C: -/* EE18DC 80242F1C 02A0202D */ daddu $a0, $s5, $zero -/* EE18E0 80242F20 0260282D */ daddu $a1, $s3, $zero -/* EE18E4 80242F24 0C090928 */ jal EDEA00_UnkNpcAIFunc12 -/* EE18E8 80242F28 0280302D */ daddu $a2, $s4, $zero -/* EE18EC 80242F2C 08090CFA */ j .L802433E8 -/* EE18F0 80242F30 00000000 */ nop -.L80242F34: -/* EE18F4 80242F34 02A0202D */ daddu $a0, $s5, $zero -/* EE18F8 80242F38 0260282D */ daddu $a1, $s3, $zero -/* EE18FC 80242F3C 0C090981 */ jal EDEA00_set_script_owner_npc_col_height -/* EE1900 80242F40 0280302D */ daddu $a2, $s4, $zero -/* EE1904 80242F44 08090CFA */ j .L802433E8 -/* EE1908 80242F48 00000000 */ nop -.L80242F4C: -/* EE190C 80242F4C 8E430094 */ lw $v1, 0x94($s2) -/* EE1910 80242F50 14620125 */ bne $v1, $v0, .L802433E8 -/* EE1914 80242F54 00000000 */ nop -/* EE1918 80242F58 0C010ABD */ jal dead_get_enemy -/* EE191C 80242F5C 8E440098 */ lw $a0, 0x98($s2) -/* EE1920 80242F60 0C00F92F */ jal dead_get_npc_unsafe -/* EE1924 80242F64 84440008 */ lh $a0, 8($v0) -/* EE1928 80242F68 C440000C */ lwc1 $f0, 0xc($v0) -/* EE192C 80242F6C 3C018024 */ lui $at, %hi(D_80247BB0_EE6570) -/* EE1930 80242F70 D4227BB0 */ ldc1 $f2, %lo(D_80247BB0_EE6570)($at) -/* EE1934 80242F74 46000021 */ cvt.d.s $f0, $f0 -/* EE1938 80242F78 4622003C */ c.lt.d $f0, $f2 -/* EE193C 80242F7C 00000000 */ nop -/* EE1940 80242F80 45000008 */ bc1f .L80242FA4 -/* EE1944 80242F84 00000000 */ nop -/* EE1948 80242F88 C4400038 */ lwc1 $f0, 0x38($v0) -/* EE194C 80242F8C 3C014028 */ lui $at, 0x4028 -/* EE1950 80242F90 44811800 */ mtc1 $at, $f3 -/* EE1954 80242F94 44801000 */ mtc1 $zero, $f2 -/* EE1958 80242F98 46000021 */ cvt.d.s $f0, $f0 -/* EE195C 80242F9C 08090BEF */ j .L80242FBC -/* EE1960 80242FA0 46220000 */ add.d $f0, $f0, $f2 -.L80242FA4: -/* EE1964 80242FA4 C4400038 */ lwc1 $f0, 0x38($v0) -/* EE1968 80242FA8 3C014028 */ lui $at, 0x4028 -/* EE196C 80242FAC 44811800 */ mtc1 $at, $f3 -/* EE1970 80242FB0 44801000 */ mtc1 $zero, $f2 -/* EE1974 80242FB4 46000021 */ cvt.d.s $f0, $f0 -/* EE1978 80242FB8 46220001 */ sub.d $f0, $f0, $f2 -.L80242FBC: -/* EE197C 80242FBC 46200020 */ cvt.s.d $f0, $f0 -/* EE1980 80242FC0 E6200038 */ swc1 $f0, 0x38($s1) -/* EE1984 80242FC4 3C04004A */ lui $a0, 0x4a -/* EE1988 80242FC8 C440003C */ lwc1 $f0, 0x3c($v0) -/* EE198C 80242FCC 3C014039 */ lui $at, 0x4039 -/* EE1990 80242FD0 44811800 */ mtc1 $at, $f3 -/* EE1994 80242FD4 44801000 */ mtc1 $zero, $f2 -/* EE1998 80242FD8 46000021 */ cvt.d.s $f0, $f0 -/* EE199C 80242FDC 46220000 */ add.d $f0, $f0, $f2 -/* EE19A0 80242FE0 34840018 */ ori $a0, $a0, 0x18 -/* EE19A4 80242FE4 3C013FF0 */ lui $at, 0x3ff0 -/* EE19A8 80242FE8 44811800 */ mtc1 $at, $f3 -/* EE19AC 80242FEC 44801000 */ mtc1 $zero, $f2 -/* EE19B0 80242FF0 46200020 */ cvt.s.d $f0, $f0 -/* EE19B4 80242FF4 E620003C */ swc1 $f0, 0x3c($s1) -/* EE19B8 80242FF8 C4400040 */ lwc1 $f0, 0x40($v0) -/* EE19BC 80242FFC 8E220000 */ lw $v0, ($s1) -/* EE19C0 80243000 2403FFFD */ addiu $v1, $zero, -3 -/* EE19C4 80243004 AE200048 */ sw $zero, 0x48($s1) -/* EE19C8 80243008 AE200034 */ sw $zero, 0x34($s1) -/* EE19CC 8024300C AE240028 */ sw $a0, 0x28($s1) -/* EE19D0 80243010 34420008 */ ori $v0, $v0, 8 -/* EE19D4 80243014 00431024 */ and $v0, $v0, $v1 -/* EE19D8 80243018 2403FDFF */ addiu $v1, $zero, -0x201 -/* EE19DC 8024301C 00431024 */ and $v0, $v0, $v1 -/* EE19E0 80243020 46000021 */ cvt.d.s $f0, $f0 -/* EE19E4 80243024 46220000 */ add.d $f0, $f0, $f2 -/* EE19E8 80243028 AE220000 */ sw $v0, ($s1) -/* EE19EC 8024302C 24020065 */ addiu $v0, $zero, 0x65 -/* EE19F0 80243030 46200020 */ cvt.s.d $f0, $f0 -/* EE19F4 80243034 E6200040 */ swc1 $f0, 0x40($s1) -/* EE19F8 80243038 AEA20070 */ sw $v0, 0x70($s5) -.L8024303C: -/* EE19FC 8024303C 8E430094 */ lw $v1, 0x94($s2) -/* EE1A00 80243040 24020003 */ addiu $v0, $zero, 3 -/* EE1A04 80243044 146200E8 */ bne $v1, $v0, .L802433E8 -/* EE1A08 80243048 24020004 */ addiu $v0, $zero, 4 -/* EE1A0C 8024304C AE420094 */ sw $v0, 0x94($s2) -/* EE1A10 80243050 C62C0038 */ lwc1 $f12, 0x38($s1) -/* EE1A14 80243054 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EE1A18 80243058 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EE1A1C 8024305C C62E0040 */ lwc1 $f14, 0x40($s1) -/* EE1A20 80243060 8C460028 */ lw $a2, 0x28($v0) -/* EE1A24 80243064 0C00ABDC */ jal fio_validate_header_checksums -/* EE1A28 80243068 8C470030 */ lw $a3, 0x30($v0) -/* EE1A2C 8024306C 3C014020 */ lui $at, 0x4020 -/* EE1A30 80243070 44811000 */ mtc1 $at, $f2 -/* EE1A34 80243074 3C014100 */ lui $at, 0x4100 -/* EE1A38 80243078 44812000 */ mtc1 $at, $f4 -/* EE1A3C 8024307C 3C013F4C */ lui $at, 0x3f4c -/* EE1A40 80243080 3421CCCD */ ori $at, $at, 0xcccd -/* EE1A44 80243084 44813000 */ mtc1 $at, $f6 -/* EE1A48 80243088 8E220000 */ lw $v0, ($s1) -/* EE1A4C 8024308C E620000C */ swc1 $f0, 0xc($s1) -/* EE1A50 80243090 34420800 */ ori $v0, $v0, 0x800 -/* EE1A54 80243094 AE220000 */ sw $v0, ($s1) -/* EE1A58 80243098 24020066 */ addiu $v0, $zero, 0x66 -/* EE1A5C 8024309C E6220018 */ swc1 $f2, 0x18($s1) -/* EE1A60 802430A0 E624001C */ swc1 $f4, 0x1c($s1) -/* EE1A64 802430A4 E6260014 */ swc1 $f6, 0x14($s1) -/* EE1A68 802430A8 AEA20070 */ sw $v0, 0x70($s5) -.L802430AC: -/* EE1A6C 802430AC C6200018 */ lwc1 $f0, 0x18($s1) -/* EE1A70 802430B0 44801000 */ mtc1 $zero, $f2 -/* EE1A74 802430B4 44801800 */ mtc1 $zero, $f3 -/* EE1A78 802430B8 46000021 */ cvt.d.s $f0, $f0 -/* EE1A7C 802430BC 4620103C */ c.lt.d $f2, $f0 -/* EE1A80 802430C0 00000000 */ nop -/* EE1A84 802430C4 4500001F */ bc1f .L80243144 -/* EE1A88 802430C8 27A50058 */ addiu $a1, $sp, 0x58 -/* EE1A8C 802430CC C6200038 */ lwc1 $f0, 0x38($s1) -/* EE1A90 802430D0 C622003C */ lwc1 $f2, 0x3c($s1) -/* EE1A94 802430D4 C6240040 */ lwc1 $f4, 0x40($s1) -/* EE1A98 802430D8 C6260018 */ lwc1 $f6, 0x18($s1) -/* EE1A9C 802430DC E7A00058 */ swc1 $f0, 0x58($sp) -/* EE1AA0 802430E0 E7A2005C */ swc1 $f2, 0x5c($sp) -/* EE1AA4 802430E4 E7A40060 */ swc1 $f4, 0x60($sp) -/* EE1AA8 802430E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* EE1AAC 802430EC C620000C */ lwc1 $f0, 0xc($s1) -/* EE1AB0 802430F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* EE1AB4 802430F4 862200A8 */ lh $v0, 0xa8($s1) -/* EE1AB8 802430F8 44820000 */ mtc1 $v0, $f0 -/* EE1ABC 802430FC 00000000 */ nop -/* EE1AC0 80243100 46800020 */ cvt.s.w $f0, $f0 -/* EE1AC4 80243104 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE1AC8 80243108 862200A6 */ lh $v0, 0xa6($s1) -/* EE1ACC 8024310C 27A6005C */ addiu $a2, $sp, 0x5c -/* EE1AD0 80243110 44820000 */ mtc1 $v0, $f0 -/* EE1AD4 80243114 00000000 */ nop -/* EE1AD8 80243118 46800020 */ cvt.s.w $f0, $f0 -/* EE1ADC 8024311C E7A0001C */ swc1 $f0, 0x1c($sp) -/* EE1AE0 80243120 8E240080 */ lw $a0, 0x80($s1) -/* EE1AE4 80243124 0C0394C1 */ jal dead_npc_test_move_simple_with_slipping -/* EE1AE8 80243128 27A70060 */ addiu $a3, $sp, 0x60 -/* EE1AEC 8024312C 54400005 */ bnel $v0, $zero, .L80243144 -/* EE1AF0 80243130 AE200018 */ sw $zero, 0x18($s1) -/* EE1AF4 80243134 8E250018 */ lw $a1, 0x18($s1) -/* EE1AF8 80243138 8E26000C */ lw $a2, 0xc($s1) -/* EE1AFC 8024313C 0C00F909 */ jal dead_npc_move_heading -/* EE1B00 80243140 0220202D */ daddu $a0, $s1, $zero -.L80243144: -/* EE1B04 80243144 C620001C */ lwc1 $f0, 0x1c($s1) -/* EE1B08 80243148 4480B000 */ mtc1 $zero, $f22 -/* EE1B0C 8024314C 4480B800 */ mtc1 $zero, $f23 -/* EE1B10 80243150 46000021 */ cvt.d.s $f0, $f0 -/* EE1B14 80243154 4636003C */ c.lt.d $f0, $f22 -/* EE1B18 80243158 00000000 */ nop -/* EE1B1C 8024315C 45000074 */ bc1f .L80243330 -/* EE1B20 80243160 27A50058 */ addiu $a1, $sp, 0x58 -/* EE1B24 80243164 27A6005C */ addiu $a2, $sp, 0x5c -/* EE1B28 80243168 27A20064 */ addiu $v0, $sp, 0x64 -/* EE1B2C 8024316C C622003C */ lwc1 $f2, 0x3c($s1) -/* EE1B30 80243170 C6260038 */ lwc1 $f6, 0x38($s1) -/* EE1B34 80243174 3C01402A */ lui $at, 0x402a -/* EE1B38 80243178 4481A800 */ mtc1 $at, $f21 -/* EE1B3C 8024317C 4480A000 */ mtc1 $zero, $f20 -/* EE1B40 80243180 460010A1 */ cvt.d.s $f2, $f2 -/* EE1B44 80243184 46341080 */ add.d $f2, $f2, $f20 -/* EE1B48 80243188 C620001C */ lwc1 $f0, 0x1c($s1) -/* EE1B4C 8024318C C6240040 */ lwc1 $f4, 0x40($s1) -/* EE1B50 80243190 46000005 */ abs.s $f0, $f0 -/* EE1B54 80243194 E7A40060 */ swc1 $f4, 0x60($sp) -/* EE1B58 80243198 3C014030 */ lui $at, 0x4030 -/* EE1B5C 8024319C 44812800 */ mtc1 $at, $f5 -/* EE1B60 802431A0 44802000 */ mtc1 $zero, $f4 -/* EE1B64 802431A4 46000021 */ cvt.d.s $f0, $f0 -/* EE1B68 802431A8 E7A60058 */ swc1 $f6, 0x58($sp) -/* EE1B6C 802431AC 46240000 */ add.d $f0, $f0, $f4 -/* EE1B70 802431B0 462010A0 */ cvt.s.d $f2, $f2 -/* EE1B74 802431B4 E7A2005C */ swc1 $f2, 0x5c($sp) -/* EE1B78 802431B8 46200020 */ cvt.s.d $f0, $f0 -/* EE1B7C 802431BC E7A00064 */ swc1 $f0, 0x64($sp) -/* EE1B80 802431C0 AFA20010 */ sw $v0, 0x10($sp) -/* EE1B84 802431C4 8E240080 */ lw $a0, 0x80($s1) -/* EE1B88 802431C8 0C03908F */ jal dead_npc_raycast_down_sides -/* EE1B8C 802431CC 27A70060 */ addiu $a3, $sp, 0x60 -/* EE1B90 802431D0 10400057 */ beqz $v0, .L80243330 -/* EE1B94 802431D4 00000000 */ nop -/* EE1B98 802431D8 C620001C */ lwc1 $f0, 0x1c($s1) -/* EE1B9C 802431DC C7A20064 */ lwc1 $f2, 0x64($sp) -/* EE1BA0 802431E0 46000005 */ abs.s $f0, $f0 -/* EE1BA4 802431E4 46000021 */ cvt.d.s $f0, $f0 -/* EE1BA8 802431E8 46340000 */ add.d $f0, $f0, $f20 -/* EE1BAC 802431EC 460010A1 */ cvt.d.s $f2, $f2 -/* EE1BB0 802431F0 4620103E */ c.le.d $f2, $f0 -/* EE1BB4 802431F4 00000000 */ nop -/* EE1BB8 802431F8 4500004D */ bc1f .L80243330 -/* EE1BBC 802431FC 00000000 */ nop -/* EE1BC0 80243200 C7A0005C */ lwc1 $f0, 0x5c($sp) -/* EE1BC4 80243204 E620003C */ swc1 $f0, 0x3c($s1) -/* EE1BC8 80243208 8E4200D0 */ lw $v0, 0xd0($s2) -/* EE1BCC 8024320C C6200038 */ lwc1 $f0, 0x38($s1) -/* EE1BD0 80243210 4600020D */ trunc.w.s $f8, $f0 -/* EE1BD4 80243214 E4480000 */ swc1 $f8, ($v0) -/* EE1BD8 80243218 8E4200D0 */ lw $v0, 0xd0($s2) -/* EE1BDC 8024321C C620003C */ lwc1 $f0, 0x3c($s1) -/* EE1BE0 80243220 4600020D */ trunc.w.s $f8, $f0 -/* EE1BE4 80243224 E4480004 */ swc1 $f8, 4($v0) -/* EE1BE8 80243228 8E4200D0 */ lw $v0, 0xd0($s2) -/* EE1BEC 8024322C C6200040 */ lwc1 $f0, 0x40($s1) -/* EE1BF0 80243230 4600020D */ trunc.w.s $f8, $f0 -/* EE1BF4 80243234 E4480008 */ swc1 $f8, 8($v0) -/* EE1BF8 80243238 8E4200D0 */ lw $v0, 0xd0($s2) -/* EE1BFC 8024323C C6200038 */ lwc1 $f0, 0x38($s1) -/* EE1C00 80243240 4600020D */ trunc.w.s $f8, $f0 -/* EE1C04 80243244 E448001C */ swc1 $f8, 0x1c($v0) -/* EE1C08 80243248 8E4200D0 */ lw $v0, 0xd0($s2) -/* EE1C0C 8024324C C620003C */ lwc1 $f0, 0x3c($s1) -/* EE1C10 80243250 4600020D */ trunc.w.s $f8, $f0 -/* EE1C14 80243254 E4480020 */ swc1 $f8, 0x20($v0) -/* EE1C18 80243258 8E4200D0 */ lw $v0, 0xd0($s2) -/* EE1C1C 8024325C C6200040 */ lwc1 $f0, 0x40($s1) -/* EE1C20 80243260 4600020D */ trunc.w.s $f8, $f0 -/* EE1C24 80243264 E4480024 */ swc1 $f8, 0x24($v0) -/* EE1C28 80243268 8E4300A0 */ lw $v1, 0xa0($s2) -/* EE1C2C 8024326C 24020005 */ addiu $v0, $zero, 5 -/* EE1C30 80243270 1060000B */ beqz $v1, .L802432A0 -/* EE1C34 80243274 AE420094 */ sw $v0, 0x94($s2) -/* EE1C38 80243278 C620003C */ lwc1 $f0, 0x3c($s1) -/* EE1C3C 8024327C 46000021 */ cvt.d.s $f0, $f0 -/* EE1C40 80243280 4636003E */ c.le.d $f0, $f22 -/* EE1C44 80243284 00000000 */ nop -/* EE1C48 80243288 4501000D */ bc1t .L802432C0 -/* EE1C4C 8024328C 2403FFF7 */ addiu $v1, $zero, -9 -/* EE1C50 80243290 8E220000 */ lw $v0, ($s1) -/* EE1C54 80243294 34420200 */ ori $v0, $v0, 0x200 -/* EE1C58 80243298 08090CB4 */ j .L802432D0 -/* EE1C5C 8024329C 00431024 */ and $v0, $v0, $v1 -.L802432A0: -/* EE1C60 802432A0 8E4200D0 */ lw $v0, 0xd0($s2) -/* EE1C64 802432A4 8C420034 */ lw $v0, 0x34($v0) -/* EE1C68 802432A8 14400005 */ bnez $v0, .L802432C0 -/* EE1C6C 802432AC 2403FFF7 */ addiu $v1, $zero, -9 -/* EE1C70 802432B0 8E220000 */ lw $v0, ($s1) -/* EE1C74 802432B4 34420200 */ ori $v0, $v0, 0x200 -/* EE1C78 802432B8 08090CB4 */ j .L802432D0 -/* EE1C7C 802432BC 00431024 */ and $v0, $v0, $v1 -.L802432C0: -/* EE1C80 802432C0 8E220000 */ lw $v0, ($s1) -/* EE1C84 802432C4 2403FDFF */ addiu $v1, $zero, -0x201 -/* EE1C88 802432C8 00431024 */ and $v0, $v0, $v1 -/* EE1C8C 802432CC 34420008 */ ori $v0, $v0, 8 -.L802432D0: -/* EE1C90 802432D0 AE220000 */ sw $v0, ($s1) -/* EE1C94 802432D4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* EE1C98 802432D8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* EE1C9C 802432DC 8E220000 */ lw $v0, ($s1) -/* EE1CA0 802432E0 3C048010 */ lui $a0, %hi(dead_gPlayerStatusPtr) -/* EE1CA4 802432E4 8C84FC90 */ lw $a0, %lo(dead_gPlayerStatusPtr)($a0) -/* EE1CA8 802432E8 3C030004 */ lui $v1, 4 -/* EE1CAC 802432EC AE20001C */ sw $zero, 0x1c($s1) -/* EE1CB0 802432F0 00431025 */ or $v0, $v0, $v1 -/* EE1CB4 802432F4 2403F7FF */ addiu $v1, $zero, -0x801 -/* EE1CB8 802432F8 00431024 */ and $v0, $v0, $v1 -/* EE1CBC 802432FC AE220000 */ sw $v0, ($s1) -/* EE1CC0 80243300 8C860028 */ lw $a2, 0x28($a0) -/* EE1CC4 80243304 0C00ABDC */ jal fio_validate_header_checksums -/* EE1CC8 80243308 8C870030 */ lw $a3, 0x30($a0) -/* EE1CCC 8024330C 3C02004A */ lui $v0, 0x4a -/* EE1CD0 80243310 3442001A */ ori $v0, $v0, 0x1a -/* EE1CD4 80243314 AE220028 */ sw $v0, 0x28($s1) -/* EE1CD8 80243318 24020003 */ addiu $v0, $zero, 3 -/* EE1CDC 8024331C A622008E */ sh $v0, 0x8e($s1) -/* EE1CE0 80243320 24020067 */ addiu $v0, $zero, 0x67 -/* EE1CE4 80243324 E620000C */ swc1 $f0, 0xc($s1) -/* EE1CE8 80243328 08090CFA */ j .L802433E8 -/* EE1CEC 8024332C AEA20070 */ sw $v0, 0x70($s5) -.L80243330: -/* EE1CF0 80243330 C624003C */ lwc1 $f4, 0x3c($s1) -/* EE1CF4 80243334 C620001C */ lwc1 $f0, 0x1c($s1) -/* EE1CF8 80243338 46002100 */ add.s $f4, $f4, $f0 -/* EE1CFC 8024333C C6220014 */ lwc1 $f2, 0x14($s1) -/* EE1D00 80243340 46020001 */ sub.s $f0, $f0, $f2 -/* EE1D04 80243344 E624003C */ swc1 $f4, 0x3c($s1) -/* EE1D08 80243348 08090CFA */ j .L802433E8 -/* EE1D0C 8024334C E620001C */ swc1 $f0, 0x1c($s1) -.L80243350: -/* EE1D10 80243350 9622008E */ lhu $v0, 0x8e($s1) -/* EE1D14 80243354 2442FFFF */ addiu $v0, $v0, -1 -/* EE1D18 80243358 A622008E */ sh $v0, 0x8e($s1) -/* EE1D1C 8024335C 00021400 */ sll $v0, $v0, 0x10 -/* EE1D20 80243360 1C400021 */ bgtz $v0, .L802433E8 -/* EE1D24 80243364 3C03004A */ lui $v1, 0x4a -/* EE1D28 80243368 3C04FFFB */ lui $a0, 0xfffb -/* EE1D2C 8024336C 3484FFFF */ ori $a0, $a0, 0xffff -/* EE1D30 80243370 8E220000 */ lw $v0, ($s1) -/* EE1D34 80243374 34630001 */ ori $v1, $v1, 1 -/* EE1D38 80243378 AE230028 */ sw $v1, 0x28($s1) -/* EE1D3C 8024337C 00441024 */ and $v0, $v0, $a0 -/* EE1D40 80243380 AE220000 */ sw $v0, ($s1) -/* EE1D44 80243384 08090CFA */ j .L802433E8 -/* EE1D48 80243388 AEA00070 */ sw $zero, 0x70($s5) -.L8024338C: -/* EE1D4C 8024338C 3C01C47A */ lui $at, 0xc47a -/* EE1D50 80243390 44810000 */ mtc1 $at, $f0 -/* EE1D54 80243394 8E230000 */ lw $v1, ($s1) -/* EE1D58 80243398 A622008E */ sh $v0, 0x8e($s1) -/* EE1D5C 8024339C 2402FDFF */ addiu $v0, $zero, -0x201 -/* EE1D60 802433A0 AE200038 */ sw $zero, 0x38($s1) -/* EE1D64 802433A4 AE200040 */ sw $zero, 0x40($s1) -/* EE1D68 802433A8 3463000A */ ori $v1, $v1, 0xa -/* EE1D6C 802433AC 00621824 */ and $v1, $v1, $v0 -/* EE1D70 802433B0 E620003C */ swc1 $f0, 0x3c($s1) -/* EE1D74 802433B4 AE230000 */ sw $v1, ($s1) -/* EE1D78 802433B8 AEA40070 */ sw $a0, 0x70($s5) -.L802433BC: -/* EE1D7C 802433BC 9622008E */ lhu $v0, 0x8e($s1) -/* EE1D80 802433C0 2442FFFF */ addiu $v0, $v0, -1 -/* EE1D84 802433C4 A622008E */ sh $v0, 0x8e($s1) -/* EE1D88 802433C8 00021400 */ sll $v0, $v0, 0x10 -/* EE1D8C 802433CC 1C400006 */ bgtz $v0, .L802433E8 -/* EE1D90 802433D0 24020064 */ addiu $v0, $zero, 0x64 -/* EE1D94 802433D4 AE400094 */ sw $zero, 0x94($s2) -/* EE1D98 802433D8 08090CFA */ j .L802433E8 -/* EE1D9C 802433DC AEA20070 */ sw $v0, 0x70($s5) -.L802433E0: -/* EE1DA0 802433E0 0C013AE3 */ jal func_8004EB8C -/* EE1DA4 802433E4 02A0202D */ daddu $a0, $s5, $zero -.L802433E8: -/* EE1DA8 802433E8 8FBF0080 */ lw $ra, 0x80($sp) -/* EE1DAC 802433EC 8FB5007C */ lw $s5, 0x7c($sp) -/* EE1DB0 802433F0 8FB40078 */ lw $s4, 0x78($sp) -/* EE1DB4 802433F4 8FB30074 */ lw $s3, 0x74($sp) -/* EE1DB8 802433F8 8FB20070 */ lw $s2, 0x70($sp) -/* EE1DBC 802433FC 8FB1006C */ lw $s1, 0x6c($sp) -/* EE1DC0 80243400 8FB00068 */ lw $s0, 0x68($sp) -/* EE1DC4 80243404 D7B60090 */ ldc1 $f22, 0x90($sp) -/* EE1DC8 80243408 D7B40088 */ ldc1 $f20, 0x88($sp) -/* EE1DCC 8024340C 0000102D */ daddu $v0, $zero, $zero -/* EE1DD0 80243410 03E00008 */ jr $ra -/* EE1DD4 80243414 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s deleted file mode 100644 index cc910bb3a4..0000000000 --- a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s +++ /dev/null @@ -1,160 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802454B0_EF25B0 -.word .L802428BC_EEF9BC, .L802428CC_EEF9CC, .L802428E4_EEF9E4, .L802428F4_EEF9F4, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024290C_EEFA0C, .L8024291C_EEFA1C, .L80242934_EEFA34, .L80242944_EEFA44, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024296C_EEFA6C, .L8024295C_EEFA5C, 0, 0, 0 - -.section .text - -glabel func_80242780_EEF880 -/* EEF880 80242780 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* EEF884 80242784 AFB40040 */ sw $s4, 0x40($sp) -/* EEF888 80242788 0080A02D */ daddu $s4, $a0, $zero -/* EEF88C 8024278C AFBF0048 */ sw $ra, 0x48($sp) -/* EEF890 80242790 AFB50044 */ sw $s5, 0x44($sp) -/* EEF894 80242794 AFB3003C */ sw $s3, 0x3c($sp) -/* EEF898 80242798 AFB20038 */ sw $s2, 0x38($sp) -/* EEF89C 8024279C AFB10034 */ sw $s1, 0x34($sp) -/* EEF8A0 802427A0 AFB00030 */ sw $s0, 0x30($sp) -/* EEF8A4 802427A4 8E920148 */ lw $s2, 0x148($s4) -/* EEF8A8 802427A8 86440008 */ lh $a0, 8($s2) -/* EEF8AC 802427AC 8E90000C */ lw $s0, 0xc($s4) -/* EEF8B0 802427B0 0C00F92F */ jal dead_get_npc_unsafe -/* EEF8B4 802427B4 00A0882D */ daddu $s1, $a1, $zero -/* EEF8B8 802427B8 0280202D */ daddu $a0, $s4, $zero -/* EEF8BC 802427BC 8E050000 */ lw $a1, ($s0) -/* EEF8C0 802427C0 0C0B53A3 */ jal dead_evt_get_variable -/* EEF8C4 802427C4 0040A82D */ daddu $s5, $v0, $zero -/* EEF8C8 802427C8 AFA00010 */ sw $zero, 0x10($sp) -/* EEF8CC 802427CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF8D0 802427D0 8C630030 */ lw $v1, 0x30($v1) -/* EEF8D4 802427D4 AFA30014 */ sw $v1, 0x14($sp) -/* EEF8D8 802427D8 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF8DC 802427DC 8C63001C */ lw $v1, 0x1c($v1) -/* EEF8E0 802427E0 AFA30018 */ sw $v1, 0x18($sp) -/* EEF8E4 802427E4 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF8E8 802427E8 8C630024 */ lw $v1, 0x24($v1) -/* EEF8EC 802427EC AFA3001C */ sw $v1, 0x1c($sp) -/* EEF8F0 802427F0 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF8F4 802427F4 8C630028 */ lw $v1, 0x28($v1) -/* EEF8F8 802427F8 AFA30020 */ sw $v1, 0x20($sp) -/* EEF8FC 802427FC 8E4300D0 */ lw $v1, 0xd0($s2) -/* EEF900 80242800 3C0142F0 */ lui $at, 0x42f0 -/* EEF904 80242804 44810000 */ mtc1 $at, $f0 -/* EEF908 80242808 8C63002C */ lw $v1, 0x2c($v1) -/* EEF90C 8024280C E7A00028 */ swc1 $f0, 0x28($sp) -/* EEF910 80242810 A7A0002C */ sh $zero, 0x2c($sp) -/* EEF914 80242814 AFA30024 */ sw $v1, 0x24($sp) -/* EEF918 80242818 C6A00038 */ lwc1 $f0, 0x38($s5) -/* EEF91C 8024281C E6400108 */ swc1 $f0, 0x108($s2) -/* EEF920 80242820 C6A0003C */ lwc1 $f0, 0x3c($s5) -/* EEF924 80242824 27B30010 */ addiu $s3, $sp, 0x10 -/* EEF928 80242828 E640010C */ swc1 $f0, 0x10c($s2) -/* EEF92C 8024282C 3C0138D1 */ lui $at, 0x38d1 -/* EEF930 80242830 3421B717 */ ori $at, $at, 0xb717 -/* EEF934 80242834 44810000 */ mtc1 $at, $f0 -/* EEF938 80242838 C6A20040 */ lwc1 $f2, 0x40($s5) -/* EEF93C 8024283C 0040802D */ daddu $s0, $v0, $zero -/* EEF940 80242840 E6400114 */ swc1 $f0, 0x114($s2) -/* EEF944 80242844 E6400118 */ swc1 $f0, 0x118($s2) -/* EEF948 80242848 12200007 */ beqz $s1, .L80242868 -/* EEF94C 8024284C E6420110 */ swc1 $f2, 0x110($s2) -/* EEF950 80242850 02A0202D */ daddu $a0, $s5, $zero -/* EEF954 80242854 0240282D */ daddu $a1, $s2, $zero -/* EEF958 80242858 0280302D */ daddu $a2, $s4, $zero -/* EEF95C 8024285C 0C09080E */ jal EEDF50_UnkFunc5 -/* EEF960 80242860 0200382D */ daddu $a3, $s0, $zero -/* EEF964 80242864 AE800070 */ sw $zero, 0x70($s4) -.L80242868: -/* EEF968 80242868 2402FFFE */ addiu $v0, $zero, -2 -/* EEF96C 8024286C A2A200AB */ sb $v0, 0xab($s5) -/* EEF970 80242870 8E4300B0 */ lw $v1, 0xb0($s2) -/* EEF974 80242874 30620004 */ andi $v0, $v1, 4 -/* EEF978 80242878 10400007 */ beqz $v0, .L80242898 -/* EEF97C 8024287C 00000000 */ nop -/* EEF980 80242880 824200B4 */ lb $v0, 0xb4($s2) -/* EEF984 80242884 1440003A */ bnez $v0, .L80242970 -/* EEF988 80242888 0000102D */ daddu $v0, $zero, $zero -/* EEF98C 8024288C 2402FFFB */ addiu $v0, $zero, -5 -/* EEF990 80242890 00621024 */ and $v0, $v1, $v0 -/* EEF994 80242894 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242898: -/* EEF998 80242898 8E830070 */ lw $v1, 0x70($s4) -/* EEF99C 8024289C 2C620015 */ sltiu $v0, $v1, 0x15 -/* EEF9A0 802428A0 10400032 */ beqz $v0, .L8024296C_EEFA6C -/* EEF9A4 802428A4 00031080 */ sll $v0, $v1, 2 -/* EEF9A8 802428A8 3C018024 */ lui $at, %hi(jtbl_802454B0_EF25B0) -/* EEF9AC 802428AC 00220821 */ addu $at, $at, $v0 -/* EEF9B0 802428B0 8C2254B0 */ lw $v0, %lo(jtbl_802454B0_EF25B0)($at) -/* EEF9B4 802428B4 00400008 */ jr $v0 -/* EEF9B8 802428B8 00000000 */ nop -.L802428BC_EEF9BC: -/* EEF9BC 802428BC 0280202D */ daddu $a0, $s4, $zero -/* EEF9C0 802428C0 0200282D */ daddu $a1, $s0, $zero -/* EEF9C4 802428C4 0C090394 */ jal EEDF50_UnkNpcAIFunc23 -/* EEF9C8 802428C8 0260302D */ daddu $a2, $s3, $zero -.L802428CC_EEF9CC: -/* EEF9CC 802428CC 0280202D */ daddu $a0, $s4, $zero -/* EEF9D0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* EEF9D4 802428D4 0C090400 */ jal EEDF50_UnkNpcAIFunc35 -/* EEF9D8 802428D8 0260302D */ daddu $a2, $s3, $zero -/* EEF9DC 802428DC 08090A5C */ j .L80242970 -/* EEF9E0 802428E0 0000102D */ daddu $v0, $zero, $zero -.L802428E4_EEF9E4: -/* EEF9E4 802428E4 0280202D */ daddu $a0, $s4, $zero -/* EEF9E8 802428E8 0200282D */ daddu $a1, $s0, $zero -/* EEF9EC 802428EC 0C09058A */ jal EEDF50_UnkNpcAIFunc1 -/* EEF9F0 802428F0 0260302D */ daddu $a2, $s3, $zero -.L802428F4_EEF9F4: -/* EEF9F4 802428F4 0280202D */ daddu $a0, $s4, $zero -/* EEF9F8 802428F8 0200282D */ daddu $a1, $s0, $zero -/* EEF9FC 802428FC 0C0905BA */ jal EEDF50_UnkFunc4 -/* EEFA00 80242900 0260302D */ daddu $a2, $s3, $zero -/* EEFA04 80242904 08090A5C */ j .L80242970 -/* EEFA08 80242908 0000102D */ daddu $v0, $zero, $zero -.L8024290C_EEFA0C: -/* EEFA0C 8024290C 0280202D */ daddu $a0, $s4, $zero -/* EEFA10 80242910 0200282D */ daddu $a1, $s0, $zero -/* EEFA14 80242914 0C09068B */ jal EEDF50_UnkNpcAIFunc2 -/* EEFA18 80242918 0260302D */ daddu $a2, $s3, $zero -.L8024291C_EEFA1C: -/* EEFA1C 8024291C 0280202D */ daddu $a0, $s4, $zero -/* EEFA20 80242920 0200282D */ daddu $a1, $s0, $zero -/* EEFA24 80242924 0C0906A9 */ jal EEDF50_SixFloatsFunc -/* EEFA28 80242928 0260302D */ daddu $a2, $s3, $zero -/* EEFA2C 8024292C 08090A5C */ j .L80242970 -/* EEFA30 80242930 0000102D */ daddu $v0, $zero, $zero -.L80242934_EEFA34: -/* EEFA34 80242934 0280202D */ daddu $a0, $s4, $zero -/* EEFA38 80242938 0200282D */ daddu $a1, $s0, $zero -/* EEFA3C 8024293C 0C0908DD */ jal EEDF50_UnkNpcAIFunc13 -/* EEFA40 80242940 0260302D */ daddu $a2, $s3, $zero -.L80242944_EEFA44: -/* EEFA44 80242944 0280202D */ daddu $a0, $s4, $zero -/* EEFA48 80242948 0200282D */ daddu $a1, $s0, $zero -/* EEFA4C 8024294C 0C090929 */ jal EEDF50_UnkNpcAIFunc34 -/* EEFA50 80242950 0260302D */ daddu $a2, $s3, $zero -/* EEFA54 80242954 08090A5C */ j .L80242970 -/* EEFA58 80242958 0000102D */ daddu $v0, $zero, $zero -.L8024295C_EEFA5C: -/* EEFA5C 8024295C 0280202D */ daddu $a0, $s4, $zero -/* EEFA60 80242960 0200282D */ daddu $a1, $s0, $zero -/* EEFA64 80242964 0C0909C9 */ jal EEDF50_UnkFunc45 -/* EEFA68 80242968 0260302D */ daddu $a2, $s3, $zero -.L8024296C_EEFA6C: -/* EEFA6C 8024296C 0000102D */ daddu $v0, $zero, $zero -.L80242970: -/* EEFA70 80242970 8FBF0048 */ lw $ra, 0x48($sp) -/* EEFA74 80242974 8FB50044 */ lw $s5, 0x44($sp) -/* EEFA78 80242978 8FB40040 */ lw $s4, 0x40($sp) -/* EEFA7C 8024297C 8FB3003C */ lw $s3, 0x3c($sp) -/* EEFA80 80242980 8FB20038 */ lw $s2, 0x38($sp) -/* EEFA84 80242984 8FB10034 */ lw $s1, 0x34($sp) -/* EEFA88 80242988 8FB00030 */ lw $s0, 0x30($sp) -/* EEFA8C 8024298C 03E00008 */ jr $ra -/* EEFA90 80242990 27BD0050 */ addiu $sp, $sp, 0x50 -/* EEFA94 80242994 00000000 */ nop -/* EEFA98 80242998 00000000 */ nop -/* EEFA9C 8024299C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s index 0ff7fa0e7b..d57c880bd1 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s +++ b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s @@ -59,7 +59,7 @@ glabel func_80241C90_EF42A0 /* EF4378 80241D68 0240202D */ daddu $a0, $s2, $zero /* EF437C 80241D6C 0260282D */ daddu $a1, $s3, $zero /* EF4380 80241D70 0280302D */ daddu $a2, $s4, $zero -/* EF4384 80241D74 0C090496 */ jal EF2680_UnkFunc5 +/* EF4384 80241D74 0C090496 */ jal EF2680_FlyingAI_Init /* EF4388 80241D78 02C0382D */ daddu $a3, $s6, $zero /* EF438C 80241D7C AE800070 */ sw $zero, 0x70($s4) .L80241D80: @@ -96,7 +96,7 @@ glabel func_80241C90_EF42A0 .L80241DF0: /* EF4400 80241DF0 0280202D */ daddu $a0, $s4, $zero /* EF4404 80241DF4 02C0282D */ daddu $a1, $s6, $zero -/* EF4408 80241DF8 0C09001C */ jal EF2680_UnkNpcAIFunc23 +/* EF4408 80241DF8 0C09001C */ jal EF2680_FlyingAI_WanderInit /* EF440C 80241DFC 02A0302D */ daddu $a2, $s5, $zero .L80241E00: /* EF4410 80241E00 0280202D */ daddu $a0, $s4, $zero @@ -108,7 +108,7 @@ glabel func_80241C90_EF42A0 .L80241E18: /* EF4428 80241E18 0280202D */ daddu $a0, $s4, $zero /* EF442C 80241E1C 02C0282D */ daddu $a1, $s6, $zero -/* EF4430 80241E20 0C090212 */ jal EF2680_UnkNpcAIFunc1 +/* EF4430 80241E20 0C090212 */ jal EF2680_FlyingAI_LoiterInit /* EF4434 80241E24 02A0302D */ daddu $a2, $s5, $zero /* EF4438 80241E28 0280202D */ daddu $a0, $s4, $zero .L80241E2C: @@ -166,18 +166,18 @@ glabel func_80241C90_EF42A0 .L80241EE8: /* EF44F8 80241EE8 0280202D */ daddu $a0, $s4, $zero /* EF44FC 80241EEC 02C0282D */ daddu $a1, $s6, $zero -/* EF4500 80241EF0 0C09034C */ jal EF2680_UnkNpcAIFunc14 +/* EF4500 80241EF0 0C09034C */ jal EF2680_FlyingAI_ChaseInit /* EF4504 80241EF4 02A0302D */ daddu $a2, $s5, $zero .L80241EF8: /* EF4508 80241EF8 0280202D */ daddu $a0, $s4, $zero /* EF450C 80241EFC 02C0282D */ daddu $a1, $s6, $zero -/* EF4510 80241F00 0C090399 */ jal EF2680_UnkNpcAIFunc3 +/* EF4510 80241F00 0C090399 */ jal EF2680_FlyingAI_Chase /* EF4514 80241F04 02A0302D */ daddu $a2, $s5, $zero /* EF4518 80241F08 080907C7 */ j .L80241F1C /* EF451C 80241F0C 00000000 */ nop .L80241F10: /* EF4520 80241F10 02C0282D */ daddu $a1, $s6, $zero -/* EF4524 80241F14 0C0903B2 */ jal EF2680_UnkFunc6 +/* EF4524 80241F14 0C0903B2 */ jal EF2680_FlyingAI_LosePlayer /* EF4528 80241F18 02A0302D */ daddu $a2, $s5, $zero .L80241F1C: /* EF452C 80241F1C 8E830070 */ lw $v1, 0x70($s4) diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s deleted file mode 100644 index f365339fef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s +++ /dev/null @@ -1,341 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel flo_13_func_80241DB8_CC55C8 -/* CC55C8 80241DB8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* CC55CC 80241DBC AFB40050 */ sw $s4, 0x50($sp) -/* CC55D0 80241DC0 0080A02D */ daddu $s4, $a0, $zero -/* CC55D4 80241DC4 AFBF005C */ sw $ra, 0x5c($sp) -/* CC55D8 80241DC8 AFB60058 */ sw $s6, 0x58($sp) -/* CC55DC 80241DCC AFB50054 */ sw $s5, 0x54($sp) -/* CC55E0 80241DD0 AFB3004C */ sw $s3, 0x4c($sp) -/* CC55E4 80241DD4 AFB20048 */ sw $s2, 0x48($sp) -/* CC55E8 80241DD8 AFB10044 */ sw $s1, 0x44($sp) -/* CC55EC 80241DDC AFB00040 */ sw $s0, 0x40($sp) -/* CC55F0 80241DE0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CC55F4 80241DE4 8E930148 */ lw $s3, 0x148($s4) -/* CC55F8 80241DE8 86640008 */ lh $a0, 8($s3) -/* CC55FC 80241DEC 8E90000C */ lw $s0, 0xc($s4) -/* CC5600 80241DF0 0C00EABB */ jal get_npc_unsafe -/* CC5604 80241DF4 00A0882D */ daddu $s1, $a1, $zero -/* CC5608 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* CC560C 80241DFC 8E050000 */ lw $a1, ($s0) -/* CC5610 80241E00 0C0B1EAF */ jal evt_get_variable -/* CC5614 80241E04 0040902D */ daddu $s2, $v0, $zero -/* CC5618 80241E08 AFA00020 */ sw $zero, 0x20($sp) -/* CC561C 80241E0C 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5620 80241E10 8C630030 */ lw $v1, 0x30($v1) -/* CC5624 80241E14 AFA30024 */ sw $v1, 0x24($sp) -/* CC5628 80241E18 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC562C 80241E1C 8C63001C */ lw $v1, 0x1c($v1) -/* CC5630 80241E20 AFA30028 */ sw $v1, 0x28($sp) -/* CC5634 80241E24 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5638 80241E28 8C630024 */ lw $v1, 0x24($v1) -/* CC563C 80241E2C AFA3002C */ sw $v1, 0x2c($sp) -/* CC5640 80241E30 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5644 80241E34 8C630028 */ lw $v1, 0x28($v1) -/* CC5648 80241E38 27B50020 */ addiu $s5, $sp, 0x20 -/* CC564C 80241E3C AFA30030 */ sw $v1, 0x30($sp) -/* CC5650 80241E40 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5654 80241E44 3C0142F0 */ lui $at, 0x42f0 -/* CC5658 80241E48 44810000 */ mtc1 $at, $f0 -/* CC565C 80241E4C 8C63002C */ lw $v1, 0x2c($v1) -/* CC5660 80241E50 0040B02D */ daddu $s6, $v0, $zero -/* CC5664 80241E54 E7A00038 */ swc1 $f0, 0x38($sp) -/* CC5668 80241E58 A7A0003C */ sh $zero, 0x3c($sp) -/* CC566C 80241E5C 12200007 */ beqz $s1, .L80241E7C -/* CC5670 80241E60 AFA30034 */ sw $v1, 0x34($sp) -/* CC5674 80241E64 0240202D */ daddu $a0, $s2, $zero -/* CC5678 80241E68 0260282D */ daddu $a1, $s3, $zero -/* CC567C 80241E6C 0280302D */ daddu $a2, $s4, $zero -/* CC5680 80241E70 0C0904EB */ jal flo_13_UnkFunc5 -/* CC5684 80241E74 02C0382D */ daddu $a3, $s6, $zero -/* CC5688 80241E78 AE800070 */ sw $zero, 0x70($s4) -.L80241E7C: -/* CC568C 80241E7C 2402FFFD */ addiu $v0, $zero, -3 -/* CC5690 80241E80 A24200AB */ sb $v0, 0xab($s2) -/* CC5694 80241E84 8E6300B0 */ lw $v1, 0xb0($s3) -/* CC5698 80241E88 30620004 */ andi $v0, $v1, 4 -/* CC569C 80241E8C 10400007 */ beqz $v0, .L80241EAC -/* CC56A0 80241E90 00000000 */ nop -/* CC56A4 80241E94 826200B4 */ lb $v0, 0xb4($s3) -/* CC56A8 80241E98 144000F4 */ bnez $v0, .L8024226C -/* CC56AC 80241E9C 0000102D */ daddu $v0, $zero, $zero -/* CC56B0 80241EA0 2402FFFB */ addiu $v0, $zero, -5 -/* CC56B4 80241EA4 00621024 */ and $v0, $v1, $v0 -/* CC56B8 80241EA8 AE6200B0 */ sw $v0, 0xb0($s3) -.L80241EAC: -/* CC56BC 80241EAC 8E830070 */ lw $v1, 0x70($s4) -/* CC56C0 80241EB0 24020001 */ addiu $v0, $zero, 1 -/* CC56C4 80241EB4 10620011 */ beq $v1, $v0, .L80241EFC -/* CC56C8 80241EB8 28620002 */ slti $v0, $v1, 2 -/* CC56CC 80241EBC 10400005 */ beqz $v0, .L80241ED4 -/* CC56D0 80241EC0 24020002 */ addiu $v0, $zero, 2 -/* CC56D4 80241EC4 10600009 */ beqz $v1, .L80241EEC -/* CC56D8 80241EC8 2402000C */ addiu $v0, $zero, 0xc -/* CC56DC 80241ECC 080907CF */ j .L80241F3C -/* CC56E0 80241ED0 00000000 */ nop -.L80241ED4: -/* CC56E4 80241ED4 1062000F */ beq $v1, $v0, .L80241F14 -/* CC56E8 80241ED8 24020003 */ addiu $v0, $zero, 3 -/* CC56EC 80241EDC 10620012 */ beq $v1, $v0, .L80241F28 -/* CC56F0 80241EE0 0280202D */ daddu $a0, $s4, $zero -/* CC56F4 80241EE4 080907CD */ j .L80241F34 -/* CC56F8 80241EE8 00000000 */ nop -.L80241EEC: -/* CC56FC 80241EEC 0280202D */ daddu $a0, $s4, $zero -/* CC5700 80241EF0 02C0282D */ daddu $a1, $s6, $zero -/* CC5704 80241EF4 0C090071 */ jal flo_13_UnkNpcAIFunc23 -/* CC5708 80241EF8 02A0302D */ daddu $a2, $s5, $zero -.L80241EFC: -/* CC570C 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* CC5710 80241F00 02C0282D */ daddu $a1, $s6, $zero -/* CC5714 80241F04 0C0905C1 */ jal flo_13_func_80241704_CC4F14 -/* CC5718 80241F08 02A0302D */ daddu $a2, $s5, $zero -/* CC571C 80241F0C 080907CD */ j .L80241F34 -/* CC5720 80241F10 00000000 */ nop -.L80241F14: -/* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero -/* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero -/* CC572C 80241F1C 0C090267 */ jal flo_13_UnkNpcAIFunc1_copy -/* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero -/* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero -.L80241F28: -/* CC5738 80241F28 02C0282D */ daddu $a1, $s6, $zero -/* CC573C 80241F2C 0C0906DA */ jal flo_13_func_80241B68_CC5378 -/* CC5740 80241F30 02A0302D */ daddu $a2, $s5, $zero -.L80241F34: -/* CC5744 80241F34 8E830070 */ lw $v1, 0x70($s4) -/* CC5748 80241F38 2402000C */ addiu $v0, $zero, 0xc -.L80241F3C: -/* CC574C 80241F3C 1462001A */ bne $v1, $v0, .L80241FA8 -/* CC5750 80241F40 00000000 */ nop -/* CC5754 80241F44 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CC5758 80241F48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC575C 80241F4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC5760 80241F50 C64E0040 */ lwc1 $f14, 0x40($s2) -/* CC5764 80241F54 8C460028 */ lw $a2, 0x28($v0) -/* CC5768 80241F58 0C00A720 */ jal atan2 -/* CC576C 80241F5C 8C470030 */ lw $a3, 0x30($v0) -/* CC5770 80241F60 0C0905AF */ jal flo_13_func_802416BC_CC4ECC -/* CC5774 80241F64 E640000C */ swc1 $f0, 0xc($s2) -/* CC5778 80241F68 0440000F */ bltz $v0, .L80241FA8 -/* CC577C 80241F6C AE62007C */ sw $v0, 0x7c($s3) -/* CC5780 80241F70 0C00FB3A */ jal get_enemy -/* CC5784 80241F74 0040202D */ daddu $a0, $v0, $zero -/* CC5788 80241F78 3C030049 */ lui $v1, 0x49 -/* CC578C 80241F7C 0040202D */ daddu $a0, $v0, $zero -/* CC5790 80241F80 24020001 */ addiu $v0, $zero, 1 -/* CC5794 80241F84 AC820094 */ sw $v0, 0x94($a0) -/* CC5798 80241F88 86620008 */ lh $v0, 8($s3) -/* CC579C 80241F8C 34630014 */ ori $v1, $v1, 0x14 -/* CC57A0 80241F90 AC820098 */ sw $v0, 0x98($a0) -/* CC57A4 80241F94 2402000F */ addiu $v0, $zero, 0xf -/* CC57A8 80241F98 A642008E */ sh $v0, 0x8e($s2) -/* CC57AC 80241F9C 2402001E */ addiu $v0, $zero, 0x1e -/* CC57B0 80241FA0 AE430028 */ sw $v1, 0x28($s2) -/* CC57B4 80241FA4 AE820070 */ sw $v0, 0x70($s4) -.L80241FA8: -/* CC57B8 80241FA8 8E830070 */ lw $v1, 0x70($s4) -/* CC57BC 80241FAC 2402000D */ addiu $v0, $zero, 0xd -/* CC57C0 80241FB0 10620010 */ beq $v1, $v0, .L80241FF4 -/* CC57C4 80241FB4 2862000E */ slti $v0, $v1, 0xe -/* CC57C8 80241FB8 10400005 */ beqz $v0, .L80241FD0 -/* CC57CC 80241FBC 2402000C */ addiu $v0, $zero, 0xc -/* CC57D0 80241FC0 10620008 */ beq $v1, $v0, .L80241FE4 -/* CC57D4 80241FC4 2410001F */ addiu $s0, $zero, 0x1f -/* CC57D8 80241FC8 08090808 */ j .L80242020 -/* CC57DC 80241FCC 00000000 */ nop -.L80241FD0: -/* CC57E0 80241FD0 2402000E */ addiu $v0, $zero, 0xe -/* CC57E4 80241FD4 1062000D */ beq $v1, $v0, .L8024200C -/* CC57E8 80241FD8 0280202D */ daddu $a0, $s4, $zero -/* CC57EC 80241FDC 08090806 */ j .L80242018 -/* CC57F0 80241FE0 00000000 */ nop -.L80241FE4: -/* CC57F4 80241FE4 0280202D */ daddu $a0, $s4, $zero -/* CC57F8 80241FE8 02C0282D */ daddu $a1, $s6, $zero -/* CC57FC 80241FEC 0C0903A1 */ jal flo_13_UnkNpcAIFunc14 -/* CC5800 80241FF0 02A0302D */ daddu $a2, $s5, $zero -.L80241FF4: -/* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero -/* CC5808 80241FF8 02C0282D */ daddu $a1, $s6, $zero -/* CC580C 80241FFC 0C0903EE */ jal flo_13_UnkNpcAIFunc3 -/* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero -/* CC5814 80242004 08090806 */ j .L80242018 -/* CC5818 80242008 00000000 */ nop -.L8024200C: -/* CC581C 8024200C 02C0282D */ daddu $a1, $s6, $zero -/* CC5820 80242010 0C090407 */ jal flo_13_UnkFunc6 -/* CC5824 80242014 02A0302D */ daddu $a2, $s5, $zero -.L80242018: -/* CC5828 80242018 8E830070 */ lw $v1, 0x70($s4) -/* CC582C 8024201C 2410001F */ addiu $s0, $zero, 0x1f -.L80242020: -/* CC5830 80242020 1070001B */ beq $v1, $s0, .L80242090 -/* CC5834 80242024 28620020 */ slti $v0, $v1, 0x20 -/* CC5838 80242028 10400005 */ beqz $v0, .L80242040 -/* CC583C 8024202C 2402001E */ addiu $v0, $zero, 0x1e -/* CC5840 80242030 1062000A */ beq $v1, $v0, .L8024205C -/* CC5844 80242034 00000000 */ nop -/* CC5848 80242038 08090843 */ j .L8024210C -/* CC584C 8024203C 00000000 */ nop -.L80242040: -/* CC5850 80242040 24020020 */ addiu $v0, $zero, 0x20 -/* CC5854 80242044 10620022 */ beq $v1, $v0, .L802420D0 -/* CC5858 80242048 24020021 */ addiu $v0, $zero, 0x21 -/* CC585C 8024204C 10620029 */ beq $v1, $v0, .L802420F4 -/* CC5860 80242050 00000000 */ nop -/* CC5864 80242054 08090843 */ j .L8024210C -/* CC5868 80242058 00000000 */ nop -.L8024205C: -/* CC586C 8024205C 9642008E */ lhu $v0, 0x8e($s2) -/* CC5870 80242060 2442FFFF */ addiu $v0, $v0, -1 -/* CC5874 80242064 A642008E */ sh $v0, 0x8e($s2) -/* CC5878 80242068 00021400 */ sll $v0, $v0, 0x10 -/* CC587C 8024206C 1C400027 */ bgtz $v0, .L8024210C -/* CC5880 80242070 00000000 */ nop -/* CC5884 80242074 0C00FB3A */ jal get_enemy -/* CC5888 80242078 8E64007C */ lw $a0, 0x7c($s3) -/* CC588C 8024207C 24030002 */ addiu $v1, $zero, 2 -/* CC5890 80242080 AC430094 */ sw $v1, 0x94($v0) -/* CC5894 80242084 24020005 */ addiu $v0, $zero, 5 -/* CC5898 80242088 A642008E */ sh $v0, 0x8e($s2) -/* CC589C 8024208C AE900070 */ sw $s0, 0x70($s4) -.L80242090: -/* CC58A0 80242090 9642008E */ lhu $v0, 0x8e($s2) -/* CC58A4 80242094 2442FFFF */ addiu $v0, $v0, -1 -/* CC58A8 80242098 A642008E */ sh $v0, 0x8e($s2) -/* CC58AC 8024209C 00021400 */ sll $v0, $v0, 0x10 -/* CC58B0 802420A0 1C40001A */ bgtz $v0, .L8024210C -/* CC58B4 802420A4 3C020049 */ lui $v0, 0x49 -/* CC58B8 802420A8 34420015 */ ori $v0, $v0, 0x15 -/* CC58BC 802420AC AE420028 */ sw $v0, 0x28($s2) -/* CC58C0 802420B0 0C00FB3A */ jal get_enemy -/* CC58C4 802420B4 8E64007C */ lw $a0, 0x7c($s3) -/* CC58C8 802420B8 24030003 */ addiu $v1, $zero, 3 -/* CC58CC 802420BC AC430094 */ sw $v1, 0x94($v0) -/* CC58D0 802420C0 2402000A */ addiu $v0, $zero, 0xa -/* CC58D4 802420C4 A642008E */ sh $v0, 0x8e($s2) -/* CC58D8 802420C8 24020020 */ addiu $v0, $zero, 0x20 -/* CC58DC 802420CC AE820070 */ sw $v0, 0x70($s4) -.L802420D0: -/* CC58E0 802420D0 9642008E */ lhu $v0, 0x8e($s2) -/* CC58E4 802420D4 2442FFFF */ addiu $v0, $v0, -1 -/* CC58E8 802420D8 A642008E */ sh $v0, 0x8e($s2) -/* CC58EC 802420DC 00021400 */ sll $v0, $v0, 0x10 -/* CC58F0 802420E0 1C40000A */ bgtz $v0, .L8024210C -/* CC58F4 802420E4 24020003 */ addiu $v0, $zero, 3 -/* CC58F8 802420E8 A642008E */ sh $v0, 0x8e($s2) -/* CC58FC 802420EC 24020021 */ addiu $v0, $zero, 0x21 -/* CC5900 802420F0 AE820070 */ sw $v0, 0x70($s4) -.L802420F4: -/* CC5904 802420F4 9642008E */ lhu $v0, 0x8e($s2) -/* CC5908 802420F8 2442FFFF */ addiu $v0, $v0, -1 -/* CC590C 802420FC A642008E */ sh $v0, 0x8e($s2) -/* CC5910 80242100 00021400 */ sll $v0, $v0, 0x10 -/* CC5914 80242104 58400001 */ blezl $v0, .L8024210C -/* CC5918 80242108 AE800070 */ sw $zero, 0x70($s4) -.L8024210C: -/* CC591C 8024210C 8E820070 */ lw $v0, 0x70($s4) -/* CC5920 80242110 2442FFE2 */ addiu $v0, $v0, -0x1e -/* CC5924 80242114 2C420002 */ sltiu $v0, $v0, 2 -/* CC5928 80242118 10400054 */ beqz $v0, .L8024226C -/* CC592C 8024211C 0000102D */ daddu $v0, $zero, $zero -/* CC5930 80242120 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* CC5934 80242124 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* CC5938 80242128 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CC593C 8024212C 8E020000 */ lw $v0, ($s0) -/* CC5940 80242130 C64E0040 */ lwc1 $f14, 0x40($s2) -/* CC5944 80242134 8C460028 */ lw $a2, 0x28($v0) -/* CC5948 80242138 0C00A720 */ jal atan2 -/* CC594C 8024213C 8C470030 */ lw $a3, 0x30($v0) -/* CC5950 80242140 8E460038 */ lw $a2, 0x38($s2) -/* CC5954 80242144 8E470040 */ lw $a3, 0x40($s2) -/* CC5958 80242148 8E020000 */ lw $v0, ($s0) -/* CC595C 8024214C E640000C */ swc1 $f0, 0xc($s2) -/* CC5960 80242150 C44C0028 */ lwc1 $f12, 0x28($v0) -/* CC5964 80242154 0C00A7B5 */ jal dist2D -/* CC5968 80242158 C44E0030 */ lwc1 $f14, 0x30($v0) -/* CC596C 8024215C C6A20008 */ lwc1 $f2, 8($s5) -/* CC5970 80242160 468010A0 */ cvt.s.w $f2, $f2 -/* CC5974 80242164 44051000 */ mfc1 $a1, $f2 -/* CC5978 80242168 C6A2000C */ lwc1 $f2, 0xc($s5) -/* CC597C 8024216C 468010A0 */ cvt.s.w $f2, $f2 -/* CC5980 80242170 44061000 */ mfc1 $a2, $f2 -/* CC5984 80242174 C6420040 */ lwc1 $f2, 0x40($s2) -/* CC5988 80242178 E7A20010 */ swc1 $f2, 0x10($sp) -/* CC598C 8024217C C6A20010 */ lwc1 $f2, 0x10($s5) -/* CC5990 80242180 468010A0 */ cvt.s.w $f2, $f2 -/* CC5994 80242184 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC5998 80242188 C6A20014 */ lwc1 $f2, 0x14($s5) -/* CC599C 8024218C 468010A0 */ cvt.s.w $f2, $f2 -/* CC59A0 80242190 E7A20018 */ swc1 $f2, 0x18($sp) -/* CC59A4 80242194 8EA40004 */ lw $a0, 4($s5) -/* CC59A8 80242198 8E470038 */ lw $a3, 0x38($s2) -/* CC59AC 8024219C 0C0123F5 */ jal is_point_within_region -/* CC59B0 802421A0 46000506 */ mov.s $f20, $f0 -/* CC59B4 802421A4 14400031 */ bnez $v0, .L8024226C -/* CC59B8 802421A8 0000102D */ daddu $v0, $zero, $zero -/* CC59BC 802421AC 3C01403E */ lui $at, 0x403e -/* CC59C0 802421B0 44810800 */ mtc1 $at, $f1 -/* CC59C4 802421B4 44800000 */ mtc1 $zero, $f0 -/* CC59C8 802421B8 4600A0A1 */ cvt.d.s $f2, $f20 -/* CC59CC 802421BC 4622003C */ c.lt.d $f0, $f2 -/* CC59D0 802421C0 00000000 */ nop -/* CC59D4 802421C4 45000029 */ bc1f .L8024226C -/* CC59D8 802421C8 00000000 */ nop -/* CC59DC 802421CC 8642008C */ lh $v0, 0x8c($s2) -/* CC59E0 802421D0 54400026 */ bnel $v0, $zero, .L8024226C -/* CC59E4 802421D4 0000102D */ daddu $v0, $zero, $zero -/* CC59E8 802421D8 3C014034 */ lui $at, 0x4034 -/* CC59EC 802421DC 44810800 */ mtc1 $at, $f1 -/* CC59F0 802421E0 44800000 */ mtc1 $zero, $f0 -/* CC59F4 802421E4 00000000 */ nop -/* CC59F8 802421E8 46201001 */ sub.d $f0, $f2, $f0 -/* CC59FC 802421EC 44801000 */ mtc1 $zero, $f2 -/* CC5A00 802421F0 44801800 */ mtc1 $zero, $f3 -/* CC5A04 802421F4 46200120 */ cvt.s.d $f4, $f0 -/* CC5A08 802421F8 46002021 */ cvt.d.s $f0, $f4 -/* CC5A0C 802421FC 4622003C */ c.lt.d $f0, $f2 -/* CC5A10 80242200 00000000 */ nop -/* CC5A14 80242204 45000002 */ bc1f .L80242210 -/* CC5A18 80242208 00000000 */ nop -/* CC5A1C 8024220C 44802000 */ mtc1 $zero, $f4 -.L80242210: -/* CC5A20 80242210 3C014069 */ lui $at, 0x4069 -/* CC5A24 80242214 44811800 */ mtc1 $at, $f3 -/* CC5A28 80242218 44801000 */ mtc1 $zero, $f2 -/* CC5A2C 8024221C 46002021 */ cvt.d.s $f0, $f4 -/* CC5A30 80242220 4620103C */ c.lt.d $f2, $f0 -/* CC5A34 80242224 00000000 */ nop -/* CC5A38 80242228 45000003 */ bc1f .L80242238 -/* CC5A3C 8024222C 240200C8 */ addiu $v0, $zero, 0xc8 -/* CC5A40 80242230 3C014348 */ lui $at, 0x4348 -/* CC5A44 80242234 44812000 */ mtc1 $at, $f4 -.L80242238: -/* CC5A48 80242238 AFA20010 */ sw $v0, 0x10($sp) -/* CC5A4C 8024223C 8EC50000 */ lw $a1, ($s6) -/* CC5A50 80242240 8EC60018 */ lw $a2, 0x18($s6) -/* CC5A54 80242244 4600218D */ trunc.w.s $f6, $f4 -/* CC5A58 80242248 44073000 */ mfc1 $a3, $f6 -/* CC5A5C 8024224C 0C00A8ED */ jal update_lerp -/* CC5A60 80242250 0000202D */ daddu $a0, $zero, $zero -/* CC5A64 80242254 44050000 */ mfc1 $a1, $f0 -/* CC5A68 80242258 8E46000C */ lw $a2, 0xc($s2) -/* CC5A6C 8024225C 0240202D */ daddu $a0, $s2, $zero -/* CC5A70 80242260 0C00EA95 */ jal npc_move_heading -/* CC5A74 80242264 AC850018 */ sw $a1, 0x18($a0) -/* CC5A78 80242268 0000102D */ daddu $v0, $zero, $zero -.L8024226C: -/* CC5A7C 8024226C 8FBF005C */ lw $ra, 0x5c($sp) -/* CC5A80 80242270 8FB60058 */ lw $s6, 0x58($sp) -/* CC5A84 80242274 8FB50054 */ lw $s5, 0x54($sp) -/* CC5A88 80242278 8FB40050 */ lw $s4, 0x50($sp) -/* CC5A8C 8024227C 8FB3004C */ lw $s3, 0x4c($sp) -/* CC5A90 80242280 8FB20048 */ lw $s2, 0x48($sp) -/* CC5A94 80242284 8FB10044 */ lw $s1, 0x44($sp) -/* CC5A98 80242288 8FB00040 */ lw $s0, 0x40($sp) -/* CC5A9C 8024228C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CC5AA0 80242290 03E00008 */ jr $ra -/* CC5AA4 80242294 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s deleted file mode 100644 index 30ebddde52..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s +++ /dev/null @@ -1,341 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel flo_17_func_80241C64_CD8F44 -/* CD8F44 80241C64 27BDFF98 */ addiu $sp, $sp, -0x68 -/* CD8F48 80241C68 AFB40050 */ sw $s4, 0x50($sp) -/* CD8F4C 80241C6C 0080A02D */ daddu $s4, $a0, $zero -/* CD8F50 80241C70 AFBF005C */ sw $ra, 0x5c($sp) -/* CD8F54 80241C74 AFB60058 */ sw $s6, 0x58($sp) -/* CD8F58 80241C78 AFB50054 */ sw $s5, 0x54($sp) -/* CD8F5C 80241C7C AFB3004C */ sw $s3, 0x4c($sp) -/* CD8F60 80241C80 AFB20048 */ sw $s2, 0x48($sp) -/* CD8F64 80241C84 AFB10044 */ sw $s1, 0x44($sp) -/* CD8F68 80241C88 AFB00040 */ sw $s0, 0x40($sp) -/* CD8F6C 80241C8C F7B40060 */ sdc1 $f20, 0x60($sp) -/* CD8F70 80241C90 8E930148 */ lw $s3, 0x148($s4) -/* CD8F74 80241C94 86640008 */ lh $a0, 8($s3) -/* CD8F78 80241C98 8E90000C */ lw $s0, 0xc($s4) -/* CD8F7C 80241C9C 0C00EABB */ jal get_npc_unsafe -/* CD8F80 80241CA0 00A0882D */ daddu $s1, $a1, $zero -/* CD8F84 80241CA4 0280202D */ daddu $a0, $s4, $zero -/* CD8F88 80241CA8 8E050000 */ lw $a1, ($s0) -/* CD8F8C 80241CAC 0C0B1EAF */ jal evt_get_variable -/* CD8F90 80241CB0 0040902D */ daddu $s2, $v0, $zero -/* CD8F94 80241CB4 AFA00020 */ sw $zero, 0x20($sp) -/* CD8F98 80241CB8 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8F9C 80241CBC 8C630030 */ lw $v1, 0x30($v1) -/* CD8FA0 80241CC0 AFA30024 */ sw $v1, 0x24($sp) -/* CD8FA4 80241CC4 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FA8 80241CC8 8C63001C */ lw $v1, 0x1c($v1) -/* CD8FAC 80241CCC AFA30028 */ sw $v1, 0x28($sp) -/* CD8FB0 80241CD0 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FB4 80241CD4 8C630024 */ lw $v1, 0x24($v1) -/* CD8FB8 80241CD8 AFA3002C */ sw $v1, 0x2c($sp) -/* CD8FBC 80241CDC 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FC0 80241CE0 8C630028 */ lw $v1, 0x28($v1) -/* CD8FC4 80241CE4 27B50020 */ addiu $s5, $sp, 0x20 -/* CD8FC8 80241CE8 AFA30030 */ sw $v1, 0x30($sp) -/* CD8FCC 80241CEC 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FD0 80241CF0 3C0142F0 */ lui $at, 0x42f0 -/* CD8FD4 80241CF4 44810000 */ mtc1 $at, $f0 -/* CD8FD8 80241CF8 8C63002C */ lw $v1, 0x2c($v1) -/* CD8FDC 80241CFC 0040B02D */ daddu $s6, $v0, $zero -/* CD8FE0 80241D00 E7A00038 */ swc1 $f0, 0x38($sp) -/* CD8FE4 80241D04 A7A0003C */ sh $zero, 0x3c($sp) -/* CD8FE8 80241D08 12200007 */ beqz $s1, .L80241D28 -/* CD8FEC 80241D0C AFA30034 */ sw $v1, 0x34($sp) -/* CD8FF0 80241D10 0240202D */ daddu $a0, $s2, $zero -/* CD8FF4 80241D14 0260282D */ daddu $a1, $s3, $zero -/* CD8FF8 80241D18 0280302D */ daddu $a2, $s4, $zero -/* CD8FFC 80241D1C 0C090496 */ jal flo_17_UnkFunc5 -/* CD9000 80241D20 02C0382D */ daddu $a3, $s6, $zero -/* CD9004 80241D24 AE800070 */ sw $zero, 0x70($s4) -.L80241D28: -/* CD9008 80241D28 2402FFFD */ addiu $v0, $zero, -3 -/* CD900C 80241D2C A24200AB */ sb $v0, 0xab($s2) -/* CD9010 80241D30 8E6300B0 */ lw $v1, 0xb0($s3) -/* CD9014 80241D34 30620004 */ andi $v0, $v1, 4 -/* CD9018 80241D38 10400007 */ beqz $v0, .L80241D58 -/* CD901C 80241D3C 00000000 */ nop -/* CD9020 80241D40 826200B4 */ lb $v0, 0xb4($s3) -/* CD9024 80241D44 144000F4 */ bnez $v0, .L80242118 -/* CD9028 80241D48 0000102D */ daddu $v0, $zero, $zero -/* CD902C 80241D4C 2402FFFB */ addiu $v0, $zero, -5 -/* CD9030 80241D50 00621024 */ and $v0, $v1, $v0 -/* CD9034 80241D54 AE6200B0 */ sw $v0, 0xb0($s3) -.L80241D58: -/* CD9038 80241D58 8E830070 */ lw $v1, 0x70($s4) -/* CD903C 80241D5C 24020001 */ addiu $v0, $zero, 1 -/* CD9040 80241D60 10620011 */ beq $v1, $v0, .L80241DA8 -/* CD9044 80241D64 28620002 */ slti $v0, $v1, 2 -/* CD9048 80241D68 10400005 */ beqz $v0, .L80241D80 -/* CD904C 80241D6C 24020002 */ addiu $v0, $zero, 2 -/* CD9050 80241D70 10600009 */ beqz $v1, .L80241D98 -/* CD9054 80241D74 2402000C */ addiu $v0, $zero, 0xc -/* CD9058 80241D78 0809077A */ j .L80241DE8 -/* CD905C 80241D7C 00000000 */ nop -.L80241D80: -/* CD9060 80241D80 1062000F */ beq $v1, $v0, .L80241DC0 -/* CD9064 80241D84 24020003 */ addiu $v0, $zero, 3 -/* CD9068 80241D88 10620012 */ beq $v1, $v0, .L80241DD4 -/* CD906C 80241D8C 0280202D */ daddu $a0, $s4, $zero -/* CD9070 80241D90 08090778 */ j .L80241DE0 -/* CD9074 80241D94 00000000 */ nop -.L80241D98: -/* CD9078 80241D98 0280202D */ daddu $a0, $s4, $zero -/* CD907C 80241D9C 02C0282D */ daddu $a1, $s6, $zero -/* CD9080 80241DA0 0C09001C */ jal flo_17_UnkNpcAIFunc23 -/* CD9084 80241DA4 02A0302D */ daddu $a2, $s5, $zero -.L80241DA8: -/* CD9088 80241DA8 0280202D */ daddu $a0, $s4, $zero -/* CD908C 80241DAC 02C0282D */ daddu $a1, $s6, $zero -/* CD9090 80241DB0 0C09056C */ jal flo_17_func_802415B0_CD8890 -/* CD9094 80241DB4 02A0302D */ daddu $a2, $s5, $zero -/* CD9098 80241DB8 08090778 */ j .L80241DE0 -/* CD909C 80241DBC 00000000 */ nop -.L80241DC0: -/* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero -/* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero -/* CD90A8 80241DC8 0C090212 */ jal flo_17_UnkNpcAIFunc1_copy -/* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero -/* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero -.L80241DD4: -/* CD90B4 80241DD4 02C0282D */ daddu $a1, $s6, $zero -/* CD90B8 80241DD8 0C090685 */ jal flo_17_func_80241A14_CD8CF4 -/* CD90BC 80241DDC 02A0302D */ daddu $a2, $s5, $zero -.L80241DE0: -/* CD90C0 80241DE0 8E830070 */ lw $v1, 0x70($s4) -/* CD90C4 80241DE4 2402000C */ addiu $v0, $zero, 0xc -.L80241DE8: -/* CD90C8 80241DE8 1462001A */ bne $v1, $v0, .L80241E54 -/* CD90CC 80241DEC 00000000 */ nop -/* CD90D0 80241DF0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CD90D4 80241DF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD90D8 80241DF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD90DC 80241DFC C64E0040 */ lwc1 $f14, 0x40($s2) -/* CD90E0 80241E00 8C460028 */ lw $a2, 0x28($v0) -/* CD90E4 80241E04 0C00A720 */ jal atan2 -/* CD90E8 80241E08 8C470030 */ lw $a3, 0x30($v0) -/* CD90EC 80241E0C 0C09055A */ jal flo_17_func_80241568_CD8848 -/* CD90F0 80241E10 E640000C */ swc1 $f0, 0xc($s2) -/* CD90F4 80241E14 0440000F */ bltz $v0, .L80241E54 -/* CD90F8 80241E18 AE62007C */ sw $v0, 0x7c($s3) -/* CD90FC 80241E1C 0C00FB3A */ jal get_enemy -/* CD9100 80241E20 0040202D */ daddu $a0, $v0, $zero -/* CD9104 80241E24 3C030049 */ lui $v1, 0x49 -/* CD9108 80241E28 0040202D */ daddu $a0, $v0, $zero -/* CD910C 80241E2C 24020001 */ addiu $v0, $zero, 1 -/* CD9110 80241E30 AC820094 */ sw $v0, 0x94($a0) -/* CD9114 80241E34 86620008 */ lh $v0, 8($s3) -/* CD9118 80241E38 34630014 */ ori $v1, $v1, 0x14 -/* CD911C 80241E3C AC820098 */ sw $v0, 0x98($a0) -/* CD9120 80241E40 2402000F */ addiu $v0, $zero, 0xf -/* CD9124 80241E44 A642008E */ sh $v0, 0x8e($s2) -/* CD9128 80241E48 2402001E */ addiu $v0, $zero, 0x1e -/* CD912C 80241E4C AE430028 */ sw $v1, 0x28($s2) -/* CD9130 80241E50 AE820070 */ sw $v0, 0x70($s4) -.L80241E54: -/* CD9134 80241E54 8E830070 */ lw $v1, 0x70($s4) -/* CD9138 80241E58 2402000D */ addiu $v0, $zero, 0xd -/* CD913C 80241E5C 10620010 */ beq $v1, $v0, .L80241EA0 -/* CD9140 80241E60 2862000E */ slti $v0, $v1, 0xe -/* CD9144 80241E64 10400005 */ beqz $v0, .L80241E7C -/* CD9148 80241E68 2402000C */ addiu $v0, $zero, 0xc -/* CD914C 80241E6C 10620008 */ beq $v1, $v0, .L80241E90 -/* CD9150 80241E70 2410001F */ addiu $s0, $zero, 0x1f -/* CD9154 80241E74 080907B3 */ j .L80241ECC -/* CD9158 80241E78 00000000 */ nop -.L80241E7C: -/* CD915C 80241E7C 2402000E */ addiu $v0, $zero, 0xe -/* CD9160 80241E80 1062000D */ beq $v1, $v0, .L80241EB8 -/* CD9164 80241E84 0280202D */ daddu $a0, $s4, $zero -/* CD9168 80241E88 080907B1 */ j .L80241EC4 -/* CD916C 80241E8C 00000000 */ nop -.L80241E90: -/* CD9170 80241E90 0280202D */ daddu $a0, $s4, $zero -/* CD9174 80241E94 02C0282D */ daddu $a1, $s6, $zero -/* CD9178 80241E98 0C09034C */ jal flo_17_UnkNpcAIFunc14 -/* CD917C 80241E9C 02A0302D */ daddu $a2, $s5, $zero -.L80241EA0: -/* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero -/* CD9184 80241EA4 02C0282D */ daddu $a1, $s6, $zero -/* CD9188 80241EA8 0C090399 */ jal flo_17_UnkNpcAIFunc3 -/* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero -/* CD9190 80241EB0 080907B1 */ j .L80241EC4 -/* CD9194 80241EB4 00000000 */ nop -.L80241EB8: -/* CD9198 80241EB8 02C0282D */ daddu $a1, $s6, $zero -/* CD919C 80241EBC 0C0903B2 */ jal flo_17_UnkFunc6 -/* CD91A0 80241EC0 02A0302D */ daddu $a2, $s5, $zero -.L80241EC4: -/* CD91A4 80241EC4 8E830070 */ lw $v1, 0x70($s4) -/* CD91A8 80241EC8 2410001F */ addiu $s0, $zero, 0x1f -.L80241ECC: -/* CD91AC 80241ECC 1070001B */ beq $v1, $s0, .L80241F3C -/* CD91B0 80241ED0 28620020 */ slti $v0, $v1, 0x20 -/* CD91B4 80241ED4 10400005 */ beqz $v0, .L80241EEC -/* CD91B8 80241ED8 2402001E */ addiu $v0, $zero, 0x1e -/* CD91BC 80241EDC 1062000A */ beq $v1, $v0, .L80241F08 -/* CD91C0 80241EE0 00000000 */ nop -/* CD91C4 80241EE4 080907EE */ j .L80241FB8 -/* CD91C8 80241EE8 00000000 */ nop -.L80241EEC: -/* CD91CC 80241EEC 24020020 */ addiu $v0, $zero, 0x20 -/* CD91D0 80241EF0 10620022 */ beq $v1, $v0, .L80241F7C -/* CD91D4 80241EF4 24020021 */ addiu $v0, $zero, 0x21 -/* CD91D8 80241EF8 10620029 */ beq $v1, $v0, .L80241FA0 -/* CD91DC 80241EFC 00000000 */ nop -/* CD91E0 80241F00 080907EE */ j .L80241FB8 -/* CD91E4 80241F04 00000000 */ nop -.L80241F08: -/* CD91E8 80241F08 9642008E */ lhu $v0, 0x8e($s2) -/* CD91EC 80241F0C 2442FFFF */ addiu $v0, $v0, -1 -/* CD91F0 80241F10 A642008E */ sh $v0, 0x8e($s2) -/* CD91F4 80241F14 00021400 */ sll $v0, $v0, 0x10 -/* CD91F8 80241F18 1C400027 */ bgtz $v0, .L80241FB8 -/* CD91FC 80241F1C 00000000 */ nop -/* CD9200 80241F20 0C00FB3A */ jal get_enemy -/* CD9204 80241F24 8E64007C */ lw $a0, 0x7c($s3) -/* CD9208 80241F28 24030002 */ addiu $v1, $zero, 2 -/* CD920C 80241F2C AC430094 */ sw $v1, 0x94($v0) -/* CD9210 80241F30 24020005 */ addiu $v0, $zero, 5 -/* CD9214 80241F34 A642008E */ sh $v0, 0x8e($s2) -/* CD9218 80241F38 AE900070 */ sw $s0, 0x70($s4) -.L80241F3C: -/* CD921C 80241F3C 9642008E */ lhu $v0, 0x8e($s2) -/* CD9220 80241F40 2442FFFF */ addiu $v0, $v0, -1 -/* CD9224 80241F44 A642008E */ sh $v0, 0x8e($s2) -/* CD9228 80241F48 00021400 */ sll $v0, $v0, 0x10 -/* CD922C 80241F4C 1C40001A */ bgtz $v0, .L80241FB8 -/* CD9230 80241F50 3C020049 */ lui $v0, 0x49 -/* CD9234 80241F54 34420015 */ ori $v0, $v0, 0x15 -/* CD9238 80241F58 AE420028 */ sw $v0, 0x28($s2) -/* CD923C 80241F5C 0C00FB3A */ jal get_enemy -/* CD9240 80241F60 8E64007C */ lw $a0, 0x7c($s3) -/* CD9244 80241F64 24030003 */ addiu $v1, $zero, 3 -/* CD9248 80241F68 AC430094 */ sw $v1, 0x94($v0) -/* CD924C 80241F6C 2402000A */ addiu $v0, $zero, 0xa -/* CD9250 80241F70 A642008E */ sh $v0, 0x8e($s2) -/* CD9254 80241F74 24020020 */ addiu $v0, $zero, 0x20 -/* CD9258 80241F78 AE820070 */ sw $v0, 0x70($s4) -.L80241F7C: -/* CD925C 80241F7C 9642008E */ lhu $v0, 0x8e($s2) -/* CD9260 80241F80 2442FFFF */ addiu $v0, $v0, -1 -/* CD9264 80241F84 A642008E */ sh $v0, 0x8e($s2) -/* CD9268 80241F88 00021400 */ sll $v0, $v0, 0x10 -/* CD926C 80241F8C 1C40000A */ bgtz $v0, .L80241FB8 -/* CD9270 80241F90 24020003 */ addiu $v0, $zero, 3 -/* CD9274 80241F94 A642008E */ sh $v0, 0x8e($s2) -/* CD9278 80241F98 24020021 */ addiu $v0, $zero, 0x21 -/* CD927C 80241F9C AE820070 */ sw $v0, 0x70($s4) -.L80241FA0: -/* CD9280 80241FA0 9642008E */ lhu $v0, 0x8e($s2) -/* CD9284 80241FA4 2442FFFF */ addiu $v0, $v0, -1 -/* CD9288 80241FA8 A642008E */ sh $v0, 0x8e($s2) -/* CD928C 80241FAC 00021400 */ sll $v0, $v0, 0x10 -/* CD9290 80241FB0 58400001 */ blezl $v0, .L80241FB8 -/* CD9294 80241FB4 AE800070 */ sw $zero, 0x70($s4) -.L80241FB8: -/* CD9298 80241FB8 8E820070 */ lw $v0, 0x70($s4) -/* CD929C 80241FBC 2442FFE2 */ addiu $v0, $v0, -0x1e -/* CD92A0 80241FC0 2C420002 */ sltiu $v0, $v0, 2 -/* CD92A4 80241FC4 10400054 */ beqz $v0, .L80242118 -/* CD92A8 80241FC8 0000102D */ daddu $v0, $zero, $zero -/* CD92AC 80241FCC 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* CD92B0 80241FD0 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* CD92B4 80241FD4 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CD92B8 80241FD8 8E020000 */ lw $v0, ($s0) -/* CD92BC 80241FDC C64E0040 */ lwc1 $f14, 0x40($s2) -/* CD92C0 80241FE0 8C460028 */ lw $a2, 0x28($v0) -/* CD92C4 80241FE4 0C00A720 */ jal atan2 -/* CD92C8 80241FE8 8C470030 */ lw $a3, 0x30($v0) -/* CD92CC 80241FEC 8E460038 */ lw $a2, 0x38($s2) -/* CD92D0 80241FF0 8E470040 */ lw $a3, 0x40($s2) -/* CD92D4 80241FF4 8E020000 */ lw $v0, ($s0) -/* CD92D8 80241FF8 E640000C */ swc1 $f0, 0xc($s2) -/* CD92DC 80241FFC C44C0028 */ lwc1 $f12, 0x28($v0) -/* CD92E0 80242000 0C00A7B5 */ jal dist2D -/* CD92E4 80242004 C44E0030 */ lwc1 $f14, 0x30($v0) -/* CD92E8 80242008 C6A20008 */ lwc1 $f2, 8($s5) -/* CD92EC 8024200C 468010A0 */ cvt.s.w $f2, $f2 -/* CD92F0 80242010 44051000 */ mfc1 $a1, $f2 -/* CD92F4 80242014 C6A2000C */ lwc1 $f2, 0xc($s5) -/* CD92F8 80242018 468010A0 */ cvt.s.w $f2, $f2 -/* CD92FC 8024201C 44061000 */ mfc1 $a2, $f2 -/* CD9300 80242020 C6420040 */ lwc1 $f2, 0x40($s2) -/* CD9304 80242024 E7A20010 */ swc1 $f2, 0x10($sp) -/* CD9308 80242028 C6A20010 */ lwc1 $f2, 0x10($s5) -/* CD930C 8024202C 468010A0 */ cvt.s.w $f2, $f2 -/* CD9310 80242030 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD9314 80242034 C6A20014 */ lwc1 $f2, 0x14($s5) -/* CD9318 80242038 468010A0 */ cvt.s.w $f2, $f2 -/* CD931C 8024203C E7A20018 */ swc1 $f2, 0x18($sp) -/* CD9320 80242040 8EA40004 */ lw $a0, 4($s5) -/* CD9324 80242044 8E470038 */ lw $a3, 0x38($s2) -/* CD9328 80242048 0C0123F5 */ jal is_point_within_region -/* CD932C 8024204C 46000506 */ mov.s $f20, $f0 -/* CD9330 80242050 14400031 */ bnez $v0, .L80242118 -/* CD9334 80242054 0000102D */ daddu $v0, $zero, $zero -/* CD9338 80242058 3C01403E */ lui $at, 0x403e -/* CD933C 8024205C 44810800 */ mtc1 $at, $f1 -/* CD9340 80242060 44800000 */ mtc1 $zero, $f0 -/* CD9344 80242064 4600A0A1 */ cvt.d.s $f2, $f20 -/* CD9348 80242068 4622003C */ c.lt.d $f0, $f2 -/* CD934C 8024206C 00000000 */ nop -/* CD9350 80242070 45000029 */ bc1f .L80242118 -/* CD9354 80242074 00000000 */ nop -/* CD9358 80242078 8642008C */ lh $v0, 0x8c($s2) -/* CD935C 8024207C 54400026 */ bnel $v0, $zero, .L80242118 -/* CD9360 80242080 0000102D */ daddu $v0, $zero, $zero -/* CD9364 80242084 3C014034 */ lui $at, 0x4034 -/* CD9368 80242088 44810800 */ mtc1 $at, $f1 -/* CD936C 8024208C 44800000 */ mtc1 $zero, $f0 -/* CD9370 80242090 00000000 */ nop -/* CD9374 80242094 46201001 */ sub.d $f0, $f2, $f0 -/* CD9378 80242098 44801000 */ mtc1 $zero, $f2 -/* CD937C 8024209C 44801800 */ mtc1 $zero, $f3 -/* CD9380 802420A0 46200120 */ cvt.s.d $f4, $f0 -/* CD9384 802420A4 46002021 */ cvt.d.s $f0, $f4 -/* CD9388 802420A8 4622003C */ c.lt.d $f0, $f2 -/* CD938C 802420AC 00000000 */ nop -/* CD9390 802420B0 45000002 */ bc1f .L802420BC -/* CD9394 802420B4 00000000 */ nop -/* CD9398 802420B8 44802000 */ mtc1 $zero, $f4 -.L802420BC: -/* CD939C 802420BC 3C014069 */ lui $at, 0x4069 -/* CD93A0 802420C0 44811800 */ mtc1 $at, $f3 -/* CD93A4 802420C4 44801000 */ mtc1 $zero, $f2 -/* CD93A8 802420C8 46002021 */ cvt.d.s $f0, $f4 -/* CD93AC 802420CC 4620103C */ c.lt.d $f2, $f0 -/* CD93B0 802420D0 00000000 */ nop -/* CD93B4 802420D4 45000003 */ bc1f .L802420E4 -/* CD93B8 802420D8 240200C8 */ addiu $v0, $zero, 0xc8 -/* CD93BC 802420DC 3C014348 */ lui $at, 0x4348 -/* CD93C0 802420E0 44812000 */ mtc1 $at, $f4 -.L802420E4: -/* CD93C4 802420E4 AFA20010 */ sw $v0, 0x10($sp) -/* CD93C8 802420E8 8EC50000 */ lw $a1, ($s6) -/* CD93CC 802420EC 8EC60018 */ lw $a2, 0x18($s6) -/* CD93D0 802420F0 4600218D */ trunc.w.s $f6, $f4 -/* CD93D4 802420F4 44073000 */ mfc1 $a3, $f6 -/* CD93D8 802420F8 0C00A8ED */ jal update_lerp -/* CD93DC 802420FC 0000202D */ daddu $a0, $zero, $zero -/* CD93E0 80242100 44050000 */ mfc1 $a1, $f0 -/* CD93E4 80242104 8E46000C */ lw $a2, 0xc($s2) -/* CD93E8 80242108 0240202D */ daddu $a0, $s2, $zero -/* CD93EC 8024210C 0C00EA95 */ jal npc_move_heading -/* CD93F0 80242110 AC850018 */ sw $a1, 0x18($a0) -/* CD93F4 80242114 0000102D */ daddu $v0, $zero, $zero -.L80242118: -/* CD93F8 80242118 8FBF005C */ lw $ra, 0x5c($sp) -/* CD93FC 8024211C 8FB60058 */ lw $s6, 0x58($sp) -/* CD9400 80242120 8FB50054 */ lw $s5, 0x54($sp) -/* CD9404 80242124 8FB40050 */ lw $s4, 0x50($sp) -/* CD9408 80242128 8FB3004C */ lw $s3, 0x4c($sp) -/* CD940C 8024212C 8FB20048 */ lw $s2, 0x48($sp) -/* CD9410 80242130 8FB10044 */ lw $s1, 0x44($sp) -/* CD9414 80242134 8FB00040 */ lw $s0, 0x40($sp) -/* CD9418 80242138 D7B40060 */ ldc1 $f20, 0x60($sp) -/* CD941C 8024213C 03E00008 */ jr $ra -/* CD9420 80242140 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240880_A2AAC0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240880_A2AAC0.s deleted file mode 100644 index 5ed0ef8cca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240880_A2AAC0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240880_A2AAC0 -/* A2AAC0 80240880 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A2AAC4 80240884 AFB1002C */ sw $s1, 0x2c($sp) -/* A2AAC8 80240888 0080882D */ daddu $s1, $a0, $zero -/* A2AACC 8024088C AFBF004C */ sw $ra, 0x4c($sp) -/* A2AAD0 80240890 AFBE0048 */ sw $fp, 0x48($sp) -/* A2AAD4 80240894 AFB70044 */ sw $s7, 0x44($sp) -/* A2AAD8 80240898 AFB60040 */ sw $s6, 0x40($sp) -/* A2AADC 8024089C AFB5003C */ sw $s5, 0x3c($sp) -/* A2AAE0 802408A0 AFB40038 */ sw $s4, 0x38($sp) -/* A2AAE4 802408A4 AFB30034 */ sw $s3, 0x34($sp) -/* A2AAE8 802408A8 AFB20030 */ sw $s2, 0x30($sp) -/* A2AAEC 802408AC AFB00028 */ sw $s0, 0x28($sp) -/* A2AAF0 802408B0 8E30000C */ lw $s0, 0xc($s1) -/* A2AAF4 802408B4 8E050000 */ lw $a1, ($s0) -/* A2AAF8 802408B8 0C0B1EAF */ jal evt_get_variable -/* A2AAFC 802408BC 26100004 */ addiu $s0, $s0, 4 -/* A2AB00 802408C0 8E050000 */ lw $a1, ($s0) -/* A2AB04 802408C4 26100004 */ addiu $s0, $s0, 4 -/* A2AB08 802408C8 0220202D */ daddu $a0, $s1, $zero -/* A2AB0C 802408CC 0C0B1EAF */ jal evt_get_variable -/* A2AB10 802408D0 0040F02D */ daddu $fp, $v0, $zero -/* A2AB14 802408D4 8E050000 */ lw $a1, ($s0) -/* A2AB18 802408D8 26100004 */ addiu $s0, $s0, 4 -/* A2AB1C 802408DC 0220202D */ daddu $a0, $s1, $zero -/* A2AB20 802408E0 0C0B1EAF */ jal evt_get_variable -/* A2AB24 802408E4 0040B02D */ daddu $s6, $v0, $zero -/* A2AB28 802408E8 8E050000 */ lw $a1, ($s0) -/* A2AB2C 802408EC 26100004 */ addiu $s0, $s0, 4 -/* A2AB30 802408F0 0220202D */ daddu $a0, $s1, $zero -/* A2AB34 802408F4 0C0B1EAF */ jal evt_get_variable -/* A2AB38 802408F8 0040B82D */ daddu $s7, $v0, $zero -/* A2AB3C 802408FC 8E050000 */ lw $a1, ($s0) -/* A2AB40 80240900 26100004 */ addiu $s0, $s0, 4 -/* A2AB44 80240904 0220202D */ daddu $a0, $s1, $zero -/* A2AB48 80240908 0C0B1EAF */ jal evt_get_variable -/* A2AB4C 8024090C 0040A82D */ daddu $s5, $v0, $zero -/* A2AB50 80240910 8E050000 */ lw $a1, ($s0) -/* A2AB54 80240914 26100004 */ addiu $s0, $s0, 4 -/* A2AB58 80240918 0220202D */ daddu $a0, $s1, $zero -/* A2AB5C 8024091C 0C0B1EAF */ jal evt_get_variable -/* A2AB60 80240920 0040A02D */ daddu $s4, $v0, $zero -/* A2AB64 80240924 8E050000 */ lw $a1, ($s0) -/* A2AB68 80240928 26100004 */ addiu $s0, $s0, 4 -/* A2AB6C 8024092C 0220202D */ daddu $a0, $s1, $zero -/* A2AB70 80240930 0C0B1EAF */ jal evt_get_variable -/* A2AB74 80240934 0040982D */ daddu $s3, $v0, $zero -/* A2AB78 80240938 8E050000 */ lw $a1, ($s0) -/* A2AB7C 8024093C 26100004 */ addiu $s0, $s0, 4 -/* A2AB80 80240940 0220202D */ daddu $a0, $s1, $zero -/* A2AB84 80240944 0C0B1EAF */ jal evt_get_variable -/* A2AB88 80240948 0040902D */ daddu $s2, $v0, $zero -/* A2AB8C 8024094C 0220202D */ daddu $a0, $s1, $zero -/* A2AB90 80240950 8E050000 */ lw $a1, ($s0) -/* A2AB94 80240954 0C0B1EAF */ jal evt_get_variable -/* A2AB98 80240958 0040802D */ daddu $s0, $v0, $zero -/* A2AB9C 8024095C 33C400FF */ andi $a0, $fp, 0xff -/* A2ABA0 80240960 32C500FF */ andi $a1, $s6, 0xff -/* A2ABA4 80240964 329400FF */ andi $s4, $s4, 0xff -/* A2ABA8 80240968 327300FF */ andi $s3, $s3, 0xff -/* A2ABAC 8024096C 325200FF */ andi $s2, $s2, 0xff -/* A2ABB0 80240970 32E600FF */ andi $a2, $s7, 0xff -/* A2ABB4 80240974 32A700FF */ andi $a3, $s5, 0xff -/* A2ABB8 80240978 AFB40010 */ sw $s4, 0x10($sp) -/* A2ABBC 8024097C AFB30014 */ sw $s3, 0x14($sp) -/* A2ABC0 80240980 AFB20018 */ sw $s2, 0x18($sp) -/* A2ABC4 80240984 AFB0001C */ sw $s0, 0x1c($sp) -/* A2ABC8 80240988 0C046FAD */ jal set_model_fog_color_parameters -/* A2ABCC 8024098C AFA20020 */ sw $v0, 0x20($sp) -/* A2ABD0 80240990 8FBF004C */ lw $ra, 0x4c($sp) -/* A2ABD4 80240994 8FBE0048 */ lw $fp, 0x48($sp) -/* A2ABD8 80240998 8FB70044 */ lw $s7, 0x44($sp) -/* A2ABDC 8024099C 8FB60040 */ lw $s6, 0x40($sp) -/* A2ABE0 802409A0 8FB5003C */ lw $s5, 0x3c($sp) -/* A2ABE4 802409A4 8FB40038 */ lw $s4, 0x38($sp) -/* A2ABE8 802409A8 8FB30034 */ lw $s3, 0x34($sp) -/* A2ABEC 802409AC 8FB20030 */ lw $s2, 0x30($sp) -/* A2ABF0 802409B0 8FB1002C */ lw $s1, 0x2c($sp) -/* A2ABF4 802409B4 8FB00028 */ lw $s0, 0x28($sp) -/* A2ABF8 802409B8 24020002 */ addiu $v0, $zero, 2 -/* A2ABFC 802409BC 03E00008 */ jr $ra -/* A2AC00 802409C0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s deleted file mode 100644 index cd11a74bae..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024F1E0_A39420 -.double 1.1 - -.section .text - -glabel func_80240D54_A2AF94 -/* A2AF94 80240D54 44852000 */ mtc1 $a1, $f4 -/* A2AF98 80240D58 3C018025 */ lui $at, %hi(D_8024F1E0_A39420) -/* A2AF9C 80240D5C D422F1E0 */ ldc1 $f2, %lo(D_8024F1E0_A39420)($at) -/* A2AFA0 80240D60 46002021 */ cvt.d.s $f0, $f4 -/* A2AFA4 80240D64 46220002 */ mul.d $f0, $f0, $f2 -/* A2AFA8 80240D68 00000000 */ nop -/* A2AFAC 80240D6C 00041080 */ sll $v0, $a0, 2 -/* A2AFB0 80240D70 00441021 */ addu $v0, $v0, $a0 -/* A2AFB4 80240D74 00021080 */ sll $v0, $v0, 2 -/* A2AFB8 80240D78 00441023 */ subu $v0, $v0, $a0 -/* A2AFBC 80240D7C 000218C0 */ sll $v1, $v0, 3 -/* A2AFC0 80240D80 00431021 */ addu $v0, $v0, $v1 -/* A2AFC4 80240D84 000210C0 */ sll $v0, $v0, 3 -/* A2AFC8 80240D88 46200020 */ cvt.s.d $f0, $f0 -/* A2AFCC 80240D8C 3C01800B */ lui $at, %hi(gCameras+0x18) -/* A2AFD0 80240D90 00220821 */ addu $at, $at, $v0 -/* A2AFD4 80240D94 E4201D98 */ swc1 $f0, %lo(gCameras+0x18)($at) -/* A2AFD8 80240D98 03E00008 */ jr $ra -/* A2AFDC 80240D9C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s deleted file mode 100644 index 68ed98adfe..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0_A2AFE0 -/* A2AFE0 80240DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A2AFE4 80240DA4 AFB10014 */ sw $s1, 0x14($sp) -/* A2AFE8 80240DA8 0080882D */ daddu $s1, $a0, $zero -/* A2AFEC 80240DAC AFBF0018 */ sw $ra, 0x18($sp) -/* A2AFF0 80240DB0 AFB00010 */ sw $s0, 0x10($sp) -/* A2AFF4 80240DB4 8E30000C */ lw $s0, 0xc($s1) -/* A2AFF8 80240DB8 8E050000 */ lw $a1, ($s0) -/* A2AFFC 80240DBC 0C0B1EAF */ jal evt_get_variable -/* A2B000 80240DC0 26100004 */ addiu $s0, $s0, 4 -/* A2B004 80240DC4 0220202D */ daddu $a0, $s1, $zero -/* A2B008 80240DC8 8E050000 */ lw $a1, ($s0) -/* A2B00C 80240DCC 0C0B210B */ jal evt_get_float_variable -/* A2B010 80240DD0 0040802D */ daddu $s0, $v0, $zero -/* A2B014 80240DD4 44050000 */ mfc1 $a1, $f0 -/* A2B018 80240DD8 0C090355 */ jal func_80240D54_A2AF94 -/* A2B01C 80240DDC 0200202D */ daddu $a0, $s0, $zero -/* A2B020 80240DE0 8FBF0018 */ lw $ra, 0x18($sp) -/* A2B024 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* A2B028 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* A2B02C 80240DEC 24020002 */ addiu $v0, $zero, 2 -/* A2B030 80240DF0 03E00008 */ jr $ra -/* A2B034 80240DF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DF8_A2B038.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DF8_A2B038.s deleted file mode 100644 index bf8effedfd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DF8_A2B038.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF8_A2B038 -/* A2B038 80240DF8 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* A2B03C 80240DFC 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* A2B040 80240E00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2B044 80240E04 AFBF0010 */ sw $ra, 0x10($sp) -/* A2B048 80240E08 908300A8 */ lbu $v1, 0xa8($a0) -/* A2B04C 80240E0C 2C620005 */ sltiu $v0, $v1, 5 -/* A2B050 80240E10 10400003 */ beqz $v0, .L80240E20 -/* A2B054 80240E14 24620001 */ addiu $v0, $v1, 1 -/* A2B058 80240E18 0C00D994 */ jal state_init_intro -/* A2B05C 80240E1C A08200A8 */ sb $v0, 0xa8($a0) -.L80240E20: -/* A2B060 80240E20 8FBF0010 */ lw $ra, 0x10($sp) -/* A2B064 80240E24 24020001 */ addiu $v0, $zero, 1 -/* A2B068 80240E28 03E00008 */ jr $ra -/* A2B06C 80240E2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E30_A2B070.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E30_A2B070.s deleted file mode 100644 index a333bfb02c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E30_A2B070.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E30_A2B070 -/* A2B070 80240E30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2B074 80240E34 AFBF0010 */ sw $ra, 0x10($sp) -/* A2B078 80240E38 0C04760B */ jal mdl_set_all_fog_mode -/* A2B07C 80240E3C 24040003 */ addiu $a0, $zero, 3 -/* A2B080 80240E40 8FBF0010 */ lw $ra, 0x10($sp) -/* A2B084 80240E44 24020002 */ addiu $v0, $zero, 2 -/* A2B088 80240E48 03E00008 */ jr $ra -/* A2B08C 80240E4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s deleted file mode 100644 index c831529f52..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F8_A39ED8 -/* A39ED8 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39EDC 802409FC AFB00010 */ sw $s0, 0x10($sp) -/* A39EE0 80240A00 0080802D */ daddu $s0, $a0, $zero -/* A39EE4 80240A04 AFBF0014 */ sw $ra, 0x14($sp) -/* A39EE8 80240A08 0C00EABB */ jal get_npc_unsafe -/* A39EEC 80240A0C 8E04008C */ lw $a0, 0x8c($s0) -/* A39EF0 80240A10 0040282D */ daddu $a1, $v0, $zero -/* A39EF4 80240A14 8E040094 */ lw $a0, 0x94($s0) -/* A39EF8 80240A18 8CA30028 */ lw $v1, 0x28($a1) -/* A39EFC 80240A1C ACA40028 */ sw $a0, 0x28($a1) -/* A39F00 80240A20 8FBF0014 */ lw $ra, 0x14($sp) -/* A39F04 80240A24 8FB00010 */ lw $s0, 0x10($sp) -/* A39F08 80240A28 24020002 */ addiu $v0, $zero, 2 -/* A39F0C 80240A2C 3C018024 */ lui $at, %hi(D_80246424) -/* A39F10 80240A30 AC236424 */ sw $v1, %lo(D_80246424)($at) -/* A39F14 80240A34 03E00008 */ jr $ra -/* A39F18 80240A38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s deleted file mode 100644 index 9ea93aff4a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A3C_A39F1C -/* A39F1C 80240A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39F20 80240A40 AFBF0010 */ sw $ra, 0x10($sp) -/* A39F24 80240A44 0C00EABB */ jal get_npc_unsafe -/* A39F28 80240A48 8C84008C */ lw $a0, 0x8c($a0) -/* A39F2C 80240A4C 3C038024 */ lui $v1, %hi(D_80246424) -/* A39F30 80240A50 8C636424 */ lw $v1, %lo(D_80246424)($v1) -/* A39F34 80240A54 AC430028 */ sw $v1, 0x28($v0) -/* A39F38 80240A58 8FBF0010 */ lw $ra, 0x10($sp) -/* A39F3C 80240A5C 24020002 */ addiu $v0, $zero, 2 -/* A39F40 80240A60 03E00008 */ jr $ra -/* A39F44 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s deleted file mode 100644 index 0c79c2185c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118_90CD58 -/* 90CD58 80240118 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 90CD5C 8024011C AFB20028 */ sw $s2, 0x28($sp) -/* 90CD60 80240120 0080902D */ daddu $s2, $a0, $zero -/* 90CD64 80240124 AFBF0030 */ sw $ra, 0x30($sp) -/* 90CD68 80240128 AFB3002C */ sw $s3, 0x2c($sp) -/* 90CD6C 8024012C AFB10024 */ sw $s1, 0x24($sp) -/* 90CD70 80240130 AFB00020 */ sw $s0, 0x20($sp) -/* 90CD74 80240134 8E530148 */ lw $s3, 0x148($s2) -/* 90CD78 80240138 86640008 */ lh $a0, 8($s3) -/* 90CD7C 8024013C 0C00EABB */ jal get_npc_unsafe -/* 90CD80 80240140 00A0802D */ daddu $s0, $a1, $zero -/* 90CD84 80240144 12000004 */ beqz $s0, .L80240158 -/* 90CD88 80240148 0040882D */ daddu $s1, $v0, $zero -/* 90CD8C 8024014C 24020014 */ addiu $v0, $zero, 0x14 -/* 90CD90 80240150 AE400070 */ sw $zero, 0x70($s2) -/* 90CD94 80240154 AE420074 */ sw $v0, 0x74($s2) -.L80240158: -/* 90CD98 80240158 8E420074 */ lw $v0, 0x74($s2) -/* 90CD9C 8024015C 30420001 */ andi $v0, $v0, 1 -/* 90CDA0 80240160 10400004 */ beqz $v0, .L80240174 -/* 90CDA4 80240164 2403FFFD */ addiu $v1, $zero, -3 -/* 90CDA8 80240168 8E220000 */ lw $v0, ($s1) -/* 90CDAC 8024016C 0809005F */ j .L8024017C -/* 90CDB0 80240170 00431024 */ and $v0, $v0, $v1 -.L80240174: -/* 90CDB4 80240174 8E220000 */ lw $v0, ($s1) -/* 90CDB8 80240178 34420002 */ ori $v0, $v0, 2 -.L8024017C: -/* 90CDBC 8024017C AE220000 */ sw $v0, ($s1) -/* 90CDC0 80240180 8E430074 */ lw $v1, 0x74($s2) -/* 90CDC4 80240184 2402000F */ addiu $v0, $zero, 0xf -/* 90CDC8 80240188 1462002A */ bne $v1, $v0, .L80240234 -/* 90CDCC 8024018C 00000000 */ nop -/* 90CDD0 80240190 240403E5 */ addiu $a0, $zero, 0x3e5 -/* 90CDD4 80240194 962300A8 */ lhu $v1, 0xa8($s1) -/* 90CDD8 80240198 C620003C */ lwc1 $f0, 0x3c($s1) -/* 90CDDC 8024019C C6220040 */ lwc1 $f2, 0x40($s1) -/* 90CDE0 802401A0 00031C00 */ sll $v1, $v1, 0x10 -/* 90CDE4 802401A4 00031403 */ sra $v0, $v1, 0x10 -/* 90CDE8 802401A8 00031FC2 */ srl $v1, $v1, 0x1f -/* 90CDEC 802401AC 00431021 */ addu $v0, $v0, $v1 -/* 90CDF0 802401B0 00021043 */ sra $v0, $v0, 1 -/* 90CDF4 802401B4 44822000 */ mtc1 $v0, $f4 -/* 90CDF8 802401B8 00000000 */ nop -/* 90CDFC 802401BC 46802120 */ cvt.s.w $f4, $f4 -/* 90CE00 802401C0 46040000 */ add.s $f0, $f0, $f4 -/* 90CE04 802401C4 E7A20010 */ swc1 $f2, 0x10($sp) -/* 90CE08 802401C8 8E260038 */ lw $a2, 0x38($s1) -/* 90CE0C 802401CC 44070000 */ mfc1 $a3, $f0 -/* 90CE10 802401D0 0C052757 */ jal sfx_play_sound_at_position -/* 90CE14 802401D4 0000282D */ daddu $a1, $zero, $zero -/* 90CE18 802401D8 962300A8 */ lhu $v1, 0xa8($s1) -/* 90CE1C 802401DC C624003C */ lwc1 $f4, 0x3c($s1) -/* 90CE20 802401E0 3C01BF80 */ lui $at, 0xbf80 -/* 90CE24 802401E4 44811000 */ mtc1 $at, $f2 -/* 90CE28 802401E8 2402000A */ addiu $v0, $zero, 0xa -/* 90CE2C 802401EC AFA00010 */ sw $zero, 0x10($sp) -/* 90CE30 802401F0 AFA00018 */ sw $zero, 0x18($sp) -/* 90CE34 802401F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 90CE38 802401F8 00031C00 */ sll $v1, $v1, 0x10 -/* 90CE3C 802401FC 00031403 */ sra $v0, $v1, 0x10 -/* 90CE40 80240200 00031FC2 */ srl $v1, $v1, 0x1f -/* 90CE44 80240204 00431021 */ addu $v0, $v0, $v1 -/* 90CE48 80240208 00021043 */ sra $v0, $v0, 1 -/* 90CE4C 8024020C 44820000 */ mtc1 $v0, $f0 -/* 90CE50 80240210 00000000 */ nop -/* 90CE54 80240214 46800020 */ cvt.s.w $f0, $f0 -/* 90CE58 80240218 46002100 */ add.s $f4, $f4, $f0 -/* 90CE5C 8024021C E7A20014 */ swc1 $f2, 0x14($sp) -/* 90CE60 80240220 8E250038 */ lw $a1, 0x38($s1) -/* 90CE64 80240224 8E270040 */ lw $a3, 0x40($s1) -/* 90CE68 80240228 44062000 */ mfc1 $a2, $f4 -/* 90CE6C 8024022C 0C01C064 */ jal fx_damage_stars -/* 90CE70 80240230 24040001 */ addiu $a0, $zero, 1 -.L80240234: -/* 90CE74 80240234 8E500074 */ lw $s0, 0x74($s2) -/* 90CE78 80240238 2402000A */ addiu $v0, $zero, 0xa -/* 90CE7C 8024023C 1602000F */ bne $s0, $v0, .L8024027C -/* 90CE80 80240240 00000000 */ nop -/* 90CE84 80240244 3C014120 */ lui $at, 0x4120 -/* 90CE88 80240248 44811000 */ mtc1 $at, $f2 -/* 90CE8C 8024024C C6200040 */ lwc1 $f0, 0x40($s1) -/* 90CE90 80240250 46020000 */ add.s $f0, $f0, $f2 -/* 90CE94 80240254 C62E003C */ lwc1 $f14, 0x3c($s1) -/* 90CE98 80240258 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 90CE9C 8024025C 44060000 */ mfc1 $a2, $f0 -/* 90CEA0 80240260 0C01BE3C */ jal fx_big_smoke_puff -/* 90CEA4 80240264 46027380 */ add.s $f14, $f14, $f2 -/* 90CEA8 80240268 8E420074 */ lw $v0, 0x74($s2) -/* 90CEAC 8024026C 14500003 */ bne $v0, $s0, .L8024027C -/* 90CEB0 80240270 00000000 */ nop -/* 90CEB4 80240274 0C0120A0 */ jal spawn_drops -/* 90CEB8 80240278 0260202D */ daddu $a0, $s3, $zero -.L8024027C: -/* 90CEBC 8024027C 8E430074 */ lw $v1, 0x74($s2) -/* 90CEC0 80240280 2463FFFF */ addiu $v1, $v1, -1 -/* 90CEC4 80240284 AE430074 */ sw $v1, 0x74($s2) -/* 90CEC8 80240288 8FBF0030 */ lw $ra, 0x30($sp) -/* 90CECC 8024028C 8FB3002C */ lw $s3, 0x2c($sp) -/* 90CED0 80240290 8FB20028 */ lw $s2, 0x28($sp) -/* 90CED4 80240294 8FB10024 */ lw $s1, 0x24($sp) -/* 90CED8 80240298 8FB00020 */ lw $s0, 0x20($sp) -/* 90CEDC 8024029C 2C620001 */ sltiu $v0, $v1, 1 -/* 90CEE0 802402A0 03E00008 */ jr $ra -/* 90CEE4 802402A4 27BD0038 */ addiu $sp, $sp, 0x38 -/* 90CEE8 802402A8 00000000 */ nop -/* 90CEEC 802402AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s deleted file mode 100644 index 3e650baf98..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B0_90CEF0 -/* 90CEF0 802402B0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 90CEF4 802402B4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 90CEF8 802402B8 8C430000 */ lw $v1, ($v0) -/* 90CEFC 802402BC 8C840084 */ lw $a0, 0x84($a0) -/* 90CF00 802402C0 34630010 */ ori $v1, $v1, 0x10 -/* 90CF04 802402C4 AC4400D0 */ sw $a0, 0xd0($v0) -/* 90CF08 802402C8 AC430000 */ sw $v1, ($v0) -/* 90CF0C 802402CC 03E00008 */ jr $ra -/* 90CF10 802402D0 24020002 */ addiu $v0, $zero, 2 -/* 90CF14 802402D4 00000000 */ nop -/* 90CF18 802402D8 00000000 */ nop -/* 90CF1C 802402DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s deleted file mode 100644 index f9a6144201..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802465C0_915C70 -.double 180.0 - -dlabel D_802465C8_915C78 -.double 75.0 - -.section .text - -glabel func_802422C4_911974 -/* 911974 802422C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 911978 802422C8 AFBF001C */ sw $ra, 0x1c($sp) -/* 91197C 802422CC AFB20018 */ sw $s2, 0x18($sp) -/* 911980 802422D0 AFB10014 */ sw $s1, 0x14($sp) -/* 911984 802422D4 AFB00010 */ sw $s0, 0x10($sp) -/* 911988 802422D8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 91198C 802422DC 8C900148 */ lw $s0, 0x148($a0) -/* 911990 802422E0 86040008 */ lh $a0, 8($s0) -/* 911994 802422E4 3C014387 */ lui $at, 0x4387 -/* 911998 802422E8 4481A000 */ mtc1 $at, $f20 -/* 91199C 802422EC 0C00EABB */ jal get_npc_unsafe -/* 9119A0 802422F0 00A0882D */ daddu $s1, $a1, $zero -/* 9119A4 802422F4 0200202D */ daddu $a0, $s0, $zero -/* 9119A8 802422F8 8E26000C */ lw $a2, 0xc($s1) -/* 9119AC 802422FC 8E270010 */ lw $a3, 0x10($s1) -/* 9119B0 80242300 0040882D */ daddu $s1, $v0, $zero -/* 9119B4 80242304 3C03800B */ lui $v1, %hi(gCameras) -/* 9119B8 80242308 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 9119BC 8024230C 3C02800A */ lui $v0, %hi(gCurrentCamID) -/* 9119C0 80242310 8442A634 */ lh $v0, %lo(gCurrentCamID)($v0) -/* 9119C4 80242314 0000282D */ daddu $a1, $zero, $zero -/* 9119C8 80242318 00028080 */ sll $s0, $v0, 2 -/* 9119CC 8024231C 02028021 */ addu $s0, $s0, $v0 -/* 9119D0 80242320 00108080 */ sll $s0, $s0, 2 -/* 9119D4 80242324 02028023 */ subu $s0, $s0, $v0 -/* 9119D8 80242328 001010C0 */ sll $v0, $s0, 3 -/* 9119DC 8024232C 02028021 */ addu $s0, $s0, $v0 -/* 9119E0 80242330 001080C0 */ sll $s0, $s0, 3 -/* 9119E4 80242334 0C0124FB */ jal func_800493EC -/* 9119E8 80242338 02038021 */ addu $s0, $s0, $v1 -/* 9119EC 8024233C C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9119F0 80242340 C62E000C */ lwc1 $f14, 0xc($s1) -/* 9119F4 80242344 0C00A70A */ jal get_clamped_angle_diff -/* 9119F8 80242348 0002802B */ sltu $s0, $zero, $v0 -/* 9119FC 8024234C 0C00A6C9 */ jal clamp_angle -/* 911A00 80242350 46000306 */ mov.s $f12, $f0 -/* 911A04 80242354 3C018024 */ lui $at, %hi(D_802465C0_915C70) -/* 911A08 80242358 D42265C0 */ ldc1 $f2, %lo(D_802465C0_915C70)($at) -/* 911A0C 8024235C 46000021 */ cvt.d.s $f0, $f0 -/* 911A10 80242360 4622003C */ c.lt.d $f0, $f2 -/* 911A14 80242364 00000000 */ nop -/* 911A18 80242368 45000003 */ bc1f .L80242378 -/* 911A1C 8024236C 00000000 */ nop -/* 911A20 80242370 3C0142B4 */ lui $at, 0x42b4 -/* 911A24 80242374 4481A000 */ mtc1 $at, $f20 -.L80242378: -/* 911A28 80242378 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 911A2C 8024237C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 911A30 80242380 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 911A34 80242384 8E420000 */ lw $v0, ($s2) -/* 911A38 80242388 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 911A3C 8024238C 8C460028 */ lw $a2, 0x28($v0) -/* 911A40 80242390 0C00A720 */ jal atan2 -/* 911A44 80242394 8C470030 */ lw $a3, 0x30($v0) -/* 911A48 80242398 4600A306 */ mov.s $f12, $f20 -/* 911A4C 8024239C 0C00A70A */ jal get_clamped_angle_diff -/* 911A50 802423A0 46000386 */ mov.s $f14, $f0 -/* 911A54 802423A4 46000005 */ abs.s $f0, $f0 -/* 911A58 802423A8 3C018024 */ lui $at, %hi(D_802465C8_915C78) -/* 911A5C 802423AC D42265C8 */ ldc1 $f2, %lo(D_802465C8_915C78)($at) -/* 911A60 802423B0 46000021 */ cvt.d.s $f0, $f0 -/* 911A64 802423B4 4620103C */ c.lt.d $f2, $f0 -/* 911A68 802423B8 00000000 */ nop -/* 911A6C 802423BC 45030001 */ bc1tl .L802423C4 -/* 911A70 802423C0 0000802D */ daddu $s0, $zero, $zero -.L802423C4: -/* 911A74 802423C4 8E420000 */ lw $v0, ($s2) -/* 911A78 802423C8 C620003C */ lwc1 $f0, 0x3c($s1) -/* 911A7C 802423CC C442002C */ lwc1 $f2, 0x2c($v0) -/* 911A80 802423D0 46020001 */ sub.s $f0, $f0, $f2 -/* 911A84 802423D4 3C014220 */ lui $at, 0x4220 -/* 911A88 802423D8 44811000 */ mtc1 $at, $f2 -/* 911A8C 802423DC 46000005 */ abs.s $f0, $f0 -/* 911A90 802423E0 4600103E */ c.le.s $f2, $f0 -/* 911A94 802423E4 00000000 */ nop -/* 911A98 802423E8 45030001 */ bc1tl .L802423F0 -/* 911A9C 802423EC 0000802D */ daddu $s0, $zero, $zero -.L802423F0: -/* 911AA0 802423F0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* 911AA4 802423F4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* 911AA8 802423F8 24020009 */ addiu $v0, $zero, 9 -/* 911AAC 802423FC 50620001 */ beql $v1, $v0, .L80242404 -/* 911AB0 80242400 0000802D */ daddu $s0, $zero, $zero -.L80242404: -/* 911AB4 80242404 0200102D */ daddu $v0, $s0, $zero -/* 911AB8 80242408 8FBF001C */ lw $ra, 0x1c($sp) -/* 911ABC 8024240C 8FB20018 */ lw $s2, 0x18($sp) -/* 911AC0 80242410 8FB10014 */ lw $s1, 0x14($sp) -/* 911AC4 80242414 8FB00010 */ lw $s0, 0x10($sp) -/* 911AC8 80242418 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 911ACC 8024241C 03E00008 */ jr $ra -/* 911AD0 80242420 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s deleted file mode 100644 index ea9c8ecb67..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802465D0_915C80 -.double 0.85 - -.section .text - -glabel func_80242498_911B48 -/* 911B48 80242498 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 911B4C 8024249C AFB3003C */ sw $s3, 0x3c($sp) -/* 911B50 802424A0 0080982D */ daddu $s3, $a0, $zero -/* 911B54 802424A4 AFBF0044 */ sw $ra, 0x44($sp) -/* 911B58 802424A8 AFB40040 */ sw $s4, 0x40($sp) -/* 911B5C 802424AC AFB20038 */ sw $s2, 0x38($sp) -/* 911B60 802424B0 AFB10034 */ sw $s1, 0x34($sp) -/* 911B64 802424B4 AFB00030 */ sw $s0, 0x30($sp) -/* 911B68 802424B8 8E700148 */ lw $s0, 0x148($s3) -/* 911B6C 802424BC 00A0902D */ daddu $s2, $a1, $zero -/* 911B70 802424C0 86040008 */ lh $a0, 8($s0) -/* 911B74 802424C4 0C00EABB */ jal get_npc_unsafe -/* 911B78 802424C8 00C0A02D */ daddu $s4, $a2, $zero -/* 911B7C 802424CC 8E630074 */ lw $v1, 0x74($s3) -/* 911B80 802424D0 1C600032 */ bgtz $v1, .L8024259C -/* 911B84 802424D4 0040882D */ daddu $s1, $v0, $zero -/* 911B88 802424D8 8E420014 */ lw $v0, 0x14($s2) -/* 911B8C 802424DC AE620074 */ sw $v0, 0x74($s3) -/* 911B90 802424E0 C640000C */ lwc1 $f0, 0xc($s2) -/* 911B94 802424E4 3C018024 */ lui $at, %hi(D_802465D0_915C80) -/* 911B98 802424E8 D42265D0 */ ldc1 $f2, %lo(D_802465D0_915C80)($at) -/* 911B9C 802424EC 46000021 */ cvt.d.s $f0, $f0 -/* 911BA0 802424F0 46220002 */ mul.d $f0, $f0, $f2 -/* 911BA4 802424F4 00000000 */ nop -/* 911BA8 802424F8 0280202D */ daddu $a0, $s4, $zero -/* 911BAC 802424FC AFA00010 */ sw $zero, 0x10($sp) -/* 911BB0 80242500 8E470010 */ lw $a3, 0x10($s2) -/* 911BB4 80242504 46200020 */ cvt.s.d $f0, $f0 -/* 911BB8 80242508 44060000 */ mfc1 $a2, $f0 -/* 911BBC 8024250C 0C01242D */ jal func_800490B4 -/* 911BC0 80242510 0200282D */ daddu $a1, $s0, $zero -/* 911BC4 80242514 10400021 */ beqz $v0, .L8024259C -/* 911BC8 80242518 0000202D */ daddu $a0, $zero, $zero -/* 911BCC 8024251C 0220282D */ daddu $a1, $s1, $zero -/* 911BD0 80242520 0000302D */ daddu $a2, $zero, $zero -/* 911BD4 80242524 8E0200CC */ lw $v0, 0xcc($s0) -/* 911BD8 80242528 3C013F80 */ lui $at, 0x3f80 -/* 911BDC 8024252C 44810000 */ mtc1 $at, $f0 -/* 911BE0 80242530 3C014000 */ lui $at, 0x4000 -/* 911BE4 80242534 44811000 */ mtc1 $at, $f2 -/* 911BE8 80242538 8C430024 */ lw $v1, 0x24($v0) -/* 911BEC 8024253C 862200A8 */ lh $v0, 0xa8($s1) -/* 911BF0 80242540 3C01C1A0 */ lui $at, 0xc1a0 -/* 911BF4 80242544 44812000 */ mtc1 $at, $f4 -/* 911BF8 80242548 44823000 */ mtc1 $v0, $f6 -/* 911BFC 8024254C 00000000 */ nop -/* 911C00 80242550 468031A0 */ cvt.s.w $f6, $f6 -/* 911C04 80242554 44073000 */ mfc1 $a3, $f6 -/* 911C08 80242558 2402000F */ addiu $v0, $zero, 0xf -/* 911C0C 8024255C AE230028 */ sw $v1, 0x28($s1) -/* 911C10 80242560 AFA2001C */ sw $v0, 0x1c($sp) -/* 911C14 80242564 27A20028 */ addiu $v0, $sp, 0x28 -/* 911C18 80242568 E7A00010 */ swc1 $f0, 0x10($sp) -/* 911C1C 8024256C E7A20014 */ swc1 $f2, 0x14($sp) -/* 911C20 80242570 E7A40018 */ swc1 $f4, 0x18($sp) -/* 911C24 80242574 0C01BFA4 */ jal fx_emote -/* 911C28 80242578 AFA20020 */ sw $v0, 0x20($sp) -/* 911C2C 8024257C 0220202D */ daddu $a0, $s1, $zero -/* 911C30 80242580 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 911C34 80242584 0C012530 */ jal ai_enemy_play_sound -/* 911C38 80242588 3C060020 */ lui $a2, 0x20 -/* 911C3C 8024258C 2402000C */ addiu $v0, $zero, 0xc -/* 911C40 80242590 A622008E */ sh $v0, 0x8e($s1) -/* 911C44 80242594 24020002 */ addiu $v0, $zero, 2 -/* 911C48 80242598 AE620070 */ sw $v0, 0x70($s3) -.L8024259C: -/* 911C4C 8024259C 8E620074 */ lw $v0, 0x74($s3) -/* 911C50 802425A0 2442FFFF */ addiu $v0, $v0, -1 -/* 911C54 802425A4 AE620074 */ sw $v0, 0x74($s3) -/* 911C58 802425A8 8FBF0044 */ lw $ra, 0x44($sp) -/* 911C5C 802425AC 8FB40040 */ lw $s4, 0x40($sp) -/* 911C60 802425B0 8FB3003C */ lw $s3, 0x3c($sp) -/* 911C64 802425B4 8FB20038 */ lw $s2, 0x38($sp) -/* 911C68 802425B8 8FB10034 */ lw $s1, 0x34($sp) -/* 911C6C 802425BC 8FB00030 */ lw $s0, 0x30($sp) -/* 911C70 802425C0 03E00008 */ jr $ra -/* 911C74 802425C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s deleted file mode 100644 index f0183cc49a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802465D8_915C88 -.double 0.9 - -.section .text - -glabel func_80242958_912008 -/* 912008 80242958 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91200C 8024295C AFB30024 */ sw $s3, 0x24($sp) -/* 912010 80242960 0080982D */ daddu $s3, $a0, $zero -/* 912014 80242964 AFBF002C */ sw $ra, 0x2c($sp) -/* 912018 80242968 AFB40028 */ sw $s4, 0x28($sp) -/* 91201C 8024296C AFB20020 */ sw $s2, 0x20($sp) -/* 912020 80242970 AFB1001C */ sw $s1, 0x1c($sp) -/* 912024 80242974 AFB00018 */ sw $s0, 0x18($sp) -/* 912028 80242978 8E710148 */ lw $s1, 0x148($s3) -/* 91202C 8024297C 86240008 */ lh $a0, 8($s1) -/* 912030 80242980 0C00EABB */ jal get_npc_unsafe -/* 912034 80242984 00A0A02D */ daddu $s4, $a1, $zero -/* 912038 80242988 0040802D */ daddu $s0, $v0, $zero -/* 91203C 8024298C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 912040 80242990 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 912044 80242994 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912048 80242998 8E420000 */ lw $v0, ($s2) -/* 91204C 8024299C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 912050 802429A0 8C460028 */ lw $a2, 0x28($v0) -/* 912054 802429A4 0C00A720 */ jal atan2 -/* 912058 802429A8 8C470030 */ lw $a3, 0x30($v0) -/* 91205C 802429AC 3C025555 */ lui $v0, 0x5555 -/* 912060 802429B0 9603008E */ lhu $v1, 0x8e($s0) -/* 912064 802429B4 34425556 */ ori $v0, $v0, 0x5556 -/* 912068 802429B8 00031C00 */ sll $v1, $v1, 0x10 -/* 91206C 802429BC 00032403 */ sra $a0, $v1, 0x10 -/* 912070 802429C0 00820018 */ mult $a0, $v0 -/* 912074 802429C4 00031FC3 */ sra $v1, $v1, 0x1f -/* 912078 802429C8 00004010 */ mfhi $t0 -/* 91207C 802429CC 01031823 */ subu $v1, $t0, $v1 -/* 912080 802429D0 00031040 */ sll $v0, $v1, 1 -/* 912084 802429D4 00431021 */ addu $v0, $v0, $v1 -/* 912088 802429D8 00822023 */ subu $a0, $a0, $v0 -/* 91208C 802429DC 00042400 */ sll $a0, $a0, 0x10 -/* 912090 802429E0 1480000C */ bnez $a0, .L80242A14 -/* 912094 802429E4 E600000C */ swc1 $f0, 0xc($s0) -/* 912098 802429E8 C6020040 */ lwc1 $f2, 0x40($s0) -/* 91209C 802429EC 3C014000 */ lui $at, 0x4000 -/* 9120A0 802429F0 44810000 */ mtc1 $at, $f0 -/* 9120A4 802429F4 AFA00010 */ sw $zero, 0x10($sp) -/* 9120A8 802429F8 AFA00014 */ sw $zero, 0x14($sp) -/* 9120AC 802429FC 46001080 */ add.s $f2, $f2, $f0 -/* 9120B0 80242A00 8E06003C */ lw $a2, 0x3c($s0) -/* 9120B4 80242A04 8E050038 */ lw $a1, 0x38($s0) -/* 9120B8 80242A08 44071000 */ mfc1 $a3, $f2 -/* 9120BC 80242A0C 0C01BECC */ jal fx_walking_dust -/* 9120C0 80242A10 24040002 */ addiu $a0, $zero, 2 -.L80242A14: -/* 9120C4 80242A14 9602008E */ lhu $v0, 0x8e($s0) -/* 9120C8 80242A18 2442FFFF */ addiu $v0, $v0, -1 -/* 9120CC 80242A1C A602008E */ sh $v0, 0x8e($s0) -/* 9120D0 80242A20 00021400 */ sll $v0, $v0, 0x10 -/* 9120D4 80242A24 1C40002C */ bgtz $v0, .L80242AD8 -/* 9120D8 80242A28 00000000 */ nop -/* 9120DC 80242A2C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9120E0 80242A30 4600010D */ trunc.w.s $f4, $f0 -/* 9120E4 80242A34 44022000 */ mfc1 $v0, $f4 -/* 9120E8 80242A38 00000000 */ nop -/* 9120EC 80242A3C A6220010 */ sh $v0, 0x10($s1) -/* 9120F0 80242A40 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9120F4 80242A44 4600010D */ trunc.w.s $f4, $f0 -/* 9120F8 80242A48 44022000 */ mfc1 $v0, $f4 -/* 9120FC 80242A4C 00000000 */ nop -/* 912100 80242A50 A6220012 */ sh $v0, 0x12($s1) -/* 912104 80242A54 C6000040 */ lwc1 $f0, 0x40($s0) -/* 912108 80242A58 24020001 */ addiu $v0, $zero, 1 -/* 91210C 80242A5C A2220007 */ sb $v0, 7($s1) -/* 912110 80242A60 4600010D */ trunc.w.s $f4, $f0 -/* 912114 80242A64 44022000 */ mfc1 $v0, $f4 -/* 912118 80242A68 00000000 */ nop -/* 91211C 80242A6C A6220014 */ sh $v0, 0x14($s1) -/* 912120 80242A70 C6800018 */ lwc1 $f0, 0x18($s4) -/* 912124 80242A74 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912128 80242A78 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91212C 80242A7C 8E420000 */ lw $v0, ($s2) -/* 912130 80242A80 E6000018 */ swc1 $f0, 0x18($s0) -/* 912134 80242A84 8C460028 */ lw $a2, 0x28($v0) -/* 912138 80242A88 0C00A7B5 */ jal dist2D -/* 91213C 80242A8C 8C470030 */ lw $a3, 0x30($v0) -/* 912140 80242A90 C6020018 */ lwc1 $f2, 0x18($s0) -/* 912144 80242A94 46020003 */ div.s $f0, $f0, $f2 -/* 912148 80242A98 3C018024 */ lui $at, %hi(D_802465D8_915C88) -/* 91214C 80242A9C D42265D8 */ ldc1 $f2, %lo(D_802465D8_915C88)($at) -/* 912150 80242AA0 46000021 */ cvt.d.s $f0, $f0 -/* 912154 80242AA4 46220000 */ add.d $f0, $f0, $f2 -/* 912158 80242AA8 4620010D */ trunc.w.d $f4, $f0 -/* 91215C 80242AAC 44022000 */ mfc1 $v0, $f4 -/* 912160 80242AB0 00000000 */ nop -/* 912164 80242AB4 A602008E */ sh $v0, 0x8e($s0) -/* 912168 80242AB8 00021400 */ sll $v0, $v0, 0x10 -/* 91216C 80242ABC 00021403 */ sra $v0, $v0, 0x10 -/* 912170 80242AC0 2842000F */ slti $v0, $v0, 0xf -/* 912174 80242AC4 10400002 */ beqz $v0, .L80242AD0 -/* 912178 80242AC8 2402000F */ addiu $v0, $zero, 0xf -/* 91217C 80242ACC A602008E */ sh $v0, 0x8e($s0) -.L80242AD0: -/* 912180 80242AD0 24020016 */ addiu $v0, $zero, 0x16 -/* 912184 80242AD4 AE620070 */ sw $v0, 0x70($s3) -.L80242AD8: -/* 912188 80242AD8 8FBF002C */ lw $ra, 0x2c($sp) -/* 91218C 80242ADC 8FB40028 */ lw $s4, 0x28($sp) -/* 912190 80242AE0 8FB30024 */ lw $s3, 0x24($sp) -/* 912194 80242AE4 8FB20020 */ lw $s2, 0x20($sp) -/* 912198 80242AE8 8FB1001C */ lw $s1, 0x1c($sp) -/* 91219C 80242AEC 8FB00018 */ lw $s0, 0x18($sp) -/* 9121A0 80242AF0 03E00008 */ jr $ra -/* 9121A4 80242AF4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s deleted file mode 100644 index bc792118c1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802465E0_915C90 -.double 32767.0 - -.section .text - -glabel func_80242C48_9122F8 -/* 9122F8 80242C48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9122FC 80242C4C AFB20018 */ sw $s2, 0x18($sp) -/* 912300 80242C50 0080902D */ daddu $s2, $a0, $zero -/* 912304 80242C54 AFBF001C */ sw $ra, 0x1c($sp) -/* 912308 80242C58 AFB10014 */ sw $s1, 0x14($sp) -/* 91230C 80242C5C AFB00010 */ sw $s0, 0x10($sp) -/* 912310 80242C60 8E500148 */ lw $s0, 0x148($s2) -/* 912314 80242C64 86040008 */ lh $a0, 8($s0) -/* 912318 80242C68 0C00EABB */ jal get_npc_unsafe -/* 91231C 80242C6C 00A0882D */ daddu $s1, $a1, $zero -/* 912320 80242C70 0040182D */ daddu $v1, $v0, $zero -/* 912324 80242C74 9462008E */ lhu $v0, 0x8e($v1) -/* 912328 80242C78 2442FFFF */ addiu $v0, $v0, -1 -/* 91232C 80242C7C A462008E */ sh $v0, 0x8e($v1) -/* 912330 80242C80 00021400 */ sll $v0, $v0, 0x10 -/* 912334 80242C84 1C400015 */ bgtz $v0, .L80242CDC -/* 912338 80242C88 00000000 */ nop -/* 91233C 80242C8C 8E0200CC */ lw $v0, 0xcc($s0) -/* 912340 80242C90 8C420004 */ lw $v0, 4($v0) -/* 912344 80242C94 AC620028 */ sw $v0, 0x28($v1) -/* 912348 80242C98 8E0200D0 */ lw $v0, 0xd0($s0) -/* 91234C 80242C9C 8C420014 */ lw $v0, 0x14($v0) -/* 912350 80242CA0 04410004 */ bgez $v0, .L80242CB4 -/* 912354 80242CA4 00000000 */ nop -/* 912358 80242CA8 C6200000 */ lwc1 $f0, ($s1) -/* 91235C 80242CAC 08090B35 */ j .L80242CD4 -/* 912360 80242CB0 E4600018 */ swc1 $f0, 0x18($v1) -.L80242CB4: -/* 912364 80242CB4 3C018024 */ lui $at, %hi(D_802465E0_915C90) -/* 912368 80242CB8 D42265E0 */ ldc1 $f2, %lo(D_802465E0_915C90)($at) -/* 91236C 80242CBC 44820000 */ mtc1 $v0, $f0 -/* 912370 80242CC0 00000000 */ nop -/* 912374 80242CC4 46800021 */ cvt.d.w $f0, $f0 -/* 912378 80242CC8 46220003 */ div.d $f0, $f0, $f2 -/* 91237C 80242CCC 46200020 */ cvt.s.d $f0, $f0 -/* 912380 80242CD0 E4600018 */ swc1 $f0, 0x18($v1) -.L80242CD4: -/* 912384 80242CD4 24020029 */ addiu $v0, $zero, 0x29 -/* 912388 80242CD8 AE420070 */ sw $v0, 0x70($s2) -.L80242CDC: -/* 91238C 80242CDC 8FBF001C */ lw $ra, 0x1c($sp) -/* 912390 80242CE0 8FB20018 */ lw $s2, 0x18($sp) -/* 912394 80242CE4 8FB10014 */ lw $s1, 0x14($sp) -/* 912398 80242CE8 8FB00010 */ lw $s0, 0x10($sp) -/* 91239C 80242CEC 03E00008 */ jr $ra -/* 9123A0 80242CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s deleted file mode 100644 index bb0e2c4d12..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s +++ /dev/null @@ -1,250 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802465E8_915C98 -.word .L802430C8_912778, .L802430D8_912788, .L802430F8_9127A8, .L80243118_9127C8, .L80243138_9127E8, .L80243148_9127F8, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L80243160_912810, .L80243180_912830, .L802431A0_912850, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L802431C4_912874, .L802431D4_912884, .L802431EC_91289C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L80243204_9128B4, .L80243224_9128D4, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024327C_91292C, .L8024323C_9128EC, .L8024324C_9128FC, .L8024326C_91291C, 0 - -.section .text - -glabel func_80242F54_912604 -/* 912604 80242F54 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 912608 80242F58 AFB3003C */ sw $s3, 0x3c($sp) -/* 91260C 80242F5C 0080982D */ daddu $s3, $a0, $zero -/* 912610 80242F60 AFBF0048 */ sw $ra, 0x48($sp) -/* 912614 80242F64 AFB50044 */ sw $s5, 0x44($sp) -/* 912618 80242F68 AFB40040 */ sw $s4, 0x40($sp) -/* 91261C 80242F6C AFB20038 */ sw $s2, 0x38($sp) -/* 912620 80242F70 AFB10034 */ sw $s1, 0x34($sp) -/* 912624 80242F74 AFB00030 */ sw $s0, 0x30($sp) -/* 912628 80242F78 8E720148 */ lw $s2, 0x148($s3) -/* 91262C 80242F7C 86440008 */ lh $a0, 8($s2) -/* 912630 80242F80 0C00EABB */ jal get_npc_unsafe -/* 912634 80242F84 00A0882D */ daddu $s1, $a1, $zero -/* 912638 80242F88 0260202D */ daddu $a0, $s3, $zero -/* 91263C 80242F8C 8E70000C */ lw $s0, 0xc($s3) -/* 912640 80242F90 0040A82D */ daddu $s5, $v0, $zero -/* 912644 80242F94 8E050000 */ lw $a1, ($s0) -/* 912648 80242F98 0C0B1EAF */ jal evt_get_variable -/* 91264C 80242F9C 26100004 */ addiu $s0, $s0, 4 -/* 912650 80242FA0 0260202D */ daddu $a0, $s3, $zero -/* 912654 80242FA4 8E050000 */ lw $a1, ($s0) -/* 912658 80242FA8 0C0B1EAF */ jal evt_get_variable -/* 91265C 80242FAC 0040A02D */ daddu $s4, $v0, $zero -/* 912660 80242FB0 AE420094 */ sw $v0, 0x94($s2) -/* 912664 80242FB4 AFA00010 */ sw $zero, 0x10($sp) -/* 912668 80242FB8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91266C 80242FBC 8C420030 */ lw $v0, 0x30($v0) -/* 912670 80242FC0 AFA20014 */ sw $v0, 0x14($sp) -/* 912674 80242FC4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912678 80242FC8 8C42001C */ lw $v0, 0x1c($v0) -/* 91267C 80242FCC AFA20018 */ sw $v0, 0x18($sp) -/* 912680 80242FD0 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912684 80242FD4 8C420024 */ lw $v0, 0x24($v0) -/* 912688 80242FD8 AFA2001C */ sw $v0, 0x1c($sp) -/* 91268C 80242FDC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912690 80242FE0 8C420028 */ lw $v0, 0x28($v0) -/* 912694 80242FE4 AFA20020 */ sw $v0, 0x20($sp) -/* 912698 80242FE8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91269C 80242FEC 3C014220 */ lui $at, 0x4220 -/* 9126A0 80242FF0 44810000 */ mtc1 $at, $f0 -/* 9126A4 80242FF4 8C42002C */ lw $v0, 0x2c($v0) -/* 9126A8 80242FF8 27B00010 */ addiu $s0, $sp, 0x10 -/* 9126AC 80242FFC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9126B0 80243000 A7A0002C */ sh $zero, 0x2c($sp) -/* 9126B4 80243004 12200012 */ beqz $s1, .L80243050 -/* 9126B8 80243008 AFA20024 */ sw $v0, 0x24($sp) -/* 9126BC 8024300C AE600070 */ sw $zero, 0x70($s3) -/* 9126C0 80243010 8EA30000 */ lw $v1, ($s5) -/* 9126C4 80243014 2402F7FF */ addiu $v0, $zero, -0x801 -/* 9126C8 80243018 A6A0008E */ sh $zero, 0x8e($s5) -/* 9126CC 8024301C 00621824 */ and $v1, $v1, $v0 -/* 9126D0 80243020 AEA30000 */ sw $v1, ($s5) -/* 9126D4 80243024 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9126D8 80243028 8C420034 */ lw $v0, 0x34($v0) -/* 9126DC 8024302C 54400005 */ bnel $v0, $zero, .L80243044 -/* 9126E0 80243030 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9126E4 80243034 34620200 */ ori $v0, $v1, 0x200 -/* 9126E8 80243038 2403FFF7 */ addiu $v1, $zero, -9 -/* 9126EC 8024303C 08090C13 */ j .L8024304C -/* 9126F0 80243040 00431024 */ and $v0, $v0, $v1 -.L80243044: -/* 9126F4 80243044 00621024 */ and $v0, $v1, $v0 -/* 9126F8 80243048 34420008 */ ori $v0, $v0, 8 -.L8024304C: -/* 9126FC 8024304C AEA20000 */ sw $v0, ($s5) -.L80243050: -/* 912700 80243050 8E4300B0 */ lw $v1, 0xb0($s2) -/* 912704 80243054 30620004 */ andi $v0, $v1, 4 -/* 912708 80243058 10400007 */ beqz $v0, .L80243078 -/* 91270C 8024305C 00000000 */ nop -/* 912710 80243060 824200B4 */ lb $v0, 0xb4($s2) -/* 912714 80243064 14400086 */ bnez $v0, .L80243280 -/* 912718 80243068 0000102D */ daddu $v0, $zero, $zero -/* 91271C 8024306C 2402FFFB */ addiu $v0, $zero, -5 -/* 912720 80243070 00621024 */ and $v0, $v1, $v0 -/* 912724 80243074 AE4200B0 */ sw $v0, 0xb0($s2) -.L80243078: -/* 912728 80243078 8E620070 */ lw $v0, 0x70($s3) -/* 91272C 8024307C 2442FFF4 */ addiu $v0, $v0, -0xc -/* 912730 80243080 2C420003 */ sltiu $v0, $v0, 3 -/* 912734 80243084 10400007 */ beqz $v0, .L802430A4 -/* 912738 80243088 0260202D */ daddu $a0, $s3, $zero -/* 91273C 8024308C 0280282D */ daddu $a1, $s4, $zero -/* 912740 80243090 0C0908B1 */ jal func_802422C4_911974 -/* 912744 80243094 0200302D */ daddu $a2, $s0, $zero -/* 912748 80243098 10400002 */ beqz $v0, .L802430A4 -/* 91274C 8024309C 24020014 */ addiu $v0, $zero, 0x14 -/* 912750 802430A0 AE620070 */ sw $v0, 0x70($s3) -.L802430A4: -/* 912754 802430A4 8E630070 */ lw $v1, 0x70($s3) -/* 912758 802430A8 2C620035 */ sltiu $v0, $v1, 0x35 -/* 91275C 802430AC 10400073 */ beqz $v0, .L8024327C_91292C -/* 912760 802430B0 00031080 */ sll $v0, $v1, 2 -/* 912764 802430B4 3C018024 */ lui $at, %hi(jtbl_802465E8_915C98) -/* 912768 802430B8 00220821 */ addu $at, $at, $v0 -/* 91276C 802430BC 8C2265E8 */ lw $v0, %lo(jtbl_802465E8_915C98)($at) -/* 912770 802430C0 00400008 */ jr $v0 -/* 912774 802430C4 00000000 */ nop -.L802430C8_912778: -/* 912778 802430C8 0260202D */ daddu $a0, $s3, $zero -/* 91277C 802430CC 0280282D */ daddu $a1, $s4, $zero -/* 912780 802430D0 0C090909 */ jal iwa_01_UnkNpcAIFunc18 -/* 912784 802430D4 0200302D */ daddu $a2, $s0, $zero -.L802430D8_912788: -/* 912788 802430D8 0260202D */ daddu $a0, $s3, $zero -/* 91278C 802430DC 0280282D */ daddu $a1, $s4, $zero -/* 912790 802430E0 0C090926 */ jal func_80242498_911B48 -/* 912794 802430E4 0200302D */ daddu $a2, $s0, $zero -/* 912798 802430E8 8E630070 */ lw $v1, 0x70($s3) -/* 91279C 802430EC 24020002 */ addiu $v0, $zero, 2 -/* 9127A0 802430F0 14620063 */ bne $v1, $v0, .L80243280 -/* 9127A4 802430F4 0000102D */ daddu $v0, $zero, $zero -.L802430F8_9127A8: -/* 9127A8 802430F8 0260202D */ daddu $a0, $s3, $zero -/* 9127AC 802430FC 0280282D */ daddu $a1, $s4, $zero -/* 9127B0 80243100 0C090972 */ jal iwa_01_UnkNpcAIFunc21 -/* 9127B4 80243104 0200302D */ daddu $a2, $s0, $zero -/* 9127B8 80243108 8E630070 */ lw $v1, 0x70($s3) -/* 9127BC 8024310C 24020003 */ addiu $v0, $zero, 3 -/* 9127C0 80243110 1462005B */ bne $v1, $v0, .L80243280 -/* 9127C4 80243114 0000102D */ daddu $v0, $zero, $zero -.L80243118_9127C8: -/* 9127C8 80243118 0260202D */ daddu $a0, $s3, $zero -/* 9127CC 8024311C 0280282D */ daddu $a1, $s4, $zero -/* 9127D0 80243120 0C090999 */ jal iwa_01_UnkNpcAIFunc20 -/* 9127D4 80243124 0200302D */ daddu $a2, $s0, $zero -/* 9127D8 80243128 8E630070 */ lw $v1, 0x70($s3) -/* 9127DC 8024312C 24020004 */ addiu $v0, $zero, 4 -/* 9127E0 80243130 14620053 */ bne $v1, $v0, .L80243280 -/* 9127E4 80243134 0000102D */ daddu $v0, $zero, $zero -.L80243138_9127E8: -/* 9127E8 80243138 0260202D */ daddu $a0, $s3, $zero -/* 9127EC 8024313C 0280282D */ daddu $a1, $s4, $zero -/* 9127F0 80243140 0C0909BB */ jal iwa_01_UnkNpcAIFunc22 -/* 9127F4 80243144 0200302D */ daddu $a2, $s0, $zero -.L80243148_9127F8: -/* 9127F8 80243148 0260202D */ daddu $a0, $s3, $zero -/* 9127FC 8024314C 0280282D */ daddu $a1, $s4, $zero -/* 912800 80243150 0C0909E5 */ jal iwa_01_UnkFunc8 -/* 912804 80243154 0200302D */ daddu $a2, $s0, $zero -/* 912808 80243158 08090CA0 */ j .L80243280 -/* 91280C 8024315C 0000102D */ daddu $v0, $zero, $zero -.L80243160_912810: -/* 912810 80243160 0260202D */ daddu $a0, $s3, $zero -/* 912814 80243164 0280282D */ daddu $a1, $s4, $zero -/* 912818 80243168 0C0127DF */ jal func_80049F7C -/* 91281C 8024316C 0200302D */ daddu $a2, $s0, $zero -/* 912820 80243170 8E630070 */ lw $v1, 0x70($s3) -/* 912824 80243174 2402000D */ addiu $v0, $zero, 0xd -/* 912828 80243178 14620041 */ bne $v1, $v0, .L80243280 -/* 91282C 8024317C 0000102D */ daddu $v0, $zero, $zero -.L80243180_912830: -/* 912830 80243180 0260202D */ daddu $a0, $s3, $zero -/* 912834 80243184 0280282D */ daddu $a1, $s4, $zero -/* 912838 80243188 0C012849 */ jal func_8004A124 -/* 91283C 8024318C 0200302D */ daddu $a2, $s0, $zero -/* 912840 80243190 8E630070 */ lw $v1, 0x70($s3) -/* 912844 80243194 2402000E */ addiu $v0, $zero, 0xe -/* 912848 80243198 14620039 */ bne $v1, $v0, .L80243280 -/* 91284C 8024319C 0000102D */ daddu $v0, $zero, $zero -.L802431A0_912850: -/* 912850 802431A0 96A2008E */ lhu $v0, 0x8e($s5) -/* 912854 802431A4 2442FFFF */ addiu $v0, $v0, -1 -/* 912858 802431A8 A6A2008E */ sh $v0, 0x8e($s5) -/* 91285C 802431AC 00021400 */ sll $v0, $v0, 0x10 -/* 912860 802431B0 14400033 */ bnez $v0, .L80243280 -/* 912864 802431B4 0000102D */ daddu $v0, $zero, $zero -/* 912868 802431B8 24020028 */ addiu $v0, $zero, 0x28 -/* 91286C 802431BC 08090C9F */ j .L8024327C_91292C -/* 912870 802431C0 AE620070 */ sw $v0, 0x70($s3) -.L802431C4_912874: -/* 912874 802431C4 0260202D */ daddu $a0, $s3, $zero -/* 912878 802431C8 0280282D */ daddu $a1, $s4, $zero -/* 91287C 802431CC 0C090A42 */ jal iwa_01_UnkNpcAIFunc16 -/* 912880 802431D0 0200302D */ daddu $a2, $s0, $zero -.L802431D4_912884: -/* 912884 802431D4 0260202D */ daddu $a0, $s3, $zero -/* 912888 802431D8 0280282D */ daddu $a1, $s4, $zero -/* 91288C 802431DC 0C090A56 */ jal func_80242958_912008 -/* 912890 802431E0 0200302D */ daddu $a2, $s0, $zero -/* 912894 802431E4 08090CA0 */ j .L80243280 -/* 912898 802431E8 0000102D */ daddu $v0, $zero, $zero -.L802431EC_91289C: -/* 91289C 802431EC 0260202D */ daddu $a0, $s3, $zero -/* 9128A0 802431F0 0280282D */ daddu $a1, $s4, $zero -/* 9128A4 802431F4 0C090ABE */ jal iwa_01_UnkFunc10 -/* 9128A8 802431F8 0200302D */ daddu $a2, $s0, $zero -/* 9128AC 802431FC 08090CA0 */ j .L80243280 -/* 9128B0 80243200 0000102D */ daddu $v0, $zero, $zero -.L80243204_9128B4: -/* 9128B4 80243204 0260202D */ daddu $a0, $s3, $zero -/* 9128B8 80243208 0280282D */ daddu $a1, $s4, $zero -/* 9128BC 8024320C 0C090B12 */ jal func_80242C48_9122F8 -/* 9128C0 80243210 0200302D */ daddu $a2, $s0, $zero -/* 9128C4 80243214 8E630070 */ lw $v1, 0x70($s3) -/* 9128C8 80243218 24020029 */ addiu $v0, $zero, 0x29 -/* 9128CC 8024321C 14620018 */ bne $v1, $v0, .L80243280 -/* 9128D0 80243220 0000102D */ daddu $v0, $zero, $zero -.L80243224_9128D4: -/* 9128D4 80243224 0260202D */ daddu $a0, $s3, $zero -/* 9128D8 80243228 0280282D */ daddu $a1, $s4, $zero -/* 9128DC 8024322C 0C090B3D */ jal iwa_01_UnkFunc9 -/* 9128E0 80243230 0200302D */ daddu $a2, $s0, $zero -/* 9128E4 80243234 08090CA0 */ j .L80243280 -/* 9128E8 80243238 0000102D */ daddu $v0, $zero, $zero -.L8024323C_9128EC: -/* 9128EC 8024323C 0260202D */ daddu $a0, $s3, $zero -/* 9128F0 80243240 0280282D */ daddu $a1, $s4, $zero -/* 9128F4 80243244 0C090B8B */ jal iwa_01_UnkNpcAIFunc19 -/* 9128F8 80243248 0200302D */ daddu $a2, $s0, $zero -.L8024324C_9128FC: -/* 9128FC 8024324C 0260202D */ daddu $a0, $s3, $zero -/* 912900 80243250 0280282D */ daddu $a1, $s4, $zero -/* 912904 80243254 0C090BAA */ jal iwa_01_UnkNpcAIFunc17 -/* 912908 80243258 0200302D */ daddu $a2, $s0, $zero -/* 91290C 8024325C 8E630070 */ lw $v1, 0x70($s3) -/* 912910 80243260 24020034 */ addiu $v0, $zero, 0x34 -/* 912914 80243264 14620006 */ bne $v1, $v0, .L80243280 -/* 912918 80243268 0000102D */ daddu $v0, $zero, $zero -.L8024326C_91291C: -/* 91291C 8024326C 0260202D */ daddu $a0, $s3, $zero -/* 912920 80243270 0280282D */ daddu $a1, $s4, $zero -/* 912924 80243274 0C090BC4 */ jal dup_iwa_01_UnkDurationCheck -/* 912928 80243278 0200302D */ daddu $a2, $s0, $zero -.L8024327C_91292C: -/* 91292C 8024327C 0000102D */ daddu $v0, $zero, $zero -.L80243280: -/* 912930 80243280 8FBF0048 */ lw $ra, 0x48($sp) -/* 912934 80243284 8FB50044 */ lw $s5, 0x44($sp) -/* 912938 80243288 8FB40040 */ lw $s4, 0x40($sp) -/* 91293C 8024328C 8FB3003C */ lw $s3, 0x3c($sp) -/* 912940 80243290 8FB20038 */ lw $s2, 0x38($sp) -/* 912944 80243294 8FB10034 */ lw $s1, 0x34($sp) -/* 912948 80243298 8FB00030 */ lw $s0, 0x30($sp) -/* 91294C 8024329C 03E00008 */ jr $ra -/* 912950 802432A0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 912954 802432A4 00000000 */ nop -/* 912958 802432A8 00000000 */ nop -/* 91295C 802432AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s deleted file mode 100644 index fb2287e4a2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432B0_912960 -/* 912960 802432B0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 912964 802432B4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 912968 802432B8 8C430000 */ lw $v1, ($v0) -/* 91296C 802432BC 8C840084 */ lw $a0, 0x84($a0) -/* 912970 802432C0 34630010 */ ori $v1, $v1, 0x10 -/* 912974 802432C4 AC4400D0 */ sw $a0, 0xd0($v0) -/* 912978 802432C8 AC430000 */ sw $v1, ($v0) -/* 91297C 802432CC 03E00008 */ jr $ra -/* 912980 802432D0 24020002 */ addiu $v0, $zero, 2 -/* 912984 802432D4 00000000 */ nop -/* 912988 802432D8 00000000 */ nop -/* 91298C 802432DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s deleted file mode 100644 index 9a6240f971..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242D40_918AB0 -.double 180.0 - -dlabel D_80242D48_918AB8 -.double 75.0 - -.section .text - -glabel func_80240000_915D70 -/* 915D70 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 915D74 80240004 AFBF001C */ sw $ra, 0x1c($sp) -/* 915D78 80240008 AFB20018 */ sw $s2, 0x18($sp) -/* 915D7C 8024000C AFB10014 */ sw $s1, 0x14($sp) -/* 915D80 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* 915D84 80240014 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 915D88 80240018 8C900148 */ lw $s0, 0x148($a0) -/* 915D8C 8024001C 86040008 */ lh $a0, 8($s0) -/* 915D90 80240020 3C014387 */ lui $at, 0x4387 -/* 915D94 80240024 4481A000 */ mtc1 $at, $f20 -/* 915D98 80240028 0C00EABB */ jal get_npc_unsafe -/* 915D9C 8024002C 00A0882D */ daddu $s1, $a1, $zero -/* 915DA0 80240030 0200202D */ daddu $a0, $s0, $zero -/* 915DA4 80240034 8E26000C */ lw $a2, 0xc($s1) -/* 915DA8 80240038 8E270010 */ lw $a3, 0x10($s1) -/* 915DAC 8024003C 0040882D */ daddu $s1, $v0, $zero -/* 915DB0 80240040 3C03800B */ lui $v1, %hi(gCameras) -/* 915DB4 80240044 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 915DB8 80240048 3C02800A */ lui $v0, %hi(gCurrentCamID) -/* 915DBC 8024004C 8442A634 */ lh $v0, %lo(gCurrentCamID)($v0) -/* 915DC0 80240050 0000282D */ daddu $a1, $zero, $zero -/* 915DC4 80240054 00028080 */ sll $s0, $v0, 2 -/* 915DC8 80240058 02028021 */ addu $s0, $s0, $v0 -/* 915DCC 8024005C 00108080 */ sll $s0, $s0, 2 -/* 915DD0 80240060 02028023 */ subu $s0, $s0, $v0 -/* 915DD4 80240064 001010C0 */ sll $v0, $s0, 3 -/* 915DD8 80240068 02028021 */ addu $s0, $s0, $v0 -/* 915DDC 8024006C 001080C0 */ sll $s0, $s0, 3 -/* 915DE0 80240070 0C0124FB */ jal func_800493EC -/* 915DE4 80240074 02038021 */ addu $s0, $s0, $v1 -/* 915DE8 80240078 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 915DEC 8024007C C62E000C */ lwc1 $f14, 0xc($s1) -/* 915DF0 80240080 0C00A70A */ jal get_clamped_angle_diff -/* 915DF4 80240084 0002802B */ sltu $s0, $zero, $v0 -/* 915DF8 80240088 0C00A6C9 */ jal clamp_angle -/* 915DFC 8024008C 46000306 */ mov.s $f12, $f0 -/* 915E00 80240090 3C018024 */ lui $at, %hi(D_80242D40_918AB0) -/* 915E04 80240094 D4222D40 */ ldc1 $f2, %lo(D_80242D40_918AB0)($at) -/* 915E08 80240098 46000021 */ cvt.d.s $f0, $f0 -/* 915E0C 8024009C 4622003C */ c.lt.d $f0, $f2 -/* 915E10 802400A0 00000000 */ nop -/* 915E14 802400A4 45000003 */ bc1f .L802400B4 -/* 915E18 802400A8 00000000 */ nop -/* 915E1C 802400AC 3C0142B4 */ lui $at, 0x42b4 -/* 915E20 802400B0 4481A000 */ mtc1 $at, $f20 -.L802400B4: -/* 915E24 802400B4 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 915E28 802400B8 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 915E2C 802400BC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 915E30 802400C0 8E420000 */ lw $v0, ($s2) -/* 915E34 802400C4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 915E38 802400C8 8C460028 */ lw $a2, 0x28($v0) -/* 915E3C 802400CC 0C00A720 */ jal atan2 -/* 915E40 802400D0 8C470030 */ lw $a3, 0x30($v0) -/* 915E44 802400D4 4600A306 */ mov.s $f12, $f20 -/* 915E48 802400D8 0C00A70A */ jal get_clamped_angle_diff -/* 915E4C 802400DC 46000386 */ mov.s $f14, $f0 -/* 915E50 802400E0 46000005 */ abs.s $f0, $f0 -/* 915E54 802400E4 3C018024 */ lui $at, %hi(D_80242D48_918AB8) -/* 915E58 802400E8 D4222D48 */ ldc1 $f2, %lo(D_80242D48_918AB8)($at) -/* 915E5C 802400EC 46000021 */ cvt.d.s $f0, $f0 -/* 915E60 802400F0 4620103C */ c.lt.d $f2, $f0 -/* 915E64 802400F4 00000000 */ nop -/* 915E68 802400F8 45030001 */ bc1tl .L80240100 -/* 915E6C 802400FC 0000802D */ daddu $s0, $zero, $zero -.L80240100: -/* 915E70 80240100 8E420000 */ lw $v0, ($s2) -/* 915E74 80240104 C620003C */ lwc1 $f0, 0x3c($s1) -/* 915E78 80240108 C442002C */ lwc1 $f2, 0x2c($v0) -/* 915E7C 8024010C 46020001 */ sub.s $f0, $f0, $f2 -/* 915E80 80240110 3C014220 */ lui $at, 0x4220 -/* 915E84 80240114 44811000 */ mtc1 $at, $f2 -/* 915E88 80240118 46000005 */ abs.s $f0, $f0 -/* 915E8C 8024011C 4600103E */ c.le.s $f2, $f0 -/* 915E90 80240120 00000000 */ nop -/* 915E94 80240124 45030001 */ bc1tl .L8024012C -/* 915E98 80240128 0000802D */ daddu $s0, $zero, $zero -.L8024012C: -/* 915E9C 8024012C 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* 915EA0 80240130 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* 915EA4 80240134 24020009 */ addiu $v0, $zero, 9 -/* 915EA8 80240138 50620001 */ beql $v1, $v0, .L80240140 -/* 915EAC 8024013C 0000802D */ daddu $s0, $zero, $zero -.L80240140: -/* 915EB0 80240140 0200102D */ daddu $v0, $s0, $zero -/* 915EB4 80240144 8FBF001C */ lw $ra, 0x1c($sp) -/* 915EB8 80240148 8FB20018 */ lw $s2, 0x18($sp) -/* 915EBC 8024014C 8FB10014 */ lw $s1, 0x14($sp) -/* 915EC0 80240150 8FB00010 */ lw $s0, 0x10($sp) -/* 915EC4 80240154 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 915EC8 80240158 03E00008 */ jr $ra -/* 915ECC 8024015C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s deleted file mode 100644 index 3006a301d1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242D50_918AC0 -.double 0.85 - -.section .text - -glabel func_802401D4_915F44 -/* 915F44 802401D4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 915F48 802401D8 AFB3003C */ sw $s3, 0x3c($sp) -/* 915F4C 802401DC 0080982D */ daddu $s3, $a0, $zero -/* 915F50 802401E0 AFBF0044 */ sw $ra, 0x44($sp) -/* 915F54 802401E4 AFB40040 */ sw $s4, 0x40($sp) -/* 915F58 802401E8 AFB20038 */ sw $s2, 0x38($sp) -/* 915F5C 802401EC AFB10034 */ sw $s1, 0x34($sp) -/* 915F60 802401F0 AFB00030 */ sw $s0, 0x30($sp) -/* 915F64 802401F4 8E700148 */ lw $s0, 0x148($s3) -/* 915F68 802401F8 00A0902D */ daddu $s2, $a1, $zero -/* 915F6C 802401FC 86040008 */ lh $a0, 8($s0) -/* 915F70 80240200 0C00EABB */ jal get_npc_unsafe -/* 915F74 80240204 00C0A02D */ daddu $s4, $a2, $zero -/* 915F78 80240208 8E630074 */ lw $v1, 0x74($s3) -/* 915F7C 8024020C 1C600032 */ bgtz $v1, .L802402D8 -/* 915F80 80240210 0040882D */ daddu $s1, $v0, $zero -/* 915F84 80240214 8E420014 */ lw $v0, 0x14($s2) -/* 915F88 80240218 AE620074 */ sw $v0, 0x74($s3) -/* 915F8C 8024021C C640000C */ lwc1 $f0, 0xc($s2) -/* 915F90 80240220 3C018024 */ lui $at, %hi(D_80242D50_918AC0) -/* 915F94 80240224 D4222D50 */ ldc1 $f2, %lo(D_80242D50_918AC0)($at) -/* 915F98 80240228 46000021 */ cvt.d.s $f0, $f0 -/* 915F9C 8024022C 46220002 */ mul.d $f0, $f0, $f2 -/* 915FA0 80240230 00000000 */ nop -/* 915FA4 80240234 0280202D */ daddu $a0, $s4, $zero -/* 915FA8 80240238 AFA00010 */ sw $zero, 0x10($sp) -/* 915FAC 8024023C 8E470010 */ lw $a3, 0x10($s2) -/* 915FB0 80240240 46200020 */ cvt.s.d $f0, $f0 -/* 915FB4 80240244 44060000 */ mfc1 $a2, $f0 -/* 915FB8 80240248 0C01242D */ jal func_800490B4 -/* 915FBC 8024024C 0200282D */ daddu $a1, $s0, $zero -/* 915FC0 80240250 10400021 */ beqz $v0, .L802402D8 -/* 915FC4 80240254 0000202D */ daddu $a0, $zero, $zero -/* 915FC8 80240258 0220282D */ daddu $a1, $s1, $zero -/* 915FCC 8024025C 0000302D */ daddu $a2, $zero, $zero -/* 915FD0 80240260 8E0200CC */ lw $v0, 0xcc($s0) -/* 915FD4 80240264 3C013F80 */ lui $at, 0x3f80 -/* 915FD8 80240268 44810000 */ mtc1 $at, $f0 -/* 915FDC 8024026C 3C014000 */ lui $at, 0x4000 -/* 915FE0 80240270 44811000 */ mtc1 $at, $f2 -/* 915FE4 80240274 8C430024 */ lw $v1, 0x24($v0) -/* 915FE8 80240278 862200A8 */ lh $v0, 0xa8($s1) -/* 915FEC 8024027C 3C01C1A0 */ lui $at, 0xc1a0 -/* 915FF0 80240280 44812000 */ mtc1 $at, $f4 -/* 915FF4 80240284 44823000 */ mtc1 $v0, $f6 -/* 915FF8 80240288 00000000 */ nop -/* 915FFC 8024028C 468031A0 */ cvt.s.w $f6, $f6 -/* 916000 80240290 44073000 */ mfc1 $a3, $f6 -/* 916004 80240294 2402000F */ addiu $v0, $zero, 0xf -/* 916008 80240298 AE230028 */ sw $v1, 0x28($s1) -/* 91600C 8024029C AFA2001C */ sw $v0, 0x1c($sp) -/* 916010 802402A0 27A20028 */ addiu $v0, $sp, 0x28 -/* 916014 802402A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 916018 802402A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 91601C 802402AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 916020 802402B0 0C01BFA4 */ jal fx_emote -/* 916024 802402B4 AFA20020 */ sw $v0, 0x20($sp) -/* 916028 802402B8 0220202D */ daddu $a0, $s1, $zero -/* 91602C 802402BC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 916030 802402C0 0C012530 */ jal ai_enemy_play_sound -/* 916034 802402C4 3C060020 */ lui $a2, 0x20 -/* 916038 802402C8 2402000C */ addiu $v0, $zero, 0xc -/* 91603C 802402CC A622008E */ sh $v0, 0x8e($s1) -/* 916040 802402D0 24020002 */ addiu $v0, $zero, 2 -/* 916044 802402D4 AE620070 */ sw $v0, 0x70($s3) -.L802402D8: -/* 916048 802402D8 8E620074 */ lw $v0, 0x74($s3) -/* 91604C 802402DC 2442FFFF */ addiu $v0, $v0, -1 -/* 916050 802402E0 AE620074 */ sw $v0, 0x74($s3) -/* 916054 802402E4 8FBF0044 */ lw $ra, 0x44($sp) -/* 916058 802402E8 8FB40040 */ lw $s4, 0x40($sp) -/* 91605C 802402EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 916060 802402F0 8FB20038 */ lw $s2, 0x38($sp) -/* 916064 802402F4 8FB10034 */ lw $s1, 0x34($sp) -/* 916068 802402F8 8FB00030 */ lw $s0, 0x30($sp) -/* 91606C 802402FC 03E00008 */ jr $ra -/* 916070 80240300 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s deleted file mode 100644 index c9fdd7c396..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242D58_918AC8 -.double 0.9 - -.section .text - -glabel func_80240694_916404 -/* 916404 80240694 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 916408 80240698 AFB30024 */ sw $s3, 0x24($sp) -/* 91640C 8024069C 0080982D */ daddu $s3, $a0, $zero -/* 916410 802406A0 AFBF002C */ sw $ra, 0x2c($sp) -/* 916414 802406A4 AFB40028 */ sw $s4, 0x28($sp) -/* 916418 802406A8 AFB20020 */ sw $s2, 0x20($sp) -/* 91641C 802406AC AFB1001C */ sw $s1, 0x1c($sp) -/* 916420 802406B0 AFB00018 */ sw $s0, 0x18($sp) -/* 916424 802406B4 8E710148 */ lw $s1, 0x148($s3) -/* 916428 802406B8 86240008 */ lh $a0, 8($s1) -/* 91642C 802406BC 0C00EABB */ jal get_npc_unsafe -/* 916430 802406C0 00A0A02D */ daddu $s4, $a1, $zero -/* 916434 802406C4 0040802D */ daddu $s0, $v0, $zero -/* 916438 802406C8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 91643C 802406CC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 916440 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916444 802406D4 8E420000 */ lw $v0, ($s2) -/* 916448 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91644C 802406DC 8C460028 */ lw $a2, 0x28($v0) -/* 916450 802406E0 0C00A720 */ jal atan2 -/* 916454 802406E4 8C470030 */ lw $a3, 0x30($v0) -/* 916458 802406E8 3C025555 */ lui $v0, 0x5555 -/* 91645C 802406EC 9603008E */ lhu $v1, 0x8e($s0) -/* 916460 802406F0 34425556 */ ori $v0, $v0, 0x5556 -/* 916464 802406F4 00031C00 */ sll $v1, $v1, 0x10 -/* 916468 802406F8 00032403 */ sra $a0, $v1, 0x10 -/* 91646C 802406FC 00820018 */ mult $a0, $v0 -/* 916470 80240700 00031FC3 */ sra $v1, $v1, 0x1f -/* 916474 80240704 00004010 */ mfhi $t0 -/* 916478 80240708 01031823 */ subu $v1, $t0, $v1 -/* 91647C 8024070C 00031040 */ sll $v0, $v1, 1 -/* 916480 80240710 00431021 */ addu $v0, $v0, $v1 -/* 916484 80240714 00822023 */ subu $a0, $a0, $v0 -/* 916488 80240718 00042400 */ sll $a0, $a0, 0x10 -/* 91648C 8024071C 1480000C */ bnez $a0, .L80240750 -/* 916490 80240720 E600000C */ swc1 $f0, 0xc($s0) -/* 916494 80240724 C6020040 */ lwc1 $f2, 0x40($s0) -/* 916498 80240728 3C014000 */ lui $at, 0x4000 -/* 91649C 8024072C 44810000 */ mtc1 $at, $f0 -/* 9164A0 80240730 AFA00010 */ sw $zero, 0x10($sp) -/* 9164A4 80240734 AFA00014 */ sw $zero, 0x14($sp) -/* 9164A8 80240738 46001080 */ add.s $f2, $f2, $f0 -/* 9164AC 8024073C 8E06003C */ lw $a2, 0x3c($s0) -/* 9164B0 80240740 8E050038 */ lw $a1, 0x38($s0) -/* 9164B4 80240744 44071000 */ mfc1 $a3, $f2 -/* 9164B8 80240748 0C01BECC */ jal fx_walking_dust -/* 9164BC 8024074C 24040002 */ addiu $a0, $zero, 2 -.L80240750: -/* 9164C0 80240750 9602008E */ lhu $v0, 0x8e($s0) -/* 9164C4 80240754 2442FFFF */ addiu $v0, $v0, -1 -/* 9164C8 80240758 A602008E */ sh $v0, 0x8e($s0) -/* 9164CC 8024075C 00021400 */ sll $v0, $v0, 0x10 -/* 9164D0 80240760 1C40002C */ bgtz $v0, .L80240814 -/* 9164D4 80240764 00000000 */ nop -/* 9164D8 80240768 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9164DC 8024076C 4600010D */ trunc.w.s $f4, $f0 -/* 9164E0 80240770 44022000 */ mfc1 $v0, $f4 -/* 9164E4 80240774 00000000 */ nop -/* 9164E8 80240778 A6220010 */ sh $v0, 0x10($s1) -/* 9164EC 8024077C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9164F0 80240780 4600010D */ trunc.w.s $f4, $f0 -/* 9164F4 80240784 44022000 */ mfc1 $v0, $f4 -/* 9164F8 80240788 00000000 */ nop -/* 9164FC 8024078C A6220012 */ sh $v0, 0x12($s1) -/* 916500 80240790 C6000040 */ lwc1 $f0, 0x40($s0) -/* 916504 80240794 24020001 */ addiu $v0, $zero, 1 -/* 916508 80240798 A2220007 */ sb $v0, 7($s1) -/* 91650C 8024079C 4600010D */ trunc.w.s $f4, $f0 -/* 916510 802407A0 44022000 */ mfc1 $v0, $f4 -/* 916514 802407A4 00000000 */ nop -/* 916518 802407A8 A6220014 */ sh $v0, 0x14($s1) -/* 91651C 802407AC C6800018 */ lwc1 $f0, 0x18($s4) -/* 916520 802407B0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916524 802407B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 916528 802407B8 8E420000 */ lw $v0, ($s2) -/* 91652C 802407BC E6000018 */ swc1 $f0, 0x18($s0) -/* 916530 802407C0 8C460028 */ lw $a2, 0x28($v0) -/* 916534 802407C4 0C00A7B5 */ jal dist2D -/* 916538 802407C8 8C470030 */ lw $a3, 0x30($v0) -/* 91653C 802407CC C6020018 */ lwc1 $f2, 0x18($s0) -/* 916540 802407D0 46020003 */ div.s $f0, $f0, $f2 -/* 916544 802407D4 3C018024 */ lui $at, %hi(D_80242D58_918AC8) -/* 916548 802407D8 D4222D58 */ ldc1 $f2, %lo(D_80242D58_918AC8)($at) -/* 91654C 802407DC 46000021 */ cvt.d.s $f0, $f0 -/* 916550 802407E0 46220000 */ add.d $f0, $f0, $f2 -/* 916554 802407E4 4620010D */ trunc.w.d $f4, $f0 -/* 916558 802407E8 44022000 */ mfc1 $v0, $f4 -/* 91655C 802407EC 00000000 */ nop -/* 916560 802407F0 A602008E */ sh $v0, 0x8e($s0) -/* 916564 802407F4 00021400 */ sll $v0, $v0, 0x10 -/* 916568 802407F8 00021403 */ sra $v0, $v0, 0x10 -/* 91656C 802407FC 2842000F */ slti $v0, $v0, 0xf -/* 916570 80240800 10400002 */ beqz $v0, .L8024080C -/* 916574 80240804 2402000F */ addiu $v0, $zero, 0xf -/* 916578 80240808 A602008E */ sh $v0, 0x8e($s0) -.L8024080C: -/* 91657C 8024080C 24020016 */ addiu $v0, $zero, 0x16 -/* 916580 80240810 AE620070 */ sw $v0, 0x70($s3) -.L80240814: -/* 916584 80240814 8FBF002C */ lw $ra, 0x2c($sp) -/* 916588 80240818 8FB40028 */ lw $s4, 0x28($sp) -/* 91658C 8024081C 8FB30024 */ lw $s3, 0x24($sp) -/* 916590 80240820 8FB20020 */ lw $s2, 0x20($sp) -/* 916594 80240824 8FB1001C */ lw $s1, 0x1c($sp) -/* 916598 80240828 8FB00018 */ lw $s0, 0x18($sp) -/* 91659C 8024082C 03E00008 */ jr $ra -/* 9165A0 80240830 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s deleted file mode 100644 index fab6beed36..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242D60_918AD0 -.double 32767.0 - -.section .text - -glabel func_80240984_9166F4 -/* 9166F4 80240984 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9166F8 80240988 AFB20018 */ sw $s2, 0x18($sp) -/* 9166FC 8024098C 0080902D */ daddu $s2, $a0, $zero -/* 916700 80240990 AFBF001C */ sw $ra, 0x1c($sp) -/* 916704 80240994 AFB10014 */ sw $s1, 0x14($sp) -/* 916708 80240998 AFB00010 */ sw $s0, 0x10($sp) -/* 91670C 8024099C 8E500148 */ lw $s0, 0x148($s2) -/* 916710 802409A0 86040008 */ lh $a0, 8($s0) -/* 916714 802409A4 0C00EABB */ jal get_npc_unsafe -/* 916718 802409A8 00A0882D */ daddu $s1, $a1, $zero -/* 91671C 802409AC 0040182D */ daddu $v1, $v0, $zero -/* 916720 802409B0 9462008E */ lhu $v0, 0x8e($v1) -/* 916724 802409B4 2442FFFF */ addiu $v0, $v0, -1 -/* 916728 802409B8 A462008E */ sh $v0, 0x8e($v1) -/* 91672C 802409BC 00021400 */ sll $v0, $v0, 0x10 -/* 916730 802409C0 1C400015 */ bgtz $v0, .L80240A18 -/* 916734 802409C4 00000000 */ nop -/* 916738 802409C8 8E0200CC */ lw $v0, 0xcc($s0) -/* 91673C 802409CC 8C420004 */ lw $v0, 4($v0) -/* 916740 802409D0 AC620028 */ sw $v0, 0x28($v1) -/* 916744 802409D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* 916748 802409D8 8C420014 */ lw $v0, 0x14($v0) -/* 91674C 802409DC 04410004 */ bgez $v0, .L802409F0 -/* 916750 802409E0 00000000 */ nop -/* 916754 802409E4 C6200000 */ lwc1 $f0, ($s1) -/* 916758 802409E8 08090284 */ j .L80240A10 -/* 91675C 802409EC E4600018 */ swc1 $f0, 0x18($v1) -.L802409F0: -/* 916760 802409F0 3C018024 */ lui $at, %hi(D_80242D60_918AD0) -/* 916764 802409F4 D4222D60 */ ldc1 $f2, %lo(D_80242D60_918AD0)($at) -/* 916768 802409F8 44820000 */ mtc1 $v0, $f0 -/* 91676C 802409FC 00000000 */ nop -/* 916770 80240A00 46800021 */ cvt.d.w $f0, $f0 -/* 916774 80240A04 46220003 */ div.d $f0, $f0, $f2 -/* 916778 80240A08 46200020 */ cvt.s.d $f0, $f0 -/* 91677C 80240A0C E4600018 */ swc1 $f0, 0x18($v1) -.L80240A10: -/* 916780 80240A10 24020029 */ addiu $v0, $zero, 0x29 -/* 916784 80240A14 AE420070 */ sw $v0, 0x70($s2) -.L80240A18: -/* 916788 80240A18 8FBF001C */ lw $ra, 0x1c($sp) -/* 91678C 80240A1C 8FB20018 */ lw $s2, 0x18($sp) -/* 916790 80240A20 8FB10014 */ lw $s1, 0x14($sp) -/* 916794 80240A24 8FB00010 */ lw $s0, 0x10($sp) -/* 916798 80240A28 03E00008 */ jr $ra -/* 91679C 80240A2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s deleted file mode 100644 index 1f34181c73..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s +++ /dev/null @@ -1,247 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242D68_918AD8 -.word .L80240E04_916B74, .L80240E14_916B84, .L80240E34_916BA4, .L80240E54_916BC4, .L80240E74_916BE4, .L80240E84_916BF4, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240E9C_916C0C, .L80240EBC_916C2C, .L80240EDC_916C4C, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240F00_916C70, .L80240F10_916C80, .L80240F28_916C98, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240F40_916CB0, .L80240F60_916CD0, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240FB8_916D28, .L80240F78_916CE8, .L80240F88_916CF8, .L80240FA8_916D18, 0 - -.section .text - -glabel func_80240C90_916A00 -/* 916A00 80240C90 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 916A04 80240C94 AFB3003C */ sw $s3, 0x3c($sp) -/* 916A08 80240C98 0080982D */ daddu $s3, $a0, $zero -/* 916A0C 80240C9C AFBF0048 */ sw $ra, 0x48($sp) -/* 916A10 80240CA0 AFB50044 */ sw $s5, 0x44($sp) -/* 916A14 80240CA4 AFB40040 */ sw $s4, 0x40($sp) -/* 916A18 80240CA8 AFB20038 */ sw $s2, 0x38($sp) -/* 916A1C 80240CAC AFB10034 */ sw $s1, 0x34($sp) -/* 916A20 80240CB0 AFB00030 */ sw $s0, 0x30($sp) -/* 916A24 80240CB4 8E720148 */ lw $s2, 0x148($s3) -/* 916A28 80240CB8 86440008 */ lh $a0, 8($s2) -/* 916A2C 80240CBC 0C00EABB */ jal get_npc_unsafe -/* 916A30 80240CC0 00A0882D */ daddu $s1, $a1, $zero -/* 916A34 80240CC4 0260202D */ daddu $a0, $s3, $zero -/* 916A38 80240CC8 8E70000C */ lw $s0, 0xc($s3) -/* 916A3C 80240CCC 0040A82D */ daddu $s5, $v0, $zero -/* 916A40 80240CD0 8E050000 */ lw $a1, ($s0) -/* 916A44 80240CD4 0C0B1EAF */ jal evt_get_variable -/* 916A48 80240CD8 26100004 */ addiu $s0, $s0, 4 -/* 916A4C 80240CDC 0260202D */ daddu $a0, $s3, $zero -/* 916A50 80240CE0 8E050000 */ lw $a1, ($s0) -/* 916A54 80240CE4 0C0B1EAF */ jal evt_get_variable -/* 916A58 80240CE8 0040A02D */ daddu $s4, $v0, $zero -/* 916A5C 80240CEC AE420094 */ sw $v0, 0x94($s2) -/* 916A60 80240CF0 AFA00010 */ sw $zero, 0x10($sp) -/* 916A64 80240CF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A68 80240CF8 8C420030 */ lw $v0, 0x30($v0) -/* 916A6C 80240CFC AFA20014 */ sw $v0, 0x14($sp) -/* 916A70 80240D00 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A74 80240D04 8C42001C */ lw $v0, 0x1c($v0) -/* 916A78 80240D08 AFA20018 */ sw $v0, 0x18($sp) -/* 916A7C 80240D0C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A80 80240D10 8C420024 */ lw $v0, 0x24($v0) -/* 916A84 80240D14 AFA2001C */ sw $v0, 0x1c($sp) -/* 916A88 80240D18 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A8C 80240D1C 8C420028 */ lw $v0, 0x28($v0) -/* 916A90 80240D20 AFA20020 */ sw $v0, 0x20($sp) -/* 916A94 80240D24 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A98 80240D28 3C014220 */ lui $at, 0x4220 -/* 916A9C 80240D2C 44810000 */ mtc1 $at, $f0 -/* 916AA0 80240D30 8C42002C */ lw $v0, 0x2c($v0) -/* 916AA4 80240D34 27B00010 */ addiu $s0, $sp, 0x10 -/* 916AA8 80240D38 E7A00028 */ swc1 $f0, 0x28($sp) -/* 916AAC 80240D3C A7A0002C */ sh $zero, 0x2c($sp) -/* 916AB0 80240D40 12200012 */ beqz $s1, .L80240D8C -/* 916AB4 80240D44 AFA20024 */ sw $v0, 0x24($sp) -/* 916AB8 80240D48 AE600070 */ sw $zero, 0x70($s3) -/* 916ABC 80240D4C 8EA30000 */ lw $v1, ($s5) -/* 916AC0 80240D50 2402F7FF */ addiu $v0, $zero, -0x801 -/* 916AC4 80240D54 A6A0008E */ sh $zero, 0x8e($s5) -/* 916AC8 80240D58 00621824 */ and $v1, $v1, $v0 -/* 916ACC 80240D5C AEA30000 */ sw $v1, ($s5) -/* 916AD0 80240D60 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916AD4 80240D64 8C420034 */ lw $v0, 0x34($v0) -/* 916AD8 80240D68 54400005 */ bnel $v0, $zero, .L80240D80 -/* 916ADC 80240D6C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 916AE0 80240D70 34620200 */ ori $v0, $v1, 0x200 -/* 916AE4 80240D74 2403FFF7 */ addiu $v1, $zero, -9 -/* 916AE8 80240D78 08090362 */ j .L80240D88 -/* 916AEC 80240D7C 00431024 */ and $v0, $v0, $v1 -.L80240D80: -/* 916AF0 80240D80 00621024 */ and $v0, $v1, $v0 -/* 916AF4 80240D84 34420008 */ ori $v0, $v0, 8 -.L80240D88: -/* 916AF8 80240D88 AEA20000 */ sw $v0, ($s5) -.L80240D8C: -/* 916AFC 80240D8C 8E4300B0 */ lw $v1, 0xb0($s2) -/* 916B00 80240D90 30620004 */ andi $v0, $v1, 4 -/* 916B04 80240D94 10400007 */ beqz $v0, .L80240DB4 -/* 916B08 80240D98 00000000 */ nop -/* 916B0C 80240D9C 824200B4 */ lb $v0, 0xb4($s2) -/* 916B10 80240DA0 14400086 */ bnez $v0, .L80240FBC -/* 916B14 80240DA4 0000102D */ daddu $v0, $zero, $zero -/* 916B18 80240DA8 2402FFFB */ addiu $v0, $zero, -5 -/* 916B1C 80240DAC 00621024 */ and $v0, $v1, $v0 -/* 916B20 80240DB0 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240DB4: -/* 916B24 80240DB4 8E620070 */ lw $v0, 0x70($s3) -/* 916B28 80240DB8 2442FFF4 */ addiu $v0, $v0, -0xc -/* 916B2C 80240DBC 2C420003 */ sltiu $v0, $v0, 3 -/* 916B30 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* 916B34 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* 916B38 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 916B3C 80240DCC 0C090000 */ jal func_80240000_915D70 -/* 916B40 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* 916B44 80240DD4 10400002 */ beqz $v0, .L80240DE0 -/* 916B48 80240DD8 24020014 */ addiu $v0, $zero, 0x14 -/* 916B4C 80240DDC AE620070 */ sw $v0, 0x70($s3) -.L80240DE0: -/* 916B50 80240DE0 8E630070 */ lw $v1, 0x70($s3) -/* 916B54 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 -/* 916B58 80240DE8 10400073 */ beqz $v0, .L80240FB8_916D28 -/* 916B5C 80240DEC 00031080 */ sll $v0, $v1, 2 -/* 916B60 80240DF0 3C018024 */ lui $at, %hi(jtbl_80242D68_918AD8) -/* 916B64 80240DF4 00220821 */ addu $at, $at, $v0 -/* 916B68 80240DF8 8C222D68 */ lw $v0, %lo(jtbl_80242D68_918AD8)($at) -/* 916B6C 80240DFC 00400008 */ jr $v0 -/* 916B70 80240E00 00000000 */ nop -.L80240E04_916B74: -/* 916B74 80240E04 0260202D */ daddu $a0, $s3, $zero -/* 916B78 80240E08 0280282D */ daddu $a1, $s4, $zero -/* 916B7C 80240E0C 0C090058 */ jal iwa_02_UnkNpcAIFunc18 -/* 916B80 80240E10 0200302D */ daddu $a2, $s0, $zero -.L80240E14_916B84: -/* 916B84 80240E14 0260202D */ daddu $a0, $s3, $zero -/* 916B88 80240E18 0280282D */ daddu $a1, $s4, $zero -/* 916B8C 80240E1C 0C090075 */ jal func_802401D4_915F44 -/* 916B90 80240E20 0200302D */ daddu $a2, $s0, $zero -/* 916B94 80240E24 8E630070 */ lw $v1, 0x70($s3) -/* 916B98 80240E28 24020002 */ addiu $v0, $zero, 2 -/* 916B9C 80240E2C 14620063 */ bne $v1, $v0, .L80240FBC -/* 916BA0 80240E30 0000102D */ daddu $v0, $zero, $zero -.L80240E34_916BA4: -/* 916BA4 80240E34 0260202D */ daddu $a0, $s3, $zero -/* 916BA8 80240E38 0280282D */ daddu $a1, $s4, $zero -/* 916BAC 80240E3C 0C0900C1 */ jal iwa_02_UnkNpcAIFunc21 -/* 916BB0 80240E40 0200302D */ daddu $a2, $s0, $zero -/* 916BB4 80240E44 8E630070 */ lw $v1, 0x70($s3) -/* 916BB8 80240E48 24020003 */ addiu $v0, $zero, 3 -/* 916BBC 80240E4C 1462005B */ bne $v1, $v0, .L80240FBC -/* 916BC0 80240E50 0000102D */ daddu $v0, $zero, $zero -.L80240E54_916BC4: -/* 916BC4 80240E54 0260202D */ daddu $a0, $s3, $zero -/* 916BC8 80240E58 0280282D */ daddu $a1, $s4, $zero -/* 916BCC 80240E5C 0C0900E8 */ jal iwa_02_UnkNpcAIFunc20 -/* 916BD0 80240E60 0200302D */ daddu $a2, $s0, $zero -/* 916BD4 80240E64 8E630070 */ lw $v1, 0x70($s3) -/* 916BD8 80240E68 24020004 */ addiu $v0, $zero, 4 -/* 916BDC 80240E6C 14620053 */ bne $v1, $v0, .L80240FBC -/* 916BE0 80240E70 0000102D */ daddu $v0, $zero, $zero -.L80240E74_916BE4: -/* 916BE4 80240E74 0260202D */ daddu $a0, $s3, $zero -/* 916BE8 80240E78 0280282D */ daddu $a1, $s4, $zero -/* 916BEC 80240E7C 0C09010A */ jal iwa_02_UnkNpcAIFunc22 -/* 916BF0 80240E80 0200302D */ daddu $a2, $s0, $zero -.L80240E84_916BF4: -/* 916BF4 80240E84 0260202D */ daddu $a0, $s3, $zero -/* 916BF8 80240E88 0280282D */ daddu $a1, $s4, $zero -/* 916BFC 80240E8C 0C090134 */ jal iwa_02_UnkFunc8 -/* 916C00 80240E90 0200302D */ daddu $a2, $s0, $zero -/* 916C04 80240E94 080903EF */ j .L80240FBC -/* 916C08 80240E98 0000102D */ daddu $v0, $zero, $zero -.L80240E9C_916C0C: -/* 916C0C 80240E9C 0260202D */ daddu $a0, $s3, $zero -/* 916C10 80240EA0 0280282D */ daddu $a1, $s4, $zero -/* 916C14 80240EA4 0C0127DF */ jal func_80049F7C -/* 916C18 80240EA8 0200302D */ daddu $a2, $s0, $zero -/* 916C1C 80240EAC 8E630070 */ lw $v1, 0x70($s3) -/* 916C20 80240EB0 2402000D */ addiu $v0, $zero, 0xd -/* 916C24 80240EB4 14620041 */ bne $v1, $v0, .L80240FBC -/* 916C28 80240EB8 0000102D */ daddu $v0, $zero, $zero -.L80240EBC_916C2C: -/* 916C2C 80240EBC 0260202D */ daddu $a0, $s3, $zero -/* 916C30 80240EC0 0280282D */ daddu $a1, $s4, $zero -/* 916C34 80240EC4 0C012849 */ jal func_8004A124 -/* 916C38 80240EC8 0200302D */ daddu $a2, $s0, $zero -/* 916C3C 80240ECC 8E630070 */ lw $v1, 0x70($s3) -/* 916C40 80240ED0 2402000E */ addiu $v0, $zero, 0xe -/* 916C44 80240ED4 14620039 */ bne $v1, $v0, .L80240FBC -/* 916C48 80240ED8 0000102D */ daddu $v0, $zero, $zero -.L80240EDC_916C4C: -/* 916C4C 80240EDC 96A2008E */ lhu $v0, 0x8e($s5) -/* 916C50 80240EE0 2442FFFF */ addiu $v0, $v0, -1 -/* 916C54 80240EE4 A6A2008E */ sh $v0, 0x8e($s5) -/* 916C58 80240EE8 00021400 */ sll $v0, $v0, 0x10 -/* 916C5C 80240EEC 14400033 */ bnez $v0, .L80240FBC -/* 916C60 80240EF0 0000102D */ daddu $v0, $zero, $zero -/* 916C64 80240EF4 24020028 */ addiu $v0, $zero, 0x28 -/* 916C68 80240EF8 080903EE */ j .L80240FB8_916D28 -/* 916C6C 80240EFC AE620070 */ sw $v0, 0x70($s3) -.L80240F00_916C70: -/* 916C70 80240F00 0260202D */ daddu $a0, $s3, $zero -/* 916C74 80240F04 0280282D */ daddu $a1, $s4, $zero -/* 916C78 80240F08 0C090191 */ jal iwa_02_UnkNpcAIFunc16 -/* 916C7C 80240F0C 0200302D */ daddu $a2, $s0, $zero -.L80240F10_916C80: -/* 916C80 80240F10 0260202D */ daddu $a0, $s3, $zero -/* 916C84 80240F14 0280282D */ daddu $a1, $s4, $zero -/* 916C88 80240F18 0C0901A5 */ jal func_80240694_916404 -/* 916C8C 80240F1C 0200302D */ daddu $a2, $s0, $zero -/* 916C90 80240F20 080903EF */ j .L80240FBC -/* 916C94 80240F24 0000102D */ daddu $v0, $zero, $zero -.L80240F28_916C98: -/* 916C98 80240F28 0260202D */ daddu $a0, $s3, $zero -/* 916C9C 80240F2C 0280282D */ daddu $a1, $s4, $zero -/* 916CA0 80240F30 0C09020D */ jal iwa_02_UnkFunc10 -/* 916CA4 80240F34 0200302D */ daddu $a2, $s0, $zero -/* 916CA8 80240F38 080903EF */ j .L80240FBC -/* 916CAC 80240F3C 0000102D */ daddu $v0, $zero, $zero -.L80240F40_916CB0: -/* 916CB0 80240F40 0260202D */ daddu $a0, $s3, $zero -/* 916CB4 80240F44 0280282D */ daddu $a1, $s4, $zero -/* 916CB8 80240F48 0C090261 */ jal func_80240984_9166F4 -/* 916CBC 80240F4C 0200302D */ daddu $a2, $s0, $zero -/* 916CC0 80240F50 8E630070 */ lw $v1, 0x70($s3) -/* 916CC4 80240F54 24020029 */ addiu $v0, $zero, 0x29 -/* 916CC8 80240F58 14620018 */ bne $v1, $v0, .L80240FBC -/* 916CCC 80240F5C 0000102D */ daddu $v0, $zero, $zero -.L80240F60_916CD0: -/* 916CD0 80240F60 0260202D */ daddu $a0, $s3, $zero -/* 916CD4 80240F64 0280282D */ daddu $a1, $s4, $zero -/* 916CD8 80240F68 0C09028C */ jal iwa_02_UnkFunc9 -/* 916CDC 80240F6C 0200302D */ daddu $a2, $s0, $zero -/* 916CE0 80240F70 080903EF */ j .L80240FBC -/* 916CE4 80240F74 0000102D */ daddu $v0, $zero, $zero -.L80240F78_916CE8: -/* 916CE8 80240F78 0260202D */ daddu $a0, $s3, $zero -/* 916CEC 80240F7C 0280282D */ daddu $a1, $s4, $zero -/* 916CF0 80240F80 0C0902DA */ jal iwa_02_UnkNpcAIFunc19 -/* 916CF4 80240F84 0200302D */ daddu $a2, $s0, $zero -.L80240F88_916CF8: -/* 916CF8 80240F88 0260202D */ daddu $a0, $s3, $zero -/* 916CFC 80240F8C 0280282D */ daddu $a1, $s4, $zero -/* 916D00 80240F90 0C0902F9 */ jal iwa_02_UnkNpcAIFunc17 -/* 916D04 80240F94 0200302D */ daddu $a2, $s0, $zero -/* 916D08 80240F98 8E630070 */ lw $v1, 0x70($s3) -/* 916D0C 80240F9C 24020034 */ addiu $v0, $zero, 0x34 -/* 916D10 80240FA0 14620006 */ bne $v1, $v0, .L80240FBC -/* 916D14 80240FA4 0000102D */ daddu $v0, $zero, $zero -.L80240FA8_916D18: -/* 916D18 80240FA8 0260202D */ daddu $a0, $s3, $zero -/* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 916D20 80240FB0 0C090313 */ jal iwa_02_UnkDurationCheck -/* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero -.L80240FB8_916D28: -/* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero -.L80240FBC: -/* 916D2C 80240FBC 8FBF0048 */ lw $ra, 0x48($sp) -/* 916D30 80240FC0 8FB50044 */ lw $s5, 0x44($sp) -/* 916D34 80240FC4 8FB40040 */ lw $s4, 0x40($sp) -/* 916D38 80240FC8 8FB3003C */ lw $s3, 0x3c($sp) -/* 916D3C 80240FCC 8FB20038 */ lw $s2, 0x38($sp) -/* 916D40 80240FD0 8FB10034 */ lw $s1, 0x34($sp) -/* 916D44 80240FD4 8FB00030 */ lw $s0, 0x30($sp) -/* 916D48 80240FD8 03E00008 */ jr $ra -/* 916D4C 80240FDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s deleted file mode 100644 index 97c7e6f517..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_918E6C -/* 918E6C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E70 802402C0 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) -/* 918E74 802402C4 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) -/* 918E78 802402C8 3C014069 */ lui $at, 0x4069 -/* 918E7C 802402CC 44810800 */ mtc1 $at, $f1 -/* 918E80 802402D0 44800000 */ mtc1 $zero, $f0 -/* 918E84 802402D4 2406FFFF */ addiu $a2, $zero, -1 -/* 918E88 802402D8 44821000 */ mtc1 $v0, $f2 -/* 918E8C 802402DC 00000000 */ nop -/* 918E90 802402E0 468010A1 */ cvt.d.w $f2, $f2 -/* 918E94 802402E4 4622003C */ c.lt.d $f0, $f2 -/* 918E98 802402E8 00000000 */ nop -/* 918E9C 802402EC 45000002 */ bc1f .L802402F8 -/* 918EA0 802402F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 918EA4 802402F4 0000302D */ daddu $a2, $zero, $zero -.L802402F8: -/* 918EA8 802402F8 3C014044 */ lui $at, 0x4044 -/* 918EAC 802402FC 44810800 */ mtc1 $at, $f1 -/* 918EB0 80240300 44800000 */ mtc1 $zero, $f0 -/* 918EB4 80240304 00000000 */ nop -/* 918EB8 80240308 4620103C */ c.lt.d $f2, $f0 -/* 918EBC 8024030C 00000000 */ nop -/* 918EC0 80240310 45030001 */ bc1tl .L80240318 -/* 918EC4 80240314 24060001 */ addiu $a2, $zero, 1 -.L80240318: -/* 918EC8 80240318 04C00004 */ bltz $a2, .L8024032C -/* 918ECC 8024031C 00000000 */ nop -/* 918ED0 80240320 3C05FD05 */ lui $a1, 0xfd05 -/* 918ED4 80240324 0C0B2026 */ jal evt_set_variable -/* 918ED8 80240328 34A50F89 */ ori $a1, $a1, 0xf89 -.L8024032C: -/* 918EDC 8024032C 8FBF0010 */ lw $ra, 0x10($sp) -/* 918EE0 80240330 0000102D */ daddu $v0, $zero, $zero -/* 918EE4 80240334 03E00008 */ jr $ra -/* 918EE8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 -/* 918EEC 8024033C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s deleted file mode 100644 index ef54180ea8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242C30_91B7E0 -.double 180.0 - -dlabel D_80242C38_91B7E8 -.double 75.0 - -.section .text - -glabel func_80240340_918EF0 -/* 918EF0 80240340 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 918EF4 80240344 AFBF001C */ sw $ra, 0x1c($sp) -/* 918EF8 80240348 AFB20018 */ sw $s2, 0x18($sp) -/* 918EFC 8024034C AFB10014 */ sw $s1, 0x14($sp) -/* 918F00 80240350 AFB00010 */ sw $s0, 0x10($sp) -/* 918F04 80240354 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 918F08 80240358 8C900148 */ lw $s0, 0x148($a0) -/* 918F0C 8024035C 86040008 */ lh $a0, 8($s0) -/* 918F10 80240360 3C014387 */ lui $at, 0x4387 -/* 918F14 80240364 4481A000 */ mtc1 $at, $f20 -/* 918F18 80240368 0C00EABB */ jal get_npc_unsafe -/* 918F1C 8024036C 00A0882D */ daddu $s1, $a1, $zero -/* 918F20 80240370 0200202D */ daddu $a0, $s0, $zero -/* 918F24 80240374 8E26000C */ lw $a2, 0xc($s1) -/* 918F28 80240378 8E270010 */ lw $a3, 0x10($s1) -/* 918F2C 8024037C 0040882D */ daddu $s1, $v0, $zero -/* 918F30 80240380 3C03800B */ lui $v1, %hi(gCameras) -/* 918F34 80240384 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 918F38 80240388 3C02800A */ lui $v0, %hi(gCurrentCamID) -/* 918F3C 8024038C 8442A634 */ lh $v0, %lo(gCurrentCamID)($v0) -/* 918F40 80240390 0000282D */ daddu $a1, $zero, $zero -/* 918F44 80240394 00028080 */ sll $s0, $v0, 2 -/* 918F48 80240398 02028021 */ addu $s0, $s0, $v0 -/* 918F4C 8024039C 00108080 */ sll $s0, $s0, 2 -/* 918F50 802403A0 02028023 */ subu $s0, $s0, $v0 -/* 918F54 802403A4 001010C0 */ sll $v0, $s0, 3 -/* 918F58 802403A8 02028021 */ addu $s0, $s0, $v0 -/* 918F5C 802403AC 001080C0 */ sll $s0, $s0, 3 -/* 918F60 802403B0 0C0124FB */ jal func_800493EC -/* 918F64 802403B4 02038021 */ addu $s0, $s0, $v1 -/* 918F68 802403B8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 918F6C 802403BC C62E000C */ lwc1 $f14, 0xc($s1) -/* 918F70 802403C0 0C00A70A */ jal get_clamped_angle_diff -/* 918F74 802403C4 0002802B */ sltu $s0, $zero, $v0 -/* 918F78 802403C8 0C00A6C9 */ jal clamp_angle -/* 918F7C 802403CC 46000306 */ mov.s $f12, $f0 -/* 918F80 802403D0 3C018024 */ lui $at, %hi(D_80242C30_91B7E0) -/* 918F84 802403D4 D4222C30 */ ldc1 $f2, %lo(D_80242C30_91B7E0)($at) -/* 918F88 802403D8 46000021 */ cvt.d.s $f0, $f0 -/* 918F8C 802403DC 4622003C */ c.lt.d $f0, $f2 -/* 918F90 802403E0 00000000 */ nop -/* 918F94 802403E4 45000003 */ bc1f .L802403F4 -/* 918F98 802403E8 00000000 */ nop -/* 918F9C 802403EC 3C0142B4 */ lui $at, 0x42b4 -/* 918FA0 802403F0 4481A000 */ mtc1 $at, $f20 -.L802403F4: -/* 918FA4 802403F4 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 918FA8 802403F8 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 918FAC 802403FC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 918FB0 80240400 8E420000 */ lw $v0, ($s2) -/* 918FB4 80240404 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 918FB8 80240408 8C460028 */ lw $a2, 0x28($v0) -/* 918FBC 8024040C 0C00A720 */ jal atan2 -/* 918FC0 80240410 8C470030 */ lw $a3, 0x30($v0) -/* 918FC4 80240414 4600A306 */ mov.s $f12, $f20 -/* 918FC8 80240418 0C00A70A */ jal get_clamped_angle_diff -/* 918FCC 8024041C 46000386 */ mov.s $f14, $f0 -/* 918FD0 80240420 46000005 */ abs.s $f0, $f0 -/* 918FD4 80240424 3C018024 */ lui $at, %hi(D_80242C38_91B7E8) -/* 918FD8 80240428 D4222C38 */ ldc1 $f2, %lo(D_80242C38_91B7E8)($at) -/* 918FDC 8024042C 46000021 */ cvt.d.s $f0, $f0 -/* 918FE0 80240430 4620103C */ c.lt.d $f2, $f0 -/* 918FE4 80240434 00000000 */ nop -/* 918FE8 80240438 45030001 */ bc1tl .L80240440 -/* 918FEC 8024043C 0000802D */ daddu $s0, $zero, $zero -.L80240440: -/* 918FF0 80240440 8E420000 */ lw $v0, ($s2) -/* 918FF4 80240444 C620003C */ lwc1 $f0, 0x3c($s1) -/* 918FF8 80240448 C442002C */ lwc1 $f2, 0x2c($v0) -/* 918FFC 8024044C 46020001 */ sub.s $f0, $f0, $f2 -/* 919000 80240450 3C014220 */ lui $at, 0x4220 -/* 919004 80240454 44811000 */ mtc1 $at, $f2 -/* 919008 80240458 46000005 */ abs.s $f0, $f0 -/* 91900C 8024045C 4600103E */ c.le.s $f2, $f0 -/* 919010 80240460 00000000 */ nop -/* 919014 80240464 45030001 */ bc1tl .L8024046C -/* 919018 80240468 0000802D */ daddu $s0, $zero, $zero -.L8024046C: -/* 91901C 8024046C 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* 919020 80240470 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* 919024 80240474 24020009 */ addiu $v0, $zero, 9 -/* 919028 80240478 50620001 */ beql $v1, $v0, .L80240480 -/* 91902C 8024047C 0000802D */ daddu $s0, $zero, $zero -.L80240480: -/* 919030 80240480 0200102D */ daddu $v0, $s0, $zero -/* 919034 80240484 8FBF001C */ lw $ra, 0x1c($sp) -/* 919038 80240488 8FB20018 */ lw $s2, 0x18($sp) -/* 91903C 8024048C 8FB10014 */ lw $s1, 0x14($sp) -/* 919040 80240490 8FB00010 */ lw $s0, 0x10($sp) -/* 919044 80240494 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 919048 80240498 03E00008 */ jr $ra -/* 91904C 8024049C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s deleted file mode 100644 index 2bd6640f1b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242C40_91B7F0 -.double 0.85 - -.section .text - -glabel func_80240514_9190C4 -/* 9190C4 80240514 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9190C8 80240518 AFB3003C */ sw $s3, 0x3c($sp) -/* 9190CC 8024051C 0080982D */ daddu $s3, $a0, $zero -/* 9190D0 80240520 AFBF0044 */ sw $ra, 0x44($sp) -/* 9190D4 80240524 AFB40040 */ sw $s4, 0x40($sp) -/* 9190D8 80240528 AFB20038 */ sw $s2, 0x38($sp) -/* 9190DC 8024052C AFB10034 */ sw $s1, 0x34($sp) -/* 9190E0 80240530 AFB00030 */ sw $s0, 0x30($sp) -/* 9190E4 80240534 8E700148 */ lw $s0, 0x148($s3) -/* 9190E8 80240538 00A0902D */ daddu $s2, $a1, $zero -/* 9190EC 8024053C 86040008 */ lh $a0, 8($s0) -/* 9190F0 80240540 0C00EABB */ jal get_npc_unsafe -/* 9190F4 80240544 00C0A02D */ daddu $s4, $a2, $zero -/* 9190F8 80240548 8E630074 */ lw $v1, 0x74($s3) -/* 9190FC 8024054C 1C600032 */ bgtz $v1, .L80240618 -/* 919100 80240550 0040882D */ daddu $s1, $v0, $zero -/* 919104 80240554 8E420014 */ lw $v0, 0x14($s2) -/* 919108 80240558 AE620074 */ sw $v0, 0x74($s3) -/* 91910C 8024055C C640000C */ lwc1 $f0, 0xc($s2) -/* 919110 80240560 3C018024 */ lui $at, %hi(D_80242C40_91B7F0) -/* 919114 80240564 D4222C40 */ ldc1 $f2, %lo(D_80242C40_91B7F0)($at) -/* 919118 80240568 46000021 */ cvt.d.s $f0, $f0 -/* 91911C 8024056C 46220002 */ mul.d $f0, $f0, $f2 -/* 919120 80240570 00000000 */ nop -/* 919124 80240574 0280202D */ daddu $a0, $s4, $zero -/* 919128 80240578 AFA00010 */ sw $zero, 0x10($sp) -/* 91912C 8024057C 8E470010 */ lw $a3, 0x10($s2) -/* 919130 80240580 46200020 */ cvt.s.d $f0, $f0 -/* 919134 80240584 44060000 */ mfc1 $a2, $f0 -/* 919138 80240588 0C01242D */ jal func_800490B4 -/* 91913C 8024058C 0200282D */ daddu $a1, $s0, $zero -/* 919140 80240590 10400021 */ beqz $v0, .L80240618 -/* 919144 80240594 0000202D */ daddu $a0, $zero, $zero -/* 919148 80240598 0220282D */ daddu $a1, $s1, $zero -/* 91914C 8024059C 0000302D */ daddu $a2, $zero, $zero -/* 919150 802405A0 8E0200CC */ lw $v0, 0xcc($s0) -/* 919154 802405A4 3C013F80 */ lui $at, 0x3f80 -/* 919158 802405A8 44810000 */ mtc1 $at, $f0 -/* 91915C 802405AC 3C014000 */ lui $at, 0x4000 -/* 919160 802405B0 44811000 */ mtc1 $at, $f2 -/* 919164 802405B4 8C430024 */ lw $v1, 0x24($v0) -/* 919168 802405B8 862200A8 */ lh $v0, 0xa8($s1) -/* 91916C 802405BC 3C01C1A0 */ lui $at, 0xc1a0 -/* 919170 802405C0 44812000 */ mtc1 $at, $f4 -/* 919174 802405C4 44823000 */ mtc1 $v0, $f6 -/* 919178 802405C8 00000000 */ nop -/* 91917C 802405CC 468031A0 */ cvt.s.w $f6, $f6 -/* 919180 802405D0 44073000 */ mfc1 $a3, $f6 -/* 919184 802405D4 2402000F */ addiu $v0, $zero, 0xf -/* 919188 802405D8 AE230028 */ sw $v1, 0x28($s1) -/* 91918C 802405DC AFA2001C */ sw $v0, 0x1c($sp) -/* 919190 802405E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 919194 802405E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 919198 802405E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 91919C 802405EC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9191A0 802405F0 0C01BFA4 */ jal fx_emote -/* 9191A4 802405F4 AFA20020 */ sw $v0, 0x20($sp) -/* 9191A8 802405F8 0220202D */ daddu $a0, $s1, $zero -/* 9191AC 802405FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9191B0 80240600 0C012530 */ jal ai_enemy_play_sound -/* 9191B4 80240604 3C060020 */ lui $a2, 0x20 -/* 9191B8 80240608 2402000C */ addiu $v0, $zero, 0xc -/* 9191BC 8024060C A622008E */ sh $v0, 0x8e($s1) -/* 9191C0 80240610 24020002 */ addiu $v0, $zero, 2 -/* 9191C4 80240614 AE620070 */ sw $v0, 0x70($s3) -.L80240618: -/* 9191C8 80240618 8E620074 */ lw $v0, 0x74($s3) -/* 9191CC 8024061C 2442FFFF */ addiu $v0, $v0, -1 -/* 9191D0 80240620 AE620074 */ sw $v0, 0x74($s3) -/* 9191D4 80240624 8FBF0044 */ lw $ra, 0x44($sp) -/* 9191D8 80240628 8FB40040 */ lw $s4, 0x40($sp) -/* 9191DC 8024062C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9191E0 80240630 8FB20038 */ lw $s2, 0x38($sp) -/* 9191E4 80240634 8FB10034 */ lw $s1, 0x34($sp) -/* 9191E8 80240638 8FB00030 */ lw $s0, 0x30($sp) -/* 9191EC 8024063C 03E00008 */ jr $ra -/* 9191F0 80240640 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s deleted file mode 100644 index 83832c9619..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242C48_91B7F8 -.double 0.9 - -.section .text - -glabel func_802409D4_919584 -/* 919584 802409D4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 919588 802409D8 AFB30024 */ sw $s3, 0x24($sp) -/* 91958C 802409DC 0080982D */ daddu $s3, $a0, $zero -/* 919590 802409E0 AFBF002C */ sw $ra, 0x2c($sp) -/* 919594 802409E4 AFB40028 */ sw $s4, 0x28($sp) -/* 919598 802409E8 AFB20020 */ sw $s2, 0x20($sp) -/* 91959C 802409EC AFB1001C */ sw $s1, 0x1c($sp) -/* 9195A0 802409F0 AFB00018 */ sw $s0, 0x18($sp) -/* 9195A4 802409F4 8E710148 */ lw $s1, 0x148($s3) -/* 9195A8 802409F8 86240008 */ lh $a0, 8($s1) -/* 9195AC 802409FC 0C00EABB */ jal get_npc_unsafe -/* 9195B0 80240A00 00A0A02D */ daddu $s4, $a1, $zero -/* 9195B4 80240A04 0040802D */ daddu $s0, $v0, $zero -/* 9195B8 80240A08 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 9195BC 80240A0C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 9195C0 80240A10 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9195C4 80240A14 8E420000 */ lw $v0, ($s2) -/* 9195C8 80240A18 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9195CC 80240A1C 8C460028 */ lw $a2, 0x28($v0) -/* 9195D0 80240A20 0C00A720 */ jal atan2 -/* 9195D4 80240A24 8C470030 */ lw $a3, 0x30($v0) -/* 9195D8 80240A28 3C025555 */ lui $v0, 0x5555 -/* 9195DC 80240A2C 9603008E */ lhu $v1, 0x8e($s0) -/* 9195E0 80240A30 34425556 */ ori $v0, $v0, 0x5556 -/* 9195E4 80240A34 00031C00 */ sll $v1, $v1, 0x10 -/* 9195E8 80240A38 00032403 */ sra $a0, $v1, 0x10 -/* 9195EC 80240A3C 00820018 */ mult $a0, $v0 -/* 9195F0 80240A40 00031FC3 */ sra $v1, $v1, 0x1f -/* 9195F4 80240A44 00004010 */ mfhi $t0 -/* 9195F8 80240A48 01031823 */ subu $v1, $t0, $v1 -/* 9195FC 80240A4C 00031040 */ sll $v0, $v1, 1 -/* 919600 80240A50 00431021 */ addu $v0, $v0, $v1 -/* 919604 80240A54 00822023 */ subu $a0, $a0, $v0 -/* 919608 80240A58 00042400 */ sll $a0, $a0, 0x10 -/* 91960C 80240A5C 1480000C */ bnez $a0, .L80240A90 -/* 919610 80240A60 E600000C */ swc1 $f0, 0xc($s0) -/* 919614 80240A64 C6020040 */ lwc1 $f2, 0x40($s0) -/* 919618 80240A68 3C014000 */ lui $at, 0x4000 -/* 91961C 80240A6C 44810000 */ mtc1 $at, $f0 -/* 919620 80240A70 AFA00010 */ sw $zero, 0x10($sp) -/* 919624 80240A74 AFA00014 */ sw $zero, 0x14($sp) -/* 919628 80240A78 46001080 */ add.s $f2, $f2, $f0 -/* 91962C 80240A7C 8E06003C */ lw $a2, 0x3c($s0) -/* 919630 80240A80 8E050038 */ lw $a1, 0x38($s0) -/* 919634 80240A84 44071000 */ mfc1 $a3, $f2 -/* 919638 80240A88 0C01BECC */ jal fx_walking_dust -/* 91963C 80240A8C 24040002 */ addiu $a0, $zero, 2 -.L80240A90: -/* 919640 80240A90 9602008E */ lhu $v0, 0x8e($s0) -/* 919644 80240A94 2442FFFF */ addiu $v0, $v0, -1 -/* 919648 80240A98 A602008E */ sh $v0, 0x8e($s0) -/* 91964C 80240A9C 00021400 */ sll $v0, $v0, 0x10 -/* 919650 80240AA0 1C40002C */ bgtz $v0, .L80240B54 -/* 919654 80240AA4 00000000 */ nop -/* 919658 80240AA8 C6000038 */ lwc1 $f0, 0x38($s0) -/* 91965C 80240AAC 4600010D */ trunc.w.s $f4, $f0 -/* 919660 80240AB0 44022000 */ mfc1 $v0, $f4 -/* 919664 80240AB4 00000000 */ nop -/* 919668 80240AB8 A6220010 */ sh $v0, 0x10($s1) -/* 91966C 80240ABC C600003C */ lwc1 $f0, 0x3c($s0) -/* 919670 80240AC0 4600010D */ trunc.w.s $f4, $f0 -/* 919674 80240AC4 44022000 */ mfc1 $v0, $f4 -/* 919678 80240AC8 00000000 */ nop -/* 91967C 80240ACC A6220012 */ sh $v0, 0x12($s1) -/* 919680 80240AD0 C6000040 */ lwc1 $f0, 0x40($s0) -/* 919684 80240AD4 24020001 */ addiu $v0, $zero, 1 -/* 919688 80240AD8 A2220007 */ sb $v0, 7($s1) -/* 91968C 80240ADC 4600010D */ trunc.w.s $f4, $f0 -/* 919690 80240AE0 44022000 */ mfc1 $v0, $f4 -/* 919694 80240AE4 00000000 */ nop -/* 919698 80240AE8 A6220014 */ sh $v0, 0x14($s1) -/* 91969C 80240AEC C6800018 */ lwc1 $f0, 0x18($s4) -/* 9196A0 80240AF0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9196A4 80240AF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9196A8 80240AF8 8E420000 */ lw $v0, ($s2) -/* 9196AC 80240AFC E6000018 */ swc1 $f0, 0x18($s0) -/* 9196B0 80240B00 8C460028 */ lw $a2, 0x28($v0) -/* 9196B4 80240B04 0C00A7B5 */ jal dist2D -/* 9196B8 80240B08 8C470030 */ lw $a3, 0x30($v0) -/* 9196BC 80240B0C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9196C0 80240B10 46020003 */ div.s $f0, $f0, $f2 -/* 9196C4 80240B14 3C018024 */ lui $at, %hi(D_80242C48_91B7F8) -/* 9196C8 80240B18 D4222C48 */ ldc1 $f2, %lo(D_80242C48_91B7F8)($at) -/* 9196CC 80240B1C 46000021 */ cvt.d.s $f0, $f0 -/* 9196D0 80240B20 46220000 */ add.d $f0, $f0, $f2 -/* 9196D4 80240B24 4620010D */ trunc.w.d $f4, $f0 -/* 9196D8 80240B28 44022000 */ mfc1 $v0, $f4 -/* 9196DC 80240B2C 00000000 */ nop -/* 9196E0 80240B30 A602008E */ sh $v0, 0x8e($s0) -/* 9196E4 80240B34 00021400 */ sll $v0, $v0, 0x10 -/* 9196E8 80240B38 00021403 */ sra $v0, $v0, 0x10 -/* 9196EC 80240B3C 2842000F */ slti $v0, $v0, 0xf -/* 9196F0 80240B40 10400002 */ beqz $v0, .L80240B4C -/* 9196F4 80240B44 2402000F */ addiu $v0, $zero, 0xf -/* 9196F8 80240B48 A602008E */ sh $v0, 0x8e($s0) -.L80240B4C: -/* 9196FC 80240B4C 24020016 */ addiu $v0, $zero, 0x16 -/* 919700 80240B50 AE620070 */ sw $v0, 0x70($s3) -.L80240B54: -/* 919704 80240B54 8FBF002C */ lw $ra, 0x2c($sp) -/* 919708 80240B58 8FB40028 */ lw $s4, 0x28($sp) -/* 91970C 80240B5C 8FB30024 */ lw $s3, 0x24($sp) -/* 919710 80240B60 8FB20020 */ lw $s2, 0x20($sp) -/* 919714 80240B64 8FB1001C */ lw $s1, 0x1c($sp) -/* 919718 80240B68 8FB00018 */ lw $s0, 0x18($sp) -/* 91971C 80240B6C 03E00008 */ jr $ra -/* 919720 80240B70 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s deleted file mode 100644 index bbb929bab7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242C50_91B800 -.double 32767.0 - -.section .text - -glabel func_80240CC4_919874 -/* 919874 80240CC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 919878 80240CC8 AFB20018 */ sw $s2, 0x18($sp) -/* 91987C 80240CCC 0080902D */ daddu $s2, $a0, $zero -/* 919880 80240CD0 AFBF001C */ sw $ra, 0x1c($sp) -/* 919884 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 919888 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 91988C 80240CDC 8E500148 */ lw $s0, 0x148($s2) -/* 919890 80240CE0 86040008 */ lh $a0, 8($s0) -/* 919894 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 919898 80240CE8 00A0882D */ daddu $s1, $a1, $zero -/* 91989C 80240CEC 0040182D */ daddu $v1, $v0, $zero -/* 9198A0 80240CF0 9462008E */ lhu $v0, 0x8e($v1) -/* 9198A4 80240CF4 2442FFFF */ addiu $v0, $v0, -1 -/* 9198A8 80240CF8 A462008E */ sh $v0, 0x8e($v1) -/* 9198AC 80240CFC 00021400 */ sll $v0, $v0, 0x10 -/* 9198B0 80240D00 1C400015 */ bgtz $v0, .L80240D58 -/* 9198B4 80240D04 00000000 */ nop -/* 9198B8 80240D08 8E0200CC */ lw $v0, 0xcc($s0) -/* 9198BC 80240D0C 8C420004 */ lw $v0, 4($v0) -/* 9198C0 80240D10 AC620028 */ sw $v0, 0x28($v1) -/* 9198C4 80240D14 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9198C8 80240D18 8C420014 */ lw $v0, 0x14($v0) -/* 9198CC 80240D1C 04410004 */ bgez $v0, .L80240D30 -/* 9198D0 80240D20 00000000 */ nop -/* 9198D4 80240D24 C6200000 */ lwc1 $f0, ($s1) -/* 9198D8 80240D28 08090354 */ j .L80240D50 -/* 9198DC 80240D2C E4600018 */ swc1 $f0, 0x18($v1) -.L80240D30: -/* 9198E0 80240D30 3C018024 */ lui $at, %hi(D_80242C50_91B800) -/* 9198E4 80240D34 D4222C50 */ ldc1 $f2, %lo(D_80242C50_91B800)($at) -/* 9198E8 80240D38 44820000 */ mtc1 $v0, $f0 -/* 9198EC 80240D3C 00000000 */ nop -/* 9198F0 80240D40 46800021 */ cvt.d.w $f0, $f0 -/* 9198F4 80240D44 46220003 */ div.d $f0, $f0, $f2 -/* 9198F8 80240D48 46200020 */ cvt.s.d $f0, $f0 -/* 9198FC 80240D4C E4600018 */ swc1 $f0, 0x18($v1) -.L80240D50: -/* 919900 80240D50 24020029 */ addiu $v0, $zero, 0x29 -/* 919904 80240D54 AE420070 */ sw $v0, 0x70($s2) -.L80240D58: -/* 919908 80240D58 8FBF001C */ lw $ra, 0x1c($sp) -/* 91990C 80240D5C 8FB20018 */ lw $s2, 0x18($sp) -/* 919910 80240D60 8FB10014 */ lw $s1, 0x14($sp) -/* 919914 80240D64 8FB00010 */ lw $s0, 0x10($sp) -/* 919918 80240D68 03E00008 */ jr $ra -/* 91991C 80240D6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s deleted file mode 100644 index 20e65b7a55..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s +++ /dev/null @@ -1,247 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242C58_91B808 -.word .L80241144_919CF4, .L80241154_919D04, .L80241174_919D24, .L80241194_919D44, .L802411B4_919D64, .L802411C4_919D74, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802411DC_919D8C, .L802411FC_919DAC, .L8024121C_919DCC, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L80241240_919DF0, .L80241250_919E00, .L80241268_919E18, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L80241280_919E30, .L802412A0_919E50, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412F8_919EA8, .L802412B8_919E68, .L802412C8_919E78, .L802412E8_919E98, 0 - -.section .text - -glabel func_80240FD0_919B80 -/* 919B80 80240FD0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 919B84 80240FD4 AFB3003C */ sw $s3, 0x3c($sp) -/* 919B88 80240FD8 0080982D */ daddu $s3, $a0, $zero -/* 919B8C 80240FDC AFBF0048 */ sw $ra, 0x48($sp) -/* 919B90 80240FE0 AFB50044 */ sw $s5, 0x44($sp) -/* 919B94 80240FE4 AFB40040 */ sw $s4, 0x40($sp) -/* 919B98 80240FE8 AFB20038 */ sw $s2, 0x38($sp) -/* 919B9C 80240FEC AFB10034 */ sw $s1, 0x34($sp) -/* 919BA0 80240FF0 AFB00030 */ sw $s0, 0x30($sp) -/* 919BA4 80240FF4 8E720148 */ lw $s2, 0x148($s3) -/* 919BA8 80240FF8 86440008 */ lh $a0, 8($s2) -/* 919BAC 80240FFC 0C00EABB */ jal get_npc_unsafe -/* 919BB0 80241000 00A0882D */ daddu $s1, $a1, $zero -/* 919BB4 80241004 0260202D */ daddu $a0, $s3, $zero -/* 919BB8 80241008 8E70000C */ lw $s0, 0xc($s3) -/* 919BBC 8024100C 0040A82D */ daddu $s5, $v0, $zero -/* 919BC0 80241010 8E050000 */ lw $a1, ($s0) -/* 919BC4 80241014 0C0B1EAF */ jal evt_get_variable -/* 919BC8 80241018 26100004 */ addiu $s0, $s0, 4 -/* 919BCC 8024101C 0260202D */ daddu $a0, $s3, $zero -/* 919BD0 80241020 8E050000 */ lw $a1, ($s0) -/* 919BD4 80241024 0C0B1EAF */ jal evt_get_variable -/* 919BD8 80241028 0040A02D */ daddu $s4, $v0, $zero -/* 919BDC 8024102C AE420094 */ sw $v0, 0x94($s2) -/* 919BE0 80241030 AFA00010 */ sw $zero, 0x10($sp) -/* 919BE4 80241034 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919BE8 80241038 8C420030 */ lw $v0, 0x30($v0) -/* 919BEC 8024103C AFA20014 */ sw $v0, 0x14($sp) -/* 919BF0 80241040 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919BF4 80241044 8C42001C */ lw $v0, 0x1c($v0) -/* 919BF8 80241048 AFA20018 */ sw $v0, 0x18($sp) -/* 919BFC 8024104C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C00 80241050 8C420024 */ lw $v0, 0x24($v0) -/* 919C04 80241054 AFA2001C */ sw $v0, 0x1c($sp) -/* 919C08 80241058 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C0C 8024105C 8C420028 */ lw $v0, 0x28($v0) -/* 919C10 80241060 AFA20020 */ sw $v0, 0x20($sp) -/* 919C14 80241064 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C18 80241068 3C014220 */ lui $at, 0x4220 -/* 919C1C 8024106C 44810000 */ mtc1 $at, $f0 -/* 919C20 80241070 8C42002C */ lw $v0, 0x2c($v0) -/* 919C24 80241074 27B00010 */ addiu $s0, $sp, 0x10 -/* 919C28 80241078 E7A00028 */ swc1 $f0, 0x28($sp) -/* 919C2C 8024107C A7A0002C */ sh $zero, 0x2c($sp) -/* 919C30 80241080 12200012 */ beqz $s1, .L802410CC -/* 919C34 80241084 AFA20024 */ sw $v0, 0x24($sp) -/* 919C38 80241088 AE600070 */ sw $zero, 0x70($s3) -/* 919C3C 8024108C 8EA30000 */ lw $v1, ($s5) -/* 919C40 80241090 2402F7FF */ addiu $v0, $zero, -0x801 -/* 919C44 80241094 A6A0008E */ sh $zero, 0x8e($s5) -/* 919C48 80241098 00621824 */ and $v1, $v1, $v0 -/* 919C4C 8024109C AEA30000 */ sw $v1, ($s5) -/* 919C50 802410A0 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C54 802410A4 8C420034 */ lw $v0, 0x34($v0) -/* 919C58 802410A8 54400005 */ bnel $v0, $zero, .L802410C0 -/* 919C5C 802410AC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 919C60 802410B0 34620200 */ ori $v0, $v1, 0x200 -/* 919C64 802410B4 2403FFF7 */ addiu $v1, $zero, -9 -/* 919C68 802410B8 08090432 */ j .L802410C8 -/* 919C6C 802410BC 00431024 */ and $v0, $v0, $v1 -.L802410C0: -/* 919C70 802410C0 00621024 */ and $v0, $v1, $v0 -/* 919C74 802410C4 34420008 */ ori $v0, $v0, 8 -.L802410C8: -/* 919C78 802410C8 AEA20000 */ sw $v0, ($s5) -.L802410CC: -/* 919C7C 802410CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 919C80 802410D0 30620004 */ andi $v0, $v1, 4 -/* 919C84 802410D4 10400007 */ beqz $v0, .L802410F4 -/* 919C88 802410D8 00000000 */ nop -/* 919C8C 802410DC 824200B4 */ lb $v0, 0xb4($s2) -/* 919C90 802410E0 14400086 */ bnez $v0, .L802412FC -/* 919C94 802410E4 0000102D */ daddu $v0, $zero, $zero -/* 919C98 802410E8 2402FFFB */ addiu $v0, $zero, -5 -/* 919C9C 802410EC 00621024 */ and $v0, $v1, $v0 -/* 919CA0 802410F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802410F4: -/* 919CA4 802410F4 8E620070 */ lw $v0, 0x70($s3) -/* 919CA8 802410F8 2442FFF4 */ addiu $v0, $v0, -0xc -/* 919CAC 802410FC 2C420003 */ sltiu $v0, $v0, 3 -/* 919CB0 80241100 10400007 */ beqz $v0, .L80241120 -/* 919CB4 80241104 0260202D */ daddu $a0, $s3, $zero -/* 919CB8 80241108 0280282D */ daddu $a1, $s4, $zero -/* 919CBC 8024110C 0C0900D0 */ jal func_80240340_918EF0 -/* 919CC0 80241110 0200302D */ daddu $a2, $s0, $zero -/* 919CC4 80241114 10400002 */ beqz $v0, .L80241120 -/* 919CC8 80241118 24020014 */ addiu $v0, $zero, 0x14 -/* 919CCC 8024111C AE620070 */ sw $v0, 0x70($s3) -.L80241120: -/* 919CD0 80241120 8E630070 */ lw $v1, 0x70($s3) -/* 919CD4 80241124 2C620035 */ sltiu $v0, $v1, 0x35 -/* 919CD8 80241128 10400073 */ beqz $v0, .L802412F8_919EA8 -/* 919CDC 8024112C 00031080 */ sll $v0, $v1, 2 -/* 919CE0 80241130 3C018024 */ lui $at, %hi(jtbl_80242C58_91B808) -/* 919CE4 80241134 00220821 */ addu $at, $at, $v0 -/* 919CE8 80241138 8C222C58 */ lw $v0, %lo(jtbl_80242C58_91B808)($at) -/* 919CEC 8024113C 00400008 */ jr $v0 -/* 919CF0 80241140 00000000 */ nop -.L80241144_919CF4: -/* 919CF4 80241144 0260202D */ daddu $a0, $s3, $zero -/* 919CF8 80241148 0280282D */ daddu $a1, $s4, $zero -/* 919CFC 8024114C 0C090128 */ jal iwa_03_UnkNpcAIFunc18 -/* 919D00 80241150 0200302D */ daddu $a2, $s0, $zero -.L80241154_919D04: -/* 919D04 80241154 0260202D */ daddu $a0, $s3, $zero -/* 919D08 80241158 0280282D */ daddu $a1, $s4, $zero -/* 919D0C 8024115C 0C090145 */ jal func_80240514_9190C4 -/* 919D10 80241160 0200302D */ daddu $a2, $s0, $zero -/* 919D14 80241164 8E630070 */ lw $v1, 0x70($s3) -/* 919D18 80241168 24020002 */ addiu $v0, $zero, 2 -/* 919D1C 8024116C 14620063 */ bne $v1, $v0, .L802412FC -/* 919D20 80241170 0000102D */ daddu $v0, $zero, $zero -.L80241174_919D24: -/* 919D24 80241174 0260202D */ daddu $a0, $s3, $zero -/* 919D28 80241178 0280282D */ daddu $a1, $s4, $zero -/* 919D2C 8024117C 0C090191 */ jal iwa_03_UnkNpcAIFunc21 -/* 919D30 80241180 0200302D */ daddu $a2, $s0, $zero -/* 919D34 80241184 8E630070 */ lw $v1, 0x70($s3) -/* 919D38 80241188 24020003 */ addiu $v0, $zero, 3 -/* 919D3C 8024118C 1462005B */ bne $v1, $v0, .L802412FC -/* 919D40 80241190 0000102D */ daddu $v0, $zero, $zero -.L80241194_919D44: -/* 919D44 80241194 0260202D */ daddu $a0, $s3, $zero -/* 919D48 80241198 0280282D */ daddu $a1, $s4, $zero -/* 919D4C 8024119C 0C0901B8 */ jal iwa_03_UnkNpcAIFunc20 -/* 919D50 802411A0 0200302D */ daddu $a2, $s0, $zero -/* 919D54 802411A4 8E630070 */ lw $v1, 0x70($s3) -/* 919D58 802411A8 24020004 */ addiu $v0, $zero, 4 -/* 919D5C 802411AC 14620053 */ bne $v1, $v0, .L802412FC -/* 919D60 802411B0 0000102D */ daddu $v0, $zero, $zero -.L802411B4_919D64: -/* 919D64 802411B4 0260202D */ daddu $a0, $s3, $zero -/* 919D68 802411B8 0280282D */ daddu $a1, $s4, $zero -/* 919D6C 802411BC 0C0901DA */ jal iwa_03_UnkNpcAIFunc22 -/* 919D70 802411C0 0200302D */ daddu $a2, $s0, $zero -.L802411C4_919D74: -/* 919D74 802411C4 0260202D */ daddu $a0, $s3, $zero -/* 919D78 802411C8 0280282D */ daddu $a1, $s4, $zero -/* 919D7C 802411CC 0C090204 */ jal iwa_03_UnkFunc8 -/* 919D80 802411D0 0200302D */ daddu $a2, $s0, $zero -/* 919D84 802411D4 080904BF */ j .L802412FC -/* 919D88 802411D8 0000102D */ daddu $v0, $zero, $zero -.L802411DC_919D8C: -/* 919D8C 802411DC 0260202D */ daddu $a0, $s3, $zero -/* 919D90 802411E0 0280282D */ daddu $a1, $s4, $zero -/* 919D94 802411E4 0C0127DF */ jal func_80049F7C -/* 919D98 802411E8 0200302D */ daddu $a2, $s0, $zero -/* 919D9C 802411EC 8E630070 */ lw $v1, 0x70($s3) -/* 919DA0 802411F0 2402000D */ addiu $v0, $zero, 0xd -/* 919DA4 802411F4 14620041 */ bne $v1, $v0, .L802412FC -/* 919DA8 802411F8 0000102D */ daddu $v0, $zero, $zero -.L802411FC_919DAC: -/* 919DAC 802411FC 0260202D */ daddu $a0, $s3, $zero -/* 919DB0 80241200 0280282D */ daddu $a1, $s4, $zero -/* 919DB4 80241204 0C012849 */ jal func_8004A124 -/* 919DB8 80241208 0200302D */ daddu $a2, $s0, $zero -/* 919DBC 8024120C 8E630070 */ lw $v1, 0x70($s3) -/* 919DC0 80241210 2402000E */ addiu $v0, $zero, 0xe -/* 919DC4 80241214 14620039 */ bne $v1, $v0, .L802412FC -/* 919DC8 80241218 0000102D */ daddu $v0, $zero, $zero -.L8024121C_919DCC: -/* 919DCC 8024121C 96A2008E */ lhu $v0, 0x8e($s5) -/* 919DD0 80241220 2442FFFF */ addiu $v0, $v0, -1 -/* 919DD4 80241224 A6A2008E */ sh $v0, 0x8e($s5) -/* 919DD8 80241228 00021400 */ sll $v0, $v0, 0x10 -/* 919DDC 8024122C 14400033 */ bnez $v0, .L802412FC -/* 919DE0 80241230 0000102D */ daddu $v0, $zero, $zero -/* 919DE4 80241234 24020028 */ addiu $v0, $zero, 0x28 -/* 919DE8 80241238 080904BE */ j .L802412F8_919EA8 -/* 919DEC 8024123C AE620070 */ sw $v0, 0x70($s3) -.L80241240_919DF0: -/* 919DF0 80241240 0260202D */ daddu $a0, $s3, $zero -/* 919DF4 80241244 0280282D */ daddu $a1, $s4, $zero -/* 919DF8 80241248 0C090261 */ jal iwa_03_UnkNpcAIFunc16 -/* 919DFC 8024124C 0200302D */ daddu $a2, $s0, $zero -.L80241250_919E00: -/* 919E00 80241250 0260202D */ daddu $a0, $s3, $zero -/* 919E04 80241254 0280282D */ daddu $a1, $s4, $zero -/* 919E08 80241258 0C090275 */ jal func_802409D4_919584 -/* 919E0C 8024125C 0200302D */ daddu $a2, $s0, $zero -/* 919E10 80241260 080904BF */ j .L802412FC -/* 919E14 80241264 0000102D */ daddu $v0, $zero, $zero -.L80241268_919E18: -/* 919E18 80241268 0260202D */ daddu $a0, $s3, $zero -/* 919E1C 8024126C 0280282D */ daddu $a1, $s4, $zero -/* 919E20 80241270 0C0902DD */ jal iwa_03_UnkFunc10 -/* 919E24 80241274 0200302D */ daddu $a2, $s0, $zero -/* 919E28 80241278 080904BF */ j .L802412FC -/* 919E2C 8024127C 0000102D */ daddu $v0, $zero, $zero -.L80241280_919E30: -/* 919E30 80241280 0260202D */ daddu $a0, $s3, $zero -/* 919E34 80241284 0280282D */ daddu $a1, $s4, $zero -/* 919E38 80241288 0C090331 */ jal func_80240CC4_919874 -/* 919E3C 8024128C 0200302D */ daddu $a2, $s0, $zero -/* 919E40 80241290 8E630070 */ lw $v1, 0x70($s3) -/* 919E44 80241294 24020029 */ addiu $v0, $zero, 0x29 -/* 919E48 80241298 14620018 */ bne $v1, $v0, .L802412FC -/* 919E4C 8024129C 0000102D */ daddu $v0, $zero, $zero -.L802412A0_919E50: -/* 919E50 802412A0 0260202D */ daddu $a0, $s3, $zero -/* 919E54 802412A4 0280282D */ daddu $a1, $s4, $zero -/* 919E58 802412A8 0C09035C */ jal iwa_03_UnkFunc9 -/* 919E5C 802412AC 0200302D */ daddu $a2, $s0, $zero -/* 919E60 802412B0 080904BF */ j .L802412FC -/* 919E64 802412B4 0000102D */ daddu $v0, $zero, $zero -.L802412B8_919E68: -/* 919E68 802412B8 0260202D */ daddu $a0, $s3, $zero -/* 919E6C 802412BC 0280282D */ daddu $a1, $s4, $zero -/* 919E70 802412C0 0C0903AA */ jal iwa_03_UnkNpcAIFunc19 -/* 919E74 802412C4 0200302D */ daddu $a2, $s0, $zero -.L802412C8_919E78: -/* 919E78 802412C8 0260202D */ daddu $a0, $s3, $zero -/* 919E7C 802412CC 0280282D */ daddu $a1, $s4, $zero -/* 919E80 802412D0 0C0903C9 */ jal iwa_03_UnkNpcAIFunc17 -/* 919E84 802412D4 0200302D */ daddu $a2, $s0, $zero -/* 919E88 802412D8 8E630070 */ lw $v1, 0x70($s3) -/* 919E8C 802412DC 24020034 */ addiu $v0, $zero, 0x34 -/* 919E90 802412E0 14620006 */ bne $v1, $v0, .L802412FC -/* 919E94 802412E4 0000102D */ daddu $v0, $zero, $zero -.L802412E8_919E98: -/* 919E98 802412E8 0260202D */ daddu $a0, $s3, $zero -/* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero -/* 919EA0 802412F0 0C0903E3 */ jal iwa_03_UnkDurationCheck -/* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero -.L802412F8_919EA8: -/* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero -.L802412FC: -/* 919EAC 802412FC 8FBF0048 */ lw $ra, 0x48($sp) -/* 919EB0 80241300 8FB50044 */ lw $s5, 0x44($sp) -/* 919EB4 80241304 8FB40040 */ lw $s4, 0x40($sp) -/* 919EB8 80241308 8FB3003C */ lw $s3, 0x3c($sp) -/* 919EBC 8024130C 8FB20038 */ lw $s2, 0x38($sp) -/* 919EC0 80241310 8FB10034 */ lw $s1, 0x34($sp) -/* 919EC4 80241314 8FB00030 */ lw $s0, 0x30($sp) -/* 919EC8 80241318 03E00008 */ jr $ra -/* 919ECC 8024131C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s deleted file mode 100644 index 02e92063ce..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80241320_919ED0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_919ED0 -/* 919ED0 80241320 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 919ED4 80241324 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 919ED8 80241328 8C430000 */ lw $v1, ($v0) -/* 919EDC 8024132C 8C840084 */ lw $a0, 0x84($a0) -/* 919EE0 80241330 34630010 */ ori $v1, $v1, 0x10 -/* 919EE4 80241334 AC4400D0 */ sw $a0, 0xd0($v0) -/* 919EE8 80241338 AC430000 */ sw $v1, ($v0) -/* 919EEC 8024133C 03E00008 */ jr $ra -/* 919EF0 80241340 24020002 */ addiu $v0, $zero, 2 -/* 919EF4 80241344 00000000 */ nop -/* 919EF8 80241348 00000000 */ nop -/* 919EFC 8024134C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s deleted file mode 100644 index fde30ed4d9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_91B8E0 -/* 91B8E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91B8E4 80240004 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) -/* 91B8E8 80240008 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) -/* 91B8EC 8024000C 3C01C059 */ lui $at, 0xc059 -/* 91B8F0 80240010 44810800 */ mtc1 $at, $f1 -/* 91B8F4 80240014 44800000 */ mtc1 $zero, $f0 -/* 91B8F8 80240018 2406FFFF */ addiu $a2, $zero, -1 -/* 91B8FC 8024001C 44821000 */ mtc1 $v0, $f2 -/* 91B900 80240020 00000000 */ nop -/* 91B904 80240024 468010A1 */ cvt.d.w $f2, $f2 -/* 91B908 80240028 4622003C */ c.lt.d $f0, $f2 -/* 91B90C 8024002C 00000000 */ nop -/* 91B910 80240030 45000002 */ bc1f .L8024003C -/* 91B914 80240034 AFBF0010 */ sw $ra, 0x10($sp) -/* 91B918 80240038 0000302D */ daddu $a2, $zero, $zero -.L8024003C: -/* 91B91C 8024003C 3C01C06E */ lui $at, 0xc06e -/* 91B920 80240040 44810800 */ mtc1 $at, $f1 -/* 91B924 80240044 44800000 */ mtc1 $zero, $f0 -/* 91B928 80240048 00000000 */ nop -/* 91B92C 8024004C 4620103C */ c.lt.d $f2, $f0 -/* 91B930 80240050 00000000 */ nop -/* 91B934 80240054 45030001 */ bc1tl .L8024005C -/* 91B938 80240058 24060001 */ addiu $a2, $zero, 1 -.L8024005C: -/* 91B93C 8024005C 04C00004 */ bltz $a2, .L80240070 -/* 91B940 80240060 00000000 */ nop -/* 91B944 80240064 3C05FD05 */ lui $a1, 0xfd05 -/* 91B948 80240068 0C0B2026 */ jal evt_set_variable -/* 91B94C 8024006C 34A50F89 */ ori $a1, $a1, 0xf89 -.L80240070: -/* 91B950 80240070 8FBF0010 */ lw $ra, 0x10($sp) -/* 91B954 80240074 0000102D */ daddu $v0, $zero, $zero -/* 91B958 80240078 03E00008 */ jr $ra -/* 91B95C 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s deleted file mode 100644 index 668ce62764..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242B90_91E470 -.double 180.0 - -dlabel D_80242B98_91E478 -.double 75.0 - -.section .text - -glabel func_80240080_91B960 -/* 91B960 80240080 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91B964 80240084 AFBF001C */ sw $ra, 0x1c($sp) -/* 91B968 80240088 AFB20018 */ sw $s2, 0x18($sp) -/* 91B96C 8024008C AFB10014 */ sw $s1, 0x14($sp) -/* 91B970 80240090 AFB00010 */ sw $s0, 0x10($sp) -/* 91B974 80240094 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 91B978 80240098 8C900148 */ lw $s0, 0x148($a0) -/* 91B97C 8024009C 86040008 */ lh $a0, 8($s0) -/* 91B980 802400A0 3C014387 */ lui $at, 0x4387 -/* 91B984 802400A4 4481A000 */ mtc1 $at, $f20 -/* 91B988 802400A8 0C00EABB */ jal get_npc_unsafe -/* 91B98C 802400AC 00A0882D */ daddu $s1, $a1, $zero -/* 91B990 802400B0 0200202D */ daddu $a0, $s0, $zero -/* 91B994 802400B4 8E26000C */ lw $a2, 0xc($s1) -/* 91B998 802400B8 8E270010 */ lw $a3, 0x10($s1) -/* 91B99C 802400BC 0040882D */ daddu $s1, $v0, $zero -/* 91B9A0 802400C0 3C03800B */ lui $v1, %hi(gCameras) -/* 91B9A4 802400C4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 91B9A8 802400C8 3C02800A */ lui $v0, %hi(gCurrentCamID) -/* 91B9AC 802400CC 8442A634 */ lh $v0, %lo(gCurrentCamID)($v0) -/* 91B9B0 802400D0 0000282D */ daddu $a1, $zero, $zero -/* 91B9B4 802400D4 00028080 */ sll $s0, $v0, 2 -/* 91B9B8 802400D8 02028021 */ addu $s0, $s0, $v0 -/* 91B9BC 802400DC 00108080 */ sll $s0, $s0, 2 -/* 91B9C0 802400E0 02028023 */ subu $s0, $s0, $v0 -/* 91B9C4 802400E4 001010C0 */ sll $v0, $s0, 3 -/* 91B9C8 802400E8 02028021 */ addu $s0, $s0, $v0 -/* 91B9CC 802400EC 001080C0 */ sll $s0, $s0, 3 -/* 91B9D0 802400F0 0C0124FB */ jal func_800493EC -/* 91B9D4 802400F4 02038021 */ addu $s0, $s0, $v1 -/* 91B9D8 802400F8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 91B9DC 802400FC C62E000C */ lwc1 $f14, 0xc($s1) -/* 91B9E0 80240100 0C00A70A */ jal get_clamped_angle_diff -/* 91B9E4 80240104 0002802B */ sltu $s0, $zero, $v0 -/* 91B9E8 80240108 0C00A6C9 */ jal clamp_angle -/* 91B9EC 8024010C 46000306 */ mov.s $f12, $f0 -/* 91B9F0 80240110 3C018024 */ lui $at, %hi(D_80242B90_91E470) -/* 91B9F4 80240114 D4222B90 */ ldc1 $f2, %lo(D_80242B90_91E470)($at) -/* 91B9F8 80240118 46000021 */ cvt.d.s $f0, $f0 -/* 91B9FC 8024011C 4622003C */ c.lt.d $f0, $f2 -/* 91BA00 80240120 00000000 */ nop -/* 91BA04 80240124 45000003 */ bc1f .L80240134 -/* 91BA08 80240128 00000000 */ nop -/* 91BA0C 8024012C 3C0142B4 */ lui $at, 0x42b4 -/* 91BA10 80240130 4481A000 */ mtc1 $at, $f20 -.L80240134: -/* 91BA14 80240134 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 91BA18 80240138 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 91BA1C 8024013C C62C0038 */ lwc1 $f12, 0x38($s1) -/* 91BA20 80240140 8E420000 */ lw $v0, ($s2) -/* 91BA24 80240144 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 91BA28 80240148 8C460028 */ lw $a2, 0x28($v0) -/* 91BA2C 8024014C 0C00A720 */ jal atan2 -/* 91BA30 80240150 8C470030 */ lw $a3, 0x30($v0) -/* 91BA34 80240154 4600A306 */ mov.s $f12, $f20 -/* 91BA38 80240158 0C00A70A */ jal get_clamped_angle_diff -/* 91BA3C 8024015C 46000386 */ mov.s $f14, $f0 -/* 91BA40 80240160 46000005 */ abs.s $f0, $f0 -/* 91BA44 80240164 3C018024 */ lui $at, %hi(D_80242B98_91E478) -/* 91BA48 80240168 D4222B98 */ ldc1 $f2, %lo(D_80242B98_91E478)($at) -/* 91BA4C 8024016C 46000021 */ cvt.d.s $f0, $f0 -/* 91BA50 80240170 4620103C */ c.lt.d $f2, $f0 -/* 91BA54 80240174 00000000 */ nop -/* 91BA58 80240178 45030001 */ bc1tl .L80240180 -/* 91BA5C 8024017C 0000802D */ daddu $s0, $zero, $zero -.L80240180: -/* 91BA60 80240180 8E420000 */ lw $v0, ($s2) -/* 91BA64 80240184 C620003C */ lwc1 $f0, 0x3c($s1) -/* 91BA68 80240188 C442002C */ lwc1 $f2, 0x2c($v0) -/* 91BA6C 8024018C 46020001 */ sub.s $f0, $f0, $f2 -/* 91BA70 80240190 3C014220 */ lui $at, 0x4220 -/* 91BA74 80240194 44811000 */ mtc1 $at, $f2 -/* 91BA78 80240198 46000005 */ abs.s $f0, $f0 -/* 91BA7C 8024019C 4600103E */ c.le.s $f2, $f0 -/* 91BA80 802401A0 00000000 */ nop -/* 91BA84 802401A4 45030001 */ bc1tl .L802401AC -/* 91BA88 802401A8 0000802D */ daddu $s0, $zero, $zero -.L802401AC: -/* 91BA8C 802401AC 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* 91BA90 802401B0 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* 91BA94 802401B4 24020009 */ addiu $v0, $zero, 9 -/* 91BA98 802401B8 50620001 */ beql $v1, $v0, .L802401C0 -/* 91BA9C 802401BC 0000802D */ daddu $s0, $zero, $zero -.L802401C0: -/* 91BAA0 802401C0 0200102D */ daddu $v0, $s0, $zero -/* 91BAA4 802401C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 91BAA8 802401C8 8FB20018 */ lw $s2, 0x18($sp) -/* 91BAAC 802401CC 8FB10014 */ lw $s1, 0x14($sp) -/* 91BAB0 802401D0 8FB00010 */ lw $s0, 0x10($sp) -/* 91BAB4 802401D4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 91BAB8 802401D8 03E00008 */ jr $ra -/* 91BABC 802401DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s deleted file mode 100644 index c723981632..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242BA0_91E480 -.double 0.85 - -.section .text - -glabel func_80240254_91BB34 -/* 91BB34 80240254 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91BB38 80240258 AFB3003C */ sw $s3, 0x3c($sp) -/* 91BB3C 8024025C 0080982D */ daddu $s3, $a0, $zero -/* 91BB40 80240260 AFBF0044 */ sw $ra, 0x44($sp) -/* 91BB44 80240264 AFB40040 */ sw $s4, 0x40($sp) -/* 91BB48 80240268 AFB20038 */ sw $s2, 0x38($sp) -/* 91BB4C 8024026C AFB10034 */ sw $s1, 0x34($sp) -/* 91BB50 80240270 AFB00030 */ sw $s0, 0x30($sp) -/* 91BB54 80240274 8E700148 */ lw $s0, 0x148($s3) -/* 91BB58 80240278 00A0902D */ daddu $s2, $a1, $zero -/* 91BB5C 8024027C 86040008 */ lh $a0, 8($s0) -/* 91BB60 80240280 0C00EABB */ jal get_npc_unsafe -/* 91BB64 80240284 00C0A02D */ daddu $s4, $a2, $zero -/* 91BB68 80240288 8E630074 */ lw $v1, 0x74($s3) -/* 91BB6C 8024028C 1C600032 */ bgtz $v1, .L80240358 -/* 91BB70 80240290 0040882D */ daddu $s1, $v0, $zero -/* 91BB74 80240294 8E420014 */ lw $v0, 0x14($s2) -/* 91BB78 80240298 AE620074 */ sw $v0, 0x74($s3) -/* 91BB7C 8024029C C640000C */ lwc1 $f0, 0xc($s2) -/* 91BB80 802402A0 3C018024 */ lui $at, %hi(D_80242BA0_91E480) -/* 91BB84 802402A4 D4222BA0 */ ldc1 $f2, %lo(D_80242BA0_91E480)($at) -/* 91BB88 802402A8 46000021 */ cvt.d.s $f0, $f0 -/* 91BB8C 802402AC 46220002 */ mul.d $f0, $f0, $f2 -/* 91BB90 802402B0 00000000 */ nop -/* 91BB94 802402B4 0280202D */ daddu $a0, $s4, $zero -/* 91BB98 802402B8 AFA00010 */ sw $zero, 0x10($sp) -/* 91BB9C 802402BC 8E470010 */ lw $a3, 0x10($s2) -/* 91BBA0 802402C0 46200020 */ cvt.s.d $f0, $f0 -/* 91BBA4 802402C4 44060000 */ mfc1 $a2, $f0 -/* 91BBA8 802402C8 0C01242D */ jal func_800490B4 -/* 91BBAC 802402CC 0200282D */ daddu $a1, $s0, $zero -/* 91BBB0 802402D0 10400021 */ beqz $v0, .L80240358 -/* 91BBB4 802402D4 0000202D */ daddu $a0, $zero, $zero -/* 91BBB8 802402D8 0220282D */ daddu $a1, $s1, $zero -/* 91BBBC 802402DC 0000302D */ daddu $a2, $zero, $zero -/* 91BBC0 802402E0 8E0200CC */ lw $v0, 0xcc($s0) -/* 91BBC4 802402E4 3C013F80 */ lui $at, 0x3f80 -/* 91BBC8 802402E8 44810000 */ mtc1 $at, $f0 -/* 91BBCC 802402EC 3C014000 */ lui $at, 0x4000 -/* 91BBD0 802402F0 44811000 */ mtc1 $at, $f2 -/* 91BBD4 802402F4 8C430024 */ lw $v1, 0x24($v0) -/* 91BBD8 802402F8 862200A8 */ lh $v0, 0xa8($s1) -/* 91BBDC 802402FC 3C01C1A0 */ lui $at, 0xc1a0 -/* 91BBE0 80240300 44812000 */ mtc1 $at, $f4 -/* 91BBE4 80240304 44823000 */ mtc1 $v0, $f6 -/* 91BBE8 80240308 00000000 */ nop -/* 91BBEC 8024030C 468031A0 */ cvt.s.w $f6, $f6 -/* 91BBF0 80240310 44073000 */ mfc1 $a3, $f6 -/* 91BBF4 80240314 2402000F */ addiu $v0, $zero, 0xf -/* 91BBF8 80240318 AE230028 */ sw $v1, 0x28($s1) -/* 91BBFC 8024031C AFA2001C */ sw $v0, 0x1c($sp) -/* 91BC00 80240320 27A20028 */ addiu $v0, $sp, 0x28 -/* 91BC04 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91BC08 80240328 E7A20014 */ swc1 $f2, 0x14($sp) -/* 91BC0C 8024032C E7A40018 */ swc1 $f4, 0x18($sp) -/* 91BC10 80240330 0C01BFA4 */ jal fx_emote -/* 91BC14 80240334 AFA20020 */ sw $v0, 0x20($sp) -/* 91BC18 80240338 0220202D */ daddu $a0, $s1, $zero -/* 91BC1C 8024033C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 91BC20 80240340 0C012530 */ jal ai_enemy_play_sound -/* 91BC24 80240344 3C060020 */ lui $a2, 0x20 -/* 91BC28 80240348 2402000C */ addiu $v0, $zero, 0xc -/* 91BC2C 8024034C A622008E */ sh $v0, 0x8e($s1) -/* 91BC30 80240350 24020002 */ addiu $v0, $zero, 2 -/* 91BC34 80240354 AE620070 */ sw $v0, 0x70($s3) -.L80240358: -/* 91BC38 80240358 8E620074 */ lw $v0, 0x74($s3) -/* 91BC3C 8024035C 2442FFFF */ addiu $v0, $v0, -1 -/* 91BC40 80240360 AE620074 */ sw $v0, 0x74($s3) -/* 91BC44 80240364 8FBF0044 */ lw $ra, 0x44($sp) -/* 91BC48 80240368 8FB40040 */ lw $s4, 0x40($sp) -/* 91BC4C 8024036C 8FB3003C */ lw $s3, 0x3c($sp) -/* 91BC50 80240370 8FB20038 */ lw $s2, 0x38($sp) -/* 91BC54 80240374 8FB10034 */ lw $s1, 0x34($sp) -/* 91BC58 80240378 8FB00030 */ lw $s0, 0x30($sp) -/* 91BC5C 8024037C 03E00008 */ jr $ra -/* 91BC60 80240380 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s deleted file mode 100644 index 88bc2eb2b7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242BA8_91E488 -.double 0.9 - -.section .text - -glabel func_80240714_91BFF4 -/* 91BFF4 80240714 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91BFF8 80240718 AFB30024 */ sw $s3, 0x24($sp) -/* 91BFFC 8024071C 0080982D */ daddu $s3, $a0, $zero -/* 91C000 80240720 AFBF002C */ sw $ra, 0x2c($sp) -/* 91C004 80240724 AFB40028 */ sw $s4, 0x28($sp) -/* 91C008 80240728 AFB20020 */ sw $s2, 0x20($sp) -/* 91C00C 8024072C AFB1001C */ sw $s1, 0x1c($sp) -/* 91C010 80240730 AFB00018 */ sw $s0, 0x18($sp) -/* 91C014 80240734 8E710148 */ lw $s1, 0x148($s3) -/* 91C018 80240738 86240008 */ lh $a0, 8($s1) -/* 91C01C 8024073C 0C00EABB */ jal get_npc_unsafe -/* 91C020 80240740 00A0A02D */ daddu $s4, $a1, $zero -/* 91C024 80240744 0040802D */ daddu $s0, $v0, $zero -/* 91C028 80240748 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 91C02C 8024074C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 91C030 80240750 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C034 80240754 8E420000 */ lw $v0, ($s2) -/* 91C038 80240758 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C03C 8024075C 8C460028 */ lw $a2, 0x28($v0) -/* 91C040 80240760 0C00A720 */ jal atan2 -/* 91C044 80240764 8C470030 */ lw $a3, 0x30($v0) -/* 91C048 80240768 3C025555 */ lui $v0, 0x5555 -/* 91C04C 8024076C 9603008E */ lhu $v1, 0x8e($s0) -/* 91C050 80240770 34425556 */ ori $v0, $v0, 0x5556 -/* 91C054 80240774 00031C00 */ sll $v1, $v1, 0x10 -/* 91C058 80240778 00032403 */ sra $a0, $v1, 0x10 -/* 91C05C 8024077C 00820018 */ mult $a0, $v0 -/* 91C060 80240780 00031FC3 */ sra $v1, $v1, 0x1f -/* 91C064 80240784 00004010 */ mfhi $t0 -/* 91C068 80240788 01031823 */ subu $v1, $t0, $v1 -/* 91C06C 8024078C 00031040 */ sll $v0, $v1, 1 -/* 91C070 80240790 00431021 */ addu $v0, $v0, $v1 -/* 91C074 80240794 00822023 */ subu $a0, $a0, $v0 -/* 91C078 80240798 00042400 */ sll $a0, $a0, 0x10 -/* 91C07C 8024079C 1480000C */ bnez $a0, .L802407D0 -/* 91C080 802407A0 E600000C */ swc1 $f0, 0xc($s0) -/* 91C084 802407A4 C6020040 */ lwc1 $f2, 0x40($s0) -/* 91C088 802407A8 3C014000 */ lui $at, 0x4000 -/* 91C08C 802407AC 44810000 */ mtc1 $at, $f0 -/* 91C090 802407B0 AFA00010 */ sw $zero, 0x10($sp) -/* 91C094 802407B4 AFA00014 */ sw $zero, 0x14($sp) -/* 91C098 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* 91C09C 802407BC 8E06003C */ lw $a2, 0x3c($s0) -/* 91C0A0 802407C0 8E050038 */ lw $a1, 0x38($s0) -/* 91C0A4 802407C4 44071000 */ mfc1 $a3, $f2 -/* 91C0A8 802407C8 0C01BECC */ jal fx_walking_dust -/* 91C0AC 802407CC 24040002 */ addiu $a0, $zero, 2 -.L802407D0: -/* 91C0B0 802407D0 9602008E */ lhu $v0, 0x8e($s0) -/* 91C0B4 802407D4 2442FFFF */ addiu $v0, $v0, -1 -/* 91C0B8 802407D8 A602008E */ sh $v0, 0x8e($s0) -/* 91C0BC 802407DC 00021400 */ sll $v0, $v0, 0x10 -/* 91C0C0 802407E0 1C40002C */ bgtz $v0, .L80240894 -/* 91C0C4 802407E4 00000000 */ nop -/* 91C0C8 802407E8 C6000038 */ lwc1 $f0, 0x38($s0) -/* 91C0CC 802407EC 4600010D */ trunc.w.s $f4, $f0 -/* 91C0D0 802407F0 44022000 */ mfc1 $v0, $f4 -/* 91C0D4 802407F4 00000000 */ nop -/* 91C0D8 802407F8 A6220010 */ sh $v0, 0x10($s1) -/* 91C0DC 802407FC C600003C */ lwc1 $f0, 0x3c($s0) -/* 91C0E0 80240800 4600010D */ trunc.w.s $f4, $f0 -/* 91C0E4 80240804 44022000 */ mfc1 $v0, $f4 -/* 91C0E8 80240808 00000000 */ nop -/* 91C0EC 8024080C A6220012 */ sh $v0, 0x12($s1) -/* 91C0F0 80240810 C6000040 */ lwc1 $f0, 0x40($s0) -/* 91C0F4 80240814 24020001 */ addiu $v0, $zero, 1 -/* 91C0F8 80240818 A2220007 */ sb $v0, 7($s1) -/* 91C0FC 8024081C 4600010D */ trunc.w.s $f4, $f0 -/* 91C100 80240820 44022000 */ mfc1 $v0, $f4 -/* 91C104 80240824 00000000 */ nop -/* 91C108 80240828 A6220014 */ sh $v0, 0x14($s1) -/* 91C10C 8024082C C6800018 */ lwc1 $f0, 0x18($s4) -/* 91C110 80240830 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C114 80240834 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C118 80240838 8E420000 */ lw $v0, ($s2) -/* 91C11C 8024083C E6000018 */ swc1 $f0, 0x18($s0) -/* 91C120 80240840 8C460028 */ lw $a2, 0x28($v0) -/* 91C124 80240844 0C00A7B5 */ jal dist2D -/* 91C128 80240848 8C470030 */ lw $a3, 0x30($v0) -/* 91C12C 8024084C C6020018 */ lwc1 $f2, 0x18($s0) -/* 91C130 80240850 46020003 */ div.s $f0, $f0, $f2 -/* 91C134 80240854 3C018024 */ lui $at, %hi(D_80242BA8_91E488) -/* 91C138 80240858 D4222BA8 */ ldc1 $f2, %lo(D_80242BA8_91E488)($at) -/* 91C13C 8024085C 46000021 */ cvt.d.s $f0, $f0 -/* 91C140 80240860 46220000 */ add.d $f0, $f0, $f2 -/* 91C144 80240864 4620010D */ trunc.w.d $f4, $f0 -/* 91C148 80240868 44022000 */ mfc1 $v0, $f4 -/* 91C14C 8024086C 00000000 */ nop -/* 91C150 80240870 A602008E */ sh $v0, 0x8e($s0) -/* 91C154 80240874 00021400 */ sll $v0, $v0, 0x10 -/* 91C158 80240878 00021403 */ sra $v0, $v0, 0x10 -/* 91C15C 8024087C 2842000F */ slti $v0, $v0, 0xf -/* 91C160 80240880 10400002 */ beqz $v0, .L8024088C -/* 91C164 80240884 2402000F */ addiu $v0, $zero, 0xf -/* 91C168 80240888 A602008E */ sh $v0, 0x8e($s0) -.L8024088C: -/* 91C16C 8024088C 24020016 */ addiu $v0, $zero, 0x16 -/* 91C170 80240890 AE620070 */ sw $v0, 0x70($s3) -.L80240894: -/* 91C174 80240894 8FBF002C */ lw $ra, 0x2c($sp) -/* 91C178 80240898 8FB40028 */ lw $s4, 0x28($sp) -/* 91C17C 8024089C 8FB30024 */ lw $s3, 0x24($sp) -/* 91C180 802408A0 8FB20020 */ lw $s2, 0x20($sp) -/* 91C184 802408A4 8FB1001C */ lw $s1, 0x1c($sp) -/* 91C188 802408A8 8FB00018 */ lw $s0, 0x18($sp) -/* 91C18C 802408AC 03E00008 */ jr $ra -/* 91C190 802408B0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s deleted file mode 100644 index 143255c613..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242BB0_91E490 -.double 32767.0 - -.section .text - -glabel func_80240A04_91C2E4 -/* 91C2E4 80240A04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91C2E8 80240A08 AFB20018 */ sw $s2, 0x18($sp) -/* 91C2EC 80240A0C 0080902D */ daddu $s2, $a0, $zero -/* 91C2F0 80240A10 AFBF001C */ sw $ra, 0x1c($sp) -/* 91C2F4 80240A14 AFB10014 */ sw $s1, 0x14($sp) -/* 91C2F8 80240A18 AFB00010 */ sw $s0, 0x10($sp) -/* 91C2FC 80240A1C 8E500148 */ lw $s0, 0x148($s2) -/* 91C300 80240A20 86040008 */ lh $a0, 8($s0) -/* 91C304 80240A24 0C00EABB */ jal get_npc_unsafe -/* 91C308 80240A28 00A0882D */ daddu $s1, $a1, $zero -/* 91C30C 80240A2C 0040182D */ daddu $v1, $v0, $zero -/* 91C310 80240A30 9462008E */ lhu $v0, 0x8e($v1) -/* 91C314 80240A34 2442FFFF */ addiu $v0, $v0, -1 -/* 91C318 80240A38 A462008E */ sh $v0, 0x8e($v1) -/* 91C31C 80240A3C 00021400 */ sll $v0, $v0, 0x10 -/* 91C320 80240A40 1C400015 */ bgtz $v0, .L80240A98 -/* 91C324 80240A44 00000000 */ nop -/* 91C328 80240A48 8E0200CC */ lw $v0, 0xcc($s0) -/* 91C32C 80240A4C 8C420004 */ lw $v0, 4($v0) -/* 91C330 80240A50 AC620028 */ sw $v0, 0x28($v1) -/* 91C334 80240A54 8E0200D0 */ lw $v0, 0xd0($s0) -/* 91C338 80240A58 8C420014 */ lw $v0, 0x14($v0) -/* 91C33C 80240A5C 04410004 */ bgez $v0, .L80240A70 -/* 91C340 80240A60 00000000 */ nop -/* 91C344 80240A64 C6200000 */ lwc1 $f0, ($s1) -/* 91C348 80240A68 080902A4 */ j .L80240A90 -/* 91C34C 80240A6C E4600018 */ swc1 $f0, 0x18($v1) -.L80240A70: -/* 91C350 80240A70 3C018024 */ lui $at, %hi(D_80242BB0_91E490) -/* 91C354 80240A74 D4222BB0 */ ldc1 $f2, %lo(D_80242BB0_91E490)($at) -/* 91C358 80240A78 44820000 */ mtc1 $v0, $f0 -/* 91C35C 80240A7C 00000000 */ nop -/* 91C360 80240A80 46800021 */ cvt.d.w $f0, $f0 -/* 91C364 80240A84 46220003 */ div.d $f0, $f0, $f2 -/* 91C368 80240A88 46200020 */ cvt.s.d $f0, $f0 -/* 91C36C 80240A8C E4600018 */ swc1 $f0, 0x18($v1) -.L80240A90: -/* 91C370 80240A90 24020029 */ addiu $v0, $zero, 0x29 -/* 91C374 80240A94 AE420070 */ sw $v0, 0x70($s2) -.L80240A98: -/* 91C378 80240A98 8FBF001C */ lw $ra, 0x1c($sp) -/* 91C37C 80240A9C 8FB20018 */ lw $s2, 0x18($sp) -/* 91C380 80240AA0 8FB10014 */ lw $s1, 0x14($sp) -/* 91C384 80240AA4 8FB00010 */ lw $s0, 0x10($sp) -/* 91C388 80240AA8 03E00008 */ jr $ra -/* 91C38C 80240AAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s deleted file mode 100644 index aa3755de91..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s +++ /dev/null @@ -1,247 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242BB8_91E498 -.word .L80240E84_91C764, .L80240E94_91C774, .L80240EB4_91C794, .L80240ED4_91C7B4, .L80240EF4_91C7D4, .L80240F04_91C7E4, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80240F1C_91C7FC, .L80240F3C_91C81C, .L80240F5C_91C83C, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80240F80_91C860, .L80240F90_91C870, .L80240FA8_91C888, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80240FC0_91C8A0, .L80240FE0_91C8C0, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80241038_91C918, .L80240FF8_91C8D8, .L80241008_91C8E8, .L80241028_91C908, 0 - -.section .text - -glabel func_80240D10_91C5F0 -/* 91C5F0 80240D10 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 91C5F4 80240D14 AFB3003C */ sw $s3, 0x3c($sp) -/* 91C5F8 80240D18 0080982D */ daddu $s3, $a0, $zero -/* 91C5FC 80240D1C AFBF0048 */ sw $ra, 0x48($sp) -/* 91C600 80240D20 AFB50044 */ sw $s5, 0x44($sp) -/* 91C604 80240D24 AFB40040 */ sw $s4, 0x40($sp) -/* 91C608 80240D28 AFB20038 */ sw $s2, 0x38($sp) -/* 91C60C 80240D2C AFB10034 */ sw $s1, 0x34($sp) -/* 91C610 80240D30 AFB00030 */ sw $s0, 0x30($sp) -/* 91C614 80240D34 8E720148 */ lw $s2, 0x148($s3) -/* 91C618 80240D38 86440008 */ lh $a0, 8($s2) -/* 91C61C 80240D3C 0C00EABB */ jal get_npc_unsafe -/* 91C620 80240D40 00A0882D */ daddu $s1, $a1, $zero -/* 91C624 80240D44 0260202D */ daddu $a0, $s3, $zero -/* 91C628 80240D48 8E70000C */ lw $s0, 0xc($s3) -/* 91C62C 80240D4C 0040A82D */ daddu $s5, $v0, $zero -/* 91C630 80240D50 8E050000 */ lw $a1, ($s0) -/* 91C634 80240D54 0C0B1EAF */ jal evt_get_variable -/* 91C638 80240D58 26100004 */ addiu $s0, $s0, 4 -/* 91C63C 80240D5C 0260202D */ daddu $a0, $s3, $zero -/* 91C640 80240D60 8E050000 */ lw $a1, ($s0) -/* 91C644 80240D64 0C0B1EAF */ jal evt_get_variable -/* 91C648 80240D68 0040A02D */ daddu $s4, $v0, $zero -/* 91C64C 80240D6C AE420094 */ sw $v0, 0x94($s2) -/* 91C650 80240D70 AFA00010 */ sw $zero, 0x10($sp) -/* 91C654 80240D74 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C658 80240D78 8C420030 */ lw $v0, 0x30($v0) -/* 91C65C 80240D7C AFA20014 */ sw $v0, 0x14($sp) -/* 91C660 80240D80 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C664 80240D84 8C42001C */ lw $v0, 0x1c($v0) -/* 91C668 80240D88 AFA20018 */ sw $v0, 0x18($sp) -/* 91C66C 80240D8C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C670 80240D90 8C420024 */ lw $v0, 0x24($v0) -/* 91C674 80240D94 AFA2001C */ sw $v0, 0x1c($sp) -/* 91C678 80240D98 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C67C 80240D9C 8C420028 */ lw $v0, 0x28($v0) -/* 91C680 80240DA0 AFA20020 */ sw $v0, 0x20($sp) -/* 91C684 80240DA4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C688 80240DA8 3C014220 */ lui $at, 0x4220 -/* 91C68C 80240DAC 44810000 */ mtc1 $at, $f0 -/* 91C690 80240DB0 8C42002C */ lw $v0, 0x2c($v0) -/* 91C694 80240DB4 27B00010 */ addiu $s0, $sp, 0x10 -/* 91C698 80240DB8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 91C69C 80240DBC A7A0002C */ sh $zero, 0x2c($sp) -/* 91C6A0 80240DC0 12200012 */ beqz $s1, .L80240E0C -/* 91C6A4 80240DC4 AFA20024 */ sw $v0, 0x24($sp) -/* 91C6A8 80240DC8 AE600070 */ sw $zero, 0x70($s3) -/* 91C6AC 80240DCC 8EA30000 */ lw $v1, ($s5) -/* 91C6B0 80240DD0 2402F7FF */ addiu $v0, $zero, -0x801 -/* 91C6B4 80240DD4 A6A0008E */ sh $zero, 0x8e($s5) -/* 91C6B8 80240DD8 00621824 */ and $v1, $v1, $v0 -/* 91C6BC 80240DDC AEA30000 */ sw $v1, ($s5) -/* 91C6C0 80240DE0 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C6C4 80240DE4 8C420034 */ lw $v0, 0x34($v0) -/* 91C6C8 80240DE8 54400005 */ bnel $v0, $zero, .L80240E00 -/* 91C6CC 80240DEC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 91C6D0 80240DF0 34620200 */ ori $v0, $v1, 0x200 -/* 91C6D4 80240DF4 2403FFF7 */ addiu $v1, $zero, -9 -/* 91C6D8 80240DF8 08090382 */ j .L80240E08 -/* 91C6DC 80240DFC 00431024 */ and $v0, $v0, $v1 -.L80240E00: -/* 91C6E0 80240E00 00621024 */ and $v0, $v1, $v0 -/* 91C6E4 80240E04 34420008 */ ori $v0, $v0, 8 -.L80240E08: -/* 91C6E8 80240E08 AEA20000 */ sw $v0, ($s5) -.L80240E0C: -/* 91C6EC 80240E0C 8E4300B0 */ lw $v1, 0xb0($s2) -/* 91C6F0 80240E10 30620004 */ andi $v0, $v1, 4 -/* 91C6F4 80240E14 10400007 */ beqz $v0, .L80240E34 -/* 91C6F8 80240E18 00000000 */ nop -/* 91C6FC 80240E1C 824200B4 */ lb $v0, 0xb4($s2) -/* 91C700 80240E20 14400086 */ bnez $v0, .L8024103C -/* 91C704 80240E24 0000102D */ daddu $v0, $zero, $zero -/* 91C708 80240E28 2402FFFB */ addiu $v0, $zero, -5 -/* 91C70C 80240E2C 00621024 */ and $v0, $v1, $v0 -/* 91C710 80240E30 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240E34: -/* 91C714 80240E34 8E620070 */ lw $v0, 0x70($s3) -/* 91C718 80240E38 2442FFF4 */ addiu $v0, $v0, -0xc -/* 91C71C 80240E3C 2C420003 */ sltiu $v0, $v0, 3 -/* 91C720 80240E40 10400007 */ beqz $v0, .L80240E60 -/* 91C724 80240E44 0260202D */ daddu $a0, $s3, $zero -/* 91C728 80240E48 0280282D */ daddu $a1, $s4, $zero -/* 91C72C 80240E4C 0C090020 */ jal func_80240080_91B960 -/* 91C730 80240E50 0200302D */ daddu $a2, $s0, $zero -/* 91C734 80240E54 10400002 */ beqz $v0, .L80240E60 -/* 91C738 80240E58 24020014 */ addiu $v0, $zero, 0x14 -/* 91C73C 80240E5C AE620070 */ sw $v0, 0x70($s3) -.L80240E60: -/* 91C740 80240E60 8E630070 */ lw $v1, 0x70($s3) -/* 91C744 80240E64 2C620035 */ sltiu $v0, $v1, 0x35 -/* 91C748 80240E68 10400073 */ beqz $v0, .L80241038_91C918 -/* 91C74C 80240E6C 00031080 */ sll $v0, $v1, 2 -/* 91C750 80240E70 3C018024 */ lui $at, %hi(jtbl_80242BB8_91E498) -/* 91C754 80240E74 00220821 */ addu $at, $at, $v0 -/* 91C758 80240E78 8C222BB8 */ lw $v0, %lo(jtbl_80242BB8_91E498)($at) -/* 91C75C 80240E7C 00400008 */ jr $v0 -/* 91C760 80240E80 00000000 */ nop -.L80240E84_91C764: -/* 91C764 80240E84 0260202D */ daddu $a0, $s3, $zero -/* 91C768 80240E88 0280282D */ daddu $a1, $s4, $zero -/* 91C76C 80240E8C 0C090078 */ jal iwa_04_UnkNpcAIFunc18 -/* 91C770 80240E90 0200302D */ daddu $a2, $s0, $zero -.L80240E94_91C774: -/* 91C774 80240E94 0260202D */ daddu $a0, $s3, $zero -/* 91C778 80240E98 0280282D */ daddu $a1, $s4, $zero -/* 91C77C 80240E9C 0C090095 */ jal func_80240254_91BB34 -/* 91C780 80240EA0 0200302D */ daddu $a2, $s0, $zero -/* 91C784 80240EA4 8E630070 */ lw $v1, 0x70($s3) -/* 91C788 80240EA8 24020002 */ addiu $v0, $zero, 2 -/* 91C78C 80240EAC 14620063 */ bne $v1, $v0, .L8024103C -/* 91C790 80240EB0 0000102D */ daddu $v0, $zero, $zero -.L80240EB4_91C794: -/* 91C794 80240EB4 0260202D */ daddu $a0, $s3, $zero -/* 91C798 80240EB8 0280282D */ daddu $a1, $s4, $zero -/* 91C79C 80240EBC 0C0900E1 */ jal iwa_04_UnkNpcAIFunc21 -/* 91C7A0 80240EC0 0200302D */ daddu $a2, $s0, $zero -/* 91C7A4 80240EC4 8E630070 */ lw $v1, 0x70($s3) -/* 91C7A8 80240EC8 24020003 */ addiu $v0, $zero, 3 -/* 91C7AC 80240ECC 1462005B */ bne $v1, $v0, .L8024103C -/* 91C7B0 80240ED0 0000102D */ daddu $v0, $zero, $zero -.L80240ED4_91C7B4: -/* 91C7B4 80240ED4 0260202D */ daddu $a0, $s3, $zero -/* 91C7B8 80240ED8 0280282D */ daddu $a1, $s4, $zero -/* 91C7BC 80240EDC 0C090108 */ jal iwa_04_UnkNpcAIFunc20 -/* 91C7C0 80240EE0 0200302D */ daddu $a2, $s0, $zero -/* 91C7C4 80240EE4 8E630070 */ lw $v1, 0x70($s3) -/* 91C7C8 80240EE8 24020004 */ addiu $v0, $zero, 4 -/* 91C7CC 80240EEC 14620053 */ bne $v1, $v0, .L8024103C -/* 91C7D0 80240EF0 0000102D */ daddu $v0, $zero, $zero -.L80240EF4_91C7D4: -/* 91C7D4 80240EF4 0260202D */ daddu $a0, $s3, $zero -/* 91C7D8 80240EF8 0280282D */ daddu $a1, $s4, $zero -/* 91C7DC 80240EFC 0C09012A */ jal iwa_04_UnkNpcAIFunc22 -/* 91C7E0 80240F00 0200302D */ daddu $a2, $s0, $zero -.L80240F04_91C7E4: -/* 91C7E4 80240F04 0260202D */ daddu $a0, $s3, $zero -/* 91C7E8 80240F08 0280282D */ daddu $a1, $s4, $zero -/* 91C7EC 80240F0C 0C090154 */ jal iwa_04_UnkFunc8 -/* 91C7F0 80240F10 0200302D */ daddu $a2, $s0, $zero -/* 91C7F4 80240F14 0809040F */ j .L8024103C -/* 91C7F8 80240F18 0000102D */ daddu $v0, $zero, $zero -.L80240F1C_91C7FC: -/* 91C7FC 80240F1C 0260202D */ daddu $a0, $s3, $zero -/* 91C800 80240F20 0280282D */ daddu $a1, $s4, $zero -/* 91C804 80240F24 0C0127DF */ jal func_80049F7C -/* 91C808 80240F28 0200302D */ daddu $a2, $s0, $zero -/* 91C80C 80240F2C 8E630070 */ lw $v1, 0x70($s3) -/* 91C810 80240F30 2402000D */ addiu $v0, $zero, 0xd -/* 91C814 80240F34 14620041 */ bne $v1, $v0, .L8024103C -/* 91C818 80240F38 0000102D */ daddu $v0, $zero, $zero -.L80240F3C_91C81C: -/* 91C81C 80240F3C 0260202D */ daddu $a0, $s3, $zero -/* 91C820 80240F40 0280282D */ daddu $a1, $s4, $zero -/* 91C824 80240F44 0C012849 */ jal func_8004A124 -/* 91C828 80240F48 0200302D */ daddu $a2, $s0, $zero -/* 91C82C 80240F4C 8E630070 */ lw $v1, 0x70($s3) -/* 91C830 80240F50 2402000E */ addiu $v0, $zero, 0xe -/* 91C834 80240F54 14620039 */ bne $v1, $v0, .L8024103C -/* 91C838 80240F58 0000102D */ daddu $v0, $zero, $zero -.L80240F5C_91C83C: -/* 91C83C 80240F5C 96A2008E */ lhu $v0, 0x8e($s5) -/* 91C840 80240F60 2442FFFF */ addiu $v0, $v0, -1 -/* 91C844 80240F64 A6A2008E */ sh $v0, 0x8e($s5) -/* 91C848 80240F68 00021400 */ sll $v0, $v0, 0x10 -/* 91C84C 80240F6C 14400033 */ bnez $v0, .L8024103C -/* 91C850 80240F70 0000102D */ daddu $v0, $zero, $zero -/* 91C854 80240F74 24020028 */ addiu $v0, $zero, 0x28 -/* 91C858 80240F78 0809040E */ j .L80241038_91C918 -/* 91C85C 80240F7C AE620070 */ sw $v0, 0x70($s3) -.L80240F80_91C860: -/* 91C860 80240F80 0260202D */ daddu $a0, $s3, $zero -/* 91C864 80240F84 0280282D */ daddu $a1, $s4, $zero -/* 91C868 80240F88 0C0901B1 */ jal iwa_04_UnkNpcAIFunc16 -/* 91C86C 80240F8C 0200302D */ daddu $a2, $s0, $zero -.L80240F90_91C870: -/* 91C870 80240F90 0260202D */ daddu $a0, $s3, $zero -/* 91C874 80240F94 0280282D */ daddu $a1, $s4, $zero -/* 91C878 80240F98 0C0901C5 */ jal func_80240714_91BFF4 -/* 91C87C 80240F9C 0200302D */ daddu $a2, $s0, $zero -/* 91C880 80240FA0 0809040F */ j .L8024103C -/* 91C884 80240FA4 0000102D */ daddu $v0, $zero, $zero -.L80240FA8_91C888: -/* 91C888 80240FA8 0260202D */ daddu $a0, $s3, $zero -/* 91C88C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 91C890 80240FB0 0C09022D */ jal iwa_04_UnkFunc10 -/* 91C894 80240FB4 0200302D */ daddu $a2, $s0, $zero -/* 91C898 80240FB8 0809040F */ j .L8024103C -/* 91C89C 80240FBC 0000102D */ daddu $v0, $zero, $zero -.L80240FC0_91C8A0: -/* 91C8A0 80240FC0 0260202D */ daddu $a0, $s3, $zero -/* 91C8A4 80240FC4 0280282D */ daddu $a1, $s4, $zero -/* 91C8A8 80240FC8 0C090281 */ jal func_80240A04_91C2E4 -/* 91C8AC 80240FCC 0200302D */ daddu $a2, $s0, $zero -/* 91C8B0 80240FD0 8E630070 */ lw $v1, 0x70($s3) -/* 91C8B4 80240FD4 24020029 */ addiu $v0, $zero, 0x29 -/* 91C8B8 80240FD8 14620018 */ bne $v1, $v0, .L8024103C -/* 91C8BC 80240FDC 0000102D */ daddu $v0, $zero, $zero -.L80240FE0_91C8C0: -/* 91C8C0 80240FE0 0260202D */ daddu $a0, $s3, $zero -/* 91C8C4 80240FE4 0280282D */ daddu $a1, $s4, $zero -/* 91C8C8 80240FE8 0C0902AC */ jal iwa_04_UnkFunc9 -/* 91C8CC 80240FEC 0200302D */ daddu $a2, $s0, $zero -/* 91C8D0 80240FF0 0809040F */ j .L8024103C -/* 91C8D4 80240FF4 0000102D */ daddu $v0, $zero, $zero -.L80240FF8_91C8D8: -/* 91C8D8 80240FF8 0260202D */ daddu $a0, $s3, $zero -/* 91C8DC 80240FFC 0280282D */ daddu $a1, $s4, $zero -/* 91C8E0 80241000 0C0902FA */ jal iwa_04_UnkNpcAIFunc19 -/* 91C8E4 80241004 0200302D */ daddu $a2, $s0, $zero -.L80241008_91C8E8: -/* 91C8E8 80241008 0260202D */ daddu $a0, $s3, $zero -/* 91C8EC 8024100C 0280282D */ daddu $a1, $s4, $zero -/* 91C8F0 80241010 0C090319 */ jal iwa_04_UnkNpcAIFunc17 -/* 91C8F4 80241014 0200302D */ daddu $a2, $s0, $zero -/* 91C8F8 80241018 8E630070 */ lw $v1, 0x70($s3) -/* 91C8FC 8024101C 24020034 */ addiu $v0, $zero, 0x34 -/* 91C900 80241020 14620006 */ bne $v1, $v0, .L8024103C -/* 91C904 80241024 0000102D */ daddu $v0, $zero, $zero -.L80241028_91C908: -/* 91C908 80241028 0260202D */ daddu $a0, $s3, $zero -/* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero -/* 91C910 80241030 0C090333 */ jal iwa_04_UnkDurationCheck -/* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero -.L80241038_91C918: -/* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero -.L8024103C: -/* 91C91C 8024103C 8FBF0048 */ lw $ra, 0x48($sp) -/* 91C920 80241040 8FB50044 */ lw $s5, 0x44($sp) -/* 91C924 80241044 8FB40040 */ lw $s4, 0x40($sp) -/* 91C928 80241048 8FB3003C */ lw $s3, 0x3c($sp) -/* 91C92C 8024104C 8FB20038 */ lw $s2, 0x38($sp) -/* 91C930 80241050 8FB10034 */ lw $s1, 0x34($sp) -/* 91C934 80241054 8FB00030 */ lw $s0, 0x30($sp) -/* 91C938 80241058 03E00008 */ jr $ra -/* 91C93C 8024105C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s deleted file mode 100644 index 0ab438090e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241060_91C940 -/* 91C940 80241060 3C013F80 */ lui $at, 0x3f80 -/* 91C944 80241064 44810000 */ mtc1 $at, $f0 -/* 91C948 80241068 00000000 */ nop -/* 91C94C 8024106C 3C01800B */ lui $at, %hi(gCameras+0x498) -/* 91C950 80241070 E4202218 */ swc1 $f0, %lo(gCameras+0x498)($at) -/* 91C954 80241074 03E00008 */ jr $ra -/* 91C958 80241078 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s deleted file mode 100644 index c117431002..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024107C_91C95C -/* 91C95C 8024107C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91C960 80241080 AFB00010 */ sw $s0, 0x10($sp) -/* 91C964 80241084 0080802D */ daddu $s0, $a0, $zero -/* 91C968 80241088 AFBF0018 */ sw $ra, 0x18($sp) -/* 91C96C 8024108C AFB10014 */ sw $s1, 0x14($sp) -/* 91C970 80241090 8E11000C */ lw $s1, 0xc($s0) -/* 91C974 80241094 0C0B36B0 */ jal resolve_npc -/* 91C978 80241098 2405FFFF */ addiu $a1, $zero, -1 -/* 91C97C 8024109C 0200202D */ daddu $a0, $s0, $zero -/* 91C980 802410A0 8E250000 */ lw $a1, ($s1) -/* 91C984 802410A4 0C0B1EAF */ jal evt_get_variable -/* 91C988 802410A8 0040802D */ daddu $s0, $v0, $zero -/* 91C98C 802410AC 44820000 */ mtc1 $v0, $f0 -/* 91C990 802410B0 00000000 */ nop -/* 91C994 802410B4 46800020 */ cvt.s.w $f0, $f0 -/* 91C998 802410B8 E6000034 */ swc1 $f0, 0x34($s0) -/* 91C99C 802410BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 91C9A0 802410C0 8FB10014 */ lw $s1, 0x14($sp) -/* 91C9A4 802410C4 8FB00010 */ lw $s0, 0x10($sp) -/* 91C9A8 802410C8 24020002 */ addiu $v0, $zero, 2 -/* 91C9AC 802410CC 03E00008 */ jr $ra -/* 91C9B0 802410D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 91C9B4 802410D4 00000000 */ nop -/* 91C9B8 802410D8 00000000 */ nop -/* 91C9BC 802410DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s deleted file mode 100644 index ce36e159f9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E570/func_80240000_91E570.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_91E570 -/* 91E570 80240000 8C8200C0 */ lw $v0, 0xc0($a0) -/* 91E574 80240004 284202D1 */ slti $v0, $v0, 0x2d1 -/* 91E578 80240008 50400001 */ beql $v0, $zero, .L80240010 -/* 91E57C 8024000C AC8000C0 */ sw $zero, 0xc0($a0) -.L80240010: -/* 91E580 80240010 8C8300C0 */ lw $v1, 0xc0($a0) -/* 91E584 80240014 00031040 */ sll $v0, $v1, 1 -/* 91E588 80240018 00431021 */ addu $v0, $v0, $v1 -/* 91E58C 8024001C 00021040 */ sll $v0, $v0, 1 -/* 91E590 80240020 AC820084 */ sw $v0, 0x84($a0) -/* 91E594 80240024 000317C2 */ srl $v0, $v1, 0x1f -/* 91E598 80240028 00621821 */ addu $v1, $v1, $v0 -/* 91E59C 8024002C 00031843 */ sra $v1, $v1, 1 -/* 91E5A0 80240030 24020002 */ addiu $v0, $zero, 2 -/* 91E5A4 80240034 03E00008 */ jr $ra -/* 91E5A8 80240038 AC830088 */ sw $v1, 0x88($a0) -/* 91E5AC 8024003C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s deleted file mode 100644 index 021010dc06..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/9269F0/func_80240000_9269F0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_9269F0 -/* 9269F0 80240000 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9269F4 80240004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9269F8 80240008 8C420010 */ lw $v0, 0x10($v0) -/* 9269FC 8024000C 3042C000 */ andi $v0, $v0, 0xc000 -/* 926A00 80240010 0002102B */ sltu $v0, $zero, $v0 -/* 926A04 80240014 03E00008 */ jr $ra -/* 926A08 80240018 00021040 */ sll $v0, $v0, 1 -/* 926A0C 8024001C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s deleted file mode 100644 index d6187d6e1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_926BA0 -/* 926BA0 802401B0 3C01C019 */ lui $at, 0xc019 -/* 926BA4 802401B4 3421999A */ ori $at, $at, 0x999a -/* 926BA8 802401B8 44810000 */ mtc1 $at, $f0 -/* 926BAC 802401BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 926BB0 802401C0 AFB00010 */ sw $s0, 0x10($sp) -/* 926BB4 802401C4 0080802D */ daddu $s0, $a0, $zero -/* 926BB8 802401C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 926BBC 802401CC C60C008C */ lwc1 $f12, 0x8c($s0) -/* 926BC0 802401D0 46806320 */ cvt.s.w $f12, $f12 -/* 926BC4 802401D4 46006302 */ mul.s $f12, $f12, $f0 -/* 926BC8 802401D8 0C00A6C9 */ jal clamp_angle -/* 926BCC 802401DC 00000000 */ nop -/* 926BD0 802401E0 3C05FE36 */ lui $a1, 0xfe36 -/* 926BD4 802401E4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 926BD8 802401E8 44060000 */ mfc1 $a2, $f0 -/* 926BDC 802401EC 0C0B2190 */ jal evt_set_float_variable -/* 926BE0 802401F0 0200202D */ daddu $a0, $s0, $zero -/* 926BE4 802401F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 926BE8 802401F8 8FB00010 */ lw $s0, 0x10($sp) -/* 926BEC 802401FC 24020002 */ addiu $v0, $zero, 2 -/* 926BF0 80240200 03E00008 */ jr $ra -/* 926BF4 80240204 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s deleted file mode 100644 index 59b75f3b91..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_926BF8 -/* 926BF8 80240208 3C01C019 */ lui $at, 0xc019 -/* 926BFC 8024020C 3421999A */ ori $at, $at, 0x999a -/* 926C00 80240210 44810000 */ mtc1 $at, $f0 -/* 926C04 80240214 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 926C08 80240218 AFB00010 */ sw $s0, 0x10($sp) -/* 926C0C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 926C10 80240220 AFBF0014 */ sw $ra, 0x14($sp) -/* 926C14 80240224 C60C008C */ lwc1 $f12, 0x8c($s0) -/* 926C18 80240228 46806320 */ cvt.s.w $f12, $f12 -/* 926C1C 8024022C 46006302 */ mul.s $f12, $f12, $f0 -/* 926C20 80240230 00000000 */ nop -/* 926C24 80240234 3C013F19 */ lui $at, 0x3f19 -/* 926C28 80240238 3421999A */ ori $at, $at, 0x999a -/* 926C2C 8024023C 44810000 */ mtc1 $at, $f0 -/* 926C30 80240240 00000000 */ nop -/* 926C34 80240244 46006302 */ mul.s $f12, $f12, $f0 -/* 926C38 80240248 0C00A6C9 */ jal clamp_angle -/* 926C3C 8024024C 00000000 */ nop -/* 926C40 80240250 3C05FE36 */ lui $a1, 0xfe36 -/* 926C44 80240254 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 926C48 80240258 44060000 */ mfc1 $a2, $f0 -/* 926C4C 8024025C 0C0B2190 */ jal evt_set_float_variable -/* 926C50 80240260 0200202D */ daddu $a0, $s0, $zero -/* 926C54 80240264 8FBF0014 */ lw $ra, 0x14($sp) -/* 926C58 80240268 8FB00010 */ lw $s0, 0x10($sp) -/* 926C5C 8024026C 24020002 */ addiu $v0, $zero, 2 -/* 926C60 80240270 03E00008 */ jr $ra -/* 926C64 80240274 27BD0018 */ addiu $sp, $sp, 0x18 -/* 926C68 80240278 00000000 */ nop -/* 926C6C 8024027C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s deleted file mode 100644 index 4980809b62..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240340_B20880.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340_B20880 -/* B20880 80240340 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B20884 80240344 AFBF0020 */ sw $ra, 0x20($sp) -/* B20888 80240348 AFB1001C */ sw $s1, 0x1c($sp) -/* B2088C 8024034C AFB00018 */ sw $s0, 0x18($sp) -/* B20890 80240350 8C910148 */ lw $s1, 0x148($a0) -/* B20894 80240354 0C00EABB */ jal get_npc_unsafe -/* B20898 80240358 86240008 */ lh $a0, 8($s1) -/* B2089C 8024035C 8E23006C */ lw $v1, 0x6c($s1) -/* B208A0 80240360 28630005 */ slti $v1, $v1, 5 -/* B208A4 80240364 1060001D */ beqz $v1, .L802403DC -/* B208A8 80240368 0040802D */ daddu $s0, $v0, $zero -/* B208AC 8024036C 0C00A67F */ jal rand_int -/* B208B0 80240370 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B208B4 80240374 2842012D */ slti $v0, $v0, 0x12d -/* B208B8 80240378 14400018 */ bnez $v0, .L802403DC -/* B208BC 8024037C 24020003 */ addiu $v0, $zero, 3 -/* B208C0 80240380 860300A8 */ lh $v1, 0xa8($s0) -/* B208C4 80240384 C604003C */ lwc1 $f4, 0x3c($s0) -/* B208C8 80240388 C6000040 */ lwc1 $f0, 0x40($s0) -/* B208CC 8024038C 3C014014 */ lui $at, 0x4014 -/* B208D0 80240390 44811800 */ mtc1 $at, $f3 -/* B208D4 80240394 44801000 */ mtc1 $zero, $f2 -/* B208D8 80240398 AFA20010 */ sw $v0, 0x10($sp) -/* B208DC 8024039C 46000021 */ cvt.d.s $f0, $f0 -/* B208E0 802403A0 46220000 */ add.d $f0, $f0, $f2 -/* B208E4 802403A4 AFA00014 */ sw $zero, 0x14($sp) -/* B208E8 802403A8 44831000 */ mtc1 $v1, $f2 -/* B208EC 802403AC 00000000 */ nop -/* B208F0 802403B0 468010A0 */ cvt.s.w $f2, $f2 -/* B208F4 802403B4 46022100 */ add.s $f4, $f4, $f2 -/* B208F8 802403B8 8E050038 */ lw $a1, 0x38($s0) -/* B208FC 802403BC 46200020 */ cvt.s.d $f0, $f0 -/* B20900 802403C0 44062000 */ mfc1 $a2, $f4 -/* B20904 802403C4 44070000 */ mfc1 $a3, $f0 -/* B20908 802403C8 0C04C6A5 */ jal make_item_entity_nodelay -/* B2090C 802403CC 24040156 */ addiu $a0, $zero, 0x156 -/* B20910 802403D0 8E22006C */ lw $v0, 0x6c($s1) -/* B20914 802403D4 24420001 */ addiu $v0, $v0, 1 -/* B20918 802403D8 AE22006C */ sw $v0, 0x6c($s1) -.L802403DC: -/* B2091C 802403DC 8FBF0020 */ lw $ra, 0x20($sp) -/* B20920 802403E0 8FB1001C */ lw $s1, 0x1c($sp) -/* B20924 802403E4 8FB00018 */ lw $s0, 0x18($sp) -/* B20928 802403E8 24020002 */ addiu $v0, $zero, 2 -/* B2092C 802403EC 03E00008 */ jr $ra -/* B20930 802403F0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s deleted file mode 100644 index 6ad675303e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ADC_B2101C -/* B2101C 80240ADC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B21020 80240AE0 AFB00010 */ sw $s0, 0x10($sp) -/* B21024 80240AE4 0080802D */ daddu $s0, $a0, $zero -/* B21028 80240AE8 AFBF0014 */ sw $ra, 0x14($sp) -/* B2102C 80240AEC 0C00EABB */ jal get_npc_unsafe -/* B21030 80240AF0 8E04008C */ lw $a0, 0x8c($s0) -/* B21034 80240AF4 0040282D */ daddu $a1, $v0, $zero -/* B21038 80240AF8 8E040094 */ lw $a0, 0x94($s0) -/* B2103C 80240AFC 8CA30028 */ lw $v1, 0x28($a1) -/* B21040 80240B00 ACA40028 */ sw $a0, 0x28($a1) -/* B21044 80240B04 8FBF0014 */ lw $ra, 0x14($sp) -/* B21048 80240B08 8FB00010 */ lw $s0, 0x10($sp) -/* B2104C 80240B0C 24020002 */ addiu $v0, $zero, 2 -/* B21050 80240B10 3C018024 */ lui $at, %hi(D_80247CB4) -/* B21054 80240B14 AC237CB4 */ sw $v1, %lo(D_80247CB4)($at) -/* B21058 80240B18 03E00008 */ jr $ra -/* B2105C 80240B1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s deleted file mode 100644 index 981d2071da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20_B21060 -/* B21060 80240B20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B21064 80240B24 AFBF0010 */ sw $ra, 0x10($sp) -/* B21068 80240B28 0C00EABB */ jal get_npc_unsafe -/* B2106C 80240B2C 8C84008C */ lw $a0, 0x8c($a0) -/* B21070 80240B30 3C038024 */ lui $v1, %hi(D_80247CB4) -/* B21074 80240B34 8C637CB4 */ lw $v1, %lo(D_80247CB4)($v1) -/* B21078 80240B38 AC430028 */ sw $v1, 0x28($v0) -/* B2107C 80240B3C 8FBF0010 */ lw $ra, 0x10($sp) -/* B21080 80240B40 24020002 */ addiu $v0, $zero, 2 -/* B21084 80240B44 03E00008 */ jr $ra -/* B21088 80240B48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s index 200784570a..6d1b90571e 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s @@ -13,8 +13,8 @@ glabel func_80241578_B2D9E8 /* B2DA08 80241598 8C620000 */ lw $v0, ($v1) /* B2DA0C 8024159C 5040000A */ beql $v0, $zero, .L802415C8 /* B2DA10 802415A0 00041080 */ sll $v0, $a0, 2 -/* B2DA14 802415A4 3C058025 */ lui $a1, %hi(D_80248760_DCCB30) -/* B2DA18 802415A8 24A58760 */ addiu $a1, $a1, %lo(D_80248760_DCCB30) +/* B2DA14 802415A4 3C058025 */ lui $a1, %hi(D_80248760_jan_02) +/* B2DA18 802415A8 24A58760 */ addiu $a1, $a1, %lo(D_80248760_jan_02) .L802415AC: /* B2DA1C 802415AC 24630004 */ addiu $v1, $v1, 4 /* B2DA20 802415B0 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_80241578_B2D9E8 /* B2DA30 802415C0 24A50004 */ addiu $a1, $a1, 4 /* B2DA34 802415C4 00041080 */ sll $v0, $a0, 2 .L802415C8: -/* B2DA38 802415C8 3C018025 */ lui $at, %hi(D_80248760_DCCB30) +/* B2DA38 802415C8 3C018025 */ lui $at, %hi(D_80248760_jan_02) /* B2DA3C 802415CC 00220821 */ addu $at, $at, $v0 -/* B2DA40 802415D0 AC208760 */ sw $zero, %lo(D_80248760_DCCB30)($at) +/* B2DA40 802415D0 AC208760 */ sw $zero, %lo(D_80248760_jan_02)($at) /* B2DA44 802415D4 08090581 */ j .L80241604 /* B2DA48 802415D8 00000000 */ nop .L802415DC: -/* B2DA4C 802415DC 3C038025 */ lui $v1, %hi(D_80248760_DCCB30) -/* B2DA50 802415E0 24638760 */ addiu $v1, $v1, %lo(D_80248760_DCCB30) +/* B2DA4C 802415DC 3C038025 */ lui $v1, %hi(D_80248760_jan_02) +/* B2DA50 802415E0 24638760 */ addiu $v1, $v1, %lo(D_80248760_jan_02) /* B2DA54 802415E4 0060282D */ daddu $a1, $v1, $zero .L802415E8: /* B2DA58 802415E8 24820010 */ addiu $v0, $a0, 0x10 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s deleted file mode 100644 index 1adf15906e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EAC_B37A7C -/* B37A7C 80242EAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37A80 80242EB0 AFB00010 */ sw $s0, 0x10($sp) -/* B37A84 80242EB4 0080802D */ daddu $s0, $a0, $zero -/* B37A88 80242EB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B37A8C 80242EBC 0C00EABB */ jal get_npc_unsafe -/* B37A90 80242EC0 8E04008C */ lw $a0, 0x8c($s0) -/* B37A94 80242EC4 0040282D */ daddu $a1, $v0, $zero -/* B37A98 80242EC8 8E040094 */ lw $a0, 0x94($s0) -/* B37A9C 80242ECC 8CA30028 */ lw $v1, 0x28($a1) -/* B37AA0 80242ED0 ACA40028 */ sw $a0, 0x28($a1) -/* B37AA4 80242ED4 8FBF0014 */ lw $ra, 0x14($sp) -/* B37AA8 80242ED8 8FB00010 */ lw $s0, 0x10($sp) -/* B37AAC 80242EDC 24020002 */ addiu $v0, $zero, 2 -/* B37AB0 80242EE0 3C018025 */ lui $at, %hi(D_8024FF04) -/* B37AB4 80242EE4 AC23FF04 */ sw $v1, %lo(D_8024FF04)($at) -/* B37AB8 80242EE8 03E00008 */ jr $ra -/* B37ABC 80242EEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s deleted file mode 100644 index 99ab91088c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EF0_B37AC0 -/* B37AC0 80242EF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37AC4 80242EF4 AFBF0010 */ sw $ra, 0x10($sp) -/* B37AC8 80242EF8 0C00EABB */ jal get_npc_unsafe -/* B37ACC 80242EFC 8C84008C */ lw $a0, 0x8c($a0) -/* B37AD0 80242F00 3C038025 */ lui $v1, %hi(D_8024FF04) -/* B37AD4 80242F04 8C63FF04 */ lw $v1, %lo(D_8024FF04)($v1) -/* B37AD8 80242F08 AC430028 */ sw $v1, 0x28($v0) -/* B37ADC 80242F0C 8FBF0010 */ lw $ra, 0x10($sp) -/* B37AE0 80242F10 24020002 */ addiu $v0, $zero, 2 -/* B37AE4 80242F14 03E00008 */ jr $ra -/* B37AE8 80242F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s deleted file mode 100644 index 9f9a91269c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802407F0_B4B260.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F0_B4B260 -/* B4B260 802407F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B4B264 802407F4 AFBF0020 */ sw $ra, 0x20($sp) -/* B4B268 802407F8 AFB1001C */ sw $s1, 0x1c($sp) -/* B4B26C 802407FC AFB00018 */ sw $s0, 0x18($sp) -/* B4B270 80240800 8C910148 */ lw $s1, 0x148($a0) -/* B4B274 80240804 0C00EABB */ jal get_npc_unsafe -/* B4B278 80240808 86240008 */ lh $a0, 8($s1) -/* B4B27C 8024080C 8E23006C */ lw $v1, 0x6c($s1) -/* B4B280 80240810 28630005 */ slti $v1, $v1, 5 -/* B4B284 80240814 1060001D */ beqz $v1, .L8024088C -/* B4B288 80240818 0040802D */ daddu $s0, $v0, $zero -/* B4B28C 8024081C 0C00A67F */ jal rand_int -/* B4B290 80240820 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B4B294 80240824 2842012D */ slti $v0, $v0, 0x12d -/* B4B298 80240828 14400018 */ bnez $v0, .L8024088C -/* B4B29C 8024082C 24020003 */ addiu $v0, $zero, 3 -/* B4B2A0 80240830 860300A8 */ lh $v1, 0xa8($s0) -/* B4B2A4 80240834 C604003C */ lwc1 $f4, 0x3c($s0) -/* B4B2A8 80240838 C6000040 */ lwc1 $f0, 0x40($s0) -/* B4B2AC 8024083C 3C014014 */ lui $at, 0x4014 -/* B4B2B0 80240840 44811800 */ mtc1 $at, $f3 -/* B4B2B4 80240844 44801000 */ mtc1 $zero, $f2 -/* B4B2B8 80240848 AFA20010 */ sw $v0, 0x10($sp) -/* B4B2BC 8024084C 46000021 */ cvt.d.s $f0, $f0 -/* B4B2C0 80240850 46220000 */ add.d $f0, $f0, $f2 -/* B4B2C4 80240854 AFA00014 */ sw $zero, 0x14($sp) -/* B4B2C8 80240858 44831000 */ mtc1 $v1, $f2 -/* B4B2CC 8024085C 00000000 */ nop -/* B4B2D0 80240860 468010A0 */ cvt.s.w $f2, $f2 -/* B4B2D4 80240864 46022100 */ add.s $f4, $f4, $f2 -/* B4B2D8 80240868 8E050038 */ lw $a1, 0x38($s0) -/* B4B2DC 8024086C 46200020 */ cvt.s.d $f0, $f0 -/* B4B2E0 80240870 44062000 */ mfc1 $a2, $f4 -/* B4B2E4 80240874 44070000 */ mfc1 $a3, $f0 -/* B4B2E8 80240878 0C04C6A5 */ jal make_item_entity_nodelay -/* B4B2EC 8024087C 24040156 */ addiu $a0, $zero, 0x156 -/* B4B2F0 80240880 8E22006C */ lw $v0, 0x6c($s1) -/* B4B2F4 80240884 24420001 */ addiu $v0, $v0, 1 -/* B4B2F8 80240888 AE22006C */ sw $v0, 0x6c($s1) -.L8024088C: -/* B4B2FC 8024088C 8FBF0020 */ lw $ra, 0x20($sp) -/* B4B300 80240890 8FB1001C */ lw $s1, 0x1c($sp) -/* B4B304 80240894 8FB00018 */ lw $s0, 0x18($sp) -/* B4B308 80240898 24020002 */ addiu $v0, $zero, 2 -/* B4B30C 8024089C 03E00008 */ jr $ra -/* B4B310 802408A0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s deleted file mode 100644 index 1f200e64af..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241554_B53D84.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241554_B53D84 -/* B53D84 80241554 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B53D88 80241558 AFBF0020 */ sw $ra, 0x20($sp) -/* B53D8C 8024155C AFB1001C */ sw $s1, 0x1c($sp) -/* B53D90 80241560 AFB00018 */ sw $s0, 0x18($sp) -/* B53D94 80241564 8C910148 */ lw $s1, 0x148($a0) -/* B53D98 80241568 0C00EABB */ jal get_npc_unsafe -/* B53D9C 8024156C 86240008 */ lh $a0, 8($s1) -/* B53DA0 80241570 8E23006C */ lw $v1, 0x6c($s1) -/* B53DA4 80241574 28630005 */ slti $v1, $v1, 5 -/* B53DA8 80241578 1060001D */ beqz $v1, .L802415F0 -/* B53DAC 8024157C 0040802D */ daddu $s0, $v0, $zero -/* B53DB0 80241580 0C00A67F */ jal rand_int -/* B53DB4 80241584 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B53DB8 80241588 2842012D */ slti $v0, $v0, 0x12d -/* B53DBC 8024158C 14400018 */ bnez $v0, .L802415F0 -/* B53DC0 80241590 24020003 */ addiu $v0, $zero, 3 -/* B53DC4 80241594 860300A8 */ lh $v1, 0xa8($s0) -/* B53DC8 80241598 C604003C */ lwc1 $f4, 0x3c($s0) -/* B53DCC 8024159C C6000040 */ lwc1 $f0, 0x40($s0) -/* B53DD0 802415A0 3C014014 */ lui $at, 0x4014 -/* B53DD4 802415A4 44811800 */ mtc1 $at, $f3 -/* B53DD8 802415A8 44801000 */ mtc1 $zero, $f2 -/* B53DDC 802415AC AFA20010 */ sw $v0, 0x10($sp) -/* B53DE0 802415B0 46000021 */ cvt.d.s $f0, $f0 -/* B53DE4 802415B4 46220000 */ add.d $f0, $f0, $f2 -/* B53DE8 802415B8 AFA00014 */ sw $zero, 0x14($sp) -/* B53DEC 802415BC 44831000 */ mtc1 $v1, $f2 -/* B53DF0 802415C0 00000000 */ nop -/* B53DF4 802415C4 468010A0 */ cvt.s.w $f2, $f2 -/* B53DF8 802415C8 46022100 */ add.s $f4, $f4, $f2 -/* B53DFC 802415CC 8E050038 */ lw $a1, 0x38($s0) -/* B53E00 802415D0 46200020 */ cvt.s.d $f0, $f0 -/* B53E04 802415D4 44062000 */ mfc1 $a2, $f4 -/* B53E08 802415D8 44070000 */ mfc1 $a3, $f0 -/* B53E0C 802415DC 0C04C6A5 */ jal make_item_entity_nodelay -/* B53E10 802415E0 24040156 */ addiu $a0, $zero, 0x156 -/* B53E14 802415E4 8E22006C */ lw $v0, 0x6c($s1) -/* B53E18 802415E8 24420001 */ addiu $v0, $v0, 1 -/* B53E1C 802415EC AE22006C */ sw $v0, 0x6c($s1) -.L802415F0: -/* B53E20 802415F0 8FBF0020 */ lw $ra, 0x20($sp) -/* B53E24 802415F4 8FB1001C */ lw $s1, 0x1c($sp) -/* B53E28 802415F8 8FB00018 */ lw $s0, 0x18($sp) -/* B53E2C 802415FC 24020002 */ addiu $v0, $zero, 2 -/* B53E30 80241600 03E00008 */ jr $ra -/* B53E34 80241604 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s deleted file mode 100644 index d039afc290..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A0_B5F650 -/* B5F650 802413A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5F654 802413A4 AFBF0020 */ sw $ra, 0x20($sp) -/* B5F658 802413A8 AFB1001C */ sw $s1, 0x1c($sp) -/* B5F65C 802413AC AFB00018 */ sw $s0, 0x18($sp) -/* B5F660 802413B0 8C910148 */ lw $s1, 0x148($a0) -/* B5F664 802413B4 0C00EABB */ jal get_npc_unsafe -/* B5F668 802413B8 86240008 */ lh $a0, 8($s1) -/* B5F66C 802413BC 8E23006C */ lw $v1, 0x6c($s1) -/* B5F670 802413C0 28630005 */ slti $v1, $v1, 5 -/* B5F674 802413C4 1060001D */ beqz $v1, .L8024143C -/* B5F678 802413C8 0040802D */ daddu $s0, $v0, $zero -/* B5F67C 802413CC 0C00A67F */ jal rand_int -/* B5F680 802413D0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B5F684 802413D4 2842012D */ slti $v0, $v0, 0x12d -/* B5F688 802413D8 14400018 */ bnez $v0, .L8024143C -/* B5F68C 802413DC 24020003 */ addiu $v0, $zero, 3 -/* B5F690 802413E0 860300A8 */ lh $v1, 0xa8($s0) -/* B5F694 802413E4 C604003C */ lwc1 $f4, 0x3c($s0) -/* B5F698 802413E8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B5F69C 802413EC 3C014014 */ lui $at, 0x4014 -/* B5F6A0 802413F0 44811800 */ mtc1 $at, $f3 -/* B5F6A4 802413F4 44801000 */ mtc1 $zero, $f2 -/* B5F6A8 802413F8 AFA20010 */ sw $v0, 0x10($sp) -/* B5F6AC 802413FC 46000021 */ cvt.d.s $f0, $f0 -/* B5F6B0 80241400 46220000 */ add.d $f0, $f0, $f2 -/* B5F6B4 80241404 AFA00014 */ sw $zero, 0x14($sp) -/* B5F6B8 80241408 44831000 */ mtc1 $v1, $f2 -/* B5F6BC 8024140C 00000000 */ nop -/* B5F6C0 80241410 468010A0 */ cvt.s.w $f2, $f2 -/* B5F6C4 80241414 46022100 */ add.s $f4, $f4, $f2 -/* B5F6C8 80241418 8E050038 */ lw $a1, 0x38($s0) -/* B5F6CC 8024141C 46200020 */ cvt.s.d $f0, $f0 -/* B5F6D0 80241420 44062000 */ mfc1 $a2, $f4 -/* B5F6D4 80241424 44070000 */ mfc1 $a3, $f0 -/* B5F6D8 80241428 0C04C6A5 */ jal make_item_entity_nodelay -/* B5F6DC 8024142C 24040156 */ addiu $a0, $zero, 0x156 -/* B5F6E0 80241430 8E22006C */ lw $v0, 0x6c($s1) -/* B5F6E4 80241434 24420001 */ addiu $v0, $v0, 1 -/* B5F6E8 80241438 AE22006C */ sw $v0, 0x6c($s1) -.L8024143C: -/* B5F6EC 8024143C 8FBF0020 */ lw $ra, 0x20($sp) -/* B5F6F0 80241440 8FB1001C */ lw $s1, 0x1c($sp) -/* B5F6F4 80241444 8FB00018 */ lw $s0, 0x18($sp) -/* B5F6F8 80241448 24020002 */ addiu $v0, $zero, 2 -/* B5F6FC 8024144C 03E00008 */ jr $ra -/* B5F700 80241450 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s deleted file mode 100644 index 689b536ce5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B730B0 -/* B730B0 80240000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B730B4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* B730B8 80240008 0080882D */ daddu $s1, $a0, $zero -/* B730BC 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* B730C0 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* B730C4 80240014 F7B80030 */ sdc1 $f24, 0x30($sp) -/* B730C8 80240018 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B730CC 8024001C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B730D0 80240020 8E30000C */ lw $s0, 0xc($s1) -/* B730D4 80240024 8E050000 */ lw $a1, ($s0) -/* B730D8 80240028 0C0B210B */ jal evt_get_float_variable -/* B730DC 8024002C 26100004 */ addiu $s0, $s0, 4 -/* B730E0 80240030 8E050000 */ lw $a1, ($s0) -/* B730E4 80240034 26100004 */ addiu $s0, $s0, 4 -/* B730E8 80240038 0220202D */ daddu $a0, $s1, $zero -/* B730EC 8024003C 0C0B210B */ jal evt_get_float_variable -/* B730F0 80240040 46000606 */ mov.s $f24, $f0 -/* B730F4 80240044 8E050000 */ lw $a1, ($s0) -/* B730F8 80240048 26100004 */ addiu $s0, $s0, 4 -/* B730FC 8024004C 3C014170 */ lui $at, 0x4170 -/* B73100 80240050 44811000 */ mtc1 $at, $f2 -/* B73104 80240054 0220202D */ daddu $a0, $s1, $zero -/* B73108 80240058 0C0B210B */ jal evt_get_float_variable -/* B7310C 8024005C 46020580 */ add.s $f22, $f0, $f2 -/* B73110 80240060 0220202D */ daddu $a0, $s1, $zero -/* B73114 80240064 8E050000 */ lw $a1, ($s0) -/* B73118 80240068 0C0B210B */ jal evt_get_float_variable -/* B7311C 8024006C 46000506 */ mov.s $f20, $f0 -/* B73120 80240070 46000002 */ mul.s $f0, $f0, $f0 -/* B73124 80240074 00000000 */ nop -/* B73128 80240078 C6240084 */ lwc1 $f4, 0x84($s1) -/* B7312C 8024007C 46802120 */ cvt.s.w $f4, $f4 -/* B73130 80240080 46182101 */ sub.s $f4, $f4, $f24 -/* B73134 80240084 46042102 */ mul.s $f4, $f4, $f4 -/* B73138 80240088 00000000 */ nop -/* B7313C 8024008C C622008C */ lwc1 $f2, 0x8c($s1) -/* B73140 80240090 468010A0 */ cvt.s.w $f2, $f2 -/* B73144 80240094 46141081 */ sub.s $f2, $f2, $f20 -/* B73148 80240098 46021082 */ mul.s $f2, $f2, $f2 -/* B7314C 8024009C 00000000 */ nop -/* B73150 802400A0 C6260088 */ lwc1 $f6, 0x88($s1) -/* B73154 802400A4 468031A0 */ cvt.s.w $f6, $f6 -/* B73158 802400A8 46163181 */ sub.s $f6, $f6, $f22 -/* B7315C 802400AC 46063182 */ mul.s $f6, $f6, $f6 -/* B73160 802400B0 00000000 */ nop -/* B73164 802400B4 46062100 */ add.s $f4, $f4, $f6 -/* B73168 802400B8 46022100 */ add.s $f4, $f4, $f2 -/* B7316C 802400BC 4600203C */ c.lt.s $f4, $f0 -/* B73170 802400C0 00000000 */ nop -/* B73174 802400C4 45010002 */ bc1t .L802400D0 -/* B73178 802400C8 24020001 */ addiu $v0, $zero, 1 -/* B7317C 802400CC 0000102D */ daddu $v0, $zero, $zero -.L802400D0: -/* B73180 802400D0 AE220084 */ sw $v0, 0x84($s1) -/* B73184 802400D4 8FBF0018 */ lw $ra, 0x18($sp) -/* B73188 802400D8 8FB10014 */ lw $s1, 0x14($sp) -/* B7318C 802400DC 8FB00010 */ lw $s0, 0x10($sp) -/* B73190 802400E0 D7B80030 */ ldc1 $f24, 0x30($sp) -/* B73194 802400E4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B73198 802400E8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B7319C 802400EC 24020002 */ addiu $v0, $zero, 2 -/* B731A0 802400F0 03E00008 */ jr $ra -/* B731A4 802400F4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s deleted file mode 100644 index c9870bfee4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F8_B731A8 -/* B731A8 802400F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B731AC 802400FC AFB10014 */ sw $s1, 0x14($sp) -/* B731B0 80240100 0080882D */ daddu $s1, $a0, $zero -/* B731B4 80240104 AFBF0018 */ sw $ra, 0x18($sp) -/* B731B8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B731BC 8024010C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B731C0 80240110 8E30000C */ lw $s0, 0xc($s1) -/* B731C4 80240114 8E050000 */ lw $a1, ($s0) -/* B731C8 80240118 0C0B210B */ jal evt_get_float_variable -/* B731CC 8024011C 26100004 */ addiu $s0, $s0, 4 -/* B731D0 80240120 8E050000 */ lw $a1, ($s0) -/* B731D4 80240124 26100004 */ addiu $s0, $s0, 4 -/* B731D8 80240128 0220202D */ daddu $a0, $s1, $zero -/* B731DC 8024012C 0C0B210B */ jal evt_get_float_variable -/* B731E0 80240130 46000506 */ mov.s $f20, $f0 -/* B731E4 80240134 46140001 */ sub.s $f0, $f0, $f20 -/* B731E8 80240138 3C014120 */ lui $at, 0x4120 -/* B731EC 8024013C 44811000 */ mtc1 $at, $f2 -/* B731F0 80240140 8E050000 */ lw $a1, ($s0) -/* B731F4 80240144 46020003 */ div.s $f0, $f0, $f2 -/* B731F8 80240148 44060000 */ mfc1 $a2, $f0 -/* B731FC 8024014C 0C0B2190 */ jal evt_set_float_variable -/* B73200 80240150 0220202D */ daddu $a0, $s1, $zero -/* B73204 80240154 8FBF0018 */ lw $ra, 0x18($sp) -/* B73208 80240158 8FB10014 */ lw $s1, 0x14($sp) -/* B7320C 8024015C 8FB00010 */ lw $s0, 0x10($sp) -/* B73210 80240160 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B73214 80240164 24020002 */ addiu $v0, $zero, 2 -/* B73218 80240168 03E00008 */ jr $ra -/* B7321C 8024016C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s deleted file mode 100644 index a80f17dbff..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802433B0_B76460 -.double 0.2, 0.0 - -.section .text - -glabel func_80240170_B73220 -/* B73220 80240170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B73224 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* B73228 80240178 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B7322C 8024017C 4485A000 */ mtc1 $a1, $f20 -/* B73230 80240180 AFBF0014 */ sw $ra, 0x14($sp) -/* B73234 80240184 0C019D28 */ jal guMtxIdentF -/* B73238 80240188 0080802D */ daddu $s0, $a0, $zero -/* B7323C 8024018C 3C018024 */ lui $at, %hi(D_802433B0_B76460) -/* B73240 80240190 D42033B0 */ ldc1 $f0, %lo(D_802433B0_B76460)($at) -/* B73244 80240194 4600A521 */ cvt.d.s $f20, $f20 -/* B73248 80240198 4620A502 */ mul.d $f20, $f20, $f0 -/* B7324C 8024019C 00000000 */ nop -/* B73250 802401A0 3C013F80 */ lui $at, 0x3f80 -/* B73254 802401A4 44810000 */ mtc1 $at, $f0 -/* B73258 802401A8 AE000018 */ sw $zero, 0x18($s0) -/* B7325C 802401AC E6000014 */ swc1 $f0, 0x14($s0) -/* B73260 802401B0 4620A520 */ cvt.s.d $f20, $f20 -/* B73264 802401B4 E6140010 */ swc1 $f20, 0x10($s0) -/* B73268 802401B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B7326C 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* B73270 802401C0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B73274 802401C4 03E00008 */ jr $ra -/* B73278 802401C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s deleted file mode 100644 index 6c2eb22f83..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_B7327C -/* B7327C 802401CC 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B73280 802401D0 AFB10054 */ sw $s1, 0x54($sp) -/* B73284 802401D4 0080882D */ daddu $s1, $a0, $zero -/* B73288 802401D8 AFBF0058 */ sw $ra, 0x58($sp) -/* B7328C 802401DC AFB00050 */ sw $s0, 0x50($sp) -/* B73290 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B73294 802401E4 8E30000C */ lw $s0, 0xc($s1) -/* B73298 802401E8 8E050000 */ lw $a1, ($s0) -/* B7329C 802401EC 0C0B1EAF */ jal evt_get_variable -/* B732A0 802401F0 26100004 */ addiu $s0, $s0, 4 -/* B732A4 802401F4 0C046C04 */ jal get_model_list_index_from_tree_index -/* B732A8 802401F8 0040202D */ daddu $a0, $v0, $zero -/* B732AC 802401FC 0220202D */ daddu $a0, $s1, $zero -/* B732B0 80240200 8E050000 */ lw $a1, ($s0) -/* B732B4 80240204 0C0B210B */ jal evt_get_float_variable -/* B732B8 80240208 0040802D */ daddu $s0, $v0, $zero -/* B732BC 8024020C 0200202D */ daddu $a0, $s0, $zero -/* B732C0 80240210 0C046B4C */ jal get_model_from_list_index -/* B732C4 80240214 46000506 */ mov.s $f20, $f0 -/* B732C8 80240218 0040802D */ daddu $s0, $v0, $zero -/* B732CC 8024021C 96020000 */ lhu $v0, ($s0) -/* B732D0 80240220 30420400 */ andi $v0, $v0, 0x400 -/* B732D4 80240224 14400008 */ bnez $v0, .L80240248 -/* B732D8 80240228 00000000 */ nop -/* B732DC 8024022C 4405A000 */ mfc1 $a1, $f20 -/* B732E0 80240230 0C09005C */ jal func_80240170_B73220 -/* B732E4 80240234 26040058 */ addiu $a0, $s0, 0x58 -/* B732E8 80240238 96020000 */ lhu $v0, ($s0) -/* B732EC 8024023C 34421400 */ ori $v0, $v0, 0x1400 -/* B732F0 80240240 08090099 */ j .L80240264 -/* B732F4 80240244 A6020000 */ sh $v0, ($s0) -.L80240248: -/* B732F8 80240248 4405A000 */ mfc1 $a1, $f20 -/* B732FC 8024024C 0C09005C */ jal func_80240170_B73220 -/* B73300 80240250 27A40010 */ addiu $a0, $sp, 0x10 -/* B73304 80240254 27A40010 */ addiu $a0, $sp, 0x10 -/* B73308 80240258 26050058 */ addiu $a1, $s0, 0x58 -/* B7330C 8024025C 0C019D80 */ jal guMtxCatF -/* B73310 80240260 00A0302D */ daddu $a2, $a1, $zero -.L80240264: -/* B73314 80240264 8FBF0058 */ lw $ra, 0x58($sp) -/* B73318 80240268 8FB10054 */ lw $s1, 0x54($sp) -/* B7331C 8024026C 8FB00050 */ lw $s0, 0x50($sp) -/* B73320 80240270 D7B40060 */ ldc1 $f20, 0x60($sp) -/* B73324 80240274 24020002 */ addiu $v0, $zero, 2 -/* B73328 80240278 03E00008 */ jr $ra -/* B7332C 8024027C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s deleted file mode 100644 index c585a8c342..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B7A050 -/* B7A050 80240000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B7A054 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* B7A058 80240008 0080882D */ daddu $s1, $a0, $zero -/* B7A05C 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* B7A060 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* B7A064 80240014 F7B80030 */ sdc1 $f24, 0x30($sp) -/* B7A068 80240018 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B7A06C 8024001C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B7A070 80240020 8E30000C */ lw $s0, 0xc($s1) -/* B7A074 80240024 8E050000 */ lw $a1, ($s0) -/* B7A078 80240028 0C0B210B */ jal evt_get_float_variable -/* B7A07C 8024002C 26100004 */ addiu $s0, $s0, 4 -/* B7A080 80240030 8E050000 */ lw $a1, ($s0) -/* B7A084 80240034 26100004 */ addiu $s0, $s0, 4 -/* B7A088 80240038 0220202D */ daddu $a0, $s1, $zero -/* B7A08C 8024003C 0C0B210B */ jal evt_get_float_variable -/* B7A090 80240040 46000606 */ mov.s $f24, $f0 -/* B7A094 80240044 8E050000 */ lw $a1, ($s0) -/* B7A098 80240048 26100004 */ addiu $s0, $s0, 4 -/* B7A09C 8024004C 3C014170 */ lui $at, 0x4170 -/* B7A0A0 80240050 44811000 */ mtc1 $at, $f2 -/* B7A0A4 80240054 0220202D */ daddu $a0, $s1, $zero -/* B7A0A8 80240058 0C0B210B */ jal evt_get_float_variable -/* B7A0AC 8024005C 46020580 */ add.s $f22, $f0, $f2 -/* B7A0B0 80240060 0220202D */ daddu $a0, $s1, $zero -/* B7A0B4 80240064 8E050000 */ lw $a1, ($s0) -/* B7A0B8 80240068 0C0B210B */ jal evt_get_float_variable -/* B7A0BC 8024006C 46000506 */ mov.s $f20, $f0 -/* B7A0C0 80240070 46000002 */ mul.s $f0, $f0, $f0 -/* B7A0C4 80240074 00000000 */ nop -/* B7A0C8 80240078 C6240084 */ lwc1 $f4, 0x84($s1) -/* B7A0CC 8024007C 46802120 */ cvt.s.w $f4, $f4 -/* B7A0D0 80240080 46182101 */ sub.s $f4, $f4, $f24 -/* B7A0D4 80240084 46042102 */ mul.s $f4, $f4, $f4 -/* B7A0D8 80240088 00000000 */ nop -/* B7A0DC 8024008C C622008C */ lwc1 $f2, 0x8c($s1) -/* B7A0E0 80240090 468010A0 */ cvt.s.w $f2, $f2 -/* B7A0E4 80240094 46141081 */ sub.s $f2, $f2, $f20 -/* B7A0E8 80240098 46021082 */ mul.s $f2, $f2, $f2 -/* B7A0EC 8024009C 00000000 */ nop -/* B7A0F0 802400A0 C6260088 */ lwc1 $f6, 0x88($s1) -/* B7A0F4 802400A4 468031A0 */ cvt.s.w $f6, $f6 -/* B7A0F8 802400A8 46163181 */ sub.s $f6, $f6, $f22 -/* B7A0FC 802400AC 46063182 */ mul.s $f6, $f6, $f6 -/* B7A100 802400B0 00000000 */ nop -/* B7A104 802400B4 46062100 */ add.s $f4, $f4, $f6 -/* B7A108 802400B8 46022100 */ add.s $f4, $f4, $f2 -/* B7A10C 802400BC 4600203C */ c.lt.s $f4, $f0 -/* B7A110 802400C0 00000000 */ nop -/* B7A114 802400C4 45010002 */ bc1t .L802400D0 -/* B7A118 802400C8 24020001 */ addiu $v0, $zero, 1 -/* B7A11C 802400CC 0000102D */ daddu $v0, $zero, $zero -.L802400D0: -/* B7A120 802400D0 AE220084 */ sw $v0, 0x84($s1) -/* B7A124 802400D4 8FBF0018 */ lw $ra, 0x18($sp) -/* B7A128 802400D8 8FB10014 */ lw $s1, 0x14($sp) -/* B7A12C 802400DC 8FB00010 */ lw $s0, 0x10($sp) -/* B7A130 802400E0 D7B80030 */ ldc1 $f24, 0x30($sp) -/* B7A134 802400E4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B7A138 802400E8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B7A13C 802400EC 24020002 */ addiu $v0, $zero, 2 -/* B7A140 802400F0 03E00008 */ jr $ra -/* B7A144 802400F4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s deleted file mode 100644 index 21341fc24a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F8_B7A148 -/* B7A148 802400F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B7A14C 802400FC AFB10014 */ sw $s1, 0x14($sp) -/* B7A150 80240100 0080882D */ daddu $s1, $a0, $zero -/* B7A154 80240104 AFBF0018 */ sw $ra, 0x18($sp) -/* B7A158 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B7A15C 8024010C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B7A160 80240110 8E30000C */ lw $s0, 0xc($s1) -/* B7A164 80240114 8E050000 */ lw $a1, ($s0) -/* B7A168 80240118 0C0B210B */ jal evt_get_float_variable -/* B7A16C 8024011C 26100004 */ addiu $s0, $s0, 4 -/* B7A170 80240120 8E050000 */ lw $a1, ($s0) -/* B7A174 80240124 26100004 */ addiu $s0, $s0, 4 -/* B7A178 80240128 0220202D */ daddu $a0, $s1, $zero -/* B7A17C 8024012C 0C0B210B */ jal evt_get_float_variable -/* B7A180 80240130 46000506 */ mov.s $f20, $f0 -/* B7A184 80240134 46140001 */ sub.s $f0, $f0, $f20 -/* B7A188 80240138 3C014120 */ lui $at, 0x4120 -/* B7A18C 8024013C 44811000 */ mtc1 $at, $f2 -/* B7A190 80240140 8E050000 */ lw $a1, ($s0) -/* B7A194 80240144 46020003 */ div.s $f0, $f0, $f2 -/* B7A198 80240148 44060000 */ mfc1 $a2, $f0 -/* B7A19C 8024014C 0C0B2190 */ jal evt_set_float_variable -/* B7A1A0 80240150 0220202D */ daddu $a0, $s1, $zero -/* B7A1A4 80240154 8FBF0018 */ lw $ra, 0x18($sp) -/* B7A1A8 80240158 8FB10014 */ lw $s1, 0x14($sp) -/* B7A1AC 8024015C 8FB00010 */ lw $s0, 0x10($sp) -/* B7A1B0 80240160 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B7A1B4 80240164 24020002 */ addiu $v0, $zero, 2 -/* B7A1B8 80240168 03E00008 */ jr $ra -/* B7A1BC 8024016C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s deleted file mode 100644 index 59de9f1fa5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243870_B7D8C0 -.double 0.2, 0.0 - -.section .text - -glabel func_80240170_B7A1C0 -/* B7A1C0 80240170 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B7A1C4 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* B7A1C8 80240178 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B7A1CC 8024017C 4485A000 */ mtc1 $a1, $f20 -/* B7A1D0 80240180 AFBF0014 */ sw $ra, 0x14($sp) -/* B7A1D4 80240184 0C019D28 */ jal guMtxIdentF -/* B7A1D8 80240188 0080802D */ daddu $s0, $a0, $zero -/* B7A1DC 8024018C 3C018024 */ lui $at, %hi(D_80243870_B7D8C0) -/* B7A1E0 80240190 D4203870 */ ldc1 $f0, %lo(D_80243870_B7D8C0)($at) -/* B7A1E4 80240194 4600A521 */ cvt.d.s $f20, $f20 -/* B7A1E8 80240198 4620A502 */ mul.d $f20, $f20, $f0 -/* B7A1EC 8024019C 00000000 */ nop -/* B7A1F0 802401A0 3C013F80 */ lui $at, 0x3f80 -/* B7A1F4 802401A4 44810000 */ mtc1 $at, $f0 -/* B7A1F8 802401A8 AE000018 */ sw $zero, 0x18($s0) -/* B7A1FC 802401AC E6000014 */ swc1 $f0, 0x14($s0) -/* B7A200 802401B0 4620A520 */ cvt.s.d $f20, $f20 -/* B7A204 802401B4 E6140010 */ swc1 $f20, 0x10($s0) -/* B7A208 802401B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B7A20C 802401BC 8FB00010 */ lw $s0, 0x10($sp) -/* B7A210 802401C0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B7A214 802401C4 03E00008 */ jr $ra -/* B7A218 802401C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s deleted file mode 100644 index d4d7851d6c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC_B7A21C -/* B7A21C 802401CC 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B7A220 802401D0 AFB10054 */ sw $s1, 0x54($sp) -/* B7A224 802401D4 0080882D */ daddu $s1, $a0, $zero -/* B7A228 802401D8 AFBF0058 */ sw $ra, 0x58($sp) -/* B7A22C 802401DC AFB00050 */ sw $s0, 0x50($sp) -/* B7A230 802401E0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B7A234 802401E4 8E30000C */ lw $s0, 0xc($s1) -/* B7A238 802401E8 8E050000 */ lw $a1, ($s0) -/* B7A23C 802401EC 0C0B1EAF */ jal evt_get_variable -/* B7A240 802401F0 26100004 */ addiu $s0, $s0, 4 -/* B7A244 802401F4 0C046C04 */ jal get_model_list_index_from_tree_index -/* B7A248 802401F8 0040202D */ daddu $a0, $v0, $zero -/* B7A24C 802401FC 0220202D */ daddu $a0, $s1, $zero -/* B7A250 80240200 8E050000 */ lw $a1, ($s0) -/* B7A254 80240204 0C0B210B */ jal evt_get_float_variable -/* B7A258 80240208 0040802D */ daddu $s0, $v0, $zero -/* B7A25C 8024020C 0200202D */ daddu $a0, $s0, $zero -/* B7A260 80240210 0C046B4C */ jal get_model_from_list_index -/* B7A264 80240214 46000506 */ mov.s $f20, $f0 -/* B7A268 80240218 0040802D */ daddu $s0, $v0, $zero -/* B7A26C 8024021C 96020000 */ lhu $v0, ($s0) -/* B7A270 80240220 30420400 */ andi $v0, $v0, 0x400 -/* B7A274 80240224 14400008 */ bnez $v0, .L80240248 -/* B7A278 80240228 00000000 */ nop -/* B7A27C 8024022C 4405A000 */ mfc1 $a1, $f20 -/* B7A280 80240230 0C09005C */ jal func_80240170_B7A1C0 -/* B7A284 80240234 26040058 */ addiu $a0, $s0, 0x58 -/* B7A288 80240238 96020000 */ lhu $v0, ($s0) -/* B7A28C 8024023C 34421400 */ ori $v0, $v0, 0x1400 -/* B7A290 80240240 08090099 */ j .L80240264 -/* B7A294 80240244 A6020000 */ sh $v0, ($s0) -.L80240248: -/* B7A298 80240248 4405A000 */ mfc1 $a1, $f20 -/* B7A29C 8024024C 0C09005C */ jal func_80240170_B7A1C0 -/* B7A2A0 80240250 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A2A4 80240254 27A40010 */ addiu $a0, $sp, 0x10 -/* B7A2A8 80240258 26050058 */ addiu $a1, $s0, 0x58 -/* B7A2AC 8024025C 0C019D80 */ jal guMtxCatF -/* B7A2B0 80240260 00A0302D */ daddu $a2, $a1, $zero -.L80240264: -/* B7A2B4 80240264 8FBF0058 */ lw $ra, 0x58($sp) -/* B7A2B8 80240268 8FB10054 */ lw $s1, 0x54($sp) -/* B7A2BC 8024026C 8FB00050 */ lw $s0, 0x50($sp) -/* B7A2C0 80240270 D7B40060 */ ldc1 $f20, 0x60($sp) -/* B7A2C4 80240274 24020002 */ addiu $v0, $zero, 2 -/* B7A2C8 80240278 03E00008 */ jr $ra -/* B7A2CC 8024027C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s b/ver/us/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s deleted file mode 100644 index 71dba75aae..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_15/B7D920/func_80240000_B7D920.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_B7D920 -/* B7D920 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B7D924 80240004 AFBF0020 */ sw $ra, 0x20($sp) -/* B7D928 80240008 AFB1001C */ sw $s1, 0x1c($sp) -/* B7D92C 8024000C AFB00018 */ sw $s0, 0x18($sp) -/* B7D930 80240010 8C910148 */ lw $s1, 0x148($a0) -/* B7D934 80240014 0C00EABB */ jal get_npc_unsafe -/* B7D938 80240018 86240008 */ lh $a0, 8($s1) -/* B7D93C 8024001C 8E23006C */ lw $v1, 0x6c($s1) -/* B7D940 80240020 28630005 */ slti $v1, $v1, 5 -/* B7D944 80240024 1060001D */ beqz $v1, .L8024009C -/* B7D948 80240028 0040802D */ daddu $s0, $v0, $zero -/* B7D94C 8024002C 0C00A67F */ jal rand_int -/* B7D950 80240030 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B7D954 80240034 2842012D */ slti $v0, $v0, 0x12d -/* B7D958 80240038 14400018 */ bnez $v0, .L8024009C -/* B7D95C 8024003C 24020003 */ addiu $v0, $zero, 3 -/* B7D960 80240040 860300A8 */ lh $v1, 0xa8($s0) -/* B7D964 80240044 C604003C */ lwc1 $f4, 0x3c($s0) -/* B7D968 80240048 C6000040 */ lwc1 $f0, 0x40($s0) -/* B7D96C 8024004C 3C014014 */ lui $at, 0x4014 -/* B7D970 80240050 44811800 */ mtc1 $at, $f3 -/* B7D974 80240054 44801000 */ mtc1 $zero, $f2 -/* B7D978 80240058 AFA20010 */ sw $v0, 0x10($sp) -/* B7D97C 8024005C 46000021 */ cvt.d.s $f0, $f0 -/* B7D980 80240060 46220000 */ add.d $f0, $f0, $f2 -/* B7D984 80240064 AFA00014 */ sw $zero, 0x14($sp) -/* B7D988 80240068 44831000 */ mtc1 $v1, $f2 -/* B7D98C 8024006C 00000000 */ nop -/* B7D990 80240070 468010A0 */ cvt.s.w $f2, $f2 -/* B7D994 80240074 46022100 */ add.s $f4, $f4, $f2 -/* B7D998 80240078 8E050038 */ lw $a1, 0x38($s0) -/* B7D99C 8024007C 46200020 */ cvt.s.d $f0, $f0 -/* B7D9A0 80240080 44062000 */ mfc1 $a2, $f4 -/* B7D9A4 80240084 44070000 */ mfc1 $a3, $f0 -/* B7D9A8 80240088 0C04C6A5 */ jal make_item_entity_nodelay -/* B7D9AC 8024008C 24040156 */ addiu $a0, $zero, 0x156 -/* B7D9B0 80240090 8E22006C */ lw $v0, 0x6c($s1) -/* B7D9B4 80240094 24420001 */ addiu $v0, $v0, 1 -/* B7D9B8 80240098 AE22006C */ sw $v0, 0x6c($s1) -.L8024009C: -/* B7D9BC 8024009C 8FBF0020 */ lw $ra, 0x20($sp) -/* B7D9C0 802400A0 8FB1001C */ lw $s1, 0x1c($sp) -/* B7D9C4 802400A4 8FB00018 */ lw $s0, 0x18($sp) -/* B7D9C8 802400A8 24020002 */ addiu $v0, $zero, 2 -/* B7D9CC 802400AC 03E00008 */ jr $ra -/* B7D9D0 802400B0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B7D9D4 802400B4 00000000 */ nop -/* B7D9D8 802400B8 00000000 */ nop -/* B7D9DC 802400BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s deleted file mode 100644 index ce1e4e1984..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241020_B851A0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241020_B851A0 -/* B851A0 80241020 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B851A4 80241024 AFB1001C */ sw $s1, 0x1c($sp) -/* B851A8 80241028 0080882D */ daddu $s1, $a0, $zero -/* B851AC 8024102C AFBF0020 */ sw $ra, 0x20($sp) -/* B851B0 80241030 AFB00018 */ sw $s0, 0x18($sp) -/* B851B4 80241034 8E30000C */ lw $s0, 0xc($s1) -/* B851B8 80241038 8E020000 */ lw $v0, ($s0) -/* B851BC 8024103C 1040001B */ beqz $v0, .L802410AC -/* B851C0 80241040 26100004 */ addiu $s0, $s0, 4 -/* B851C4 80241044 8E050000 */ lw $a1, ($s0) -/* B851C8 80241048 0C0B1EAF */ jal evt_get_variable -/* B851CC 8024104C 26100004 */ addiu $s0, $s0, 4 -/* B851D0 80241050 AE220070 */ sw $v0, 0x70($s1) -/* B851D4 80241054 8E050000 */ lw $a1, ($s0) -/* B851D8 80241058 26100004 */ addiu $s0, $s0, 4 -/* B851DC 8024105C 0C0B1EAF */ jal evt_get_variable -/* B851E0 80241060 0220202D */ daddu $a0, $s1, $zero -/* B851E4 80241064 AE220074 */ sw $v0, 0x74($s1) -/* B851E8 80241068 8E050000 */ lw $a1, ($s0) -/* B851EC 8024106C 0C0B1EAF */ jal evt_get_variable -/* B851F0 80241070 0220202D */ daddu $a0, $s1, $zero -/* B851F4 80241074 24040168 */ addiu $a0, $zero, 0x168 -/* B851F8 80241078 0000282D */ daddu $a1, $zero, $zero -/* B851FC 8024107C C6200070 */ lwc1 $f0, 0x70($s1) -/* B85200 80241080 46800020 */ cvt.s.w $f0, $f0 -/* B85204 80241084 C6220074 */ lwc1 $f2, 0x74($s1) -/* B85208 80241088 468010A0 */ cvt.s.w $f2, $f2 -/* B8520C 8024108C 44060000 */ mfc1 $a2, $f0 -/* B85210 80241090 44071000 */ mfc1 $a3, $f2 -/* B85214 80241094 44820000 */ mtc1 $v0, $f0 -/* B85218 80241098 00000000 */ nop -/* B8521C 8024109C 46800020 */ cvt.s.w $f0, $f0 -/* B85220 802410A0 AE220078 */ sw $v0, 0x78($s1) -/* B85224 802410A4 0C05267B */ jal sfx_adjust_env_sound_pos -/* B85228 802410A8 E7A00010 */ swc1 $f0, 0x10($sp) -.L802410AC: -/* B8522C 802410AC 8FBF0020 */ lw $ra, 0x20($sp) -/* B85230 802410B0 8FB1001C */ lw $s1, 0x1c($sp) -/* B85234 802410B4 8FB00018 */ lw $s0, 0x18($sp) -/* B85238 802410B8 24020002 */ addiu $v0, $zero, 2 -/* B8523C 802410BC 03E00008 */ jr $ra -/* B85240 802410C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s deleted file mode 100644 index 19387bed81..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C4_B85244 -/* B85244 802410C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B85248 802410C8 AFB1001C */ sw $s1, 0x1c($sp) -/* B8524C 802410CC 0080882D */ daddu $s1, $a0, $zero -/* B85250 802410D0 AFBF0020 */ sw $ra, 0x20($sp) -/* B85254 802410D4 AFB00018 */ sw $s0, 0x18($sp) -/* B85258 802410D8 8E30000C */ lw $s0, 0xc($s1) -/* B8525C 802410DC 8E020000 */ lw $v0, ($s0) -/* B85260 802410E0 1040001B */ beqz $v0, .L80241150 -/* B85264 802410E4 26100004 */ addiu $s0, $s0, 4 -/* B85268 802410E8 8E050000 */ lw $a1, ($s0) -/* B8526C 802410EC 0C0B1EAF */ jal evt_get_variable -/* B85270 802410F0 26100004 */ addiu $s0, $s0, 4 -/* B85274 802410F4 AE220070 */ sw $v0, 0x70($s1) -/* B85278 802410F8 8E050000 */ lw $a1, ($s0) -/* B8527C 802410FC 26100004 */ addiu $s0, $s0, 4 -/* B85280 80241100 0C0B1EAF */ jal evt_get_variable -/* B85284 80241104 0220202D */ daddu $a0, $s1, $zero -/* B85288 80241108 AE220074 */ sw $v0, 0x74($s1) -/* B8528C 8024110C 8E050000 */ lw $a1, ($s0) -/* B85290 80241110 0C0B1EAF */ jal evt_get_variable -/* B85294 80241114 0220202D */ daddu $a0, $s1, $zero -/* B85298 80241118 24040185 */ addiu $a0, $zero, 0x185 -/* B8529C 8024111C 0000282D */ daddu $a1, $zero, $zero -/* B852A0 80241120 C6200070 */ lwc1 $f0, 0x70($s1) -/* B852A4 80241124 46800020 */ cvt.s.w $f0, $f0 -/* B852A8 80241128 C6220074 */ lwc1 $f2, 0x74($s1) -/* B852AC 8024112C 468010A0 */ cvt.s.w $f2, $f2 -/* B852B0 80241130 44060000 */ mfc1 $a2, $f0 -/* B852B4 80241134 44071000 */ mfc1 $a3, $f2 -/* B852B8 80241138 44820000 */ mtc1 $v0, $f0 -/* B852BC 8024113C 00000000 */ nop -/* B852C0 80241140 46800020 */ cvt.s.w $f0, $f0 -/* B852C4 80241144 AE220078 */ sw $v0, 0x78($s1) -/* B852C8 80241148 0C05267B */ jal sfx_adjust_env_sound_pos -/* B852CC 8024114C E7A00010 */ swc1 $f0, 0x10($sp) -.L80241150: -/* B852D0 80241150 8FBF0020 */ lw $ra, 0x20($sp) -/* B852D4 80241154 8FB1001C */ lw $s1, 0x1c($sp) -/* B852D8 80241158 8FB00018 */ lw $s0, 0x18($sp) -/* B852DC 8024115C 24020002 */ addiu $v0, $zero, 2 -/* B852E0 80241160 03E00008 */ jr $ra -/* B852E4 80241164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s deleted file mode 100644 index 0c4319206c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802412E0_B85460.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E0_B85460 -/* B85460 802412E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B85464 802412E4 AFB10014 */ sw $s1, 0x14($sp) -/* B85468 802412E8 0080882D */ daddu $s1, $a0, $zero -/* B8546C 802412EC AFBF001C */ sw $ra, 0x1c($sp) -/* B85470 802412F0 AFB20018 */ sw $s2, 0x18($sp) -/* B85474 802412F4 AFB00010 */ sw $s0, 0x10($sp) -/* B85478 802412F8 8E30000C */ lw $s0, 0xc($s1) -/* B8547C 802412FC 8E050000 */ lw $a1, ($s0) -/* B85480 80241300 0C0B1EAF */ jal evt_get_variable -/* B85484 80241304 26100004 */ addiu $s0, $s0, 4 -/* B85488 80241308 0220202D */ daddu $a0, $s1, $zero -/* B8548C 8024130C 8E050000 */ lw $a1, ($s0) -/* B85490 80241310 2450FFEF */ addiu $s0, $v0, -0x11 -/* B85494 80241314 0C0B1EAF */ jal evt_get_variable -/* B85498 80241318 24520011 */ addiu $s2, $v0, 0x11 -/* B8549C 8024131C 2403FFFF */ addiu $v1, $zero, -1 -/* B854A0 80241320 44900000 */ mtc1 $s0, $f0 -/* B854A4 80241324 00000000 */ nop -/* B854A8 80241328 46800020 */ cvt.s.w $f0, $f0 -/* B854AC 8024132C AE2300A4 */ sw $v1, 0xa4($s1) -/* B854B0 80241330 2443FFEF */ addiu $v1, $v0, -0x11 -/* B854B4 80241334 3C018011 */ lui $at, %hi(gPlayerStatus+0x28) -/* B854B8 80241338 C422EFF0 */ lwc1 $f2, %lo(gPlayerStatus+0x28)($at) -/* B854BC 8024133C 4600103C */ c.lt.s $f2, $f0 -/* B854C0 80241340 00000000 */ nop -/* B854C4 80241344 45010008 */ bc1t .L80241368 -/* B854C8 80241348 24420011 */ addiu $v0, $v0, 0x11 -/* B854CC 8024134C 44920000 */ mtc1 $s2, $f0 -/* B854D0 80241350 00000000 */ nop -/* B854D4 80241354 46800020 */ cvt.s.w $f0, $f0 -/* B854D8 80241358 4602003C */ c.lt.s $f0, $f2 -/* B854DC 8024135C 00000000 */ nop -/* B854E0 80241360 45000014 */ bc1f .L802413B4 -/* B854E4 80241364 00000000 */ nop -.L80241368: -/* B854E8 80241368 44830000 */ mtc1 $v1, $f0 -/* B854EC 8024136C 00000000 */ nop -/* B854F0 80241370 46800020 */ cvt.s.w $f0, $f0 -/* B854F4 80241374 4600103C */ c.lt.s $f2, $f0 -/* B854F8 80241378 00000000 */ nop -/* B854FC 8024137C 45010008 */ bc1t .L802413A0 -/* B85500 80241380 00000000 */ nop -/* B85504 80241384 44820000 */ mtc1 $v0, $f0 -/* B85508 80241388 00000000 */ nop -/* B8550C 8024138C 46800020 */ cvt.s.w $f0, $f0 -/* B85510 80241390 4602003C */ c.lt.s $f0, $f2 -/* B85514 80241394 00000000 */ nop -/* B85518 80241398 45000006 */ bc1f .L802413B4 -/* B8551C 8024139C 00000000 */ nop -.L802413A0: -/* B85520 802413A0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B85524 802413A4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B85528 802413A8 8C420010 */ lw $v0, 0x10($v0) -/* B8552C 802413AC 30428000 */ andi $v0, $v0, 0x8000 -/* B85530 802413B0 AE2200A4 */ sw $v0, 0xa4($s1) -.L802413B4: -/* B85534 802413B4 8FBF001C */ lw $ra, 0x1c($sp) -/* B85538 802413B8 8FB20018 */ lw $s2, 0x18($sp) -/* B8553C 802413BC 8FB10014 */ lw $s1, 0x14($sp) -/* B85540 802413C0 8FB00010 */ lw $s0, 0x10($sp) -/* B85544 802413C4 24020002 */ addiu $v0, $zero, 2 -/* B85548 802413C8 03E00008 */ jr $ra -/* B8554C 802413CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s index 937b74f782..cfbe06e33d 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s @@ -13,8 +13,8 @@ glabel func_802405F8_AF3298 /* AF32B8 80240618 8C620000 */ lw $v0, ($v1) /* AF32BC 8024061C 5040000A */ beql $v0, $zero, .L80240648 /* AF32C0 80240620 00041080 */ sll $v0, $a0, 2 -/* AF32C4 80240624 3C058024 */ lui $a1, %hi(tik_07_sixFloats) -/* AF32C8 80240628 24A54CB0 */ addiu $a1, $a1, %lo(tik_07_sixFloats) +/* AF32C4 80240624 3C058024 */ lui $a1, %hi(tik_07_FlyingAI_JumpVels) +/* AF32C8 80240628 24A54CB0 */ addiu $a1, $a1, %lo(tik_07_FlyingAI_JumpVels) .L8024062C: /* AF32CC 8024062C 24630004 */ addiu $v1, $v1, 4 /* AF32D0 80240630 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_802405F8_AF3298 /* AF32E0 80240640 24A50004 */ addiu $a1, $a1, 4 /* AF32E4 80240644 00041080 */ sll $v0, $a0, 2 .L80240648: -/* AF32E8 80240648 3C018024 */ lui $at, %hi(tik_07_sixFloats) +/* AF32E8 80240648 3C018024 */ lui $at, %hi(tik_07_FlyingAI_JumpVels) /* AF32EC 8024064C 00220821 */ addu $at, $at, $v0 -/* AF32F0 80240650 AC204CB0 */ sw $zero, %lo(tik_07_sixFloats)($at) +/* AF32F0 80240650 AC204CB0 */ sw $zero, %lo(tik_07_FlyingAI_JumpVels)($at) /* AF32F4 80240654 080901A1 */ j .L80240684 /* AF32F8 80240658 00000000 */ nop .L8024065C: -/* AF32FC 8024065C 3C038024 */ lui $v1, %hi(tik_07_sixFloats) -/* AF3300 80240660 24634CB0 */ addiu $v1, $v1, %lo(tik_07_sixFloats) +/* AF32FC 8024065C 3C038024 */ lui $v1, %hi(tik_07_FlyingAI_JumpVels) +/* AF3300 80240660 24634CB0 */ addiu $v1, $v1, %lo(tik_07_FlyingAI_JumpVels) /* AF3304 80240664 0060282D */ daddu $a1, $v1, $zero .L80240668: /* AF3308 80240668 24820010 */ addiu $v0, $a0, 0x10 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s index f038c6a6c1..ceb39a1fbf 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s @@ -60,8 +60,8 @@ glabel func_802406C4_AF8014 /* AF80C8 80240778 2414000A */ addiu $s4, $zero, 0xa /* AF80CC 8024077C 3C048011 */ lui $a0, %hi(HudScript_AButton) /* AF80D0 80240780 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* AF80D4 80240784 3C038024 */ lui $v1, %hi(D_80246538_C8BFE8) -/* AF80D8 80240788 24636538 */ addiu $v1, $v1, %lo(D_80246538_C8BFE8) +/* AF80D4 80240784 3C038024 */ lui $v1, %hi(D_80246538_kkj_19) +/* AF80D8 80240788 24636538 */ addiu $v1, $v1, %lo(D_80246538_kkj_19) /* AF80DC 8024078C 2402000C */ addiu $v0, $zero, 0xc /* AF80E0 80240790 AC620004 */ sw $v0, 4($v1) /* AF80E4 80240794 24020018 */ addiu $v0, $zero, 0x18 @@ -75,11 +75,11 @@ glabel func_802406C4_AF8014 /* AF8104 802407B4 24020005 */ addiu $v0, $zero, 5 /* AF8108 802407B8 3C118024 */ lui $s1, %hi(D_8024655C) /* AF810C 802407BC 2631655C */ addiu $s1, $s1, %lo(D_8024655C) -/* AF8110 802407C0 3C018024 */ lui $at, %hi(D_80246550_C8C000) -/* AF8114 802407C4 AC226550 */ sw $v0, %lo(D_80246550_C8C000)($at) +/* AF8110 802407C0 3C018024 */ lui $at, %hi(D_80246550_kkj_19) +/* AF8114 802407C4 AC226550 */ sw $v0, %lo(D_80246550_kkj_19)($at) /* AF8118 802407C8 2402FFD0 */ addiu $v0, $zero, -0x30 -/* AF811C 802407CC 3C108024 */ lui $s0, %hi(D_80246560_C8C010) -/* AF8120 802407D0 26106560 */ addiu $s0, $s0, %lo(D_80246560_C8C010) +/* AF811C 802407CC 3C108024 */ lui $s0, %hi(D_80246560_kkj_19) +/* AF8120 802407D0 26106560 */ addiu $s0, $s0, %lo(D_80246560_kkj_19) /* AF8124 802407D4 3C018024 */ lui $at, %hi(D_802465A0) /* AF8128 802407D8 AC2065A0 */ sw $zero, %lo(D_802465A0)($at) /* AF812C 802407DC AC600000 */ sw $zero, ($v1) @@ -150,8 +150,8 @@ glabel func_802406C4_AF8014 .L802408DC: /* AF822C 802408DC 3C118024 */ lui $s1, %hi(D_80246568_C8C018) /* AF8230 802408E0 26316568 */ addiu $s1, $s1, %lo(D_80246568_C8C018) -/* AF8234 802408E4 3C108024 */ lui $s0, %hi(D_80246560_C8C010) -/* AF8238 802408E8 26106560 */ addiu $s0, $s0, %lo(D_80246560_C8C010) +/* AF8234 802408E4 3C108024 */ lui $s0, %hi(D_80246560_kkj_19) +/* AF8238 802408E8 26106560 */ addiu $s0, $s0, %lo(D_80246560_kkj_19) /* AF823C 802408EC 8E240000 */ lw $a0, ($s1) /* AF8240 802408F0 8E450000 */ lw $a1, ($s2) /* AF8244 802408F4 0C051261 */ jal hud_element_set_render_pos @@ -187,15 +187,15 @@ glabel func_802406C4_AF8014 /* AF82B4 80240964 3C018024 */ lui $at, %hi(D_80246558_kkj_19) /* AF82B8 80240968 AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) .L8024096C_AF82BC: -/* AF82BC 8024096C 3C038024 */ lui $v1, %hi(D_80246550_C8C000) -/* AF82C0 80240970 8C636550 */ lw $v1, %lo(D_80246550_C8C000)($v1) +/* AF82BC 8024096C 3C038024 */ lui $v1, %hi(D_80246550_kkj_19) +/* AF82C0 80240970 8C636550 */ lw $v1, %lo(D_80246550_kkj_19)($v1) /* AF82C4 80240974 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* AF82C8 80240978 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* AF82CC 8024097C 00031880 */ sll $v1, $v1, 2 /* AF82D0 80240980 8C420010 */ lw $v0, 0x10($v0) -/* AF82D4 80240984 3C048024 */ lui $a0, %hi(D_80246538_C8BFE8) +/* AF82D4 80240984 3C048024 */ lui $a0, %hi(D_80246538_kkj_19) /* AF82D8 80240988 00832021 */ addu $a0, $a0, $v1 -/* AF82DC 8024098C 8C846538 */ lw $a0, %lo(D_80246538_C8BFE8)($a0) +/* AF82DC 8024098C 8C846538 */ lw $a0, %lo(D_80246538_kkj_19)($a0) /* AF82E0 80240990 30428000 */ andi $v0, $v0, 0x8000 /* AF82E4 80240994 10400006 */ beqz $v0, .L802409B0 /* AF82E8 80240998 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s deleted file mode 100644 index 225f9e12e4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426A0_8B2710 -/* 8B2710 802426A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2714 802426A4 AFB00010 */ sw $s0, 0x10($sp) -/* 8B2718 802426A8 0080802D */ daddu $s0, $a0, $zero -/* 8B271C 802426AC AFBF0014 */ sw $ra, 0x14($sp) -/* 8B2720 802426B0 0C00EABB */ jal get_npc_unsafe -/* 8B2724 802426B4 8E04008C */ lw $a0, 0x8c($s0) -/* 8B2728 802426B8 0040282D */ daddu $a1, $v0, $zero -/* 8B272C 802426BC 8E040094 */ lw $a0, 0x94($s0) -/* 8B2730 802426C0 8CA30028 */ lw $v1, 0x28($a1) -/* 8B2734 802426C4 ACA40028 */ sw $a0, 0x28($a1) -/* 8B2738 802426C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B273C 802426CC 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2740 802426D0 24020002 */ addiu $v0, $zero, 2 -/* 8B2744 802426D4 3C018026 */ lui $at, %hi(D_8025811C) -/* 8B2748 802426D8 AC23811C */ sw $v1, %lo(D_8025811C)($at) -/* 8B274C 802426DC 03E00008 */ jr $ra -/* 8B2750 802426E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s deleted file mode 100644 index 7eb5a997da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426E4_8B2754 -/* 8B2754 802426E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2758 802426E8 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B275C 802426EC 0C00EABB */ jal get_npc_unsafe -/* 8B2760 802426F0 8C84008C */ lw $a0, 0x8c($a0) -/* 8B2764 802426F4 3C038026 */ lui $v1, %hi(D_8025811C) -/* 8B2768 802426F8 8C63811C */ lw $v1, %lo(D_8025811C)($v1) -/* 8B276C 802426FC AC430028 */ sw $v1, 0x28($v0) -/* 8B2770 80242700 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2774 80242704 24020002 */ addiu $v0, $zero, 2 -/* 8B2778 80242708 03E00008 */ jr $ra -/* 8B277C 8024270C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s index 485c50fac6..17f3fcc516 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s @@ -10,8 +10,8 @@ glabel func_80240010_8FEE90 /* 8FEEA4 80240024 3C0EFD18 */ lui $t6, 0xfd18 /* 8FEEA8 80240028 35CE00C7 */ ori $t6, $t6, 0xc7 /* 8FEEAC 8024002C AFB3000C */ sw $s3, 0xc($sp) -/* 8FEEB0 80240030 3C138024 */ lui $s3, %hi(kmr_07_UnkNpcAIMainFunc4) -/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, %lo(kmr_07_UnkNpcAIMainFunc4) +/* 8FEEB0 80240030 3C138024 */ lui $s3, %hi(kmr_07_StationaryAI_Main) +/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, %lo(kmr_07_StationaryAI_Main) /* 8FEEB8 80240038 3C0BF518 */ lui $t3, 0xf518 /* 8FEEBC 8024003C 356B6400 */ ori $t3, $t3, 0x6400 /* 8FEEC0 80240040 AFB20008 */ sw $s2, 8($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s index 37a941da0a..db0ae3b496 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s @@ -33,8 +33,8 @@ glabel func_80240210_8FF090 /* 8FF0E4 80240264 3C058024 */ lui $a1, %hi(func_80240010_8FEE90) /* 8FF0E8 80240268 24A50010 */ addiu $a1, $a1, %lo(func_80240010_8FEE90) /* 8FF0EC 8024026C 00431021 */ addu $v0, $v0, $v1 -/* 8FF0F0 80240270 3C018024 */ lui $at, %hi(kmr_07_UnkNpcAIMainFunc4) -/* 8FF0F4 80240274 AC2207F4 */ sw $v0, %lo(kmr_07_UnkNpcAIMainFunc4)($at) +/* 8FF0F0 80240270 3C018024 */ lui $at, %hi(kmr_07_StationaryAI_Main) +/* 8FF0F4 80240274 AC2207F4 */ sw $v0, %lo(kmr_07_StationaryAI_Main)($at) /* 8FF0F8 80240278 0C048C8F */ jal create_generic_entity_frontUI /* 8FF0FC 8024027C 0000202D */ daddu $a0, $zero, $zero /* 8FF100 80240280 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s deleted file mode 100644 index 0ad2018c6f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024119C_A4975C -/* A4975C 8024119C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A49760 802411A0 AFB3001C */ sw $s3, 0x1c($sp) -/* A49764 802411A4 0080982D */ daddu $s3, $a0, $zero -/* A49768 802411A8 AFBF0020 */ sw $ra, 0x20($sp) -/* A4976C 802411AC AFB20018 */ sw $s2, 0x18($sp) -/* A49770 802411B0 AFB10014 */ sw $s1, 0x14($sp) -/* A49774 802411B4 AFB00010 */ sw $s0, 0x10($sp) -/* A49778 802411B8 8E720148 */ lw $s2, 0x148($s3) -/* A4977C 802411BC 0C00EABB */ jal get_npc_unsafe -/* A49780 802411C0 86440008 */ lh $a0, 8($s2) -/* A49784 802411C4 0040802D */ daddu $s0, $v0, $zero -/* A49788 802411C8 8603008E */ lh $v1, 0x8e($s0) -/* A4978C 802411CC 3C118024 */ lui $s1, %hi(D_802425E0_A4ABA0) -/* A49790 802411D0 263125E0 */ addiu $s1, $s1, %lo(D_802425E0_A4ABA0) -/* A49794 802411D4 00031040 */ sll $v0, $v1, 1 -/* A49798 802411D8 00431021 */ addu $v0, $v0, $v1 -/* A4979C 802411DC 00021080 */ sll $v0, $v0, 2 -/* A497A0 802411E0 3C018024 */ lui $at, %hi(D_802425E0_A4ABA0) -/* A497A4 802411E4 00220821 */ addu $at, $at, $v0 -/* A497A8 802411E8 C42025E0 */ lwc1 $f0, %lo(D_802425E0_A4ABA0)($at) -/* A497AC 802411EC 00031040 */ sll $v0, $v1, 1 -/* A497B0 802411F0 00431021 */ addu $v0, $v0, $v1 -/* A497B4 802411F4 00021080 */ sll $v0, $v0, 2 -/* A497B8 802411F8 E6000054 */ swc1 $f0, 0x54($s0) -/* A497BC 802411FC 3C018024 */ lui $at, %hi(D_802425E4_A4ABA4) -/* A497C0 80241200 00220821 */ addu $at, $at, $v0 -/* A497C4 80241204 C42025E4 */ lwc1 $f0, %lo(D_802425E4_A4ABA4)($at) -/* A497C8 80241208 00031040 */ sll $v0, $v1, 1 -/* A497CC 8024120C 00431021 */ addu $v0, $v0, $v1 -/* A497D0 80241210 9603008E */ lhu $v1, 0x8e($s0) -/* A497D4 80241214 00021080 */ sll $v0, $v0, 2 -/* A497D8 80241218 E6000058 */ swc1 $f0, 0x58($s0) -/* A497DC 8024121C 3C018024 */ lui $at, %hi(D_802425E8_A4ABA8) -/* A497E0 80241220 00220821 */ addu $at, $at, $v0 -/* A497E4 80241224 902225E8 */ lbu $v0, %lo(D_802425E8_A4ABA8)($at) -/* A497E8 80241228 24630001 */ addiu $v1, $v1, 1 -/* A497EC 8024122C A603008E */ sh $v1, 0x8e($s0) -/* A497F0 80241230 00031C00 */ sll $v1, $v1, 0x10 -/* A497F4 80241234 00031C03 */ sra $v1, $v1, 0x10 -/* A497F8 80241238 A20200AC */ sb $v0, 0xac($s0) -/* A497FC 8024123C 24020004 */ addiu $v0, $zero, 4 -/* A49800 80241240 14620007 */ bne $v1, $v0, .L80241260 -/* A49804 80241244 00000000 */ nop -/* A49808 80241248 0C00EAFF */ jal disable_npc_shadow -/* A4980C 8024124C 0200202D */ daddu $a0, $s0, $zero -/* A49810 80241250 8E420000 */ lw $v0, ($s2) -/* A49814 80241254 3C031F10 */ lui $v1, 0x1f10 -/* A49818 80241258 00431025 */ or $v0, $v0, $v1 -/* A4981C 8024125C AE420000 */ sw $v0, ($s2) -.L80241260: -/* A49820 80241260 8602008E */ lh $v0, 0x8e($s0) -/* A49824 80241264 00021840 */ sll $v1, $v0, 1 -/* A49828 80241268 00621821 */ addu $v1, $v1, $v0 -/* A4982C 8024126C 00031880 */ sll $v1, $v1, 2 -/* A49830 80241270 00711821 */ addu $v1, $v1, $s1 -/* A49834 80241274 90620008 */ lbu $v0, 8($v1) -/* A49838 80241278 1440000C */ bnez $v0, .L802412AC -/* A4983C 8024127C 240200FF */ addiu $v0, $zero, 0xff -/* A49840 80241280 A20200AC */ sb $v0, 0xac($s0) -/* A49844 80241284 24020005 */ addiu $v0, $zero, 5 -/* A49848 80241288 8E030000 */ lw $v1, ($s0) -/* A4984C 8024128C 3C013F80 */ lui $at, 0x3f80 -/* A49850 80241290 44810000 */ mtc1 $at, $f0 -/* A49854 80241294 34630002 */ ori $v1, $v1, 2 -/* A49858 80241298 E6000054 */ swc1 $f0, 0x54($s0) -/* A4985C 8024129C E6000058 */ swc1 $f0, 0x58($s0) -/* A49860 802412A0 E600005C */ swc1 $f0, 0x5c($s0) -/* A49864 802412A4 AE030000 */ sw $v1, ($s0) -/* A49868 802412A8 AE620070 */ sw $v0, 0x70($s3) -.L802412AC: -/* A4986C 802412AC 8FBF0020 */ lw $ra, 0x20($sp) -/* A49870 802412B0 8FB3001C */ lw $s3, 0x1c($sp) -/* A49874 802412B4 8FB20018 */ lw $s2, 0x18($sp) -/* A49878 802412B8 8FB10014 */ lw $s1, 0x14($sp) -/* A4987C 802412BC 8FB00010 */ lw $s0, 0x10($sp) -/* A49880 802412C0 03E00008 */ jr $ra -/* A49884 802412C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368_A49928.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368_A49928.s deleted file mode 100644 index 71857abbe9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368_A49928.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241368_A49928 -/* A49928 80241368 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4992C 8024136C AFB10014 */ sw $s1, 0x14($sp) -/* A49930 80241370 0080882D */ daddu $s1, $a0, $zero -/* A49934 80241374 AFBF0018 */ sw $ra, 0x18($sp) -/* A49938 80241378 AFB00010 */ sw $s0, 0x10($sp) -/* A4993C 8024137C 8E220148 */ lw $v0, 0x148($s1) -/* A49940 80241380 0C00EABB */ jal get_npc_unsafe -/* A49944 80241384 84440008 */ lh $a0, 8($v0) -/* A49948 80241388 0040802D */ daddu $s0, $v0, $zero -/* A4994C 8024138C 8E050018 */ lw $a1, 0x18($s0) -/* A49950 80241390 8E06000C */ lw $a2, 0xc($s0) -/* A49954 80241394 0C00EA95 */ jal npc_move_heading -/* A49958 80241398 0200202D */ daddu $a0, $s0, $zero -/* A4995C 8024139C 9602008E */ lhu $v0, 0x8e($s0) -/* A49960 802413A0 2442FFFF */ addiu $v0, $v0, -1 -/* A49964 802413A4 A602008E */ sh $v0, 0x8e($s0) -/* A49968 802413A8 00021400 */ sll $v0, $v0, 0x10 -/* A4996C 802413AC 1C400002 */ bgtz $v0, .L802413B8 -/* A49970 802413B0 2402000A */ addiu $v0, $zero, 0xa -/* A49974 802413B4 AE220070 */ sw $v0, 0x70($s1) -.L802413B8: -/* A49978 802413B8 8FBF0018 */ lw $ra, 0x18($sp) -/* A4997C 802413BC 8FB10014 */ lw $s1, 0x14($sp) -/* A49980 802413C0 8FB00010 */ lw $s0, 0x10($sp) -/* A49984 802413C4 03E00008 */ jr $ra -/* A49988 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802413CC_A4998C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802413CC_A4998C.s deleted file mode 100644 index 625504eb1a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802413CC_A4998C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_A4998C -/* A4998C 802413CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A49990 802413D0 AFB30034 */ sw $s3, 0x34($sp) -/* A49994 802413D4 0080982D */ daddu $s3, $a0, $zero -/* A49998 802413D8 AFBF0038 */ sw $ra, 0x38($sp) -/* A4999C 802413DC AFB20030 */ sw $s2, 0x30($sp) -/* A499A0 802413E0 AFB1002C */ sw $s1, 0x2c($sp) -/* A499A4 802413E4 AFB00028 */ sw $s0, 0x28($sp) -/* A499A8 802413E8 8E700148 */ lw $s0, 0x148($s3) -/* A499AC 802413EC 0C00EABB */ jal get_npc_unsafe -/* A499B0 802413F0 86040008 */ lh $a0, 8($s0) -/* A499B4 802413F4 0040902D */ daddu $s2, $v0, $zero -/* A499B8 802413F8 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A499BC 802413FC 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A499C0 80241400 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A499C4 80241404 8E220000 */ lw $v0, ($s1) -/* A499C8 80241408 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A499CC 8024140C 8C460028 */ lw $a2, 0x28($v0) -/* A499D0 80241410 0C00A7B5 */ jal dist2D -/* A499D4 80241414 8C470030 */ lw $a3, 0x30($v0) -/* A499D8 80241418 24020001 */ addiu $v0, $zero, 1 -/* A499DC 8024141C AE02006C */ sw $v0, 0x6c($s0) -/* A499E0 80241420 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A499E4 80241424 8E0200CC */ lw $v0, 0xcc($s0) -/* A499E8 80241428 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A499EC 8024142C 8E230000 */ lw $v1, ($s1) -/* A499F0 80241430 8C420020 */ lw $v0, 0x20($v0) -/* A499F4 80241434 AE420028 */ sw $v0, 0x28($s2) -/* A499F8 80241438 8C660028 */ lw $a2, 0x28($v1) -/* A499FC 8024143C 8C670030 */ lw $a3, 0x30($v1) -/* A49A00 80241440 0C00A720 */ jal atan2 -/* A49A04 80241444 E7A00024 */ swc1 $f0, 0x24($sp) -/* A49A08 80241448 8E420000 */ lw $v0, ($s2) -/* A49A0C 8024144C 3C013DCC */ lui $at, 0x3dcc -/* A49A10 80241450 3421CCCD */ ori $at, $at, 0xcccd -/* A49A14 80241454 44811000 */ mtc1 $at, $f2 -/* A49A18 80241458 2403FFFD */ addiu $v1, $zero, -3 -/* A49A1C 8024145C E640000C */ swc1 $f0, 0xc($s2) -/* A49A20 80241460 00431024 */ and $v0, $v0, $v1 -/* A49A24 80241464 AE420000 */ sw $v0, ($s2) -/* A49A28 80241468 30420008 */ andi $v0, $v0, 8 -/* A49A2C 8024146C E6420054 */ swc1 $f2, 0x54($s2) -/* A49A30 80241470 E6420058 */ swc1 $f2, 0x58($s2) -/* A49A34 80241474 1440001B */ bnez $v0, .L802414E4 -/* A49A38 80241478 E642005C */ swc1 $f2, 0x5c($s2) -/* A49A3C 8024147C 27A6001C */ addiu $a2, $sp, 0x1c -/* A49A40 80241480 27A70020 */ addiu $a3, $sp, 0x20 -/* A49A44 80241484 27A20024 */ addiu $v0, $sp, 0x24 -/* A49A48 80241488 C6420038 */ lwc1 $f2, 0x38($s2) -/* A49A4C 8024148C C640003C */ lwc1 $f0, 0x3c($s2) -/* A49A50 80241490 3C014348 */ lui $at, 0x4348 -/* A49A54 80241494 44813000 */ mtc1 $at, $f6 -/* A49A58 80241498 46000021 */ cvt.d.s $f0, $f0 -/* A49A5C 8024149C E7A20018 */ swc1 $f2, 0x18($sp) -/* A49A60 802414A0 3C014059 */ lui $at, 0x4059 -/* A49A64 802414A4 44811800 */ mtc1 $at, $f3 -/* A49A68 802414A8 44801000 */ mtc1 $zero, $f2 -/* A49A6C 802414AC C6440040 */ lwc1 $f4, 0x40($s2) -/* A49A70 802414B0 46220000 */ add.d $f0, $f0, $f2 -/* A49A74 802414B4 E7A60024 */ swc1 $f6, 0x24($sp) -/* A49A78 802414B8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A49A7C 802414BC 46200020 */ cvt.s.d $f0, $f0 -/* A49A80 802414C0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A49A84 802414C4 AFA20010 */ sw $v0, 0x10($sp) -/* A49A88 802414C8 8E440080 */ lw $a0, 0x80($s2) -/* A49A8C 802414CC 0C0372DF */ jal npc_raycast_down_sides -/* A49A90 802414D0 27A50018 */ addiu $a1, $sp, 0x18 -/* A49A94 802414D4 10400004 */ beqz $v0, .L802414E8 -/* A49A98 802414D8 2402000B */ addiu $v0, $zero, 0xb -/* A49A9C 802414DC C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A49AA0 802414E0 E640003C */ swc1 $f0, 0x3c($s2) -.L802414E4: -/* A49AA4 802414E4 2402000B */ addiu $v0, $zero, 0xb -.L802414E8: -/* A49AA8 802414E8 A640008E */ sh $zero, 0x8e($s2) -/* A49AAC 802414EC AE620070 */ sw $v0, 0x70($s3) -/* A49AB0 802414F0 8FBF0038 */ lw $ra, 0x38($sp) -/* A49AB4 802414F4 8FB30034 */ lw $s3, 0x34($sp) -/* A49AB8 802414F8 8FB20030 */ lw $s2, 0x30($sp) -/* A49ABC 802414FC 8FB1002C */ lw $s1, 0x2c($sp) -/* A49AC0 80241500 8FB00028 */ lw $s0, 0x28($sp) -/* A49AC4 80241504 03E00008 */ jr $ra -/* A49AC8 80241508 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s deleted file mode 100644 index df8099dde3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243920_A4BEE0 -.double 0.1 - -dlabel D_80243928_A4BEE8 -.double 0.4 - -.section .text - -glabel func_8024150C_A49ACC -/* A49ACC 8024150C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A49AD0 80241510 AFB20028 */ sw $s2, 0x28($sp) -/* A49AD4 80241514 0080902D */ daddu $s2, $a0, $zero -/* A49AD8 80241518 AFBF002C */ sw $ra, 0x2c($sp) -/* A49ADC 8024151C AFB10024 */ sw $s1, 0x24($sp) -/* A49AE0 80241520 AFB00020 */ sw $s0, 0x20($sp) -/* A49AE4 80241524 8E510148 */ lw $s1, 0x148($s2) -/* A49AE8 80241528 0C00EABB */ jal get_npc_unsafe -/* A49AEC 8024152C 86240008 */ lh $a0, 8($s1) -/* A49AF0 80241530 8E23006C */ lw $v1, 0x6c($s1) -/* A49AF4 80241534 14600006 */ bnez $v1, .L80241550 -/* A49AF8 80241538 0040802D */ daddu $s0, $v0, $zero -/* A49AFC 8024153C 8603008E */ lh $v1, 0x8e($s0) -/* A49B00 80241540 00031100 */ sll $v0, $v1, 4 -/* A49B04 80241544 00431023 */ subu $v0, $v0, $v1 -/* A49B08 80241548 08090558 */ j .L80241560 -/* A49B0C 8024154C 24430082 */ addiu $v1, $v0, 0x82 -.L80241550: -/* A49B10 80241550 8603008E */ lh $v1, 0x8e($s0) -/* A49B14 80241554 00031100 */ sll $v0, $v1, 4 -/* A49B18 80241558 00431023 */ subu $v0, $v0, $v1 -/* A49B1C 8024155C 2443001E */ addiu $v1, $v0, 0x1e -.L80241560: -/* A49B20 80241560 00031400 */ sll $v0, $v1, 0x10 -/* A49B24 80241564 00021403 */ sra $v0, $v0, 0x10 -/* A49B28 80241568 28420100 */ slti $v0, $v0, 0x100 -/* A49B2C 8024156C 50400001 */ beql $v0, $zero, .L80241574 -/* A49B30 80241570 240300FF */ addiu $v1, $zero, 0xff -.L80241574: -/* A49B34 80241574 8602008E */ lh $v0, 0x8e($s0) -/* A49B38 80241578 3C018024 */ lui $at, %hi(D_80243920_A4BEE0) -/* A49B3C 8024157C D4223920 */ ldc1 $f2, %lo(D_80243920_A4BEE0)($at) -/* A49B40 80241580 44820000 */ mtc1 $v0, $f0 -/* A49B44 80241584 00000000 */ nop -/* A49B48 80241588 46800020 */ cvt.s.w $f0, $f0 -/* A49B4C 8024158C 46000021 */ cvt.d.s $f0, $f0 -/* A49B50 80241590 46220002 */ mul.d $f0, $f0, $f2 -/* A49B54 80241594 00000000 */ nop -/* A49B58 80241598 3C018024 */ lui $at, %hi(D_80243928_A4BEE8) -/* A49B5C 8024159C D4223928 */ ldc1 $f2, %lo(D_80243928_A4BEE8)($at) -/* A49B60 802415A0 46220000 */ add.d $f0, $f0, $f2 -/* A49B64 802415A4 A20300AC */ sb $v1, 0xac($s0) -/* A49B68 802415A8 3C013FF0 */ lui $at, 0x3ff0 -/* A49B6C 802415AC 44811800 */ mtc1 $at, $f3 -/* A49B70 802415B0 44801000 */ mtc1 $zero, $f2 -/* A49B74 802415B4 46200020 */ cvt.s.d $f0, $f0 -/* A49B78 802415B8 E6000054 */ swc1 $f0, 0x54($s0) -/* A49B7C 802415BC 46000021 */ cvt.d.s $f0, $f0 -/* A49B80 802415C0 4620103C */ c.lt.d $f2, $f0 -/* A49B84 802415C4 00000000 */ nop -/* A49B88 802415C8 45000005 */ bc1f .L802415E0 -/* A49B8C 802415CC 24030005 */ addiu $v1, $zero, 5 -/* A49B90 802415D0 3C013F80 */ lui $at, 0x3f80 -/* A49B94 802415D4 44810000 */ mtc1 $at, $f0 -/* A49B98 802415D8 00000000 */ nop -/* A49B9C 802415DC E6000054 */ swc1 $f0, 0x54($s0) -.L802415E0: -/* A49BA0 802415E0 C6000054 */ lwc1 $f0, 0x54($s0) -/* A49BA4 802415E4 9602008E */ lhu $v0, 0x8e($s0) -/* A49BA8 802415E8 46000086 */ mov.s $f2, $f0 -/* A49BAC 802415EC 24420001 */ addiu $v0, $v0, 1 -/* A49BB0 802415F0 A602008E */ sh $v0, 0x8e($s0) -/* A49BB4 802415F4 00021400 */ sll $v0, $v0, 0x10 -/* A49BB8 802415F8 00021403 */ sra $v0, $v0, 0x10 -/* A49BBC 802415FC E6000058 */ swc1 $f0, 0x58($s0) -/* A49BC0 80241600 14430008 */ bne $v0, $v1, .L80241624 -/* A49BC4 80241604 E602005C */ swc1 $f2, 0x5c($s0) -/* A49BC8 80241608 0C00EAE8 */ jal enable_npc_shadow -/* A49BCC 8024160C 0200202D */ daddu $a0, $s0, $zero -/* A49BD0 80241610 3C03E0EF */ lui $v1, 0xe0ef -/* A49BD4 80241614 8E220000 */ lw $v0, ($s1) -/* A49BD8 80241618 3463FFFF */ ori $v1, $v1, 0xffff -/* A49BDC 8024161C 00431024 */ and $v0, $v0, $v1 -/* A49BE0 80241620 AE220000 */ sw $v0, ($s1) -.L80241624: -/* A49BE4 80241624 8E22006C */ lw $v0, 0x6c($s1) -/* A49BE8 80241628 1440000E */ bnez $v0, .L80241664 -/* A49BEC 8024162C 00000000 */ nop -/* A49BF0 80241630 8602008E */ lh $v0, 0x8e($s0) -/* A49BF4 80241634 28420014 */ slti $v0, $v0, 0x14 -/* A49BF8 80241638 14400017 */ bnez $v0, .L80241698 -/* A49BFC 8024163C 0000282D */ daddu $a1, $zero, $zero -/* A49C00 80241640 00A0302D */ daddu $a2, $a1, $zero -/* A49C04 80241644 AFA00010 */ sw $zero, 0x10($sp) -/* A49C08 80241648 AFA00014 */ sw $zero, 0x14($sp) -/* A49C0C 8024164C AFA00018 */ sw $zero, 0x18($sp) -/* A49C10 80241650 8E040024 */ lw $a0, 0x24($s0) -/* A49C14 80241654 0C0B7A25 */ jal func_802DE894 -/* A49C18 80241658 00A0382D */ daddu $a3, $a1, $zero -/* A49C1C 8024165C 0809059D */ j .L80241674 -/* A49C20 80241660 00000000 */ nop -.L80241664: -/* A49C24 80241664 8602008E */ lh $v0, 0x8e($s0) -/* A49C28 80241668 2842000A */ slti $v0, $v0, 0xa -/* A49C2C 8024166C 1440000A */ bnez $v0, .L80241698 -/* A49C30 80241670 00000000 */ nop -.L80241674: -/* A49C34 80241674 3C013F80 */ lui $at, 0x3f80 -/* A49C38 80241678 44810000 */ mtc1 $at, $f0 -/* A49C3C 8024167C 240200FF */ addiu $v0, $zero, 0xff -/* A49C40 80241680 A20200AC */ sb $v0, 0xac($s0) -/* A49C44 80241684 24020014 */ addiu $v0, $zero, 0x14 -/* A49C48 80241688 E6000054 */ swc1 $f0, 0x54($s0) -/* A49C4C 8024168C E6000058 */ swc1 $f0, 0x58($s0) -/* A49C50 80241690 E600005C */ swc1 $f0, 0x5c($s0) -/* A49C54 80241694 AE420070 */ sw $v0, 0x70($s2) -.L80241698: -/* A49C58 80241698 8FBF002C */ lw $ra, 0x2c($sp) -/* A49C5C 8024169C 8FB20028 */ lw $s2, 0x28($sp) -/* A49C60 802416A0 8FB10024 */ lw $s1, 0x24($sp) -/* A49C64 802416A4 8FB00020 */ lw $s0, 0x20($sp) -/* A49C68 802416A8 03E00008 */ jr $ra -/* A49C6C 802416AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s deleted file mode 100644 index 538bcc8c34..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416EC_A49CAC -/* A49CAC 802416EC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A49CB0 802416F0 AFB40048 */ sw $s4, 0x48($sp) -/* A49CB4 802416F4 0080A02D */ daddu $s4, $a0, $zero -/* A49CB8 802416F8 AFBF004C */ sw $ra, 0x4c($sp) -/* A49CBC 802416FC AFB30044 */ sw $s3, 0x44($sp) -/* A49CC0 80241700 AFB20040 */ sw $s2, 0x40($sp) -/* A49CC4 80241704 AFB1003C */ sw $s1, 0x3c($sp) -/* A49CC8 80241708 AFB00038 */ sw $s0, 0x38($sp) -/* A49CCC 8024170C F7B40050 */ sdc1 $f20, 0x50($sp) -/* A49CD0 80241710 8E910148 */ lw $s1, 0x148($s4) -/* A49CD4 80241714 00A0902D */ daddu $s2, $a1, $zero -/* A49CD8 80241718 86240008 */ lh $a0, 8($s1) -/* A49CDC 8024171C 0C00EABB */ jal get_npc_unsafe -/* A49CE0 80241720 00C0982D */ daddu $s3, $a2, $zero -/* A49CE4 80241724 0040802D */ daddu $s0, $v0, $zero -/* A49CE8 80241728 9602008E */ lhu $v0, 0x8e($s0) -/* A49CEC 8024172C 2442FFFF */ addiu $v0, $v0, -1 -/* A49CF0 80241730 A602008E */ sh $v0, 0x8e($s0) -/* A49CF4 80241734 00021400 */ sll $v0, $v0, 0x10 -/* A49CF8 80241738 14400021 */ bnez $v0, .L802417C0 -/* A49CFC 8024173C 0280202D */ daddu $a0, $s4, $zero -/* A49D00 80241740 24040002 */ addiu $a0, $zero, 2 -/* A49D04 80241744 0200282D */ daddu $a1, $s0, $zero -/* A49D08 80241748 0000302D */ daddu $a2, $zero, $zero -/* A49D0C 8024174C 8E2200CC */ lw $v0, 0xcc($s1) -/* A49D10 80241750 3C013F80 */ lui $at, 0x3f80 -/* A49D14 80241754 44810000 */ mtc1 $at, $f0 -/* A49D18 80241758 3C014000 */ lui $at, 0x4000 -/* A49D1C 8024175C 44811000 */ mtc1 $at, $f2 -/* A49D20 80241760 8C430000 */ lw $v1, ($v0) -/* A49D24 80241764 860200A8 */ lh $v0, 0xa8($s0) -/* A49D28 80241768 3C01C1A0 */ lui $at, 0xc1a0 -/* A49D2C 8024176C 44812000 */ mtc1 $at, $f4 -/* A49D30 80241770 44824000 */ mtc1 $v0, $f8 -/* A49D34 80241774 00000000 */ nop -/* A49D38 80241778 46804220 */ cvt.s.w $f8, $f8 -/* A49D3C 8024177C 44074000 */ mfc1 $a3, $f8 -/* A49D40 80241780 2402000C */ addiu $v0, $zero, 0xc -/* A49D44 80241784 AE030028 */ sw $v1, 0x28($s0) -/* A49D48 80241788 AFA2001C */ sw $v0, 0x1c($sp) -/* A49D4C 8024178C 27A20028 */ addiu $v0, $sp, 0x28 -/* A49D50 80241790 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49D54 80241794 E7A20014 */ swc1 $f2, 0x14($sp) -/* A49D58 80241798 E7A40018 */ swc1 $f4, 0x18($sp) -/* A49D5C 8024179C 0C01BFA4 */ jal fx_emote -/* A49D60 802417A0 AFA20020 */ sw $v0, 0x20($sp) -/* A49D64 802417A4 8E2200CC */ lw $v0, 0xcc($s1) -/* A49D68 802417A8 8C430000 */ lw $v1, ($v0) -/* A49D6C 802417AC 2402000F */ addiu $v0, $zero, 0xf -/* A49D70 802417B0 A602008E */ sh $v0, 0x8e($s0) -/* A49D74 802417B4 AE030028 */ sw $v1, 0x28($s0) -/* A49D78 802417B8 08090622 */ j .L80241888 -/* A49D7C 802417BC AE800070 */ sw $zero, 0x70($s4) -.L802417C0: -/* A49D80 802417C0 8E450024 */ lw $a1, 0x24($s2) -/* A49D84 802417C4 8E460028 */ lw $a2, 0x28($s2) -/* A49D88 802417C8 0C090292 */ jal kpa_03_UnkNpcAIFunc47 -/* A49D8C 802417CC 0260382D */ daddu $a3, $s3, $zero -/* A49D90 802417D0 24030001 */ addiu $v1, $zero, 1 -/* A49D94 802417D4 1443002C */ bne $v0, $v1, .L80241888 -/* A49D98 802417D8 0200202D */ daddu $a0, $s0, $zero -/* A49D9C 802417DC 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A49DA0 802417E0 0C012530 */ jal ai_enemy_play_sound -/* A49DA4 802417E4 0000302D */ daddu $a2, $zero, $zero -/* A49DA8 802417E8 27A4002C */ addiu $a0, $sp, 0x2c -/* A49DAC 802417EC 27A50030 */ addiu $a1, $sp, 0x30 -/* A49DB0 802417F0 3C064188 */ lui $a2, 0x4188 -/* A49DB4 802417F4 C6020034 */ lwc1 $f2, 0x34($s0) -/* A49DB8 802417F8 3C014387 */ lui $at, 0x4387 -/* A49DBC 802417FC 44810000 */ mtc1 $at, $f0 -/* A49DC0 80241800 8E2200CC */ lw $v0, 0xcc($s1) -/* A49DC4 80241804 C614003C */ lwc1 $f20, 0x3c($s0) -/* A49DC8 80241808 46020001 */ sub.s $f0, $f0, $f2 -/* A49DCC 8024180C 3C014200 */ lui $at, 0x4200 -/* A49DD0 80241810 44812000 */ mtc1 $at, $f4 -/* A49DD4 80241814 C6060038 */ lwc1 $f6, 0x38($s0) -/* A49DD8 80241818 4604A500 */ add.s $f20, $f20, $f4 -/* A49DDC 8024181C 3C013F80 */ lui $at, 0x3f80 -/* A49DE0 80241820 44811000 */ mtc1 $at, $f2 -/* A49DE4 80241824 44070000 */ mfc1 $a3, $f0 -/* A49DE8 80241828 C6000040 */ lwc1 $f0, 0x40($s0) -/* A49DEC 8024182C 8C420020 */ lw $v0, 0x20($v0) -/* A49DF0 80241830 46020000 */ add.s $f0, $f0, $f2 -/* A49DF4 80241834 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A49DF8 80241838 AE020028 */ sw $v0, 0x28($s0) -/* A49DFC 8024183C 0C00A7E7 */ jal add_vec2D_polar -/* A49E00 80241840 E7A00030 */ swc1 $f0, 0x30($sp) -/* A49E04 80241844 0000202D */ daddu $a0, $zero, $zero -/* A49E08 80241848 4406A000 */ mfc1 $a2, $f20 -/* A49E0C 8024184C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A49E10 80241850 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A49E14 80241854 44050000 */ mfc1 $a1, $f0 -/* A49E18 80241858 44071000 */ mfc1 $a3, $f2 -/* A49E1C 8024185C 3C013DCC */ lui $at, 0x3dcc -/* A49E20 80241860 3421CCCD */ ori $at, $at, 0xcccd -/* A49E24 80241864 44810000 */ mtc1 $at, $f0 -/* A49E28 80241868 2402000D */ addiu $v0, $zero, 0xd -/* A49E2C 8024186C AFA20014 */ sw $v0, 0x14($sp) -/* A49E30 80241870 0C01BFEC */ jal fx_gather_energy_pink -/* A49E34 80241874 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49E38 80241878 2402000F */ addiu $v0, $zero, 0xf -/* A49E3C 8024187C A602008E */ sh $v0, 0x8e($s0) -/* A49E40 80241880 24020016 */ addiu $v0, $zero, 0x16 -/* A49E44 80241884 AE820070 */ sw $v0, 0x70($s4) -.L80241888: -/* A49E48 80241888 8FBF004C */ lw $ra, 0x4c($sp) -/* A49E4C 8024188C 8FB40048 */ lw $s4, 0x48($sp) -/* A49E50 80241890 8FB30044 */ lw $s3, 0x44($sp) -/* A49E54 80241894 8FB20040 */ lw $s2, 0x40($sp) -/* A49E58 80241898 8FB1003C */ lw $s1, 0x3c($sp) -/* A49E5C 8024189C 8FB00038 */ lw $s0, 0x38($sp) -/* A49E60 802418A0 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A49E64 802418A4 03E00008 */ jr $ra -/* A49E68 802418A8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s deleted file mode 100644 index e7a274e484..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802418AC_A49E6C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418AC_A49E6C -/* A49E6C 802418AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A49E70 802418B0 AFB10014 */ sw $s1, 0x14($sp) -/* A49E74 802418B4 0080882D */ daddu $s1, $a0, $zero -/* A49E78 802418B8 AFBF0018 */ sw $ra, 0x18($sp) -/* A49E7C 802418BC AFB00010 */ sw $s0, 0x10($sp) -/* A49E80 802418C0 8E300148 */ lw $s0, 0x148($s1) -/* A49E84 802418C4 0C00EABB */ jal get_npc_unsafe -/* A49E88 802418C8 86040008 */ lh $a0, 8($s0) -/* A49E8C 802418CC 0040202D */ daddu $a0, $v0, $zero -/* A49E90 802418D0 9482008E */ lhu $v0, 0x8e($a0) -/* A49E94 802418D4 2442FFFF */ addiu $v0, $v0, -1 -/* A49E98 802418D8 A482008E */ sh $v0, 0x8e($a0) -/* A49E9C 802418DC 00021400 */ sll $v0, $v0, 0x10 -/* A49EA0 802418E0 1C400008 */ bgtz $v0, .L80241904 -/* A49EA4 802418E4 00000000 */ nop -/* A49EA8 802418E8 8E0200CC */ lw $v0, 0xcc($s0) -/* A49EAC 802418EC 8C430024 */ lw $v1, 0x24($v0) -/* A49EB0 802418F0 24020009 */ addiu $v0, $zero, 9 -/* A49EB4 802418F4 A482008E */ sh $v0, 0x8e($a0) -/* A49EB8 802418F8 24020017 */ addiu $v0, $zero, 0x17 -/* A49EBC 802418FC AC830028 */ sw $v1, 0x28($a0) -/* A49EC0 80241900 AE220070 */ sw $v0, 0x70($s1) -.L80241904: -/* A49EC4 80241904 8FBF0018 */ lw $ra, 0x18($sp) -/* A49EC8 80241908 8FB10014 */ lw $s1, 0x14($sp) -/* A49ECC 8024190C 8FB00010 */ lw $s0, 0x10($sp) -/* A49ED0 80241910 03E00008 */ jr $ra -/* A49ED4 80241914 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s deleted file mode 100644 index 5d1ae0ae11..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241918_A49ED8 -/* A49ED8 80241918 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A49EDC 8024191C AFB3003C */ sw $s3, 0x3c($sp) -/* A49EE0 80241920 0080982D */ daddu $s3, $a0, $zero -/* A49EE4 80241924 AFBF0044 */ sw $ra, 0x44($sp) -/* A49EE8 80241928 AFB40040 */ sw $s4, 0x40($sp) -/* A49EEC 8024192C AFB20038 */ sw $s2, 0x38($sp) -/* A49EF0 80241930 AFB10034 */ sw $s1, 0x34($sp) -/* A49EF4 80241934 AFB00030 */ sw $s0, 0x30($sp) -/* A49EF8 80241938 8E720148 */ lw $s2, 0x148($s3) -/* A49EFC 8024193C 00A0882D */ daddu $s1, $a1, $zero -/* A49F00 80241940 86440008 */ lh $a0, 8($s2) -/* A49F04 80241944 0C00EABB */ jal get_npc_unsafe -/* A49F08 80241948 00C0A02D */ daddu $s4, $a2, $zero -/* A49F0C 8024194C 0040802D */ daddu $s0, $v0, $zero -/* A49F10 80241950 9602008E */ lhu $v0, 0x8e($s0) -/* A49F14 80241954 2442FFFF */ addiu $v0, $v0, -1 -/* A49F18 80241958 A602008E */ sh $v0, 0x8e($s0) -/* A49F1C 8024195C 00021400 */ sll $v0, $v0, 0x10 -/* A49F20 80241960 1C400032 */ bgtz $v0, .L80241A2C -/* A49F24 80241964 00000000 */ nop -/* A49F28 80241968 0260202D */ daddu $a0, $s3, $zero -/* A49F2C 8024196C 8E250024 */ lw $a1, 0x24($s1) -/* A49F30 80241970 8E260028 */ lw $a2, 0x28($s1) -/* A49F34 80241974 0C090292 */ jal kpa_03_UnkNpcAIFunc47 -/* A49F38 80241978 0280382D */ daddu $a3, $s4, $zero -/* A49F3C 8024197C 0040882D */ daddu $s1, $v0, $zero -/* A49F40 80241980 24020001 */ addiu $v0, $zero, 1 -/* A49F44 80241984 1222001D */ beq $s1, $v0, .L802419FC -/* A49F48 80241988 0200282D */ daddu $a1, $s0, $zero -/* A49F4C 8024198C 24040002 */ addiu $a0, $zero, 2 -/* A49F50 80241990 0000302D */ daddu $a2, $zero, $zero -/* A49F54 80241994 860300A8 */ lh $v1, 0xa8($s0) -/* A49F58 80241998 3C013F80 */ lui $at, 0x3f80 -/* A49F5C 8024199C 44810000 */ mtc1 $at, $f0 -/* A49F60 802419A0 3C014000 */ lui $at, 0x4000 -/* A49F64 802419A4 44811000 */ mtc1 $at, $f2 -/* A49F68 802419A8 3C01C1A0 */ lui $at, 0xc1a0 -/* A49F6C 802419AC 44812000 */ mtc1 $at, $f4 -/* A49F70 802419B0 2402000C */ addiu $v0, $zero, 0xc -/* A49F74 802419B4 AFA2001C */ sw $v0, 0x1c($sp) -/* A49F78 802419B8 44833000 */ mtc1 $v1, $f6 -/* A49F7C 802419BC 00000000 */ nop -/* A49F80 802419C0 468031A0 */ cvt.s.w $f6, $f6 -/* A49F84 802419C4 44073000 */ mfc1 $a3, $f6 -/* A49F88 802419C8 27A20028 */ addiu $v0, $sp, 0x28 -/* A49F8C 802419CC AFA20020 */ sw $v0, 0x20($sp) -/* A49F90 802419D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49F94 802419D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A49F98 802419D8 0C01BFA4 */ jal fx_emote -/* A49F9C 802419DC E7A40018 */ swc1 $f4, 0x18($sp) -/* A49FA0 802419E0 8E4200CC */ lw $v0, 0xcc($s2) -/* A49FA4 802419E4 8C430000 */ lw $v1, ($v0) -/* A49FA8 802419E8 2402000F */ addiu $v0, $zero, 0xf -/* A49FAC 802419EC A602008E */ sh $v0, 0x8e($s0) -/* A49FB0 802419F0 AE030028 */ sw $v1, 0x28($s0) -/* A49FB4 802419F4 0809068B */ j .L80241A2C -/* A49FB8 802419F8 AE600070 */ sw $zero, 0x70($s3) -.L802419FC: -/* A49FBC 802419FC 0200202D */ daddu $a0, $s0, $zero -/* A49FC0 80241A00 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A49FC4 80241A04 0C012530 */ jal ai_enemy_play_sound -/* A49FC8 80241A08 0000302D */ daddu $a2, $zero, $zero -/* A49FCC 80241A0C 86440008 */ lh $a0, 8($s2) -/* A49FD0 80241A10 0C00FB3A */ jal get_enemy -/* A49FD4 80241A14 24840001 */ addiu $a0, $a0, 1 -/* A49FD8 80241A18 AC51006C */ sw $s1, 0x6c($v0) -/* A49FDC 80241A1C 24020014 */ addiu $v0, $zero, 0x14 -/* A49FE0 80241A20 A602008E */ sh $v0, 0x8e($s0) -/* A49FE4 80241A24 24020018 */ addiu $v0, $zero, 0x18 -/* A49FE8 80241A28 AE620070 */ sw $v0, 0x70($s3) -.L80241A2C: -/* A49FEC 80241A2C 8FBF0044 */ lw $ra, 0x44($sp) -/* A49FF0 80241A30 8FB40040 */ lw $s4, 0x40($sp) -/* A49FF4 80241A34 8FB3003C */ lw $s3, 0x3c($sp) -/* A49FF8 80241A38 8FB20038 */ lw $s2, 0x38($sp) -/* A49FFC 80241A3C 8FB10034 */ lw $s1, 0x34($sp) -/* A4A000 80241A40 8FB00030 */ lw $s0, 0x30($sp) -/* A4A004 80241A44 03E00008 */ jr $ra -/* A4A008 80241A48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s deleted file mode 100644 index fc08254b99..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241A4C_A4A00C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A4C_A4A00C -/* A4A00C 80241A4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4A010 80241A50 AFB10014 */ sw $s1, 0x14($sp) -/* A4A014 80241A54 0080882D */ daddu $s1, $a0, $zero -/* A4A018 80241A58 AFBF0018 */ sw $ra, 0x18($sp) -/* A4A01C 80241A5C AFB00010 */ sw $s0, 0x10($sp) -/* A4A020 80241A60 8E300148 */ lw $s0, 0x148($s1) -/* A4A024 80241A64 0C00EABB */ jal get_npc_unsafe -/* A4A028 80241A68 86040008 */ lh $a0, 8($s0) -/* A4A02C 80241A6C 0040202D */ daddu $a0, $v0, $zero -/* A4A030 80241A70 9482008E */ lhu $v0, 0x8e($a0) -/* A4A034 80241A74 2442FFFF */ addiu $v0, $v0, -1 -/* A4A038 80241A78 A482008E */ sh $v0, 0x8e($a0) -/* A4A03C 80241A7C 00021400 */ sll $v0, $v0, 0x10 -/* A4A040 80241A80 1C400007 */ bgtz $v0, .L80241AA0 -/* A4A044 80241A84 00000000 */ nop -/* A4A048 80241A88 8E0200CC */ lw $v0, 0xcc($s0) -/* A4A04C 80241A8C 8C430000 */ lw $v1, ($v0) -/* A4A050 80241A90 24020003 */ addiu $v0, $zero, 3 -/* A4A054 80241A94 A482008E */ sh $v0, 0x8e($a0) -/* A4A058 80241A98 AC830028 */ sw $v1, 0x28($a0) -/* A4A05C 80241A9C AE200070 */ sw $zero, 0x70($s1) -.L80241AA0: -/* A4A060 80241AA0 8FBF0018 */ lw $ra, 0x18($sp) -/* A4A064 80241AA4 8FB10014 */ lw $s1, 0x14($sp) -/* A4A068 80241AA8 8FB00010 */ lw $s0, 0x10($sp) -/* A4A06C 80241AAC 03E00008 */ jr $ra -/* A4A070 80241AB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s deleted file mode 100644 index dd1d372648..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s +++ /dev/null @@ -1,181 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243930_A4BEF0 -.word .L80241C00_A4A1C0, .L80241C20_A4A1E0, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241C38_A4A1F8, .L80241C48_A4A208, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241C60_A4A220, .L80241C70_A4A230, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241CF8_A4A2B8, .L80241C88_A4A248, .L80241CA0_A4A260, .L80241CB8_A4A278, .L80241CD0_A4A290, .L80241CE8_A4A2A8, 0, 0, 0 - -.section .text - -glabel func_80241AB4_A4A074 -/* A4A074 80241AB4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4A078 80241AB8 AFB50044 */ sw $s5, 0x44($sp) -/* A4A07C 80241ABC 0080A82D */ daddu $s5, $a0, $zero -/* A4A080 80241AC0 AFBF0048 */ sw $ra, 0x48($sp) -/* A4A084 80241AC4 AFB40040 */ sw $s4, 0x40($sp) -/* A4A088 80241AC8 AFB3003C */ sw $s3, 0x3c($sp) -/* A4A08C 80241ACC AFB20038 */ sw $s2, 0x38($sp) -/* A4A090 80241AD0 AFB10034 */ sw $s1, 0x34($sp) -/* A4A094 80241AD4 AFB00030 */ sw $s0, 0x30($sp) -/* A4A098 80241AD8 8EB10148 */ lw $s1, 0x148($s5) -/* A4A09C 80241ADC 86240008 */ lh $a0, 8($s1) -/* A4A0A0 80241AE0 0C00EABB */ jal get_npc_unsafe -/* A4A0A4 80241AE4 00A0802D */ daddu $s0, $a1, $zero -/* A4A0A8 80241AE8 8EA3000C */ lw $v1, 0xc($s5) -/* A4A0AC 80241AEC 02A0202D */ daddu $a0, $s5, $zero -/* A4A0B0 80241AF0 8C650000 */ lw $a1, ($v1) -/* A4A0B4 80241AF4 0C0B1EAF */ jal evt_get_variable -/* A4A0B8 80241AF8 0040902D */ daddu $s2, $v0, $zero -/* A4A0BC 80241AFC AFA00010 */ sw $zero, 0x10($sp) -/* A4A0C0 80241B00 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0C4 80241B04 8C630030 */ lw $v1, 0x30($v1) -/* A4A0C8 80241B08 AFA30014 */ sw $v1, 0x14($sp) -/* A4A0CC 80241B0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0D0 80241B10 8C63001C */ lw $v1, 0x1c($v1) -/* A4A0D4 80241B14 AFA30018 */ sw $v1, 0x18($sp) -/* A4A0D8 80241B18 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0DC 80241B1C 8C630024 */ lw $v1, 0x24($v1) -/* A4A0E0 80241B20 AFA3001C */ sw $v1, 0x1c($sp) -/* A4A0E4 80241B24 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0E8 80241B28 8C630028 */ lw $v1, 0x28($v1) -/* A4A0EC 80241B2C 27B40010 */ addiu $s4, $sp, 0x10 -/* A4A0F0 80241B30 AFA30020 */ sw $v1, 0x20($sp) -/* A4A0F4 80241B34 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4A0F8 80241B38 3C0142C8 */ lui $at, 0x42c8 -/* A4A0FC 80241B3C 44810000 */ mtc1 $at, $f0 -/* A4A100 80241B40 8C63002C */ lw $v1, 0x2c($v1) -/* A4A104 80241B44 0040982D */ daddu $s3, $v0, $zero -/* A4A108 80241B48 E7A00028 */ swc1 $f0, 0x28($sp) -/* A4A10C 80241B4C A7A0002C */ sh $zero, 0x2c($sp) -/* A4A110 80241B50 16000005 */ bnez $s0, .L80241B68 -/* A4A114 80241B54 AFA30024 */ sw $v1, 0x24($sp) -/* A4A118 80241B58 8E2200B0 */ lw $v0, 0xb0($s1) -/* A4A11C 80241B5C 30420004 */ andi $v0, $v0, 4 -/* A4A120 80241B60 1040001E */ beqz $v0, .L80241BDC -/* A4A124 80241B64 00000000 */ nop -.L80241B68: -/* A4A128 80241B68 8E430000 */ lw $v1, ($s2) -/* A4A12C 80241B6C 2402F7FF */ addiu $v0, $zero, -0x801 -/* A4A130 80241B70 00621824 */ and $v1, $v1, $v0 -/* A4A134 80241B74 8E2200CC */ lw $v0, 0xcc($s1) -/* A4A138 80241B78 3C040020 */ lui $a0, 0x20 -/* A4A13C 80241B7C 8C420000 */ lw $v0, ($v0) -/* A4A140 80241B80 00641825 */ or $v1, $v1, $a0 -/* A4A144 80241B84 AE430000 */ sw $v1, ($s2) -/* A4A148 80241B88 AE420028 */ sw $v0, 0x28($s2) -/* A4A14C 80241B8C 8E220000 */ lw $v0, ($s1) -/* A4A150 80241B90 00441025 */ or $v0, $v0, $a0 -/* A4A154 80241B94 AE220000 */ sw $v0, ($s1) -/* A4A158 80241B98 A640008E */ sh $zero, 0x8e($s2) -/* A4A15C 80241B9C 8E2300B0 */ lw $v1, 0xb0($s1) -/* A4A160 80241BA0 30620004 */ andi $v0, $v1, 4 -/* A4A164 80241BA4 1040000C */ beqz $v0, .L80241BD8 -/* A4A168 80241BA8 2402FFFB */ addiu $v0, $zero, -5 -/* A4A16C 80241BAC 3C013F80 */ lui $at, 0x3f80 -/* A4A170 80241BB0 44810000 */ mtc1 $at, $f0 -/* A4A174 80241BB4 00621024 */ and $v0, $v1, $v0 -/* A4A178 80241BB8 AE2200B0 */ sw $v0, 0xb0($s1) -/* A4A17C 80241BBC 240200FF */ addiu $v0, $zero, 0xff -/* A4A180 80241BC0 A24200AC */ sb $v0, 0xac($s2) -/* A4A184 80241BC4 24020014 */ addiu $v0, $zero, 0x14 -/* A4A188 80241BC8 A642008E */ sh $v0, 0x8e($s2) -/* A4A18C 80241BCC E6400054 */ swc1 $f0, 0x54($s2) -/* A4A190 80241BD0 E6400058 */ swc1 $f0, 0x58($s2) -/* A4A194 80241BD4 E640005C */ swc1 $f0, 0x5c($s2) -.L80241BD8: -/* A4A198 80241BD8 AEA00070 */ sw $zero, 0x70($s5) -.L80241BDC: -/* A4A19C 80241BDC 8EA30070 */ lw $v1, 0x70($s5) -/* A4A1A0 80241BE0 2C620019 */ sltiu $v0, $v1, 0x19 -/* A4A1A4 80241BE4 10400044 */ beqz $v0, .L80241CF8_A4A2B8 -/* A4A1A8 80241BE8 00031080 */ sll $v0, $v1, 2 -/* A4A1AC 80241BEC 3C018024 */ lui $at, %hi(jtbl_80243930_A4BEF0) -/* A4A1B0 80241BF0 00220821 */ addu $at, $at, $v0 -/* A4A1B4 80241BF4 8C223930 */ lw $v0, %lo(jtbl_80243930_A4BEF0)($at) -/* A4A1B8 80241BF8 00400008 */ jr $v0 -/* A4A1BC 80241BFC 00000000 */ nop -.L80241C00_A4A1C0: -/* A4A1C0 80241C00 02A0202D */ daddu $a0, $s5, $zero -/* A4A1C4 80241C04 0260282D */ daddu $a1, $s3, $zero -/* A4A1C8 80241C08 0C09044A */ jal kpa_03_UnkFunc58 -/* A4A1CC 80241C0C 0280302D */ daddu $a2, $s4, $zero -/* A4A1D0 80241C10 8EA30070 */ lw $v1, 0x70($s5) -/* A4A1D4 80241C14 24020001 */ addiu $v0, $zero, 1 -/* A4A1D8 80241C18 14620037 */ bne $v1, $v0, .L80241CF8_A4A2B8 -/* A4A1DC 80241C1C 00000000 */ nop -.L80241C20_A4A1E0: -/* A4A1E0 80241C20 02A0202D */ daddu $a0, $s5, $zero -/* A4A1E4 80241C24 0260282D */ daddu $a1, $s3, $zero -/* A4A1E8 80241C28 0C090467 */ jal func_8024119C_A4975C -/* A4A1EC 80241C2C 0280302D */ daddu $a2, $s4, $zero -/* A4A1F0 80241C30 0809073E */ j .L80241CF8_A4A2B8 -/* A4A1F4 80241C34 00000000 */ nop -.L80241C38_A4A1F8: -/* A4A1F8 80241C38 02A0202D */ daddu $a0, $s5, $zero -/* A4A1FC 80241C3C 0260282D */ daddu $a1, $s3, $zero -/* A4A200 80241C40 0C0904B2 */ jal kpa_03_UnkFunc59 -/* A4A204 80241C44 0280302D */ daddu $a2, $s4, $zero -.L80241C48_A4A208: -/* A4A208 80241C48 02A0202D */ daddu $a0, $s5, $zero -/* A4A20C 80241C4C 0260282D */ daddu $a1, $s3, $zero -/* A4A210 80241C50 0C0904DA */ jal func_80241368_A49928 -/* A4A214 80241C54 0280302D */ daddu $a2, $s4, $zero -/* A4A218 80241C58 0809073E */ j .L80241CF8_A4A2B8 -/* A4A21C 80241C5C 00000000 */ nop -.L80241C60_A4A220: -/* A4A220 80241C60 02A0202D */ daddu $a0, $s5, $zero -/* A4A224 80241C64 0260282D */ daddu $a1, $s3, $zero -/* A4A228 80241C68 0C0904F3 */ jal func_802413CC_A4998C -/* A4A22C 80241C6C 0280302D */ daddu $a2, $s4, $zero -.L80241C70_A4A230: -/* A4A230 80241C70 02A0202D */ daddu $a0, $s5, $zero -/* A4A234 80241C74 0260282D */ daddu $a1, $s3, $zero -/* A4A238 80241C78 0C090543 */ jal func_8024150C_A49ACC -/* A4A23C 80241C7C 0280302D */ daddu $a2, $s4, $zero -/* A4A240 80241C80 0809073E */ j .L80241CF8_A4A2B8 -/* A4A244 80241C84 00000000 */ nop -.L80241C88_A4A248: -/* A4A248 80241C88 02A0202D */ daddu $a0, $s5, $zero -/* A4A24C 80241C8C 0260282D */ daddu $a1, $s3, $zero -/* A4A250 80241C90 0C0905AC */ jal func_802416B0_A49C70 -/* A4A254 80241C94 0280302D */ daddu $a2, $s4, $zero -/* A4A258 80241C98 0809073E */ j .L80241CF8_A4A2B8 -/* A4A25C 80241C9C 00000000 */ nop -.L80241CA0_A4A260: -/* A4A260 80241CA0 02A0202D */ daddu $a0, $s5, $zero -/* A4A264 80241CA4 0260282D */ daddu $a1, $s3, $zero -/* A4A268 80241CA8 0C0905BB */ jal func_802416EC_A49CAC -/* A4A26C 80241CAC 0280302D */ daddu $a2, $s4, $zero -/* A4A270 80241CB0 0809073E */ j .L80241CF8_A4A2B8 -/* A4A274 80241CB4 00000000 */ nop -.L80241CB8_A4A278: -/* A4A278 80241CB8 02A0202D */ daddu $a0, $s5, $zero -/* A4A27C 80241CBC 0260282D */ daddu $a1, $s3, $zero -/* A4A280 80241CC0 0C09062B */ jal func_802418AC_A49E6C -/* A4A284 80241CC4 0280302D */ daddu $a2, $s4, $zero -/* A4A288 80241CC8 0809073E */ j .L80241CF8_A4A2B8 -/* A4A28C 80241CCC 00000000 */ nop -.L80241CD0_A4A290: -/* A4A290 80241CD0 02A0202D */ daddu $a0, $s5, $zero -/* A4A294 80241CD4 0260282D */ daddu $a1, $s3, $zero -/* A4A298 80241CD8 0C090646 */ jal func_80241918_A49ED8 -/* A4A29C 80241CDC 0280302D */ daddu $a2, $s4, $zero -/* A4A2A0 80241CE0 0809073E */ j .L80241CF8_A4A2B8 -/* A4A2A4 80241CE4 00000000 */ nop -.L80241CE8_A4A2A8: -/* A4A2A8 80241CE8 02A0202D */ daddu $a0, $s5, $zero -/* A4A2AC 80241CEC 0260282D */ daddu $a1, $s3, $zero -/* A4A2B0 80241CF0 0C090693 */ jal func_80241A4C_A4A00C -/* A4A2B4 80241CF4 0280302D */ daddu $a2, $s4, $zero -.L80241CF8_A4A2B8: -/* A4A2B8 80241CF8 8FBF0048 */ lw $ra, 0x48($sp) -/* A4A2BC 80241CFC 8FB50044 */ lw $s5, 0x44($sp) -/* A4A2C0 80241D00 8FB40040 */ lw $s4, 0x40($sp) -/* A4A2C4 80241D04 8FB3003C */ lw $s3, 0x3c($sp) -/* A4A2C8 80241D08 8FB20038 */ lw $s2, 0x38($sp) -/* A4A2CC 80241D0C 8FB10034 */ lw $s1, 0x34($sp) -/* A4A2D0 80241D10 8FB00030 */ lw $s0, 0x30($sp) -/* A4A2D4 80241D14 0000102D */ daddu $v0, $zero, $zero -/* A4A2D8 80241D18 03E00008 */ jr $ra -/* A4A2DC 80241D1C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20_A4A2E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20_A4A2E0.s deleted file mode 100644 index 943e500762..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20_A4A2E0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D20_A4A2E0 -/* A4A2E0 80241D20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4A2E4 80241D24 AFBF0020 */ sw $ra, 0x20($sp) -/* A4A2E8 80241D28 8C820148 */ lw $v0, 0x148($a0) -/* A4A2EC 80241D2C 0C00EABB */ jal get_npc_unsafe -/* A4A2F0 80241D30 84440008 */ lh $a0, 8($v0) -/* A4A2F4 80241D34 240300FF */ addiu $v1, $zero, 0xff -/* A4A2F8 80241D38 0000282D */ daddu $a1, $zero, $zero -/* A4A2FC 80241D3C 00A0302D */ daddu $a2, $a1, $zero -/* A4A300 80241D40 A04300AC */ sb $v1, 0xac($v0) -/* A4A304 80241D44 AFA00010 */ sw $zero, 0x10($sp) -/* A4A308 80241D48 AFA00014 */ sw $zero, 0x14($sp) -/* A4A30C 80241D4C AFA00018 */ sw $zero, 0x18($sp) -/* A4A310 80241D50 8C440024 */ lw $a0, 0x24($v0) -/* A4A314 80241D54 0C0B7A25 */ jal func_802DE894 -/* A4A318 80241D58 00A0382D */ daddu $a3, $a1, $zero -/* A4A31C 80241D5C 8FBF0020 */ lw $ra, 0x20($sp) -/* A4A320 80241D60 24020002 */ addiu $v0, $zero, 2 -/* A4A324 80241D64 03E00008 */ jr $ra -/* A4A328 80241D68 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C_A4A32C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C_A4A32C.s deleted file mode 100644 index 02e2d2ee22..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C_A4A32C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D6C_A4A32C -/* A4A32C 80241D6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4A330 80241D70 AFB10014 */ sw $s1, 0x14($sp) -/* A4A334 80241D74 0080882D */ daddu $s1, $a0, $zero -/* A4A338 80241D78 AFBF0018 */ sw $ra, 0x18($sp) -/* A4A33C 80241D7C AFB00010 */ sw $s0, 0x10($sp) -/* A4A340 80241D80 8E300148 */ lw $s0, 0x148($s1) -/* A4A344 80241D84 0C00EABB */ jal get_npc_unsafe -/* A4A348 80241D88 86040008 */ lh $a0, 8($s0) -/* A4A34C 80241D8C 0040182D */ daddu $v1, $v0, $zero -/* A4A350 80241D90 240200FF */ addiu $v0, $zero, 0xff -/* A4A354 80241D94 A06200AC */ sb $v0, 0xac($v1) -/* A4A358 80241D98 8E0200CC */ lw $v0, 0xcc($s0) -/* A4A35C 80241D9C 8C440008 */ lw $a0, 8($v0) -/* A4A360 80241DA0 A460008E */ sh $zero, 0x8e($v1) -/* A4A364 80241DA4 AC640028 */ sw $a0, 0x28($v1) -/* A4A368 80241DA8 AE200070 */ sw $zero, 0x70($s1) -/* A4A36C 80241DAC 8FBF0018 */ lw $ra, 0x18($sp) -/* A4A370 80241DB0 8FB10014 */ lw $s1, 0x14($sp) -/* A4A374 80241DB4 8FB00010 */ lw $s0, 0x10($sp) -/* A4A378 80241DB8 24020002 */ addiu $v0, $zero, 2 -/* A4A37C 80241DBC 03E00008 */ jr $ra -/* A4A380 80241DC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s deleted file mode 100644 index d3c9ff0871..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DFC_A4A3BC.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DFC_A4A3BC -/* A4A3BC 80241DFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4A3C0 80241E00 AFBF0014 */ sw $ra, 0x14($sp) -/* A4A3C4 80241E04 AFB00010 */ sw $s0, 0x10($sp) -/* A4A3C8 80241E08 8C900148 */ lw $s0, 0x148($a0) -/* A4A3CC 80241E0C 0C00EABB */ jal get_npc_unsafe -/* A4A3D0 80241E10 86040008 */ lh $a0, 8($s0) -/* A4A3D4 80241E14 0040202D */ daddu $a0, $v0, $zero -/* A4A3D8 80241E18 8E03006C */ lw $v1, 0x6c($s0) -/* A4A3DC 80241E1C 24020002 */ addiu $v0, $zero, 2 -/* A4A3E0 80241E20 14620003 */ bne $v1, $v0, .L80241E30 -/* A4A3E4 80241E24 00000000 */ nop -/* A4A3E8 80241E28 AC80001C */ sw $zero, 0x1c($a0) -/* A4A3EC 80241E2C AC800018 */ sw $zero, 0x18($a0) -.L80241E30: -/* A4A3F0 80241E30 8FBF0014 */ lw $ra, 0x14($sp) -/* A4A3F4 80241E34 8FB00010 */ lw $s0, 0x10($sp) -/* A4A3F8 80241E38 24020002 */ addiu $v0, $zero, 2 -/* A4A3FC 80241E3C 03E00008 */ jr $ra -/* A4A400 80241E40 27BD0018 */ addiu $sp, $sp, 0x18 -/* A4A404 80241E44 00000000 */ nop -/* A4A408 80241E48 00000000 */ nop -/* A4A40C 80241E4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s deleted file mode 100644 index aa0f1f00aa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E50_A4A410 -/* A4A410 80241E50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4A414 80241E54 AFB10014 */ sw $s1, 0x14($sp) -/* A4A418 80241E58 0080882D */ daddu $s1, $a0, $zero -/* A4A41C 80241E5C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A4A420 80241E60 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A4A424 80241E64 AFBF0018 */ sw $ra, 0x18($sp) -/* A4A428 80241E68 AFB00010 */ sw $s0, 0x10($sp) -/* A4A42C 80241E6C 84430018 */ lh $v1, 0x18($v0) -/* A4A430 80241E70 04600005 */ bltz $v1, .L80241E88 -/* A4A434 80241E74 0040802D */ daddu $s0, $v0, $zero -/* A4A438 80241E78 3C05FD05 */ lui $a1, 0xfd05 -/* A4A43C 80241E7C 34A50F80 */ ori $a1, $a1, 0xf80 -/* A4A440 80241E80 0C0B2026 */ jal evt_set_variable -/* A4A444 80241E84 0000302D */ daddu $a2, $zero, $zero -.L80241E88: -/* A4A448 80241E88 86020018 */ lh $v0, 0x18($s0) -/* A4A44C 80241E8C 2842FEE9 */ slti $v0, $v0, -0x117 -/* A4A450 80241E90 10400005 */ beqz $v0, .L80241EA8 -/* A4A454 80241E94 0220202D */ daddu $a0, $s1, $zero -/* A4A458 80241E98 3C05FD05 */ lui $a1, 0xfd05 -/* A4A45C 80241E9C 34A50F80 */ ori $a1, $a1, 0xf80 -/* A4A460 80241EA0 0C0B2026 */ jal evt_set_variable -/* A4A464 80241EA4 24060001 */ addiu $a2, $zero, 1 -.L80241EA8: -/* A4A468 80241EA8 8FBF0018 */ lw $ra, 0x18($sp) -/* A4A46C 80241EAC 8FB10014 */ lw $s1, 0x14($sp) -/* A4A470 80241EB0 8FB00010 */ lw $s0, 0x10($sp) -/* A4A474 80241EB4 0000102D */ daddu $v0, $zero, $zero -/* A4A478 80241EB8 03E00008 */ jr $ra -/* A4A47C 80241EBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s deleted file mode 100644 index d90e472f1b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4_A4D214 -/* A4D214 802407F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4D218 802407F8 AFB3001C */ sw $s3, 0x1c($sp) -/* A4D21C 802407FC 0080982D */ daddu $s3, $a0, $zero -/* A4D220 80240800 AFBF0020 */ sw $ra, 0x20($sp) -/* A4D224 80240804 AFB20018 */ sw $s2, 0x18($sp) -/* A4D228 80240808 AFB10014 */ sw $s1, 0x14($sp) -/* A4D22C 8024080C AFB00010 */ sw $s0, 0x10($sp) -/* A4D230 80240810 8E720148 */ lw $s2, 0x148($s3) -/* A4D234 80240814 0C00EABB */ jal get_npc_unsafe -/* A4D238 80240818 86440008 */ lh $a0, 8($s2) -/* A4D23C 8024081C 0040802D */ daddu $s0, $v0, $zero -/* A4D240 80240820 8603008E */ lh $v1, 0x8e($s0) -/* A4D244 80240824 3C118024 */ lui $s1, %hi(D_80241CF0_A4E710) -/* A4D248 80240828 26311CF0 */ addiu $s1, $s1, %lo(D_80241CF0_A4E710) -/* A4D24C 8024082C 00031040 */ sll $v0, $v1, 1 -/* A4D250 80240830 00431021 */ addu $v0, $v0, $v1 -/* A4D254 80240834 00021080 */ sll $v0, $v0, 2 -/* A4D258 80240838 3C018024 */ lui $at, %hi(D_80241CF0_A4E710) -/* A4D25C 8024083C 00220821 */ addu $at, $at, $v0 -/* A4D260 80240840 C4201CF0 */ lwc1 $f0, %lo(D_80241CF0_A4E710)($at) -/* A4D264 80240844 00031040 */ sll $v0, $v1, 1 -/* A4D268 80240848 00431021 */ addu $v0, $v0, $v1 -/* A4D26C 8024084C 00021080 */ sll $v0, $v0, 2 -/* A4D270 80240850 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D274 80240854 3C018024 */ lui $at, %hi(D_80241CF4_A4E714) -/* A4D278 80240858 00220821 */ addu $at, $at, $v0 -/* A4D27C 8024085C C4201CF4 */ lwc1 $f0, %lo(D_80241CF4_A4E714)($at) -/* A4D280 80240860 00031040 */ sll $v0, $v1, 1 -/* A4D284 80240864 00431021 */ addu $v0, $v0, $v1 -/* A4D288 80240868 9603008E */ lhu $v1, 0x8e($s0) -/* A4D28C 8024086C 00021080 */ sll $v0, $v0, 2 -/* A4D290 80240870 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D294 80240874 3C018024 */ lui $at, %hi(D_80241CF8_A4E718) -/* A4D298 80240878 00220821 */ addu $at, $at, $v0 -/* A4D29C 8024087C 90221CF8 */ lbu $v0, %lo(D_80241CF8_A4E718)($at) -/* A4D2A0 80240880 24630001 */ addiu $v1, $v1, 1 -/* A4D2A4 80240884 A603008E */ sh $v1, 0x8e($s0) -/* A4D2A8 80240888 00031C00 */ sll $v1, $v1, 0x10 -/* A4D2AC 8024088C 00031C03 */ sra $v1, $v1, 0x10 -/* A4D2B0 80240890 A20200AC */ sb $v0, 0xac($s0) -/* A4D2B4 80240894 24020004 */ addiu $v0, $zero, 4 -/* A4D2B8 80240898 14620007 */ bne $v1, $v0, .L802408B8 -/* A4D2BC 8024089C 00000000 */ nop -/* A4D2C0 802408A0 0C00EAFF */ jal disable_npc_shadow -/* A4D2C4 802408A4 0200202D */ daddu $a0, $s0, $zero -/* A4D2C8 802408A8 8E420000 */ lw $v0, ($s2) -/* A4D2CC 802408AC 3C031F10 */ lui $v1, 0x1f10 -/* A4D2D0 802408B0 00431025 */ or $v0, $v0, $v1 -/* A4D2D4 802408B4 AE420000 */ sw $v0, ($s2) -.L802408B8: -/* A4D2D8 802408B8 8602008E */ lh $v0, 0x8e($s0) -/* A4D2DC 802408BC 00021840 */ sll $v1, $v0, 1 -/* A4D2E0 802408C0 00621821 */ addu $v1, $v1, $v0 -/* A4D2E4 802408C4 00031880 */ sll $v1, $v1, 2 -/* A4D2E8 802408C8 00711821 */ addu $v1, $v1, $s1 -/* A4D2EC 802408CC 90620008 */ lbu $v0, 8($v1) -/* A4D2F0 802408D0 1440000C */ bnez $v0, .L80240904 -/* A4D2F4 802408D4 240200FF */ addiu $v0, $zero, 0xff -/* A4D2F8 802408D8 A20200AC */ sb $v0, 0xac($s0) -/* A4D2FC 802408DC 24020005 */ addiu $v0, $zero, 5 -/* A4D300 802408E0 8E030000 */ lw $v1, ($s0) -/* A4D304 802408E4 3C013F80 */ lui $at, 0x3f80 -/* A4D308 802408E8 44810000 */ mtc1 $at, $f0 -/* A4D30C 802408EC 34630002 */ ori $v1, $v1, 2 -/* A4D310 802408F0 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D314 802408F4 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D318 802408F8 E600005C */ swc1 $f0, 0x5c($s0) -/* A4D31C 802408FC AE030000 */ sw $v1, ($s0) -/* A4D320 80240900 AE620070 */ sw $v0, 0x70($s3) -.L80240904: -/* A4D324 80240904 8FBF0020 */ lw $ra, 0x20($sp) -/* A4D328 80240908 8FB3001C */ lw $s3, 0x1c($sp) -/* A4D32C 8024090C 8FB20018 */ lw $s2, 0x18($sp) -/* A4D330 80240910 8FB10014 */ lw $s1, 0x14($sp) -/* A4D334 80240914 8FB00010 */ lw $s0, 0x10($sp) -/* A4D338 80240918 03E00008 */ jr $ra -/* A4D33C 8024091C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802409C0_A4D3E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802409C0_A4D3E0.s deleted file mode 100644 index b7f6c205a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802409C0_A4D3E0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C0_A4D3E0 -/* A4D3E0 802409C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D3E4 802409C4 AFB10014 */ sw $s1, 0x14($sp) -/* A4D3E8 802409C8 0080882D */ daddu $s1, $a0, $zero -/* A4D3EC 802409CC AFBF0018 */ sw $ra, 0x18($sp) -/* A4D3F0 802409D0 AFB00010 */ sw $s0, 0x10($sp) -/* A4D3F4 802409D4 8E220148 */ lw $v0, 0x148($s1) -/* A4D3F8 802409D8 0C00EABB */ jal get_npc_unsafe -/* A4D3FC 802409DC 84440008 */ lh $a0, 8($v0) -/* A4D400 802409E0 0040802D */ daddu $s0, $v0, $zero -/* A4D404 802409E4 8E050018 */ lw $a1, 0x18($s0) -/* A4D408 802409E8 8E06000C */ lw $a2, 0xc($s0) -/* A4D40C 802409EC 0C00EA95 */ jal npc_move_heading -/* A4D410 802409F0 0200202D */ daddu $a0, $s0, $zero -/* A4D414 802409F4 9602008E */ lhu $v0, 0x8e($s0) -/* A4D418 802409F8 2442FFFF */ addiu $v0, $v0, -1 -/* A4D41C 802409FC A602008E */ sh $v0, 0x8e($s0) -/* A4D420 80240A00 00021400 */ sll $v0, $v0, 0x10 -/* A4D424 80240A04 1C400002 */ bgtz $v0, .L80240A10 -/* A4D428 80240A08 2402000A */ addiu $v0, $zero, 0xa -/* A4D42C 80240A0C AE220070 */ sw $v0, 0x70($s1) -.L80240A10: -/* A4D430 80240A10 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D434 80240A14 8FB10014 */ lw $s1, 0x14($sp) -/* A4D438 80240A18 8FB00010 */ lw $s0, 0x10($sp) -/* A4D43C 80240A1C 03E00008 */ jr $ra -/* A4D440 80240A20 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24_A4D444.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24_A4D444.s deleted file mode 100644 index 806f7e20e5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24_A4D444.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A24_A4D444 -/* A4D444 80240A24 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A4D448 80240A28 AFB30034 */ sw $s3, 0x34($sp) -/* A4D44C 80240A2C 0080982D */ daddu $s3, $a0, $zero -/* A4D450 80240A30 AFBF0038 */ sw $ra, 0x38($sp) -/* A4D454 80240A34 AFB20030 */ sw $s2, 0x30($sp) -/* A4D458 80240A38 AFB1002C */ sw $s1, 0x2c($sp) -/* A4D45C 80240A3C AFB00028 */ sw $s0, 0x28($sp) -/* A4D460 80240A40 8E700148 */ lw $s0, 0x148($s3) -/* A4D464 80240A44 0C00EABB */ jal get_npc_unsafe -/* A4D468 80240A48 86040008 */ lh $a0, 8($s0) -/* A4D46C 80240A4C 0040902D */ daddu $s2, $v0, $zero -/* A4D470 80240A50 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A4D474 80240A54 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A4D478 80240A58 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A4D47C 80240A5C 8E220000 */ lw $v0, ($s1) -/* A4D480 80240A60 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A4D484 80240A64 8C460028 */ lw $a2, 0x28($v0) -/* A4D488 80240A68 0C00A7B5 */ jal dist2D -/* A4D48C 80240A6C 8C470030 */ lw $a3, 0x30($v0) -/* A4D490 80240A70 24020001 */ addiu $v0, $zero, 1 -/* A4D494 80240A74 AE02006C */ sw $v0, 0x6c($s0) -/* A4D498 80240A78 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A4D49C 80240A7C 8E0200CC */ lw $v0, 0xcc($s0) -/* A4D4A0 80240A80 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A4D4A4 80240A84 8E230000 */ lw $v1, ($s1) -/* A4D4A8 80240A88 8C420020 */ lw $v0, 0x20($v0) -/* A4D4AC 80240A8C AE420028 */ sw $v0, 0x28($s2) -/* A4D4B0 80240A90 8C660028 */ lw $a2, 0x28($v1) -/* A4D4B4 80240A94 8C670030 */ lw $a3, 0x30($v1) -/* A4D4B8 80240A98 0C00A720 */ jal atan2 -/* A4D4BC 80240A9C E7A00024 */ swc1 $f0, 0x24($sp) -/* A4D4C0 80240AA0 8E420000 */ lw $v0, ($s2) -/* A4D4C4 80240AA4 3C013DCC */ lui $at, 0x3dcc -/* A4D4C8 80240AA8 3421CCCD */ ori $at, $at, 0xcccd -/* A4D4CC 80240AAC 44811000 */ mtc1 $at, $f2 -/* A4D4D0 80240AB0 2403FFFD */ addiu $v1, $zero, -3 -/* A4D4D4 80240AB4 E640000C */ swc1 $f0, 0xc($s2) -/* A4D4D8 80240AB8 00431024 */ and $v0, $v0, $v1 -/* A4D4DC 80240ABC AE420000 */ sw $v0, ($s2) -/* A4D4E0 80240AC0 30420008 */ andi $v0, $v0, 8 -/* A4D4E4 80240AC4 E6420054 */ swc1 $f2, 0x54($s2) -/* A4D4E8 80240AC8 E6420058 */ swc1 $f2, 0x58($s2) -/* A4D4EC 80240ACC 1440001B */ bnez $v0, .L80240B3C -/* A4D4F0 80240AD0 E642005C */ swc1 $f2, 0x5c($s2) -/* A4D4F4 80240AD4 27A6001C */ addiu $a2, $sp, 0x1c -/* A4D4F8 80240AD8 27A70020 */ addiu $a3, $sp, 0x20 -/* A4D4FC 80240ADC 27A20024 */ addiu $v0, $sp, 0x24 -/* A4D500 80240AE0 C6420038 */ lwc1 $f2, 0x38($s2) -/* A4D504 80240AE4 C640003C */ lwc1 $f0, 0x3c($s2) -/* A4D508 80240AE8 3C014348 */ lui $at, 0x4348 -/* A4D50C 80240AEC 44813000 */ mtc1 $at, $f6 -/* A4D510 80240AF0 46000021 */ cvt.d.s $f0, $f0 -/* A4D514 80240AF4 E7A20018 */ swc1 $f2, 0x18($sp) -/* A4D518 80240AF8 3C014059 */ lui $at, 0x4059 -/* A4D51C 80240AFC 44811800 */ mtc1 $at, $f3 -/* A4D520 80240B00 44801000 */ mtc1 $zero, $f2 -/* A4D524 80240B04 C6440040 */ lwc1 $f4, 0x40($s2) -/* A4D528 80240B08 46220000 */ add.d $f0, $f0, $f2 -/* A4D52C 80240B0C E7A60024 */ swc1 $f6, 0x24($sp) -/* A4D530 80240B10 E7A40020 */ swc1 $f4, 0x20($sp) -/* A4D534 80240B14 46200020 */ cvt.s.d $f0, $f0 -/* A4D538 80240B18 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A4D53C 80240B1C AFA20010 */ sw $v0, 0x10($sp) -/* A4D540 80240B20 8E440080 */ lw $a0, 0x80($s2) -/* A4D544 80240B24 0C0372DF */ jal npc_raycast_down_sides -/* A4D548 80240B28 27A50018 */ addiu $a1, $sp, 0x18 -/* A4D54C 80240B2C 10400004 */ beqz $v0, .L80240B40 -/* A4D550 80240B30 2402000B */ addiu $v0, $zero, 0xb -/* A4D554 80240B34 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A4D558 80240B38 E640003C */ swc1 $f0, 0x3c($s2) -.L80240B3C: -/* A4D55C 80240B3C 2402000B */ addiu $v0, $zero, 0xb -.L80240B40: -/* A4D560 80240B40 A640008E */ sh $zero, 0x8e($s2) -/* A4D564 80240B44 AE620070 */ sw $v0, 0x70($s3) -/* A4D568 80240B48 8FBF0038 */ lw $ra, 0x38($sp) -/* A4D56C 80240B4C 8FB30034 */ lw $s3, 0x34($sp) -/* A4D570 80240B50 8FB20030 */ lw $s2, 0x30($sp) -/* A4D574 80240B54 8FB1002C */ lw $s1, 0x2c($sp) -/* A4D578 80240B58 8FB00028 */ lw $s0, 0x28($sp) -/* A4D57C 80240B5C 03E00008 */ jr $ra -/* A4D580 80240B60 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s deleted file mode 100644 index 8b4f34157f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242560_A4EF80 -.double 0.1 - -dlabel D_80242568_A4EF88 -.double 0.4 - -.section .text - -glabel func_80240B64_A4D584 -/* A4D584 80240B64 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A4D588 80240B68 AFB20028 */ sw $s2, 0x28($sp) -/* A4D58C 80240B6C 0080902D */ daddu $s2, $a0, $zero -/* A4D590 80240B70 AFBF002C */ sw $ra, 0x2c($sp) -/* A4D594 80240B74 AFB10024 */ sw $s1, 0x24($sp) -/* A4D598 80240B78 AFB00020 */ sw $s0, 0x20($sp) -/* A4D59C 80240B7C 8E510148 */ lw $s1, 0x148($s2) -/* A4D5A0 80240B80 0C00EABB */ jal get_npc_unsafe -/* A4D5A4 80240B84 86240008 */ lh $a0, 8($s1) -/* A4D5A8 80240B88 8E23006C */ lw $v1, 0x6c($s1) -/* A4D5AC 80240B8C 14600006 */ bnez $v1, .L80240BA8 -/* A4D5B0 80240B90 0040802D */ daddu $s0, $v0, $zero -/* A4D5B4 80240B94 8603008E */ lh $v1, 0x8e($s0) -/* A4D5B8 80240B98 00031100 */ sll $v0, $v1, 4 -/* A4D5BC 80240B9C 00431023 */ subu $v0, $v0, $v1 -/* A4D5C0 80240BA0 080902EE */ j .L80240BB8 -/* A4D5C4 80240BA4 24430082 */ addiu $v1, $v0, 0x82 -.L80240BA8: -/* A4D5C8 80240BA8 8603008E */ lh $v1, 0x8e($s0) -/* A4D5CC 80240BAC 00031100 */ sll $v0, $v1, 4 -/* A4D5D0 80240BB0 00431023 */ subu $v0, $v0, $v1 -/* A4D5D4 80240BB4 2443001E */ addiu $v1, $v0, 0x1e -.L80240BB8: -/* A4D5D8 80240BB8 00031400 */ sll $v0, $v1, 0x10 -/* A4D5DC 80240BBC 00021403 */ sra $v0, $v0, 0x10 -/* A4D5E0 80240BC0 28420100 */ slti $v0, $v0, 0x100 -/* A4D5E4 80240BC4 50400001 */ beql $v0, $zero, .L80240BCC -/* A4D5E8 80240BC8 240300FF */ addiu $v1, $zero, 0xff -.L80240BCC: -/* A4D5EC 80240BCC 8602008E */ lh $v0, 0x8e($s0) -/* A4D5F0 80240BD0 3C018024 */ lui $at, %hi(D_80242560_A4EF80) -/* A4D5F4 80240BD4 D4222560 */ ldc1 $f2, %lo(D_80242560_A4EF80)($at) -/* A4D5F8 80240BD8 44820000 */ mtc1 $v0, $f0 -/* A4D5FC 80240BDC 00000000 */ nop -/* A4D600 80240BE0 46800020 */ cvt.s.w $f0, $f0 -/* A4D604 80240BE4 46000021 */ cvt.d.s $f0, $f0 -/* A4D608 80240BE8 46220002 */ mul.d $f0, $f0, $f2 -/* A4D60C 80240BEC 00000000 */ nop -/* A4D610 80240BF0 3C018024 */ lui $at, %hi(D_80242568_A4EF88) -/* A4D614 80240BF4 D4222568 */ ldc1 $f2, %lo(D_80242568_A4EF88)($at) -/* A4D618 80240BF8 46220000 */ add.d $f0, $f0, $f2 -/* A4D61C 80240BFC A20300AC */ sb $v1, 0xac($s0) -/* A4D620 80240C00 3C013FF0 */ lui $at, 0x3ff0 -/* A4D624 80240C04 44811800 */ mtc1 $at, $f3 -/* A4D628 80240C08 44801000 */ mtc1 $zero, $f2 -/* A4D62C 80240C0C 46200020 */ cvt.s.d $f0, $f0 -/* A4D630 80240C10 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D634 80240C14 46000021 */ cvt.d.s $f0, $f0 -/* A4D638 80240C18 4620103C */ c.lt.d $f2, $f0 -/* A4D63C 80240C1C 00000000 */ nop -/* A4D640 80240C20 45000005 */ bc1f .L80240C38 -/* A4D644 80240C24 24030005 */ addiu $v1, $zero, 5 -/* A4D648 80240C28 3C013F80 */ lui $at, 0x3f80 -/* A4D64C 80240C2C 44810000 */ mtc1 $at, $f0 -/* A4D650 80240C30 00000000 */ nop -/* A4D654 80240C34 E6000054 */ swc1 $f0, 0x54($s0) -.L80240C38: -/* A4D658 80240C38 C6000054 */ lwc1 $f0, 0x54($s0) -/* A4D65C 80240C3C 9602008E */ lhu $v0, 0x8e($s0) -/* A4D660 80240C40 46000086 */ mov.s $f2, $f0 -/* A4D664 80240C44 24420001 */ addiu $v0, $v0, 1 -/* A4D668 80240C48 A602008E */ sh $v0, 0x8e($s0) -/* A4D66C 80240C4C 00021400 */ sll $v0, $v0, 0x10 -/* A4D670 80240C50 00021403 */ sra $v0, $v0, 0x10 -/* A4D674 80240C54 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D678 80240C58 14430008 */ bne $v0, $v1, .L80240C7C -/* A4D67C 80240C5C E602005C */ swc1 $f2, 0x5c($s0) -/* A4D680 80240C60 0C00EAE8 */ jal enable_npc_shadow -/* A4D684 80240C64 0200202D */ daddu $a0, $s0, $zero -/* A4D688 80240C68 3C03E0EF */ lui $v1, 0xe0ef -/* A4D68C 80240C6C 8E220000 */ lw $v0, ($s1) -/* A4D690 80240C70 3463FFFF */ ori $v1, $v1, 0xffff -/* A4D694 80240C74 00431024 */ and $v0, $v0, $v1 -/* A4D698 80240C78 AE220000 */ sw $v0, ($s1) -.L80240C7C: -/* A4D69C 80240C7C 8E22006C */ lw $v0, 0x6c($s1) -/* A4D6A0 80240C80 1440000E */ bnez $v0, .L80240CBC -/* A4D6A4 80240C84 00000000 */ nop -/* A4D6A8 80240C88 8602008E */ lh $v0, 0x8e($s0) -/* A4D6AC 80240C8C 28420014 */ slti $v0, $v0, 0x14 -/* A4D6B0 80240C90 14400017 */ bnez $v0, .L80240CF0 -/* A4D6B4 80240C94 0000282D */ daddu $a1, $zero, $zero -/* A4D6B8 80240C98 00A0302D */ daddu $a2, $a1, $zero -/* A4D6BC 80240C9C AFA00010 */ sw $zero, 0x10($sp) -/* A4D6C0 80240CA0 AFA00014 */ sw $zero, 0x14($sp) -/* A4D6C4 80240CA4 AFA00018 */ sw $zero, 0x18($sp) -/* A4D6C8 80240CA8 8E040024 */ lw $a0, 0x24($s0) -/* A4D6CC 80240CAC 0C0B7A25 */ jal func_802DE894 -/* A4D6D0 80240CB0 00A0382D */ daddu $a3, $a1, $zero -/* A4D6D4 80240CB4 08090333 */ j .L80240CCC -/* A4D6D8 80240CB8 00000000 */ nop -.L80240CBC: -/* A4D6DC 80240CBC 8602008E */ lh $v0, 0x8e($s0) -/* A4D6E0 80240CC0 2842000A */ slti $v0, $v0, 0xa -/* A4D6E4 80240CC4 1440000A */ bnez $v0, .L80240CF0 -/* A4D6E8 80240CC8 00000000 */ nop -.L80240CCC: -/* A4D6EC 80240CCC 3C013F80 */ lui $at, 0x3f80 -/* A4D6F0 80240CD0 44810000 */ mtc1 $at, $f0 -/* A4D6F4 80240CD4 240200FF */ addiu $v0, $zero, 0xff -/* A4D6F8 80240CD8 A20200AC */ sb $v0, 0xac($s0) -/* A4D6FC 80240CDC 24020014 */ addiu $v0, $zero, 0x14 -/* A4D700 80240CE0 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D704 80240CE4 E6000058 */ swc1 $f0, 0x58($s0) -/* A4D708 80240CE8 E600005C */ swc1 $f0, 0x5c($s0) -/* A4D70C 80240CEC AE420070 */ sw $v0, 0x70($s2) -.L80240CF0: -/* A4D710 80240CF0 8FBF002C */ lw $ra, 0x2c($sp) -/* A4D714 80240CF4 8FB20028 */ lw $s2, 0x28($sp) -/* A4D718 80240CF8 8FB10024 */ lw $s1, 0x24($sp) -/* A4D71C 80240CFC 8FB00020 */ lw $s0, 0x20($sp) -/* A4D720 80240D00 03E00008 */ jr $ra -/* A4D724 80240D04 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D08_A4D728.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D08_A4D728.s deleted file mode 100644 index bc43655130..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D08_A4D728.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_A4D728 -/* A4D728 80240D08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4D72C 80240D0C AFB00010 */ sw $s0, 0x10($sp) -/* A4D730 80240D10 0080802D */ daddu $s0, $a0, $zero -/* A4D734 80240D14 AFBF0014 */ sw $ra, 0x14($sp) -/* A4D738 80240D18 8E020148 */ lw $v0, 0x148($s0) -/* A4D73C 80240D1C 0C00EABB */ jal get_npc_unsafe -/* A4D740 80240D20 84440008 */ lh $a0, 8($v0) -/* A4D744 80240D24 24030028 */ addiu $v1, $zero, 0x28 -/* A4D748 80240D28 A443008E */ sh $v1, 0x8e($v0) -/* A4D74C 80240D2C 24020015 */ addiu $v0, $zero, 0x15 -/* A4D750 80240D30 AE020070 */ sw $v0, 0x70($s0) -/* A4D754 80240D34 8FBF0014 */ lw $ra, 0x14($sp) -/* A4D758 80240D38 8FB00010 */ lw $s0, 0x10($sp) -/* A4D75C 80240D3C 03E00008 */ jr $ra -/* A4D760 80240D40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s deleted file mode 100644 index 8b3698bfdd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D44_A4D764 -/* A4D764 80240D44 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A4D768 80240D48 AFB40048 */ sw $s4, 0x48($sp) -/* A4D76C 80240D4C 0080A02D */ daddu $s4, $a0, $zero -/* A4D770 80240D50 AFBF004C */ sw $ra, 0x4c($sp) -/* A4D774 80240D54 AFB30044 */ sw $s3, 0x44($sp) -/* A4D778 80240D58 AFB20040 */ sw $s2, 0x40($sp) -/* A4D77C 80240D5C AFB1003C */ sw $s1, 0x3c($sp) -/* A4D780 80240D60 AFB00038 */ sw $s0, 0x38($sp) -/* A4D784 80240D64 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A4D788 80240D68 8E910148 */ lw $s1, 0x148($s4) -/* A4D78C 80240D6C 00A0902D */ daddu $s2, $a1, $zero -/* A4D790 80240D70 86240008 */ lh $a0, 8($s1) -/* A4D794 80240D74 0C00EABB */ jal get_npc_unsafe -/* A4D798 80240D78 00C0982D */ daddu $s3, $a2, $zero -/* A4D79C 80240D7C 0040802D */ daddu $s0, $v0, $zero -/* A4D7A0 80240D80 9602008E */ lhu $v0, 0x8e($s0) -/* A4D7A4 80240D84 2442FFFF */ addiu $v0, $v0, -1 -/* A4D7A8 80240D88 A602008E */ sh $v0, 0x8e($s0) -/* A4D7AC 80240D8C 00021400 */ sll $v0, $v0, 0x10 -/* A4D7B0 80240D90 14400021 */ bnez $v0, .L80240E18 -/* A4D7B4 80240D94 0280202D */ daddu $a0, $s4, $zero -/* A4D7B8 80240D98 24040002 */ addiu $a0, $zero, 2 -/* A4D7BC 80240D9C 0200282D */ daddu $a1, $s0, $zero -/* A4D7C0 80240DA0 0000302D */ daddu $a2, $zero, $zero -/* A4D7C4 80240DA4 8E2200CC */ lw $v0, 0xcc($s1) -/* A4D7C8 80240DA8 3C013F80 */ lui $at, 0x3f80 -/* A4D7CC 80240DAC 44810000 */ mtc1 $at, $f0 -/* A4D7D0 80240DB0 3C014000 */ lui $at, 0x4000 -/* A4D7D4 80240DB4 44811000 */ mtc1 $at, $f2 -/* A4D7D8 80240DB8 8C430000 */ lw $v1, ($v0) -/* A4D7DC 80240DBC 860200A8 */ lh $v0, 0xa8($s0) -/* A4D7E0 80240DC0 3C01C1A0 */ lui $at, 0xc1a0 -/* A4D7E4 80240DC4 44812000 */ mtc1 $at, $f4 -/* A4D7E8 80240DC8 44824000 */ mtc1 $v0, $f8 -/* A4D7EC 80240DCC 00000000 */ nop -/* A4D7F0 80240DD0 46804220 */ cvt.s.w $f8, $f8 -/* A4D7F4 80240DD4 44074000 */ mfc1 $a3, $f8 -/* A4D7F8 80240DD8 2402000C */ addiu $v0, $zero, 0xc -/* A4D7FC 80240DDC AE030028 */ sw $v1, 0x28($s0) -/* A4D800 80240DE0 AFA2001C */ sw $v0, 0x1c($sp) -/* A4D804 80240DE4 27A20028 */ addiu $v0, $sp, 0x28 -/* A4D808 80240DE8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A4D80C 80240DEC E7A20014 */ swc1 $f2, 0x14($sp) -/* A4D810 80240DF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4D814 80240DF4 0C01BFA4 */ jal fx_emote -/* A4D818 80240DF8 AFA20020 */ sw $v0, 0x20($sp) -/* A4D81C 80240DFC 8E2200CC */ lw $v0, 0xcc($s1) -/* A4D820 80240E00 8C430000 */ lw $v1, ($v0) -/* A4D824 80240E04 2402000F */ addiu $v0, $zero, 0xf -/* A4D828 80240E08 A602008E */ sh $v0, 0x8e($s0) -/* A4D82C 80240E0C AE030028 */ sw $v1, 0x28($s0) -/* A4D830 80240E10 080903B8 */ j .L80240EE0 -/* A4D834 80240E14 AE800070 */ sw $zero, 0x70($s4) -.L80240E18: -/* A4D838 80240E18 8E450024 */ lw $a1, 0x24($s2) -/* A4D83C 80240E1C 8E460028 */ lw $a2, 0x28($s2) -/* A4D840 80240E20 0C090028 */ jal kpa_08_UnkNpcAIFunc47 -/* A4D844 80240E24 0260382D */ daddu $a3, $s3, $zero -/* A4D848 80240E28 24030001 */ addiu $v1, $zero, 1 -/* A4D84C 80240E2C 1443002C */ bne $v0, $v1, .L80240EE0 -/* A4D850 80240E30 0200202D */ daddu $a0, $s0, $zero -/* A4D854 80240E34 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A4D858 80240E38 0C012530 */ jal ai_enemy_play_sound -/* A4D85C 80240E3C 0000302D */ daddu $a2, $zero, $zero -/* A4D860 80240E40 27A4002C */ addiu $a0, $sp, 0x2c -/* A4D864 80240E44 27A50030 */ addiu $a1, $sp, 0x30 -/* A4D868 80240E48 3C064188 */ lui $a2, 0x4188 -/* A4D86C 80240E4C C6020034 */ lwc1 $f2, 0x34($s0) -/* A4D870 80240E50 3C014387 */ lui $at, 0x4387 -/* A4D874 80240E54 44810000 */ mtc1 $at, $f0 -/* A4D878 80240E58 8E2200CC */ lw $v0, 0xcc($s1) -/* A4D87C 80240E5C C614003C */ lwc1 $f20, 0x3c($s0) -/* A4D880 80240E60 46020001 */ sub.s $f0, $f0, $f2 -/* A4D884 80240E64 3C014200 */ lui $at, 0x4200 -/* A4D888 80240E68 44812000 */ mtc1 $at, $f4 -/* A4D88C 80240E6C C6060038 */ lwc1 $f6, 0x38($s0) -/* A4D890 80240E70 4604A500 */ add.s $f20, $f20, $f4 -/* A4D894 80240E74 3C013F80 */ lui $at, 0x3f80 -/* A4D898 80240E78 44811000 */ mtc1 $at, $f2 -/* A4D89C 80240E7C 44070000 */ mfc1 $a3, $f0 -/* A4D8A0 80240E80 C6000040 */ lwc1 $f0, 0x40($s0) -/* A4D8A4 80240E84 8C420020 */ lw $v0, 0x20($v0) -/* A4D8A8 80240E88 46020000 */ add.s $f0, $f0, $f2 -/* A4D8AC 80240E8C E7A6002C */ swc1 $f6, 0x2c($sp) -/* A4D8B0 80240E90 AE020028 */ sw $v0, 0x28($s0) -/* A4D8B4 80240E94 0C00A7E7 */ jal add_vec2D_polar -/* A4D8B8 80240E98 E7A00030 */ swc1 $f0, 0x30($sp) -/* A4D8BC 80240E9C 0000202D */ daddu $a0, $zero, $zero -/* A4D8C0 80240EA0 4406A000 */ mfc1 $a2, $f20 -/* A4D8C4 80240EA4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A4D8C8 80240EA8 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A4D8CC 80240EAC 44050000 */ mfc1 $a1, $f0 -/* A4D8D0 80240EB0 44071000 */ mfc1 $a3, $f2 -/* A4D8D4 80240EB4 3C013DCC */ lui $at, 0x3dcc -/* A4D8D8 80240EB8 3421CCCD */ ori $at, $at, 0xcccd -/* A4D8DC 80240EBC 44810000 */ mtc1 $at, $f0 -/* A4D8E0 80240EC0 2402000D */ addiu $v0, $zero, 0xd -/* A4D8E4 80240EC4 AFA20014 */ sw $v0, 0x14($sp) -/* A4D8E8 80240EC8 0C01BFEC */ jal fx_gather_energy_pink -/* A4D8EC 80240ECC E7A00010 */ swc1 $f0, 0x10($sp) -/* A4D8F0 80240ED0 2402000F */ addiu $v0, $zero, 0xf -/* A4D8F4 80240ED4 A602008E */ sh $v0, 0x8e($s0) -/* A4D8F8 80240ED8 24020016 */ addiu $v0, $zero, 0x16 -/* A4D8FC 80240EDC AE820070 */ sw $v0, 0x70($s4) -.L80240EE0: -/* A4D900 80240EE0 8FBF004C */ lw $ra, 0x4c($sp) -/* A4D904 80240EE4 8FB40048 */ lw $s4, 0x48($sp) -/* A4D908 80240EE8 8FB30044 */ lw $s3, 0x44($sp) -/* A4D90C 80240EEC 8FB20040 */ lw $s2, 0x40($sp) -/* A4D910 80240EF0 8FB1003C */ lw $s1, 0x3c($sp) -/* A4D914 80240EF4 8FB00038 */ lw $s0, 0x38($sp) -/* A4D918 80240EF8 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A4D91C 80240EFC 03E00008 */ jr $ra -/* A4D920 80240F00 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s deleted file mode 100644 index 1348046e86..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F04_A4D924 -/* A4D924 80240F04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D928 80240F08 AFB10014 */ sw $s1, 0x14($sp) -/* A4D92C 80240F0C 0080882D */ daddu $s1, $a0, $zero -/* A4D930 80240F10 AFBF0018 */ sw $ra, 0x18($sp) -/* A4D934 80240F14 AFB00010 */ sw $s0, 0x10($sp) -/* A4D938 80240F18 8E300148 */ lw $s0, 0x148($s1) -/* A4D93C 80240F1C 0C00EABB */ jal get_npc_unsafe -/* A4D940 80240F20 86040008 */ lh $a0, 8($s0) -/* A4D944 80240F24 0040202D */ daddu $a0, $v0, $zero -/* A4D948 80240F28 9482008E */ lhu $v0, 0x8e($a0) -/* A4D94C 80240F2C 2442FFFF */ addiu $v0, $v0, -1 -/* A4D950 80240F30 A482008E */ sh $v0, 0x8e($a0) -/* A4D954 80240F34 00021400 */ sll $v0, $v0, 0x10 -/* A4D958 80240F38 1C400008 */ bgtz $v0, .L80240F5C -/* A4D95C 80240F3C 00000000 */ nop -/* A4D960 80240F40 8E0200CC */ lw $v0, 0xcc($s0) -/* A4D964 80240F44 8C430024 */ lw $v1, 0x24($v0) -/* A4D968 80240F48 24020009 */ addiu $v0, $zero, 9 -/* A4D96C 80240F4C A482008E */ sh $v0, 0x8e($a0) -/* A4D970 80240F50 24020017 */ addiu $v0, $zero, 0x17 -/* A4D974 80240F54 AC830028 */ sw $v1, 0x28($a0) -/* A4D978 80240F58 AE220070 */ sw $v0, 0x70($s1) -.L80240F5C: -/* A4D97C 80240F5C 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D980 80240F60 8FB10014 */ lw $s1, 0x14($sp) -/* A4D984 80240F64 8FB00010 */ lw $s0, 0x10($sp) -/* A4D988 80240F68 03E00008 */ jr $ra -/* A4D98C 80240F6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s deleted file mode 100644 index 5e2a41bfce..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F70_A4D990 -/* A4D990 80240F70 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A4D994 80240F74 AFB3003C */ sw $s3, 0x3c($sp) -/* A4D998 80240F78 0080982D */ daddu $s3, $a0, $zero -/* A4D99C 80240F7C AFBF0044 */ sw $ra, 0x44($sp) -/* A4D9A0 80240F80 AFB40040 */ sw $s4, 0x40($sp) -/* A4D9A4 80240F84 AFB20038 */ sw $s2, 0x38($sp) -/* A4D9A8 80240F88 AFB10034 */ sw $s1, 0x34($sp) -/* A4D9AC 80240F8C AFB00030 */ sw $s0, 0x30($sp) -/* A4D9B0 80240F90 8E720148 */ lw $s2, 0x148($s3) -/* A4D9B4 80240F94 00A0882D */ daddu $s1, $a1, $zero -/* A4D9B8 80240F98 86440008 */ lh $a0, 8($s2) -/* A4D9BC 80240F9C 0C00EABB */ jal get_npc_unsafe -/* A4D9C0 80240FA0 00C0A02D */ daddu $s4, $a2, $zero -/* A4D9C4 80240FA4 0040802D */ daddu $s0, $v0, $zero -/* A4D9C8 80240FA8 9602008E */ lhu $v0, 0x8e($s0) -/* A4D9CC 80240FAC 2442FFFF */ addiu $v0, $v0, -1 -/* A4D9D0 80240FB0 A602008E */ sh $v0, 0x8e($s0) -/* A4D9D4 80240FB4 00021400 */ sll $v0, $v0, 0x10 -/* A4D9D8 80240FB8 1C400032 */ bgtz $v0, .L80241084 -/* A4D9DC 80240FBC 00000000 */ nop -/* A4D9E0 80240FC0 0260202D */ daddu $a0, $s3, $zero -/* A4D9E4 80240FC4 8E250024 */ lw $a1, 0x24($s1) -/* A4D9E8 80240FC8 8E260028 */ lw $a2, 0x28($s1) -/* A4D9EC 80240FCC 0C090028 */ jal kpa_08_UnkNpcAIFunc47 -/* A4D9F0 80240FD0 0280382D */ daddu $a3, $s4, $zero -/* A4D9F4 80240FD4 0040882D */ daddu $s1, $v0, $zero -/* A4D9F8 80240FD8 24020001 */ addiu $v0, $zero, 1 -/* A4D9FC 80240FDC 1222001D */ beq $s1, $v0, .L80241054 -/* A4DA00 80240FE0 0200282D */ daddu $a1, $s0, $zero -/* A4DA04 80240FE4 24040002 */ addiu $a0, $zero, 2 -/* A4DA08 80240FE8 0000302D */ daddu $a2, $zero, $zero -/* A4DA0C 80240FEC 860300A8 */ lh $v1, 0xa8($s0) -/* A4DA10 80240FF0 3C013F80 */ lui $at, 0x3f80 -/* A4DA14 80240FF4 44810000 */ mtc1 $at, $f0 -/* A4DA18 80240FF8 3C014000 */ lui $at, 0x4000 -/* A4DA1C 80240FFC 44811000 */ mtc1 $at, $f2 -/* A4DA20 80241000 3C01C1A0 */ lui $at, 0xc1a0 -/* A4DA24 80241004 44812000 */ mtc1 $at, $f4 -/* A4DA28 80241008 2402000C */ addiu $v0, $zero, 0xc -/* A4DA2C 8024100C AFA2001C */ sw $v0, 0x1c($sp) -/* A4DA30 80241010 44833000 */ mtc1 $v1, $f6 -/* A4DA34 80241014 00000000 */ nop -/* A4DA38 80241018 468031A0 */ cvt.s.w $f6, $f6 -/* A4DA3C 8024101C 44073000 */ mfc1 $a3, $f6 -/* A4DA40 80241020 27A20028 */ addiu $v0, $sp, 0x28 -/* A4DA44 80241024 AFA20020 */ sw $v0, 0x20($sp) -/* A4DA48 80241028 E7A00010 */ swc1 $f0, 0x10($sp) -/* A4DA4C 8024102C E7A20014 */ swc1 $f2, 0x14($sp) -/* A4DA50 80241030 0C01BFA4 */ jal fx_emote -/* A4DA54 80241034 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4DA58 80241038 8E4200CC */ lw $v0, 0xcc($s2) -/* A4DA5C 8024103C 8C430000 */ lw $v1, ($v0) -/* A4DA60 80241040 2402000F */ addiu $v0, $zero, 0xf -/* A4DA64 80241044 A602008E */ sh $v0, 0x8e($s0) -/* A4DA68 80241048 AE030028 */ sw $v1, 0x28($s0) -/* A4DA6C 8024104C 08090421 */ j .L80241084 -/* A4DA70 80241050 AE600070 */ sw $zero, 0x70($s3) -.L80241054: -/* A4DA74 80241054 0200202D */ daddu $a0, $s0, $zero -/* A4DA78 80241058 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A4DA7C 8024105C 0C012530 */ jal ai_enemy_play_sound -/* A4DA80 80241060 0000302D */ daddu $a2, $zero, $zero -/* A4DA84 80241064 86440008 */ lh $a0, 8($s2) -/* A4DA88 80241068 0C00FB3A */ jal get_enemy -/* A4DA8C 8024106C 24840001 */ addiu $a0, $a0, 1 -/* A4DA90 80241070 AC51006C */ sw $s1, 0x6c($v0) -/* A4DA94 80241074 24020014 */ addiu $v0, $zero, 0x14 -/* A4DA98 80241078 A602008E */ sh $v0, 0x8e($s0) -/* A4DA9C 8024107C 24020018 */ addiu $v0, $zero, 0x18 -/* A4DAA0 80241080 AE620070 */ sw $v0, 0x70($s3) -.L80241084: -/* A4DAA4 80241084 8FBF0044 */ lw $ra, 0x44($sp) -/* A4DAA8 80241088 8FB40040 */ lw $s4, 0x40($sp) -/* A4DAAC 8024108C 8FB3003C */ lw $s3, 0x3c($sp) -/* A4DAB0 80241090 8FB20038 */ lw $s2, 0x38($sp) -/* A4DAB4 80241094 8FB10034 */ lw $s1, 0x34($sp) -/* A4DAB8 80241098 8FB00030 */ lw $s0, 0x30($sp) -/* A4DABC 8024109C 03E00008 */ jr $ra -/* A4DAC0 802410A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s deleted file mode 100644 index f0d511d1d5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802410A4_A4DAC4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A4_A4DAC4 -/* A4DAC4 802410A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4DAC8 802410A8 AFB10014 */ sw $s1, 0x14($sp) -/* A4DACC 802410AC 0080882D */ daddu $s1, $a0, $zero -/* A4DAD0 802410B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A4DAD4 802410B4 AFB00010 */ sw $s0, 0x10($sp) -/* A4DAD8 802410B8 8E300148 */ lw $s0, 0x148($s1) -/* A4DADC 802410BC 0C00EABB */ jal get_npc_unsafe -/* A4DAE0 802410C0 86040008 */ lh $a0, 8($s0) -/* A4DAE4 802410C4 0040202D */ daddu $a0, $v0, $zero -/* A4DAE8 802410C8 9482008E */ lhu $v0, 0x8e($a0) -/* A4DAEC 802410CC 2442FFFF */ addiu $v0, $v0, -1 -/* A4DAF0 802410D0 A482008E */ sh $v0, 0x8e($a0) -/* A4DAF4 802410D4 00021400 */ sll $v0, $v0, 0x10 -/* A4DAF8 802410D8 1C400007 */ bgtz $v0, .L802410F8 -/* A4DAFC 802410DC 00000000 */ nop -/* A4DB00 802410E0 8E0200CC */ lw $v0, 0xcc($s0) -/* A4DB04 802410E4 8C430000 */ lw $v1, ($v0) -/* A4DB08 802410E8 24020003 */ addiu $v0, $zero, 3 -/* A4DB0C 802410EC A482008E */ sh $v0, 0x8e($a0) -/* A4DB10 802410F0 AC830028 */ sw $v1, 0x28($a0) -/* A4DB14 802410F4 AE200070 */ sw $zero, 0x70($s1) -.L802410F8: -/* A4DB18 802410F8 8FBF0018 */ lw $ra, 0x18($sp) -/* A4DB1C 802410FC 8FB10014 */ lw $s1, 0x14($sp) -/* A4DB20 80241100 8FB00010 */ lw $s0, 0x10($sp) -/* A4DB24 80241104 03E00008 */ jr $ra -/* A4DB28 80241108 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s deleted file mode 100644 index 3ac490204d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s +++ /dev/null @@ -1,181 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242570_A4EF90 -.word .L80241258_A4DC78, .L80241278_A4DC98, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L80241290_A4DCB0, .L802412A0_A4DCC0, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L802412B8_A4DCD8, .L802412C8_A4DCE8, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L80241350_A4DD70, .L802412E0_A4DD00, .L802412F8_A4DD18, .L80241310_A4DD30, .L80241328_A4DD48, .L80241340_A4DD60, 0, 0, 0 - -.section .text - -glabel func_8024110C_A4DB2C -/* A4DB2C 8024110C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4DB30 80241110 AFB50044 */ sw $s5, 0x44($sp) -/* A4DB34 80241114 0080A82D */ daddu $s5, $a0, $zero -/* A4DB38 80241118 AFBF0048 */ sw $ra, 0x48($sp) -/* A4DB3C 8024111C AFB40040 */ sw $s4, 0x40($sp) -/* A4DB40 80241120 AFB3003C */ sw $s3, 0x3c($sp) -/* A4DB44 80241124 AFB20038 */ sw $s2, 0x38($sp) -/* A4DB48 80241128 AFB10034 */ sw $s1, 0x34($sp) -/* A4DB4C 8024112C AFB00030 */ sw $s0, 0x30($sp) -/* A4DB50 80241130 8EB10148 */ lw $s1, 0x148($s5) -/* A4DB54 80241134 86240008 */ lh $a0, 8($s1) -/* A4DB58 80241138 0C00EABB */ jal get_npc_unsafe -/* A4DB5C 8024113C 00A0802D */ daddu $s0, $a1, $zero -/* A4DB60 80241140 8EA3000C */ lw $v1, 0xc($s5) -/* A4DB64 80241144 02A0202D */ daddu $a0, $s5, $zero -/* A4DB68 80241148 8C650000 */ lw $a1, ($v1) -/* A4DB6C 8024114C 0C0B1EAF */ jal evt_get_variable -/* A4DB70 80241150 0040902D */ daddu $s2, $v0, $zero -/* A4DB74 80241154 AFA00010 */ sw $zero, 0x10($sp) -/* A4DB78 80241158 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DB7C 8024115C 8C630030 */ lw $v1, 0x30($v1) -/* A4DB80 80241160 AFA30014 */ sw $v1, 0x14($sp) -/* A4DB84 80241164 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DB88 80241168 8C63001C */ lw $v1, 0x1c($v1) -/* A4DB8C 8024116C AFA30018 */ sw $v1, 0x18($sp) -/* A4DB90 80241170 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DB94 80241174 8C630024 */ lw $v1, 0x24($v1) -/* A4DB98 80241178 AFA3001C */ sw $v1, 0x1c($sp) -/* A4DB9C 8024117C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DBA0 80241180 8C630028 */ lw $v1, 0x28($v1) -/* A4DBA4 80241184 27B40010 */ addiu $s4, $sp, 0x10 -/* A4DBA8 80241188 AFA30020 */ sw $v1, 0x20($sp) -/* A4DBAC 8024118C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DBB0 80241190 3C0142C8 */ lui $at, 0x42c8 -/* A4DBB4 80241194 44810000 */ mtc1 $at, $f0 -/* A4DBB8 80241198 8C63002C */ lw $v1, 0x2c($v1) -/* A4DBBC 8024119C 0040982D */ daddu $s3, $v0, $zero -/* A4DBC0 802411A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* A4DBC4 802411A4 A7A0002C */ sh $zero, 0x2c($sp) -/* A4DBC8 802411A8 16000005 */ bnez $s0, .L802411C0 -/* A4DBCC 802411AC AFA30024 */ sw $v1, 0x24($sp) -/* A4DBD0 802411B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A4DBD4 802411B4 30420004 */ andi $v0, $v0, 4 -/* A4DBD8 802411B8 1040001E */ beqz $v0, .L80241234 -/* A4DBDC 802411BC 00000000 */ nop -.L802411C0: -/* A4DBE0 802411C0 8E430000 */ lw $v1, ($s2) -/* A4DBE4 802411C4 2402F7FF */ addiu $v0, $zero, -0x801 -/* A4DBE8 802411C8 00621824 */ and $v1, $v1, $v0 -/* A4DBEC 802411CC 8E2200CC */ lw $v0, 0xcc($s1) -/* A4DBF0 802411D0 3C040020 */ lui $a0, 0x20 -/* A4DBF4 802411D4 8C420000 */ lw $v0, ($v0) -/* A4DBF8 802411D8 00641825 */ or $v1, $v1, $a0 -/* A4DBFC 802411DC AE430000 */ sw $v1, ($s2) -/* A4DC00 802411E0 AE420028 */ sw $v0, 0x28($s2) -/* A4DC04 802411E4 8E220000 */ lw $v0, ($s1) -/* A4DC08 802411E8 00441025 */ or $v0, $v0, $a0 -/* A4DC0C 802411EC AE220000 */ sw $v0, ($s1) -/* A4DC10 802411F0 A640008E */ sh $zero, 0x8e($s2) -/* A4DC14 802411F4 8E2300B0 */ lw $v1, 0xb0($s1) -/* A4DC18 802411F8 30620004 */ andi $v0, $v1, 4 -/* A4DC1C 802411FC 1040000C */ beqz $v0, .L80241230 -/* A4DC20 80241200 2402FFFB */ addiu $v0, $zero, -5 -/* A4DC24 80241204 3C013F80 */ lui $at, 0x3f80 -/* A4DC28 80241208 44810000 */ mtc1 $at, $f0 -/* A4DC2C 8024120C 00621024 */ and $v0, $v1, $v0 -/* A4DC30 80241210 AE2200B0 */ sw $v0, 0xb0($s1) -/* A4DC34 80241214 240200FF */ addiu $v0, $zero, 0xff -/* A4DC38 80241218 A24200AC */ sb $v0, 0xac($s2) -/* A4DC3C 8024121C 24020014 */ addiu $v0, $zero, 0x14 -/* A4DC40 80241220 A642008E */ sh $v0, 0x8e($s2) -/* A4DC44 80241224 E6400054 */ swc1 $f0, 0x54($s2) -/* A4DC48 80241228 E6400058 */ swc1 $f0, 0x58($s2) -/* A4DC4C 8024122C E640005C */ swc1 $f0, 0x5c($s2) -.L80241230: -/* A4DC50 80241230 AEA00070 */ sw $zero, 0x70($s5) -.L80241234: -/* A4DC54 80241234 8EA30070 */ lw $v1, 0x70($s5) -/* A4DC58 80241238 2C620019 */ sltiu $v0, $v1, 0x19 -/* A4DC5C 8024123C 10400044 */ beqz $v0, .L80241350_A4DD70 -/* A4DC60 80241240 00031080 */ sll $v0, $v1, 2 -/* A4DC64 80241244 3C018024 */ lui $at, %hi(jtbl_80242570_A4EF90) -/* A4DC68 80241248 00220821 */ addu $at, $at, $v0 -/* A4DC6C 8024124C 8C222570 */ lw $v0, %lo(jtbl_80242570_A4EF90)($at) -/* A4DC70 80241250 00400008 */ jr $v0 -/* A4DC74 80241254 00000000 */ nop -.L80241258_A4DC78: -/* A4DC78 80241258 02A0202D */ daddu $a0, $s5, $zero -/* A4DC7C 8024125C 0260282D */ daddu $a1, $s3, $zero -/* A4DC80 80241260 0C0901E0 */ jal kpa_08_UnkFunc58 -/* A4DC84 80241264 0280302D */ daddu $a2, $s4, $zero -/* A4DC88 80241268 8EA30070 */ lw $v1, 0x70($s5) -/* A4DC8C 8024126C 24020001 */ addiu $v0, $zero, 1 -/* A4DC90 80241270 14620037 */ bne $v1, $v0, .L80241350_A4DD70 -/* A4DC94 80241274 00000000 */ nop -.L80241278_A4DC98: -/* A4DC98 80241278 02A0202D */ daddu $a0, $s5, $zero -/* A4DC9C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* A4DCA0 80241280 0C0901FD */ jal func_802407F4_A4D214 -/* A4DCA4 80241284 0280302D */ daddu $a2, $s4, $zero -/* A4DCA8 80241288 080904D4 */ j .L80241350_A4DD70 -/* A4DCAC 8024128C 00000000 */ nop -.L80241290_A4DCB0: -/* A4DCB0 80241290 02A0202D */ daddu $a0, $s5, $zero -/* A4DCB4 80241294 0260282D */ daddu $a1, $s3, $zero -/* A4DCB8 80241298 0C090248 */ jal kpa_08_UnkFunc59 -/* A4DCBC 8024129C 0280302D */ daddu $a2, $s4, $zero -.L802412A0_A4DCC0: -/* A4DCC0 802412A0 02A0202D */ daddu $a0, $s5, $zero -/* A4DCC4 802412A4 0260282D */ daddu $a1, $s3, $zero -/* A4DCC8 802412A8 0C090270 */ jal func_802409C0_A4D3E0 -/* A4DCCC 802412AC 0280302D */ daddu $a2, $s4, $zero -/* A4DCD0 802412B0 080904D4 */ j .L80241350_A4DD70 -/* A4DCD4 802412B4 00000000 */ nop -.L802412B8_A4DCD8: -/* A4DCD8 802412B8 02A0202D */ daddu $a0, $s5, $zero -/* A4DCDC 802412BC 0260282D */ daddu $a1, $s3, $zero -/* A4DCE0 802412C0 0C090289 */ jal func_80240A24_A4D444 -/* A4DCE4 802412C4 0280302D */ daddu $a2, $s4, $zero -.L802412C8_A4DCE8: -/* A4DCE8 802412C8 02A0202D */ daddu $a0, $s5, $zero -/* A4DCEC 802412CC 0260282D */ daddu $a1, $s3, $zero -/* A4DCF0 802412D0 0C0902D9 */ jal func_80240B64_A4D584 -/* A4DCF4 802412D4 0280302D */ daddu $a2, $s4, $zero -/* A4DCF8 802412D8 080904D4 */ j .L80241350_A4DD70 -/* A4DCFC 802412DC 00000000 */ nop -.L802412E0_A4DD00: -/* A4DD00 802412E0 02A0202D */ daddu $a0, $s5, $zero -/* A4DD04 802412E4 0260282D */ daddu $a1, $s3, $zero -/* A4DD08 802412E8 0C090342 */ jal func_80240D08_A4D728 -/* A4DD0C 802412EC 0280302D */ daddu $a2, $s4, $zero -/* A4DD10 802412F0 080904D4 */ j .L80241350_A4DD70 -/* A4DD14 802412F4 00000000 */ nop -.L802412F8_A4DD18: -/* A4DD18 802412F8 02A0202D */ daddu $a0, $s5, $zero -/* A4DD1C 802412FC 0260282D */ daddu $a1, $s3, $zero -/* A4DD20 80241300 0C090351 */ jal func_80240D44_A4D764 -/* A4DD24 80241304 0280302D */ daddu $a2, $s4, $zero -/* A4DD28 80241308 080904D4 */ j .L80241350_A4DD70 -/* A4DD2C 8024130C 00000000 */ nop -.L80241310_A4DD30: -/* A4DD30 80241310 02A0202D */ daddu $a0, $s5, $zero -/* A4DD34 80241314 0260282D */ daddu $a1, $s3, $zero -/* A4DD38 80241318 0C0903C1 */ jal func_80240F04_A4D924 -/* A4DD3C 8024131C 0280302D */ daddu $a2, $s4, $zero -/* A4DD40 80241320 080904D4 */ j .L80241350_A4DD70 -/* A4DD44 80241324 00000000 */ nop -.L80241328_A4DD48: -/* A4DD48 80241328 02A0202D */ daddu $a0, $s5, $zero -/* A4DD4C 8024132C 0260282D */ daddu $a1, $s3, $zero -/* A4DD50 80241330 0C0903DC */ jal func_80240F70_A4D990 -/* A4DD54 80241334 0280302D */ daddu $a2, $s4, $zero -/* A4DD58 80241338 080904D4 */ j .L80241350_A4DD70 -/* A4DD5C 8024133C 00000000 */ nop -.L80241340_A4DD60: -/* A4DD60 80241340 02A0202D */ daddu $a0, $s5, $zero -/* A4DD64 80241344 0260282D */ daddu $a1, $s3, $zero -/* A4DD68 80241348 0C090429 */ jal func_802410A4_A4DAC4 -/* A4DD6C 8024134C 0280302D */ daddu $a2, $s4, $zero -.L80241350_A4DD70: -/* A4DD70 80241350 8FBF0048 */ lw $ra, 0x48($sp) -/* A4DD74 80241354 8FB50044 */ lw $s5, 0x44($sp) -/* A4DD78 80241358 8FB40040 */ lw $s4, 0x40($sp) -/* A4DD7C 8024135C 8FB3003C */ lw $s3, 0x3c($sp) -/* A4DD80 80241360 8FB20038 */ lw $s2, 0x38($sp) -/* A4DD84 80241364 8FB10034 */ lw $s1, 0x34($sp) -/* A4DD88 80241368 8FB00030 */ lw $s0, 0x30($sp) -/* A4DD8C 8024136C 0000102D */ daddu $v0, $zero, $zero -/* A4DD90 80241370 03E00008 */ jr $ra -/* A4DD94 80241374 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378_A4DD98.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378_A4DD98.s deleted file mode 100644 index 0681123819..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378_A4DD98.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241378_A4DD98 -/* A4DD98 80241378 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4DD9C 8024137C AFBF0020 */ sw $ra, 0x20($sp) -/* A4DDA0 80241380 8C820148 */ lw $v0, 0x148($a0) -/* A4DDA4 80241384 0C00EABB */ jal get_npc_unsafe -/* A4DDA8 80241388 84440008 */ lh $a0, 8($v0) -/* A4DDAC 8024138C 240300FF */ addiu $v1, $zero, 0xff -/* A4DDB0 80241390 0000282D */ daddu $a1, $zero, $zero -/* A4DDB4 80241394 00A0302D */ daddu $a2, $a1, $zero -/* A4DDB8 80241398 A04300AC */ sb $v1, 0xac($v0) -/* A4DDBC 8024139C AFA00010 */ sw $zero, 0x10($sp) -/* A4DDC0 802413A0 AFA00014 */ sw $zero, 0x14($sp) -/* A4DDC4 802413A4 AFA00018 */ sw $zero, 0x18($sp) -/* A4DDC8 802413A8 8C440024 */ lw $a0, 0x24($v0) -/* A4DDCC 802413AC 0C0B7A25 */ jal func_802DE894 -/* A4DDD0 802413B0 00A0382D */ daddu $a3, $a1, $zero -/* A4DDD4 802413B4 8FBF0020 */ lw $ra, 0x20($sp) -/* A4DDD8 802413B8 24020002 */ addiu $v0, $zero, 2 -/* A4DDDC 802413BC 03E00008 */ jr $ra -/* A4DDE0 802413C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4_A4DDE4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4_A4DDE4.s deleted file mode 100644 index a8381ec988..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4_A4DDE4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413C4_A4DDE4 -/* A4DDE4 802413C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4DDE8 802413C8 AFB10014 */ sw $s1, 0x14($sp) -/* A4DDEC 802413CC 0080882D */ daddu $s1, $a0, $zero -/* A4DDF0 802413D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A4DDF4 802413D4 AFB00010 */ sw $s0, 0x10($sp) -/* A4DDF8 802413D8 8E300148 */ lw $s0, 0x148($s1) -/* A4DDFC 802413DC 0C00EABB */ jal get_npc_unsafe -/* A4DE00 802413E0 86040008 */ lh $a0, 8($s0) -/* A4DE04 802413E4 0040182D */ daddu $v1, $v0, $zero -/* A4DE08 802413E8 240200FF */ addiu $v0, $zero, 0xff -/* A4DE0C 802413EC A06200AC */ sb $v0, 0xac($v1) -/* A4DE10 802413F0 8E0200CC */ lw $v0, 0xcc($s0) -/* A4DE14 802413F4 8C440008 */ lw $a0, 8($v0) -/* A4DE18 802413F8 A460008E */ sh $zero, 0x8e($v1) -/* A4DE1C 802413FC AC640028 */ sw $a0, 0x28($v1) -/* A4DE20 80241400 AE200070 */ sw $zero, 0x70($s1) -/* A4DE24 80241404 8FBF0018 */ lw $ra, 0x18($sp) -/* A4DE28 80241408 8FB10014 */ lw $s1, 0x14($sp) -/* A4DE2C 8024140C 8FB00010 */ lw $s0, 0x10($sp) -/* A4DE30 80241410 24020002 */ addiu $v0, $zero, 2 -/* A4DE34 80241414 03E00008 */ jr $ra -/* A4DE38 80241418 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s deleted file mode 100644 index 113314619d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241454_A4DE74.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241454_A4DE74 -/* A4DE74 80241454 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4DE78 80241458 AFBF0014 */ sw $ra, 0x14($sp) -/* A4DE7C 8024145C AFB00010 */ sw $s0, 0x10($sp) -/* A4DE80 80241460 8C900148 */ lw $s0, 0x148($a0) -/* A4DE84 80241464 0C00EABB */ jal get_npc_unsafe -/* A4DE88 80241468 86040008 */ lh $a0, 8($s0) -/* A4DE8C 8024146C 0040202D */ daddu $a0, $v0, $zero -/* A4DE90 80241470 8E03006C */ lw $v1, 0x6c($s0) -/* A4DE94 80241474 24020002 */ addiu $v0, $zero, 2 -/* A4DE98 80241478 14620003 */ bne $v1, $v0, .L80241488 -/* A4DE9C 8024147C 00000000 */ nop -/* A4DEA0 80241480 AC80001C */ sw $zero, 0x1c($a0) -/* A4DEA4 80241484 AC800018 */ sw $zero, 0x18($a0) -.L80241488: -/* A4DEA8 80241488 8FBF0014 */ lw $ra, 0x14($sp) -/* A4DEAC 8024148C 8FB00010 */ lw $s0, 0x10($sp) -/* A4DEB0 80241490 24020002 */ addiu $v0, $zero, 2 -/* A4DEB4 80241494 03E00008 */ jr $ra -/* A4DEB8 80241498 27BD0018 */ addiu $sp, $sp, 0x18 -/* A4DEBC 8024149C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242410_A95B50.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242410_A95B50.s deleted file mode 100644 index 88c27fcbf7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242410_A95B50.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242410_A95B50 -/* A95B50 80242410 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A95B54 80242414 AFB00010 */ sw $s0, 0x10($sp) -/* A95B58 80242418 0080802D */ daddu $s0, $a0, $zero -/* A95B5C 8024241C AFBF0014 */ sw $ra, 0x14($sp) -/* A95B60 80242420 8E020148 */ lw $v0, 0x148($s0) -/* A95B64 80242424 0C00EABB */ jal get_npc_unsafe -/* A95B68 80242428 84440008 */ lh $a0, 8($v0) -/* A95B6C 8024242C 2403001E */ addiu $v1, $zero, 0x1e -/* A95B70 80242430 A443008E */ sh $v1, 0x8e($v0) -/* A95B74 80242434 2402000B */ addiu $v0, $zero, 0xb -/* A95B78 80242438 AE020070 */ sw $v0, 0x70($s0) -/* A95B7C 8024243C 8FBF0014 */ lw $ra, 0x14($sp) -/* A95B80 80242440 8FB00010 */ lw $s0, 0x10($sp) -/* A95B84 80242444 03E00008 */ jr $ra -/* A95B88 80242448 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s deleted file mode 100644 index d88d6a4632..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024244C_A95B8C -/* A95B8C 8024244C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A95B90 80242450 AFB40040 */ sw $s4, 0x40($sp) -/* A95B94 80242454 0080A02D */ daddu $s4, $a0, $zero -/* A95B98 80242458 AFBF0044 */ sw $ra, 0x44($sp) -/* A95B9C 8024245C AFB3003C */ sw $s3, 0x3c($sp) -/* A95BA0 80242460 AFB20038 */ sw $s2, 0x38($sp) -/* A95BA4 80242464 AFB10034 */ sw $s1, 0x34($sp) -/* A95BA8 80242468 AFB00030 */ sw $s0, 0x30($sp) -/* A95BAC 8024246C F7B40048 */ sdc1 $f20, 0x48($sp) -/* A95BB0 80242470 8E900148 */ lw $s0, 0x148($s4) -/* A95BB4 80242474 00A0882D */ daddu $s1, $a1, $zero -/* A95BB8 80242478 86040008 */ lh $a0, 8($s0) -/* A95BBC 8024247C 0C00EABB */ jal get_npc_unsafe -/* A95BC0 80242480 00C0902D */ daddu $s2, $a2, $zero -/* A95BC4 80242484 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A95BC8 80242488 46806320 */ cvt.s.w $f12, $f12 -/* A95BCC 8024248C 0040982D */ daddu $s3, $v0, $zero -/* A95BD0 80242490 C6140070 */ lwc1 $f20, 0x70($s0) -/* A95BD4 80242494 4680A520 */ cvt.s.w $f20, $f20 -/* A95BD8 80242498 3C014059 */ lui $at, 0x4059 -/* A95BDC 8024249C 44810800 */ mtc1 $at, $f1 -/* A95BE0 802424A0 44800000 */ mtc1 $zero, $f0 -/* A95BE4 802424A4 4600A521 */ cvt.d.s $f20, $f20 -/* A95BE8 802424A8 4620A503 */ div.d $f20, $f20, $f0 -/* A95BEC 802424AC 0C00A8BB */ jal sin_deg -/* A95BF0 802424B0 4620A520 */ cvt.s.d $f20, $f20 -/* A95BF4 802424B4 3C014018 */ lui $at, 0x4018 -/* A95BF8 802424B8 44811800 */ mtc1 $at, $f3 -/* A95BFC 802424BC 44801000 */ mtc1 $zero, $f2 -/* A95C00 802424C0 46000021 */ cvt.d.s $f0, $f0 -/* A95C04 802424C4 46220002 */ mul.d $f0, $f0, $f2 -/* A95C08 802424C8 00000000 */ nop -/* A95C0C 802424CC 4600A0A1 */ cvt.d.s $f2, $f20 -/* A95C10 802424D0 46201080 */ add.d $f2, $f2, $f0 -/* A95C14 802424D4 462010A0 */ cvt.s.d $f2, $f2 -/* A95C18 802424D8 E662003C */ swc1 $f2, 0x3c($s3) -/* A95C1C 802424DC 8E02006C */ lw $v0, 0x6c($s0) -/* A95C20 802424E0 2442000A */ addiu $v0, $v0, 0xa -/* A95C24 802424E4 44826000 */ mtc1 $v0, $f12 -/* A95C28 802424E8 00000000 */ nop -/* A95C2C 802424EC 0C00A6C9 */ jal clamp_angle -/* A95C30 802424F0 46806320 */ cvt.s.w $f12, $f12 -/* A95C34 802424F4 4600018D */ trunc.w.s $f6, $f0 -/* A95C38 802424F8 E606006C */ swc1 $f6, 0x6c($s0) -/* A95C3C 802424FC 0280202D */ daddu $a0, $s4, $zero -/* A95C40 80242500 8E250024 */ lw $a1, 0x24($s1) -/* A95C44 80242504 8E260028 */ lw $a2, 0x28($s1) -/* A95C48 80242508 0C09074C */ jal kpa_102_UnkNpcAIFunc47 -/* A95C4C 8024250C 0240382D */ daddu $a3, $s2, $zero -/* A95C50 80242510 24030001 */ addiu $v1, $zero, 1 -/* A95C54 80242514 1443001E */ bne $v0, $v1, .L80242590 -/* A95C58 80242518 0000202D */ daddu $a0, $zero, $zero -/* A95C5C 8024251C 0260282D */ daddu $a1, $s3, $zero -/* A95C60 80242520 0000302D */ daddu $a2, $zero, $zero -/* A95C64 80242524 866300A8 */ lh $v1, 0xa8($s3) -/* A95C68 80242528 3C013F80 */ lui $at, 0x3f80 -/* A95C6C 8024252C 44810000 */ mtc1 $at, $f0 -/* A95C70 80242530 3C014000 */ lui $at, 0x4000 -/* A95C74 80242534 44811000 */ mtc1 $at, $f2 -/* A95C78 80242538 3C01C1A0 */ lui $at, 0xc1a0 -/* A95C7C 8024253C 44812000 */ mtc1 $at, $f4 -/* A95C80 80242540 2402000F */ addiu $v0, $zero, 0xf -/* A95C84 80242544 AFA2001C */ sw $v0, 0x1c($sp) -/* A95C88 80242548 44833000 */ mtc1 $v1, $f6 -/* A95C8C 8024254C 00000000 */ nop -/* A95C90 80242550 468031A0 */ cvt.s.w $f6, $f6 -/* A95C94 80242554 44073000 */ mfc1 $a3, $f6 -/* A95C98 80242558 27A20028 */ addiu $v0, $sp, 0x28 -/* A95C9C 8024255C AFA20020 */ sw $v0, 0x20($sp) -/* A95CA0 80242560 E7A00010 */ swc1 $f0, 0x10($sp) -/* A95CA4 80242564 E7A20014 */ swc1 $f2, 0x14($sp) -/* A95CA8 80242568 0C01BFA4 */ jal fx_emote -/* A95CAC 8024256C E7A40018 */ swc1 $f4, 0x18($sp) -/* A95CB0 80242570 0260202D */ daddu $a0, $s3, $zero -/* A95CB4 80242574 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A95CB8 80242578 0C012530 */ jal ai_enemy_play_sound -/* A95CBC 8024257C 3C060020 */ lui $a2, 0x20 -/* A95CC0 80242580 24020032 */ addiu $v0, $zero, 0x32 -/* A95CC4 80242584 A662008E */ sh $v0, 0x8e($s3) -/* A95CC8 80242588 0809096C */ j .L802425B0 -/* A95CCC 8024258C 24020014 */ addiu $v0, $zero, 0x14 -.L80242590: -/* A95CD0 80242590 9662008E */ lhu $v0, 0x8e($s3) -/* A95CD4 80242594 2442FFFF */ addiu $v0, $v0, -1 -/* A95CD8 80242598 A662008E */ sh $v0, 0x8e($s3) -/* A95CDC 8024259C 00021400 */ sll $v0, $v0, 0x10 -/* A95CE0 802425A0 1C400004 */ bgtz $v0, .L802425B4 -/* A95CE4 802425A4 24020005 */ addiu $v0, $zero, 5 -/* A95CE8 802425A8 A662008E */ sh $v0, 0x8e($s3) -/* A95CEC 802425AC 2402000F */ addiu $v0, $zero, 0xf -.L802425B0: -/* A95CF0 802425B0 AE820070 */ sw $v0, 0x70($s4) -.L802425B4: -/* A95CF4 802425B4 8FBF0044 */ lw $ra, 0x44($sp) -/* A95CF8 802425B8 8FB40040 */ lw $s4, 0x40($sp) -/* A95CFC 802425BC 8FB3003C */ lw $s3, 0x3c($sp) -/* A95D00 802425C0 8FB20038 */ lw $s2, 0x38($sp) -/* A95D04 802425C4 8FB10034 */ lw $s1, 0x34($sp) -/* A95D08 802425C8 8FB00030 */ lw $s0, 0x30($sp) -/* A95D0C 802425CC D7B40048 */ ldc1 $f20, 0x48($sp) -/* A95D10 802425D0 03E00008 */ jr $ra -/* A95D14 802425D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s deleted file mode 100644 index 29526eccbc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s +++ /dev/null @@ -1,282 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245D78_A994B8 -.double 180.0 - -dlabel D_80245D80_A994C0 -.double 90.0 - -dlabel D_80245D88_A994C8 -.double 270.0 - -.section .text - -glabel func_802425D8_A95D18 -/* A95D18 802425D8 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A95D1C 802425DC AFB60048 */ sw $s6, 0x48($sp) -/* A95D20 802425E0 0080B02D */ daddu $s6, $a0, $zero -/* A95D24 802425E4 AFBF004C */ sw $ra, 0x4c($sp) -/* A95D28 802425E8 AFB50044 */ sw $s5, 0x44($sp) -/* A95D2C 802425EC AFB40040 */ sw $s4, 0x40($sp) -/* A95D30 802425F0 AFB3003C */ sw $s3, 0x3c($sp) -/* A95D34 802425F4 AFB20038 */ sw $s2, 0x38($sp) -/* A95D38 802425F8 AFB10034 */ sw $s1, 0x34($sp) -/* A95D3C 802425FC AFB00030 */ sw $s0, 0x30($sp) -/* A95D40 80242600 F7B60058 */ sdc1 $f22, 0x58($sp) -/* A95D44 80242604 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A95D48 80242608 8ED50148 */ lw $s5, 0x148($s6) -/* A95D4C 8024260C 86A40008 */ lh $a0, 8($s5) -/* A95D50 80242610 0C00EABB */ jal get_npc_unsafe -/* A95D54 80242614 0000982D */ daddu $s3, $zero, $zero -/* A95D58 80242618 0040802D */ daddu $s0, $v0, $zero -/* A95D5C 8024261C 9602008E */ lhu $v0, 0x8e($s0) -/* A95D60 80242620 2442FFFF */ addiu $v0, $v0, -1 -/* A95D64 80242624 A602008E */ sh $v0, 0x8e($s0) -/* A95D68 80242628 00021400 */ sll $v0, $v0, 0x10 -/* A95D6C 8024262C 1C4000DA */ bgtz $v0, .L80242998 -/* A95D70 80242630 0260A02D */ daddu $s4, $s3, $zero -/* A95D74 80242634 0C00A67F */ jal rand_int -/* A95D78 80242638 2404001E */ addiu $a0, $zero, 0x1e -/* A95D7C 8024263C 0260902D */ daddu $s2, $s3, $zero -/* A95D80 80242640 8EA400D0 */ lw $a0, 0xd0($s5) -/* A95D84 80242644 C6000040 */ lwc1 $f0, 0x40($s0) -/* A95D88 80242648 3C018024 */ lui $at, %hi(D_80245D78_A994B8) -/* A95D8C 8024264C D4365D78 */ ldc1 $f22, %lo(D_80245D78_A994B8)($at) -/* A95D90 80242650 C4820000 */ lwc1 $f2, ($a0) -/* A95D94 80242654 468010A0 */ cvt.s.w $f2, $f2 -/* A95D98 80242658 C4840008 */ lwc1 $f4, 8($a0) -/* A95D9C 8024265C 46802120 */ cvt.s.w $f4, $f4 -/* A95DA0 80242660 E7A00010 */ swc1 $f0, 0x10($sp) -/* A95DA4 80242664 8EA300D0 */ lw $v1, 0xd0($s5) -/* A95DA8 80242668 44051000 */ mfc1 $a1, $f2 -/* A95DAC 8024266C C460000C */ lwc1 $f0, 0xc($v1) -/* A95DB0 80242670 46800020 */ cvt.s.w $f0, $f0 -/* A95DB4 80242674 E7A00014 */ swc1 $f0, 0x14($sp) -/* A95DB8 80242678 8EA300D0 */ lw $v1, 0xd0($s5) -/* A95DBC 8024267C 44062000 */ mfc1 $a2, $f4 -/* A95DC0 80242680 C4600010 */ lwc1 $f0, 0x10($v1) -/* A95DC4 80242684 46800020 */ cvt.s.w $f0, $f0 -/* A95DC8 80242688 E7A00018 */ swc1 $f0, 0x18($sp) -/* A95DCC 8024268C 44820000 */ mtc1 $v0, $f0 -/* A95DD0 80242690 00000000 */ nop -/* A95DD4 80242694 46800021 */ cvt.d.w $f0, $f0 -/* A95DD8 80242698 46360000 */ add.d $f0, $f0, $f22 -/* A95DDC 8024269C 8C840018 */ lw $a0, 0x18($a0) -/* A95DE0 802426A0 8E070038 */ lw $a3, 0x38($s0) -/* A95DE4 802426A4 0C0123F5 */ jal is_point_within_region -/* A95DE8 802426A8 46200520 */ cvt.s.d $f20, $f0 -/* A95DEC 802426AC 10400023 */ beqz $v0, .L8024273C -/* A95DF0 802426B0 00000000 */ nop -/* A95DF4 802426B4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95DF8 802426B8 8EA200D0 */ lw $v0, 0xd0($s5) -/* A95DFC 802426BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95E00 802426C0 C44A0000 */ lwc1 $f10, ($v0) -/* A95E04 802426C4 468052A0 */ cvt.s.w $f10, $f10 -/* A95E08 802426C8 44065000 */ mfc1 $a2, $f10 -/* A95E0C 802426CC C44A0008 */ lwc1 $f10, 8($v0) -/* A95E10 802426D0 468052A0 */ cvt.s.w $f10, $f10 -/* A95E14 802426D4 44075000 */ mfc1 $a3, $f10 -/* A95E18 802426D8 0C00A720 */ jal atan2 -/* A95E1C 802426DC 00000000 */ nop -/* A95E20 802426E0 44931000 */ mtc1 $s3, $f2 -/* A95E24 802426E4 00000000 */ nop -/* A95E28 802426E8 468010A0 */ cvt.s.w $f2, $f2 -/* A95E2C 802426EC 46020001 */ sub.s $f0, $f0, $f2 -/* A95E30 802426F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95E34 802426F4 E600000C */ swc1 $f0, 0xc($s0) -/* A95E38 802426F8 8EA200D0 */ lw $v0, 0xd0($s5) -/* A95E3C 802426FC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95E40 80242700 C44A0000 */ lwc1 $f10, ($v0) -/* A95E44 80242704 468052A0 */ cvt.s.w $f10, $f10 -/* A95E48 80242708 44065000 */ mfc1 $a2, $f10 -/* A95E4C 8024270C C44A0008 */ lwc1 $f10, 8($v0) -/* A95E50 80242710 468052A0 */ cvt.s.w $f10, $f10 -/* A95E54 80242714 44075000 */ mfc1 $a3, $f10 -/* A95E58 80242718 0C00A7B5 */ jal dist2D -/* A95E5C 8024271C 00000000 */ nop -/* A95E60 80242720 46000106 */ mov.s $f4, $f0 -/* A95E64 80242724 4614003C */ c.lt.s $f0, $f20 -/* A95E68 80242728 00000000 */ nop -/* A95E6C 8024272C 4503006A */ bc1tl .L802428D8 -/* A95E70 80242730 46002506 */ mov.s $f20, $f4 -/* A95E74 80242734 08090A37 */ j .L802428DC -/* A95E78 80242738 27A40020 */ addiu $a0, $sp, 0x20 -.L8024273C: -/* A95E7C 8024273C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95E80 80242740 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A95E84 80242744 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A95E88 80242748 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95E8C 8024274C 8C460028 */ lw $a2, 0x28($v0) -/* A95E90 80242750 0C00A720 */ jal atan2 -/* A95E94 80242754 8C470030 */ lw $a3, 0x30($v0) -/* A95E98 80242758 460000A1 */ cvt.d.s $f2, $f0 -/* A95E9C 8024275C 4636103C */ c.lt.d $f2, $f22 -/* A95EA0 80242760 00000000 */ nop -/* A95EA4 80242764 45000006 */ bc1f .L80242780 -/* A95EA8 80242768 E600000C */ swc1 $f0, 0xc($s0) -/* A95EAC 8024276C 0C00A67F */ jal rand_int -/* A95EB0 80242770 2404000A */ addiu $a0, $zero, 0xa -/* A95EB4 80242774 3C018024 */ lui $at, %hi(D_80245D80_A994C0) -/* A95EB8 80242778 080909E4 */ j .L80242790 -/* A95EBC 8024277C D4205D80 */ ldc1 $f0, %lo(D_80245D80_A994C0)($at) -.L80242780: -/* A95EC0 80242780 0C00A67F */ jal rand_int -/* A95EC4 80242784 2404000A */ addiu $a0, $zero, 0xa -/* A95EC8 80242788 3C018024 */ lui $at, %hi(D_80245D88_A994C8) -/* A95ECC 8024278C D4205D88 */ ldc1 $f0, %lo(D_80245D88_A994C8)($at) -.L80242790: -/* A95ED0 80242790 44821000 */ mtc1 $v0, $f2 -/* A95ED4 80242794 00000000 */ nop -/* A95ED8 80242798 468010A1 */ cvt.d.w $f2, $f2 -/* A95EDC 8024279C 46201080 */ add.d $f2, $f2, $f0 -/* A95EE0 802427A0 3C014014 */ lui $at, 0x4014 -/* A95EE4 802427A4 44810800 */ mtc1 $at, $f1 -/* A95EE8 802427A8 44800000 */ mtc1 $zero, $f0 -/* A95EEC 802427AC 00000000 */ nop -/* A95EF0 802427B0 46201081 */ sub.d $f2, $f2, $f0 -/* A95EF4 802427B4 462015A0 */ cvt.s.d $f22, $f2 -/* A95EF8 802427B8 00141080 */ sll $v0, $s4, 2 -/* A95EFC 802427BC 00548821 */ addu $s1, $v0, $s4 -.L802427C0: -/* A95F00 802427C0 12400006 */ beqz $s2, .L802427DC -/* A95F04 802427C4 00000000 */ nop -/* A95F08 802427C8 44910000 */ mtc1 $s1, $f0 -/* A95F0C 802427CC 00000000 */ nop -/* A95F10 802427D0 46800020 */ cvt.s.w $f0, $f0 -/* A95F14 802427D4 080909FB */ j .L802427EC -/* A95F18 802427D8 4600B000 */ add.s $f0, $f22, $f0 -.L802427DC: -/* A95F1C 802427DC 44910000 */ mtc1 $s1, $f0 -/* A95F20 802427E0 00000000 */ nop -/* A95F24 802427E4 46800020 */ cvt.s.w $f0, $f0 -/* A95F28 802427E8 4600B001 */ sub.s $f0, $f22, $f0 -.L802427EC: -/* A95F2C 802427EC E600000C */ swc1 $f0, 0xc($s0) -/* A95F30 802427F0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A95F34 802427F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* A95F38 802427F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* A95F3C 802427FC 0000202D */ daddu $a0, $zero, $zero -/* A95F40 80242800 E7A00020 */ swc1 $f0, 0x20($sp) -/* A95F44 80242804 E7A20024 */ swc1 $f2, 0x24($sp) -/* A95F48 80242808 E7A40028 */ swc1 $f4, 0x28($sp) -/* A95F4C 8024280C E7B40010 */ swc1 $f20, 0x10($sp) -/* A95F50 80242810 C600000C */ lwc1 $f0, 0xc($s0) -/* A95F54 80242814 27A50020 */ addiu $a1, $sp, 0x20 -/* A95F58 80242818 E7A00014 */ swc1 $f0, 0x14($sp) -/* A95F5C 8024281C 860200A8 */ lh $v0, 0xa8($s0) -/* A95F60 80242820 27A60024 */ addiu $a2, $sp, 0x24 -/* A95F64 80242824 44820000 */ mtc1 $v0, $f0 -/* A95F68 80242828 00000000 */ nop -/* A95F6C 8024282C 46800020 */ cvt.s.w $f0, $f0 -/* A95F70 80242830 E7A00018 */ swc1 $f0, 0x18($sp) -/* A95F74 80242834 860200A6 */ lh $v0, 0xa6($s0) -/* A95F78 80242838 27A70028 */ addiu $a3, $sp, 0x28 -/* A95F7C 8024283C 44820000 */ mtc1 $v0, $f0 -/* A95F80 80242840 00000000 */ nop -/* A95F84 80242844 46800020 */ cvt.s.w $f0, $f0 -/* A95F88 80242848 0C0376B9 */ jal npc_test_move_taller_with_slipping -/* A95F8C 8024284C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A95F90 80242850 50400014 */ beql $v0, $zero, .L802428A4 -/* A95F94 80242854 24130002 */ addiu $s3, $zero, 2 -/* A95F98 80242858 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A95F9C 8024285C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A95FA0 80242860 8FA60020 */ lw $a2, 0x20($sp) -/* A95FA4 80242864 0C00A7B5 */ jal dist2D -/* A95FA8 80242868 8FA70028 */ lw $a3, 0x28($sp) -/* A95FAC 8024286C 46000106 */ mov.s $f4, $f0 -/* A95FB0 80242870 3C014064 */ lui $at, 0x4064 -/* A95FB4 80242874 44811800 */ mtc1 $at, $f3 -/* A95FB8 80242878 44801000 */ mtc1 $zero, $f2 -/* A95FBC 8024287C 46002021 */ cvt.d.s $f0, $f4 -/* A95FC0 80242880 4620103C */ c.lt.d $f2, $f0 -/* A95FC4 80242884 00000000 */ nop -/* A95FC8 80242888 45000006 */ bc1f .L802428A4 -/* A95FCC 8024288C 00000000 */ nop -/* A95FD0 80242890 4614203C */ c.lt.s $f4, $f20 -/* A95FD4 80242894 00000000 */ nop -/* A95FD8 80242898 45030001 */ bc1tl .L802428A0 -/* A95FDC 8024289C 46002506 */ mov.s $f20, $f4 -.L802428A0: -/* A95FE0 802428A0 24130001 */ addiu $s3, $zero, 1 -.L802428A4: -/* A95FE4 802428A4 1660000D */ bnez $s3, .L802428DC -/* A95FE8 802428A8 27A40020 */ addiu $a0, $sp, 0x20 -/* A95FEC 802428AC 56400003 */ bnel $s2, $zero, .L802428BC -/* A95FF0 802428B0 26310005 */ addiu $s1, $s1, 5 -/* A95FF4 802428B4 08090A31 */ j .L802428C4 -/* A95FF8 802428B8 24120001 */ addiu $s2, $zero, 1 -.L802428BC: -/* A95FFC 802428BC 26940001 */ addiu $s4, $s4, 1 -/* A96000 802428C0 0000902D */ daddu $s2, $zero, $zero -.L802428C4: -/* A96004 802428C4 2A820007 */ slti $v0, $s4, 7 -/* A96008 802428C8 5040FFBD */ beql $v0, $zero, .L802427C0 -/* A9600C 802428CC 24130003 */ addiu $s3, $zero, 3 -/* A96010 802428D0 080909F0 */ j .L802427C0 -/* A96014 802428D4 00000000 */ nop -.L802428D8: -/* A96018 802428D8 27A40020 */ addiu $a0, $sp, 0x20 -.L802428DC: -/* A9601C 802428DC 4406A000 */ mfc1 $a2, $f20 -/* A96020 802428E0 8E07000C */ lw $a3, 0xc($s0) -/* A96024 802428E4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A96028 802428E8 C6020040 */ lwc1 $f2, 0x40($s0) -/* A9602C 802428EC 27A50028 */ addiu $a1, $sp, 0x28 -/* A96030 802428F0 E7A00020 */ swc1 $f0, 0x20($sp) -/* A96034 802428F4 0C00A7E7 */ jal add_vec2D_polar -/* A96038 802428F8 E7A20028 */ swc1 $f2, 0x28($sp) -/* A9603C 802428FC C6000038 */ lwc1 $f0, 0x38($s0) -/* A96040 80242900 3C014059 */ lui $at, 0x4059 -/* A96044 80242904 44814800 */ mtc1 $at, $f9 -/* A96048 80242908 44804000 */ mtc1 $zero, $f8 -/* A9604C 8024290C 46000021 */ cvt.d.s $f0, $f0 -/* A96050 80242910 46280002 */ mul.d $f0, $f0, $f8 -/* A96054 80242914 00000000 */ nop -/* A96058 80242918 C7A20020 */ lwc1 $f2, 0x20($sp) -/* A9605C 8024291C C604003C */ lwc1 $f4, 0x3c($s0) -/* A96060 80242920 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A96064 80242924 E6020060 */ swc1 $f2, 0x60($s0) -/* A96068 80242928 E6040064 */ swc1 $f4, 0x64($s0) -/* A9606C 8024292C E6060068 */ swc1 $f6, 0x68($s0) -/* A96070 80242930 4620028D */ trunc.w.d $f10, $f0 -/* A96074 80242934 E6AA007C */ swc1 $f10, 0x7c($s5) -/* A96078 80242938 C6000040 */ lwc1 $f0, 0x40($s0) -/* A9607C 8024293C 46000021 */ cvt.d.s $f0, $f0 -/* A96080 80242940 46280002 */ mul.d $f0, $f0, $f8 -/* A96084 80242944 00000000 */ nop -/* A96088 80242948 4620028D */ trunc.w.d $f10, $f0 -/* A9608C 8024294C E6AA0084 */ swc1 $f10, 0x84($s5) -/* A96090 80242950 0C00A67F */ jal rand_int -/* A96094 80242954 2404000A */ addiu $a0, $zero, 0xa -/* A96098 80242958 3C014040 */ lui $at, 0x4040 -/* A9609C 8024295C 44810000 */ mtc1 $at, $f0 -/* A960A0 80242960 3C013FB3 */ lui $at, 0x3fb3 -/* A960A4 80242964 34213333 */ ori $at, $at, 0x3333 -/* A960A8 80242968 44811000 */ mtc1 $at, $f2 -/* A960AC 8024296C 3C013E4C */ lui $at, 0x3e4c -/* A960B0 80242970 3421CCCD */ ori $at, $at, 0xcccd -/* A960B4 80242974 44812000 */ mtc1 $at, $f4 -/* A960B8 80242978 24420023 */ addiu $v0, $v0, 0x23 -/* A960BC 8024297C AEA20078 */ sw $v0, 0x78($s5) -/* A960C0 80242980 24020010 */ addiu $v0, $zero, 0x10 -/* A960C4 80242984 A600008E */ sh $zero, 0x8e($s0) -/* A960C8 80242988 E6000018 */ swc1 $f0, 0x18($s0) -/* A960CC 8024298C E602001C */ swc1 $f2, 0x1c($s0) -/* A960D0 80242990 E6040014 */ swc1 $f4, 0x14($s0) -/* A960D4 80242994 AEC20070 */ sw $v0, 0x70($s6) -.L80242998: -/* A960D8 80242998 8FBF004C */ lw $ra, 0x4c($sp) -/* A960DC 8024299C 8FB60048 */ lw $s6, 0x48($sp) -/* A960E0 802429A0 8FB50044 */ lw $s5, 0x44($sp) -/* A960E4 802429A4 8FB40040 */ lw $s4, 0x40($sp) -/* A960E8 802429A8 8FB3003C */ lw $s3, 0x3c($sp) -/* A960EC 802429AC 8FB20038 */ lw $s2, 0x38($sp) -/* A960F0 802429B0 8FB10034 */ lw $s1, 0x34($sp) -/* A960F4 802429B4 8FB00030 */ lw $s0, 0x30($sp) -/* A960F8 802429B8 D7B60058 */ ldc1 $f22, 0x58($sp) -/* A960FC 802429BC D7B40050 */ ldc1 $f20, 0x50($sp) -/* A96100 802429C0 03E00008 */ jr $ra -/* A96104 802429C4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s deleted file mode 100644 index 36939a73f6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429C8_A96108 -/* A96108 802429C8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9610C 802429CC AFB20018 */ sw $s2, 0x18($sp) -/* A96110 802429D0 0080902D */ daddu $s2, $a0, $zero -/* A96114 802429D4 AFBF001C */ sw $ra, 0x1c($sp) -/* A96118 802429D8 AFB10014 */ sw $s1, 0x14($sp) -/* A9611C 802429DC AFB00010 */ sw $s0, 0x10($sp) -/* A96120 802429E0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A96124 802429E4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A96128 802429E8 8E510148 */ lw $s1, 0x148($s2) -/* A9612C 802429EC 0C00EABB */ jal get_npc_unsafe -/* A96130 802429F0 86240008 */ lh $a0, 8($s1) -/* A96134 802429F4 0040802D */ daddu $s0, $v0, $zero -/* A96138 802429F8 C6340070 */ lwc1 $f20, 0x70($s1) -/* A9613C 802429FC 4680A520 */ cvt.s.w $f20, $f20 -/* A96140 80242A00 4600A521 */ cvt.d.s $f20, $f20 -/* A96144 80242A04 8E23006C */ lw $v1, 0x6c($s1) -/* A96148 80242A08 3C014059 */ lui $at, 0x4059 -/* A9614C 80242A0C 4481B800 */ mtc1 $at, $f23 -/* A96150 80242A10 4480B000 */ mtc1 $zero, $f22 -/* A96154 80242A14 2463000A */ addiu $v1, $v1, 0xa -/* A96158 80242A18 44836000 */ mtc1 $v1, $f12 -/* A9615C 80242A1C 00000000 */ nop -/* A96160 80242A20 46806320 */ cvt.s.w $f12, $f12 -/* A96164 80242A24 4636A503 */ div.d $f20, $f20, $f22 -/* A96168 80242A28 0C00A6C9 */ jal clamp_angle -/* A9616C 80242A2C 4620A520 */ cvt.s.d $f20, $f20 -/* A96170 80242A30 4600010D */ trunc.w.s $f4, $f0 -/* A96174 80242A34 44022000 */ mfc1 $v0, $f4 -/* A96178 80242A38 00000000 */ nop -/* A9617C 80242A3C 44826000 */ mtc1 $v0, $f12 -/* A96180 80242A40 00000000 */ nop -/* A96184 80242A44 46806320 */ cvt.s.w $f12, $f12 -/* A96188 80242A48 0C00A8BB */ jal sin_deg -/* A9618C 80242A4C AE22006C */ sw $v0, 0x6c($s1) -/* A96190 80242A50 3C014018 */ lui $at, 0x4018 -/* A96194 80242A54 44811800 */ mtc1 $at, $f3 -/* A96198 80242A58 44801000 */ mtc1 $zero, $f2 -/* A9619C 80242A5C 46000021 */ cvt.d.s $f0, $f0 -/* A961A0 80242A60 46220002 */ mul.d $f0, $f0, $f2 -/* A961A4 80242A64 00000000 */ nop -/* A961A8 80242A68 4600A0A1 */ cvt.d.s $f2, $f20 -/* A961AC 80242A6C 46201080 */ add.d $f2, $f2, $f0 -/* A961B0 80242A70 8602008C */ lh $v0, 0x8c($s0) -/* A961B4 80242A74 46201020 */ cvt.s.d $f0, $f2 -/* A961B8 80242A78 14400008 */ bnez $v0, .L80242A9C -/* A961BC 80242A7C E600003C */ swc1 $f0, 0x3c($s0) -/* A961C0 80242A80 46000021 */ cvt.d.s $f0, $f0 -/* A961C4 80242A84 46360002 */ mul.d $f0, $f0, $f22 -/* A961C8 80242A88 00000000 */ nop -/* A961CC 80242A8C 24020011 */ addiu $v0, $zero, 0x11 -/* A961D0 80242A90 4620010D */ trunc.w.d $f4, $f0 -/* A961D4 80242A94 E6240080 */ swc1 $f4, 0x80($s1) -/* A961D8 80242A98 AE420070 */ sw $v0, 0x70($s2) -.L80242A9C: -/* A961DC 80242A9C 8FBF001C */ lw $ra, 0x1c($sp) -/* A961E0 80242AA0 8FB20018 */ lw $s2, 0x18($sp) -/* A961E4 80242AA4 8FB10014 */ lw $s1, 0x14($sp) -/* A961E8 80242AA8 8FB00010 */ lw $s0, 0x10($sp) -/* A961EC 80242AAC D7B60028 */ ldc1 $f22, 0x28($sp) -/* A961F0 80242AB0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A961F4 80242AB4 03E00008 */ jr $ra -/* A961F8 80242AB8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s deleted file mode 100644 index 6b0250c406..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245D90_A994D0 -.double 180.0 - -dlabel D_80245D98_A994D8 -.double 270.0 - -.section .text - -glabel func_80242ABC_A961FC -/* A961FC 80242ABC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A96200 80242AC0 AFB20020 */ sw $s2, 0x20($sp) -/* A96204 80242AC4 0080902D */ daddu $s2, $a0, $zero -/* A96208 80242AC8 AFBF0024 */ sw $ra, 0x24($sp) -/* A9620C 80242ACC AFB1001C */ sw $s1, 0x1c($sp) -/* A96210 80242AD0 AFB00018 */ sw $s0, 0x18($sp) -/* A96214 80242AD4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A96218 80242AD8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A9621C 80242ADC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A96220 80242AE0 8E510148 */ lw $s1, 0x148($s2) -/* A96224 80242AE4 0C00EABB */ jal get_npc_unsafe -/* A96228 80242AE8 86240008 */ lh $a0, 8($s1) -/* A9622C 80242AEC 2404000B */ addiu $a0, $zero, 0xb -/* A96230 80242AF0 0040802D */ daddu $s0, $v0, $zero -/* A96234 80242AF4 C620007C */ lwc1 $f0, 0x7c($s1) -/* A96238 80242AF8 46800020 */ cvt.s.w $f0, $f0 -/* A9623C 80242AFC 46000021 */ cvt.d.s $f0, $f0 -/* A96240 80242B00 C6360080 */ lwc1 $f22, 0x80($s1) -/* A96244 80242B04 4680B5A0 */ cvt.s.w $f22, $f22 -/* A96248 80242B08 C6340084 */ lwc1 $f20, 0x84($s1) -/* A9624C 80242B0C 4680A520 */ cvt.s.w $f20, $f20 -/* A96250 80242B10 4600B5A1 */ cvt.d.s $f22, $f22 -/* A96254 80242B14 4600A521 */ cvt.d.s $f20, $f20 -/* A96258 80242B18 3C014059 */ lui $at, 0x4059 -/* A9625C 80242B1C 44811800 */ mtc1 $at, $f3 -/* A96260 80242B20 44801000 */ mtc1 $zero, $f2 -/* A96264 80242B24 8607008E */ lh $a3, 0x8e($s0) -/* A96268 80242B28 8E220078 */ lw $v0, 0x78($s1) -/* A9626C 80242B2C 46220003 */ div.d $f0, $f0, $f2 -/* A96270 80242B30 46200020 */ cvt.s.d $f0, $f0 -/* A96274 80242B34 44050000 */ mfc1 $a1, $f0 -/* A96278 80242B38 C6200070 */ lwc1 $f0, 0x70($s1) -/* A9627C 80242B3C 46800020 */ cvt.s.w $f0, $f0 -/* A96280 80242B40 46000021 */ cvt.d.s $f0, $f0 -/* A96284 80242B44 46220003 */ div.d $f0, $f0, $f2 -/* A96288 80242B48 46200620 */ cvt.s.d $f24, $f0 -/* A9628C 80242B4C 4622B583 */ div.d $f22, $f22, $f2 -/* A96290 80242B50 4620B5A0 */ cvt.s.d $f22, $f22 -/* A96294 80242B54 4622A503 */ div.d $f20, $f20, $f2 -/* A96298 80242B58 AFA20010 */ sw $v0, 0x10($sp) -/* A9629C 80242B5C 8E060060 */ lw $a2, 0x60($s0) -/* A962A0 80242B60 0C00A8ED */ jal update_lerp -/* A962A4 80242B64 4620A520 */ cvt.s.d $f20, $f20 -/* A962A8 80242B68 4405A000 */ mfc1 $a1, $f20 -/* A962AC 80242B6C 8607008E */ lh $a3, 0x8e($s0) -/* A962B0 80242B70 8E220078 */ lw $v0, 0x78($s1) -/* A962B4 80242B74 2404000B */ addiu $a0, $zero, 0xb -/* A962B8 80242B78 AFA20010 */ sw $v0, 0x10($sp) -/* A962BC 80242B7C 8E060068 */ lw $a2, 0x68($s0) -/* A962C0 80242B80 0C00A8ED */ jal update_lerp -/* A962C4 80242B84 46000506 */ mov.s $f20, $f0 -/* A962C8 80242B88 E6140038 */ swc1 $f20, 0x38($s0) -/* A962CC 80242B8C E6000040 */ swc1 $f0, 0x40($s0) -/* A962D0 80242B90 C6200078 */ lwc1 $f0, 0x78($s1) -/* A962D4 80242B94 46800020 */ cvt.s.w $f0, $f0 -/* A962D8 80242B98 46000021 */ cvt.d.s $f0, $f0 -/* A962DC 80242B9C 8602008E */ lh $v0, 0x8e($s0) -/* A962E0 80242BA0 3C018024 */ lui $at, %hi(D_80245D90_A994D0) -/* A962E4 80242BA4 D4345D90 */ ldc1 $f20, %lo(D_80245D90_A994D0)($at) -/* A962E8 80242BA8 44821000 */ mtc1 $v0, $f2 -/* A962EC 80242BAC 00000000 */ nop -/* A962F0 80242BB0 468010A1 */ cvt.d.w $f2, $f2 -/* A962F4 80242BB4 4620A003 */ div.d $f0, $f20, $f0 -/* A962F8 80242BB8 46201082 */ mul.d $f2, $f2, $f0 -/* A962FC 80242BBC 00000000 */ nop -/* A96300 80242BC0 4620110D */ trunc.w.d $f4, $f2 -/* A96304 80242BC4 44022000 */ mfc1 $v0, $f4 -/* A96308 80242BC8 00000000 */ nop -/* A9630C 80242BCC 244200B4 */ addiu $v0, $v0, 0xb4 -/* A96310 80242BD0 44826000 */ mtc1 $v0, $f12 -/* A96314 80242BD4 00000000 */ nop -/* A96318 80242BD8 0C00A8BB */ jal sin_deg -/* A9631C 80242BDC 46806320 */ cvt.s.w $f12, $f12 -/* A96320 80242BE0 3C014039 */ lui $at, 0x4039 -/* A96324 80242BE4 44811800 */ mtc1 $at, $f3 -/* A96328 80242BE8 44801000 */ mtc1 $zero, $f2 -/* A9632C 80242BEC 46000021 */ cvt.d.s $f0, $f0 -/* A96330 80242BF0 46220002 */ mul.d $f0, $f0, $f2 -/* A96334 80242BF4 00000000 */ nop -/* A96338 80242BF8 9602008E */ lhu $v0, 0x8e($s0) -/* A9633C 80242BFC 4600B0A1 */ cvt.d.s $f2, $f22 -/* A96340 80242C00 24420001 */ addiu $v0, $v0, 1 -/* A96344 80242C04 46201080 */ add.d $f2, $f2, $f0 -/* A96348 80242C08 A602008E */ sh $v0, 0x8e($s0) -/* A9634C 80242C0C 00021400 */ sll $v0, $v0, 0x10 -/* A96350 80242C10 462010A0 */ cvt.s.d $f2, $f2 -/* A96354 80242C14 E602003C */ swc1 $f2, 0x3c($s0) -/* A96358 80242C18 8E230078 */ lw $v1, 0x78($s1) -/* A9635C 80242C1C 00021403 */ sra $v0, $v0, 0x10 -/* A96360 80242C20 2463FFF8 */ addiu $v1, $v1, -8 -/* A96364 80242C24 14430009 */ bne $v0, $v1, .L80242C4C -/* A96368 80242C28 00000000 */ nop -/* A9636C 80242C2C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A96370 80242C30 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A96374 80242C34 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A96378 80242C38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A9637C 80242C3C 8C460028 */ lw $a2, 0x28($v0) -/* A96380 80242C40 0C00A720 */ jal atan2 -/* A96384 80242C44 8C470030 */ lw $a3, 0x30($v0) -/* A96388 80242C48 E600000C */ swc1 $f0, 0xc($s0) -.L80242C4C: -/* A9638C 80242C4C C600003C */ lwc1 $f0, 0x3c($s0) -/* A96390 80242C50 4600C03E */ c.le.s $f24, $f0 -/* A96394 80242C54 00000000 */ nop -/* A96398 80242C58 45000004 */ bc1f .L80242C6C -/* A9639C 80242C5C 2402000A */ addiu $v0, $zero, 0xa -/* A963A0 80242C60 E618003C */ swc1 $f24, 0x3c($s0) -/* A963A4 80242C64 08090B36 */ j .L80242CD8 -/* A963A8 80242C68 AE20006C */ sw $zero, 0x6c($s1) -.L80242C6C: -/* A963AC 80242C6C 8602008E */ lh $v0, 0x8e($s0) -/* A963B0 80242C70 8E230078 */ lw $v1, 0x78($s1) -/* A963B4 80242C74 0043102A */ slt $v0, $v0, $v1 -/* A963B8 80242C78 14400018 */ bnez $v0, .L80242CDC -/* A963BC 80242C7C 00000000 */ nop -/* A963C0 80242C80 8E23006C */ lw $v1, 0x6c($s1) -/* A963C4 80242C84 44831000 */ mtc1 $v1, $f2 -/* A963C8 80242C88 00000000 */ nop -/* A963CC 80242C8C 468010A1 */ cvt.d.w $f2, $f2 -/* A963D0 80242C90 4622A03E */ c.le.d $f20, $f2 -/* A963D4 80242C94 00000000 */ nop -/* A963D8 80242C98 4500000F */ bc1f .L80242CD8 -/* A963DC 80242C9C 2402000A */ addiu $v0, $zero, 0xa -/* A963E0 80242CA0 3C018024 */ lui $at, %hi(D_80245D98_A994D8) -/* A963E4 80242CA4 D4205D98 */ ldc1 $f0, %lo(D_80245D98_A994D8)($at) -/* A963E8 80242CA8 4620103C */ c.lt.d $f2, $f0 -/* A963EC 80242CAC 00000000 */ nop -/* A963F0 80242CB0 45000008 */ bc1f .L80242CD4 -/* A963F4 80242CB4 2402021C */ addiu $v0, $zero, 0x21c -/* A963F8 80242CB8 00431023 */ subu $v0, $v0, $v1 -/* A963FC 80242CBC 44826000 */ mtc1 $v0, $f12 -/* A96400 80242CC0 00000000 */ nop -/* A96404 80242CC4 0C00A6C9 */ jal clamp_angle -/* A96408 80242CC8 46806320 */ cvt.s.w $f12, $f12 -/* A9640C 80242CCC 4600010D */ trunc.w.s $f4, $f0 -/* A96410 80242CD0 E624006C */ swc1 $f4, 0x6c($s1) -.L80242CD4: -/* A96414 80242CD4 2402000A */ addiu $v0, $zero, 0xa -.L80242CD8: -/* A96418 80242CD8 AE420070 */ sw $v0, 0x70($s2) -.L80242CDC: -/* A9641C 80242CDC 8FBF0024 */ lw $ra, 0x24($sp) -/* A96420 80242CE0 8FB20020 */ lw $s2, 0x20($sp) -/* A96424 80242CE4 8FB1001C */ lw $s1, 0x1c($sp) -/* A96428 80242CE8 8FB00018 */ lw $s0, 0x18($sp) -/* A9642C 80242CEC D7B80038 */ ldc1 $f24, 0x38($sp) -/* A96430 80242CF0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A96434 80242CF4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A96438 80242CF8 03E00008 */ jr $ra -/* A9643C 80242CFC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00_A96440.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00_A96440.s deleted file mode 100644 index 3ad8d7883c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00_A96440.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D00_A96440 -/* A96440 80242D00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A96444 80242D04 AFB00010 */ sw $s0, 0x10($sp) -/* A96448 80242D08 0080802D */ daddu $s0, $a0, $zero -/* A9644C 80242D0C AFBF0014 */ sw $ra, 0x14($sp) -/* A96450 80242D10 8E020148 */ lw $v0, 0x148($s0) -/* A96454 80242D14 0C00EABB */ jal get_npc_unsafe -/* A96458 80242D18 84440008 */ lh $a0, 8($v0) -/* A9645C 80242D1C 24030028 */ addiu $v1, $zero, 0x28 -/* A96460 80242D20 A443008E */ sh $v1, 0x8e($v0) -/* A96464 80242D24 24020015 */ addiu $v0, $zero, 0x15 -/* A96468 80242D28 AE020070 */ sw $v0, 0x70($s0) -/* A9646C 80242D2C 8FBF0014 */ lw $ra, 0x14($sp) -/* A96470 80242D30 8FB00010 */ lw $s0, 0x10($sp) -/* A96474 80242D34 03E00008 */ jr $ra -/* A96478 80242D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s deleted file mode 100644 index 7297f1f8e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D3C_A9647C -/* A9647C 80242D3C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A96480 80242D40 AFB40048 */ sw $s4, 0x48($sp) -/* A96484 80242D44 0080A02D */ daddu $s4, $a0, $zero -/* A96488 80242D48 AFBF004C */ sw $ra, 0x4c($sp) -/* A9648C 80242D4C AFB30044 */ sw $s3, 0x44($sp) -/* A96490 80242D50 AFB20040 */ sw $s2, 0x40($sp) -/* A96494 80242D54 AFB1003C */ sw $s1, 0x3c($sp) -/* A96498 80242D58 AFB00038 */ sw $s0, 0x38($sp) -/* A9649C 80242D5C F7B40050 */ sdc1 $f20, 0x50($sp) -/* A964A0 80242D60 8E910148 */ lw $s1, 0x148($s4) -/* A964A4 80242D64 00A0902D */ daddu $s2, $a1, $zero -/* A964A8 80242D68 86240008 */ lh $a0, 8($s1) -/* A964AC 80242D6C 0C00EABB */ jal get_npc_unsafe -/* A964B0 80242D70 00C0982D */ daddu $s3, $a2, $zero -/* A964B4 80242D74 0040802D */ daddu $s0, $v0, $zero -/* A964B8 80242D78 9602008E */ lhu $v0, 0x8e($s0) -/* A964BC 80242D7C 2442FFFF */ addiu $v0, $v0, -1 -/* A964C0 80242D80 A602008E */ sh $v0, 0x8e($s0) -/* A964C4 80242D84 00021400 */ sll $v0, $v0, 0x10 -/* A964C8 80242D88 14400021 */ bnez $v0, .L80242E10 -/* A964CC 80242D8C 0280202D */ daddu $a0, $s4, $zero -/* A964D0 80242D90 24040002 */ addiu $a0, $zero, 2 -/* A964D4 80242D94 0200282D */ daddu $a1, $s0, $zero -/* A964D8 80242D98 0000302D */ daddu $a2, $zero, $zero -/* A964DC 80242D9C 8E2200CC */ lw $v0, 0xcc($s1) -/* A964E0 80242DA0 3C013F80 */ lui $at, 0x3f80 -/* A964E4 80242DA4 44810000 */ mtc1 $at, $f0 -/* A964E8 80242DA8 3C014000 */ lui $at, 0x4000 -/* A964EC 80242DAC 44811000 */ mtc1 $at, $f2 -/* A964F0 80242DB0 8C430000 */ lw $v1, ($v0) -/* A964F4 80242DB4 860200A8 */ lh $v0, 0xa8($s0) -/* A964F8 80242DB8 3C01C1A0 */ lui $at, 0xc1a0 -/* A964FC 80242DBC 44812000 */ mtc1 $at, $f4 -/* A96500 80242DC0 44824000 */ mtc1 $v0, $f8 -/* A96504 80242DC4 00000000 */ nop -/* A96508 80242DC8 46804220 */ cvt.s.w $f8, $f8 -/* A9650C 80242DCC 44074000 */ mfc1 $a3, $f8 -/* A96510 80242DD0 2402000C */ addiu $v0, $zero, 0xc -/* A96514 80242DD4 AE030028 */ sw $v1, 0x28($s0) -/* A96518 80242DD8 AFA2001C */ sw $v0, 0x1c($sp) -/* A9651C 80242DDC 27A20028 */ addiu $v0, $sp, 0x28 -/* A96520 80242DE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A96524 80242DE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A96528 80242DE8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9652C 80242DEC 0C01BFA4 */ jal fx_emote -/* A96530 80242DF0 AFA20020 */ sw $v0, 0x20($sp) -/* A96534 80242DF4 8E2200CC */ lw $v0, 0xcc($s1) -/* A96538 80242DF8 8C430000 */ lw $v1, ($v0) -/* A9653C 80242DFC 2402000F */ addiu $v0, $zero, 0xf -/* A96540 80242E00 A602008E */ sh $v0, 0x8e($s0) -/* A96544 80242E04 24020032 */ addiu $v0, $zero, 0x32 -/* A96548 80242E08 08090BB8 */ j .L80242EE0 -/* A9654C 80242E0C AE030028 */ sw $v1, 0x28($s0) -.L80242E10: -/* A96550 80242E10 8E450024 */ lw $a1, 0x24($s2) -/* A96554 80242E14 8E460028 */ lw $a2, 0x28($s2) -/* A96558 80242E18 0C09074C */ jal kpa_102_UnkNpcAIFunc47 -/* A9655C 80242E1C 0260382D */ daddu $a3, $s3, $zero -/* A96560 80242E20 24030001 */ addiu $v1, $zero, 1 -/* A96564 80242E24 1443002F */ bne $v0, $v1, .L80242EE4 -/* A96568 80242E28 00000000 */ nop -/* A9656C 80242E2C 8602008C */ lh $v0, 0x8c($s0) -/* A96570 80242E30 1440002C */ bnez $v0, .L80242EE4 -/* A96574 80242E34 0200202D */ daddu $a0, $s0, $zero -/* A96578 80242E38 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A9657C 80242E3C 0C012530 */ jal ai_enemy_play_sound -/* A96580 80242E40 0000302D */ daddu $a2, $zero, $zero -/* A96584 80242E44 27A4002C */ addiu $a0, $sp, 0x2c -/* A96588 80242E48 27A50030 */ addiu $a1, $sp, 0x30 -/* A9658C 80242E4C 3C0641F0 */ lui $a2, 0x41f0 -/* A96590 80242E50 C6020034 */ lwc1 $f2, 0x34($s0) -/* A96594 80242E54 3C014387 */ lui $at, 0x4387 -/* A96598 80242E58 44810000 */ mtc1 $at, $f0 -/* A9659C 80242E5C 8E2200CC */ lw $v0, 0xcc($s1) -/* A965A0 80242E60 C614003C */ lwc1 $f20, 0x3c($s0) -/* A965A4 80242E64 46020001 */ sub.s $f0, $f0, $f2 -/* A965A8 80242E68 3C0141E8 */ lui $at, 0x41e8 -/* A965AC 80242E6C 44812000 */ mtc1 $at, $f4 -/* A965B0 80242E70 C6060038 */ lwc1 $f6, 0x38($s0) -/* A965B4 80242E74 4604A500 */ add.s $f20, $f20, $f4 -/* A965B8 80242E78 3C013F80 */ lui $at, 0x3f80 -/* A965BC 80242E7C 44811000 */ mtc1 $at, $f2 -/* A965C0 80242E80 44070000 */ mfc1 $a3, $f0 -/* A965C4 80242E84 C6000040 */ lwc1 $f0, 0x40($s0) -/* A965C8 80242E88 8C420020 */ lw $v0, 0x20($v0) -/* A965CC 80242E8C 46020000 */ add.s $f0, $f0, $f2 -/* A965D0 80242E90 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A965D4 80242E94 AE020028 */ sw $v0, 0x28($s0) -/* A965D8 80242E98 0C00A7E7 */ jal add_vec2D_polar -/* A965DC 80242E9C E7A00030 */ swc1 $f0, 0x30($sp) -/* A965E0 80242EA0 0000202D */ daddu $a0, $zero, $zero -/* A965E4 80242EA4 4406A000 */ mfc1 $a2, $f20 -/* A965E8 80242EA8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A965EC 80242EAC C7A20030 */ lwc1 $f2, 0x30($sp) -/* A965F0 80242EB0 44050000 */ mfc1 $a1, $f0 -/* A965F4 80242EB4 44071000 */ mfc1 $a3, $f2 -/* A965F8 80242EB8 3C013DCC */ lui $at, 0x3dcc -/* A965FC 80242EBC 3421CCCD */ ori $at, $at, 0xcccd -/* A96600 80242EC0 44810000 */ mtc1 $at, $f0 -/* A96604 80242EC4 2402000D */ addiu $v0, $zero, 0xd -/* A96608 80242EC8 AFA20014 */ sw $v0, 0x14($sp) -/* A9660C 80242ECC 0C01BFEC */ jal fx_gather_energy_pink -/* A96610 80242ED0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A96614 80242ED4 2402000F */ addiu $v0, $zero, 0xf -/* A96618 80242ED8 A602008E */ sh $v0, 0x8e($s0) -/* A9661C 80242EDC 24020016 */ addiu $v0, $zero, 0x16 -.L80242EE0: -/* A96620 80242EE0 AE820070 */ sw $v0, 0x70($s4) -.L80242EE4: -/* A96624 80242EE4 8FBF004C */ lw $ra, 0x4c($sp) -/* A96628 80242EE8 8FB40048 */ lw $s4, 0x48($sp) -/* A9662C 80242EEC 8FB30044 */ lw $s3, 0x44($sp) -/* A96630 80242EF0 8FB20040 */ lw $s2, 0x40($sp) -/* A96634 80242EF4 8FB1003C */ lw $s1, 0x3c($sp) -/* A96638 80242EF8 8FB00038 */ lw $s0, 0x38($sp) -/* A9663C 80242EFC D7B40050 */ ldc1 $f20, 0x50($sp) -/* A96640 80242F00 03E00008 */ jr $ra -/* A96644 80242F04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s deleted file mode 100644 index ad83e9c609..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F08_A96648.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F08_A96648 -/* A96648 80242F08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9664C 80242F0C AFB10014 */ sw $s1, 0x14($sp) -/* A96650 80242F10 0080882D */ daddu $s1, $a0, $zero -/* A96654 80242F14 AFBF0018 */ sw $ra, 0x18($sp) -/* A96658 80242F18 AFB00010 */ sw $s0, 0x10($sp) -/* A9665C 80242F1C 8E300148 */ lw $s0, 0x148($s1) -/* A96660 80242F20 0C00EABB */ jal get_npc_unsafe -/* A96664 80242F24 86040008 */ lh $a0, 8($s0) -/* A96668 80242F28 0040202D */ daddu $a0, $v0, $zero -/* A9666C 80242F2C 9482008E */ lhu $v0, 0x8e($a0) -/* A96670 80242F30 2442FFFF */ addiu $v0, $v0, -1 -/* A96674 80242F34 A482008E */ sh $v0, 0x8e($a0) -/* A96678 80242F38 00021400 */ sll $v0, $v0, 0x10 -/* A9667C 80242F3C 1C400008 */ bgtz $v0, .L80242F60 -/* A96680 80242F40 00000000 */ nop -/* A96684 80242F44 8E0200CC */ lw $v0, 0xcc($s0) -/* A96688 80242F48 8C430024 */ lw $v1, 0x24($v0) -/* A9668C 80242F4C 24020007 */ addiu $v0, $zero, 7 -/* A96690 80242F50 A482008E */ sh $v0, 0x8e($a0) -/* A96694 80242F54 24020017 */ addiu $v0, $zero, 0x17 -/* A96698 80242F58 AC830028 */ sw $v1, 0x28($a0) -/* A9669C 80242F5C AE220070 */ sw $v0, 0x70($s1) -.L80242F60: -/* A966A0 80242F60 8FBF0018 */ lw $ra, 0x18($sp) -/* A966A4 80242F64 8FB10014 */ lw $s1, 0x14($sp) -/* A966A8 80242F68 8FB00010 */ lw $s0, 0x10($sp) -/* A966AC 80242F6C 03E00008 */ jr $ra -/* A966B0 80242F70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s deleted file mode 100644 index ec143689d8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s +++ /dev/null @@ -1,84 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74_A966B4 -/* A966B4 80242F74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A966B8 80242F78 AFB3003C */ sw $s3, 0x3c($sp) -/* A966BC 80242F7C 0080982D */ daddu $s3, $a0, $zero -/* A966C0 80242F80 AFBF0044 */ sw $ra, 0x44($sp) -/* A966C4 80242F84 AFB40040 */ sw $s4, 0x40($sp) -/* A966C8 80242F88 AFB20038 */ sw $s2, 0x38($sp) -/* A966CC 80242F8C AFB10034 */ sw $s1, 0x34($sp) -/* A966D0 80242F90 AFB00030 */ sw $s0, 0x30($sp) -/* A966D4 80242F94 8E720148 */ lw $s2, 0x148($s3) -/* A966D8 80242F98 00A0882D */ daddu $s1, $a1, $zero -/* A966DC 80242F9C 86440008 */ lh $a0, 8($s2) -/* A966E0 80242FA0 0C00EABB */ jal get_npc_unsafe -/* A966E4 80242FA4 00C0A02D */ daddu $s4, $a2, $zero -/* A966E8 80242FA8 0040802D */ daddu $s0, $v0, $zero -/* A966EC 80242FAC 9602008E */ lhu $v0, 0x8e($s0) -/* A966F0 80242FB0 2442FFFF */ addiu $v0, $v0, -1 -/* A966F4 80242FB4 A602008E */ sh $v0, 0x8e($s0) -/* A966F8 80242FB8 00021400 */ sll $v0, $v0, 0x10 -/* A966FC 80242FBC 1C400032 */ bgtz $v0, .L80243088 -/* A96700 80242FC0 00000000 */ nop -/* A96704 80242FC4 0260202D */ daddu $a0, $s3, $zero -/* A96708 80242FC8 8E250024 */ lw $a1, 0x24($s1) -/* A9670C 80242FCC 8E260028 */ lw $a2, 0x28($s1) -/* A96710 80242FD0 0C09074C */ jal kpa_102_UnkNpcAIFunc47 -/* A96714 80242FD4 0280382D */ daddu $a3, $s4, $zero -/* A96718 80242FD8 0040882D */ daddu $s1, $v0, $zero -/* A9671C 80242FDC 24020001 */ addiu $v0, $zero, 1 -/* A96720 80242FE0 1222001D */ beq $s1, $v0, .L80243058 -/* A96724 80242FE4 0200282D */ daddu $a1, $s0, $zero -/* A96728 80242FE8 24040002 */ addiu $a0, $zero, 2 -/* A9672C 80242FEC 0000302D */ daddu $a2, $zero, $zero -/* A96730 80242FF0 860300A8 */ lh $v1, 0xa8($s0) -/* A96734 80242FF4 3C013F80 */ lui $at, 0x3f80 -/* A96738 80242FF8 44810000 */ mtc1 $at, $f0 -/* A9673C 80242FFC 3C014000 */ lui $at, 0x4000 -/* A96740 80243000 44811000 */ mtc1 $at, $f2 -/* A96744 80243004 3C01C1A0 */ lui $at, 0xc1a0 -/* A96748 80243008 44812000 */ mtc1 $at, $f4 -/* A9674C 8024300C 2402000C */ addiu $v0, $zero, 0xc -/* A96750 80243010 AFA2001C */ sw $v0, 0x1c($sp) -/* A96754 80243014 44833000 */ mtc1 $v1, $f6 -/* A96758 80243018 00000000 */ nop -/* A9675C 8024301C 468031A0 */ cvt.s.w $f6, $f6 -/* A96760 80243020 44073000 */ mfc1 $a3, $f6 -/* A96764 80243024 27A20028 */ addiu $v0, $sp, 0x28 -/* A96768 80243028 AFA20020 */ sw $v0, 0x20($sp) -/* A9676C 8024302C E7A00010 */ swc1 $f0, 0x10($sp) -/* A96770 80243030 E7A20014 */ swc1 $f2, 0x14($sp) -/* A96774 80243034 0C01BFA4 */ jal fx_emote -/* A96778 80243038 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9677C 8024303C 8E4200CC */ lw $v0, 0xcc($s2) -/* A96780 80243040 8C430000 */ lw $v1, ($v0) -/* A96784 80243044 2402000F */ addiu $v0, $zero, 0xf -/* A96788 80243048 A602008E */ sh $v0, 0x8e($s0) -/* A9678C 8024304C 24020032 */ addiu $v0, $zero, 0x32 -/* A96790 80243050 08090C21 */ j .L80243084 -/* A96794 80243054 AE030028 */ sw $v1, 0x28($s0) -.L80243058: -/* A96798 80243058 0200202D */ daddu $a0, $s0, $zero -/* A9679C 8024305C 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A967A0 80243060 0C012530 */ jal ai_enemy_play_sound -/* A967A4 80243064 0000302D */ daddu $a2, $zero, $zero -/* A967A8 80243068 86440008 */ lh $a0, 8($s2) -/* A967AC 8024306C 0C00FB3A */ jal get_enemy -/* A967B0 80243070 24840001 */ addiu $a0, $a0, 1 -/* A967B4 80243074 AC51006C */ sw $s1, 0x6c($v0) -/* A967B8 80243078 24020014 */ addiu $v0, $zero, 0x14 -/* A967BC 8024307C A602008E */ sh $v0, 0x8e($s0) -/* A967C0 80243080 24020018 */ addiu $v0, $zero, 0x18 -.L80243084: -/* A967C4 80243084 AE620070 */ sw $v0, 0x70($s3) -.L80243088: -/* A967C8 80243088 8FBF0044 */ lw $ra, 0x44($sp) -/* A967CC 8024308C 8FB40040 */ lw $s4, 0x40($sp) -/* A967D0 80243090 8FB3003C */ lw $s3, 0x3c($sp) -/* A967D4 80243094 8FB20038 */ lw $s2, 0x38($sp) -/* A967D8 80243098 8FB10034 */ lw $s1, 0x34($sp) -/* A967DC 8024309C 8FB00030 */ lw $s0, 0x30($sp) -/* A967E0 802430A0 03E00008 */ jr $ra -/* A967E4 802430A4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s deleted file mode 100644 index e68d16ea19..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430A8_A967E8 -/* A967E8 802430A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A967EC 802430AC AFB20018 */ sw $s2, 0x18($sp) -/* A967F0 802430B0 0080902D */ daddu $s2, $a0, $zero -/* A967F4 802430B4 AFBF001C */ sw $ra, 0x1c($sp) -/* A967F8 802430B8 AFB10014 */ sw $s1, 0x14($sp) -/* A967FC 802430BC AFB00010 */ sw $s0, 0x10($sp) -/* A96800 802430C0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A96804 802430C4 8E500148 */ lw $s0, 0x148($s2) -/* A96808 802430C8 0C00EABB */ jal get_npc_unsafe -/* A9680C 802430CC 86040008 */ lh $a0, 8($s0) -/* A96810 802430D0 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A96814 802430D4 46806320 */ cvt.s.w $f12, $f12 -/* A96818 802430D8 0040882D */ daddu $s1, $v0, $zero -/* A9681C 802430DC C6140070 */ lwc1 $f20, 0x70($s0) -/* A96820 802430E0 4680A520 */ cvt.s.w $f20, $f20 -/* A96824 802430E4 3C014059 */ lui $at, 0x4059 -/* A96828 802430E8 44810800 */ mtc1 $at, $f1 -/* A9682C 802430EC 44800000 */ mtc1 $zero, $f0 -/* A96830 802430F0 4600A521 */ cvt.d.s $f20, $f20 -/* A96834 802430F4 4620A503 */ div.d $f20, $f20, $f0 -/* A96838 802430F8 0C00A8BB */ jal sin_deg -/* A9683C 802430FC 4620A520 */ cvt.s.d $f20, $f20 -/* A96840 80243100 3C014018 */ lui $at, 0x4018 -/* A96844 80243104 44811800 */ mtc1 $at, $f3 -/* A96848 80243108 44801000 */ mtc1 $zero, $f2 -/* A9684C 8024310C 46000021 */ cvt.d.s $f0, $f0 -/* A96850 80243110 46220002 */ mul.d $f0, $f0, $f2 -/* A96854 80243114 00000000 */ nop -/* A96858 80243118 4600A0A1 */ cvt.d.s $f2, $f20 -/* A9685C 8024311C 46201080 */ add.d $f2, $f2, $f0 -/* A96860 80243120 462010A0 */ cvt.s.d $f2, $f2 -/* A96864 80243124 E622003C */ swc1 $f2, 0x3c($s1) -/* A96868 80243128 8E02006C */ lw $v0, 0x6c($s0) -/* A9686C 8024312C 2442000A */ addiu $v0, $v0, 0xa -/* A96870 80243130 44826000 */ mtc1 $v0, $f12 -/* A96874 80243134 00000000 */ nop -/* A96878 80243138 0C00A6C9 */ jal clamp_angle -/* A9687C 8024313C 46806320 */ cvt.s.w $f12, $f12 -/* A96880 80243140 4600010D */ trunc.w.s $f4, $f0 -/* A96884 80243144 E604006C */ swc1 $f4, 0x6c($s0) -/* A96888 80243148 9622008E */ lhu $v0, 0x8e($s1) -/* A9688C 8024314C 2442FFFF */ addiu $v0, $v0, -1 -/* A96890 80243150 A622008E */ sh $v0, 0x8e($s1) -/* A96894 80243154 00021400 */ sll $v0, $v0, 0x10 -/* A96898 80243158 1C400008 */ bgtz $v0, .L8024317C -/* A9689C 8024315C 00000000 */ nop -/* A968A0 80243160 8E0200CC */ lw $v0, 0xcc($s0) -/* A968A4 80243164 8C430000 */ lw $v1, ($v0) -/* A968A8 80243168 24020003 */ addiu $v0, $zero, 3 -/* A968AC 8024316C A622008E */ sh $v0, 0x8e($s1) -/* A968B0 80243170 24020032 */ addiu $v0, $zero, 0x32 -/* A968B4 80243174 AE230028 */ sw $v1, 0x28($s1) -/* A968B8 80243178 AE420070 */ sw $v0, 0x70($s2) -.L8024317C: -/* A968BC 8024317C 8FBF001C */ lw $ra, 0x1c($sp) -/* A968C0 80243180 8FB20018 */ lw $s2, 0x18($sp) -/* A968C4 80243184 8FB10014 */ lw $s1, 0x14($sp) -/* A968C8 80243188 8FB00010 */ lw $s0, 0x10($sp) -/* A968CC 8024318C D7B40020 */ ldc1 $f20, 0x20($sp) -/* A968D0 80243190 03E00008 */ jr $ra -/* A968D4 80243194 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s deleted file mode 100644 index d585a5e6bb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243198_A968D8 -/* A968D8 80243198 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A968DC 8024319C AFB20018 */ sw $s2, 0x18($sp) -/* A968E0 802431A0 0080902D */ daddu $s2, $a0, $zero -/* A968E4 802431A4 AFBF001C */ sw $ra, 0x1c($sp) -/* A968E8 802431A8 AFB10014 */ sw $s1, 0x14($sp) -/* A968EC 802431AC AFB00010 */ sw $s0, 0x10($sp) -/* A968F0 802431B0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A968F4 802431B4 8E500148 */ lw $s0, 0x148($s2) -/* A968F8 802431B8 0C00EABB */ jal get_npc_unsafe -/* A968FC 802431BC 86040008 */ lh $a0, 8($s0) -/* A96900 802431C0 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A96904 802431C4 46806320 */ cvt.s.w $f12, $f12 -/* A96908 802431C8 0040882D */ daddu $s1, $v0, $zero -/* A9690C 802431CC C6140070 */ lwc1 $f20, 0x70($s0) -/* A96910 802431D0 4680A520 */ cvt.s.w $f20, $f20 -/* A96914 802431D4 3C014059 */ lui $at, 0x4059 -/* A96918 802431D8 44810800 */ mtc1 $at, $f1 -/* A9691C 802431DC 44800000 */ mtc1 $zero, $f0 -/* A96920 802431E0 4600A521 */ cvt.d.s $f20, $f20 -/* A96924 802431E4 4620A503 */ div.d $f20, $f20, $f0 -/* A96928 802431E8 0C00A8BB */ jal sin_deg -/* A9692C 802431EC 4620A520 */ cvt.s.d $f20, $f20 -/* A96930 802431F0 3C014018 */ lui $at, 0x4018 -/* A96934 802431F4 44811800 */ mtc1 $at, $f3 -/* A96938 802431F8 44801000 */ mtc1 $zero, $f2 -/* A9693C 802431FC 46000021 */ cvt.d.s $f0, $f0 -/* A96940 80243200 46220002 */ mul.d $f0, $f0, $f2 -/* A96944 80243204 00000000 */ nop -/* A96948 80243208 4600A0A1 */ cvt.d.s $f2, $f20 -/* A9694C 8024320C 46201080 */ add.d $f2, $f2, $f0 -/* A96950 80243210 462010A0 */ cvt.s.d $f2, $f2 -/* A96954 80243214 E622003C */ swc1 $f2, 0x3c($s1) -/* A96958 80243218 8E02006C */ lw $v0, 0x6c($s0) -/* A9695C 8024321C 2442000A */ addiu $v0, $v0, 0xa -/* A96960 80243220 44826000 */ mtc1 $v0, $f12 -/* A96964 80243224 00000000 */ nop -/* A96968 80243228 0C00A6C9 */ jal clamp_angle -/* A9696C 8024322C 46806320 */ cvt.s.w $f12, $f12 -/* A96970 80243230 4600010D */ trunc.w.s $f4, $f0 -/* A96974 80243234 E604006C */ swc1 $f4, 0x6c($s0) -/* A96978 80243238 9622008E */ lhu $v0, 0x8e($s1) -/* A9697C 8024323C 2442FFFF */ addiu $v0, $v0, -1 -/* A96980 80243240 A622008E */ sh $v0, 0x8e($s1) -/* A96984 80243244 00021400 */ sll $v0, $v0, 0x10 -/* A96988 80243248 1C400002 */ bgtz $v0, .L80243254 -/* A9698C 8024324C 2402000A */ addiu $v0, $zero, 0xa -/* A96990 80243250 AE420070 */ sw $v0, 0x70($s2) -.L80243254: -/* A96994 80243254 8FBF001C */ lw $ra, 0x1c($sp) -/* A96998 80243258 8FB20018 */ lw $s2, 0x18($sp) -/* A9699C 8024325C 8FB10014 */ lw $s1, 0x14($sp) -/* A969A0 80243260 8FB00010 */ lw $s0, 0x10($sp) -/* A969A4 80243264 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A969A8 80243268 03E00008 */ jr $ra -/* A969AC 8024326C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s deleted file mode 100644 index 2c385bcb78..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s +++ /dev/null @@ -1,191 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245DA0_A994E0 -.word .L802433CC_A96B0C, .L802433DC_A96B1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802433F4_A96B34, .L80243414_A96B54, .L80243434_A96B74, .L802434DC_A96C1C, .L802434DC_A96C1C, .L8024344C_A96B8C, .L80243464_A96BA4, .L8024347C_A96BBC, .L80243494_A96BD4, .L802434B4_A96BF4, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434DC_A96C1C, .L802434CC_A96C0C, 0, 0, 0 - -.section .text - -glabel func_80243270_A969B0 -/* A969B0 80243270 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A969B4 80243274 AFB40040 */ sw $s4, 0x40($sp) -/* A969B8 80243278 0080A02D */ daddu $s4, $a0, $zero -/* A969BC 8024327C AFBF0048 */ sw $ra, 0x48($sp) -/* A969C0 80243280 AFB50044 */ sw $s5, 0x44($sp) -/* A969C4 80243284 AFB3003C */ sw $s3, 0x3c($sp) -/* A969C8 80243288 AFB20038 */ sw $s2, 0x38($sp) -/* A969CC 8024328C AFB10034 */ sw $s1, 0x34($sp) -/* A969D0 80243290 AFB00030 */ sw $s0, 0x30($sp) -/* A969D4 80243294 8E920148 */ lw $s2, 0x148($s4) -/* A969D8 80243298 86440008 */ lh $a0, 8($s2) -/* A969DC 8024329C 8E90000C */ lw $s0, 0xc($s4) -/* A969E0 802432A0 0C00EABB */ jal get_npc_unsafe -/* A969E4 802432A4 00A0882D */ daddu $s1, $a1, $zero -/* A969E8 802432A8 0280202D */ daddu $a0, $s4, $zero -/* A969EC 802432AC 8E050000 */ lw $a1, ($s0) -/* A969F0 802432B0 0C0B1EAF */ jal evt_get_variable -/* A969F4 802432B4 0040A82D */ daddu $s5, $v0, $zero -/* A969F8 802432B8 AFA00010 */ sw $zero, 0x10($sp) -/* A969FC 802432BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A00 802432C0 8C630030 */ lw $v1, 0x30($v1) -/* A96A04 802432C4 AFA30014 */ sw $v1, 0x14($sp) -/* A96A08 802432C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A0C 802432CC 8C63001C */ lw $v1, 0x1c($v1) -/* A96A10 802432D0 AFA30018 */ sw $v1, 0x18($sp) -/* A96A14 802432D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A18 802432D8 8C630024 */ lw $v1, 0x24($v1) -/* A96A1C 802432DC AFA3001C */ sw $v1, 0x1c($sp) -/* A96A20 802432E0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A24 802432E4 8C630028 */ lw $v1, 0x28($v1) -/* A96A28 802432E8 27B30010 */ addiu $s3, $sp, 0x10 -/* A96A2C 802432EC AFA30020 */ sw $v1, 0x20($sp) -/* A96A30 802432F0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A34 802432F4 3C0142F0 */ lui $at, 0x42f0 -/* A96A38 802432F8 44810000 */ mtc1 $at, $f0 -/* A96A3C 802432FC 8C63002C */ lw $v1, 0x2c($v1) -/* A96A40 80243300 0040802D */ daddu $s0, $v0, $zero -/* A96A44 80243304 E7A00028 */ swc1 $f0, 0x28($sp) -/* A96A48 80243308 A7A0002C */ sh $zero, 0x2c($sp) -/* A96A4C 8024330C 12200019 */ beqz $s1, .L80243374 -/* A96A50 80243310 AFA30024 */ sw $v1, 0x24($sp) -/* A96A54 80243314 8EA20000 */ lw $v0, ($s5) -/* A96A58 80243318 2403FDFF */ addiu $v1, $zero, -0x201 -/* A96A5C 8024331C 00431024 */ and $v0, $v0, $v1 -/* A96A60 80243320 34420008 */ ori $v0, $v0, 8 -/* A96A64 80243324 3C030020 */ lui $v1, 0x20 -/* A96A68 80243328 00431025 */ or $v0, $v0, $v1 -/* A96A6C 8024332C AEA20000 */ sw $v0, ($s5) -/* A96A70 80243330 8E420000 */ lw $v0, ($s2) -/* A96A74 80243334 00431025 */ or $v0, $v0, $v1 -/* A96A78 80243338 AE420000 */ sw $v0, ($s2) -/* A96A7C 8024333C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* A96A80 80243340 3C014059 */ lui $at, 0x4059 -/* A96A84 80243344 44811800 */ mtc1 $at, $f3 -/* A96A88 80243348 44801000 */ mtc1 $zero, $f2 -/* A96A8C 8024334C 46000021 */ cvt.d.s $f0, $f0 -/* A96A90 80243350 46220002 */ mul.d $f0, $f0, $f2 -/* A96A94 80243354 00000000 */ nop -/* A96A98 80243358 2402000A */ addiu $v0, $zero, 0xa -/* A96A9C 8024335C AE40006C */ sw $zero, 0x6c($s2) -/* A96AA0 80243360 AE400074 */ sw $zero, 0x74($s2) -/* A96AA4 80243364 4620010D */ trunc.w.d $f4, $f0 -/* A96AA8 80243368 E6440070 */ swc1 $f4, 0x70($s2) -/* A96AAC 8024336C A6A0008E */ sh $zero, 0x8e($s5) -/* A96AB0 80243370 AE820070 */ sw $v0, 0x70($s4) -.L80243374: -/* A96AB4 80243374 2402FFFB */ addiu $v0, $zero, -5 -/* A96AB8 80243378 A2A200AB */ sb $v0, 0xab($s5) -/* A96ABC 8024337C 8E4300B0 */ lw $v1, 0xb0($s2) -/* A96AC0 80243380 30620004 */ andi $v0, $v1, 4 -/* A96AC4 80243384 10400007 */ beqz $v0, .L802433A4 -/* A96AC8 80243388 00000000 */ nop -/* A96ACC 8024338C 824200B4 */ lb $v0, 0xb4($s2) -/* A96AD0 80243390 14400053 */ bnez $v0, .L802434E0 -/* A96AD4 80243394 0000102D */ daddu $v0, $zero, $zero -/* A96AD8 80243398 2402FFFB */ addiu $v0, $zero, -5 -/* A96ADC 8024339C 00621024 */ and $v0, $v1, $v0 -/* A96AE0 802433A0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802433A4: -/* A96AE4 802433A4 8E820070 */ lw $v0, 0x70($s4) -/* A96AE8 802433A8 2443FFF6 */ addiu $v1, $v0, -0xa -/* A96AEC 802433AC 2C620029 */ sltiu $v0, $v1, 0x29 -/* A96AF0 802433B0 1040004A */ beqz $v0, .L802434DC_A96C1C -/* A96AF4 802433B4 00031080 */ sll $v0, $v1, 2 -/* A96AF8 802433B8 3C018024 */ lui $at, %hi(jtbl_80245DA0_A994E0) -/* A96AFC 802433BC 00220821 */ addu $at, $at, $v0 -/* A96B00 802433C0 8C225DA0 */ lw $v0, %lo(jtbl_80245DA0_A994E0)($at) -/* A96B04 802433C4 00400008 */ jr $v0 -/* A96B08 802433C8 00000000 */ nop -.L802433CC_A96B0C: -/* A96B0C 802433CC 0280202D */ daddu $a0, $s4, $zero -/* A96B10 802433D0 0200282D */ daddu $a1, $s0, $zero -/* A96B14 802433D4 0C090904 */ jal func_80242410_A95B50 -/* A96B18 802433D8 0260302D */ daddu $a2, $s3, $zero -.L802433DC_A96B1C: -/* A96B1C 802433DC 0280202D */ daddu $a0, $s4, $zero -/* A96B20 802433E0 0200282D */ daddu $a1, $s0, $zero -/* A96B24 802433E4 0C090913 */ jal func_8024244C_A95B8C -/* A96B28 802433E8 0260302D */ daddu $a2, $s3, $zero -/* A96B2C 802433EC 08090D38 */ j .L802434E0 -/* A96B30 802433F0 0000102D */ daddu $v0, $zero, $zero -.L802433F4_A96B34: -/* A96B34 802433F4 0280202D */ daddu $a0, $s4, $zero -/* A96B38 802433F8 0200282D */ daddu $a1, $s0, $zero -/* A96B3C 802433FC 0C090976 */ jal func_802425D8_A95D18 -/* A96B40 80243400 0260302D */ daddu $a2, $s3, $zero -/* A96B44 80243404 8E830070 */ lw $v1, 0x70($s4) -/* A96B48 80243408 24020010 */ addiu $v0, $zero, 0x10 -/* A96B4C 8024340C 14620034 */ bne $v1, $v0, .L802434E0 -/* A96B50 80243410 0000102D */ daddu $v0, $zero, $zero -.L80243414_A96B54: -/* A96B54 80243414 0280202D */ daddu $a0, $s4, $zero -/* A96B58 80243418 0200282D */ daddu $a1, $s0, $zero -/* A96B5C 8024341C 0C090A72 */ jal func_802429C8_A96108 -/* A96B60 80243420 0260302D */ daddu $a2, $s3, $zero -/* A96B64 80243424 8E830070 */ lw $v1, 0x70($s4) -/* A96B68 80243428 24020011 */ addiu $v0, $zero, 0x11 -/* A96B6C 8024342C 1462002C */ bne $v1, $v0, .L802434E0 -/* A96B70 80243430 0000102D */ daddu $v0, $zero, $zero -.L80243434_A96B74: -/* A96B74 80243434 0280202D */ daddu $a0, $s4, $zero -/* A96B78 80243438 0200282D */ daddu $a1, $s0, $zero -/* A96B7C 8024343C 0C090AAF */ jal func_80242ABC_A961FC -/* A96B80 80243440 0260302D */ daddu $a2, $s3, $zero -/* A96B84 80243444 08090D38 */ j .L802434E0 -/* A96B88 80243448 0000102D */ daddu $v0, $zero, $zero -.L8024344C_A96B8C: -/* A96B8C 8024344C 0280202D */ daddu $a0, $s4, $zero -/* A96B90 80243450 0200282D */ daddu $a1, $s0, $zero -/* A96B94 80243454 0C090B40 */ jal func_80242D00_A96440 -/* A96B98 80243458 0260302D */ daddu $a2, $s3, $zero -/* A96B9C 8024345C 08090D38 */ j .L802434E0 -/* A96BA0 80243460 0000102D */ daddu $v0, $zero, $zero -.L80243464_A96BA4: -/* A96BA4 80243464 0280202D */ daddu $a0, $s4, $zero -/* A96BA8 80243468 0200282D */ daddu $a1, $s0, $zero -/* A96BAC 8024346C 0C090B4F */ jal func_80242D3C_A9647C -/* A96BB0 80243470 0260302D */ daddu $a2, $s3, $zero -/* A96BB4 80243474 08090D38 */ j .L802434E0 -/* A96BB8 80243478 0000102D */ daddu $v0, $zero, $zero -.L8024347C_A96BBC: -/* A96BBC 8024347C 0280202D */ daddu $a0, $s4, $zero -/* A96BC0 80243480 0200282D */ daddu $a1, $s0, $zero -/* A96BC4 80243484 0C090BC2 */ jal func_80242F08_A96648 -/* A96BC8 80243488 0260302D */ daddu $a2, $s3, $zero -/* A96BCC 8024348C 08090D38 */ j .L802434E0 -/* A96BD0 80243490 0000102D */ daddu $v0, $zero, $zero -.L80243494_A96BD4: -/* A96BD4 80243494 0280202D */ daddu $a0, $s4, $zero -/* A96BD8 80243498 0200282D */ daddu $a1, $s0, $zero -/* A96BDC 8024349C 0C090BDD */ jal func_80242F74_A966B4 -/* A96BE0 802434A0 0260302D */ daddu $a2, $s3, $zero -/* A96BE4 802434A4 8E830070 */ lw $v1, 0x70($s4) -/* A96BE8 802434A8 24020018 */ addiu $v0, $zero, 0x18 -/* A96BEC 802434AC 1462000C */ bne $v1, $v0, .L802434E0 -/* A96BF0 802434B0 0000102D */ daddu $v0, $zero, $zero -.L802434B4_A96BF4: -/* A96BF4 802434B4 0280202D */ daddu $a0, $s4, $zero -/* A96BF8 802434B8 0200282D */ daddu $a1, $s0, $zero -/* A96BFC 802434BC 0C090C2A */ jal func_802430A8_A967E8 -/* A96C00 802434C0 0260302D */ daddu $a2, $s3, $zero -/* A96C04 802434C4 08090D38 */ j .L802434E0 -/* A96C08 802434C8 0000102D */ daddu $v0, $zero, $zero -.L802434CC_A96C0C: -/* A96C0C 802434CC 0280202D */ daddu $a0, $s4, $zero -/* A96C10 802434D0 0200282D */ daddu $a1, $s0, $zero -/* A96C14 802434D4 0C090C66 */ jal func_80243198_A968D8 -/* A96C18 802434D8 0260302D */ daddu $a2, $s3, $zero -.L802434DC_A96C1C: -/* A96C1C 802434DC 0000102D */ daddu $v0, $zero, $zero -.L802434E0: -/* A96C20 802434E0 8FBF0048 */ lw $ra, 0x48($sp) -/* A96C24 802434E4 8FB50044 */ lw $s5, 0x44($sp) -/* A96C28 802434E8 8FB40040 */ lw $s4, 0x40($sp) -/* A96C2C 802434EC 8FB3003C */ lw $s3, 0x3c($sp) -/* A96C30 802434F0 8FB20038 */ lw $s2, 0x38($sp) -/* A96C34 802434F4 8FB10034 */ lw $s1, 0x34($sp) -/* A96C38 802434F8 8FB00030 */ lw $s0, 0x30($sp) -/* A96C3C 802434FC 03E00008 */ jr $ra -/* A96C40 80243500 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s deleted file mode 100644 index 354a07ea91..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024353C_A96C7C -/* A96C7C 8024353C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A96C80 80243540 AFBF0014 */ sw $ra, 0x14($sp) -/* A96C84 80243544 AFB00010 */ sw $s0, 0x10($sp) -/* A96C88 80243548 8C900148 */ lw $s0, 0x148($a0) -/* A96C8C 8024354C 0C00EABB */ jal get_npc_unsafe -/* A96C90 80243550 86040008 */ lh $a0, 8($s0) -/* A96C94 80243554 0040202D */ daddu $a0, $v0, $zero -/* A96C98 80243558 8E03006C */ lw $v1, 0x6c($s0) -/* A96C9C 8024355C 24020002 */ addiu $v0, $zero, 2 -/* A96CA0 80243560 14620003 */ bne $v1, $v0, .L80243570 -/* A96CA4 80243564 00000000 */ nop -/* A96CA8 80243568 AC80001C */ sw $zero, 0x1c($a0) -/* A96CAC 8024356C AC800018 */ sw $zero, 0x18($a0) -.L80243570: -/* A96CB0 80243570 8FBF0014 */ lw $ra, 0x14($sp) -/* A96CB4 80243574 8FB00010 */ lw $s0, 0x10($sp) -/* A96CB8 80243578 24020002 */ addiu $v0, $zero, 2 -/* A96CBC 8024357C 03E00008 */ jr $ra -/* A96CC0 80243580 27BD0018 */ addiu $sp, $sp, 0x18 -/* A96CC4 80243584 00000000 */ nop -/* A96CC8 80243588 00000000 */ nop -/* A96CCC 8024358C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240000_AA2D20.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240000_AA2D20.s deleted file mode 100644 index 0ba0cef989..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240000_AA2D20.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_AA2D20 -/* AA2D20 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA2D24 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AA2D28 80240008 24100032 */ addiu $s0, $zero, 0x32 -/* AA2D2C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -.L80240010: -/* AA2D30 80240010 0C00FB3A */ jal get_enemy -/* AA2D34 80240014 0200202D */ daddu $a0, $s0, $zero -/* AA2D38 80240018 8C42006C */ lw $v0, 0x6c($v0) -/* AA2D3C 8024001C 54400003 */ bnel $v0, $zero, .L8024002C -/* AA2D40 80240020 26100001 */ addiu $s0, $s0, 1 -/* AA2D44 80240024 0809000E */ j .L80240038 -/* AA2D48 80240028 0200102D */ daddu $v0, $s0, $zero -.L8024002C: -/* AA2D4C 8024002C 2A02003C */ slti $v0, $s0, 0x3c -/* AA2D50 80240030 1440FFF7 */ bnez $v0, .L80240010 -/* AA2D54 80240034 2402FFFF */ addiu $v0, $zero, -1 -.L80240038: -/* AA2D58 80240038 8FBF0014 */ lw $ra, 0x14($sp) -/* AA2D5C 8024003C 8FB00010 */ lw $s0, 0x10($sp) -/* AA2D60 80240040 03E00008 */ jr $ra -/* AA2D64 80240044 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s deleted file mode 100644 index 4d23c95e79..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244758_AA7478 -.double 190.0 - -.section .text - -glabel func_802404AC_AA31CC -/* AA31CC 802404AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA31D0 802404B0 AFB40020 */ sw $s4, 0x20($sp) -/* AA31D4 802404B4 0080A02D */ daddu $s4, $a0, $zero -/* AA31D8 802404B8 AFBF0024 */ sw $ra, 0x24($sp) -/* AA31DC 802404BC AFB3001C */ sw $s3, 0x1c($sp) -/* AA31E0 802404C0 AFB20018 */ sw $s2, 0x18($sp) -/* AA31E4 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* AA31E8 802404C8 AFB00010 */ sw $s0, 0x10($sp) -/* AA31EC 802404CC 8E920148 */ lw $s2, 0x148($s4) -/* AA31F0 802404D0 86440008 */ lh $a0, 8($s2) -/* AA31F4 802404D4 8E90000C */ lw $s0, 0xc($s4) -/* AA31F8 802404D8 0C00EABB */ jal get_npc_unsafe -/* AA31FC 802404DC 00A0882D */ daddu $s1, $a1, $zero -/* AA3200 802404E0 0280202D */ daddu $a0, $s4, $zero -/* AA3204 802404E4 8E050000 */ lw $a1, ($s0) -/* AA3208 802404E8 0C0B1EAF */ jal evt_get_variable -/* AA320C 802404EC 0040982D */ daddu $s3, $v0, $zero -/* AA3210 802404F0 1220000C */ beqz $s1, .L80240524 -/* AA3214 802404F4 2402001E */ addiu $v0, $zero, 0x1e -/* AA3218 802404F8 AE800070 */ sw $zero, 0x70($s4) -/* AA321C 802404FC A662008E */ sh $v0, 0x8e($s3) -/* AA3220 80240500 8E4200CC */ lw $v0, 0xcc($s2) -/* AA3224 80240504 8C420000 */ lw $v0, ($v0) -/* AA3228 80240508 0260202D */ daddu $a0, $s3, $zero -/* AA322C 8024050C AE620028 */ sw $v0, 0x28($s3) -/* AA3230 80240510 8E420000 */ lw $v0, ($s2) -/* AA3234 80240514 3C030020 */ lui $v1, 0x20 -/* AA3238 80240518 00431025 */ or $v0, $v0, $v1 -/* AA323C 8024051C 0C00EAFF */ jal disable_npc_shadow -/* AA3240 80240520 AE420000 */ sw $v0, ($s2) -.L80240524: -/* AA3244 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* AA3248 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* AA324C 8024052C C660003C */ lwc1 $f0, 0x3c($s3) -/* AA3250 80240530 C442002C */ lwc1 $f2, 0x2c($v0) -/* AA3254 80240534 46020001 */ sub.s $f0, $f0, $f2 -/* AA3258 80240538 3C018024 */ lui $at, %hi(D_80244758_AA7478) -/* AA325C 8024053C D4224758 */ ldc1 $f2, %lo(D_80244758_AA7478)($at) -/* AA3260 80240540 46000121 */ cvt.d.s $f4, $f0 -/* AA3264 80240544 4624103C */ c.lt.d $f2, $f4 -/* AA3268 80240548 00000000 */ nop -/* AA326C 8024054C 45010071 */ bc1t .L80240714 -/* AA3270 80240550 0000102D */ daddu $v0, $zero, $zero -/* AA3274 80240554 3C01C054 */ lui $at, 0xc054 -/* AA3278 80240558 44810800 */ mtc1 $at, $f1 -/* AA327C 8024055C 44800000 */ mtc1 $zero, $f0 -/* AA3280 80240560 00000000 */ nop -/* AA3284 80240564 4620203C */ c.lt.d $f4, $f0 -/* AA3288 80240568 00000000 */ nop -/* AA328C 8024056C 45010069 */ bc1t .L80240714 -/* AA3290 80240570 00000000 */ nop -/* AA3294 80240574 8E4200B0 */ lw $v0, 0xb0($s2) -/* AA3298 80240578 30420004 */ andi $v0, $v0, 4 -/* AA329C 8024057C 1040000B */ beqz $v0, .L802405AC -/* AA32A0 80240580 00000000 */ nop -/* AA32A4 80240584 8E4200CC */ lw $v0, 0xcc($s2) -/* AA32A8 80240588 8C420000 */ lw $v0, ($v0) -/* AA32AC 8024058C AE620028 */ sw $v0, 0x28($s3) -/* AA32B0 80240590 824200B4 */ lb $v0, 0xb4($s2) -/* AA32B4 80240594 1440005F */ bnez $v0, .L80240714 -/* AA32B8 80240598 0000102D */ daddu $v0, $zero, $zero -/* AA32BC 8024059C 8E4200B0 */ lw $v0, 0xb0($s2) -/* AA32C0 802405A0 2403FFFB */ addiu $v1, $zero, -5 -/* AA32C4 802405A4 00431024 */ and $v0, $v0, $v1 -/* AA32C8 802405A8 AE4200B0 */ sw $v0, 0xb0($s2) -.L802405AC: -/* AA32CC 802405AC 8E900070 */ lw $s0, 0x70($s4) -/* AA32D0 802405B0 1200000E */ beqz $s0, .L802405EC -/* AA32D4 802405B4 00000000 */ nop -/* AA32D8 802405B8 06000055 */ bltz $s0, .L80240710 -/* AA32DC 802405BC 2402000A */ addiu $v0, $zero, 0xa -/* AA32E0 802405C0 12020013 */ beq $s0, $v0, .L80240610 -/* AA32E4 802405C4 0202102A */ slt $v0, $s0, $v0 -/* AA32E8 802405C8 14400052 */ bnez $v0, .L80240714 -/* AA32EC 802405CC 0000102D */ daddu $v0, $zero, $zero -/* AA32F0 802405D0 2402000B */ addiu $v0, $zero, 0xb -/* AA32F4 802405D4 12020022 */ beq $s0, $v0, .L80240660 -/* AA32F8 802405D8 2402000C */ addiu $v0, $zero, 0xc -/* AA32FC 802405DC 12020035 */ beq $s0, $v0, .L802406B4 -/* AA3300 802405E0 0000102D */ daddu $v0, $zero, $zero -/* AA3304 802405E4 080901C5 */ j .L80240714 -/* AA3308 802405E8 00000000 */ nop -.L802405EC: -/* AA330C 802405EC 9662008E */ lhu $v0, 0x8e($s3) -/* AA3310 802405F0 2442FFFF */ addiu $v0, $v0, -1 -/* AA3314 802405F4 A662008E */ sh $v0, 0x8e($s3) -/* AA3318 802405F8 00021400 */ sll $v0, $v0, 0x10 -/* AA331C 802405FC 1C400045 */ bgtz $v0, .L80240714 -/* AA3320 80240600 0000102D */ daddu $v0, $zero, $zero -/* AA3324 80240604 2402000A */ addiu $v0, $zero, 0xa -/* AA3328 80240608 080901C4 */ j .L80240710 -/* AA332C 8024060C AE820070 */ sw $v0, 0x70($s4) -.L80240610: -/* AA3330 80240610 0C090000 */ jal func_80240000_AA2D20 -/* AA3334 80240614 00000000 */ nop -/* AA3338 80240618 1840002C */ blez $v0, .L802406CC -/* AA333C 8024061C AE42006C */ sw $v0, 0x6c($s2) -/* AA3340 80240620 0C00FB3A */ jal get_enemy -/* AA3344 80240624 0040202D */ daddu $a0, $v0, $zero -/* AA3348 80240628 0040182D */ daddu $v1, $v0, $zero -/* AA334C 8024062C 24020001 */ addiu $v0, $zero, 1 -/* AA3350 80240630 AC62006C */ sw $v0, 0x6c($v1) -/* AA3354 80240634 86420008 */ lh $v0, 8($s2) -/* AA3358 80240638 AC620070 */ sw $v0, 0x70($v1) -/* AA335C 8024063C 8E420070 */ lw $v0, 0x70($s2) -/* AA3360 80240640 AC620074 */ sw $v0, 0x74($v1) -/* AA3364 80240644 8E4200CC */ lw $v0, 0xcc($s2) -/* AA3368 80240648 8C420020 */ lw $v0, 0x20($v0) -/* AA336C 8024064C A670008E */ sh $s0, 0x8e($s3) -/* AA3370 80240650 AE620028 */ sw $v0, 0x28($s3) -/* AA3374 80240654 2402000B */ addiu $v0, $zero, 0xb -/* AA3378 80240658 080901C4 */ j .L80240710 -/* AA337C 8024065C AE820070 */ sw $v0, 0x70($s4) -.L80240660: -/* AA3380 80240660 9662008E */ lhu $v0, 0x8e($s3) -/* AA3384 80240664 2442FFFF */ addiu $v0, $v0, -1 -/* AA3388 80240668 A662008E */ sh $v0, 0x8e($s3) -/* AA338C 8024066C 00021400 */ sll $v0, $v0, 0x10 -/* AA3390 80240670 1C400028 */ bgtz $v0, .L80240714 -/* AA3394 80240674 0000102D */ daddu $v0, $zero, $zero -/* AA3398 80240678 8E4200CC */ lw $v0, 0xcc($s2) -/* AA339C 8024067C 8C420000 */ lw $v0, ($v0) -/* AA33A0 80240680 AE620028 */ sw $v0, 0x28($s3) -/* AA33A4 80240684 0C00FB3A */ jal get_enemy -/* AA33A8 80240688 8E44006C */ lw $a0, 0x6c($s2) -/* AA33AC 8024068C 0260202D */ daddu $a0, $s3, $zero -/* AA33B0 80240690 24050328 */ addiu $a1, $zero, 0x328 -/* AA33B4 80240694 24030002 */ addiu $v1, $zero, 2 -/* AA33B8 80240698 3C060020 */ lui $a2, 0x20 -/* AA33BC 8024069C 0C012530 */ jal ai_enemy_play_sound -/* AA33C0 802406A0 AC43006C */ sw $v1, 0x6c($v0) -/* AA33C4 802406A4 24020005 */ addiu $v0, $zero, 5 -/* AA33C8 802406A8 A662008E */ sh $v0, 0x8e($s3) -/* AA33CC 802406AC 2402000C */ addiu $v0, $zero, 0xc -/* AA33D0 802406B0 AE820070 */ sw $v0, 0x70($s4) -.L802406B4: -/* AA33D4 802406B4 9662008E */ lhu $v0, 0x8e($s3) -/* AA33D8 802406B8 2442FFFF */ addiu $v0, $v0, -1 -/* AA33DC 802406BC A662008E */ sh $v0, 0x8e($s3) -/* AA33E0 802406C0 00021400 */ sll $v0, $v0, 0x10 -/* AA33E4 802406C4 1C400013 */ bgtz $v0, .L80240714 -/* AA33E8 802406C8 0000102D */ daddu $v0, $zero, $zero -.L802406CC: -/* AA33EC 802406CC 0C00A67F */ jal rand_int -/* AA33F0 802406D0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* AA33F4 802406D4 3C038888 */ lui $v1, 0x8888 -/* AA33F8 802406D8 34638889 */ ori $v1, $v1, 0x8889 -/* AA33FC 802406DC 00430018 */ mult $v0, $v1 -/* AA3400 802406E0 00021FC3 */ sra $v1, $v0, 0x1f -/* AA3404 802406E4 00003810 */ mfhi $a3 -/* AA3408 802406E8 00E22021 */ addu $a0, $a3, $v0 -/* AA340C 802406EC 00042143 */ sra $a0, $a0, 5 -/* AA3410 802406F0 00832023 */ subu $a0, $a0, $v1 -/* AA3414 802406F4 00041900 */ sll $v1, $a0, 4 -/* AA3418 802406F8 00641823 */ subu $v1, $v1, $a0 -/* AA341C 802406FC 00031880 */ sll $v1, $v1, 2 -/* AA3420 80240700 00431023 */ subu $v0, $v0, $v1 -/* AA3424 80240704 24420028 */ addiu $v0, $v0, 0x28 -/* AA3428 80240708 A662008E */ sh $v0, 0x8e($s3) -/* AA342C 8024070C AE800070 */ sw $zero, 0x70($s4) -.L80240710: -/* AA3430 80240710 0000102D */ daddu $v0, $zero, $zero -.L80240714: -/* AA3434 80240714 8FBF0024 */ lw $ra, 0x24($sp) -/* AA3438 80240718 8FB40020 */ lw $s4, 0x20($sp) -/* AA343C 8024071C 8FB3001C */ lw $s3, 0x1c($sp) -/* AA3440 80240720 8FB20018 */ lw $s2, 0x18($sp) -/* AA3444 80240724 8FB10014 */ lw $s1, 0x14($sp) -/* AA3448 80240728 8FB00010 */ lw $s0, 0x10($sp) -/* AA344C 8024072C 03E00008 */ jr $ra -/* AA3450 80240730 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA3454 80240734 00000000 */ nop -/* AA3458 80240738 00000000 */ nop -/* AA345C 8024073C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s deleted file mode 100644 index 2c7f89cd8e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4_A64834 -/* A64834 802407A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A64838 802407A8 AFB3001C */ sw $s3, 0x1c($sp) -/* A6483C 802407AC 0080982D */ daddu $s3, $a0, $zero -/* A64840 802407B0 AFBF0020 */ sw $ra, 0x20($sp) -/* A64844 802407B4 AFB20018 */ sw $s2, 0x18($sp) -/* A64848 802407B8 AFB10014 */ sw $s1, 0x14($sp) -/* A6484C 802407BC AFB00010 */ sw $s0, 0x10($sp) -/* A64850 802407C0 8E720148 */ lw $s2, 0x148($s3) -/* A64854 802407C4 0C00EABB */ jal get_npc_unsafe -/* A64858 802407C8 86440008 */ lh $a0, 8($s2) -/* A6485C 802407CC 0040802D */ daddu $s0, $v0, $zero -/* A64860 802407D0 8603008E */ lh $v1, 0x8e($s0) -/* A64864 802407D4 3C118024 */ lui $s1, %hi(D_80242050_A660E0) -/* A64868 802407D8 26312050 */ addiu $s1, $s1, %lo(D_80242050_A660E0) -/* A6486C 802407DC 00031040 */ sll $v0, $v1, 1 -/* A64870 802407E0 00431021 */ addu $v0, $v0, $v1 -/* A64874 802407E4 00021080 */ sll $v0, $v0, 2 -/* A64878 802407E8 3C018024 */ lui $at, %hi(D_80242050_A660E0) -/* A6487C 802407EC 00220821 */ addu $at, $at, $v0 -/* A64880 802407F0 C4202050 */ lwc1 $f0, %lo(D_80242050_A660E0)($at) -/* A64884 802407F4 00031040 */ sll $v0, $v1, 1 -/* A64888 802407F8 00431021 */ addu $v0, $v0, $v1 -/* A6488C 802407FC 00021080 */ sll $v0, $v0, 2 -/* A64890 80240800 E6000054 */ swc1 $f0, 0x54($s0) -/* A64894 80240804 3C018024 */ lui $at, %hi(D_80242054_A660E4) -/* A64898 80240808 00220821 */ addu $at, $at, $v0 -/* A6489C 8024080C C4202054 */ lwc1 $f0, %lo(D_80242054_A660E4)($at) -/* A648A0 80240810 00031040 */ sll $v0, $v1, 1 -/* A648A4 80240814 00431021 */ addu $v0, $v0, $v1 -/* A648A8 80240818 9603008E */ lhu $v1, 0x8e($s0) -/* A648AC 8024081C 00021080 */ sll $v0, $v0, 2 -/* A648B0 80240820 E6000058 */ swc1 $f0, 0x58($s0) -/* A648B4 80240824 3C018024 */ lui $at, %hi(D_80242058_A660E8) -/* A648B8 80240828 00220821 */ addu $at, $at, $v0 -/* A648BC 8024082C 90222058 */ lbu $v0, %lo(D_80242058_A660E8)($at) -/* A648C0 80240830 24630001 */ addiu $v1, $v1, 1 -/* A648C4 80240834 A603008E */ sh $v1, 0x8e($s0) -/* A648C8 80240838 00031C00 */ sll $v1, $v1, 0x10 -/* A648CC 8024083C 00031C03 */ sra $v1, $v1, 0x10 -/* A648D0 80240840 A20200AC */ sb $v0, 0xac($s0) -/* A648D4 80240844 24020004 */ addiu $v0, $zero, 4 -/* A648D8 80240848 14620007 */ bne $v1, $v0, .L80240868 -/* A648DC 8024084C 00000000 */ nop -/* A648E0 80240850 0C00EAFF */ jal disable_npc_shadow -/* A648E4 80240854 0200202D */ daddu $a0, $s0, $zero -/* A648E8 80240858 8E420000 */ lw $v0, ($s2) -/* A648EC 8024085C 3C031F10 */ lui $v1, 0x1f10 -/* A648F0 80240860 00431025 */ or $v0, $v0, $v1 -/* A648F4 80240864 AE420000 */ sw $v0, ($s2) -.L80240868: -/* A648F8 80240868 8602008E */ lh $v0, 0x8e($s0) -/* A648FC 8024086C 00021840 */ sll $v1, $v0, 1 -/* A64900 80240870 00621821 */ addu $v1, $v1, $v0 -/* A64904 80240874 00031880 */ sll $v1, $v1, 2 -/* A64908 80240878 00711821 */ addu $v1, $v1, $s1 -/* A6490C 8024087C 90620008 */ lbu $v0, 8($v1) -/* A64910 80240880 1440000C */ bnez $v0, .L802408B4 -/* A64914 80240884 240200FF */ addiu $v0, $zero, 0xff -/* A64918 80240888 A20200AC */ sb $v0, 0xac($s0) -/* A6491C 8024088C 24020005 */ addiu $v0, $zero, 5 -/* A64920 80240890 8E030000 */ lw $v1, ($s0) -/* A64924 80240894 3C013F80 */ lui $at, 0x3f80 -/* A64928 80240898 44810000 */ mtc1 $at, $f0 -/* A6492C 8024089C 34630002 */ ori $v1, $v1, 2 -/* A64930 802408A0 E6000054 */ swc1 $f0, 0x54($s0) -/* A64934 802408A4 E6000058 */ swc1 $f0, 0x58($s0) -/* A64938 802408A8 E600005C */ swc1 $f0, 0x5c($s0) -/* A6493C 802408AC AE030000 */ sw $v1, ($s0) -/* A64940 802408B0 AE620070 */ sw $v0, 0x70($s3) -.L802408B4: -/* A64944 802408B4 8FBF0020 */ lw $ra, 0x20($sp) -/* A64948 802408B8 8FB3001C */ lw $s3, 0x1c($sp) -/* A6494C 802408BC 8FB20018 */ lw $s2, 0x18($sp) -/* A64950 802408C0 8FB10014 */ lw $s1, 0x14($sp) -/* A64954 802408C4 8FB00010 */ lw $s0, 0x10($sp) -/* A64958 802408C8 03E00008 */ jr $ra -/* A6495C 802408CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240970_A64A00.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240970_A64A00.s deleted file mode 100644 index 60923b808d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240970_A64A00.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240970_A64A00 -/* A64A00 80240970 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A64A04 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* A64A08 80240978 0080882D */ daddu $s1, $a0, $zero -/* A64A0C 8024097C AFBF0018 */ sw $ra, 0x18($sp) -/* A64A10 80240980 AFB00010 */ sw $s0, 0x10($sp) -/* A64A14 80240984 8E220148 */ lw $v0, 0x148($s1) -/* A64A18 80240988 0C00EABB */ jal get_npc_unsafe -/* A64A1C 8024098C 84440008 */ lh $a0, 8($v0) -/* A64A20 80240990 0040802D */ daddu $s0, $v0, $zero -/* A64A24 80240994 8E050018 */ lw $a1, 0x18($s0) -/* A64A28 80240998 8E06000C */ lw $a2, 0xc($s0) -/* A64A2C 8024099C 0C00EA95 */ jal npc_move_heading -/* A64A30 802409A0 0200202D */ daddu $a0, $s0, $zero -/* A64A34 802409A4 9602008E */ lhu $v0, 0x8e($s0) -/* A64A38 802409A8 2442FFFF */ addiu $v0, $v0, -1 -/* A64A3C 802409AC A602008E */ sh $v0, 0x8e($s0) -/* A64A40 802409B0 00021400 */ sll $v0, $v0, 0x10 -/* A64A44 802409B4 1C400002 */ bgtz $v0, .L802409C0 -/* A64A48 802409B8 2402000A */ addiu $v0, $zero, 0xa -/* A64A4C 802409BC AE220070 */ sw $v0, 0x70($s1) -.L802409C0: -/* A64A50 802409C0 8FBF0018 */ lw $ra, 0x18($sp) -/* A64A54 802409C4 8FB10014 */ lw $s1, 0x14($sp) -/* A64A58 802409C8 8FB00010 */ lw $s0, 0x10($sp) -/* A64A5C 802409CC 03E00008 */ jr $ra -/* A64A60 802409D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802409D4_A64A64.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802409D4_A64A64.s deleted file mode 100644 index c9d2c06f9d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802409D4_A64A64.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D4_A64A64 -/* A64A64 802409D4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A64A68 802409D8 AFB30034 */ sw $s3, 0x34($sp) -/* A64A6C 802409DC 0080982D */ daddu $s3, $a0, $zero -/* A64A70 802409E0 AFBF0038 */ sw $ra, 0x38($sp) -/* A64A74 802409E4 AFB20030 */ sw $s2, 0x30($sp) -/* A64A78 802409E8 AFB1002C */ sw $s1, 0x2c($sp) -/* A64A7C 802409EC AFB00028 */ sw $s0, 0x28($sp) -/* A64A80 802409F0 8E700148 */ lw $s0, 0x148($s3) -/* A64A84 802409F4 0C00EABB */ jal get_npc_unsafe -/* A64A88 802409F8 86040008 */ lh $a0, 8($s0) -/* A64A8C 802409FC 0040902D */ daddu $s2, $v0, $zero -/* A64A90 80240A00 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A64A94 80240A04 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A64A98 80240A08 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A64A9C 80240A0C 8E220000 */ lw $v0, ($s1) -/* A64AA0 80240A10 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A64AA4 80240A14 8C460028 */ lw $a2, 0x28($v0) -/* A64AA8 80240A18 0C00A7B5 */ jal dist2D -/* A64AAC 80240A1C 8C470030 */ lw $a3, 0x30($v0) -/* A64AB0 80240A20 24020001 */ addiu $v0, $zero, 1 -/* A64AB4 80240A24 AE02006C */ sw $v0, 0x6c($s0) -/* A64AB8 80240A28 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A64ABC 80240A2C 8E0200CC */ lw $v0, 0xcc($s0) -/* A64AC0 80240A30 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A64AC4 80240A34 8E230000 */ lw $v1, ($s1) -/* A64AC8 80240A38 8C420020 */ lw $v0, 0x20($v0) -/* A64ACC 80240A3C AE420028 */ sw $v0, 0x28($s2) -/* A64AD0 80240A40 8C660028 */ lw $a2, 0x28($v1) -/* A64AD4 80240A44 8C670030 */ lw $a3, 0x30($v1) -/* A64AD8 80240A48 0C00A720 */ jal atan2 -/* A64ADC 80240A4C E7A00024 */ swc1 $f0, 0x24($sp) -/* A64AE0 80240A50 8E420000 */ lw $v0, ($s2) -/* A64AE4 80240A54 3C013DCC */ lui $at, 0x3dcc -/* A64AE8 80240A58 3421CCCD */ ori $at, $at, 0xcccd -/* A64AEC 80240A5C 44811000 */ mtc1 $at, $f2 -/* A64AF0 80240A60 2403FFFD */ addiu $v1, $zero, -3 -/* A64AF4 80240A64 E640000C */ swc1 $f0, 0xc($s2) -/* A64AF8 80240A68 00431024 */ and $v0, $v0, $v1 -/* A64AFC 80240A6C AE420000 */ sw $v0, ($s2) -/* A64B00 80240A70 30420008 */ andi $v0, $v0, 8 -/* A64B04 80240A74 E6420054 */ swc1 $f2, 0x54($s2) -/* A64B08 80240A78 E6420058 */ swc1 $f2, 0x58($s2) -/* A64B0C 80240A7C 1440001B */ bnez $v0, .L80240AEC -/* A64B10 80240A80 E642005C */ swc1 $f2, 0x5c($s2) -/* A64B14 80240A84 27A6001C */ addiu $a2, $sp, 0x1c -/* A64B18 80240A88 27A70020 */ addiu $a3, $sp, 0x20 -/* A64B1C 80240A8C 27A20024 */ addiu $v0, $sp, 0x24 -/* A64B20 80240A90 C6420038 */ lwc1 $f2, 0x38($s2) -/* A64B24 80240A94 C640003C */ lwc1 $f0, 0x3c($s2) -/* A64B28 80240A98 3C014348 */ lui $at, 0x4348 -/* A64B2C 80240A9C 44813000 */ mtc1 $at, $f6 -/* A64B30 80240AA0 46000021 */ cvt.d.s $f0, $f0 -/* A64B34 80240AA4 E7A20018 */ swc1 $f2, 0x18($sp) -/* A64B38 80240AA8 3C014059 */ lui $at, 0x4059 -/* A64B3C 80240AAC 44811800 */ mtc1 $at, $f3 -/* A64B40 80240AB0 44801000 */ mtc1 $zero, $f2 -/* A64B44 80240AB4 C6440040 */ lwc1 $f4, 0x40($s2) -/* A64B48 80240AB8 46220000 */ add.d $f0, $f0, $f2 -/* A64B4C 80240ABC E7A60024 */ swc1 $f6, 0x24($sp) -/* A64B50 80240AC0 E7A40020 */ swc1 $f4, 0x20($sp) -/* A64B54 80240AC4 46200020 */ cvt.s.d $f0, $f0 -/* A64B58 80240AC8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A64B5C 80240ACC AFA20010 */ sw $v0, 0x10($sp) -/* A64B60 80240AD0 8E440080 */ lw $a0, 0x80($s2) -/* A64B64 80240AD4 0C0372DF */ jal npc_raycast_down_sides -/* A64B68 80240AD8 27A50018 */ addiu $a1, $sp, 0x18 -/* A64B6C 80240ADC 10400004 */ beqz $v0, .L80240AF0 -/* A64B70 80240AE0 2402000B */ addiu $v0, $zero, 0xb -/* A64B74 80240AE4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A64B78 80240AE8 E640003C */ swc1 $f0, 0x3c($s2) -.L80240AEC: -/* A64B7C 80240AEC 2402000B */ addiu $v0, $zero, 0xb -.L80240AF0: -/* A64B80 80240AF0 A640008E */ sh $zero, 0x8e($s2) -/* A64B84 80240AF4 AE620070 */ sw $v0, 0x70($s3) -/* A64B88 80240AF8 8FBF0038 */ lw $ra, 0x38($sp) -/* A64B8C 80240AFC 8FB30034 */ lw $s3, 0x34($sp) -/* A64B90 80240B00 8FB20030 */ lw $s2, 0x30($sp) -/* A64B94 80240B04 8FB1002C */ lw $s1, 0x2c($sp) -/* A64B98 80240B08 8FB00028 */ lw $s0, 0x28($sp) -/* A64B9C 80240B0C 03E00008 */ jr $ra -/* A64BA0 80240B10 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s deleted file mode 100644 index a78058c062..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242F90_A67020 -.double 0.1 - -dlabel D_80242F98_A67028 -.double 0.4 - -.section .text - -glabel func_80240B14_A64BA4 -/* A64BA4 80240B14 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A64BA8 80240B18 AFB20028 */ sw $s2, 0x28($sp) -/* A64BAC 80240B1C 0080902D */ daddu $s2, $a0, $zero -/* A64BB0 80240B20 AFBF002C */ sw $ra, 0x2c($sp) -/* A64BB4 80240B24 AFB10024 */ sw $s1, 0x24($sp) -/* A64BB8 80240B28 AFB00020 */ sw $s0, 0x20($sp) -/* A64BBC 80240B2C 8E510148 */ lw $s1, 0x148($s2) -/* A64BC0 80240B30 0C00EABB */ jal get_npc_unsafe -/* A64BC4 80240B34 86240008 */ lh $a0, 8($s1) -/* A64BC8 80240B38 8E23006C */ lw $v1, 0x6c($s1) -/* A64BCC 80240B3C 14600006 */ bnez $v1, .L80240B58 -/* A64BD0 80240B40 0040802D */ daddu $s0, $v0, $zero -/* A64BD4 80240B44 8603008E */ lh $v1, 0x8e($s0) -/* A64BD8 80240B48 00031100 */ sll $v0, $v1, 4 -/* A64BDC 80240B4C 00431023 */ subu $v0, $v0, $v1 -/* A64BE0 80240B50 080902DA */ j .L80240B68 -/* A64BE4 80240B54 24430082 */ addiu $v1, $v0, 0x82 -.L80240B58: -/* A64BE8 80240B58 8603008E */ lh $v1, 0x8e($s0) -/* A64BEC 80240B5C 00031100 */ sll $v0, $v1, 4 -/* A64BF0 80240B60 00431023 */ subu $v0, $v0, $v1 -/* A64BF4 80240B64 2443001E */ addiu $v1, $v0, 0x1e -.L80240B68: -/* A64BF8 80240B68 00031400 */ sll $v0, $v1, 0x10 -/* A64BFC 80240B6C 00021403 */ sra $v0, $v0, 0x10 -/* A64C00 80240B70 28420100 */ slti $v0, $v0, 0x100 -/* A64C04 80240B74 50400001 */ beql $v0, $zero, .L80240B7C -/* A64C08 80240B78 240300FF */ addiu $v1, $zero, 0xff -.L80240B7C: -/* A64C0C 80240B7C 8602008E */ lh $v0, 0x8e($s0) -/* A64C10 80240B80 3C018024 */ lui $at, %hi(D_80242F90_A67020) -/* A64C14 80240B84 D4222F90 */ ldc1 $f2, %lo(D_80242F90_A67020)($at) -/* A64C18 80240B88 44820000 */ mtc1 $v0, $f0 -/* A64C1C 80240B8C 00000000 */ nop -/* A64C20 80240B90 46800020 */ cvt.s.w $f0, $f0 -/* A64C24 80240B94 46000021 */ cvt.d.s $f0, $f0 -/* A64C28 80240B98 46220002 */ mul.d $f0, $f0, $f2 -/* A64C2C 80240B9C 00000000 */ nop -/* A64C30 80240BA0 3C018024 */ lui $at, %hi(D_80242F98_A67028) -/* A64C34 80240BA4 D4222F98 */ ldc1 $f2, %lo(D_80242F98_A67028)($at) -/* A64C38 80240BA8 46220000 */ add.d $f0, $f0, $f2 -/* A64C3C 80240BAC A20300AC */ sb $v1, 0xac($s0) -/* A64C40 80240BB0 3C013FF0 */ lui $at, 0x3ff0 -/* A64C44 80240BB4 44811800 */ mtc1 $at, $f3 -/* A64C48 80240BB8 44801000 */ mtc1 $zero, $f2 -/* A64C4C 80240BBC 46200020 */ cvt.s.d $f0, $f0 -/* A64C50 80240BC0 E6000054 */ swc1 $f0, 0x54($s0) -/* A64C54 80240BC4 46000021 */ cvt.d.s $f0, $f0 -/* A64C58 80240BC8 4620103C */ c.lt.d $f2, $f0 -/* A64C5C 80240BCC 00000000 */ nop -/* A64C60 80240BD0 45000005 */ bc1f .L80240BE8 -/* A64C64 80240BD4 24030005 */ addiu $v1, $zero, 5 -/* A64C68 80240BD8 3C013F80 */ lui $at, 0x3f80 -/* A64C6C 80240BDC 44810000 */ mtc1 $at, $f0 -/* A64C70 80240BE0 00000000 */ nop -/* A64C74 80240BE4 E6000054 */ swc1 $f0, 0x54($s0) -.L80240BE8: -/* A64C78 80240BE8 C6000054 */ lwc1 $f0, 0x54($s0) -/* A64C7C 80240BEC 9602008E */ lhu $v0, 0x8e($s0) -/* A64C80 80240BF0 46000086 */ mov.s $f2, $f0 -/* A64C84 80240BF4 24420001 */ addiu $v0, $v0, 1 -/* A64C88 80240BF8 A602008E */ sh $v0, 0x8e($s0) -/* A64C8C 80240BFC 00021400 */ sll $v0, $v0, 0x10 -/* A64C90 80240C00 00021403 */ sra $v0, $v0, 0x10 -/* A64C94 80240C04 E6000058 */ swc1 $f0, 0x58($s0) -/* A64C98 80240C08 14430008 */ bne $v0, $v1, .L80240C2C -/* A64C9C 80240C0C E602005C */ swc1 $f2, 0x5c($s0) -/* A64CA0 80240C10 0C00EAE8 */ jal enable_npc_shadow -/* A64CA4 80240C14 0200202D */ daddu $a0, $s0, $zero -/* A64CA8 80240C18 3C03E0EF */ lui $v1, 0xe0ef -/* A64CAC 80240C1C 8E220000 */ lw $v0, ($s1) -/* A64CB0 80240C20 3463FFFF */ ori $v1, $v1, 0xffff -/* A64CB4 80240C24 00431024 */ and $v0, $v0, $v1 -/* A64CB8 80240C28 AE220000 */ sw $v0, ($s1) -.L80240C2C: -/* A64CBC 80240C2C 8E22006C */ lw $v0, 0x6c($s1) -/* A64CC0 80240C30 1440000E */ bnez $v0, .L80240C6C -/* A64CC4 80240C34 00000000 */ nop -/* A64CC8 80240C38 8602008E */ lh $v0, 0x8e($s0) -/* A64CCC 80240C3C 28420014 */ slti $v0, $v0, 0x14 -/* A64CD0 80240C40 14400017 */ bnez $v0, .L80240CA0 -/* A64CD4 80240C44 0000282D */ daddu $a1, $zero, $zero -/* A64CD8 80240C48 00A0302D */ daddu $a2, $a1, $zero -/* A64CDC 80240C4C AFA00010 */ sw $zero, 0x10($sp) -/* A64CE0 80240C50 AFA00014 */ sw $zero, 0x14($sp) -/* A64CE4 80240C54 AFA00018 */ sw $zero, 0x18($sp) -/* A64CE8 80240C58 8E040024 */ lw $a0, 0x24($s0) -/* A64CEC 80240C5C 0C0B7A25 */ jal func_802DE894 -/* A64CF0 80240C60 00A0382D */ daddu $a3, $a1, $zero -/* A64CF4 80240C64 0809031F */ j .L80240C7C -/* A64CF8 80240C68 00000000 */ nop -.L80240C6C: -/* A64CFC 80240C6C 8602008E */ lh $v0, 0x8e($s0) -/* A64D00 80240C70 2842000A */ slti $v0, $v0, 0xa -/* A64D04 80240C74 1440000A */ bnez $v0, .L80240CA0 -/* A64D08 80240C78 00000000 */ nop -.L80240C7C: -/* A64D0C 80240C7C 3C013F80 */ lui $at, 0x3f80 -/* A64D10 80240C80 44810000 */ mtc1 $at, $f0 -/* A64D14 80240C84 240200FF */ addiu $v0, $zero, 0xff -/* A64D18 80240C88 A20200AC */ sb $v0, 0xac($s0) -/* A64D1C 80240C8C 24020014 */ addiu $v0, $zero, 0x14 -/* A64D20 80240C90 E6000054 */ swc1 $f0, 0x54($s0) -/* A64D24 80240C94 E6000058 */ swc1 $f0, 0x58($s0) -/* A64D28 80240C98 E600005C */ swc1 $f0, 0x5c($s0) -/* A64D2C 80240C9C AE420070 */ sw $v0, 0x70($s2) -.L80240CA0: -/* A64D30 80240CA0 8FBF002C */ lw $ra, 0x2c($sp) -/* A64D34 80240CA4 8FB20028 */ lw $s2, 0x28($sp) -/* A64D38 80240CA8 8FB10024 */ lw $s1, 0x24($sp) -/* A64D3C 80240CAC 8FB00020 */ lw $s0, 0x20($sp) -/* A64D40 80240CB0 03E00008 */ jr $ra -/* A64D44 80240CB4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8_A64D48.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8_A64D48.s deleted file mode 100644 index 50b27068c7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8_A64D48.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB8_A64D48 -/* A64D48 80240CB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A64D4C 80240CBC AFB00010 */ sw $s0, 0x10($sp) -/* A64D50 80240CC0 0080802D */ daddu $s0, $a0, $zero -/* A64D54 80240CC4 AFBF0014 */ sw $ra, 0x14($sp) -/* A64D58 80240CC8 8E020148 */ lw $v0, 0x148($s0) -/* A64D5C 80240CCC 0C00EABB */ jal get_npc_unsafe -/* A64D60 80240CD0 84440008 */ lh $a0, 8($v0) -/* A64D64 80240CD4 24030028 */ addiu $v1, $zero, 0x28 -/* A64D68 80240CD8 A443008E */ sh $v1, 0x8e($v0) -/* A64D6C 80240CDC 24020015 */ addiu $v0, $zero, 0x15 -/* A64D70 80240CE0 AE020070 */ sw $v0, 0x70($s0) -/* A64D74 80240CE4 8FBF0014 */ lw $ra, 0x14($sp) -/* A64D78 80240CE8 8FB00010 */ lw $s0, 0x10($sp) -/* A64D7C 80240CEC 03E00008 */ jr $ra -/* A64D80 80240CF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s deleted file mode 100644 index 4db37a4dad..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF4_A64D84 -/* A64D84 80240CF4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A64D88 80240CF8 AFB40048 */ sw $s4, 0x48($sp) -/* A64D8C 80240CFC 0080A02D */ daddu $s4, $a0, $zero -/* A64D90 80240D00 AFBF004C */ sw $ra, 0x4c($sp) -/* A64D94 80240D04 AFB30044 */ sw $s3, 0x44($sp) -/* A64D98 80240D08 AFB20040 */ sw $s2, 0x40($sp) -/* A64D9C 80240D0C AFB1003C */ sw $s1, 0x3c($sp) -/* A64DA0 80240D10 AFB00038 */ sw $s0, 0x38($sp) -/* A64DA4 80240D14 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A64DA8 80240D18 8E910148 */ lw $s1, 0x148($s4) -/* A64DAC 80240D1C 00A0902D */ daddu $s2, $a1, $zero -/* A64DB0 80240D20 86240008 */ lh $a0, 8($s1) -/* A64DB4 80240D24 0C00EABB */ jal get_npc_unsafe -/* A64DB8 80240D28 00C0982D */ daddu $s3, $a2, $zero -/* A64DBC 80240D2C 0040802D */ daddu $s0, $v0, $zero -/* A64DC0 80240D30 9602008E */ lhu $v0, 0x8e($s0) -/* A64DC4 80240D34 2442FFFF */ addiu $v0, $v0, -1 -/* A64DC8 80240D38 A602008E */ sh $v0, 0x8e($s0) -/* A64DCC 80240D3C 00021400 */ sll $v0, $v0, 0x10 -/* A64DD0 80240D40 14400021 */ bnez $v0, .L80240DC8 -/* A64DD4 80240D44 0280202D */ daddu $a0, $s4, $zero -/* A64DD8 80240D48 24040002 */ addiu $a0, $zero, 2 -/* A64DDC 80240D4C 0200282D */ daddu $a1, $s0, $zero -/* A64DE0 80240D50 0000302D */ daddu $a2, $zero, $zero -/* A64DE4 80240D54 8E2200CC */ lw $v0, 0xcc($s1) -/* A64DE8 80240D58 3C013F80 */ lui $at, 0x3f80 -/* A64DEC 80240D5C 44810000 */ mtc1 $at, $f0 -/* A64DF0 80240D60 3C014000 */ lui $at, 0x4000 -/* A64DF4 80240D64 44811000 */ mtc1 $at, $f2 -/* A64DF8 80240D68 8C430000 */ lw $v1, ($v0) -/* A64DFC 80240D6C 860200A8 */ lh $v0, 0xa8($s0) -/* A64E00 80240D70 3C01C1A0 */ lui $at, 0xc1a0 -/* A64E04 80240D74 44812000 */ mtc1 $at, $f4 -/* A64E08 80240D78 44824000 */ mtc1 $v0, $f8 -/* A64E0C 80240D7C 00000000 */ nop -/* A64E10 80240D80 46804220 */ cvt.s.w $f8, $f8 -/* A64E14 80240D84 44074000 */ mfc1 $a3, $f8 -/* A64E18 80240D88 2402000C */ addiu $v0, $zero, 0xc -/* A64E1C 80240D8C AE030028 */ sw $v1, 0x28($s0) -/* A64E20 80240D90 AFA2001C */ sw $v0, 0x1c($sp) -/* A64E24 80240D94 27A20028 */ addiu $v0, $sp, 0x28 -/* A64E28 80240D98 E7A00010 */ swc1 $f0, 0x10($sp) -/* A64E2C 80240D9C E7A20014 */ swc1 $f2, 0x14($sp) -/* A64E30 80240DA0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A64E34 80240DA4 0C01BFA4 */ jal fx_emote -/* A64E38 80240DA8 AFA20020 */ sw $v0, 0x20($sp) -/* A64E3C 80240DAC 8E2200CC */ lw $v0, 0xcc($s1) -/* A64E40 80240DB0 8C430000 */ lw $v1, ($v0) -/* A64E44 80240DB4 2402000F */ addiu $v0, $zero, 0xf -/* A64E48 80240DB8 A602008E */ sh $v0, 0x8e($s0) -/* A64E4C 80240DBC AE030028 */ sw $v1, 0x28($s0) -/* A64E50 80240DC0 080903A4 */ j .L80240E90 -/* A64E54 80240DC4 AE800070 */ sw $zero, 0x70($s4) -.L80240DC8: -/* A64E58 80240DC8 8E450024 */ lw $a1, 0x24($s2) -/* A64E5C 80240DCC 8E460028 */ lw $a2, 0x28($s2) -/* A64E60 80240DD0 0C090014 */ jal kpa_51_UnkNpcAIFunc47 -/* A64E64 80240DD4 0260382D */ daddu $a3, $s3, $zero -/* A64E68 80240DD8 24030001 */ addiu $v1, $zero, 1 -/* A64E6C 80240DDC 1443002C */ bne $v0, $v1, .L80240E90 -/* A64E70 80240DE0 0200202D */ daddu $a0, $s0, $zero -/* A64E74 80240DE4 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A64E78 80240DE8 0C012530 */ jal ai_enemy_play_sound -/* A64E7C 80240DEC 0000302D */ daddu $a2, $zero, $zero -/* A64E80 80240DF0 27A4002C */ addiu $a0, $sp, 0x2c -/* A64E84 80240DF4 27A50030 */ addiu $a1, $sp, 0x30 -/* A64E88 80240DF8 3C064188 */ lui $a2, 0x4188 -/* A64E8C 80240DFC C6020034 */ lwc1 $f2, 0x34($s0) -/* A64E90 80240E00 3C014387 */ lui $at, 0x4387 -/* A64E94 80240E04 44810000 */ mtc1 $at, $f0 -/* A64E98 80240E08 8E2200CC */ lw $v0, 0xcc($s1) -/* A64E9C 80240E0C C614003C */ lwc1 $f20, 0x3c($s0) -/* A64EA0 80240E10 46020001 */ sub.s $f0, $f0, $f2 -/* A64EA4 80240E14 3C014200 */ lui $at, 0x4200 -/* A64EA8 80240E18 44812000 */ mtc1 $at, $f4 -/* A64EAC 80240E1C C6060038 */ lwc1 $f6, 0x38($s0) -/* A64EB0 80240E20 4604A500 */ add.s $f20, $f20, $f4 -/* A64EB4 80240E24 3C013F80 */ lui $at, 0x3f80 -/* A64EB8 80240E28 44811000 */ mtc1 $at, $f2 -/* A64EBC 80240E2C 44070000 */ mfc1 $a3, $f0 -/* A64EC0 80240E30 C6000040 */ lwc1 $f0, 0x40($s0) -/* A64EC4 80240E34 8C420020 */ lw $v0, 0x20($v0) -/* A64EC8 80240E38 46020000 */ add.s $f0, $f0, $f2 -/* A64ECC 80240E3C E7A6002C */ swc1 $f6, 0x2c($sp) -/* A64ED0 80240E40 AE020028 */ sw $v0, 0x28($s0) -/* A64ED4 80240E44 0C00A7E7 */ jal add_vec2D_polar -/* A64ED8 80240E48 E7A00030 */ swc1 $f0, 0x30($sp) -/* A64EDC 80240E4C 0000202D */ daddu $a0, $zero, $zero -/* A64EE0 80240E50 4406A000 */ mfc1 $a2, $f20 -/* A64EE4 80240E54 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A64EE8 80240E58 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A64EEC 80240E5C 44050000 */ mfc1 $a1, $f0 -/* A64EF0 80240E60 44071000 */ mfc1 $a3, $f2 -/* A64EF4 80240E64 3C013DCC */ lui $at, 0x3dcc -/* A64EF8 80240E68 3421CCCD */ ori $at, $at, 0xcccd -/* A64EFC 80240E6C 44810000 */ mtc1 $at, $f0 -/* A64F00 80240E70 2402000D */ addiu $v0, $zero, 0xd -/* A64F04 80240E74 AFA20014 */ sw $v0, 0x14($sp) -/* A64F08 80240E78 0C01BFEC */ jal fx_gather_energy_pink -/* A64F0C 80240E7C E7A00010 */ swc1 $f0, 0x10($sp) -/* A64F10 80240E80 2402000F */ addiu $v0, $zero, 0xf -/* A64F14 80240E84 A602008E */ sh $v0, 0x8e($s0) -/* A64F18 80240E88 24020016 */ addiu $v0, $zero, 0x16 -/* A64F1C 80240E8C AE820070 */ sw $v0, 0x70($s4) -.L80240E90: -/* A64F20 80240E90 8FBF004C */ lw $ra, 0x4c($sp) -/* A64F24 80240E94 8FB40048 */ lw $s4, 0x48($sp) -/* A64F28 80240E98 8FB30044 */ lw $s3, 0x44($sp) -/* A64F2C 80240E9C 8FB20040 */ lw $s2, 0x40($sp) -/* A64F30 80240EA0 8FB1003C */ lw $s1, 0x3c($sp) -/* A64F34 80240EA4 8FB00038 */ lw $s0, 0x38($sp) -/* A64F38 80240EA8 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A64F3C 80240EAC 03E00008 */ jr $ra -/* A64F40 80240EB0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s deleted file mode 100644 index 5f670d59a5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240EB4_A64F44.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4_A64F44 -/* A64F44 80240EB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A64F48 80240EB8 AFB10014 */ sw $s1, 0x14($sp) -/* A64F4C 80240EBC 0080882D */ daddu $s1, $a0, $zero -/* A64F50 80240EC0 AFBF0018 */ sw $ra, 0x18($sp) -/* A64F54 80240EC4 AFB00010 */ sw $s0, 0x10($sp) -/* A64F58 80240EC8 8E300148 */ lw $s0, 0x148($s1) -/* A64F5C 80240ECC 0C00EABB */ jal get_npc_unsafe -/* A64F60 80240ED0 86040008 */ lh $a0, 8($s0) -/* A64F64 80240ED4 0040202D */ daddu $a0, $v0, $zero -/* A64F68 80240ED8 9482008E */ lhu $v0, 0x8e($a0) -/* A64F6C 80240EDC 2442FFFF */ addiu $v0, $v0, -1 -/* A64F70 80240EE0 A482008E */ sh $v0, 0x8e($a0) -/* A64F74 80240EE4 00021400 */ sll $v0, $v0, 0x10 -/* A64F78 80240EE8 1C400008 */ bgtz $v0, .L80240F0C -/* A64F7C 80240EEC 00000000 */ nop -/* A64F80 80240EF0 8E0200CC */ lw $v0, 0xcc($s0) -/* A64F84 80240EF4 8C430024 */ lw $v1, 0x24($v0) -/* A64F88 80240EF8 24020009 */ addiu $v0, $zero, 9 -/* A64F8C 80240EFC A482008E */ sh $v0, 0x8e($a0) -/* A64F90 80240F00 24020017 */ addiu $v0, $zero, 0x17 -/* A64F94 80240F04 AC830028 */ sw $v1, 0x28($a0) -/* A64F98 80240F08 AE220070 */ sw $v0, 0x70($s1) -.L80240F0C: -/* A64F9C 80240F0C 8FBF0018 */ lw $ra, 0x18($sp) -/* A64FA0 80240F10 8FB10014 */ lw $s1, 0x14($sp) -/* A64FA4 80240F14 8FB00010 */ lw $s0, 0x10($sp) -/* A64FA8 80240F18 03E00008 */ jr $ra -/* A64FAC 80240F1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s deleted file mode 100644 index 419b1d40f1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_A64FB0 -/* A64FB0 80240F20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A64FB4 80240F24 AFB3003C */ sw $s3, 0x3c($sp) -/* A64FB8 80240F28 0080982D */ daddu $s3, $a0, $zero -/* A64FBC 80240F2C AFBF0044 */ sw $ra, 0x44($sp) -/* A64FC0 80240F30 AFB40040 */ sw $s4, 0x40($sp) -/* A64FC4 80240F34 AFB20038 */ sw $s2, 0x38($sp) -/* A64FC8 80240F38 AFB10034 */ sw $s1, 0x34($sp) -/* A64FCC 80240F3C AFB00030 */ sw $s0, 0x30($sp) -/* A64FD0 80240F40 8E720148 */ lw $s2, 0x148($s3) -/* A64FD4 80240F44 00A0882D */ daddu $s1, $a1, $zero -/* A64FD8 80240F48 86440008 */ lh $a0, 8($s2) -/* A64FDC 80240F4C 0C00EABB */ jal get_npc_unsafe -/* A64FE0 80240F50 00C0A02D */ daddu $s4, $a2, $zero -/* A64FE4 80240F54 0040802D */ daddu $s0, $v0, $zero -/* A64FE8 80240F58 9602008E */ lhu $v0, 0x8e($s0) -/* A64FEC 80240F5C 2442FFFF */ addiu $v0, $v0, -1 -/* A64FF0 80240F60 A602008E */ sh $v0, 0x8e($s0) -/* A64FF4 80240F64 00021400 */ sll $v0, $v0, 0x10 -/* A64FF8 80240F68 1C400032 */ bgtz $v0, .L80241034 -/* A64FFC 80240F6C 00000000 */ nop -/* A65000 80240F70 0260202D */ daddu $a0, $s3, $zero -/* A65004 80240F74 8E250024 */ lw $a1, 0x24($s1) -/* A65008 80240F78 8E260028 */ lw $a2, 0x28($s1) -/* A6500C 80240F7C 0C090014 */ jal kpa_51_UnkNpcAIFunc47 -/* A65010 80240F80 0280382D */ daddu $a3, $s4, $zero -/* A65014 80240F84 0040882D */ daddu $s1, $v0, $zero -/* A65018 80240F88 24020001 */ addiu $v0, $zero, 1 -/* A6501C 80240F8C 1222001D */ beq $s1, $v0, .L80241004 -/* A65020 80240F90 0200282D */ daddu $a1, $s0, $zero -/* A65024 80240F94 24040002 */ addiu $a0, $zero, 2 -/* A65028 80240F98 0000302D */ daddu $a2, $zero, $zero -/* A6502C 80240F9C 860300A8 */ lh $v1, 0xa8($s0) -/* A65030 80240FA0 3C013F80 */ lui $at, 0x3f80 -/* A65034 80240FA4 44810000 */ mtc1 $at, $f0 -/* A65038 80240FA8 3C014000 */ lui $at, 0x4000 -/* A6503C 80240FAC 44811000 */ mtc1 $at, $f2 -/* A65040 80240FB0 3C01C1A0 */ lui $at, 0xc1a0 -/* A65044 80240FB4 44812000 */ mtc1 $at, $f4 -/* A65048 80240FB8 2402000C */ addiu $v0, $zero, 0xc -/* A6504C 80240FBC AFA2001C */ sw $v0, 0x1c($sp) -/* A65050 80240FC0 44833000 */ mtc1 $v1, $f6 -/* A65054 80240FC4 00000000 */ nop -/* A65058 80240FC8 468031A0 */ cvt.s.w $f6, $f6 -/* A6505C 80240FCC 44073000 */ mfc1 $a3, $f6 -/* A65060 80240FD0 27A20028 */ addiu $v0, $sp, 0x28 -/* A65064 80240FD4 AFA20020 */ sw $v0, 0x20($sp) -/* A65068 80240FD8 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6506C 80240FDC E7A20014 */ swc1 $f2, 0x14($sp) -/* A65070 80240FE0 0C01BFA4 */ jal fx_emote -/* A65074 80240FE4 E7A40018 */ swc1 $f4, 0x18($sp) -/* A65078 80240FE8 8E4200CC */ lw $v0, 0xcc($s2) -/* A6507C 80240FEC 8C430000 */ lw $v1, ($v0) -/* A65080 80240FF0 2402000F */ addiu $v0, $zero, 0xf -/* A65084 80240FF4 A602008E */ sh $v0, 0x8e($s0) -/* A65088 80240FF8 AE030028 */ sw $v1, 0x28($s0) -/* A6508C 80240FFC 0809040D */ j .L80241034 -/* A65090 80241000 AE600070 */ sw $zero, 0x70($s3) -.L80241004: -/* A65094 80241004 0200202D */ daddu $a0, $s0, $zero -/* A65098 80241008 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A6509C 8024100C 0C012530 */ jal ai_enemy_play_sound -/* A650A0 80241010 0000302D */ daddu $a2, $zero, $zero -/* A650A4 80241014 86440008 */ lh $a0, 8($s2) -/* A650A8 80241018 0C00FB3A */ jal get_enemy -/* A650AC 8024101C 24840001 */ addiu $a0, $a0, 1 -/* A650B0 80241020 AC51006C */ sw $s1, 0x6c($v0) -/* A650B4 80241024 24020014 */ addiu $v0, $zero, 0x14 -/* A650B8 80241028 A602008E */ sh $v0, 0x8e($s0) -/* A650BC 8024102C 24020018 */ addiu $v0, $zero, 0x18 -/* A650C0 80241030 AE620070 */ sw $v0, 0x70($s3) -.L80241034: -/* A650C4 80241034 8FBF0044 */ lw $ra, 0x44($sp) -/* A650C8 80241038 8FB40040 */ lw $s4, 0x40($sp) -/* A650CC 8024103C 8FB3003C */ lw $s3, 0x3c($sp) -/* A650D0 80241040 8FB20038 */ lw $s2, 0x38($sp) -/* A650D4 80241044 8FB10034 */ lw $s1, 0x34($sp) -/* A650D8 80241048 8FB00030 */ lw $s0, 0x30($sp) -/* A650DC 8024104C 03E00008 */ jr $ra -/* A650E0 80241050 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s deleted file mode 100644 index 2d74803ad8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241054_A650E4 -/* A650E4 80241054 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A650E8 80241058 AFB10014 */ sw $s1, 0x14($sp) -/* A650EC 8024105C 0080882D */ daddu $s1, $a0, $zero -/* A650F0 80241060 AFBF0018 */ sw $ra, 0x18($sp) -/* A650F4 80241064 AFB00010 */ sw $s0, 0x10($sp) -/* A650F8 80241068 8E300148 */ lw $s0, 0x148($s1) -/* A650FC 8024106C 0C00EABB */ jal get_npc_unsafe -/* A65100 80241070 86040008 */ lh $a0, 8($s0) -/* A65104 80241074 0040202D */ daddu $a0, $v0, $zero -/* A65108 80241078 9482008E */ lhu $v0, 0x8e($a0) -/* A6510C 8024107C 2442FFFF */ addiu $v0, $v0, -1 -/* A65110 80241080 A482008E */ sh $v0, 0x8e($a0) -/* A65114 80241084 00021400 */ sll $v0, $v0, 0x10 -/* A65118 80241088 1C400007 */ bgtz $v0, .L802410A8 -/* A6511C 8024108C 00000000 */ nop -/* A65120 80241090 8E0200CC */ lw $v0, 0xcc($s0) -/* A65124 80241094 8C430000 */ lw $v1, ($v0) -/* A65128 80241098 24020003 */ addiu $v0, $zero, 3 -/* A6512C 8024109C A482008E */ sh $v0, 0x8e($a0) -/* A65130 802410A0 AC830028 */ sw $v1, 0x28($a0) -/* A65134 802410A4 AE200070 */ sw $zero, 0x70($s1) -.L802410A8: -/* A65138 802410A8 8FBF0018 */ lw $ra, 0x18($sp) -/* A6513C 802410AC 8FB10014 */ lw $s1, 0x14($sp) -/* A65140 802410B0 8FB00010 */ lw $s0, 0x10($sp) -/* A65144 802410B4 03E00008 */ jr $ra -/* A65148 802410B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s deleted file mode 100644 index 2a1bab00f0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s +++ /dev/null @@ -1,181 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242FA0_A67030 -.word .L80241208_A65298, .L80241228_A652B8, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241240_A652D0, .L80241250_A652E0, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241268_A652F8, .L80241278_A65308, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241300_A65390, .L80241290_A65320, .L802412A8_A65338, .L802412C0_A65350, .L802412D8_A65368, .L802412F0_A65380, 0 - -.section .text - -glabel func_802410BC_A6514C -/* A6514C 802410BC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A65150 802410C0 AFB50044 */ sw $s5, 0x44($sp) -/* A65154 802410C4 0080A82D */ daddu $s5, $a0, $zero -/* A65158 802410C8 AFBF0048 */ sw $ra, 0x48($sp) -/* A6515C 802410CC AFB40040 */ sw $s4, 0x40($sp) -/* A65160 802410D0 AFB3003C */ sw $s3, 0x3c($sp) -/* A65164 802410D4 AFB20038 */ sw $s2, 0x38($sp) -/* A65168 802410D8 AFB10034 */ sw $s1, 0x34($sp) -/* A6516C 802410DC AFB00030 */ sw $s0, 0x30($sp) -/* A65170 802410E0 8EB10148 */ lw $s1, 0x148($s5) -/* A65174 802410E4 86240008 */ lh $a0, 8($s1) -/* A65178 802410E8 0C00EABB */ jal get_npc_unsafe -/* A6517C 802410EC 00A0802D */ daddu $s0, $a1, $zero -/* A65180 802410F0 8EA3000C */ lw $v1, 0xc($s5) -/* A65184 802410F4 02A0202D */ daddu $a0, $s5, $zero -/* A65188 802410F8 8C650000 */ lw $a1, ($v1) -/* A6518C 802410FC 0C0B1EAF */ jal evt_get_variable -/* A65190 80241100 0040902D */ daddu $s2, $v0, $zero -/* A65194 80241104 AFA00010 */ sw $zero, 0x10($sp) -/* A65198 80241108 8E2300D0 */ lw $v1, 0xd0($s1) -/* A6519C 8024110C 8C630030 */ lw $v1, 0x30($v1) -/* A651A0 80241110 AFA30014 */ sw $v1, 0x14($sp) -/* A651A4 80241114 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651A8 80241118 8C63001C */ lw $v1, 0x1c($v1) -/* A651AC 8024111C AFA30018 */ sw $v1, 0x18($sp) -/* A651B0 80241120 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651B4 80241124 8C630024 */ lw $v1, 0x24($v1) -/* A651B8 80241128 AFA3001C */ sw $v1, 0x1c($sp) -/* A651BC 8024112C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651C0 80241130 8C630028 */ lw $v1, 0x28($v1) -/* A651C4 80241134 27B40010 */ addiu $s4, $sp, 0x10 -/* A651C8 80241138 AFA30020 */ sw $v1, 0x20($sp) -/* A651CC 8024113C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A651D0 80241140 3C0142C8 */ lui $at, 0x42c8 -/* A651D4 80241144 44810000 */ mtc1 $at, $f0 -/* A651D8 80241148 8C63002C */ lw $v1, 0x2c($v1) -/* A651DC 8024114C 0040982D */ daddu $s3, $v0, $zero -/* A651E0 80241150 E7A00028 */ swc1 $f0, 0x28($sp) -/* A651E4 80241154 A7A0002C */ sh $zero, 0x2c($sp) -/* A651E8 80241158 16000005 */ bnez $s0, .L80241170 -/* A651EC 8024115C AFA30024 */ sw $v1, 0x24($sp) -/* A651F0 80241160 8E2200B0 */ lw $v0, 0xb0($s1) -/* A651F4 80241164 30420004 */ andi $v0, $v0, 4 -/* A651F8 80241168 1040001E */ beqz $v0, .L802411E4 -/* A651FC 8024116C 00000000 */ nop -.L80241170: -/* A65200 80241170 8E430000 */ lw $v1, ($s2) -/* A65204 80241174 2402F7FF */ addiu $v0, $zero, -0x801 -/* A65208 80241178 00621824 */ and $v1, $v1, $v0 -/* A6520C 8024117C 8E2200CC */ lw $v0, 0xcc($s1) -/* A65210 80241180 3C040020 */ lui $a0, 0x20 -/* A65214 80241184 8C420000 */ lw $v0, ($v0) -/* A65218 80241188 00641825 */ or $v1, $v1, $a0 -/* A6521C 8024118C AE430000 */ sw $v1, ($s2) -/* A65220 80241190 AE420028 */ sw $v0, 0x28($s2) -/* A65224 80241194 8E220000 */ lw $v0, ($s1) -/* A65228 80241198 00441025 */ or $v0, $v0, $a0 -/* A6522C 8024119C AE220000 */ sw $v0, ($s1) -/* A65230 802411A0 A640008E */ sh $zero, 0x8e($s2) -/* A65234 802411A4 8E2300B0 */ lw $v1, 0xb0($s1) -/* A65238 802411A8 30620004 */ andi $v0, $v1, 4 -/* A6523C 802411AC 1040000C */ beqz $v0, .L802411E0 -/* A65240 802411B0 2402FFFB */ addiu $v0, $zero, -5 -/* A65244 802411B4 3C013F80 */ lui $at, 0x3f80 -/* A65248 802411B8 44810000 */ mtc1 $at, $f0 -/* A6524C 802411BC 00621024 */ and $v0, $v1, $v0 -/* A65250 802411C0 AE2200B0 */ sw $v0, 0xb0($s1) -/* A65254 802411C4 240200FF */ addiu $v0, $zero, 0xff -/* A65258 802411C8 A24200AC */ sb $v0, 0xac($s2) -/* A6525C 802411CC 24020014 */ addiu $v0, $zero, 0x14 -/* A65260 802411D0 A642008E */ sh $v0, 0x8e($s2) -/* A65264 802411D4 E6400054 */ swc1 $f0, 0x54($s2) -/* A65268 802411D8 E6400058 */ swc1 $f0, 0x58($s2) -/* A6526C 802411DC E640005C */ swc1 $f0, 0x5c($s2) -.L802411E0: -/* A65270 802411E0 AEA00070 */ sw $zero, 0x70($s5) -.L802411E4: -/* A65274 802411E4 8EA30070 */ lw $v1, 0x70($s5) -/* A65278 802411E8 2C620019 */ sltiu $v0, $v1, 0x19 -/* A6527C 802411EC 10400044 */ beqz $v0, .L80241300_A65390 -/* A65280 802411F0 00031080 */ sll $v0, $v1, 2 -/* A65284 802411F4 3C018024 */ lui $at, %hi(jtbl_80242FA0_A67030) -/* A65288 802411F8 00220821 */ addu $at, $at, $v0 -/* A6528C 802411FC 8C222FA0 */ lw $v0, %lo(jtbl_80242FA0_A67030)($at) -/* A65290 80241200 00400008 */ jr $v0 -/* A65294 80241204 00000000 */ nop -.L80241208_A65298: -/* A65298 80241208 02A0202D */ daddu $a0, $s5, $zero -/* A6529C 8024120C 0260282D */ daddu $a1, $s3, $zero -/* A652A0 80241210 0C0901CC */ jal kpa_51_UnkFunc58 -/* A652A4 80241214 0280302D */ daddu $a2, $s4, $zero -/* A652A8 80241218 8EA30070 */ lw $v1, 0x70($s5) -/* A652AC 8024121C 24020001 */ addiu $v0, $zero, 1 -/* A652B0 80241220 14620037 */ bne $v1, $v0, .L80241300_A65390 -/* A652B4 80241224 00000000 */ nop -.L80241228_A652B8: -/* A652B8 80241228 02A0202D */ daddu $a0, $s5, $zero -/* A652BC 8024122C 0260282D */ daddu $a1, $s3, $zero -/* A652C0 80241230 0C0901E9 */ jal func_802407A4_A64834 -/* A652C4 80241234 0280302D */ daddu $a2, $s4, $zero -/* A652C8 80241238 080904C0 */ j .L80241300_A65390 -/* A652CC 8024123C 00000000 */ nop -.L80241240_A652D0: -/* A652D0 80241240 02A0202D */ daddu $a0, $s5, $zero -/* A652D4 80241244 0260282D */ daddu $a1, $s3, $zero -/* A652D8 80241248 0C090234 */ jal kpa_51_UnkFunc59 -/* A652DC 8024124C 0280302D */ daddu $a2, $s4, $zero -.L80241250_A652E0: -/* A652E0 80241250 02A0202D */ daddu $a0, $s5, $zero -/* A652E4 80241254 0260282D */ daddu $a1, $s3, $zero -/* A652E8 80241258 0C09025C */ jal func_80240970_A64A00 -/* A652EC 8024125C 0280302D */ daddu $a2, $s4, $zero -/* A652F0 80241260 080904C0 */ j .L80241300_A65390 -/* A652F4 80241264 00000000 */ nop -.L80241268_A652F8: -/* A652F8 80241268 02A0202D */ daddu $a0, $s5, $zero -/* A652FC 8024126C 0260282D */ daddu $a1, $s3, $zero -/* A65300 80241270 0C090275 */ jal func_802409D4_A64A64 -/* A65304 80241274 0280302D */ daddu $a2, $s4, $zero -.L80241278_A65308: -/* A65308 80241278 02A0202D */ daddu $a0, $s5, $zero -/* A6530C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* A65310 80241280 0C0902C5 */ jal func_80240B14_A64BA4 -/* A65314 80241284 0280302D */ daddu $a2, $s4, $zero -/* A65318 80241288 080904C0 */ j .L80241300_A65390 -/* A6531C 8024128C 00000000 */ nop -.L80241290_A65320: -/* A65320 80241290 02A0202D */ daddu $a0, $s5, $zero -/* A65324 80241294 0260282D */ daddu $a1, $s3, $zero -/* A65328 80241298 0C09032E */ jal func_80240CB8_A64D48 -/* A6532C 8024129C 0280302D */ daddu $a2, $s4, $zero -/* A65330 802412A0 080904C0 */ j .L80241300_A65390 -/* A65334 802412A4 00000000 */ nop -.L802412A8_A65338: -/* A65338 802412A8 02A0202D */ daddu $a0, $s5, $zero -/* A6533C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* A65340 802412B0 0C09033D */ jal func_80240CF4_A64D84 -/* A65344 802412B4 0280302D */ daddu $a2, $s4, $zero -/* A65348 802412B8 080904C0 */ j .L80241300_A65390 -/* A6534C 802412BC 00000000 */ nop -.L802412C0_A65350: -/* A65350 802412C0 02A0202D */ daddu $a0, $s5, $zero -/* A65354 802412C4 0260282D */ daddu $a1, $s3, $zero -/* A65358 802412C8 0C0903AD */ jal func_80240EB4_A64F44 -/* A6535C 802412CC 0280302D */ daddu $a2, $s4, $zero -/* A65360 802412D0 080904C0 */ j .L80241300_A65390 -/* A65364 802412D4 00000000 */ nop -.L802412D8_A65368: -/* A65368 802412D8 02A0202D */ daddu $a0, $s5, $zero -/* A6536C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* A65370 802412E0 0C0903C8 */ jal func_80240F20_A64FB0 -/* A65374 802412E4 0280302D */ daddu $a2, $s4, $zero -/* A65378 802412E8 080904C0 */ j .L80241300_A65390 -/* A6537C 802412EC 00000000 */ nop -.L802412F0_A65380: -/* A65380 802412F0 02A0202D */ daddu $a0, $s5, $zero -/* A65384 802412F4 0260282D */ daddu $a1, $s3, $zero -/* A65388 802412F8 0C090415 */ jal func_80241054_A650E4 -/* A6538C 802412FC 0280302D */ daddu $a2, $s4, $zero -.L80241300_A65390: -/* A65390 80241300 8FBF0048 */ lw $ra, 0x48($sp) -/* A65394 80241304 8FB50044 */ lw $s5, 0x44($sp) -/* A65398 80241308 8FB40040 */ lw $s4, 0x40($sp) -/* A6539C 8024130C 8FB3003C */ lw $s3, 0x3c($sp) -/* A653A0 80241310 8FB20038 */ lw $s2, 0x38($sp) -/* A653A4 80241314 8FB10034 */ lw $s1, 0x34($sp) -/* A653A8 80241318 8FB00030 */ lw $s0, 0x30($sp) -/* A653AC 8024131C 0000102D */ daddu $v0, $zero, $zero -/* A653B0 80241320 03E00008 */ jr $ra -/* A653B4 80241324 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328_A653B8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328_A653B8.s deleted file mode 100644 index c91cff0e4c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328_A653B8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241328_A653B8 -/* A653B8 80241328 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A653BC 8024132C AFBF0020 */ sw $ra, 0x20($sp) -/* A653C0 80241330 8C820148 */ lw $v0, 0x148($a0) -/* A653C4 80241334 0C00EABB */ jal get_npc_unsafe -/* A653C8 80241338 84440008 */ lh $a0, 8($v0) -/* A653CC 8024133C 240300FF */ addiu $v1, $zero, 0xff -/* A653D0 80241340 0000282D */ daddu $a1, $zero, $zero -/* A653D4 80241344 00A0302D */ daddu $a2, $a1, $zero -/* A653D8 80241348 A04300AC */ sb $v1, 0xac($v0) -/* A653DC 8024134C AFA00010 */ sw $zero, 0x10($sp) -/* A653E0 80241350 AFA00014 */ sw $zero, 0x14($sp) -/* A653E4 80241354 AFA00018 */ sw $zero, 0x18($sp) -/* A653E8 80241358 8C440024 */ lw $a0, 0x24($v0) -/* A653EC 8024135C 0C0B7A25 */ jal func_802DE894 -/* A653F0 80241360 00A0382D */ daddu $a3, $a1, $zero -/* A653F4 80241364 8FBF0020 */ lw $ra, 0x20($sp) -/* A653F8 80241368 24020002 */ addiu $v0, $zero, 2 -/* A653FC 8024136C 03E00008 */ jr $ra -/* A65400 80241370 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374_A65404.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374_A65404.s deleted file mode 100644 index 81760925bb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374_A65404.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241374_A65404 -/* A65404 80241374 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A65408 80241378 AFB10014 */ sw $s1, 0x14($sp) -/* A6540C 8024137C 0080882D */ daddu $s1, $a0, $zero -/* A65410 80241380 AFBF0018 */ sw $ra, 0x18($sp) -/* A65414 80241384 AFB00010 */ sw $s0, 0x10($sp) -/* A65418 80241388 8E300148 */ lw $s0, 0x148($s1) -/* A6541C 8024138C 0C00EABB */ jal get_npc_unsafe -/* A65420 80241390 86040008 */ lh $a0, 8($s0) -/* A65424 80241394 0040182D */ daddu $v1, $v0, $zero -/* A65428 80241398 240200FF */ addiu $v0, $zero, 0xff -/* A6542C 8024139C A06200AC */ sb $v0, 0xac($v1) -/* A65430 802413A0 8E0200CC */ lw $v0, 0xcc($s0) -/* A65434 802413A4 8C440008 */ lw $a0, 8($v0) -/* A65438 802413A8 A460008E */ sh $zero, 0x8e($v1) -/* A6543C 802413AC AC640028 */ sw $a0, 0x28($v1) -/* A65440 802413B0 AE200070 */ sw $zero, 0x70($s1) -/* A65444 802413B4 8FBF0018 */ lw $ra, 0x18($sp) -/* A65448 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* A6544C 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* A65450 802413C0 24020002 */ addiu $v0, $zero, 2 -/* A65454 802413C4 03E00008 */ jr $ra -/* A65458 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s deleted file mode 100644 index ecc9894768..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241404_A65494.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241404_A65494 -/* A65494 80241404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A65498 80241408 AFBF0014 */ sw $ra, 0x14($sp) -/* A6549C 8024140C AFB00010 */ sw $s0, 0x10($sp) -/* A654A0 80241410 8C900148 */ lw $s0, 0x148($a0) -/* A654A4 80241414 0C00EABB */ jal get_npc_unsafe -/* A654A8 80241418 86040008 */ lh $a0, 8($s0) -/* A654AC 8024141C 0040202D */ daddu $a0, $v0, $zero -/* A654B0 80241420 8E03006C */ lw $v1, 0x6c($s0) -/* A654B4 80241424 24020002 */ addiu $v0, $zero, 2 -/* A654B8 80241428 14620003 */ bne $v1, $v0, .L80241438 -/* A654BC 8024142C 00000000 */ nop -/* A654C0 80241430 AC80001C */ sw $zero, 0x1c($a0) -/* A654C4 80241434 AC800018 */ sw $zero, 0x18($a0) -.L80241438: -/* A654C8 80241438 8FBF0014 */ lw $ra, 0x14($sp) -/* A654CC 8024143C 8FB00010 */ lw $s0, 0x10($sp) -/* A654D0 80241440 24020002 */ addiu $v0, $zero, 2 -/* A654D4 80241444 03E00008 */ jr $ra -/* A654D8 80241448 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802411C4_A6F5A4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802411C4_A6F5A4.s deleted file mode 100644 index 662cc6f4d6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802411C4_A6F5A4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411C4_A6F5A4 -/* A6F5A4 802411C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6F5A8 802411C8 AFB00010 */ sw $s0, 0x10($sp) -/* A6F5AC 802411CC 0080802D */ daddu $s0, $a0, $zero -/* A6F5B0 802411D0 AFBF0014 */ sw $ra, 0x14($sp) -/* A6F5B4 802411D4 8E020148 */ lw $v0, 0x148($s0) -/* A6F5B8 802411D8 0C00EABB */ jal get_npc_unsafe -/* A6F5BC 802411DC 84440008 */ lh $a0, 8($v0) -/* A6F5C0 802411E0 2403001E */ addiu $v1, $zero, 0x1e -/* A6F5C4 802411E4 A443008E */ sh $v1, 0x8e($v0) -/* A6F5C8 802411E8 2402000B */ addiu $v0, $zero, 0xb -/* A6F5CC 802411EC AE020070 */ sw $v0, 0x70($s0) -/* A6F5D0 802411F0 8FBF0014 */ lw $ra, 0x14($sp) -/* A6F5D4 802411F4 8FB00010 */ lw $s0, 0x10($sp) -/* A6F5D8 802411F8 03E00008 */ jr $ra -/* A6F5DC 802411FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s deleted file mode 100644 index 1bc4960aa5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241200_A6F5E0 -/* A6F5E0 80241200 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A6F5E4 80241204 AFB40040 */ sw $s4, 0x40($sp) -/* A6F5E8 80241208 0080A02D */ daddu $s4, $a0, $zero -/* A6F5EC 8024120C AFBF0044 */ sw $ra, 0x44($sp) -/* A6F5F0 80241210 AFB3003C */ sw $s3, 0x3c($sp) -/* A6F5F4 80241214 AFB20038 */ sw $s2, 0x38($sp) -/* A6F5F8 80241218 AFB10034 */ sw $s1, 0x34($sp) -/* A6F5FC 8024121C AFB00030 */ sw $s0, 0x30($sp) -/* A6F600 80241220 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A6F604 80241224 8E900148 */ lw $s0, 0x148($s4) -/* A6F608 80241228 00A0882D */ daddu $s1, $a1, $zero -/* A6F60C 8024122C 86040008 */ lh $a0, 8($s0) -/* A6F610 80241230 0C00EABB */ jal get_npc_unsafe -/* A6F614 80241234 00C0902D */ daddu $s2, $a2, $zero -/* A6F618 80241238 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A6F61C 8024123C 46806320 */ cvt.s.w $f12, $f12 -/* A6F620 80241240 0040982D */ daddu $s3, $v0, $zero -/* A6F624 80241244 C6140070 */ lwc1 $f20, 0x70($s0) -/* A6F628 80241248 4680A520 */ cvt.s.w $f20, $f20 -/* A6F62C 8024124C 3C014059 */ lui $at, 0x4059 -/* A6F630 80241250 44810800 */ mtc1 $at, $f1 -/* A6F634 80241254 44800000 */ mtc1 $zero, $f0 -/* A6F638 80241258 4600A521 */ cvt.d.s $f20, $f20 -/* A6F63C 8024125C 4620A503 */ div.d $f20, $f20, $f0 -/* A6F640 80241260 0C00A8BB */ jal sin_deg -/* A6F644 80241264 4620A520 */ cvt.s.d $f20, $f20 -/* A6F648 80241268 3C014018 */ lui $at, 0x4018 -/* A6F64C 8024126C 44811800 */ mtc1 $at, $f3 -/* A6F650 80241270 44801000 */ mtc1 $zero, $f2 -/* A6F654 80241274 46000021 */ cvt.d.s $f0, $f0 -/* A6F658 80241278 46220002 */ mul.d $f0, $f0, $f2 -/* A6F65C 8024127C 00000000 */ nop -/* A6F660 80241280 4600A0A1 */ cvt.d.s $f2, $f20 -/* A6F664 80241284 46201080 */ add.d $f2, $f2, $f0 -/* A6F668 80241288 462010A0 */ cvt.s.d $f2, $f2 -/* A6F66C 8024128C E662003C */ swc1 $f2, 0x3c($s3) -/* A6F670 80241290 8E02006C */ lw $v0, 0x6c($s0) -/* A6F674 80241294 2442000A */ addiu $v0, $v0, 0xa -/* A6F678 80241298 44826000 */ mtc1 $v0, $f12 -/* A6F67C 8024129C 00000000 */ nop -/* A6F680 802412A0 0C00A6C9 */ jal clamp_angle -/* A6F684 802412A4 46806320 */ cvt.s.w $f12, $f12 -/* A6F688 802412A8 4600018D */ trunc.w.s $f6, $f0 -/* A6F68C 802412AC E606006C */ swc1 $f6, 0x6c($s0) -/* A6F690 802412B0 0280202D */ daddu $a0, $s4, $zero -/* A6F694 802412B4 8E250024 */ lw $a1, 0x24($s1) -/* A6F698 802412B8 8E260028 */ lw $a2, 0x28($s1) -/* A6F69C 802412BC 0C0902B9 */ jal kpa_61_UnkNpcAIFunc47 -/* A6F6A0 802412C0 0240382D */ daddu $a3, $s2, $zero -/* A6F6A4 802412C4 24030001 */ addiu $v1, $zero, 1 -/* A6F6A8 802412C8 1443001E */ bne $v0, $v1, .L80241344 -/* A6F6AC 802412CC 0000202D */ daddu $a0, $zero, $zero -/* A6F6B0 802412D0 0260282D */ daddu $a1, $s3, $zero -/* A6F6B4 802412D4 0000302D */ daddu $a2, $zero, $zero -/* A6F6B8 802412D8 866300A8 */ lh $v1, 0xa8($s3) -/* A6F6BC 802412DC 3C013F80 */ lui $at, 0x3f80 -/* A6F6C0 802412E0 44810000 */ mtc1 $at, $f0 -/* A6F6C4 802412E4 3C014000 */ lui $at, 0x4000 -/* A6F6C8 802412E8 44811000 */ mtc1 $at, $f2 -/* A6F6CC 802412EC 3C01C1A0 */ lui $at, 0xc1a0 -/* A6F6D0 802412F0 44812000 */ mtc1 $at, $f4 -/* A6F6D4 802412F4 2402000F */ addiu $v0, $zero, 0xf -/* A6F6D8 802412F8 AFA2001C */ sw $v0, 0x1c($sp) -/* A6F6DC 802412FC 44833000 */ mtc1 $v1, $f6 -/* A6F6E0 80241300 00000000 */ nop -/* A6F6E4 80241304 468031A0 */ cvt.s.w $f6, $f6 -/* A6F6E8 80241308 44073000 */ mfc1 $a3, $f6 -/* A6F6EC 8024130C 27A20028 */ addiu $v0, $sp, 0x28 -/* A6F6F0 80241310 AFA20020 */ sw $v0, 0x20($sp) -/* A6F6F4 80241314 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F6F8 80241318 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6F6FC 8024131C 0C01BFA4 */ jal fx_emote -/* A6F700 80241320 E7A40018 */ swc1 $f4, 0x18($sp) -/* A6F704 80241324 0260202D */ daddu $a0, $s3, $zero -/* A6F708 80241328 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A6F70C 8024132C 0C012530 */ jal ai_enemy_play_sound -/* A6F710 80241330 3C060020 */ lui $a2, 0x20 -/* A6F714 80241334 24020032 */ addiu $v0, $zero, 0x32 -/* A6F718 80241338 A662008E */ sh $v0, 0x8e($s3) -/* A6F71C 8024133C 080904D9 */ j .L80241364 -/* A6F720 80241340 24020014 */ addiu $v0, $zero, 0x14 -.L80241344: -/* A6F724 80241344 9662008E */ lhu $v0, 0x8e($s3) -/* A6F728 80241348 2442FFFF */ addiu $v0, $v0, -1 -/* A6F72C 8024134C A662008E */ sh $v0, 0x8e($s3) -/* A6F730 80241350 00021400 */ sll $v0, $v0, 0x10 -/* A6F734 80241354 1C400004 */ bgtz $v0, .L80241368 -/* A6F738 80241358 24020005 */ addiu $v0, $zero, 5 -/* A6F73C 8024135C A662008E */ sh $v0, 0x8e($s3) -/* A6F740 80241360 2402000F */ addiu $v0, $zero, 0xf -.L80241364: -/* A6F744 80241364 AE820070 */ sw $v0, 0x70($s4) -.L80241368: -/* A6F748 80241368 8FBF0044 */ lw $ra, 0x44($sp) -/* A6F74C 8024136C 8FB40040 */ lw $s4, 0x40($sp) -/* A6F750 80241370 8FB3003C */ lw $s3, 0x3c($sp) -/* A6F754 80241374 8FB20038 */ lw $s2, 0x38($sp) -/* A6F758 80241378 8FB10034 */ lw $s1, 0x34($sp) -/* A6F75C 8024137C 8FB00030 */ lw $s0, 0x30($sp) -/* A6F760 80241380 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A6F764 80241384 03E00008 */ jr $ra -/* A6F768 80241388 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s deleted file mode 100644 index 9087044a98..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s +++ /dev/null @@ -1,282 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243D70_A72150 -.double 180.0 - -dlabel D_80243D78_A72158 -.double 90.0 - -dlabel D_80243D80_A72160 -.double 270.0 - -.section .text - -glabel func_8024138C_A6F76C -/* A6F76C 8024138C 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A6F770 80241390 AFB60048 */ sw $s6, 0x48($sp) -/* A6F774 80241394 0080B02D */ daddu $s6, $a0, $zero -/* A6F778 80241398 AFBF004C */ sw $ra, 0x4c($sp) -/* A6F77C 8024139C AFB50044 */ sw $s5, 0x44($sp) -/* A6F780 802413A0 AFB40040 */ sw $s4, 0x40($sp) -/* A6F784 802413A4 AFB3003C */ sw $s3, 0x3c($sp) -/* A6F788 802413A8 AFB20038 */ sw $s2, 0x38($sp) -/* A6F78C 802413AC AFB10034 */ sw $s1, 0x34($sp) -/* A6F790 802413B0 AFB00030 */ sw $s0, 0x30($sp) -/* A6F794 802413B4 F7B60058 */ sdc1 $f22, 0x58($sp) -/* A6F798 802413B8 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A6F79C 802413BC 8ED50148 */ lw $s5, 0x148($s6) -/* A6F7A0 802413C0 86A40008 */ lh $a0, 8($s5) -/* A6F7A4 802413C4 0C00EABB */ jal get_npc_unsafe -/* A6F7A8 802413C8 0000982D */ daddu $s3, $zero, $zero -/* A6F7AC 802413CC 0040802D */ daddu $s0, $v0, $zero -/* A6F7B0 802413D0 9602008E */ lhu $v0, 0x8e($s0) -/* A6F7B4 802413D4 2442FFFF */ addiu $v0, $v0, -1 -/* A6F7B8 802413D8 A602008E */ sh $v0, 0x8e($s0) -/* A6F7BC 802413DC 00021400 */ sll $v0, $v0, 0x10 -/* A6F7C0 802413E0 1C4000DA */ bgtz $v0, .L8024174C -/* A6F7C4 802413E4 0260A02D */ daddu $s4, $s3, $zero -/* A6F7C8 802413E8 0C00A67F */ jal rand_int -/* A6F7CC 802413EC 2404001E */ addiu $a0, $zero, 0x1e -/* A6F7D0 802413F0 0260902D */ daddu $s2, $s3, $zero -/* A6F7D4 802413F4 8EA400D0 */ lw $a0, 0xd0($s5) -/* A6F7D8 802413F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A6F7DC 802413FC 3C018024 */ lui $at, %hi(D_80243D70_A72150) -/* A6F7E0 80241400 D4363D70 */ ldc1 $f22, %lo(D_80243D70_A72150)($at) -/* A6F7E4 80241404 C4820000 */ lwc1 $f2, ($a0) -/* A6F7E8 80241408 468010A0 */ cvt.s.w $f2, $f2 -/* A6F7EC 8024140C C4840008 */ lwc1 $f4, 8($a0) -/* A6F7F0 80241410 46802120 */ cvt.s.w $f4, $f4 -/* A6F7F4 80241414 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F7F8 80241418 8EA300D0 */ lw $v1, 0xd0($s5) -/* A6F7FC 8024141C 44051000 */ mfc1 $a1, $f2 -/* A6F800 80241420 C460000C */ lwc1 $f0, 0xc($v1) -/* A6F804 80241424 46800020 */ cvt.s.w $f0, $f0 -/* A6F808 80241428 E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F80C 8024142C 8EA300D0 */ lw $v1, 0xd0($s5) -/* A6F810 80241430 44062000 */ mfc1 $a2, $f4 -/* A6F814 80241434 C4600010 */ lwc1 $f0, 0x10($v1) -/* A6F818 80241438 46800020 */ cvt.s.w $f0, $f0 -/* A6F81C 8024143C E7A00018 */ swc1 $f0, 0x18($sp) -/* A6F820 80241440 44820000 */ mtc1 $v0, $f0 -/* A6F824 80241444 00000000 */ nop -/* A6F828 80241448 46800021 */ cvt.d.w $f0, $f0 -/* A6F82C 8024144C 46360000 */ add.d $f0, $f0, $f22 -/* A6F830 80241450 8C840018 */ lw $a0, 0x18($a0) -/* A6F834 80241454 8E070038 */ lw $a3, 0x38($s0) -/* A6F838 80241458 0C0123F5 */ jal is_point_within_region -/* A6F83C 8024145C 46200520 */ cvt.s.d $f20, $f0 -/* A6F840 80241460 10400023 */ beqz $v0, .L802414F0 -/* A6F844 80241464 00000000 */ nop -/* A6F848 80241468 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F84C 8024146C 8EA200D0 */ lw $v0, 0xd0($s5) -/* A6F850 80241470 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F854 80241474 C44A0000 */ lwc1 $f10, ($v0) -/* A6F858 80241478 468052A0 */ cvt.s.w $f10, $f10 -/* A6F85C 8024147C 44065000 */ mfc1 $a2, $f10 -/* A6F860 80241480 C44A0008 */ lwc1 $f10, 8($v0) -/* A6F864 80241484 468052A0 */ cvt.s.w $f10, $f10 -/* A6F868 80241488 44075000 */ mfc1 $a3, $f10 -/* A6F86C 8024148C 0C00A720 */ jal atan2 -/* A6F870 80241490 00000000 */ nop -/* A6F874 80241494 44931000 */ mtc1 $s3, $f2 -/* A6F878 80241498 00000000 */ nop -/* A6F87C 8024149C 468010A0 */ cvt.s.w $f2, $f2 -/* A6F880 802414A0 46020001 */ sub.s $f0, $f0, $f2 -/* A6F884 802414A4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F888 802414A8 E600000C */ swc1 $f0, 0xc($s0) -/* A6F88C 802414AC 8EA200D0 */ lw $v0, 0xd0($s5) -/* A6F890 802414B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F894 802414B4 C44A0000 */ lwc1 $f10, ($v0) -/* A6F898 802414B8 468052A0 */ cvt.s.w $f10, $f10 -/* A6F89C 802414BC 44065000 */ mfc1 $a2, $f10 -/* A6F8A0 802414C0 C44A0008 */ lwc1 $f10, 8($v0) -/* A6F8A4 802414C4 468052A0 */ cvt.s.w $f10, $f10 -/* A6F8A8 802414C8 44075000 */ mfc1 $a3, $f10 -/* A6F8AC 802414CC 0C00A7B5 */ jal dist2D -/* A6F8B0 802414D0 00000000 */ nop -/* A6F8B4 802414D4 46000106 */ mov.s $f4, $f0 -/* A6F8B8 802414D8 4614003C */ c.lt.s $f0, $f20 -/* A6F8BC 802414DC 00000000 */ nop -/* A6F8C0 802414E0 4503006A */ bc1tl .L8024168C -/* A6F8C4 802414E4 46002506 */ mov.s $f20, $f4 -/* A6F8C8 802414E8 080905A4 */ j .L80241690 -/* A6F8CC 802414EC 27A40020 */ addiu $a0, $sp, 0x20 -.L802414F0: -/* A6F8D0 802414F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F8D4 802414F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6F8D8 802414F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A6F8DC 802414FC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F8E0 80241500 8C460028 */ lw $a2, 0x28($v0) -/* A6F8E4 80241504 0C00A720 */ jal atan2 -/* A6F8E8 80241508 8C470030 */ lw $a3, 0x30($v0) -/* A6F8EC 8024150C 460000A1 */ cvt.d.s $f2, $f0 -/* A6F8F0 80241510 4636103C */ c.lt.d $f2, $f22 -/* A6F8F4 80241514 00000000 */ nop -/* A6F8F8 80241518 45000006 */ bc1f .L80241534 -/* A6F8FC 8024151C E600000C */ swc1 $f0, 0xc($s0) -/* A6F900 80241520 0C00A67F */ jal rand_int -/* A6F904 80241524 2404000A */ addiu $a0, $zero, 0xa -/* A6F908 80241528 3C018024 */ lui $at, %hi(D_80243D78_A72158) -/* A6F90C 8024152C 08090551 */ j .L80241544 -/* A6F910 80241530 D4203D78 */ ldc1 $f0, %lo(D_80243D78_A72158)($at) -.L80241534: -/* A6F914 80241534 0C00A67F */ jal rand_int -/* A6F918 80241538 2404000A */ addiu $a0, $zero, 0xa -/* A6F91C 8024153C 3C018024 */ lui $at, %hi(D_80243D80_A72160) -/* A6F920 80241540 D4203D80 */ ldc1 $f0, %lo(D_80243D80_A72160)($at) -.L80241544: -/* A6F924 80241544 44821000 */ mtc1 $v0, $f2 -/* A6F928 80241548 00000000 */ nop -/* A6F92C 8024154C 468010A1 */ cvt.d.w $f2, $f2 -/* A6F930 80241550 46201080 */ add.d $f2, $f2, $f0 -/* A6F934 80241554 3C014014 */ lui $at, 0x4014 -/* A6F938 80241558 44810800 */ mtc1 $at, $f1 -/* A6F93C 8024155C 44800000 */ mtc1 $zero, $f0 -/* A6F940 80241560 00000000 */ nop -/* A6F944 80241564 46201081 */ sub.d $f2, $f2, $f0 -/* A6F948 80241568 462015A0 */ cvt.s.d $f22, $f2 -/* A6F94C 8024156C 00141080 */ sll $v0, $s4, 2 -/* A6F950 80241570 00548821 */ addu $s1, $v0, $s4 -.L80241574: -/* A6F954 80241574 12400006 */ beqz $s2, .L80241590 -/* A6F958 80241578 00000000 */ nop -/* A6F95C 8024157C 44910000 */ mtc1 $s1, $f0 -/* A6F960 80241580 00000000 */ nop -/* A6F964 80241584 46800020 */ cvt.s.w $f0, $f0 -/* A6F968 80241588 08090568 */ j .L802415A0 -/* A6F96C 8024158C 4600B000 */ add.s $f0, $f22, $f0 -.L80241590: -/* A6F970 80241590 44910000 */ mtc1 $s1, $f0 -/* A6F974 80241594 00000000 */ nop -/* A6F978 80241598 46800020 */ cvt.s.w $f0, $f0 -/* A6F97C 8024159C 4600B001 */ sub.s $f0, $f22, $f0 -.L802415A0: -/* A6F980 802415A0 E600000C */ swc1 $f0, 0xc($s0) -/* A6F984 802415A4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6F988 802415A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A6F98C 802415AC C6040040 */ lwc1 $f4, 0x40($s0) -/* A6F990 802415B0 0000202D */ daddu $a0, $zero, $zero -/* A6F994 802415B4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A6F998 802415B8 E7A20024 */ swc1 $f2, 0x24($sp) -/* A6F99C 802415BC E7A40028 */ swc1 $f4, 0x28($sp) -/* A6F9A0 802415C0 E7B40010 */ swc1 $f20, 0x10($sp) -/* A6F9A4 802415C4 C600000C */ lwc1 $f0, 0xc($s0) -/* A6F9A8 802415C8 27A50020 */ addiu $a1, $sp, 0x20 -/* A6F9AC 802415CC E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F9B0 802415D0 860200A8 */ lh $v0, 0xa8($s0) -/* A6F9B4 802415D4 27A60024 */ addiu $a2, $sp, 0x24 -/* A6F9B8 802415D8 44820000 */ mtc1 $v0, $f0 -/* A6F9BC 802415DC 00000000 */ nop -/* A6F9C0 802415E0 46800020 */ cvt.s.w $f0, $f0 -/* A6F9C4 802415E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A6F9C8 802415E8 860200A6 */ lh $v0, 0xa6($s0) -/* A6F9CC 802415EC 27A70028 */ addiu $a3, $sp, 0x28 -/* A6F9D0 802415F0 44820000 */ mtc1 $v0, $f0 -/* A6F9D4 802415F4 00000000 */ nop -/* A6F9D8 802415F8 46800020 */ cvt.s.w $f0, $f0 -/* A6F9DC 802415FC 0C0376B9 */ jal npc_test_move_taller_with_slipping -/* A6F9E0 80241600 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A6F9E4 80241604 50400014 */ beql $v0, $zero, .L80241658 -/* A6F9E8 80241608 24130002 */ addiu $s3, $zero, 2 -/* A6F9EC 8024160C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F9F0 80241610 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F9F4 80241614 8FA60020 */ lw $a2, 0x20($sp) -/* A6F9F8 80241618 0C00A7B5 */ jal dist2D -/* A6F9FC 8024161C 8FA70028 */ lw $a3, 0x28($sp) -/* A6FA00 80241620 46000106 */ mov.s $f4, $f0 -/* A6FA04 80241624 3C014064 */ lui $at, 0x4064 -/* A6FA08 80241628 44811800 */ mtc1 $at, $f3 -/* A6FA0C 8024162C 44801000 */ mtc1 $zero, $f2 -/* A6FA10 80241630 46002021 */ cvt.d.s $f0, $f4 -/* A6FA14 80241634 4620103C */ c.lt.d $f2, $f0 -/* A6FA18 80241638 00000000 */ nop -/* A6FA1C 8024163C 45000006 */ bc1f .L80241658 -/* A6FA20 80241640 00000000 */ nop -/* A6FA24 80241644 4614203C */ c.lt.s $f4, $f20 -/* A6FA28 80241648 00000000 */ nop -/* A6FA2C 8024164C 45030001 */ bc1tl .L80241654 -/* A6FA30 80241650 46002506 */ mov.s $f20, $f4 -.L80241654: -/* A6FA34 80241654 24130001 */ addiu $s3, $zero, 1 -.L80241658: -/* A6FA38 80241658 1660000D */ bnez $s3, .L80241690 -/* A6FA3C 8024165C 27A40020 */ addiu $a0, $sp, 0x20 -/* A6FA40 80241660 56400003 */ bnel $s2, $zero, .L80241670 -/* A6FA44 80241664 26310005 */ addiu $s1, $s1, 5 -/* A6FA48 80241668 0809059E */ j .L80241678 -/* A6FA4C 8024166C 24120001 */ addiu $s2, $zero, 1 -.L80241670: -/* A6FA50 80241670 26940001 */ addiu $s4, $s4, 1 -/* A6FA54 80241674 0000902D */ daddu $s2, $zero, $zero -.L80241678: -/* A6FA58 80241678 2A820007 */ slti $v0, $s4, 7 -/* A6FA5C 8024167C 5040FFBD */ beql $v0, $zero, .L80241574 -/* A6FA60 80241680 24130003 */ addiu $s3, $zero, 3 -/* A6FA64 80241684 0809055D */ j .L80241574 -/* A6FA68 80241688 00000000 */ nop -.L8024168C: -/* A6FA6C 8024168C 27A40020 */ addiu $a0, $sp, 0x20 -.L80241690: -/* A6FA70 80241690 4406A000 */ mfc1 $a2, $f20 -/* A6FA74 80241694 8E07000C */ lw $a3, 0xc($s0) -/* A6FA78 80241698 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6FA7C 8024169C C6020040 */ lwc1 $f2, 0x40($s0) -/* A6FA80 802416A0 27A50028 */ addiu $a1, $sp, 0x28 -/* A6FA84 802416A4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A6FA88 802416A8 0C00A7E7 */ jal add_vec2D_polar -/* A6FA8C 802416AC E7A20028 */ swc1 $f2, 0x28($sp) -/* A6FA90 802416B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6FA94 802416B4 3C014059 */ lui $at, 0x4059 -/* A6FA98 802416B8 44814800 */ mtc1 $at, $f9 -/* A6FA9C 802416BC 44804000 */ mtc1 $zero, $f8 -/* A6FAA0 802416C0 46000021 */ cvt.d.s $f0, $f0 -/* A6FAA4 802416C4 46280002 */ mul.d $f0, $f0, $f8 -/* A6FAA8 802416C8 00000000 */ nop -/* A6FAAC 802416CC C7A20020 */ lwc1 $f2, 0x20($sp) -/* A6FAB0 802416D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* A6FAB4 802416D4 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A6FAB8 802416D8 E6020060 */ swc1 $f2, 0x60($s0) -/* A6FABC 802416DC E6040064 */ swc1 $f4, 0x64($s0) -/* A6FAC0 802416E0 E6060068 */ swc1 $f6, 0x68($s0) -/* A6FAC4 802416E4 4620028D */ trunc.w.d $f10, $f0 -/* A6FAC8 802416E8 E6AA007C */ swc1 $f10, 0x7c($s5) -/* A6FACC 802416EC C6000040 */ lwc1 $f0, 0x40($s0) -/* A6FAD0 802416F0 46000021 */ cvt.d.s $f0, $f0 -/* A6FAD4 802416F4 46280002 */ mul.d $f0, $f0, $f8 -/* A6FAD8 802416F8 00000000 */ nop -/* A6FADC 802416FC 4620028D */ trunc.w.d $f10, $f0 -/* A6FAE0 80241700 E6AA0084 */ swc1 $f10, 0x84($s5) -/* A6FAE4 80241704 0C00A67F */ jal rand_int -/* A6FAE8 80241708 2404000A */ addiu $a0, $zero, 0xa -/* A6FAEC 8024170C 3C014040 */ lui $at, 0x4040 -/* A6FAF0 80241710 44810000 */ mtc1 $at, $f0 -/* A6FAF4 80241714 3C013FB3 */ lui $at, 0x3fb3 -/* A6FAF8 80241718 34213333 */ ori $at, $at, 0x3333 -/* A6FAFC 8024171C 44811000 */ mtc1 $at, $f2 -/* A6FB00 80241720 3C013E4C */ lui $at, 0x3e4c -/* A6FB04 80241724 3421CCCD */ ori $at, $at, 0xcccd -/* A6FB08 80241728 44812000 */ mtc1 $at, $f4 -/* A6FB0C 8024172C 24420023 */ addiu $v0, $v0, 0x23 -/* A6FB10 80241730 AEA20078 */ sw $v0, 0x78($s5) -/* A6FB14 80241734 24020010 */ addiu $v0, $zero, 0x10 -/* A6FB18 80241738 A600008E */ sh $zero, 0x8e($s0) -/* A6FB1C 8024173C E6000018 */ swc1 $f0, 0x18($s0) -/* A6FB20 80241740 E602001C */ swc1 $f2, 0x1c($s0) -/* A6FB24 80241744 E6040014 */ swc1 $f4, 0x14($s0) -/* A6FB28 80241748 AEC20070 */ sw $v0, 0x70($s6) -.L8024174C: -/* A6FB2C 8024174C 8FBF004C */ lw $ra, 0x4c($sp) -/* A6FB30 80241750 8FB60048 */ lw $s6, 0x48($sp) -/* A6FB34 80241754 8FB50044 */ lw $s5, 0x44($sp) -/* A6FB38 80241758 8FB40040 */ lw $s4, 0x40($sp) -/* A6FB3C 8024175C 8FB3003C */ lw $s3, 0x3c($sp) -/* A6FB40 80241760 8FB20038 */ lw $s2, 0x38($sp) -/* A6FB44 80241764 8FB10034 */ lw $s1, 0x34($sp) -/* A6FB48 80241768 8FB00030 */ lw $s0, 0x30($sp) -/* A6FB4C 8024176C D7B60058 */ ldc1 $f22, 0x58($sp) -/* A6FB50 80241770 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A6FB54 80241774 03E00008 */ jr $ra -/* A6FB58 80241778 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s deleted file mode 100644 index 161031b1ae..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024177C_A6FB5C -/* A6FB5C 8024177C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A6FB60 80241780 AFB20018 */ sw $s2, 0x18($sp) -/* A6FB64 80241784 0080902D */ daddu $s2, $a0, $zero -/* A6FB68 80241788 AFBF001C */ sw $ra, 0x1c($sp) -/* A6FB6C 8024178C AFB10014 */ sw $s1, 0x14($sp) -/* A6FB70 80241790 AFB00010 */ sw $s0, 0x10($sp) -/* A6FB74 80241794 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A6FB78 80241798 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A6FB7C 8024179C 8E510148 */ lw $s1, 0x148($s2) -/* A6FB80 802417A0 0C00EABB */ jal get_npc_unsafe -/* A6FB84 802417A4 86240008 */ lh $a0, 8($s1) -/* A6FB88 802417A8 0040802D */ daddu $s0, $v0, $zero -/* A6FB8C 802417AC C6340070 */ lwc1 $f20, 0x70($s1) -/* A6FB90 802417B0 4680A520 */ cvt.s.w $f20, $f20 -/* A6FB94 802417B4 4600A521 */ cvt.d.s $f20, $f20 -/* A6FB98 802417B8 8E23006C */ lw $v1, 0x6c($s1) -/* A6FB9C 802417BC 3C014059 */ lui $at, 0x4059 -/* A6FBA0 802417C0 4481B800 */ mtc1 $at, $f23 -/* A6FBA4 802417C4 4480B000 */ mtc1 $zero, $f22 -/* A6FBA8 802417C8 2463000A */ addiu $v1, $v1, 0xa -/* A6FBAC 802417CC 44836000 */ mtc1 $v1, $f12 -/* A6FBB0 802417D0 00000000 */ nop -/* A6FBB4 802417D4 46806320 */ cvt.s.w $f12, $f12 -/* A6FBB8 802417D8 4636A503 */ div.d $f20, $f20, $f22 -/* A6FBBC 802417DC 0C00A6C9 */ jal clamp_angle -/* A6FBC0 802417E0 4620A520 */ cvt.s.d $f20, $f20 -/* A6FBC4 802417E4 4600010D */ trunc.w.s $f4, $f0 -/* A6FBC8 802417E8 44022000 */ mfc1 $v0, $f4 -/* A6FBCC 802417EC 00000000 */ nop -/* A6FBD0 802417F0 44826000 */ mtc1 $v0, $f12 -/* A6FBD4 802417F4 00000000 */ nop -/* A6FBD8 802417F8 46806320 */ cvt.s.w $f12, $f12 -/* A6FBDC 802417FC 0C00A8BB */ jal sin_deg -/* A6FBE0 80241800 AE22006C */ sw $v0, 0x6c($s1) -/* A6FBE4 80241804 3C014018 */ lui $at, 0x4018 -/* A6FBE8 80241808 44811800 */ mtc1 $at, $f3 -/* A6FBEC 8024180C 44801000 */ mtc1 $zero, $f2 -/* A6FBF0 80241810 46000021 */ cvt.d.s $f0, $f0 -/* A6FBF4 80241814 46220002 */ mul.d $f0, $f0, $f2 -/* A6FBF8 80241818 00000000 */ nop -/* A6FBFC 8024181C 4600A0A1 */ cvt.d.s $f2, $f20 -/* A6FC00 80241820 46201080 */ add.d $f2, $f2, $f0 -/* A6FC04 80241824 8602008C */ lh $v0, 0x8c($s0) -/* A6FC08 80241828 46201020 */ cvt.s.d $f0, $f2 -/* A6FC0C 8024182C 14400008 */ bnez $v0, .L80241850 -/* A6FC10 80241830 E600003C */ swc1 $f0, 0x3c($s0) -/* A6FC14 80241834 46000021 */ cvt.d.s $f0, $f0 -/* A6FC18 80241838 46360002 */ mul.d $f0, $f0, $f22 -/* A6FC1C 8024183C 00000000 */ nop -/* A6FC20 80241840 24020011 */ addiu $v0, $zero, 0x11 -/* A6FC24 80241844 4620010D */ trunc.w.d $f4, $f0 -/* A6FC28 80241848 E6240080 */ swc1 $f4, 0x80($s1) -/* A6FC2C 8024184C AE420070 */ sw $v0, 0x70($s2) -.L80241850: -/* A6FC30 80241850 8FBF001C */ lw $ra, 0x1c($sp) -/* A6FC34 80241854 8FB20018 */ lw $s2, 0x18($sp) -/* A6FC38 80241858 8FB10014 */ lw $s1, 0x14($sp) -/* A6FC3C 8024185C 8FB00010 */ lw $s0, 0x10($sp) -/* A6FC40 80241860 D7B60028 */ ldc1 $f22, 0x28($sp) -/* A6FC44 80241864 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A6FC48 80241868 03E00008 */ jr $ra -/* A6FC4C 8024186C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s deleted file mode 100644 index 09b1c61912..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s +++ /dev/null @@ -1,164 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243D88_A72168 -.double 180.0 - -dlabel D_80243D90_A72170 -.double 270.0 - -.section .text - -glabel func_80241870_A6FC50 -/* A6FC50 80241870 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A6FC54 80241874 AFB20020 */ sw $s2, 0x20($sp) -/* A6FC58 80241878 0080902D */ daddu $s2, $a0, $zero -/* A6FC5C 8024187C AFBF0024 */ sw $ra, 0x24($sp) -/* A6FC60 80241880 AFB1001C */ sw $s1, 0x1c($sp) -/* A6FC64 80241884 AFB00018 */ sw $s0, 0x18($sp) -/* A6FC68 80241888 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A6FC6C 8024188C F7B60030 */ sdc1 $f22, 0x30($sp) -/* A6FC70 80241890 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A6FC74 80241894 8E510148 */ lw $s1, 0x148($s2) -/* A6FC78 80241898 0C00EABB */ jal get_npc_unsafe -/* A6FC7C 8024189C 86240008 */ lh $a0, 8($s1) -/* A6FC80 802418A0 2404000B */ addiu $a0, $zero, 0xb -/* A6FC84 802418A4 0040802D */ daddu $s0, $v0, $zero -/* A6FC88 802418A8 C620007C */ lwc1 $f0, 0x7c($s1) -/* A6FC8C 802418AC 46800020 */ cvt.s.w $f0, $f0 -/* A6FC90 802418B0 46000021 */ cvt.d.s $f0, $f0 -/* A6FC94 802418B4 C6360080 */ lwc1 $f22, 0x80($s1) -/* A6FC98 802418B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* A6FC9C 802418BC C6340084 */ lwc1 $f20, 0x84($s1) -/* A6FCA0 802418C0 4680A520 */ cvt.s.w $f20, $f20 -/* A6FCA4 802418C4 4600B5A1 */ cvt.d.s $f22, $f22 -/* A6FCA8 802418C8 4600A521 */ cvt.d.s $f20, $f20 -/* A6FCAC 802418CC 3C014059 */ lui $at, 0x4059 -/* A6FCB0 802418D0 44811800 */ mtc1 $at, $f3 -/* A6FCB4 802418D4 44801000 */ mtc1 $zero, $f2 -/* A6FCB8 802418D8 8607008E */ lh $a3, 0x8e($s0) -/* A6FCBC 802418DC 8E220078 */ lw $v0, 0x78($s1) -/* A6FCC0 802418E0 46220003 */ div.d $f0, $f0, $f2 -/* A6FCC4 802418E4 46200020 */ cvt.s.d $f0, $f0 -/* A6FCC8 802418E8 44050000 */ mfc1 $a1, $f0 -/* A6FCCC 802418EC C6200070 */ lwc1 $f0, 0x70($s1) -/* A6FCD0 802418F0 46800020 */ cvt.s.w $f0, $f0 -/* A6FCD4 802418F4 46000021 */ cvt.d.s $f0, $f0 -/* A6FCD8 802418F8 46220003 */ div.d $f0, $f0, $f2 -/* A6FCDC 802418FC 46200620 */ cvt.s.d $f24, $f0 -/* A6FCE0 80241900 4622B583 */ div.d $f22, $f22, $f2 -/* A6FCE4 80241904 4620B5A0 */ cvt.s.d $f22, $f22 -/* A6FCE8 80241908 4622A503 */ div.d $f20, $f20, $f2 -/* A6FCEC 8024190C AFA20010 */ sw $v0, 0x10($sp) -/* A6FCF0 80241910 8E060060 */ lw $a2, 0x60($s0) -/* A6FCF4 80241914 0C00A8ED */ jal update_lerp -/* A6FCF8 80241918 4620A520 */ cvt.s.d $f20, $f20 -/* A6FCFC 8024191C 4405A000 */ mfc1 $a1, $f20 -/* A6FD00 80241920 8607008E */ lh $a3, 0x8e($s0) -/* A6FD04 80241924 8E220078 */ lw $v0, 0x78($s1) -/* A6FD08 80241928 2404000B */ addiu $a0, $zero, 0xb -/* A6FD0C 8024192C AFA20010 */ sw $v0, 0x10($sp) -/* A6FD10 80241930 8E060068 */ lw $a2, 0x68($s0) -/* A6FD14 80241934 0C00A8ED */ jal update_lerp -/* A6FD18 80241938 46000506 */ mov.s $f20, $f0 -/* A6FD1C 8024193C E6140038 */ swc1 $f20, 0x38($s0) -/* A6FD20 80241940 E6000040 */ swc1 $f0, 0x40($s0) -/* A6FD24 80241944 C6200078 */ lwc1 $f0, 0x78($s1) -/* A6FD28 80241948 46800020 */ cvt.s.w $f0, $f0 -/* A6FD2C 8024194C 46000021 */ cvt.d.s $f0, $f0 -/* A6FD30 80241950 8602008E */ lh $v0, 0x8e($s0) -/* A6FD34 80241954 3C018024 */ lui $at, %hi(D_80243D88_A72168) -/* A6FD38 80241958 D4343D88 */ ldc1 $f20, %lo(D_80243D88_A72168)($at) -/* A6FD3C 8024195C 44821000 */ mtc1 $v0, $f2 -/* A6FD40 80241960 00000000 */ nop -/* A6FD44 80241964 468010A1 */ cvt.d.w $f2, $f2 -/* A6FD48 80241968 4620A003 */ div.d $f0, $f20, $f0 -/* A6FD4C 8024196C 46201082 */ mul.d $f2, $f2, $f0 -/* A6FD50 80241970 00000000 */ nop -/* A6FD54 80241974 4620110D */ trunc.w.d $f4, $f2 -/* A6FD58 80241978 44022000 */ mfc1 $v0, $f4 -/* A6FD5C 8024197C 00000000 */ nop -/* A6FD60 80241980 244200B4 */ addiu $v0, $v0, 0xb4 -/* A6FD64 80241984 44826000 */ mtc1 $v0, $f12 -/* A6FD68 80241988 00000000 */ nop -/* A6FD6C 8024198C 0C00A8BB */ jal sin_deg -/* A6FD70 80241990 46806320 */ cvt.s.w $f12, $f12 -/* A6FD74 80241994 3C014039 */ lui $at, 0x4039 -/* A6FD78 80241998 44811800 */ mtc1 $at, $f3 -/* A6FD7C 8024199C 44801000 */ mtc1 $zero, $f2 -/* A6FD80 802419A0 46000021 */ cvt.d.s $f0, $f0 -/* A6FD84 802419A4 46220002 */ mul.d $f0, $f0, $f2 -/* A6FD88 802419A8 00000000 */ nop -/* A6FD8C 802419AC 9602008E */ lhu $v0, 0x8e($s0) -/* A6FD90 802419B0 4600B0A1 */ cvt.d.s $f2, $f22 -/* A6FD94 802419B4 24420001 */ addiu $v0, $v0, 1 -/* A6FD98 802419B8 46201080 */ add.d $f2, $f2, $f0 -/* A6FD9C 802419BC A602008E */ sh $v0, 0x8e($s0) -/* A6FDA0 802419C0 00021400 */ sll $v0, $v0, 0x10 -/* A6FDA4 802419C4 462010A0 */ cvt.s.d $f2, $f2 -/* A6FDA8 802419C8 E602003C */ swc1 $f2, 0x3c($s0) -/* A6FDAC 802419CC 8E230078 */ lw $v1, 0x78($s1) -/* A6FDB0 802419D0 00021403 */ sra $v0, $v0, 0x10 -/* A6FDB4 802419D4 2463FFF8 */ addiu $v1, $v1, -8 -/* A6FDB8 802419D8 14430009 */ bne $v0, $v1, .L80241A00 -/* A6FDBC 802419DC 00000000 */ nop -/* A6FDC0 802419E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6FDC4 802419E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A6FDC8 802419E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6FDCC 802419EC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6FDD0 802419F0 8C460028 */ lw $a2, 0x28($v0) -/* A6FDD4 802419F4 0C00A720 */ jal atan2 -/* A6FDD8 802419F8 8C470030 */ lw $a3, 0x30($v0) -/* A6FDDC 802419FC E600000C */ swc1 $f0, 0xc($s0) -.L80241A00: -/* A6FDE0 80241A00 C600003C */ lwc1 $f0, 0x3c($s0) -/* A6FDE4 80241A04 4600C03E */ c.le.s $f24, $f0 -/* A6FDE8 80241A08 00000000 */ nop -/* A6FDEC 80241A0C 45000004 */ bc1f .L80241A20 -/* A6FDF0 80241A10 2402000A */ addiu $v0, $zero, 0xa -/* A6FDF4 80241A14 E618003C */ swc1 $f24, 0x3c($s0) -/* A6FDF8 80241A18 080906A3 */ j .L80241A8C -/* A6FDFC 80241A1C AE20006C */ sw $zero, 0x6c($s1) -.L80241A20: -/* A6FE00 80241A20 8602008E */ lh $v0, 0x8e($s0) -/* A6FE04 80241A24 8E230078 */ lw $v1, 0x78($s1) -/* A6FE08 80241A28 0043102A */ slt $v0, $v0, $v1 -/* A6FE0C 80241A2C 14400018 */ bnez $v0, .L80241A90 -/* A6FE10 80241A30 00000000 */ nop -/* A6FE14 80241A34 8E23006C */ lw $v1, 0x6c($s1) -/* A6FE18 80241A38 44831000 */ mtc1 $v1, $f2 -/* A6FE1C 80241A3C 00000000 */ nop -/* A6FE20 80241A40 468010A1 */ cvt.d.w $f2, $f2 -/* A6FE24 80241A44 4622A03E */ c.le.d $f20, $f2 -/* A6FE28 80241A48 00000000 */ nop -/* A6FE2C 80241A4C 4500000F */ bc1f .L80241A8C -/* A6FE30 80241A50 2402000A */ addiu $v0, $zero, 0xa -/* A6FE34 80241A54 3C018024 */ lui $at, %hi(D_80243D90_A72170) -/* A6FE38 80241A58 D4203D90 */ ldc1 $f0, %lo(D_80243D90_A72170)($at) -/* A6FE3C 80241A5C 4620103C */ c.lt.d $f2, $f0 -/* A6FE40 80241A60 00000000 */ nop -/* A6FE44 80241A64 45000008 */ bc1f .L80241A88 -/* A6FE48 80241A68 2402021C */ addiu $v0, $zero, 0x21c -/* A6FE4C 80241A6C 00431023 */ subu $v0, $v0, $v1 -/* A6FE50 80241A70 44826000 */ mtc1 $v0, $f12 -/* A6FE54 80241A74 00000000 */ nop -/* A6FE58 80241A78 0C00A6C9 */ jal clamp_angle -/* A6FE5C 80241A7C 46806320 */ cvt.s.w $f12, $f12 -/* A6FE60 80241A80 4600010D */ trunc.w.s $f4, $f0 -/* A6FE64 80241A84 E624006C */ swc1 $f4, 0x6c($s1) -.L80241A88: -/* A6FE68 80241A88 2402000A */ addiu $v0, $zero, 0xa -.L80241A8C: -/* A6FE6C 80241A8C AE420070 */ sw $v0, 0x70($s2) -.L80241A90: -/* A6FE70 80241A90 8FBF0024 */ lw $ra, 0x24($sp) -/* A6FE74 80241A94 8FB20020 */ lw $s2, 0x20($sp) -/* A6FE78 80241A98 8FB1001C */ lw $s1, 0x1c($sp) -/* A6FE7C 80241A9C 8FB00018 */ lw $s0, 0x18($sp) -/* A6FE80 80241AA0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* A6FE84 80241AA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A6FE88 80241AA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A6FE8C 80241AAC 03E00008 */ jr $ra -/* A6FE90 80241AB0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AB4_A6FE94.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AB4_A6FE94.s deleted file mode 100644 index 6a18e901f8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AB4_A6FE94.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AB4_A6FE94 -/* A6FE94 80241AB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6FE98 80241AB8 AFB00010 */ sw $s0, 0x10($sp) -/* A6FE9C 80241ABC 0080802D */ daddu $s0, $a0, $zero -/* A6FEA0 80241AC0 AFBF0014 */ sw $ra, 0x14($sp) -/* A6FEA4 80241AC4 8E020148 */ lw $v0, 0x148($s0) -/* A6FEA8 80241AC8 0C00EABB */ jal get_npc_unsafe -/* A6FEAC 80241ACC 84440008 */ lh $a0, 8($v0) -/* A6FEB0 80241AD0 24030028 */ addiu $v1, $zero, 0x28 -/* A6FEB4 80241AD4 A443008E */ sh $v1, 0x8e($v0) -/* A6FEB8 80241AD8 24020015 */ addiu $v0, $zero, 0x15 -/* A6FEBC 80241ADC AE020070 */ sw $v0, 0x70($s0) -/* A6FEC0 80241AE0 8FBF0014 */ lw $ra, 0x14($sp) -/* A6FEC4 80241AE4 8FB00010 */ lw $s0, 0x10($sp) -/* A6FEC8 80241AE8 03E00008 */ jr $ra -/* A6FECC 80241AEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s deleted file mode 100644 index 3168c44312..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AF0_A6FED0 -/* A6FED0 80241AF0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A6FED4 80241AF4 AFB40048 */ sw $s4, 0x48($sp) -/* A6FED8 80241AF8 0080A02D */ daddu $s4, $a0, $zero -/* A6FEDC 80241AFC AFBF004C */ sw $ra, 0x4c($sp) -/* A6FEE0 80241B00 AFB30044 */ sw $s3, 0x44($sp) -/* A6FEE4 80241B04 AFB20040 */ sw $s2, 0x40($sp) -/* A6FEE8 80241B08 AFB1003C */ sw $s1, 0x3c($sp) -/* A6FEEC 80241B0C AFB00038 */ sw $s0, 0x38($sp) -/* A6FEF0 80241B10 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A6FEF4 80241B14 8E910148 */ lw $s1, 0x148($s4) -/* A6FEF8 80241B18 00A0902D */ daddu $s2, $a1, $zero -/* A6FEFC 80241B1C 86240008 */ lh $a0, 8($s1) -/* A6FF00 80241B20 0C00EABB */ jal get_npc_unsafe -/* A6FF04 80241B24 00C0982D */ daddu $s3, $a2, $zero -/* A6FF08 80241B28 0040802D */ daddu $s0, $v0, $zero -/* A6FF0C 80241B2C 9602008E */ lhu $v0, 0x8e($s0) -/* A6FF10 80241B30 2442FFFF */ addiu $v0, $v0, -1 -/* A6FF14 80241B34 A602008E */ sh $v0, 0x8e($s0) -/* A6FF18 80241B38 00021400 */ sll $v0, $v0, 0x10 -/* A6FF1C 80241B3C 14400021 */ bnez $v0, .L80241BC4 -/* A6FF20 80241B40 0280202D */ daddu $a0, $s4, $zero -/* A6FF24 80241B44 24040002 */ addiu $a0, $zero, 2 -/* A6FF28 80241B48 0200282D */ daddu $a1, $s0, $zero -/* A6FF2C 80241B4C 0000302D */ daddu $a2, $zero, $zero -/* A6FF30 80241B50 8E2200CC */ lw $v0, 0xcc($s1) -/* A6FF34 80241B54 3C013F80 */ lui $at, 0x3f80 -/* A6FF38 80241B58 44810000 */ mtc1 $at, $f0 -/* A6FF3C 80241B5C 3C014000 */ lui $at, 0x4000 -/* A6FF40 80241B60 44811000 */ mtc1 $at, $f2 -/* A6FF44 80241B64 8C430000 */ lw $v1, ($v0) -/* A6FF48 80241B68 860200A8 */ lh $v0, 0xa8($s0) -/* A6FF4C 80241B6C 3C01C1A0 */ lui $at, 0xc1a0 -/* A6FF50 80241B70 44812000 */ mtc1 $at, $f4 -/* A6FF54 80241B74 44824000 */ mtc1 $v0, $f8 -/* A6FF58 80241B78 00000000 */ nop -/* A6FF5C 80241B7C 46804220 */ cvt.s.w $f8, $f8 -/* A6FF60 80241B80 44074000 */ mfc1 $a3, $f8 -/* A6FF64 80241B84 2402000C */ addiu $v0, $zero, 0xc -/* A6FF68 80241B88 AE030028 */ sw $v1, 0x28($s0) -/* A6FF6C 80241B8C AFA2001C */ sw $v0, 0x1c($sp) -/* A6FF70 80241B90 27A20028 */ addiu $v0, $sp, 0x28 -/* A6FF74 80241B94 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6FF78 80241B98 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6FF7C 80241B9C E7A40018 */ swc1 $f4, 0x18($sp) -/* A6FF80 80241BA0 0C01BFA4 */ jal fx_emote -/* A6FF84 80241BA4 AFA20020 */ sw $v0, 0x20($sp) -/* A6FF88 80241BA8 8E2200CC */ lw $v0, 0xcc($s1) -/* A6FF8C 80241BAC 8C430000 */ lw $v1, ($v0) -/* A6FF90 80241BB0 2402000F */ addiu $v0, $zero, 0xf -/* A6FF94 80241BB4 A602008E */ sh $v0, 0x8e($s0) -/* A6FF98 80241BB8 24020032 */ addiu $v0, $zero, 0x32 -/* A6FF9C 80241BBC 08090725 */ j .L80241C94 -/* A6FFA0 80241BC0 AE030028 */ sw $v1, 0x28($s0) -.L80241BC4: -/* A6FFA4 80241BC4 8E450024 */ lw $a1, 0x24($s2) -/* A6FFA8 80241BC8 8E460028 */ lw $a2, 0x28($s2) -/* A6FFAC 80241BCC 0C0902B9 */ jal kpa_61_UnkNpcAIFunc47 -/* A6FFB0 80241BD0 0260382D */ daddu $a3, $s3, $zero -/* A6FFB4 80241BD4 24030001 */ addiu $v1, $zero, 1 -/* A6FFB8 80241BD8 1443002F */ bne $v0, $v1, .L80241C98 -/* A6FFBC 80241BDC 00000000 */ nop -/* A6FFC0 80241BE0 8602008C */ lh $v0, 0x8c($s0) -/* A6FFC4 80241BE4 1440002C */ bnez $v0, .L80241C98 -/* A6FFC8 80241BE8 0200202D */ daddu $a0, $s0, $zero -/* A6FFCC 80241BEC 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A6FFD0 80241BF0 0C012530 */ jal ai_enemy_play_sound -/* A6FFD4 80241BF4 0000302D */ daddu $a2, $zero, $zero -/* A6FFD8 80241BF8 27A4002C */ addiu $a0, $sp, 0x2c -/* A6FFDC 80241BFC 27A50030 */ addiu $a1, $sp, 0x30 -/* A6FFE0 80241C00 3C0641F0 */ lui $a2, 0x41f0 -/* A6FFE4 80241C04 C6020034 */ lwc1 $f2, 0x34($s0) -/* A6FFE8 80241C08 3C014387 */ lui $at, 0x4387 -/* A6FFEC 80241C0C 44810000 */ mtc1 $at, $f0 -/* A6FFF0 80241C10 8E2200CC */ lw $v0, 0xcc($s1) -/* A6FFF4 80241C14 C614003C */ lwc1 $f20, 0x3c($s0) -/* A6FFF8 80241C18 46020001 */ sub.s $f0, $f0, $f2 -/* A6FFFC 80241C1C 3C0141E8 */ lui $at, 0x41e8 -/* A70000 80241C20 44812000 */ mtc1 $at, $f4 -/* A70004 80241C24 C6060038 */ lwc1 $f6, 0x38($s0) -/* A70008 80241C28 4604A500 */ add.s $f20, $f20, $f4 -/* A7000C 80241C2C 3C013F80 */ lui $at, 0x3f80 -/* A70010 80241C30 44811000 */ mtc1 $at, $f2 -/* A70014 80241C34 44070000 */ mfc1 $a3, $f0 -/* A70018 80241C38 C6000040 */ lwc1 $f0, 0x40($s0) -/* A7001C 80241C3C 8C420020 */ lw $v0, 0x20($v0) -/* A70020 80241C40 46020000 */ add.s $f0, $f0, $f2 -/* A70024 80241C44 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A70028 80241C48 AE020028 */ sw $v0, 0x28($s0) -/* A7002C 80241C4C 0C00A7E7 */ jal add_vec2D_polar -/* A70030 80241C50 E7A00030 */ swc1 $f0, 0x30($sp) -/* A70034 80241C54 0000202D */ daddu $a0, $zero, $zero -/* A70038 80241C58 4406A000 */ mfc1 $a2, $f20 -/* A7003C 80241C5C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A70040 80241C60 C7A20030 */ lwc1 $f2, 0x30($sp) -/* A70044 80241C64 44050000 */ mfc1 $a1, $f0 -/* A70048 80241C68 44071000 */ mfc1 $a3, $f2 -/* A7004C 80241C6C 3C013DCC */ lui $at, 0x3dcc -/* A70050 80241C70 3421CCCD */ ori $at, $at, 0xcccd -/* A70054 80241C74 44810000 */ mtc1 $at, $f0 -/* A70058 80241C78 2402000D */ addiu $v0, $zero, 0xd -/* A7005C 80241C7C AFA20014 */ sw $v0, 0x14($sp) -/* A70060 80241C80 0C01BFEC */ jal fx_gather_energy_pink -/* A70064 80241C84 E7A00010 */ swc1 $f0, 0x10($sp) -/* A70068 80241C88 2402000F */ addiu $v0, $zero, 0xf -/* A7006C 80241C8C A602008E */ sh $v0, 0x8e($s0) -/* A70070 80241C90 24020016 */ addiu $v0, $zero, 0x16 -.L80241C94: -/* A70074 80241C94 AE820070 */ sw $v0, 0x70($s4) -.L80241C98: -/* A70078 80241C98 8FBF004C */ lw $ra, 0x4c($sp) -/* A7007C 80241C9C 8FB40048 */ lw $s4, 0x48($sp) -/* A70080 80241CA0 8FB30044 */ lw $s3, 0x44($sp) -/* A70084 80241CA4 8FB20040 */ lw $s2, 0x40($sp) -/* A70088 80241CA8 8FB1003C */ lw $s1, 0x3c($sp) -/* A7008C 80241CAC 8FB00038 */ lw $s0, 0x38($sp) -/* A70090 80241CB0 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A70094 80241CB4 03E00008 */ jr $ra -/* A70098 80241CB8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s deleted file mode 100644 index 089dc08608..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241CBC_A7009C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CBC_A7009C -/* A7009C 80241CBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A700A0 80241CC0 AFB10014 */ sw $s1, 0x14($sp) -/* A700A4 80241CC4 0080882D */ daddu $s1, $a0, $zero -/* A700A8 80241CC8 AFBF0018 */ sw $ra, 0x18($sp) -/* A700AC 80241CCC AFB00010 */ sw $s0, 0x10($sp) -/* A700B0 80241CD0 8E300148 */ lw $s0, 0x148($s1) -/* A700B4 80241CD4 0C00EABB */ jal get_npc_unsafe -/* A700B8 80241CD8 86040008 */ lh $a0, 8($s0) -/* A700BC 80241CDC 0040202D */ daddu $a0, $v0, $zero -/* A700C0 80241CE0 9482008E */ lhu $v0, 0x8e($a0) -/* A700C4 80241CE4 2442FFFF */ addiu $v0, $v0, -1 -/* A700C8 80241CE8 A482008E */ sh $v0, 0x8e($a0) -/* A700CC 80241CEC 00021400 */ sll $v0, $v0, 0x10 -/* A700D0 80241CF0 1C400008 */ bgtz $v0, .L80241D14 -/* A700D4 80241CF4 00000000 */ nop -/* A700D8 80241CF8 8E0200CC */ lw $v0, 0xcc($s0) -/* A700DC 80241CFC 8C430024 */ lw $v1, 0x24($v0) -/* A700E0 80241D00 24020007 */ addiu $v0, $zero, 7 -/* A700E4 80241D04 A482008E */ sh $v0, 0x8e($a0) -/* A700E8 80241D08 24020017 */ addiu $v0, $zero, 0x17 -/* A700EC 80241D0C AC830028 */ sw $v1, 0x28($a0) -/* A700F0 80241D10 AE220070 */ sw $v0, 0x70($s1) -.L80241D14: -/* A700F4 80241D14 8FBF0018 */ lw $ra, 0x18($sp) -/* A700F8 80241D18 8FB10014 */ lw $s1, 0x14($sp) -/* A700FC 80241D1C 8FB00010 */ lw $s0, 0x10($sp) -/* A70100 80241D20 03E00008 */ jr $ra -/* A70104 80241D24 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s deleted file mode 100644 index e01e8fb75d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s +++ /dev/null @@ -1,84 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D28_A70108 -/* A70108 80241D28 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A7010C 80241D2C AFB3003C */ sw $s3, 0x3c($sp) -/* A70110 80241D30 0080982D */ daddu $s3, $a0, $zero -/* A70114 80241D34 AFBF0044 */ sw $ra, 0x44($sp) -/* A70118 80241D38 AFB40040 */ sw $s4, 0x40($sp) -/* A7011C 80241D3C AFB20038 */ sw $s2, 0x38($sp) -/* A70120 80241D40 AFB10034 */ sw $s1, 0x34($sp) -/* A70124 80241D44 AFB00030 */ sw $s0, 0x30($sp) -/* A70128 80241D48 8E720148 */ lw $s2, 0x148($s3) -/* A7012C 80241D4C 00A0882D */ daddu $s1, $a1, $zero -/* A70130 80241D50 86440008 */ lh $a0, 8($s2) -/* A70134 80241D54 0C00EABB */ jal get_npc_unsafe -/* A70138 80241D58 00C0A02D */ daddu $s4, $a2, $zero -/* A7013C 80241D5C 0040802D */ daddu $s0, $v0, $zero -/* A70140 80241D60 9602008E */ lhu $v0, 0x8e($s0) -/* A70144 80241D64 2442FFFF */ addiu $v0, $v0, -1 -/* A70148 80241D68 A602008E */ sh $v0, 0x8e($s0) -/* A7014C 80241D6C 00021400 */ sll $v0, $v0, 0x10 -/* A70150 80241D70 1C400032 */ bgtz $v0, .L80241E3C -/* A70154 80241D74 00000000 */ nop -/* A70158 80241D78 0260202D */ daddu $a0, $s3, $zero -/* A7015C 80241D7C 8E250024 */ lw $a1, 0x24($s1) -/* A70160 80241D80 8E260028 */ lw $a2, 0x28($s1) -/* A70164 80241D84 0C0902B9 */ jal kpa_61_UnkNpcAIFunc47 -/* A70168 80241D88 0280382D */ daddu $a3, $s4, $zero -/* A7016C 80241D8C 0040882D */ daddu $s1, $v0, $zero -/* A70170 80241D90 24020001 */ addiu $v0, $zero, 1 -/* A70174 80241D94 1222001D */ beq $s1, $v0, .L80241E0C -/* A70178 80241D98 0200282D */ daddu $a1, $s0, $zero -/* A7017C 80241D9C 24040002 */ addiu $a0, $zero, 2 -/* A70180 80241DA0 0000302D */ daddu $a2, $zero, $zero -/* A70184 80241DA4 860300A8 */ lh $v1, 0xa8($s0) -/* A70188 80241DA8 3C013F80 */ lui $at, 0x3f80 -/* A7018C 80241DAC 44810000 */ mtc1 $at, $f0 -/* A70190 80241DB0 3C014000 */ lui $at, 0x4000 -/* A70194 80241DB4 44811000 */ mtc1 $at, $f2 -/* A70198 80241DB8 3C01C1A0 */ lui $at, 0xc1a0 -/* A7019C 80241DBC 44812000 */ mtc1 $at, $f4 -/* A701A0 80241DC0 2402000C */ addiu $v0, $zero, 0xc -/* A701A4 80241DC4 AFA2001C */ sw $v0, 0x1c($sp) -/* A701A8 80241DC8 44833000 */ mtc1 $v1, $f6 -/* A701AC 80241DCC 00000000 */ nop -/* A701B0 80241DD0 468031A0 */ cvt.s.w $f6, $f6 -/* A701B4 80241DD4 44073000 */ mfc1 $a3, $f6 -/* A701B8 80241DD8 27A20028 */ addiu $v0, $sp, 0x28 -/* A701BC 80241DDC AFA20020 */ sw $v0, 0x20($sp) -/* A701C0 80241DE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A701C4 80241DE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A701C8 80241DE8 0C01BFA4 */ jal fx_emote -/* A701CC 80241DEC E7A40018 */ swc1 $f4, 0x18($sp) -/* A701D0 80241DF0 8E4200CC */ lw $v0, 0xcc($s2) -/* A701D4 80241DF4 8C430000 */ lw $v1, ($v0) -/* A701D8 80241DF8 2402000F */ addiu $v0, $zero, 0xf -/* A701DC 80241DFC A602008E */ sh $v0, 0x8e($s0) -/* A701E0 80241E00 24020032 */ addiu $v0, $zero, 0x32 -/* A701E4 80241E04 0809078E */ j .L80241E38 -/* A701E8 80241E08 AE030028 */ sw $v1, 0x28($s0) -.L80241E0C: -/* A701EC 80241E0C 0200202D */ daddu $a0, $s0, $zero -/* A701F0 80241E10 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A701F4 80241E14 0C012530 */ jal ai_enemy_play_sound -/* A701F8 80241E18 0000302D */ daddu $a2, $zero, $zero -/* A701FC 80241E1C 86440008 */ lh $a0, 8($s2) -/* A70200 80241E20 0C00FB3A */ jal get_enemy -/* A70204 80241E24 24840001 */ addiu $a0, $a0, 1 -/* A70208 80241E28 AC51006C */ sw $s1, 0x6c($v0) -/* A7020C 80241E2C 24020014 */ addiu $v0, $zero, 0x14 -/* A70210 80241E30 A602008E */ sh $v0, 0x8e($s0) -/* A70214 80241E34 24020018 */ addiu $v0, $zero, 0x18 -.L80241E38: -/* A70218 80241E38 AE620070 */ sw $v0, 0x70($s3) -.L80241E3C: -/* A7021C 80241E3C 8FBF0044 */ lw $ra, 0x44($sp) -/* A70220 80241E40 8FB40040 */ lw $s4, 0x40($sp) -/* A70224 80241E44 8FB3003C */ lw $s3, 0x3c($sp) -/* A70228 80241E48 8FB20038 */ lw $s2, 0x38($sp) -/* A7022C 80241E4C 8FB10034 */ lw $s1, 0x34($sp) -/* A70230 80241E50 8FB00030 */ lw $s0, 0x30($sp) -/* A70234 80241E54 03E00008 */ jr $ra -/* A70238 80241E58 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s deleted file mode 100644 index 6fda56daa2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241E5C_A7023C.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E5C_A7023C -/* A7023C 80241E5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A70240 80241E60 AFB20018 */ sw $s2, 0x18($sp) -/* A70244 80241E64 0080902D */ daddu $s2, $a0, $zero -/* A70248 80241E68 AFBF001C */ sw $ra, 0x1c($sp) -/* A7024C 80241E6C AFB10014 */ sw $s1, 0x14($sp) -/* A70250 80241E70 AFB00010 */ sw $s0, 0x10($sp) -/* A70254 80241E74 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A70258 80241E78 8E500148 */ lw $s0, 0x148($s2) -/* A7025C 80241E7C 0C00EABB */ jal get_npc_unsafe -/* A70260 80241E80 86040008 */ lh $a0, 8($s0) -/* A70264 80241E84 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A70268 80241E88 46806320 */ cvt.s.w $f12, $f12 -/* A7026C 80241E8C 0040882D */ daddu $s1, $v0, $zero -/* A70270 80241E90 C6140070 */ lwc1 $f20, 0x70($s0) -/* A70274 80241E94 4680A520 */ cvt.s.w $f20, $f20 -/* A70278 80241E98 3C014059 */ lui $at, 0x4059 -/* A7027C 80241E9C 44810800 */ mtc1 $at, $f1 -/* A70280 80241EA0 44800000 */ mtc1 $zero, $f0 -/* A70284 80241EA4 4600A521 */ cvt.d.s $f20, $f20 -/* A70288 80241EA8 4620A503 */ div.d $f20, $f20, $f0 -/* A7028C 80241EAC 0C00A8BB */ jal sin_deg -/* A70290 80241EB0 4620A520 */ cvt.s.d $f20, $f20 -/* A70294 80241EB4 3C014018 */ lui $at, 0x4018 -/* A70298 80241EB8 44811800 */ mtc1 $at, $f3 -/* A7029C 80241EBC 44801000 */ mtc1 $zero, $f2 -/* A702A0 80241EC0 46000021 */ cvt.d.s $f0, $f0 -/* A702A4 80241EC4 46220002 */ mul.d $f0, $f0, $f2 -/* A702A8 80241EC8 00000000 */ nop -/* A702AC 80241ECC 4600A0A1 */ cvt.d.s $f2, $f20 -/* A702B0 80241ED0 46201080 */ add.d $f2, $f2, $f0 -/* A702B4 80241ED4 462010A0 */ cvt.s.d $f2, $f2 -/* A702B8 80241ED8 E622003C */ swc1 $f2, 0x3c($s1) -/* A702BC 80241EDC 8E02006C */ lw $v0, 0x6c($s0) -/* A702C0 80241EE0 2442000A */ addiu $v0, $v0, 0xa -/* A702C4 80241EE4 44826000 */ mtc1 $v0, $f12 -/* A702C8 80241EE8 00000000 */ nop -/* A702CC 80241EEC 0C00A6C9 */ jal clamp_angle -/* A702D0 80241EF0 46806320 */ cvt.s.w $f12, $f12 -/* A702D4 80241EF4 4600010D */ trunc.w.s $f4, $f0 -/* A702D8 80241EF8 E604006C */ swc1 $f4, 0x6c($s0) -/* A702DC 80241EFC 9622008E */ lhu $v0, 0x8e($s1) -/* A702E0 80241F00 2442FFFF */ addiu $v0, $v0, -1 -/* A702E4 80241F04 A622008E */ sh $v0, 0x8e($s1) -/* A702E8 80241F08 00021400 */ sll $v0, $v0, 0x10 -/* A702EC 80241F0C 1C400008 */ bgtz $v0, .L80241F30 -/* A702F0 80241F10 00000000 */ nop -/* A702F4 80241F14 8E0200CC */ lw $v0, 0xcc($s0) -/* A702F8 80241F18 8C430000 */ lw $v1, ($v0) -/* A702FC 80241F1C 24020003 */ addiu $v0, $zero, 3 -/* A70300 80241F20 A622008E */ sh $v0, 0x8e($s1) -/* A70304 80241F24 24020032 */ addiu $v0, $zero, 0x32 -/* A70308 80241F28 AE230028 */ sw $v1, 0x28($s1) -/* A7030C 80241F2C AE420070 */ sw $v0, 0x70($s2) -.L80241F30: -/* A70310 80241F30 8FBF001C */ lw $ra, 0x1c($sp) -/* A70314 80241F34 8FB20018 */ lw $s2, 0x18($sp) -/* A70318 80241F38 8FB10014 */ lw $s1, 0x14($sp) -/* A7031C 80241F3C 8FB00010 */ lw $s0, 0x10($sp) -/* A70320 80241F40 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A70324 80241F44 03E00008 */ jr $ra -/* A70328 80241F48 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s deleted file mode 100644 index ac43caa286..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F4C_A7032C -/* A7032C 80241F4C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A70330 80241F50 AFB20018 */ sw $s2, 0x18($sp) -/* A70334 80241F54 0080902D */ daddu $s2, $a0, $zero -/* A70338 80241F58 AFBF001C */ sw $ra, 0x1c($sp) -/* A7033C 80241F5C AFB10014 */ sw $s1, 0x14($sp) -/* A70340 80241F60 AFB00010 */ sw $s0, 0x10($sp) -/* A70344 80241F64 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A70348 80241F68 8E500148 */ lw $s0, 0x148($s2) -/* A7034C 80241F6C 0C00EABB */ jal get_npc_unsafe -/* A70350 80241F70 86040008 */ lh $a0, 8($s0) -/* A70354 80241F74 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A70358 80241F78 46806320 */ cvt.s.w $f12, $f12 -/* A7035C 80241F7C 0040882D */ daddu $s1, $v0, $zero -/* A70360 80241F80 C6140070 */ lwc1 $f20, 0x70($s0) -/* A70364 80241F84 4680A520 */ cvt.s.w $f20, $f20 -/* A70368 80241F88 3C014059 */ lui $at, 0x4059 -/* A7036C 80241F8C 44810800 */ mtc1 $at, $f1 -/* A70370 80241F90 44800000 */ mtc1 $zero, $f0 -/* A70374 80241F94 4600A521 */ cvt.d.s $f20, $f20 -/* A70378 80241F98 4620A503 */ div.d $f20, $f20, $f0 -/* A7037C 80241F9C 0C00A8BB */ jal sin_deg -/* A70380 80241FA0 4620A520 */ cvt.s.d $f20, $f20 -/* A70384 80241FA4 3C014018 */ lui $at, 0x4018 -/* A70388 80241FA8 44811800 */ mtc1 $at, $f3 -/* A7038C 80241FAC 44801000 */ mtc1 $zero, $f2 -/* A70390 80241FB0 46000021 */ cvt.d.s $f0, $f0 -/* A70394 80241FB4 46220002 */ mul.d $f0, $f0, $f2 -/* A70398 80241FB8 00000000 */ nop -/* A7039C 80241FBC 4600A0A1 */ cvt.d.s $f2, $f20 -/* A703A0 80241FC0 46201080 */ add.d $f2, $f2, $f0 -/* A703A4 80241FC4 462010A0 */ cvt.s.d $f2, $f2 -/* A703A8 80241FC8 E622003C */ swc1 $f2, 0x3c($s1) -/* A703AC 80241FCC 8E02006C */ lw $v0, 0x6c($s0) -/* A703B0 80241FD0 2442000A */ addiu $v0, $v0, 0xa -/* A703B4 80241FD4 44826000 */ mtc1 $v0, $f12 -/* A703B8 80241FD8 00000000 */ nop -/* A703BC 80241FDC 0C00A6C9 */ jal clamp_angle -/* A703C0 80241FE0 46806320 */ cvt.s.w $f12, $f12 -/* A703C4 80241FE4 4600010D */ trunc.w.s $f4, $f0 -/* A703C8 80241FE8 E604006C */ swc1 $f4, 0x6c($s0) -/* A703CC 80241FEC 9622008E */ lhu $v0, 0x8e($s1) -/* A703D0 80241FF0 2442FFFF */ addiu $v0, $v0, -1 -/* A703D4 80241FF4 A622008E */ sh $v0, 0x8e($s1) -/* A703D8 80241FF8 00021400 */ sll $v0, $v0, 0x10 -/* A703DC 80241FFC 1C400002 */ bgtz $v0, .L80242008 -/* A703E0 80242000 2402000A */ addiu $v0, $zero, 0xa -/* A703E4 80242004 AE420070 */ sw $v0, 0x70($s2) -.L80242008: -/* A703E8 80242008 8FBF001C */ lw $ra, 0x1c($sp) -/* A703EC 8024200C 8FB20018 */ lw $s2, 0x18($sp) -/* A703F0 80242010 8FB10014 */ lw $s1, 0x14($sp) -/* A703F4 80242014 8FB00010 */ lw $s0, 0x10($sp) -/* A703F8 80242018 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A703FC 8024201C 03E00008 */ jr $ra -/* A70400 80242020 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s deleted file mode 100644 index efe5c7be29..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422F0_A706D0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F0_A706D0 -/* A706D0 802422F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A706D4 802422F4 AFBF0014 */ sw $ra, 0x14($sp) -/* A706D8 802422F8 AFB00010 */ sw $s0, 0x10($sp) -/* A706DC 802422FC 8C900148 */ lw $s0, 0x148($a0) -/* A706E0 80242300 0C00EABB */ jal get_npc_unsafe -/* A706E4 80242304 86040008 */ lh $a0, 8($s0) -/* A706E8 80242308 0040202D */ daddu $a0, $v0, $zero -/* A706EC 8024230C 8E03006C */ lw $v1, 0x6c($s0) -/* A706F0 80242310 24020002 */ addiu $v0, $zero, 2 -/* A706F4 80242314 14620003 */ bne $v1, $v0, .L80242324 -/* A706F8 80242318 00000000 */ nop -/* A706FC 8024231C AC80001C */ sw $zero, 0x1c($a0) -/* A70700 80242320 AC800018 */ sw $zero, 0x18($a0) -.L80242324: -/* A70704 80242324 8FBF0014 */ lw $ra, 0x14($sp) -/* A70708 80242328 8FB00010 */ lw $s0, 0x10($sp) -/* A7070C 8024232C 24020002 */ addiu $v0, $zero, 2 -/* A70710 80242330 03E00008 */ jr $ra -/* A70714 80242334 27BD0018 */ addiu $sp, $sp, 0x18 -/* A70718 80242338 00000000 */ nop -/* A7071C 8024233C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s deleted file mode 100644 index f964152908..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s +++ /dev/null @@ -1,191 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243D98_A72178 -.word .L80242180_A70560, .L80242190_A70570, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L802421A8_A70588, .L802421C8_A705A8, .L802421E8_A705C8, .L80242290_A70670, .L80242290_A70670, .L80242200_A705E0, .L80242218_A705F8, .L80242230_A70610, .L80242248_A70628, .L80242268_A70648, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242290_A70670, .L80242280_A70660, 0 - -.section .text - -glabel btl_state_update_begin_player_turn_A70404 -/* A70404 80242024 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A70408 80242028 AFB40040 */ sw $s4, 0x40($sp) -/* A7040C 8024202C 0080A02D */ daddu $s4, $a0, $zero -/* A70410 80242030 AFBF0048 */ sw $ra, 0x48($sp) -/* A70414 80242034 AFB50044 */ sw $s5, 0x44($sp) -/* A70418 80242038 AFB3003C */ sw $s3, 0x3c($sp) -/* A7041C 8024203C AFB20038 */ sw $s2, 0x38($sp) -/* A70420 80242040 AFB10034 */ sw $s1, 0x34($sp) -/* A70424 80242044 AFB00030 */ sw $s0, 0x30($sp) -/* A70428 80242048 8E920148 */ lw $s2, 0x148($s4) -/* A7042C 8024204C 86440008 */ lh $a0, 8($s2) -/* A70430 80242050 8E90000C */ lw $s0, 0xc($s4) -/* A70434 80242054 0C00EABB */ jal get_npc_unsafe -/* A70438 80242058 00A0882D */ daddu $s1, $a1, $zero -/* A7043C 8024205C 0280202D */ daddu $a0, $s4, $zero -/* A70440 80242060 8E050000 */ lw $a1, ($s0) -/* A70444 80242064 0C0B1EAF */ jal evt_get_variable -/* A70448 80242068 0040A82D */ daddu $s5, $v0, $zero -/* A7044C 8024206C AFA00010 */ sw $zero, 0x10($sp) -/* A70450 80242070 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70454 80242074 8C630030 */ lw $v1, 0x30($v1) -/* A70458 80242078 AFA30014 */ sw $v1, 0x14($sp) -/* A7045C 8024207C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70460 80242080 8C63001C */ lw $v1, 0x1c($v1) -/* A70464 80242084 AFA30018 */ sw $v1, 0x18($sp) -/* A70468 80242088 8E4300D0 */ lw $v1, 0xd0($s2) -/* A7046C 8024208C 8C630024 */ lw $v1, 0x24($v1) -/* A70470 80242090 AFA3001C */ sw $v1, 0x1c($sp) -/* A70474 80242094 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70478 80242098 8C630028 */ lw $v1, 0x28($v1) -/* A7047C 8024209C 27B30010 */ addiu $s3, $sp, 0x10 -/* A70480 802420A0 AFA30020 */ sw $v1, 0x20($sp) -/* A70484 802420A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A70488 802420A8 3C0142F0 */ lui $at, 0x42f0 -/* A7048C 802420AC 44810000 */ mtc1 $at, $f0 -/* A70490 802420B0 8C63002C */ lw $v1, 0x2c($v1) -/* A70494 802420B4 0040802D */ daddu $s0, $v0, $zero -/* A70498 802420B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* A7049C 802420BC A7A0002C */ sh $zero, 0x2c($sp) -/* A704A0 802420C0 12200019 */ beqz $s1, .L80242128 -/* A704A4 802420C4 AFA30024 */ sw $v1, 0x24($sp) -/* A704A8 802420C8 8EA20000 */ lw $v0, ($s5) -/* A704AC 802420CC 2403FDFF */ addiu $v1, $zero, -0x201 -/* A704B0 802420D0 00431024 */ and $v0, $v0, $v1 -/* A704B4 802420D4 34420008 */ ori $v0, $v0, 8 -/* A704B8 802420D8 3C030020 */ lui $v1, 0x20 -/* A704BC 802420DC 00431025 */ or $v0, $v0, $v1 -/* A704C0 802420E0 AEA20000 */ sw $v0, ($s5) -/* A704C4 802420E4 8E420000 */ lw $v0, ($s2) -/* A704C8 802420E8 00431025 */ or $v0, $v0, $v1 -/* A704CC 802420EC AE420000 */ sw $v0, ($s2) -/* A704D0 802420F0 C6A0003C */ lwc1 $f0, 0x3c($s5) -/* A704D4 802420F4 3C014059 */ lui $at, 0x4059 -/* A704D8 802420F8 44811800 */ mtc1 $at, $f3 -/* A704DC 802420FC 44801000 */ mtc1 $zero, $f2 -/* A704E0 80242100 46000021 */ cvt.d.s $f0, $f0 -/* A704E4 80242104 46220002 */ mul.d $f0, $f0, $f2 -/* A704E8 80242108 00000000 */ nop -/* A704EC 8024210C 2402000A */ addiu $v0, $zero, 0xa -/* A704F0 80242110 AE40006C */ sw $zero, 0x6c($s2) -/* A704F4 80242114 AE400074 */ sw $zero, 0x74($s2) -/* A704F8 80242118 4620010D */ trunc.w.d $f4, $f0 -/* A704FC 8024211C E6440070 */ swc1 $f4, 0x70($s2) -/* A70500 80242120 A6A0008E */ sh $zero, 0x8e($s5) -/* A70504 80242124 AE820070 */ sw $v0, 0x70($s4) -.L80242128: -/* A70508 80242128 2402FFFB */ addiu $v0, $zero, -5 -/* A7050C 8024212C A2A200AB */ sb $v0, 0xab($s5) -/* A70510 80242130 8E4300B0 */ lw $v1, 0xb0($s2) -/* A70514 80242134 30620004 */ andi $v0, $v1, 4 -/* A70518 80242138 10400007 */ beqz $v0, .L80242158 -/* A7051C 8024213C 00000000 */ nop -/* A70520 80242140 824200B4 */ lb $v0, 0xb4($s2) -/* A70524 80242144 14400053 */ bnez $v0, .L80242294 -/* A70528 80242148 0000102D */ daddu $v0, $zero, $zero -/* A7052C 8024214C 2402FFFB */ addiu $v0, $zero, -5 -/* A70530 80242150 00621024 */ and $v0, $v1, $v0 -/* A70534 80242154 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242158: -/* A70538 80242158 8E820070 */ lw $v0, 0x70($s4) -/* A7053C 8024215C 2443FFF6 */ addiu $v1, $v0, -0xa -/* A70540 80242160 2C620029 */ sltiu $v0, $v1, 0x29 -/* A70544 80242164 1040004A */ beqz $v0, .L80242290_A70670 -/* A70548 80242168 00031080 */ sll $v0, $v1, 2 -/* A7054C 8024216C 3C018024 */ lui $at, %hi(jtbl_80243D98_A72178) -/* A70550 80242170 00220821 */ addu $at, $at, $v0 -/* A70554 80242174 8C223D98 */ lw $v0, %lo(jtbl_80243D98_A72178)($at) -/* A70558 80242178 00400008 */ jr $v0 -/* A7055C 8024217C 00000000 */ nop -.L80242180_A70560: -/* A70560 80242180 0280202D */ daddu $a0, $s4, $zero -/* A70564 80242184 0200282D */ daddu $a1, $s0, $zero -/* A70568 80242188 0C090471 */ jal func_802411C4_A6F5A4 -/* A7056C 8024218C 0260302D */ daddu $a2, $s3, $zero -.L80242190_A70570: -/* A70570 80242190 0280202D */ daddu $a0, $s4, $zero -/* A70574 80242194 0200282D */ daddu $a1, $s0, $zero -/* A70578 80242198 0C090480 */ jal func_80241200_A6F5E0 -/* A7057C 8024219C 0260302D */ daddu $a2, $s3, $zero -/* A70580 802421A0 080908A5 */ j .L80242294 -/* A70584 802421A4 0000102D */ daddu $v0, $zero, $zero -.L802421A8_A70588: -/* A70588 802421A8 0280202D */ daddu $a0, $s4, $zero -/* A7058C 802421AC 0200282D */ daddu $a1, $s0, $zero -/* A70590 802421B0 0C0904E3 */ jal func_8024138C_A6F76C -/* A70594 802421B4 0260302D */ daddu $a2, $s3, $zero -/* A70598 802421B8 8E830070 */ lw $v1, 0x70($s4) -/* A7059C 802421BC 24020010 */ addiu $v0, $zero, 0x10 -/* A705A0 802421C0 14620034 */ bne $v1, $v0, .L80242294 -/* A705A4 802421C4 0000102D */ daddu $v0, $zero, $zero -.L802421C8_A705A8: -/* A705A8 802421C8 0280202D */ daddu $a0, $s4, $zero -/* A705AC 802421CC 0200282D */ daddu $a1, $s0, $zero -/* A705B0 802421D0 0C0905DF */ jal func_8024177C_A6FB5C -/* A705B4 802421D4 0260302D */ daddu $a2, $s3, $zero -/* A705B8 802421D8 8E830070 */ lw $v1, 0x70($s4) -/* A705BC 802421DC 24020011 */ addiu $v0, $zero, 0x11 -/* A705C0 802421E0 1462002C */ bne $v1, $v0, .L80242294 -/* A705C4 802421E4 0000102D */ daddu $v0, $zero, $zero -.L802421E8_A705C8: -/* A705C8 802421E8 0280202D */ daddu $a0, $s4, $zero -/* A705CC 802421EC 0200282D */ daddu $a1, $s0, $zero -/* A705D0 802421F0 0C09061C */ jal func_80241870_A6FC50 -/* A705D4 802421F4 0260302D */ daddu $a2, $s3, $zero -/* A705D8 802421F8 080908A5 */ j .L80242294 -/* A705DC 802421FC 0000102D */ daddu $v0, $zero, $zero -.L80242200_A705E0: -/* A705E0 80242200 0280202D */ daddu $a0, $s4, $zero -/* A705E4 80242204 0200282D */ daddu $a1, $s0, $zero -/* A705E8 80242208 0C0906AD */ jal func_80241AB4_A6FE94 -/* A705EC 8024220C 0260302D */ daddu $a2, $s3, $zero -/* A705F0 80242210 080908A5 */ j .L80242294 -/* A705F4 80242214 0000102D */ daddu $v0, $zero, $zero -.L80242218_A705F8: -/* A705F8 80242218 0280202D */ daddu $a0, $s4, $zero -/* A705FC 8024221C 0200282D */ daddu $a1, $s0, $zero -/* A70600 80242220 0C0906BC */ jal func_80241AF0_A6FED0 -/* A70604 80242224 0260302D */ daddu $a2, $s3, $zero -/* A70608 80242228 080908A5 */ j .L80242294 -/* A7060C 8024222C 0000102D */ daddu $v0, $zero, $zero -.L80242230_A70610: -/* A70610 80242230 0280202D */ daddu $a0, $s4, $zero -/* A70614 80242234 0200282D */ daddu $a1, $s0, $zero -/* A70618 80242238 0C09072F */ jal func_80241CBC_A7009C -/* A7061C 8024223C 0260302D */ daddu $a2, $s3, $zero -/* A70620 80242240 080908A5 */ j .L80242294 -/* A70624 80242244 0000102D */ daddu $v0, $zero, $zero -.L80242248_A70628: -/* A70628 80242248 0280202D */ daddu $a0, $s4, $zero -/* A7062C 8024224C 0200282D */ daddu $a1, $s0, $zero -/* A70630 80242250 0C09074A */ jal func_80241D28_A70108 -/* A70634 80242254 0260302D */ daddu $a2, $s3, $zero -/* A70638 80242258 8E830070 */ lw $v1, 0x70($s4) -/* A7063C 8024225C 24020018 */ addiu $v0, $zero, 0x18 -/* A70640 80242260 1462000C */ bne $v1, $v0, .L80242294 -/* A70644 80242264 0000102D */ daddu $v0, $zero, $zero -.L80242268_A70648: -/* A70648 80242268 0280202D */ daddu $a0, $s4, $zero -/* A7064C 8024226C 0200282D */ daddu $a1, $s0, $zero -/* A70650 80242270 0C090797 */ jal func_80241E5C_A7023C -/* A70654 80242274 0260302D */ daddu $a2, $s3, $zero -/* A70658 80242278 080908A5 */ j .L80242294 -/* A7065C 8024227C 0000102D */ daddu $v0, $zero, $zero -.L80242280_A70660: -/* A70660 80242280 0280202D */ daddu $a0, $s4, $zero -/* A70664 80242284 0200282D */ daddu $a1, $s0, $zero -/* A70668 80242288 0C0907D3 */ jal func_80241F4C_A7032C -/* A7066C 8024228C 0260302D */ daddu $a2, $s3, $zero -.L80242290_A70670: -/* A70670 80242290 0000102D */ daddu $v0, $zero, $zero -.L80242294: -/* A70674 80242294 8FBF0048 */ lw $ra, 0x48($sp) -/* A70678 80242298 8FB50044 */ lw $s5, 0x44($sp) -/* A7067C 8024229C 8FB40040 */ lw $s4, 0x40($sp) -/* A70680 802422A0 8FB3003C */ lw $s3, 0x3c($sp) -/* A70684 802422A4 8FB20038 */ lw $s2, 0x38($sp) -/* A70688 802422A8 8FB10034 */ lw $s1, 0x34($sp) -/* A7068C 802422AC 8FB00030 */ lw $s0, 0x30($sp) -/* A70690 802422B0 03E00008 */ jr $ra -/* A70694 802422B4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s index 5fd5d9fec1..dc2daefcb6 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s @@ -13,8 +13,8 @@ glabel func_8024239C_C5CADC /* C5CAFC 802423BC 8C620000 */ lw $v0, ($v1) /* C5CB00 802423C0 5040000A */ beql $v0, $zero, .L802423EC /* C5CB04 802423C4 00041080 */ sll $v0, $a0, 2 -/* C5CB08 802423C8 3C058024 */ lui $a1, %hi(D_802465D0_915C80) -/* C5CB0C 802423CC 24A565D0 */ addiu $a1, $a1, %lo(D_802465D0_915C80) +/* C5CB08 802423C8 3C058024 */ lui $a1, %hi(D_802465D0_kzn_02) +/* C5CB0C 802423CC 24A565D0 */ addiu $a1, $a1, %lo(D_802465D0_kzn_02) .L802423D0: /* C5CB10 802423D0 24630004 */ addiu $v1, $v1, 4 /* C5CB14 802423D4 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_8024239C_C5CADC /* C5CB24 802423E4 24A50004 */ addiu $a1, $a1, 4 /* C5CB28 802423E8 00041080 */ sll $v0, $a0, 2 .L802423EC: -/* C5CB2C 802423EC 3C018024 */ lui $at, %hi(D_802465D0_915C80) +/* C5CB2C 802423EC 3C018024 */ lui $at, %hi(D_802465D0_kzn_02) /* C5CB30 802423F0 00220821 */ addu $at, $at, $v0 -/* C5CB34 802423F4 AC2065D0 */ sw $zero, %lo(D_802465D0_915C80)($at) +/* C5CB34 802423F4 AC2065D0 */ sw $zero, %lo(D_802465D0_kzn_02)($at) /* C5CB38 802423F8 0809090A */ j .L80242428 /* C5CB3C 802423FC 00000000 */ nop .L80242400: -/* C5CB40 80242400 3C038024 */ lui $v1, %hi(D_802465D0_915C80) -/* C5CB44 80242404 246365D0 */ addiu $v1, $v1, %lo(D_802465D0_915C80) +/* C5CB40 80242400 3C038024 */ lui $v1, %hi(D_802465D0_kzn_02) +/* C5CB44 80242404 246365D0 */ addiu $v1, $v1, %lo(D_802465D0_kzn_02) /* C5CB48 80242408 0060282D */ daddu $a1, $v1, $zero .L8024240C: /* C5CB4C 8024240C 24820010 */ addiu $v0, $a0, 0x10 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s deleted file mode 100644 index 88f25e1866..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B4_C5CDF4 -/* C5CDF4 802426B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5CDF8 802426B8 AFB00010 */ sw $s0, 0x10($sp) -/* C5CDFC 802426BC 0080802D */ daddu $s0, $a0, $zero -/* C5CE00 802426C0 AFBF0014 */ sw $ra, 0x14($sp) -/* C5CE04 802426C4 0C00EABB */ jal get_npc_unsafe -/* C5CE08 802426C8 8E04008C */ lw $a0, 0x8c($s0) -/* C5CE0C 802426CC 0040282D */ daddu $a1, $v0, $zero -/* C5CE10 802426D0 8E040094 */ lw $a0, 0x94($s0) -/* C5CE14 802426D4 8CA30028 */ lw $v1, 0x28($a1) -/* C5CE18 802426D8 ACA40028 */ sw $a0, 0x28($a1) -/* C5CE1C 802426DC 8FBF0014 */ lw $ra, 0x14($sp) -/* C5CE20 802426E0 8FB00010 */ lw $s0, 0x10($sp) -/* C5CE24 802426E4 24020002 */ addiu $v0, $zero, 2 -/* C5CE28 802426E8 3C018024 */ lui $at, %hi(D_80246794) -/* C5CE2C 802426EC AC236794 */ sw $v1, %lo(D_80246794)($at) -/* C5CE30 802426F0 03E00008 */ jr $ra -/* C5CE34 802426F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s deleted file mode 100644 index c01e5f0d5c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426F8_C5CE38 -/* C5CE38 802426F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5CE3C 802426FC AFBF0010 */ sw $ra, 0x10($sp) -/* C5CE40 80242700 0C00EABB */ jal get_npc_unsafe -/* C5CE44 80242704 8C84008C */ lw $a0, 0x8c($a0) -/* C5CE48 80242708 3C038024 */ lui $v1, %hi(D_80246794) -/* C5CE4C 8024270C 8C636794 */ lw $v1, %lo(D_80246794)($v1) -/* C5CE50 80242710 AC430028 */ sw $v1, 0x28($v0) -/* C5CE54 80242714 8FBF0010 */ lw $ra, 0x10($sp) -/* C5CE58 80242718 24020002 */ addiu $v0, $zero, 2 -/* C5CE5C 8024271C 03E00008 */ jr $ra -/* C5CE60 80242720 27BD0018 */ addiu $sp, $sp, 0x18 -/* C5CE64 80242724 00000000 */ nop -/* C5CE68 80242728 00000000 */ nop -/* C5CE6C 8024272C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s deleted file mode 100644 index bd869dc843..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024234C_C6305C -/* C6305C 8024234C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C63060 80242350 AFB20038 */ sw $s2, 0x38($sp) -/* C63064 80242354 0080902D */ daddu $s2, $a0, $zero -/* C63068 80242358 AFBF0048 */ sw $ra, 0x48($sp) -/* C6306C 8024235C AFB50044 */ sw $s5, 0x44($sp) -/* C63070 80242360 AFB40040 */ sw $s4, 0x40($sp) -/* C63074 80242364 AFB3003C */ sw $s3, 0x3c($sp) -/* C63078 80242368 AFB10034 */ sw $s1, 0x34($sp) -/* C6307C 8024236C AFB00030 */ sw $s0, 0x30($sp) -/* C63080 80242370 8E510148 */ lw $s1, 0x148($s2) -/* C63084 80242374 86240008 */ lh $a0, 8($s1) -/* C63088 80242378 0C00EABB */ jal get_npc_unsafe -/* C6308C 8024237C 00A0802D */ daddu $s0, $a1, $zero -/* C63090 80242380 8E43000C */ lw $v1, 0xc($s2) -/* C63094 80242384 0240202D */ daddu $a0, $s2, $zero -/* C63098 80242388 8C650000 */ lw $a1, ($v1) -/* C6309C 8024238C 0C0B1EAF */ jal evt_get_variable -/* C630A0 80242390 0040A82D */ daddu $s5, $v0, $zero -/* C630A4 80242394 AFA00010 */ sw $zero, 0x10($sp) -/* C630A8 80242398 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630AC 8024239C 8C630030 */ lw $v1, 0x30($v1) -/* C630B0 802423A0 AFA30014 */ sw $v1, 0x14($sp) -/* C630B4 802423A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630B8 802423A8 8C63001C */ lw $v1, 0x1c($v1) -/* C630BC 802423AC AFA30018 */ sw $v1, 0x18($sp) -/* C630C0 802423B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630C4 802423B4 8C630024 */ lw $v1, 0x24($v1) -/* C630C8 802423B8 AFA3001C */ sw $v1, 0x1c($sp) -/* C630CC 802423BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630D0 802423C0 8C630028 */ lw $v1, 0x28($v1) -/* C630D4 802423C4 27B40010 */ addiu $s4, $sp, 0x10 -/* C630D8 802423C8 AFA30020 */ sw $v1, 0x20($sp) -/* C630DC 802423CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C630E0 802423D0 3C014348 */ lui $at, 0x4348 -/* C630E4 802423D4 44810000 */ mtc1 $at, $f0 -/* C630E8 802423D8 8C63002C */ lw $v1, 0x2c($v1) -/* C630EC 802423DC 0040982D */ daddu $s3, $v0, $zero -/* C630F0 802423E0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C630F4 802423E4 A7A0002C */ sh $zero, 0x2c($sp) -/* C630F8 802423E8 16000005 */ bnez $s0, .L80242400 -/* C630FC 802423EC AFA30024 */ sw $v1, 0x24($sp) -/* C63100 802423F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C63104 802423F4 30420004 */ andi $v0, $v0, 4 -/* C63108 802423F8 10400011 */ beqz $v0, .L80242440 -/* C6310C 802423FC 00000000 */ nop -.L80242400: -/* C63110 80242400 AE400070 */ sw $zero, 0x70($s2) -/* C63114 80242404 A6A0008E */ sh $zero, 0x8e($s5) -/* C63118 80242408 8E2200CC */ lw $v0, 0xcc($s1) -/* C6311C 8024240C 8C420000 */ lw $v0, ($v0) -/* C63120 80242410 AEA20028 */ sw $v0, 0x28($s5) -/* C63124 80242414 8E2200B0 */ lw $v0, 0xb0($s1) -/* C63128 80242418 30420004 */ andi $v0, $v0, 4 -/* C6312C 8024241C 10400008 */ beqz $v0, .L80242440 -/* C63130 80242420 AE20006C */ sw $zero, 0x6c($s1) -/* C63134 80242424 24020063 */ addiu $v0, $zero, 0x63 -/* C63138 80242428 AE420070 */ sw $v0, 0x70($s2) -/* C6313C 8024242C AE400074 */ sw $zero, 0x74($s2) -/* C63140 80242430 8E2200B0 */ lw $v0, 0xb0($s1) -/* C63144 80242434 2403FFFB */ addiu $v1, $zero, -5 -/* C63148 80242438 00431024 */ and $v0, $v0, $v1 -/* C6314C 8024243C AE2200B0 */ sw $v0, 0xb0($s1) -.L80242440: -/* C63150 80242440 8E430070 */ lw $v1, 0x70($s2) -/* C63154 80242444 2410000B */ addiu $s0, $zero, 0xb -/* C63158 80242448 1070002A */ beq $v1, $s0, .L802424F4 -/* C6315C 8024244C 2862000C */ slti $v0, $v1, 0xc -/* C63160 80242450 1040000D */ beqz $v0, .L80242488 -/* C63164 80242454 24020001 */ addiu $v0, $zero, 1 -/* C63168 80242458 1062001A */ beq $v1, $v0, .L802424C4 -/* C6316C 8024245C 28620002 */ slti $v0, $v1, 2 -/* C63170 80242460 10400005 */ beqz $v0, .L80242478 -/* C63174 80242464 2402000A */ addiu $v0, $zero, 0xa -/* C63178 80242468 10600013 */ beqz $v1, .L802424B8 -/* C6317C 8024246C 0240202D */ daddu $a0, $s2, $zero -/* C63180 80242470 0809095D */ j .L80242574 -/* C63184 80242474 00000000 */ nop -.L80242478: -/* C63188 80242478 10620018 */ beq $v1, $v0, .L802424DC -/* C6318C 8024247C 0240202D */ daddu $a0, $s2, $zero -/* C63190 80242480 0809095D */ j .L80242574 -/* C63194 80242484 00000000 */ nop -.L80242488: -/* C63198 80242488 2402000D */ addiu $v0, $zero, 0xd -/* C6319C 8024248C 10620029 */ beq $v1, $v0, .L80242534 -/* C631A0 80242490 0062102A */ slt $v0, $v1, $v0 -/* C631A4 80242494 14400020 */ bnez $v0, .L80242518 -/* C631A8 80242498 0240202D */ daddu $a0, $s2, $zero -/* C631AC 8024249C 2402000E */ addiu $v0, $zero, 0xe -/* C631B0 802424A0 1062002D */ beq $v1, $v0, .L80242558 -/* C631B4 802424A4 24020063 */ addiu $v0, $zero, 0x63 -/* C631B8 802424A8 10620030 */ beq $v1, $v0, .L8024256C -/* C631BC 802424AC 00000000 */ nop -/* C631C0 802424B0 0809095D */ j .L80242574 -/* C631C4 802424B4 00000000 */ nop -.L802424B8: -/* C631C8 802424B8 0260282D */ daddu $a1, $s3, $zero -/* C631CC 802424BC 0C090532 */ jal kzn_03_UnkNpcAIFunc31 -/* C631D0 802424C0 0280302D */ daddu $a2, $s4, $zero -.L802424C4: -/* C631D4 802424C4 0240202D */ daddu $a0, $s2, $zero -/* C631D8 802424C8 0260282D */ daddu $a1, $s3, $zero -/* C631DC 802424CC 0C09054D */ jal kzn_03_UnkNpcAIFunc32 -/* C631E0 802424D0 0280302D */ daddu $a2, $s4, $zero -/* C631E4 802424D4 0809095D */ j .L80242574 -/* C631E8 802424D8 00000000 */ nop -.L802424DC: -/* C631EC 802424DC 0260282D */ daddu $a1, $s3, $zero -/* C631F0 802424E0 0C09058C */ jal kzn_03_UnkNpcAIFunc46 -/* C631F4 802424E4 0280302D */ daddu $a2, $s4, $zero -/* C631F8 802424E8 8E420070 */ lw $v0, 0x70($s2) -/* C631FC 802424EC 14500021 */ bne $v0, $s0, .L80242574 -/* C63200 802424F0 00000000 */ nop -.L802424F4: -/* C63204 802424F4 0240202D */ daddu $a0, $s2, $zero -/* C63208 802424F8 0260282D */ daddu $a1, $s3, $zero -/* C6320C 802424FC 0C09081C */ jal kzn_03_UnkNpcDurationFlagFunc3 -/* C63210 80242500 0280302D */ daddu $a2, $s4, $zero -/* C63214 80242504 8E430070 */ lw $v1, 0x70($s2) -/* C63218 80242508 2402000C */ addiu $v0, $zero, 0xc -/* C6321C 8024250C 14620019 */ bne $v1, $v0, .L80242574 -/* C63220 80242510 00000000 */ nop -/* C63224 80242514 0240202D */ daddu $a0, $s2, $zero -.L80242518: -/* C63228 80242518 0260282D */ daddu $a1, $s3, $zero -/* C6322C 8024251C 0C090840 */ jal kzn_03_UnkNpcAIFunc33 -/* C63230 80242520 0280302D */ daddu $a2, $s4, $zero -/* C63234 80242524 8E430070 */ lw $v1, 0x70($s2) -/* C63238 80242528 2402000D */ addiu $v0, $zero, 0xd -/* C6323C 8024252C 14620011 */ bne $v1, $v0, .L80242574 -/* C63240 80242530 00000000 */ nop -.L80242534: -/* C63244 80242534 0240202D */ daddu $a0, $s2, $zero -/* C63248 80242538 0260282D */ daddu $a1, $s3, $zero -/* C6324C 8024253C 0C090880 */ jal kzn_03_UnkNpcDurationFlagFunc2 -/* C63250 80242540 0280302D */ daddu $a2, $s4, $zero -/* C63254 80242544 8E430070 */ lw $v1, 0x70($s2) -/* C63258 80242548 2402000E */ addiu $v0, $zero, 0xe -/* C6325C 8024254C 14620009 */ bne $v1, $v0, .L80242574 -/* C63260 80242550 00000000 */ nop -/* C63264 80242554 0240202D */ daddu $a0, $s2, $zero -.L80242558: -/* C63268 80242558 0260282D */ daddu $a1, $s3, $zero -/* C6326C 8024255C 0C090898 */ jal kzn_03_UnkNpcAIFunc30 -/* C63270 80242560 0280302D */ daddu $a2, $s4, $zero -/* C63274 80242564 0809095D */ j .L80242574 -/* C63278 80242568 00000000 */ nop -.L8024256C: -/* C6327C 8024256C 0C0129CF */ jal func_8004A73C -/* C63280 80242570 0240202D */ daddu $a0, $s2, $zero -.L80242574: -/* C63284 80242574 8FBF0048 */ lw $ra, 0x48($sp) -/* C63288 80242578 8FB50044 */ lw $s5, 0x44($sp) -/* C6328C 8024257C 8FB40040 */ lw $s4, 0x40($sp) -/* C63290 80242580 8FB3003C */ lw $s3, 0x3c($sp) -/* C63294 80242584 8FB20038 */ lw $s2, 0x38($sp) -/* C63298 80242588 8FB10034 */ lw $s1, 0x34($sp) -/* C6329C 8024258C 8FB00030 */ lw $s0, 0x30($sp) -/* C632A0 80242590 0000102D */ daddu $v0, $zero, $zero -/* C632A4 80242594 03E00008 */ jr $ra -/* C632A8 80242598 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s index 698506e1ef..c5bafa986e 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s @@ -13,8 +13,8 @@ glabel func_8024296C_C6367C /* C6369C 8024298C 8C620000 */ lw $v0, ($v1) /* C636A0 80242990 5040000A */ beql $v0, $zero, .L802429BC /* C636A4 80242994 00041080 */ sll $v0, $a0, 2 -/* C636A8 80242998 3C058024 */ lui $a1, %hi(D_80247420_C7E100) -/* C636AC 8024299C 24A57420 */ addiu $a1, $a1, %lo(D_80247420_C7E100) +/* C636A8 80242998 3C058024 */ lui $a1, %hi(D_80247420_kzn_03) +/* C636AC 8024299C 24A57420 */ addiu $a1, $a1, %lo(D_80247420_kzn_03) .L802429A0: /* C636B0 802429A0 24630004 */ addiu $v1, $v1, 4 /* C636B4 802429A4 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_8024296C_C6367C /* C636C4 802429B4 24A50004 */ addiu $a1, $a1, 4 /* C636C8 802429B8 00041080 */ sll $v0, $a0, 2 .L802429BC: -/* C636CC 802429BC 3C018024 */ lui $at, %hi(D_80247420_C7E100) +/* C636CC 802429BC 3C018024 */ lui $at, %hi(D_80247420_kzn_03) /* C636D0 802429C0 00220821 */ addu $at, $at, $v0 -/* C636D4 802429C4 AC207420 */ sw $zero, %lo(D_80247420_C7E100)($at) +/* C636D4 802429C4 AC207420 */ sw $zero, %lo(D_80247420_kzn_03)($at) /* C636D8 802429C8 08090A7E */ j .L802429F8 /* C636DC 802429CC 00000000 */ nop .L802429D0: -/* C636E0 802429D0 3C038024 */ lui $v1, %hi(D_80247420_C7E100) -/* C636E4 802429D4 24637420 */ addiu $v1, $v1, %lo(D_80247420_C7E100) +/* C636E0 802429D0 3C038024 */ lui $v1, %hi(D_80247420_kzn_03) +/* C636E4 802429D4 24637420 */ addiu $v1, $v1, %lo(D_80247420_kzn_03) /* C636E8 802429D8 0060282D */ daddu $a1, $v1, $zero .L802429DC: /* C636EC 802429DC 24820010 */ addiu $v0, $a0, 0x10 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s deleted file mode 100644 index 00ff2b2dde..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C84_C63994 -/* C63994 80242C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63998 80242C88 AFB00010 */ sw $s0, 0x10($sp) -/* C6399C 80242C8C 0080802D */ daddu $s0, $a0, $zero -/* C639A0 80242C90 AFBF0014 */ sw $ra, 0x14($sp) -/* C639A4 80242C94 0C00EABB */ jal get_npc_unsafe -/* C639A8 80242C98 8E04008C */ lw $a0, 0x8c($s0) -/* C639AC 80242C9C 0040282D */ daddu $a1, $v0, $zero -/* C639B0 80242CA0 8E040094 */ lw $a0, 0x94($s0) -/* C639B4 80242CA4 8CA30028 */ lw $v1, 0x28($a1) -/* C639B8 80242CA8 ACA40028 */ sw $a0, 0x28($a1) -/* C639BC 80242CAC 8FBF0014 */ lw $ra, 0x14($sp) -/* C639C0 80242CB0 8FB00010 */ lw $s0, 0x10($sp) -/* C639C4 80242CB4 24020002 */ addiu $v0, $zero, 2 -/* C639C8 80242CB8 3C018024 */ lui $at, %hi(dro_02_pad_XX111) -/* C639CC 80242CBC AC2375E4 */ sw $v1, %lo(dro_02_pad_XX111)($at) -/* C639D0 80242CC0 03E00008 */ jr $ra -/* C639D4 80242CC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s deleted file mode 100644 index ad5f4d9394..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CC8_C639D8 -/* C639D8 80242CC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C639DC 80242CCC AFBF0010 */ sw $ra, 0x10($sp) -/* C639E0 80242CD0 0C00EABB */ jal get_npc_unsafe -/* C639E4 80242CD4 8C84008C */ lw $a0, 0x8c($a0) -/* C639E8 80242CD8 3C038024 */ lui $v1, %hi(dro_02_pad_XX111) -/* C639EC 80242CDC 8C6375E4 */ lw $v1, %lo(dro_02_pad_XX111)($v1) -/* C639F0 80242CE0 AC430028 */ sw $v1, 0x28($v0) -/* C639F4 80242CE4 8FBF0010 */ lw $ra, 0x10($sp) -/* C639F8 80242CE8 24020002 */ addiu $v0, $zero, 2 -/* C639FC 80242CEC 03E00008 */ jr $ra -/* C63A00 80242CF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C63A04 80242CF4 00000000 */ nop -/* C63A08 80242CF8 00000000 */ nop -/* C63A0C 80242CFC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s deleted file mode 100644 index 7554004262..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242DB0_C63AC0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DB0_C63AC0 -/* C63AC0 80242DB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C63AC4 80242DB4 AFB1001C */ sw $s1, 0x1c($sp) -/* C63AC8 80242DB8 0080882D */ daddu $s1, $a0, $zero -/* C63ACC 80242DBC AFBF0020 */ sw $ra, 0x20($sp) -/* C63AD0 80242DC0 AFB00018 */ sw $s0, 0x18($sp) -/* C63AD4 80242DC4 8E30000C */ lw $s0, 0xc($s1) -/* C63AD8 80242DC8 8E020000 */ lw $v0, ($s0) -/* C63ADC 80242DCC 1040001B */ beqz $v0, .L80242E3C -/* C63AE0 80242DD0 26100004 */ addiu $s0, $s0, 4 -/* C63AE4 80242DD4 8E050000 */ lw $a1, ($s0) -/* C63AE8 80242DD8 0C0B1EAF */ jal evt_get_variable -/* C63AEC 80242DDC 26100004 */ addiu $s0, $s0, 4 -/* C63AF0 80242DE0 AE220070 */ sw $v0, 0x70($s1) -/* C63AF4 80242DE4 8E050000 */ lw $a1, ($s0) -/* C63AF8 80242DE8 26100004 */ addiu $s0, $s0, 4 -/* C63AFC 80242DEC 0C0B1EAF */ jal evt_get_variable -/* C63B00 80242DF0 0220202D */ daddu $a0, $s1, $zero -/* C63B04 80242DF4 AE220074 */ sw $v0, 0x74($s1) -/* C63B08 80242DF8 8E050000 */ lw $a1, ($s0) -/* C63B0C 80242DFC 0C0B1EAF */ jal evt_get_variable -/* C63B10 80242E00 0220202D */ daddu $a0, $s1, $zero -/* C63B14 80242E04 24040168 */ addiu $a0, $zero, 0x168 -/* C63B18 80242E08 0000282D */ daddu $a1, $zero, $zero -/* C63B1C 80242E0C C6200070 */ lwc1 $f0, 0x70($s1) -/* C63B20 80242E10 46800020 */ cvt.s.w $f0, $f0 -/* C63B24 80242E14 C6220074 */ lwc1 $f2, 0x74($s1) -/* C63B28 80242E18 468010A0 */ cvt.s.w $f2, $f2 -/* C63B2C 80242E1C 44060000 */ mfc1 $a2, $f0 -/* C63B30 80242E20 44071000 */ mfc1 $a3, $f2 -/* C63B34 80242E24 44820000 */ mtc1 $v0, $f0 -/* C63B38 80242E28 00000000 */ nop -/* C63B3C 80242E2C 46800020 */ cvt.s.w $f0, $f0 -/* C63B40 80242E30 AE220078 */ sw $v0, 0x78($s1) -/* C63B44 80242E34 0C05267B */ jal sfx_adjust_env_sound_pos -/* C63B48 80242E38 E7A00010 */ swc1 $f0, 0x10($sp) -.L80242E3C: -/* C63B4C 80242E3C 8FBF0020 */ lw $ra, 0x20($sp) -/* C63B50 80242E40 8FB1001C */ lw $s1, 0x1c($sp) -/* C63B54 80242E44 8FB00018 */ lw $s0, 0x18($sp) -/* C63B58 80242E48 24020002 */ addiu $v0, $zero, 2 -/* C63B5C 80242E4C 03E00008 */ jr $ra -/* C63B60 80242E50 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s deleted file mode 100644 index feb8b5d0e5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E54_C63B64 -/* C63B64 80242E54 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C63B68 80242E58 AFB1001C */ sw $s1, 0x1c($sp) -/* C63B6C 80242E5C 0080882D */ daddu $s1, $a0, $zero -/* C63B70 80242E60 AFBF0020 */ sw $ra, 0x20($sp) -/* C63B74 80242E64 AFB00018 */ sw $s0, 0x18($sp) -/* C63B78 80242E68 8E30000C */ lw $s0, 0xc($s1) -/* C63B7C 80242E6C 8E020000 */ lw $v0, ($s0) -/* C63B80 80242E70 1040001B */ beqz $v0, .L80242EE0 -/* C63B84 80242E74 26100004 */ addiu $s0, $s0, 4 -/* C63B88 80242E78 8E050000 */ lw $a1, ($s0) -/* C63B8C 80242E7C 0C0B1EAF */ jal evt_get_variable -/* C63B90 80242E80 26100004 */ addiu $s0, $s0, 4 -/* C63B94 80242E84 AE220070 */ sw $v0, 0x70($s1) -/* C63B98 80242E88 8E050000 */ lw $a1, ($s0) -/* C63B9C 80242E8C 26100004 */ addiu $s0, $s0, 4 -/* C63BA0 80242E90 0C0B1EAF */ jal evt_get_variable -/* C63BA4 80242E94 0220202D */ daddu $a0, $s1, $zero -/* C63BA8 80242E98 AE220074 */ sw $v0, 0x74($s1) -/* C63BAC 80242E9C 8E050000 */ lw $a1, ($s0) -/* C63BB0 80242EA0 0C0B1EAF */ jal evt_get_variable -/* C63BB4 80242EA4 0220202D */ daddu $a0, $s1, $zero -/* C63BB8 80242EA8 24040185 */ addiu $a0, $zero, 0x185 -/* C63BBC 80242EAC 0000282D */ daddu $a1, $zero, $zero -/* C63BC0 80242EB0 C6200070 */ lwc1 $f0, 0x70($s1) -/* C63BC4 80242EB4 46800020 */ cvt.s.w $f0, $f0 -/* C63BC8 80242EB8 C6220074 */ lwc1 $f2, 0x74($s1) -/* C63BCC 80242EBC 468010A0 */ cvt.s.w $f2, $f2 -/* C63BD0 80242EC0 44060000 */ mfc1 $a2, $f0 -/* C63BD4 80242EC4 44071000 */ mfc1 $a3, $f2 -/* C63BD8 80242EC8 44820000 */ mtc1 $v0, $f0 -/* C63BDC 80242ECC 00000000 */ nop -/* C63BE0 80242ED0 46800020 */ cvt.s.w $f0, $f0 -/* C63BE4 80242ED4 AE220078 */ sw $v0, 0x78($s1) -/* C63BE8 80242ED8 0C05267B */ jal sfx_adjust_env_sound_pos -/* C63BEC 80242EDC E7A00010 */ swc1 $f0, 0x10($sp) -.L80242EE0: -/* C63BF0 80242EE0 8FBF0020 */ lw $ra, 0x20($sp) -/* C63BF4 80242EE4 8FB1001C */ lw $s1, 0x1c($sp) -/* C63BF8 80242EE8 8FB00018 */ lw $s0, 0x18($sp) -/* C63BFC 80242EEC 24020002 */ addiu $v0, $zero, 2 -/* C63C00 80242EF0 03E00008 */ jr $ra -/* C63C04 80242EF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s deleted file mode 100644 index 0b25eb68ca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80243070_C63D80.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243070_C63D80 -/* C63D80 80243070 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* C63D84 80243074 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* C63D88 80243078 8C420010 */ lw $v0, 0x10($v0) -/* C63D8C 8024307C 30428000 */ andi $v0, $v0, 0x8000 -/* C63D90 80243080 AC8200A4 */ sw $v0, 0xa4($a0) -/* C63D94 80243084 03E00008 */ jr $ra -/* C63D98 80243088 24020002 */ addiu $v0, $zero, 2 -/* C63D9C 8024308C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s deleted file mode 100644 index 484e75ced6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C90_C75110 -/* C75110 80243C90 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C75114 80243C94 AFB20038 */ sw $s2, 0x38($sp) -/* C75118 80243C98 0080902D */ daddu $s2, $a0, $zero -/* C7511C 80243C9C AFBF0048 */ sw $ra, 0x48($sp) -/* C75120 80243CA0 AFB50044 */ sw $s5, 0x44($sp) -/* C75124 80243CA4 AFB40040 */ sw $s4, 0x40($sp) -/* C75128 80243CA8 AFB3003C */ sw $s3, 0x3c($sp) -/* C7512C 80243CAC AFB10034 */ sw $s1, 0x34($sp) -/* C75130 80243CB0 AFB00030 */ sw $s0, 0x30($sp) -/* C75134 80243CB4 8E510148 */ lw $s1, 0x148($s2) -/* C75138 80243CB8 86240008 */ lh $a0, 8($s1) -/* C7513C 80243CBC 0C00EABB */ jal get_npc_unsafe -/* C75140 80243CC0 00A0802D */ daddu $s0, $a1, $zero -/* C75144 80243CC4 8E43000C */ lw $v1, 0xc($s2) -/* C75148 80243CC8 0240202D */ daddu $a0, $s2, $zero -/* C7514C 80243CCC 8C650000 */ lw $a1, ($v1) -/* C75150 80243CD0 0C0B1EAF */ jal evt_get_variable -/* C75154 80243CD4 0040A82D */ daddu $s5, $v0, $zero -/* C75158 80243CD8 AFA00010 */ sw $zero, 0x10($sp) -/* C7515C 80243CDC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75160 80243CE0 8C630030 */ lw $v1, 0x30($v1) -/* C75164 80243CE4 AFA30014 */ sw $v1, 0x14($sp) -/* C75168 80243CE8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C7516C 80243CEC 8C63001C */ lw $v1, 0x1c($v1) -/* C75170 80243CF0 AFA30018 */ sw $v1, 0x18($sp) -/* C75174 80243CF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75178 80243CF8 8C630024 */ lw $v1, 0x24($v1) -/* C7517C 80243CFC AFA3001C */ sw $v1, 0x1c($sp) -/* C75180 80243D00 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75184 80243D04 8C630028 */ lw $v1, 0x28($v1) -/* C75188 80243D08 27B40010 */ addiu $s4, $sp, 0x10 -/* C7518C 80243D0C AFA30020 */ sw $v1, 0x20($sp) -/* C75190 80243D10 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75194 80243D14 3C014348 */ lui $at, 0x4348 -/* C75198 80243D18 44810000 */ mtc1 $at, $f0 -/* C7519C 80243D1C 8C63002C */ lw $v1, 0x2c($v1) -/* C751A0 80243D20 0040982D */ daddu $s3, $v0, $zero -/* C751A4 80243D24 E7A00028 */ swc1 $f0, 0x28($sp) -/* C751A8 80243D28 A7A0002C */ sh $zero, 0x2c($sp) -/* C751AC 80243D2C 16000005 */ bnez $s0, .L80243D44 -/* C751B0 80243D30 AFA30024 */ sw $v1, 0x24($sp) -/* C751B4 80243D34 8E2200B0 */ lw $v0, 0xb0($s1) -/* C751B8 80243D38 30420004 */ andi $v0, $v0, 4 -/* C751BC 80243D3C 10400011 */ beqz $v0, .L80243D84 -/* C751C0 80243D40 00000000 */ nop -.L80243D44: -/* C751C4 80243D44 AE400070 */ sw $zero, 0x70($s2) -/* C751C8 80243D48 A6A0008E */ sh $zero, 0x8e($s5) -/* C751CC 80243D4C 8E2200CC */ lw $v0, 0xcc($s1) -/* C751D0 80243D50 8C420000 */ lw $v0, ($v0) -/* C751D4 80243D54 AEA20028 */ sw $v0, 0x28($s5) -/* C751D8 80243D58 8E2200B0 */ lw $v0, 0xb0($s1) -/* C751DC 80243D5C 30420004 */ andi $v0, $v0, 4 -/* C751E0 80243D60 10400008 */ beqz $v0, .L80243D84 -/* C751E4 80243D64 AE20006C */ sw $zero, 0x6c($s1) -/* C751E8 80243D68 24020063 */ addiu $v0, $zero, 0x63 -/* C751EC 80243D6C AE420070 */ sw $v0, 0x70($s2) -/* C751F0 80243D70 AE400074 */ sw $zero, 0x74($s2) -/* C751F4 80243D74 8E2200B0 */ lw $v0, 0xb0($s1) -/* C751F8 80243D78 2403FFFB */ addiu $v1, $zero, -5 -/* C751FC 80243D7C 00431024 */ and $v0, $v0, $v1 -/* C75200 80243D80 AE2200B0 */ sw $v0, 0xb0($s1) -.L80243D84: -/* C75204 80243D84 8E430070 */ lw $v1, 0x70($s2) -/* C75208 80243D88 2410000B */ addiu $s0, $zero, 0xb -/* C7520C 80243D8C 1070002A */ beq $v1, $s0, .L80243E38 -/* C75210 80243D90 2862000C */ slti $v0, $v1, 0xc -/* C75214 80243D94 1040000D */ beqz $v0, .L80243DCC -/* C75218 80243D98 24020001 */ addiu $v0, $zero, 1 -/* C7521C 80243D9C 1062001A */ beq $v1, $v0, .L80243E08 -/* C75220 80243DA0 28620002 */ slti $v0, $v1, 2 -/* C75224 80243DA4 10400005 */ beqz $v0, .L80243DBC -/* C75228 80243DA8 2402000A */ addiu $v0, $zero, 0xa -/* C7522C 80243DAC 10600013 */ beqz $v1, .L80243DFC -/* C75230 80243DB0 0240202D */ daddu $a0, $s2, $zero -/* C75234 80243DB4 08090FAE */ j .L80243EB8 -/* C75238 80243DB8 00000000 */ nop -.L80243DBC: -/* C7523C 80243DBC 10620018 */ beq $v1, $v0, .L80243E20 -/* C75240 80243DC0 0240202D */ daddu $a0, $s2, $zero -/* C75244 80243DC4 08090FAE */ j .L80243EB8 -/* C75248 80243DC8 00000000 */ nop -.L80243DCC: -/* C7524C 80243DCC 2402000D */ addiu $v0, $zero, 0xd -/* C75250 80243DD0 10620029 */ beq $v1, $v0, .L80243E78 -/* C75254 80243DD4 0062102A */ slt $v0, $v1, $v0 -/* C75258 80243DD8 14400020 */ bnez $v0, .L80243E5C -/* C7525C 80243DDC 0240202D */ daddu $a0, $s2, $zero -/* C75260 80243DE0 2402000E */ addiu $v0, $zero, 0xe -/* C75264 80243DE4 1062002D */ beq $v1, $v0, .L80243E9C -/* C75268 80243DE8 24020063 */ addiu $v0, $zero, 0x63 -/* C7526C 80243DEC 10620030 */ beq $v1, $v0, .L80243EB0 -/* C75270 80243DF0 00000000 */ nop -/* C75274 80243DF4 08090FAE */ j .L80243EB8 -/* C75278 80243DF8 00000000 */ nop -.L80243DFC: -/* C7527C 80243DFC 0260282D */ daddu $a1, $s3, $zero -/* C75280 80243E00 0C090B83 */ jal kzn_08_UnkNpcAIFunc31 -/* C75284 80243E04 0280302D */ daddu $a2, $s4, $zero -.L80243E08: -/* C75288 80243E08 0240202D */ daddu $a0, $s2, $zero -/* C7528C 80243E0C 0260282D */ daddu $a1, $s3, $zero -/* C75290 80243E10 0C090B9E */ jal kzn_08_UnkNpcAIFunc32 -/* C75294 80243E14 0280302D */ daddu $a2, $s4, $zero -/* C75298 80243E18 08090FAE */ j .L80243EB8 -/* C7529C 80243E1C 00000000 */ nop -.L80243E20: -/* C752A0 80243E20 0260282D */ daddu $a1, $s3, $zero -/* C752A4 80243E24 0C090BDD */ jal kzn_08_UnkNpcAIFunc46 -/* C752A8 80243E28 0280302D */ daddu $a2, $s4, $zero -/* C752AC 80243E2C 8E420070 */ lw $v0, 0x70($s2) -/* C752B0 80243E30 14500021 */ bne $v0, $s0, .L80243EB8 -/* C752B4 80243E34 00000000 */ nop -.L80243E38: -/* C752B8 80243E38 0240202D */ daddu $a0, $s2, $zero -/* C752BC 80243E3C 0260282D */ daddu $a1, $s3, $zero -/* C752C0 80243E40 0C090E6D */ jal kzn_08_UnkNpcDurationFlagFunc3 -/* C752C4 80243E44 0280302D */ daddu $a2, $s4, $zero -/* C752C8 80243E48 8E430070 */ lw $v1, 0x70($s2) -/* C752CC 80243E4C 2402000C */ addiu $v0, $zero, 0xc -/* C752D0 80243E50 14620019 */ bne $v1, $v0, .L80243EB8 -/* C752D4 80243E54 00000000 */ nop -/* C752D8 80243E58 0240202D */ daddu $a0, $s2, $zero -.L80243E5C: -/* C752DC 80243E5C 0260282D */ daddu $a1, $s3, $zero -/* C752E0 80243E60 0C090E91 */ jal kzn_08_UnkNpcAIFunc33 -/* C752E4 80243E64 0280302D */ daddu $a2, $s4, $zero -/* C752E8 80243E68 8E430070 */ lw $v1, 0x70($s2) -/* C752EC 80243E6C 2402000D */ addiu $v0, $zero, 0xd -/* C752F0 80243E70 14620011 */ bne $v1, $v0, .L80243EB8 -/* C752F4 80243E74 00000000 */ nop -.L80243E78: -/* C752F8 80243E78 0240202D */ daddu $a0, $s2, $zero -/* C752FC 80243E7C 0260282D */ daddu $a1, $s3, $zero -/* C75300 80243E80 0C090ED1 */ jal kzn_08_UnkNpcDurationFlagFunc2 -/* C75304 80243E84 0280302D */ daddu $a2, $s4, $zero -/* C75308 80243E88 8E430070 */ lw $v1, 0x70($s2) -/* C7530C 80243E8C 2402000E */ addiu $v0, $zero, 0xe -/* C75310 80243E90 14620009 */ bne $v1, $v0, .L80243EB8 -/* C75314 80243E94 00000000 */ nop -/* C75318 80243E98 0240202D */ daddu $a0, $s2, $zero -.L80243E9C: -/* C7531C 80243E9C 0260282D */ daddu $a1, $s3, $zero -/* C75320 80243EA0 0C090EE9 */ jal kzn_08_UnkNpcAIFunc30 -/* C75324 80243EA4 0280302D */ daddu $a2, $s4, $zero -/* C75328 80243EA8 08090FAE */ j .L80243EB8 -/* C7532C 80243EAC 00000000 */ nop -.L80243EB0: -/* C75330 80243EB0 0C0129CF */ jal func_8004A73C -/* C75334 80243EB4 0240202D */ daddu $a0, $s2, $zero -.L80243EB8: -/* C75338 80243EB8 8FBF0048 */ lw $ra, 0x48($sp) -/* C7533C 80243EBC 8FB50044 */ lw $s5, 0x44($sp) -/* C75340 80243EC0 8FB40040 */ lw $s4, 0x40($sp) -/* C75344 80243EC4 8FB3003C */ lw $s3, 0x3c($sp) -/* C75348 80243EC8 8FB20038 */ lw $s2, 0x38($sp) -/* C7534C 80243ECC 8FB10034 */ lw $s1, 0x34($sp) -/* C75350 80243ED0 8FB00030 */ lw $s0, 0x30($sp) -/* C75354 80243ED4 0000102D */ daddu $v0, $zero, $zero -/* C75358 80243ED8 03E00008 */ jr $ra -/* C7535C 80243EDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s deleted file mode 100644 index 5977b9ccbf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240D40_C77A20.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D40_C77A20 -/* C77A20 80240D40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C77A24 80240D44 AFB1001C */ sw $s1, 0x1c($sp) -/* C77A28 80240D48 0080882D */ daddu $s1, $a0, $zero -/* C77A2C 80240D4C AFBF0020 */ sw $ra, 0x20($sp) -/* C77A30 80240D50 AFB00018 */ sw $s0, 0x18($sp) -/* C77A34 80240D54 8E30000C */ lw $s0, 0xc($s1) -/* C77A38 80240D58 8E020000 */ lw $v0, ($s0) -/* C77A3C 80240D5C 1040001B */ beqz $v0, .L80240DCC -/* C77A40 80240D60 26100004 */ addiu $s0, $s0, 4 -/* C77A44 80240D64 8E050000 */ lw $a1, ($s0) -/* C77A48 80240D68 0C0B1EAF */ jal evt_get_variable -/* C77A4C 80240D6C 26100004 */ addiu $s0, $s0, 4 -/* C77A50 80240D70 AE220070 */ sw $v0, 0x70($s1) -/* C77A54 80240D74 8E050000 */ lw $a1, ($s0) -/* C77A58 80240D78 26100004 */ addiu $s0, $s0, 4 -/* C77A5C 80240D7C 0C0B1EAF */ jal evt_get_variable -/* C77A60 80240D80 0220202D */ daddu $a0, $s1, $zero -/* C77A64 80240D84 AE220074 */ sw $v0, 0x74($s1) -/* C77A68 80240D88 8E050000 */ lw $a1, ($s0) -/* C77A6C 80240D8C 0C0B1EAF */ jal evt_get_variable -/* C77A70 80240D90 0220202D */ daddu $a0, $s1, $zero -/* C77A74 80240D94 24040168 */ addiu $a0, $zero, 0x168 -/* C77A78 80240D98 0000282D */ daddu $a1, $zero, $zero -/* C77A7C 80240D9C C6200070 */ lwc1 $f0, 0x70($s1) -/* C77A80 80240DA0 46800020 */ cvt.s.w $f0, $f0 -/* C77A84 80240DA4 C6220074 */ lwc1 $f2, 0x74($s1) -/* C77A88 80240DA8 468010A0 */ cvt.s.w $f2, $f2 -/* C77A8C 80240DAC 44060000 */ mfc1 $a2, $f0 -/* C77A90 80240DB0 44071000 */ mfc1 $a3, $f2 -/* C77A94 80240DB4 44820000 */ mtc1 $v0, $f0 -/* C77A98 80240DB8 00000000 */ nop -/* C77A9C 80240DBC 46800020 */ cvt.s.w $f0, $f0 -/* C77AA0 80240DC0 AE220078 */ sw $v0, 0x78($s1) -/* C77AA4 80240DC4 0C05267B */ jal sfx_adjust_env_sound_pos -/* C77AA8 80240DC8 E7A00010 */ swc1 $f0, 0x10($sp) -.L80240DCC: -/* C77AAC 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) -/* C77AB0 80240DD0 8FB1001C */ lw $s1, 0x1c($sp) -/* C77AB4 80240DD4 8FB00018 */ lw $s0, 0x18($sp) -/* C77AB8 80240DD8 24020002 */ addiu $v0, $zero, 2 -/* C77ABC 80240DDC 03E00008 */ jr $ra -/* C77AC0 80240DE0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s deleted file mode 100644 index 7a5430f1bf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240DE4_C77AC4.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE4_C77AC4 -/* C77AC4 80240DE4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C77AC8 80240DE8 AFB1001C */ sw $s1, 0x1c($sp) -/* C77ACC 80240DEC 0080882D */ daddu $s1, $a0, $zero -/* C77AD0 80240DF0 AFBF0020 */ sw $ra, 0x20($sp) -/* C77AD4 80240DF4 AFB00018 */ sw $s0, 0x18($sp) -/* C77AD8 80240DF8 8E30000C */ lw $s0, 0xc($s1) -/* C77ADC 80240DFC 8E020000 */ lw $v0, ($s0) -/* C77AE0 80240E00 1040001B */ beqz $v0, .L80240E70 -/* C77AE4 80240E04 26100004 */ addiu $s0, $s0, 4 -/* C77AE8 80240E08 8E050000 */ lw $a1, ($s0) -/* C77AEC 80240E0C 0C0B1EAF */ jal evt_get_variable -/* C77AF0 80240E10 26100004 */ addiu $s0, $s0, 4 -/* C77AF4 80240E14 AE220070 */ sw $v0, 0x70($s1) -/* C77AF8 80240E18 8E050000 */ lw $a1, ($s0) -/* C77AFC 80240E1C 26100004 */ addiu $s0, $s0, 4 -/* C77B00 80240E20 0C0B1EAF */ jal evt_get_variable -/* C77B04 80240E24 0220202D */ daddu $a0, $s1, $zero -/* C77B08 80240E28 AE220074 */ sw $v0, 0x74($s1) -/* C77B0C 80240E2C 8E050000 */ lw $a1, ($s0) -/* C77B10 80240E30 0C0B1EAF */ jal evt_get_variable -/* C77B14 80240E34 0220202D */ daddu $a0, $s1, $zero -/* C77B18 80240E38 24040185 */ addiu $a0, $zero, 0x185 -/* C77B1C 80240E3C 0000282D */ daddu $a1, $zero, $zero -/* C77B20 80240E40 C6200070 */ lwc1 $f0, 0x70($s1) -/* C77B24 80240E44 46800020 */ cvt.s.w $f0, $f0 -/* C77B28 80240E48 C6220074 */ lwc1 $f2, 0x74($s1) -/* C77B2C 80240E4C 468010A0 */ cvt.s.w $f2, $f2 -/* C77B30 80240E50 44060000 */ mfc1 $a2, $f0 -/* C77B34 80240E54 44071000 */ mfc1 $a3, $f2 -/* C77B38 80240E58 44820000 */ mtc1 $v0, $f0 -/* C77B3C 80240E5C 00000000 */ nop -/* C77B40 80240E60 46800020 */ cvt.s.w $f0, $f0 -/* C77B44 80240E64 AE220078 */ sw $v0, 0x78($s1) -/* C77B48 80240E68 0C05267B */ jal sfx_adjust_env_sound_pos -/* C77B4C 80240E6C E7A00010 */ swc1 $f0, 0x10($sp) -.L80240E70: -/* C77B50 80240E70 8FBF0020 */ lw $ra, 0x20($sp) -/* C77B54 80240E74 8FB1001C */ lw $s1, 0x1c($sp) -/* C77B58 80240E78 8FB00018 */ lw $s0, 0x18($sp) -/* C77B5C 80240E7C 24020002 */ addiu $v0, $zero, 2 -/* C77B60 80240E80 03E00008 */ jr $ra -/* C77B64 80240E84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s deleted file mode 100644 index 2f7154a27d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80241000_C77CE0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241000_C77CE0 -/* C77CE0 80241000 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* C77CE4 80241004 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* C77CE8 80241008 8C420010 */ lw $v0, 0x10($v0) -/* C77CEC 8024100C 30428000 */ andi $v0, $v0, 0x8000 -/* C77CF0 80241010 AC8200A4 */ sw $v0, 0xa4($a0) -/* C77CF4 80241014 03E00008 */ jr $ra -/* C77CF8 80241018 24020002 */ addiu $v0, $zero, 2 -/* C77CFC 8024101C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s deleted file mode 100644 index 47f56400bb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s +++ /dev/null @@ -1,710 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247408_C7E0E8 -.double 380.0 - -dlabel D_80247410_C7E0F0 -.double -380.0 - -dlabel D_80247418_C7E0F8 -.double 305.0 - -dlabel D_80247420_C7E100 -.double 375.0 - -dlabel D_80247428_C7E108 -.double 45.0 - -dlabel D_80247430_C7E110 -.double 150.0 - -.section .text - -glabel func_80241A58_C78738 -/* C78738 80241A58 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C7873C 80241A5C AFBF0064 */ sw $ra, 0x64($sp) -/* C78740 80241A60 AFBE0060 */ sw $fp, 0x60($sp) -/* C78744 80241A64 AFB7005C */ sw $s7, 0x5c($sp) -/* C78748 80241A68 AFB60058 */ sw $s6, 0x58($sp) -/* C7874C 80241A6C AFB50054 */ sw $s5, 0x54($sp) -/* C78750 80241A70 AFB40050 */ sw $s4, 0x50($sp) -/* C78754 80241A74 AFB3004C */ sw $s3, 0x4c($sp) -/* C78758 80241A78 AFB20048 */ sw $s2, 0x48($sp) -/* C7875C 80241A7C AFB10044 */ sw $s1, 0x44($sp) -/* C78760 80241A80 AFB00040 */ sw $s0, 0x40($sp) -/* C78764 80241A84 F7B80078 */ sdc1 $f24, 0x78($sp) -/* C78768 80241A88 F7B60070 */ sdc1 $f22, 0x70($sp) -/* C7876C 80241A8C F7B40068 */ sdc1 $f20, 0x68($sp) -/* C78770 80241A90 AFA40080 */ sw $a0, 0x80($sp) -/* C78774 80241A94 8C960148 */ lw $s6, 0x148($a0) -/* C78778 80241A98 00C0902D */ daddu $s2, $a2, $zero -/* C7877C 80241A9C 86C40008 */ lh $a0, 8($s6) -/* C78780 80241AA0 0C00EABB */ jal get_npc_unsafe -/* C78784 80241AA4 0000B82D */ daddu $s7, $zero, $zero -/* C78788 80241AA8 0040882D */ daddu $s1, $v0, $zero -/* C7878C 80241AAC 9622008E */ lhu $v0, 0x8e($s1) -/* C78790 80241AB0 2442FFFF */ addiu $v0, $v0, -1 -/* C78794 80241AB4 A622008E */ sh $v0, 0x8e($s1) -/* C78798 80241AB8 00021400 */ sll $v0, $v0, 0x10 -/* C7879C 80241ABC 8EC30090 */ lw $v1, 0x90($s6) -/* C787A0 80241AC0 00021403 */ sra $v0, $v0, 0x10 -/* C787A4 80241AC4 0062182A */ slt $v1, $v1, $v0 -/* C787A8 80241AC8 14600005 */ bnez $v1, .L80241AE0 -/* C787AC 80241ACC 02E0F02D */ daddu $fp, $s7, $zero -/* C787B0 80241AD0 8EC20000 */ lw $v0, ($s6) -/* C787B4 80241AD4 3C031F10 */ lui $v1, 0x1f10 -/* C787B8 80241AD8 00431025 */ or $v0, $v0, $v1 -/* C787BC 80241ADC AEC20000 */ sw $v0, ($s6) -.L80241AE0: -/* C787C0 80241AE0 8622008E */ lh $v0, 0x8e($s1) -/* C787C4 80241AE4 1440025D */ bnez $v0, .L8024245C -/* C787C8 80241AE8 00000000 */ nop -/* C787CC 80241AEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C787D0 80241AF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C787D4 80241AF4 0C00A6C9 */ jal clamp_angle -/* C787D8 80241AF8 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* C787DC 80241AFC 3C014334 */ lui $at, 0x4334 -/* C787E0 80241B00 44811000 */ mtc1 $at, $f2 -/* C787E4 80241B04 00000000 */ nop -/* C787E8 80241B08 4602003C */ c.lt.s $f0, $f2 -/* C787EC 80241B0C 00000000 */ nop -/* C787F0 80241B10 45000011 */ bc1f .L80241B58 -/* C787F4 80241B14 00000000 */ nop -/* C787F8 80241B18 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C787FC 80241B1C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C78800 80241B20 3C0142B4 */ lui $at, 0x42b4 -/* C78804 80241B24 44816000 */ mtc1 $at, $f12 -/* C78808 80241B28 00031080 */ sll $v0, $v1, 2 -/* C7880C 80241B2C 00431021 */ addu $v0, $v0, $v1 -/* C78810 80241B30 00021080 */ sll $v0, $v0, 2 -/* C78814 80241B34 00431023 */ subu $v0, $v0, $v1 -/* C78818 80241B38 000218C0 */ sll $v1, $v0, 3 -/* C7881C 80241B3C 00431021 */ addu $v0, $v0, $v1 -/* C78820 80241B40 000210C0 */ sll $v0, $v0, 3 -/* C78824 80241B44 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* C78828 80241B48 00220821 */ addu $at, $at, $v0 -/* C7882C 80241B4C C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* C78830 80241B50 080906E5 */ j .L80241B94 -/* C78834 80241B54 460C0301 */ sub.s $f12, $f0, $f12 -.L80241B58: -/* C78838 80241B58 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C7883C 80241B5C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C78840 80241B60 3C0142B4 */ lui $at, 0x42b4 -/* C78844 80241B64 44816000 */ mtc1 $at, $f12 -/* C78848 80241B68 00031080 */ sll $v0, $v1, 2 -/* C7884C 80241B6C 00431021 */ addu $v0, $v0, $v1 -/* C78850 80241B70 00021080 */ sll $v0, $v0, 2 -/* C78854 80241B74 00431023 */ subu $v0, $v0, $v1 -/* C78858 80241B78 000218C0 */ sll $v1, $v0, 3 -/* C7885C 80241B7C 00431021 */ addu $v0, $v0, $v1 -/* C78860 80241B80 000210C0 */ sll $v0, $v0, 3 -/* C78864 80241B84 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* C78868 80241B88 00220821 */ addu $at, $at, $v0 -/* C7886C 80241B8C C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* C78870 80241B90 460C0300 */ add.s $f12, $f0, $f12 -.L80241B94: -/* C78874 80241B94 0C00A6C9 */ jal clamp_angle -/* C78878 80241B98 00000000 */ nop -/* C7887C 80241B9C 46000586 */ mov.s $f22, $f0 -/* C78880 80241BA0 3C014334 */ lui $at, 0x4334 -/* C78884 80241BA4 44816000 */ mtc1 $at, $f12 -/* C78888 80241BA8 0C00A6C9 */ jal clamp_angle -/* C7888C 80241BAC 460CB300 */ add.s $f12, $f22, $f12 -/* C78890 80241BB0 8EC20088 */ lw $v0, 0x88($s6) -/* C78894 80241BB4 14400010 */ bnez $v0, .L80241BF8 -/* C78898 80241BB8 46000606 */ mov.s $f24, $f0 -/* C7889C 80241BBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C788A0 80241BC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C788A4 80241BC4 804300B4 */ lb $v1, 0xb4($v0) -/* C788A8 80241BC8 3C014200 */ lui $at, 0x4200 -/* C788AC 80241BCC 4481A000 */ mtc1 $at, $f20 -/* C788B0 80241BD0 10600016 */ beqz $v1, .L80241C2C -/* C788B4 80241BD4 24020001 */ addiu $v0, $zero, 1 -/* C788B8 80241BD8 3C0142C8 */ lui $at, 0x42c8 -/* C788BC 80241BDC 4481A000 */ mtc1 $at, $f20 -/* C788C0 80241BE0 14620013 */ bne $v1, $v0, .L80241C30 -/* C788C4 80241BE4 26300038 */ addiu $s0, $s1, 0x38 -/* C788C8 80241BE8 3C0142B4 */ lui $at, 0x42b4 -/* C788CC 80241BEC 4481A000 */ mtc1 $at, $f20 -/* C788D0 80241BF0 0809070D */ j .L80241C34 -/* C788D4 80241BF4 0200202D */ daddu $a0, $s0, $zero -.L80241BF8: -/* C788D8 80241BF8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C788DC 80241BFC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C788E0 80241C00 804300B4 */ lb $v1, 0xb4($v0) -/* C788E4 80241C04 3C014218 */ lui $at, 0x4218 -/* C788E8 80241C08 4481A000 */ mtc1 $at, $f20 -/* C788EC 80241C0C 10600007 */ beqz $v1, .L80241C2C -/* C788F0 80241C10 24020001 */ addiu $v0, $zero, 1 -/* C788F4 80241C14 3C0142B4 */ lui $at, 0x42b4 -/* C788F8 80241C18 4481A000 */ mtc1 $at, $f20 -/* C788FC 80241C1C 14620004 */ bne $v1, $v0, .L80241C30 -/* C78900 80241C20 26300038 */ addiu $s0, $s1, 0x38 -/* C78904 80241C24 3C014296 */ lui $at, 0x4296 -/* C78908 80241C28 4481A000 */ mtc1 $at, $f20 -.L80241C2C: -/* C7890C 80241C2C 26300038 */ addiu $s0, $s1, 0x38 -.L80241C30: -/* C78910 80241C30 0200202D */ daddu $a0, $s0, $zero -.L80241C34: -/* C78914 80241C34 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* C78918 80241C38 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* C7891C 80241C3C 4407C000 */ mfc1 $a3, $f24 -/* C78920 80241C40 862200A6 */ lh $v0, 0xa6($s1) -/* C78924 80241C44 8EA30000 */ lw $v1, ($s5) -/* C78928 80241C48 44824000 */ mtc1 $v0, $f8 -/* C7892C 80241C4C 00000000 */ nop -/* C78930 80241C50 46804220 */ cvt.s.w $f8, $f8 -/* C78934 80241C54 C4600028 */ lwc1 $f0, 0x28($v1) -/* C78938 80241C58 44064000 */ mfc1 $a2, $f8 -/* C7893C 80241C5C 26330040 */ addiu $s3, $s1, 0x40 -/* C78940 80241C60 E6200038 */ swc1 $f0, 0x38($s1) -/* C78944 80241C64 C4600030 */ lwc1 $f0, 0x30($v1) -/* C78948 80241C68 0260282D */ daddu $a1, $s3, $zero -/* C7894C 80241C6C 0C00A7E7 */ jal add_vec2D_polar -/* C78950 80241C70 E6200040 */ swc1 $f0, 0x40($s1) -/* C78954 80241C74 862200A6 */ lh $v0, 0xa6($s1) -/* C78958 80241C78 44820000 */ mtc1 $v0, $f0 -/* C7895C 80241C7C 00000000 */ nop -/* C78960 80241C80 46800020 */ cvt.s.w $f0, $f0 -/* C78964 80241C84 4600A000 */ add.s $f0, $f20, $f0 -/* C78968 80241C88 4406B000 */ mfc1 $a2, $f22 -/* C7896C 80241C8C 44050000 */ mfc1 $a1, $f0 -/* C78970 80241C90 0C00EA95 */ jal npc_move_heading -/* C78974 80241C94 0220202D */ daddu $a0, $s1, $zero -/* C78978 80241C98 8EC20088 */ lw $v0, 0x88($s6) -/* C7897C 80241C9C 1440005D */ bnez $v0, .L80241E14 -/* C78980 80241CA0 00000000 */ nop -/* C78984 80241CA4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C78988 80241CA8 3C018024 */ lui $at, %hi(D_80247408_C7E0E8) -/* C7898C 80241CAC D4247408 */ ldc1 $f4, %lo(D_80247408_C7E0E8)($at) -/* C78990 80241CB0 46000021 */ cvt.d.s $f0, $f0 -/* C78994 80241CB4 4620203C */ c.lt.d $f4, $f0 -/* C78998 80241CB8 00000000 */ nop -/* C7899C 80241CBC 45000005 */ bc1f .L80241CD4 -/* C789A0 80241CC0 00000000 */ nop -/* C789A4 80241CC4 3C0143BE */ lui $at, 0x43be -/* C789A8 80241CC8 44810000 */ mtc1 $at, $f0 -/* C789AC 80241CCC 00000000 */ nop -/* C789B0 80241CD0 E6200038 */ swc1 $f0, 0x38($s1) -.L80241CD4: -/* C789B4 80241CD4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C789B8 80241CD8 3C018024 */ lui $at, %hi(D_80247410_C7E0F0) -/* C789BC 80241CDC D4227410 */ ldc1 $f2, %lo(D_80247410_C7E0F0)($at) -/* C789C0 80241CE0 46000021 */ cvt.d.s $f0, $f0 -/* C789C4 80241CE4 4622003C */ c.lt.d $f0, $f2 -/* C789C8 80241CE8 00000000 */ nop -/* C789CC 80241CEC 45000005 */ bc1f .L80241D04 -/* C789D0 80241CF0 00000000 */ nop -/* C789D4 80241CF4 3C01C3BE */ lui $at, 0xc3be -/* C789D8 80241CF8 44810000 */ mtc1 $at, $f0 -/* C789DC 80241CFC 00000000 */ nop -/* C789E0 80241D00 E6200038 */ swc1 $f0, 0x38($s1) -.L80241D04: -/* C789E4 80241D04 C6200040 */ lwc1 $f0, 0x40($s1) -/* C789E8 80241D08 46000021 */ cvt.d.s $f0, $f0 -/* C789EC 80241D0C 4620203C */ c.lt.d $f4, $f0 -/* C789F0 80241D10 00000000 */ nop -/* C789F4 80241D14 45000005 */ bc1f .L80241D2C -/* C789F8 80241D18 00000000 */ nop -/* C789FC 80241D1C 3C0143BE */ lui $at, 0x43be -/* C78A00 80241D20 44810000 */ mtc1 $at, $f0 -/* C78A04 80241D24 00000000 */ nop -/* C78A08 80241D28 E6200040 */ swc1 $f0, 0x40($s1) -.L80241D2C: -/* C78A0C 80241D2C C6200040 */ lwc1 $f0, 0x40($s1) -/* C78A10 80241D30 46000021 */ cvt.d.s $f0, $f0 -/* C78A14 80241D34 4622003C */ c.lt.d $f0, $f2 -/* C78A18 80241D38 00000000 */ nop -/* C78A1C 80241D3C 45000005 */ bc1f .L80241D54 -/* C78A20 80241D40 00000000 */ nop -/* C78A24 80241D44 3C01C3BE */ lui $at, 0xc3be -/* C78A28 80241D48 44810000 */ mtc1 $at, $f0 -/* C78A2C 80241D4C 00000000 */ nop -/* C78A30 80241D50 E6200040 */ swc1 $f0, 0x40($s1) -.L80241D54: -/* C78A34 80241D54 C6220038 */ lwc1 $f2, 0x38($s1) -/* C78A38 80241D58 46021082 */ mul.s $f2, $f2, $f2 -/* C78A3C 80241D5C 00000000 */ nop -/* C78A40 80241D60 C6200040 */ lwc1 $f0, 0x40($s1) -/* C78A44 80241D64 46000002 */ mul.s $f0, $f0, $f0 -/* C78A48 80241D68 00000000 */ nop -/* C78A4C 80241D6C 46001300 */ add.s $f12, $f2, $f0 -/* C78A50 80241D70 46006004 */ sqrt.s $f0, $f12 -/* C78A54 80241D74 46000032 */ c.eq.s $f0, $f0 -/* C78A58 80241D78 00000000 */ nop -/* C78A5C 80241D7C 45010003 */ bc1t .L80241D8C -/* C78A60 80241D80 00000000 */ nop -/* C78A64 80241D84 0C0187BC */ jal sqrtf -/* C78A68 80241D88 00000000 */ nop -.L80241D8C: -/* C78A6C 80241D8C 8E260038 */ lw $a2, 0x38($s1) -/* C78A70 80241D90 8E270040 */ lw $a3, 0x40($s1) -/* C78A74 80241D94 4480A000 */ mtc1 $zero, $f20 -/* C78A78 80241D98 E7A00038 */ swc1 $f0, 0x38($sp) -/* C78A7C 80241D9C 4600A306 */ mov.s $f12, $f20 -/* C78A80 80241DA0 0C00A720 */ jal atan2 -/* C78A84 80241DA4 4600A386 */ mov.s $f14, $f20 -/* C78A88 80241DA8 46000586 */ mov.s $f22, $f0 -/* C78A8C 80241DAC C7A20038 */ lwc1 $f2, 0x38($sp) -/* C78A90 80241DB0 3C018024 */ lui $at, %hi(D_80247418_C7E0F8) -/* C78A94 80241DB4 D4207418 */ ldc1 $f0, %lo(D_80247418_C7E0F8)($at) -/* C78A98 80241DB8 460010A1 */ cvt.d.s $f2, $f2 -/* C78A9C 80241DBC 4620103C */ c.lt.d $f2, $f0 -/* C78AA0 80241DC0 00000000 */ nop -/* C78AA4 80241DC4 45000004 */ bc1f .L80241DD8 -/* C78AA8 80241DC8 0200202D */ daddu $a0, $s0, $zero -/* C78AAC 80241DCC 3C064398 */ lui $a2, 0x4398 -/* C78AB0 80241DD0 0809077E */ j .L80241DF8 -/* C78AB4 80241DD4 34C68000 */ ori $a2, $a2, 0x8000 -.L80241DD8: -/* C78AB8 80241DD8 3C018024 */ lui $at, %hi(D_80247420_C7E100) -/* C78ABC 80241DDC D4207420 */ ldc1 $f0, %lo(D_80247420_C7E100)($at) -/* C78AC0 80241DE0 4622003C */ c.lt.d $f0, $f2 -/* C78AC4 80241DE4 00000000 */ nop -/* C78AC8 80241DE8 450000FA */ bc1f .L802421D4 -/* C78ACC 80241DEC 00000000 */ nop -/* C78AD0 80241DF0 3C0643BB */ lui $a2, 0x43bb -/* C78AD4 80241DF4 34C68000 */ ori $a2, $a2, 0x8000 -.L80241DF8: -/* C78AD8 80241DF8 4407B000 */ mfc1 $a3, $f22 -/* C78ADC 80241DFC 0260282D */ daddu $a1, $s3, $zero -/* C78AE0 80241E00 E6340038 */ swc1 $f20, 0x38($s1) -/* C78AE4 80241E04 0C00A7E7 */ jal add_vec2D_polar -/* C78AE8 80241E08 E6340040 */ swc1 $f20, 0x40($s1) -/* C78AEC 80241E0C 08090875 */ j .L802421D4 -/* C78AF0 80241E10 00000000 */ nop -.L80241E14: -/* C78AF4 80241E14 8E220000 */ lw $v0, ($s1) -/* C78AF8 80241E18 30420040 */ andi $v0, $v0, 0x40 -/* C78AFC 80241E1C 144000B0 */ bnez $v0, .L802420E0 -/* C78B00 80241E20 27A50020 */ addiu $a1, $sp, 0x20 -/* C78B04 80241E24 27B40020 */ addiu $s4, $sp, 0x20 -/* C78B08 80241E28 0280282D */ daddu $a1, $s4, $zero -/* C78B0C 80241E2C 27B30024 */ addiu $s3, $sp, 0x24 -/* C78B10 80241E30 8EA20000 */ lw $v0, ($s5) -/* C78B14 80241E34 3C014032 */ lui $at, 0x4032 -/* C78B18 80241E38 44811800 */ mtc1 $at, $f3 -/* C78B1C 80241E3C 44801000 */ mtc1 $zero, $f2 -/* C78B20 80241E40 C440002C */ lwc1 $f0, 0x2c($v0) -/* C78B24 80241E44 C4460028 */ lwc1 $f6, 0x28($v0) -/* C78B28 80241E48 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78B2C 80241E4C 46000021 */ cvt.d.s $f0, $f0 -/* C78B30 80241E50 46220000 */ add.d $f0, $f0, $f2 -/* C78B34 80241E54 E7A60020 */ swc1 $f6, 0x20($sp) -/* C78B38 80241E58 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78B3C 80241E5C 46200020 */ cvt.s.d $f0, $f0 -/* C78B40 80241E60 E7A00024 */ swc1 $f0, 0x24($sp) -/* C78B44 80241E64 E7B40010 */ swc1 $f20, 0x10($sp) -/* C78B48 80241E68 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78B4C 80241E6C 862200A8 */ lh $v0, 0xa8($s1) -/* C78B50 80241E70 0260302D */ daddu $a2, $s3, $zero -/* C78B54 80241E74 44820000 */ mtc1 $v0, $f0 -/* C78B58 80241E78 00000000 */ nop -/* C78B5C 80241E7C 46800020 */ cvt.s.w $f0, $f0 -/* C78B60 80241E80 E7A00018 */ swc1 $f0, 0x18($sp) -/* C78B64 80241E84 862200A6 */ lh $v0, 0xa6($s1) -/* C78B68 80241E88 27B00028 */ addiu $s0, $sp, 0x28 -/* C78B6C 80241E8C 44820000 */ mtc1 $v0, $f0 -/* C78B70 80241E90 00000000 */ nop -/* C78B74 80241E94 46800020 */ cvt.s.w $f0, $f0 -/* C78B78 80241E98 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78B7C 80241E9C 8E240080 */ lw $a0, 0x80($s1) -/* C78B80 80241EA0 0C037711 */ jal npc_test_move_simple_with_slipping -/* C78B84 80241EA4 0200382D */ daddu $a3, $s0, $zero -/* C78B88 80241EA8 104000CA */ beqz $v0, .L802421D4 -/* C78B8C 80241EAC 0280282D */ daddu $a1, $s4, $zero -/* C78B90 80241EB0 8EA20000 */ lw $v0, ($s5) -/* C78B94 80241EB4 3C018024 */ lui $at, %hi(D_80247428_C7E108) -/* C78B98 80241EB8 D4227428 */ ldc1 $f2, %lo(D_80247428_C7E108)($at) -/* C78B9C 80241EBC C440002C */ lwc1 $f0, 0x2c($v0) -/* C78BA0 80241EC0 C4460028 */ lwc1 $f6, 0x28($v0) -/* C78BA4 80241EC4 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78BA8 80241EC8 46000021 */ cvt.d.s $f0, $f0 -/* C78BAC 80241ECC 46220000 */ add.d $f0, $f0, $f2 -/* C78BB0 80241ED0 E7A60020 */ swc1 $f6, 0x20($sp) -/* C78BB4 80241ED4 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78BB8 80241ED8 46200020 */ cvt.s.d $f0, $f0 -/* C78BBC 80241EDC E7A00024 */ swc1 $f0, 0x24($sp) -/* C78BC0 80241EE0 E7B40010 */ swc1 $f20, 0x10($sp) -/* C78BC4 80241EE4 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78BC8 80241EE8 862200A8 */ lh $v0, 0xa8($s1) -/* C78BCC 80241EEC 44820000 */ mtc1 $v0, $f0 -/* C78BD0 80241EF0 00000000 */ nop -/* C78BD4 80241EF4 46800020 */ cvt.s.w $f0, $f0 -/* C78BD8 80241EF8 E7A00018 */ swc1 $f0, 0x18($sp) -/* C78BDC 80241EFC 862200A6 */ lh $v0, 0xa6($s1) -/* C78BE0 80241F00 0260302D */ daddu $a2, $s3, $zero -/* C78BE4 80241F04 44820000 */ mtc1 $v0, $f0 -/* C78BE8 80241F08 00000000 */ nop -/* C78BEC 80241F0C 46800020 */ cvt.s.w $f0, $f0 -/* C78BF0 80241F10 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78BF4 80241F14 8E240080 */ lw $a0, 0x80($s1) -/* C78BF8 80241F18 0C037711 */ jal npc_test_move_simple_with_slipping -/* C78BFC 80241F1C 0200382D */ daddu $a3, $s0, $zero -/* C78C00 80241F20 27A5002C */ addiu $a1, $sp, 0x2c -/* C78C04 80241F24 27A60030 */ addiu $a2, $sp, 0x30 -/* C78C08 80241F28 27A70034 */ addiu $a3, $sp, 0x34 -/* C78C0C 80241F2C 27A30038 */ addiu $v1, $sp, 0x38 -/* C78C10 80241F30 C6220038 */ lwc1 $f2, 0x38($s1) -/* C78C14 80241F34 C620003C */ lwc1 $f0, 0x3c($s1) -/* C78C18 80241F38 3C014348 */ lui $at, 0x4348 -/* C78C1C 80241F3C 44813000 */ mtc1 $at, $f6 -/* C78C20 80241F40 46000021 */ cvt.d.s $f0, $f0 -/* C78C24 80241F44 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C78C28 80241F48 3C014059 */ lui $at, 0x4059 -/* C78C2C 80241F4C 44811800 */ mtc1 $at, $f3 -/* C78C30 80241F50 44801000 */ mtc1 $zero, $f2 -/* C78C34 80241F54 C6240040 */ lwc1 $f4, 0x40($s1) -/* C78C38 80241F58 46220000 */ add.d $f0, $f0, $f2 -/* C78C3C 80241F5C E7A60038 */ swc1 $f6, 0x38($sp) -/* C78C40 80241F60 E7A40034 */ swc1 $f4, 0x34($sp) -/* C78C44 80241F64 46200020 */ cvt.s.d $f0, $f0 -/* C78C48 80241F68 E7A00030 */ swc1 $f0, 0x30($sp) -/* C78C4C 80241F6C AFA30010 */ sw $v1, 0x10($sp) -/* C78C50 80241F70 8E240080 */ lw $a0, 0x80($s1) -/* C78C54 80241F74 0C0372DF */ jal npc_raycast_down_sides -/* C78C58 80241F78 0040802D */ daddu $s0, $v0, $zero -/* C78C5C 80241F7C 1600001C */ bnez $s0, .L80241FF0 -/* C78C60 80241F80 00000000 */ nop -/* C78C64 80241F84 1040001A */ beqz $v0, .L80241FF0 -/* C78C68 80241F88 00000000 */ nop -/* C78C6C 80241F8C C7A20038 */ lwc1 $f2, 0x38($sp) -/* C78C70 80241F90 3C014054 */ lui $at, 0x4054 -/* C78C74 80241F94 44810800 */ mtc1 $at, $f1 -/* C78C78 80241F98 44800000 */ mtc1 $zero, $f0 -/* C78C7C 80241F9C 460010A1 */ cvt.d.s $f2, $f2 -/* C78C80 80241FA0 4622003C */ c.lt.d $f0, $f2 -/* C78C84 80241FA4 00000000 */ nop -/* C78C88 80241FA8 45000011 */ bc1f .L80241FF0 -/* C78C8C 80241FAC 00000000 */ nop -/* C78C90 80241FB0 3C01405E */ lui $at, 0x405e -/* C78C94 80241FB4 44810800 */ mtc1 $at, $f1 -/* C78C98 80241FB8 44800000 */ mtc1 $zero, $f0 -/* C78C9C 80241FBC 00000000 */ nop -/* C78CA0 80241FC0 4620103C */ c.lt.d $f2, $f0 -/* C78CA4 80241FC4 00000000 */ nop -/* C78CA8 80241FC8 45000009 */ bc1f .L80241FF0 -/* C78CAC 80241FCC 00000000 */ nop -/* C78CB0 80241FD0 C622003C */ lwc1 $f2, 0x3c($s1) -/* C78CB4 80241FD4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C78CB8 80241FD8 46001032 */ c.eq.s $f2, $f0 -/* C78CBC 80241FDC 00000000 */ nop -/* C78CC0 80241FE0 45010003 */ bc1t .L80241FF0 -/* C78CC4 80241FE4 00000000 */ nop -/* C78CC8 80241FE8 08090875 */ j .L802421D4 -/* C78CCC 80241FEC 241E0001 */ addiu $fp, $zero, 1 -.L80241FF0: -/* C78CD0 80241FF0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C78CD4 80241FF4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C78CD8 80241FF8 8E020000 */ lw $v0, ($s0) -/* C78CDC 80241FFC 3C014024 */ lui $at, 0x4024 -/* C78CE0 80242000 44811800 */ mtc1 $at, $f3 -/* C78CE4 80242004 44801000 */ mtc1 $zero, $f2 -/* C78CE8 80242008 C440002C */ lwc1 $f0, 0x2c($v0) -/* C78CEC 8024200C C4460028 */ lwc1 $f6, 0x28($v0) -/* C78CF0 80242010 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78CF4 80242014 46000021 */ cvt.d.s $f0, $f0 -/* C78CF8 80242018 46220000 */ add.d $f0, $f0, $f2 -/* C78CFC 8024201C E7A60020 */ swc1 $f6, 0x20($sp) -/* C78D00 80242020 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78D04 80242024 46200020 */ cvt.s.d $f0, $f0 -/* C78D08 80242028 E7A00024 */ swc1 $f0, 0x24($sp) -/* C78D0C 8024202C E7B40010 */ swc1 $f20, 0x10($sp) -/* C78D10 80242030 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78D14 80242034 862200A8 */ lh $v0, 0xa8($s1) -/* C78D18 80242038 27A50020 */ addiu $a1, $sp, 0x20 -/* C78D1C 8024203C 44820000 */ mtc1 $v0, $f0 -/* C78D20 80242040 00000000 */ nop -/* C78D24 80242044 46800020 */ cvt.s.w $f0, $f0 -/* C78D28 80242048 E7A00018 */ swc1 $f0, 0x18($sp) -/* C78D2C 8024204C 862200A6 */ lh $v0, 0xa6($s1) -/* C78D30 80242050 27A60024 */ addiu $a2, $sp, 0x24 -/* C78D34 80242054 44820000 */ mtc1 $v0, $f0 -/* C78D38 80242058 00000000 */ nop -/* C78D3C 8024205C 46800020 */ cvt.s.w $f0, $f0 -/* C78D40 80242060 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78D44 80242064 8E240080 */ lw $a0, 0x80($s1) -/* C78D48 80242068 0C037711 */ jal npc_test_move_simple_with_slipping -/* C78D4C 8024206C 27A70028 */ addiu $a3, $sp, 0x28 -/* C78D50 80242070 8FA60020 */ lw $a2, 0x20($sp) -/* C78D54 80242074 8E020000 */ lw $v0, ($s0) -/* C78D58 80242078 8FA70028 */ lw $a3, 0x28($sp) -/* C78D5C 8024207C C44C0028 */ lwc1 $f12, 0x28($v0) -/* C78D60 80242080 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C78D64 80242084 0C00A7B5 */ jal dist2D -/* C78D68 80242088 24170001 */ addiu $s7, $zero, 1 -/* C78D6C 8024208C 46000506 */ mov.s $f20, $f0 -/* C78D70 80242090 8E030000 */ lw $v1, ($s0) -/* C78D74 80242094 862200A6 */ lh $v0, 0xa6($s1) -/* C78D78 80242098 4407C000 */ mfc1 $a3, $f24 -/* C78D7C 8024209C 44824000 */ mtc1 $v0, $f8 -/* C78D80 802420A0 00000000 */ nop -/* C78D84 802420A4 46804220 */ cvt.s.w $f8, $f8 -/* C78D88 802420A8 C4600028 */ lwc1 $f0, 0x28($v1) -/* C78D8C 802420AC 44064000 */ mfc1 $a2, $f8 -/* C78D90 802420B0 26240038 */ addiu $a0, $s1, 0x38 -/* C78D94 802420B4 E6200038 */ swc1 $f0, 0x38($s1) -/* C78D98 802420B8 C4600030 */ lwc1 $f0, 0x30($v1) -/* C78D9C 802420BC 26250040 */ addiu $a1, $s1, 0x40 -/* C78DA0 802420C0 0C00A7E7 */ jal add_vec2D_polar -/* C78DA4 802420C4 E6200040 */ swc1 $f0, 0x40($s1) -/* C78DA8 802420C8 862200A6 */ lh $v0, 0xa6($s1) -/* C78DAC 802420CC 44820000 */ mtc1 $v0, $f0 -/* C78DB0 802420D0 00000000 */ nop -/* C78DB4 802420D4 46800020 */ cvt.s.w $f0, $f0 -/* C78DB8 802420D8 08090871 */ j .L802421C4 -/* C78DBC 802420DC 4600A500 */ add.s $f20, $f20, $f0 -.L802420E0: -/* C78DC0 802420E0 8EA20000 */ lw $v0, ($s5) -/* C78DC4 802420E4 3C014032 */ lui $at, 0x4032 -/* C78DC8 802420E8 44811800 */ mtc1 $at, $f3 -/* C78DCC 802420EC 44801000 */ mtc1 $zero, $f2 -/* C78DD0 802420F0 C440002C */ lwc1 $f0, 0x2c($v0) -/* C78DD4 802420F4 C4460028 */ lwc1 $f6, 0x28($v0) -/* C78DD8 802420F8 C4440030 */ lwc1 $f4, 0x30($v0) -/* C78DDC 802420FC 46000021 */ cvt.d.s $f0, $f0 -/* C78DE0 80242100 46220000 */ add.d $f0, $f0, $f2 -/* C78DE4 80242104 E7A60020 */ swc1 $f6, 0x20($sp) -/* C78DE8 80242108 E7A40028 */ swc1 $f4, 0x28($sp) -/* C78DEC 8024210C 46200020 */ cvt.s.d $f0, $f0 -/* C78DF0 80242110 E7A00024 */ swc1 $f0, 0x24($sp) -/* C78DF4 80242114 E7B40010 */ swc1 $f20, 0x10($sp) -/* C78DF8 80242118 E7B60014 */ swc1 $f22, 0x14($sp) -/* C78DFC 8024211C 862200A8 */ lh $v0, 0xa8($s1) -/* C78E00 80242120 44820000 */ mtc1 $v0, $f0 -/* C78E04 80242124 00000000 */ nop -/* C78E08 80242128 46800020 */ cvt.s.w $f0, $f0 -/* C78E0C 8024212C E7A00018 */ swc1 $f0, 0x18($sp) -/* C78E10 80242130 862200A6 */ lh $v0, 0xa6($s1) -/* C78E14 80242134 27A60024 */ addiu $a2, $sp, 0x24 -/* C78E18 80242138 44820000 */ mtc1 $v0, $f0 -/* C78E1C 8024213C 00000000 */ nop -/* C78E20 80242140 46800020 */ cvt.s.w $f0, $f0 -/* C78E24 80242144 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C78E28 80242148 8E240080 */ lw $a0, 0x80($s1) -/* C78E2C 8024214C 0C037711 */ jal npc_test_move_simple_with_slipping -/* C78E30 80242150 27A70028 */ addiu $a3, $sp, 0x28 -/* C78E34 80242154 1040001F */ beqz $v0, .L802421D4 -/* C78E38 80242158 00000000 */ nop -/* C78E3C 8024215C 8FA60020 */ lw $a2, 0x20($sp) -/* C78E40 80242160 8EA20000 */ lw $v0, ($s5) -/* C78E44 80242164 8FA70028 */ lw $a3, 0x28($sp) -/* C78E48 80242168 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C78E4C 8024216C 0C00A7B5 */ jal dist2D -/* C78E50 80242170 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C78E54 80242174 46000506 */ mov.s $f20, $f0 -/* C78E58 80242178 8EA30000 */ lw $v1, ($s5) -/* C78E5C 8024217C 862200A6 */ lh $v0, 0xa6($s1) -/* C78E60 80242180 4407C000 */ mfc1 $a3, $f24 -/* C78E64 80242184 44824000 */ mtc1 $v0, $f8 -/* C78E68 80242188 00000000 */ nop -/* C78E6C 8024218C 46804220 */ cvt.s.w $f8, $f8 -/* C78E70 80242190 C4600028 */ lwc1 $f0, 0x28($v1) -/* C78E74 80242194 44064000 */ mfc1 $a2, $f8 -/* C78E78 80242198 0200202D */ daddu $a0, $s0, $zero -/* C78E7C 8024219C E6200038 */ swc1 $f0, 0x38($s1) -/* C78E80 802421A0 C4600030 */ lwc1 $f0, 0x30($v1) -/* C78E84 802421A4 0260282D */ daddu $a1, $s3, $zero -/* C78E88 802421A8 0C00A7E7 */ jal add_vec2D_polar -/* C78E8C 802421AC E6200040 */ swc1 $f0, 0x40($s1) -/* C78E90 802421B0 862200A6 */ lh $v0, 0xa6($s1) -/* C78E94 802421B4 44820000 */ mtc1 $v0, $f0 -/* C78E98 802421B8 00000000 */ nop -/* C78E9C 802421BC 46800020 */ cvt.s.w $f0, $f0 -/* C78EA0 802421C0 4600A500 */ add.s $f20, $f20, $f0 -.L802421C4: -/* C78EA4 802421C4 4406B000 */ mfc1 $a2, $f22 -/* C78EA8 802421C8 4405A000 */ mfc1 $a1, $f20 -/* C78EAC 802421CC 0C00EA95 */ jal npc_move_heading -/* C78EB0 802421D0 0220202D */ daddu $a0, $s1, $zero -.L802421D4: -/* C78EB4 802421D4 C6400008 */ lwc1 $f0, 8($s2) -/* C78EB8 802421D8 46800020 */ cvt.s.w $f0, $f0 -/* C78EBC 802421DC 44050000 */ mfc1 $a1, $f0 -/* C78EC0 802421E0 C640000C */ lwc1 $f0, 0xc($s2) -/* C78EC4 802421E4 46800020 */ cvt.s.w $f0, $f0 -/* C78EC8 802421E8 44060000 */ mfc1 $a2, $f0 -/* C78ECC 802421EC C6200040 */ lwc1 $f0, 0x40($s1) -/* C78ED0 802421F0 26300038 */ addiu $s0, $s1, 0x38 -/* C78ED4 802421F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C78ED8 802421F8 C6400010 */ lwc1 $f0, 0x10($s2) -/* C78EDC 802421FC 46800020 */ cvt.s.w $f0, $f0 -/* C78EE0 80242200 E7A00014 */ swc1 $f0, 0x14($sp) -/* C78EE4 80242204 C6400014 */ lwc1 $f0, 0x14($s2) -/* C78EE8 80242208 46800020 */ cvt.s.w $f0, $f0 -/* C78EEC 8024220C E7A00018 */ swc1 $f0, 0x18($sp) -/* C78EF0 80242210 8E440004 */ lw $a0, 4($s2) -/* C78EF4 80242214 8E270038 */ lw $a3, 0x38($s1) -/* C78EF8 80242218 0C0123F5 */ jal is_point_within_region -/* C78EFC 8024221C 26330040 */ addiu $s3, $s1, 0x40 -/* C78F00 80242220 1040005A */ beqz $v0, .L8024238C -/* C78F04 80242224 00000000 */ nop -/* C78F08 80242228 8E430004 */ lw $v1, 4($s2) -/* C78F0C 8024222C 10600005 */ beqz $v1, .L80242244 -/* C78F10 80242230 24020001 */ addiu $v0, $zero, 1 -/* C78F14 80242234 10620029 */ beq $v1, $v0, .L802422DC -/* C78F18 80242238 00000000 */ nop -/* C78F1C 8024223C 080908E3 */ j .L8024238C -/* C78F20 80242240 00000000 */ nop -.L80242244: -/* C78F24 80242244 C6480008 */ lwc1 $f8, 8($s2) -/* C78F28 80242248 46804220 */ cvt.s.w $f8, $f8 -/* C78F2C 8024224C 44064000 */ mfc1 $a2, $f8 -/* C78F30 80242250 C648000C */ lwc1 $f8, 0xc($s2) -/* C78F34 80242254 46804220 */ cvt.s.w $f8, $f8 -/* C78F38 80242258 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C78F3C 8024225C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C78F40 80242260 44074000 */ mfc1 $a3, $f8 -/* C78F44 80242264 0C00A7B5 */ jal dist2D -/* C78F48 80242268 00000000 */ nop -/* C78F4C 8024226C C6420010 */ lwc1 $f2, 0x10($s2) -/* C78F50 80242270 468010A0 */ cvt.s.w $f2, $f2 -/* C78F54 80242274 4600103C */ c.lt.s $f2, $f0 -/* C78F58 80242278 00000000 */ nop -/* C78F5C 8024227C 45000043 */ bc1f .L8024238C -/* C78F60 80242280 E7A00038 */ swc1 $f0, 0x38($sp) -/* C78F64 80242284 C64C0008 */ lwc1 $f12, 8($s2) -/* C78F68 80242288 46806320 */ cvt.s.w $f12, $f12 -/* C78F6C 8024228C 8E260038 */ lw $a2, 0x38($s1) -/* C78F70 80242290 8E270040 */ lw $a3, 0x40($s1) -/* C78F74 80242294 C64E000C */ lwc1 $f14, 0xc($s2) -/* C78F78 80242298 0C00A720 */ jal atan2 -/* C78F7C 8024229C 468073A0 */ cvt.s.w $f14, $f14 -/* C78F80 802422A0 0200202D */ daddu $a0, $s0, $zero -/* C78F84 802422A4 44070000 */ mfc1 $a3, $f0 -/* C78F88 802422A8 C6400008 */ lwc1 $f0, 8($s2) -/* C78F8C 802422AC 46800020 */ cvt.s.w $f0, $f0 -/* C78F90 802422B0 E6200038 */ swc1 $f0, 0x38($s1) -/* C78F94 802422B4 C640000C */ lwc1 $f0, 0xc($s2) -/* C78F98 802422B8 46800020 */ cvt.s.w $f0, $f0 -/* C78F9C 802422BC E6200040 */ swc1 $f0, 0x40($s1) -/* C78FA0 802422C0 C6480010 */ lwc1 $f8, 0x10($s2) -/* C78FA4 802422C4 46804220 */ cvt.s.w $f8, $f8 -/* C78FA8 802422C8 44064000 */ mfc1 $a2, $f8 -/* C78FAC 802422CC 0C00A7E7 */ jal add_vec2D_polar -/* C78FB0 802422D0 0260282D */ daddu $a1, $s3, $zero -/* C78FB4 802422D4 080908E3 */ j .L8024238C -/* C78FB8 802422D8 00000000 */ nop -.L802422DC: -/* C78FBC 802422DC 8E420008 */ lw $v0, 8($s2) -/* C78FC0 802422E0 8E430010 */ lw $v1, 0x10($s2) -/* C78FC4 802422E4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C78FC8 802422E8 00431021 */ addu $v0, $v0, $v1 -/* C78FCC 802422EC 44821000 */ mtc1 $v0, $f2 -/* C78FD0 802422F0 00000000 */ nop -/* C78FD4 802422F4 468010A0 */ cvt.s.w $f2, $f2 -/* C78FD8 802422F8 4600103C */ c.lt.s $f2, $f0 -/* C78FDC 802422FC 00000000 */ nop -/* C78FE0 80242300 45030001 */ bc1tl .L80242308 -/* C78FE4 80242304 E6220038 */ swc1 $f2, 0x38($s1) -.L80242308: -/* C78FE8 80242308 8E420008 */ lw $v0, 8($s2) -/* C78FEC 8024230C 8E430010 */ lw $v1, 0x10($s2) -/* C78FF0 80242310 C6200038 */ lwc1 $f0, 0x38($s1) -/* C78FF4 80242314 00431023 */ subu $v0, $v0, $v1 -/* C78FF8 80242318 44821000 */ mtc1 $v0, $f2 -/* C78FFC 8024231C 00000000 */ nop -/* C79000 80242320 468010A0 */ cvt.s.w $f2, $f2 -/* C79004 80242324 4602003C */ c.lt.s $f0, $f2 -/* C79008 80242328 00000000 */ nop -/* C7900C 8024232C 45030001 */ bc1tl .L80242334 -/* C79010 80242330 E6220038 */ swc1 $f2, 0x38($s1) -.L80242334: -/* C79014 80242334 8E42000C */ lw $v0, 0xc($s2) -/* C79018 80242338 8E430014 */ lw $v1, 0x14($s2) -/* C7901C 8024233C C6200040 */ lwc1 $f0, 0x40($s1) -/* C79020 80242340 00431021 */ addu $v0, $v0, $v1 -/* C79024 80242344 44821000 */ mtc1 $v0, $f2 -/* C79028 80242348 00000000 */ nop -/* C7902C 8024234C 468010A0 */ cvt.s.w $f2, $f2 -/* C79030 80242350 4600103C */ c.lt.s $f2, $f0 -/* C79034 80242354 00000000 */ nop -/* C79038 80242358 45030001 */ bc1tl .L80242360 -/* C7903C 8024235C E6220040 */ swc1 $f2, 0x40($s1) -.L80242360: -/* C79040 80242360 8E42000C */ lw $v0, 0xc($s2) -/* C79044 80242364 8E430014 */ lw $v1, 0x14($s2) -/* C79048 80242368 C6200040 */ lwc1 $f0, 0x40($s1) -/* C7904C 8024236C 00431023 */ subu $v0, $v0, $v1 -/* C79050 80242370 44821000 */ mtc1 $v0, $f2 -/* C79054 80242374 00000000 */ nop -/* C79058 80242378 468010A0 */ cvt.s.w $f2, $f2 -/* C7905C 8024237C 4602003C */ c.lt.s $f0, $f2 -/* C79060 80242380 00000000 */ nop -/* C79064 80242384 45030001 */ bc1tl .L8024238C -/* C79068 80242388 E6220040 */ swc1 $f2, 0x40($s1) -.L8024238C: -/* C7906C 8024238C 16E0001F */ bnez $s7, .L8024240C -/* C79070 80242390 00000000 */ nop -/* C79074 80242394 8E220000 */ lw $v0, ($s1) -/* C79078 80242398 30420008 */ andi $v0, $v0, 8 -/* C7907C 8024239C 10400003 */ beqz $v0, .L802423AC -/* C79080 802423A0 27A50020 */ addiu $a1, $sp, 0x20 -/* C79084 802423A4 13C00019 */ beqz $fp, .L8024240C -/* C79088 802423A8 00000000 */ nop -.L802423AC: -/* C7908C 802423AC 27A60024 */ addiu $a2, $sp, 0x24 -/* C79090 802423B0 27A20038 */ addiu $v0, $sp, 0x38 -/* C79094 802423B4 C6220038 */ lwc1 $f2, 0x38($s1) -/* C79098 802423B8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C7909C 802423BC 3C0143C8 */ lui $at, 0x43c8 -/* C790A0 802423C0 44813000 */ mtc1 $at, $f6 -/* C790A4 802423C4 46000021 */ cvt.d.s $f0, $f0 -/* C790A8 802423C8 E7A20020 */ swc1 $f2, 0x20($sp) -/* C790AC 802423CC 3C018024 */ lui $at, %hi(D_80247430_C7E110) -/* C790B0 802423D0 D4227430 */ ldc1 $f2, %lo(D_80247430_C7E110)($at) -/* C790B4 802423D4 C6240040 */ lwc1 $f4, 0x40($s1) -/* C790B8 802423D8 46220000 */ add.d $f0, $f0, $f2 -/* C790BC 802423DC E7A60038 */ swc1 $f6, 0x38($sp) -/* C790C0 802423E0 E7A40028 */ swc1 $f4, 0x28($sp) -/* C790C4 802423E4 46200020 */ cvt.s.d $f0, $f0 -/* C790C8 802423E8 E7A00024 */ swc1 $f0, 0x24($sp) -/* C790CC 802423EC AFA20010 */ sw $v0, 0x10($sp) -/* C790D0 802423F0 8E240080 */ lw $a0, 0x80($s1) -/* C790D4 802423F4 0C0372DF */ jal npc_raycast_down_sides -/* C790D8 802423F8 27A70028 */ addiu $a3, $sp, 0x28 -/* C790DC 802423FC 10400003 */ beqz $v0, .L8024240C -/* C790E0 80242400 00000000 */ nop -/* C790E4 80242404 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C790E8 80242408 E620003C */ swc1 $f0, 0x3c($s1) -.L8024240C: -/* C790EC 8024240C C62C0038 */ lwc1 $f12, 0x38($s1) -/* C790F0 80242410 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C790F4 80242414 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C790F8 80242418 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C790FC 8024241C 8C460028 */ lw $a2, 0x28($v0) -/* C79100 80242420 0C00A720 */ jal atan2 -/* C79104 80242424 8C470030 */ lw $a3, 0x30($v0) -/* C79108 80242428 0220202D */ daddu $a0, $s1, $zero -/* C7910C 8024242C 24050321 */ addiu $a1, $zero, 0x321 -/* C79110 80242430 0000302D */ daddu $a2, $zero, $zero -/* C79114 80242434 0C012530 */ jal ai_enemy_play_sound -/* C79118 80242438 E620000C */ swc1 $f0, 0xc($s1) -/* C7911C 8024243C 8EC200CC */ lw $v0, 0xcc($s6) -/* C79120 80242440 8C420024 */ lw $v0, 0x24($v0) -/* C79124 80242444 AE220028 */ sw $v0, 0x28($s1) -/* C79128 80242448 96C20096 */ lhu $v0, 0x96($s6) -/* C7912C 8024244C A622008E */ sh $v0, 0x8e($s1) -/* C79130 80242450 8FA80080 */ lw $t0, 0x80($sp) -/* C79134 80242454 2402000B */ addiu $v0, $zero, 0xb -/* C79138 80242458 AD020070 */ sw $v0, 0x70($t0) -.L8024245C: -/* C7913C 8024245C 8FBF0064 */ lw $ra, 0x64($sp) -/* C79140 80242460 8FBE0060 */ lw $fp, 0x60($sp) -/* C79144 80242464 8FB7005C */ lw $s7, 0x5c($sp) -/* C79148 80242468 8FB60058 */ lw $s6, 0x58($sp) -/* C7914C 8024246C 8FB50054 */ lw $s5, 0x54($sp) -/* C79150 80242470 8FB40050 */ lw $s4, 0x50($sp) -/* C79154 80242474 8FB3004C */ lw $s3, 0x4c($sp) -/* C79158 80242478 8FB20048 */ lw $s2, 0x48($sp) -/* C7915C 8024247C 8FB10044 */ lw $s1, 0x44($sp) -/* C79160 80242480 8FB00040 */ lw $s0, 0x40($sp) -/* C79164 80242484 D7B80078 */ ldc1 $f24, 0x78($sp) -/* C79168 80242488 D7B60070 */ ldc1 $f22, 0x70($sp) -/* C7916C 8024248C D7B40068 */ ldc1 $f20, 0x68($sp) -/* C79170 80242490 03E00008 */ jr $ra -/* C79174 80242494 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s deleted file mode 100644 index 8ddd5f9289..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242774_C79454 -/* C79454 80242774 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C79458 80242778 AFB20038 */ sw $s2, 0x38($sp) -/* C7945C 8024277C 0080902D */ daddu $s2, $a0, $zero -/* C79460 80242780 AFBF0048 */ sw $ra, 0x48($sp) -/* C79464 80242784 AFB50044 */ sw $s5, 0x44($sp) -/* C79468 80242788 AFB40040 */ sw $s4, 0x40($sp) -/* C7946C 8024278C AFB3003C */ sw $s3, 0x3c($sp) -/* C79470 80242790 AFB10034 */ sw $s1, 0x34($sp) -/* C79474 80242794 AFB00030 */ sw $s0, 0x30($sp) -/* C79478 80242798 8E510148 */ lw $s1, 0x148($s2) -/* C7947C 8024279C 86240008 */ lh $a0, 8($s1) -/* C79480 802427A0 0C00EABB */ jal get_npc_unsafe -/* C79484 802427A4 00A0802D */ daddu $s0, $a1, $zero -/* C79488 802427A8 8E43000C */ lw $v1, 0xc($s2) -/* C7948C 802427AC 0240202D */ daddu $a0, $s2, $zero -/* C79490 802427B0 8C650000 */ lw $a1, ($v1) -/* C79494 802427B4 0C0B1EAF */ jal evt_get_variable -/* C79498 802427B8 0040A82D */ daddu $s5, $v0, $zero -/* C7949C 802427BC AFA00010 */ sw $zero, 0x10($sp) -/* C794A0 802427C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794A4 802427C4 8C630030 */ lw $v1, 0x30($v1) -/* C794A8 802427C8 AFA30014 */ sw $v1, 0x14($sp) -/* C794AC 802427CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794B0 802427D0 8C63001C */ lw $v1, 0x1c($v1) -/* C794B4 802427D4 AFA30018 */ sw $v1, 0x18($sp) -/* C794B8 802427D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794BC 802427DC 8C630024 */ lw $v1, 0x24($v1) -/* C794C0 802427E0 AFA3001C */ sw $v1, 0x1c($sp) -/* C794C4 802427E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794C8 802427E8 8C630028 */ lw $v1, 0x28($v1) -/* C794CC 802427EC 27B40010 */ addiu $s4, $sp, 0x10 -/* C794D0 802427F0 AFA30020 */ sw $v1, 0x20($sp) -/* C794D4 802427F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794D8 802427F8 3C014348 */ lui $at, 0x4348 -/* C794DC 802427FC 44810000 */ mtc1 $at, $f0 -/* C794E0 80242800 8C63002C */ lw $v1, 0x2c($v1) -/* C794E4 80242804 0040982D */ daddu $s3, $v0, $zero -/* C794E8 80242808 E7A00028 */ swc1 $f0, 0x28($sp) -/* C794EC 8024280C A7A0002C */ sh $zero, 0x2c($sp) -/* C794F0 80242810 16000005 */ bnez $s0, .L80242828 -/* C794F4 80242814 AFA30024 */ sw $v1, 0x24($sp) -/* C794F8 80242818 8E2200B0 */ lw $v0, 0xb0($s1) -/* C794FC 8024281C 30420004 */ andi $v0, $v0, 4 -/* C79500 80242820 10400011 */ beqz $v0, .L80242868 -/* C79504 80242824 00000000 */ nop -.L80242828: -/* C79508 80242828 AE400070 */ sw $zero, 0x70($s2) -/* C7950C 8024282C A6A0008E */ sh $zero, 0x8e($s5) -/* C79510 80242830 8E2200CC */ lw $v0, 0xcc($s1) -/* C79514 80242834 8C420000 */ lw $v0, ($v0) -/* C79518 80242838 AEA20028 */ sw $v0, 0x28($s5) -/* C7951C 8024283C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79520 80242840 30420004 */ andi $v0, $v0, 4 -/* C79524 80242844 10400008 */ beqz $v0, .L80242868 -/* C79528 80242848 AE20006C */ sw $zero, 0x6c($s1) -/* C7952C 8024284C 24020063 */ addiu $v0, $zero, 0x63 -/* C79530 80242850 AE420070 */ sw $v0, 0x70($s2) -/* C79534 80242854 AE400074 */ sw $zero, 0x74($s2) -/* C79538 80242858 8E2200B0 */ lw $v0, 0xb0($s1) -/* C7953C 8024285C 2403FFFB */ addiu $v1, $zero, -5 -/* C79540 80242860 00431024 */ and $v0, $v0, $v1 -/* C79544 80242864 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242868: -/* C79548 80242868 8E430070 */ lw $v1, 0x70($s2) -/* C7954C 8024286C 2410000B */ addiu $s0, $zero, 0xb -/* C79550 80242870 1070002A */ beq $v1, $s0, .L8024291C -/* C79554 80242874 2862000C */ slti $v0, $v1, 0xc -/* C79558 80242878 1040000D */ beqz $v0, .L802428B0 -/* C7955C 8024287C 24020001 */ addiu $v0, $zero, 1 -/* C79560 80242880 1062001A */ beq $v1, $v0, .L802428EC -/* C79564 80242884 28620002 */ slti $v0, $v1, 2 -/* C79568 80242888 10400005 */ beqz $v0, .L802428A0 -/* C7956C 8024288C 2402000A */ addiu $v0, $zero, 0xa -/* C79570 80242890 10600013 */ beqz $v1, .L802428E0 -/* C79574 80242894 0240202D */ daddu $a0, $s2, $zero -/* C79578 80242898 08090A67 */ j .L8024299C -/* C7957C 8024289C 00000000 */ nop -.L802428A0: -/* C79580 802428A0 10620018 */ beq $v1, $v0, .L80242904 -/* C79584 802428A4 0240202D */ daddu $a0, $s2, $zero -/* C79588 802428A8 08090A67 */ j .L8024299C -/* C7958C 802428AC 00000000 */ nop -.L802428B0: -/* C79590 802428B0 2402000D */ addiu $v0, $zero, 0xd -/* C79594 802428B4 10620029 */ beq $v1, $v0, .L8024295C -/* C79598 802428B8 0062102A */ slt $v0, $v1, $v0 -/* C7959C 802428BC 14400020 */ bnez $v0, .L80242940 -/* C795A0 802428C0 0240202D */ daddu $a0, $s2, $zero -/* C795A4 802428C4 2402000E */ addiu $v0, $zero, 0xe -/* C795A8 802428C8 1062002D */ beq $v1, $v0, .L80242980 -/* C795AC 802428CC 24020063 */ addiu $v0, $zero, 0x63 -/* C795B0 802428D0 10620030 */ beq $v1, $v0, .L80242994 -/* C795B4 802428D4 00000000 */ nop -/* C795B8 802428D8 08090A67 */ j .L8024299C -/* C795BC 802428DC 00000000 */ nop -.L802428E0: -/* C795C0 802428E0 0260282D */ daddu $a1, $s3, $zero -/* C795C4 802428E4 0C09063C */ jal kzn_09_UnkNpcAIFunc31 -/* C795C8 802428E8 0280302D */ daddu $a2, $s4, $zero -.L802428EC: -/* C795CC 802428EC 0240202D */ daddu $a0, $s2, $zero -/* C795D0 802428F0 0260282D */ daddu $a1, $s3, $zero -/* C795D4 802428F4 0C090657 */ jal kzn_09_UnkNpcAIFunc32 -/* C795D8 802428F8 0280302D */ daddu $a2, $s4, $zero -/* C795DC 802428FC 08090A67 */ j .L8024299C -/* C795E0 80242900 00000000 */ nop -.L80242904: -/* C795E4 80242904 0260282D */ daddu $a1, $s3, $zero -/* C795E8 80242908 0C090696 */ jal func_80241A58_C78738 -/* C795EC 8024290C 0280302D */ daddu $a2, $s4, $zero -/* C795F0 80242910 8E420070 */ lw $v0, 0x70($s2) -/* C795F4 80242914 14500021 */ bne $v0, $s0, .L8024299C -/* C795F8 80242918 00000000 */ nop -.L8024291C: -/* C795FC 8024291C 0240202D */ daddu $a0, $s2, $zero -/* C79600 80242920 0260282D */ daddu $a1, $s3, $zero -/* C79604 80242924 0C090926 */ jal kzn_09_UnkNpcDurationFlagFunc3 -/* C79608 80242928 0280302D */ daddu $a2, $s4, $zero -/* C7960C 8024292C 8E430070 */ lw $v1, 0x70($s2) -/* C79610 80242930 2402000C */ addiu $v0, $zero, 0xc -/* C79614 80242934 14620019 */ bne $v1, $v0, .L8024299C -/* C79618 80242938 00000000 */ nop -/* C7961C 8024293C 0240202D */ daddu $a0, $s2, $zero -.L80242940: -/* C79620 80242940 0260282D */ daddu $a1, $s3, $zero -/* C79624 80242944 0C09094A */ jal kzn_09_UnkNpcAIFunc33 -/* C79628 80242948 0280302D */ daddu $a2, $s4, $zero -/* C7962C 8024294C 8E430070 */ lw $v1, 0x70($s2) -/* C79630 80242950 2402000D */ addiu $v0, $zero, 0xd -/* C79634 80242954 14620011 */ bne $v1, $v0, .L8024299C -/* C79638 80242958 00000000 */ nop -.L8024295C: -/* C7963C 8024295C 0240202D */ daddu $a0, $s2, $zero -/* C79640 80242960 0260282D */ daddu $a1, $s3, $zero -/* C79644 80242964 0C09098A */ jal kzn_09_UnkNpcDurationFlagFunc2 -/* C79648 80242968 0280302D */ daddu $a2, $s4, $zero -/* C7964C 8024296C 8E430070 */ lw $v1, 0x70($s2) -/* C79650 80242970 2402000E */ addiu $v0, $zero, 0xe -/* C79654 80242974 14620009 */ bne $v1, $v0, .L8024299C -/* C79658 80242978 00000000 */ nop -/* C7965C 8024297C 0240202D */ daddu $a0, $s2, $zero -.L80242980: -/* C79660 80242980 0260282D */ daddu $a1, $s3, $zero -/* C79664 80242984 0C0909A2 */ jal kzn_09_UnkNpcAIFunc30 -/* C79668 80242988 0280302D */ daddu $a2, $s4, $zero -/* C7966C 8024298C 08090A67 */ j .L8024299C -/* C79670 80242990 00000000 */ nop -.L80242994: -/* C79674 80242994 0C0129CF */ jal func_8004A73C -/* C79678 80242998 0240202D */ daddu $a0, $s2, $zero -.L8024299C: -/* C7967C 8024299C 8FBF0048 */ lw $ra, 0x48($sp) -/* C79680 802429A0 8FB50044 */ lw $s5, 0x44($sp) -/* C79684 802429A4 8FB40040 */ lw $s4, 0x40($sp) -/* C79688 802429A8 8FB3003C */ lw $s3, 0x3c($sp) -/* C7968C 802429AC 8FB20038 */ lw $s2, 0x38($sp) -/* C79690 802429B0 8FB10034 */ lw $s1, 0x34($sp) -/* C79694 802429B4 8FB00030 */ lw $s0, 0x30($sp) -/* C79698 802429B8 0000102D */ daddu $v0, $zero, $zero -/* C7969C 802429BC 03E00008 */ jr $ra -/* C796A0 802429C0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s deleted file mode 100644 index 8c5c641cf9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243994_C7A674 -/* C7A674 80243994 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7A678 80243998 AFB00010 */ sw $s0, 0x10($sp) -/* C7A67C 8024399C 0080802D */ daddu $s0, $a0, $zero -/* C7A680 802439A0 AFBF0014 */ sw $ra, 0x14($sp) -/* C7A684 802439A4 0C00EABB */ jal get_npc_unsafe -/* C7A688 802439A8 8E04008C */ lw $a0, 0x8c($s0) -/* C7A68C 802439AC 0040282D */ daddu $a1, $v0, $zero -/* C7A690 802439B0 8E040094 */ lw $a0, 0x94($s0) -/* C7A694 802439B4 8CA30028 */ lw $v1, 0x28($a1) -/* C7A698 802439B8 ACA40028 */ sw $a0, 0x28($a1) -/* C7A69C 802439BC 8FBF0014 */ lw $ra, 0x14($sp) -/* C7A6A0 802439C0 8FB00010 */ lw $s0, 0x10($sp) -/* C7A6A4 802439C4 24020002 */ addiu $v0, $zero, 2 -/* C7A6A8 802439C8 3C018024 */ lui $at, %hi(D_80247664) -/* C7A6AC 802439CC AC237664 */ sw $v1, %lo(D_80247664)($at) -/* C7A6B0 802439D0 03E00008 */ jr $ra -/* C7A6B4 802439D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s deleted file mode 100644 index 535ce839a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439D8_C7A6B8 -/* C7A6B8 802439D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7A6BC 802439DC AFBF0010 */ sw $ra, 0x10($sp) -/* C7A6C0 802439E0 0C00EABB */ jal get_npc_unsafe -/* C7A6C4 802439E4 8C84008C */ lw $a0, 0x8c($a0) -/* C7A6C8 802439E8 3C038024 */ lui $v1, %hi(D_80247664) -/* C7A6CC 802439EC 8C637664 */ lw $v1, %lo(D_80247664)($v1) -/* C7A6D0 802439F0 AC430028 */ sw $v1, 0x28($v0) -/* C7A6D4 802439F4 8FBF0010 */ lw $ra, 0x10($sp) -/* C7A6D8 802439F8 24020002 */ addiu $v0, $zero, 2 -/* C7A6DC 802439FC 03E00008 */ jr $ra -/* C7A6E0 80243A00 27BD0018 */ addiu $sp, $sp, 0x18 -/* C7A6E4 80243A04 00000000 */ nop -/* C7A6E8 80243A08 00000000 */ nop -/* C7A6EC 80243A0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s deleted file mode 100644 index b5c1aaf928..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s +++ /dev/null @@ -1,710 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246538_C8BFE8 -.double 380.0 - -dlabel D_80246540_C8BFF0 -.double -380.0 - -dlabel D_80246548_C8BFF8 -.double 305.0 - -dlabel D_80246550_C8C000 -.double 375.0 - -dlabel D_80246558_C8C008 -.double 45.0 - -dlabel D_80246560_C8C010 -.double 150.0 - -.section .text - -glabel func_80240D48_C867F8 -/* C867F8 80240D48 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C867FC 80240D4C AFBF0064 */ sw $ra, 0x64($sp) -/* C86800 80240D50 AFBE0060 */ sw $fp, 0x60($sp) -/* C86804 80240D54 AFB7005C */ sw $s7, 0x5c($sp) -/* C86808 80240D58 AFB60058 */ sw $s6, 0x58($sp) -/* C8680C 80240D5C AFB50054 */ sw $s5, 0x54($sp) -/* C86810 80240D60 AFB40050 */ sw $s4, 0x50($sp) -/* C86814 80240D64 AFB3004C */ sw $s3, 0x4c($sp) -/* C86818 80240D68 AFB20048 */ sw $s2, 0x48($sp) -/* C8681C 80240D6C AFB10044 */ sw $s1, 0x44($sp) -/* C86820 80240D70 AFB00040 */ sw $s0, 0x40($sp) -/* C86824 80240D74 F7B80078 */ sdc1 $f24, 0x78($sp) -/* C86828 80240D78 F7B60070 */ sdc1 $f22, 0x70($sp) -/* C8682C 80240D7C F7B40068 */ sdc1 $f20, 0x68($sp) -/* C86830 80240D80 AFA40080 */ sw $a0, 0x80($sp) -/* C86834 80240D84 8C960148 */ lw $s6, 0x148($a0) -/* C86838 80240D88 00C0902D */ daddu $s2, $a2, $zero -/* C8683C 80240D8C 86C40008 */ lh $a0, 8($s6) -/* C86840 80240D90 0C00EABB */ jal get_npc_unsafe -/* C86844 80240D94 0000B82D */ daddu $s7, $zero, $zero -/* C86848 80240D98 0040882D */ daddu $s1, $v0, $zero -/* C8684C 80240D9C 9622008E */ lhu $v0, 0x8e($s1) -/* C86850 80240DA0 2442FFFF */ addiu $v0, $v0, -1 -/* C86854 80240DA4 A622008E */ sh $v0, 0x8e($s1) -/* C86858 80240DA8 00021400 */ sll $v0, $v0, 0x10 -/* C8685C 80240DAC 8EC30090 */ lw $v1, 0x90($s6) -/* C86860 80240DB0 00021403 */ sra $v0, $v0, 0x10 -/* C86864 80240DB4 0062182A */ slt $v1, $v1, $v0 -/* C86868 80240DB8 14600005 */ bnez $v1, .L80240DD0 -/* C8686C 80240DBC 02E0F02D */ daddu $fp, $s7, $zero -/* C86870 80240DC0 8EC20000 */ lw $v0, ($s6) -/* C86874 80240DC4 3C031F10 */ lui $v1, 0x1f10 -/* C86878 80240DC8 00431025 */ or $v0, $v0, $v1 -/* C8687C 80240DCC AEC20000 */ sw $v0, ($s6) -.L80240DD0: -/* C86880 80240DD0 8622008E */ lh $v0, 0x8e($s1) -/* C86884 80240DD4 1440025D */ bnez $v0, .L8024174C -/* C86888 80240DD8 00000000 */ nop -/* C8688C 80240DDC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C86890 80240DE0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C86894 80240DE4 0C00A6C9 */ jal clamp_angle -/* C86898 80240DE8 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* C8689C 80240DEC 3C014334 */ lui $at, 0x4334 -/* C868A0 80240DF0 44811000 */ mtc1 $at, $f2 -/* C868A4 80240DF4 00000000 */ nop -/* C868A8 80240DF8 4602003C */ c.lt.s $f0, $f2 -/* C868AC 80240DFC 00000000 */ nop -/* C868B0 80240E00 45000011 */ bc1f .L80240E48 -/* C868B4 80240E04 00000000 */ nop -/* C868B8 80240E08 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C868BC 80240E0C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C868C0 80240E10 3C0142B4 */ lui $at, 0x42b4 -/* C868C4 80240E14 44816000 */ mtc1 $at, $f12 -/* C868C8 80240E18 00031080 */ sll $v0, $v1, 2 -/* C868CC 80240E1C 00431021 */ addu $v0, $v0, $v1 -/* C868D0 80240E20 00021080 */ sll $v0, $v0, 2 -/* C868D4 80240E24 00431023 */ subu $v0, $v0, $v1 -/* C868D8 80240E28 000218C0 */ sll $v1, $v0, 3 -/* C868DC 80240E2C 00431021 */ addu $v0, $v0, $v1 -/* C868E0 80240E30 000210C0 */ sll $v0, $v0, 3 -/* C868E4 80240E34 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* C868E8 80240E38 00220821 */ addu $at, $at, $v0 -/* C868EC 80240E3C C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* C868F0 80240E40 080903A1 */ j .L80240E84 -/* C868F4 80240E44 460C0301 */ sub.s $f12, $f0, $f12 -.L80240E48: -/* C868F8 80240E48 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C868FC 80240E4C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C86900 80240E50 3C0142B4 */ lui $at, 0x42b4 -/* C86904 80240E54 44816000 */ mtc1 $at, $f12 -/* C86908 80240E58 00031080 */ sll $v0, $v1, 2 -/* C8690C 80240E5C 00431021 */ addu $v0, $v0, $v1 -/* C86910 80240E60 00021080 */ sll $v0, $v0, 2 -/* C86914 80240E64 00431023 */ subu $v0, $v0, $v1 -/* C86918 80240E68 000218C0 */ sll $v1, $v0, 3 -/* C8691C 80240E6C 00431021 */ addu $v0, $v0, $v1 -/* C86920 80240E70 000210C0 */ sll $v0, $v0, 3 -/* C86924 80240E74 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* C86928 80240E78 00220821 */ addu $at, $at, $v0 -/* C8692C 80240E7C C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* C86930 80240E80 460C0300 */ add.s $f12, $f0, $f12 -.L80240E84: -/* C86934 80240E84 0C00A6C9 */ jal clamp_angle -/* C86938 80240E88 00000000 */ nop -/* C8693C 80240E8C 46000586 */ mov.s $f22, $f0 -/* C86940 80240E90 3C014334 */ lui $at, 0x4334 -/* C86944 80240E94 44816000 */ mtc1 $at, $f12 -/* C86948 80240E98 0C00A6C9 */ jal clamp_angle -/* C8694C 80240E9C 460CB300 */ add.s $f12, $f22, $f12 -/* C86950 80240EA0 8EC20088 */ lw $v0, 0x88($s6) -/* C86954 80240EA4 14400010 */ bnez $v0, .L80240EE8 -/* C86958 80240EA8 46000606 */ mov.s $f24, $f0 -/* C8695C 80240EAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C86960 80240EB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C86964 80240EB4 804300B4 */ lb $v1, 0xb4($v0) -/* C86968 80240EB8 3C014200 */ lui $at, 0x4200 -/* C8696C 80240EBC 4481A000 */ mtc1 $at, $f20 -/* C86970 80240EC0 10600016 */ beqz $v1, .L80240F1C -/* C86974 80240EC4 24020001 */ addiu $v0, $zero, 1 -/* C86978 80240EC8 3C0142C8 */ lui $at, 0x42c8 -/* C8697C 80240ECC 4481A000 */ mtc1 $at, $f20 -/* C86980 80240ED0 14620013 */ bne $v1, $v0, .L80240F20 -/* C86984 80240ED4 26300038 */ addiu $s0, $s1, 0x38 -/* C86988 80240ED8 3C0142B4 */ lui $at, 0x42b4 -/* C8698C 80240EDC 4481A000 */ mtc1 $at, $f20 -/* C86990 80240EE0 080903C9 */ j .L80240F24 -/* C86994 80240EE4 0200202D */ daddu $a0, $s0, $zero -.L80240EE8: -/* C86998 80240EE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C8699C 80240EEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C869A0 80240EF0 804300B4 */ lb $v1, 0xb4($v0) -/* C869A4 80240EF4 3C014218 */ lui $at, 0x4218 -/* C869A8 80240EF8 4481A000 */ mtc1 $at, $f20 -/* C869AC 80240EFC 10600007 */ beqz $v1, .L80240F1C -/* C869B0 80240F00 24020001 */ addiu $v0, $zero, 1 -/* C869B4 80240F04 3C0142B4 */ lui $at, 0x42b4 -/* C869B8 80240F08 4481A000 */ mtc1 $at, $f20 -/* C869BC 80240F0C 14620004 */ bne $v1, $v0, .L80240F20 -/* C869C0 80240F10 26300038 */ addiu $s0, $s1, 0x38 -/* C869C4 80240F14 3C014296 */ lui $at, 0x4296 -/* C869C8 80240F18 4481A000 */ mtc1 $at, $f20 -.L80240F1C: -/* C869CC 80240F1C 26300038 */ addiu $s0, $s1, 0x38 -.L80240F20: -/* C869D0 80240F20 0200202D */ daddu $a0, $s0, $zero -.L80240F24: -/* C869D4 80240F24 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* C869D8 80240F28 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* C869DC 80240F2C 4407C000 */ mfc1 $a3, $f24 -/* C869E0 80240F30 862200A6 */ lh $v0, 0xa6($s1) -/* C869E4 80240F34 8EA30000 */ lw $v1, ($s5) -/* C869E8 80240F38 44824000 */ mtc1 $v0, $f8 -/* C869EC 80240F3C 00000000 */ nop -/* C869F0 80240F40 46804220 */ cvt.s.w $f8, $f8 -/* C869F4 80240F44 C4600028 */ lwc1 $f0, 0x28($v1) -/* C869F8 80240F48 44064000 */ mfc1 $a2, $f8 -/* C869FC 80240F4C 26330040 */ addiu $s3, $s1, 0x40 -/* C86A00 80240F50 E6200038 */ swc1 $f0, 0x38($s1) -/* C86A04 80240F54 C4600030 */ lwc1 $f0, 0x30($v1) -/* C86A08 80240F58 0260282D */ daddu $a1, $s3, $zero -/* C86A0C 80240F5C 0C00A7E7 */ jal add_vec2D_polar -/* C86A10 80240F60 E6200040 */ swc1 $f0, 0x40($s1) -/* C86A14 80240F64 862200A6 */ lh $v0, 0xa6($s1) -/* C86A18 80240F68 44820000 */ mtc1 $v0, $f0 -/* C86A1C 80240F6C 00000000 */ nop -/* C86A20 80240F70 46800020 */ cvt.s.w $f0, $f0 -/* C86A24 80240F74 4600A000 */ add.s $f0, $f20, $f0 -/* C86A28 80240F78 4406B000 */ mfc1 $a2, $f22 -/* C86A2C 80240F7C 44050000 */ mfc1 $a1, $f0 -/* C86A30 80240F80 0C00EA95 */ jal npc_move_heading -/* C86A34 80240F84 0220202D */ daddu $a0, $s1, $zero -/* C86A38 80240F88 8EC20088 */ lw $v0, 0x88($s6) -/* C86A3C 80240F8C 1440005D */ bnez $v0, .L80241104 -/* C86A40 80240F90 00000000 */ nop -/* C86A44 80240F94 C6200038 */ lwc1 $f0, 0x38($s1) -/* C86A48 80240F98 3C018024 */ lui $at, %hi(D_80246538_C8BFE8) -/* C86A4C 80240F9C D4246538 */ ldc1 $f4, %lo(D_80246538_C8BFE8)($at) -/* C86A50 80240FA0 46000021 */ cvt.d.s $f0, $f0 -/* C86A54 80240FA4 4620203C */ c.lt.d $f4, $f0 -/* C86A58 80240FA8 00000000 */ nop -/* C86A5C 80240FAC 45000005 */ bc1f .L80240FC4 -/* C86A60 80240FB0 00000000 */ nop -/* C86A64 80240FB4 3C0143BE */ lui $at, 0x43be -/* C86A68 80240FB8 44810000 */ mtc1 $at, $f0 -/* C86A6C 80240FBC 00000000 */ nop -/* C86A70 80240FC0 E6200038 */ swc1 $f0, 0x38($s1) -.L80240FC4: -/* C86A74 80240FC4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C86A78 80240FC8 3C018024 */ lui $at, %hi(D_80246540_C8BFF0) -/* C86A7C 80240FCC D4226540 */ ldc1 $f2, %lo(D_80246540_C8BFF0)($at) -/* C86A80 80240FD0 46000021 */ cvt.d.s $f0, $f0 -/* C86A84 80240FD4 4622003C */ c.lt.d $f0, $f2 -/* C86A88 80240FD8 00000000 */ nop -/* C86A8C 80240FDC 45000005 */ bc1f .L80240FF4 -/* C86A90 80240FE0 00000000 */ nop -/* C86A94 80240FE4 3C01C3BE */ lui $at, 0xc3be -/* C86A98 80240FE8 44810000 */ mtc1 $at, $f0 -/* C86A9C 80240FEC 00000000 */ nop -/* C86AA0 80240FF0 E6200038 */ swc1 $f0, 0x38($s1) -.L80240FF4: -/* C86AA4 80240FF4 C6200040 */ lwc1 $f0, 0x40($s1) -/* C86AA8 80240FF8 46000021 */ cvt.d.s $f0, $f0 -/* C86AAC 80240FFC 4620203C */ c.lt.d $f4, $f0 -/* C86AB0 80241000 00000000 */ nop -/* C86AB4 80241004 45000005 */ bc1f .L8024101C -/* C86AB8 80241008 00000000 */ nop -/* C86ABC 8024100C 3C0143BE */ lui $at, 0x43be -/* C86AC0 80241010 44810000 */ mtc1 $at, $f0 -/* C86AC4 80241014 00000000 */ nop -/* C86AC8 80241018 E6200040 */ swc1 $f0, 0x40($s1) -.L8024101C: -/* C86ACC 8024101C C6200040 */ lwc1 $f0, 0x40($s1) -/* C86AD0 80241020 46000021 */ cvt.d.s $f0, $f0 -/* C86AD4 80241024 4622003C */ c.lt.d $f0, $f2 -/* C86AD8 80241028 00000000 */ nop -/* C86ADC 8024102C 45000005 */ bc1f .L80241044 -/* C86AE0 80241030 00000000 */ nop -/* C86AE4 80241034 3C01C3BE */ lui $at, 0xc3be -/* C86AE8 80241038 44810000 */ mtc1 $at, $f0 -/* C86AEC 8024103C 00000000 */ nop -/* C86AF0 80241040 E6200040 */ swc1 $f0, 0x40($s1) -.L80241044: -/* C86AF4 80241044 C6220038 */ lwc1 $f2, 0x38($s1) -/* C86AF8 80241048 46021082 */ mul.s $f2, $f2, $f2 -/* C86AFC 8024104C 00000000 */ nop -/* C86B00 80241050 C6200040 */ lwc1 $f0, 0x40($s1) -/* C86B04 80241054 46000002 */ mul.s $f0, $f0, $f0 -/* C86B08 80241058 00000000 */ nop -/* C86B0C 8024105C 46001300 */ add.s $f12, $f2, $f0 -/* C86B10 80241060 46006004 */ sqrt.s $f0, $f12 -/* C86B14 80241064 46000032 */ c.eq.s $f0, $f0 -/* C86B18 80241068 00000000 */ nop -/* C86B1C 8024106C 45010003 */ bc1t .L8024107C -/* C86B20 80241070 00000000 */ nop -/* C86B24 80241074 0C0187BC */ jal sqrtf -/* C86B28 80241078 00000000 */ nop -.L8024107C: -/* C86B2C 8024107C 8E260038 */ lw $a2, 0x38($s1) -/* C86B30 80241080 8E270040 */ lw $a3, 0x40($s1) -/* C86B34 80241084 4480A000 */ mtc1 $zero, $f20 -/* C86B38 80241088 E7A00038 */ swc1 $f0, 0x38($sp) -/* C86B3C 8024108C 4600A306 */ mov.s $f12, $f20 -/* C86B40 80241090 0C00A720 */ jal atan2 -/* C86B44 80241094 4600A386 */ mov.s $f14, $f20 -/* C86B48 80241098 46000586 */ mov.s $f22, $f0 -/* C86B4C 8024109C C7A20038 */ lwc1 $f2, 0x38($sp) -/* C86B50 802410A0 3C018024 */ lui $at, %hi(D_80246548_C8BFF8) -/* C86B54 802410A4 D4206548 */ ldc1 $f0, %lo(D_80246548_C8BFF8)($at) -/* C86B58 802410A8 460010A1 */ cvt.d.s $f2, $f2 -/* C86B5C 802410AC 4620103C */ c.lt.d $f2, $f0 -/* C86B60 802410B0 00000000 */ nop -/* C86B64 802410B4 45000004 */ bc1f .L802410C8 -/* C86B68 802410B8 0200202D */ daddu $a0, $s0, $zero -/* C86B6C 802410BC 3C064398 */ lui $a2, 0x4398 -/* C86B70 802410C0 0809043A */ j .L802410E8 -/* C86B74 802410C4 34C68000 */ ori $a2, $a2, 0x8000 -.L802410C8: -/* C86B78 802410C8 3C018024 */ lui $at, %hi(D_80246550_C8C000) -/* C86B7C 802410CC D4206550 */ ldc1 $f0, %lo(D_80246550_C8C000)($at) -/* C86B80 802410D0 4622003C */ c.lt.d $f0, $f2 -/* C86B84 802410D4 00000000 */ nop -/* C86B88 802410D8 450000FA */ bc1f .L802414C4 -/* C86B8C 802410DC 00000000 */ nop -/* C86B90 802410E0 3C0643BB */ lui $a2, 0x43bb -/* C86B94 802410E4 34C68000 */ ori $a2, $a2, 0x8000 -.L802410E8: -/* C86B98 802410E8 4407B000 */ mfc1 $a3, $f22 -/* C86B9C 802410EC 0260282D */ daddu $a1, $s3, $zero -/* C86BA0 802410F0 E6340038 */ swc1 $f20, 0x38($s1) -/* C86BA4 802410F4 0C00A7E7 */ jal add_vec2D_polar -/* C86BA8 802410F8 E6340040 */ swc1 $f20, 0x40($s1) -/* C86BAC 802410FC 08090531 */ j .L802414C4 -/* C86BB0 80241100 00000000 */ nop -.L80241104: -/* C86BB4 80241104 8E220000 */ lw $v0, ($s1) -/* C86BB8 80241108 30420040 */ andi $v0, $v0, 0x40 -/* C86BBC 8024110C 144000B0 */ bnez $v0, .L802413D0 -/* C86BC0 80241110 27A50020 */ addiu $a1, $sp, 0x20 -/* C86BC4 80241114 27B40020 */ addiu $s4, $sp, 0x20 -/* C86BC8 80241118 0280282D */ daddu $a1, $s4, $zero -/* C86BCC 8024111C 27B30024 */ addiu $s3, $sp, 0x24 -/* C86BD0 80241120 8EA20000 */ lw $v0, ($s5) -/* C86BD4 80241124 3C014032 */ lui $at, 0x4032 -/* C86BD8 80241128 44811800 */ mtc1 $at, $f3 -/* C86BDC 8024112C 44801000 */ mtc1 $zero, $f2 -/* C86BE0 80241130 C440002C */ lwc1 $f0, 0x2c($v0) -/* C86BE4 80241134 C4460028 */ lwc1 $f6, 0x28($v0) -/* C86BE8 80241138 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86BEC 8024113C 46000021 */ cvt.d.s $f0, $f0 -/* C86BF0 80241140 46220000 */ add.d $f0, $f0, $f2 -/* C86BF4 80241144 E7A60020 */ swc1 $f6, 0x20($sp) -/* C86BF8 80241148 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86BFC 8024114C 46200020 */ cvt.s.d $f0, $f0 -/* C86C00 80241150 E7A00024 */ swc1 $f0, 0x24($sp) -/* C86C04 80241154 E7B40010 */ swc1 $f20, 0x10($sp) -/* C86C08 80241158 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86C0C 8024115C 862200A8 */ lh $v0, 0xa8($s1) -/* C86C10 80241160 0260302D */ daddu $a2, $s3, $zero -/* C86C14 80241164 44820000 */ mtc1 $v0, $f0 -/* C86C18 80241168 00000000 */ nop -/* C86C1C 8024116C 46800020 */ cvt.s.w $f0, $f0 -/* C86C20 80241170 E7A00018 */ swc1 $f0, 0x18($sp) -/* C86C24 80241174 862200A6 */ lh $v0, 0xa6($s1) -/* C86C28 80241178 27B00028 */ addiu $s0, $sp, 0x28 -/* C86C2C 8024117C 44820000 */ mtc1 $v0, $f0 -/* C86C30 80241180 00000000 */ nop -/* C86C34 80241184 46800020 */ cvt.s.w $f0, $f0 -/* C86C38 80241188 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86C3C 8024118C 8E240080 */ lw $a0, 0x80($s1) -/* C86C40 80241190 0C037711 */ jal npc_test_move_simple_with_slipping -/* C86C44 80241194 0200382D */ daddu $a3, $s0, $zero -/* C86C48 80241198 104000CA */ beqz $v0, .L802414C4 -/* C86C4C 8024119C 0280282D */ daddu $a1, $s4, $zero -/* C86C50 802411A0 8EA20000 */ lw $v0, ($s5) -/* C86C54 802411A4 3C018024 */ lui $at, %hi(D_80246558_C8C008) -/* C86C58 802411A8 D4226558 */ ldc1 $f2, %lo(D_80246558_C8C008)($at) -/* C86C5C 802411AC C440002C */ lwc1 $f0, 0x2c($v0) -/* C86C60 802411B0 C4460028 */ lwc1 $f6, 0x28($v0) -/* C86C64 802411B4 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86C68 802411B8 46000021 */ cvt.d.s $f0, $f0 -/* C86C6C 802411BC 46220000 */ add.d $f0, $f0, $f2 -/* C86C70 802411C0 E7A60020 */ swc1 $f6, 0x20($sp) -/* C86C74 802411C4 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86C78 802411C8 46200020 */ cvt.s.d $f0, $f0 -/* C86C7C 802411CC E7A00024 */ swc1 $f0, 0x24($sp) -/* C86C80 802411D0 E7B40010 */ swc1 $f20, 0x10($sp) -/* C86C84 802411D4 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86C88 802411D8 862200A8 */ lh $v0, 0xa8($s1) -/* C86C8C 802411DC 44820000 */ mtc1 $v0, $f0 -/* C86C90 802411E0 00000000 */ nop -/* C86C94 802411E4 46800020 */ cvt.s.w $f0, $f0 -/* C86C98 802411E8 E7A00018 */ swc1 $f0, 0x18($sp) -/* C86C9C 802411EC 862200A6 */ lh $v0, 0xa6($s1) -/* C86CA0 802411F0 0260302D */ daddu $a2, $s3, $zero -/* C86CA4 802411F4 44820000 */ mtc1 $v0, $f0 -/* C86CA8 802411F8 00000000 */ nop -/* C86CAC 802411FC 46800020 */ cvt.s.w $f0, $f0 -/* C86CB0 80241200 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86CB4 80241204 8E240080 */ lw $a0, 0x80($s1) -/* C86CB8 80241208 0C037711 */ jal npc_test_move_simple_with_slipping -/* C86CBC 8024120C 0200382D */ daddu $a3, $s0, $zero -/* C86CC0 80241210 27A5002C */ addiu $a1, $sp, 0x2c -/* C86CC4 80241214 27A60030 */ addiu $a2, $sp, 0x30 -/* C86CC8 80241218 27A70034 */ addiu $a3, $sp, 0x34 -/* C86CCC 8024121C 27A30038 */ addiu $v1, $sp, 0x38 -/* C86CD0 80241220 C6220038 */ lwc1 $f2, 0x38($s1) -/* C86CD4 80241224 C620003C */ lwc1 $f0, 0x3c($s1) -/* C86CD8 80241228 3C014348 */ lui $at, 0x4348 -/* C86CDC 8024122C 44813000 */ mtc1 $at, $f6 -/* C86CE0 80241230 46000021 */ cvt.d.s $f0, $f0 -/* C86CE4 80241234 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C86CE8 80241238 3C014059 */ lui $at, 0x4059 -/* C86CEC 8024123C 44811800 */ mtc1 $at, $f3 -/* C86CF0 80241240 44801000 */ mtc1 $zero, $f2 -/* C86CF4 80241244 C6240040 */ lwc1 $f4, 0x40($s1) -/* C86CF8 80241248 46220000 */ add.d $f0, $f0, $f2 -/* C86CFC 8024124C E7A60038 */ swc1 $f6, 0x38($sp) -/* C86D00 80241250 E7A40034 */ swc1 $f4, 0x34($sp) -/* C86D04 80241254 46200020 */ cvt.s.d $f0, $f0 -/* C86D08 80241258 E7A00030 */ swc1 $f0, 0x30($sp) -/* C86D0C 8024125C AFA30010 */ sw $v1, 0x10($sp) -/* C86D10 80241260 8E240080 */ lw $a0, 0x80($s1) -/* C86D14 80241264 0C0372DF */ jal npc_raycast_down_sides -/* C86D18 80241268 0040802D */ daddu $s0, $v0, $zero -/* C86D1C 8024126C 1600001C */ bnez $s0, .L802412E0 -/* C86D20 80241270 00000000 */ nop -/* C86D24 80241274 1040001A */ beqz $v0, .L802412E0 -/* C86D28 80241278 00000000 */ nop -/* C86D2C 8024127C C7A20038 */ lwc1 $f2, 0x38($sp) -/* C86D30 80241280 3C014054 */ lui $at, 0x4054 -/* C86D34 80241284 44810800 */ mtc1 $at, $f1 -/* C86D38 80241288 44800000 */ mtc1 $zero, $f0 -/* C86D3C 8024128C 460010A1 */ cvt.d.s $f2, $f2 -/* C86D40 80241290 4622003C */ c.lt.d $f0, $f2 -/* C86D44 80241294 00000000 */ nop -/* C86D48 80241298 45000011 */ bc1f .L802412E0 -/* C86D4C 8024129C 00000000 */ nop -/* C86D50 802412A0 3C01405E */ lui $at, 0x405e -/* C86D54 802412A4 44810800 */ mtc1 $at, $f1 -/* C86D58 802412A8 44800000 */ mtc1 $zero, $f0 -/* C86D5C 802412AC 00000000 */ nop -/* C86D60 802412B0 4620103C */ c.lt.d $f2, $f0 -/* C86D64 802412B4 00000000 */ nop -/* C86D68 802412B8 45000009 */ bc1f .L802412E0 -/* C86D6C 802412BC 00000000 */ nop -/* C86D70 802412C0 C622003C */ lwc1 $f2, 0x3c($s1) -/* C86D74 802412C4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C86D78 802412C8 46001032 */ c.eq.s $f2, $f0 -/* C86D7C 802412CC 00000000 */ nop -/* C86D80 802412D0 45010003 */ bc1t .L802412E0 -/* C86D84 802412D4 00000000 */ nop -/* C86D88 802412D8 08090531 */ j .L802414C4 -/* C86D8C 802412DC 241E0001 */ addiu $fp, $zero, 1 -.L802412E0: -/* C86D90 802412E0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C86D94 802412E4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C86D98 802412E8 8E020000 */ lw $v0, ($s0) -/* C86D9C 802412EC 3C014024 */ lui $at, 0x4024 -/* C86DA0 802412F0 44811800 */ mtc1 $at, $f3 -/* C86DA4 802412F4 44801000 */ mtc1 $zero, $f2 -/* C86DA8 802412F8 C440002C */ lwc1 $f0, 0x2c($v0) -/* C86DAC 802412FC C4460028 */ lwc1 $f6, 0x28($v0) -/* C86DB0 80241300 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86DB4 80241304 46000021 */ cvt.d.s $f0, $f0 -/* C86DB8 80241308 46220000 */ add.d $f0, $f0, $f2 -/* C86DBC 8024130C E7A60020 */ swc1 $f6, 0x20($sp) -/* C86DC0 80241310 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86DC4 80241314 46200020 */ cvt.s.d $f0, $f0 -/* C86DC8 80241318 E7A00024 */ swc1 $f0, 0x24($sp) -/* C86DCC 8024131C E7B40010 */ swc1 $f20, 0x10($sp) -/* C86DD0 80241320 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86DD4 80241324 862200A8 */ lh $v0, 0xa8($s1) -/* C86DD8 80241328 27A50020 */ addiu $a1, $sp, 0x20 -/* C86DDC 8024132C 44820000 */ mtc1 $v0, $f0 -/* C86DE0 80241330 00000000 */ nop -/* C86DE4 80241334 46800020 */ cvt.s.w $f0, $f0 -/* C86DE8 80241338 E7A00018 */ swc1 $f0, 0x18($sp) -/* C86DEC 8024133C 862200A6 */ lh $v0, 0xa6($s1) -/* C86DF0 80241340 27A60024 */ addiu $a2, $sp, 0x24 -/* C86DF4 80241344 44820000 */ mtc1 $v0, $f0 -/* C86DF8 80241348 00000000 */ nop -/* C86DFC 8024134C 46800020 */ cvt.s.w $f0, $f0 -/* C86E00 80241350 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86E04 80241354 8E240080 */ lw $a0, 0x80($s1) -/* C86E08 80241358 0C037711 */ jal npc_test_move_simple_with_slipping -/* C86E0C 8024135C 27A70028 */ addiu $a3, $sp, 0x28 -/* C86E10 80241360 8FA60020 */ lw $a2, 0x20($sp) -/* C86E14 80241364 8E020000 */ lw $v0, ($s0) -/* C86E18 80241368 8FA70028 */ lw $a3, 0x28($sp) -/* C86E1C 8024136C C44C0028 */ lwc1 $f12, 0x28($v0) -/* C86E20 80241370 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C86E24 80241374 0C00A7B5 */ jal dist2D -/* C86E28 80241378 24170001 */ addiu $s7, $zero, 1 -/* C86E2C 8024137C 46000506 */ mov.s $f20, $f0 -/* C86E30 80241380 8E030000 */ lw $v1, ($s0) -/* C86E34 80241384 862200A6 */ lh $v0, 0xa6($s1) -/* C86E38 80241388 4407C000 */ mfc1 $a3, $f24 -/* C86E3C 8024138C 44824000 */ mtc1 $v0, $f8 -/* C86E40 80241390 00000000 */ nop -/* C86E44 80241394 46804220 */ cvt.s.w $f8, $f8 -/* C86E48 80241398 C4600028 */ lwc1 $f0, 0x28($v1) -/* C86E4C 8024139C 44064000 */ mfc1 $a2, $f8 -/* C86E50 802413A0 26240038 */ addiu $a0, $s1, 0x38 -/* C86E54 802413A4 E6200038 */ swc1 $f0, 0x38($s1) -/* C86E58 802413A8 C4600030 */ lwc1 $f0, 0x30($v1) -/* C86E5C 802413AC 26250040 */ addiu $a1, $s1, 0x40 -/* C86E60 802413B0 0C00A7E7 */ jal add_vec2D_polar -/* C86E64 802413B4 E6200040 */ swc1 $f0, 0x40($s1) -/* C86E68 802413B8 862200A6 */ lh $v0, 0xa6($s1) -/* C86E6C 802413BC 44820000 */ mtc1 $v0, $f0 -/* C86E70 802413C0 00000000 */ nop -/* C86E74 802413C4 46800020 */ cvt.s.w $f0, $f0 -/* C86E78 802413C8 0809052D */ j .L802414B4 -/* C86E7C 802413CC 4600A500 */ add.s $f20, $f20, $f0 -.L802413D0: -/* C86E80 802413D0 8EA20000 */ lw $v0, ($s5) -/* C86E84 802413D4 3C014032 */ lui $at, 0x4032 -/* C86E88 802413D8 44811800 */ mtc1 $at, $f3 -/* C86E8C 802413DC 44801000 */ mtc1 $zero, $f2 -/* C86E90 802413E0 C440002C */ lwc1 $f0, 0x2c($v0) -/* C86E94 802413E4 C4460028 */ lwc1 $f6, 0x28($v0) -/* C86E98 802413E8 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86E9C 802413EC 46000021 */ cvt.d.s $f0, $f0 -/* C86EA0 802413F0 46220000 */ add.d $f0, $f0, $f2 -/* C86EA4 802413F4 E7A60020 */ swc1 $f6, 0x20($sp) -/* C86EA8 802413F8 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86EAC 802413FC 46200020 */ cvt.s.d $f0, $f0 -/* C86EB0 80241400 E7A00024 */ swc1 $f0, 0x24($sp) -/* C86EB4 80241404 E7B40010 */ swc1 $f20, 0x10($sp) -/* C86EB8 80241408 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86EBC 8024140C 862200A8 */ lh $v0, 0xa8($s1) -/* C86EC0 80241410 44820000 */ mtc1 $v0, $f0 -/* C86EC4 80241414 00000000 */ nop -/* C86EC8 80241418 46800020 */ cvt.s.w $f0, $f0 -/* C86ECC 8024141C E7A00018 */ swc1 $f0, 0x18($sp) -/* C86ED0 80241420 862200A6 */ lh $v0, 0xa6($s1) -/* C86ED4 80241424 27A60024 */ addiu $a2, $sp, 0x24 -/* C86ED8 80241428 44820000 */ mtc1 $v0, $f0 -/* C86EDC 8024142C 00000000 */ nop -/* C86EE0 80241430 46800020 */ cvt.s.w $f0, $f0 -/* C86EE4 80241434 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86EE8 80241438 8E240080 */ lw $a0, 0x80($s1) -/* C86EEC 8024143C 0C037711 */ jal npc_test_move_simple_with_slipping -/* C86EF0 80241440 27A70028 */ addiu $a3, $sp, 0x28 -/* C86EF4 80241444 1040001F */ beqz $v0, .L802414C4 -/* C86EF8 80241448 00000000 */ nop -/* C86EFC 8024144C 8FA60020 */ lw $a2, 0x20($sp) -/* C86F00 80241450 8EA20000 */ lw $v0, ($s5) -/* C86F04 80241454 8FA70028 */ lw $a3, 0x28($sp) -/* C86F08 80241458 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C86F0C 8024145C 0C00A7B5 */ jal dist2D -/* C86F10 80241460 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C86F14 80241464 46000506 */ mov.s $f20, $f0 -/* C86F18 80241468 8EA30000 */ lw $v1, ($s5) -/* C86F1C 8024146C 862200A6 */ lh $v0, 0xa6($s1) -/* C86F20 80241470 4407C000 */ mfc1 $a3, $f24 -/* C86F24 80241474 44824000 */ mtc1 $v0, $f8 -/* C86F28 80241478 00000000 */ nop -/* C86F2C 8024147C 46804220 */ cvt.s.w $f8, $f8 -/* C86F30 80241480 C4600028 */ lwc1 $f0, 0x28($v1) -/* C86F34 80241484 44064000 */ mfc1 $a2, $f8 -/* C86F38 80241488 0200202D */ daddu $a0, $s0, $zero -/* C86F3C 8024148C E6200038 */ swc1 $f0, 0x38($s1) -/* C86F40 80241490 C4600030 */ lwc1 $f0, 0x30($v1) -/* C86F44 80241494 0260282D */ daddu $a1, $s3, $zero -/* C86F48 80241498 0C00A7E7 */ jal add_vec2D_polar -/* C86F4C 8024149C E6200040 */ swc1 $f0, 0x40($s1) -/* C86F50 802414A0 862200A6 */ lh $v0, 0xa6($s1) -/* C86F54 802414A4 44820000 */ mtc1 $v0, $f0 -/* C86F58 802414A8 00000000 */ nop -/* C86F5C 802414AC 46800020 */ cvt.s.w $f0, $f0 -/* C86F60 802414B0 4600A500 */ add.s $f20, $f20, $f0 -.L802414B4: -/* C86F64 802414B4 4406B000 */ mfc1 $a2, $f22 -/* C86F68 802414B8 4405A000 */ mfc1 $a1, $f20 -/* C86F6C 802414BC 0C00EA95 */ jal npc_move_heading -/* C86F70 802414C0 0220202D */ daddu $a0, $s1, $zero -.L802414C4: -/* C86F74 802414C4 C6400008 */ lwc1 $f0, 8($s2) -/* C86F78 802414C8 46800020 */ cvt.s.w $f0, $f0 -/* C86F7C 802414CC 44050000 */ mfc1 $a1, $f0 -/* C86F80 802414D0 C640000C */ lwc1 $f0, 0xc($s2) -/* C86F84 802414D4 46800020 */ cvt.s.w $f0, $f0 -/* C86F88 802414D8 44060000 */ mfc1 $a2, $f0 -/* C86F8C 802414DC C6200040 */ lwc1 $f0, 0x40($s1) -/* C86F90 802414E0 26300038 */ addiu $s0, $s1, 0x38 -/* C86F94 802414E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C86F98 802414E8 C6400010 */ lwc1 $f0, 0x10($s2) -/* C86F9C 802414EC 46800020 */ cvt.s.w $f0, $f0 -/* C86FA0 802414F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C86FA4 802414F4 C6400014 */ lwc1 $f0, 0x14($s2) -/* C86FA8 802414F8 46800020 */ cvt.s.w $f0, $f0 -/* C86FAC 802414FC E7A00018 */ swc1 $f0, 0x18($sp) -/* C86FB0 80241500 8E440004 */ lw $a0, 4($s2) -/* C86FB4 80241504 8E270038 */ lw $a3, 0x38($s1) -/* C86FB8 80241508 0C0123F5 */ jal is_point_within_region -/* C86FBC 8024150C 26330040 */ addiu $s3, $s1, 0x40 -/* C86FC0 80241510 1040005A */ beqz $v0, .L8024167C -/* C86FC4 80241514 00000000 */ nop -/* C86FC8 80241518 8E430004 */ lw $v1, 4($s2) -/* C86FCC 8024151C 10600005 */ beqz $v1, .L80241534 -/* C86FD0 80241520 24020001 */ addiu $v0, $zero, 1 -/* C86FD4 80241524 10620029 */ beq $v1, $v0, .L802415CC -/* C86FD8 80241528 00000000 */ nop -/* C86FDC 8024152C 0809059F */ j .L8024167C -/* C86FE0 80241530 00000000 */ nop -.L80241534: -/* C86FE4 80241534 C6480008 */ lwc1 $f8, 8($s2) -/* C86FE8 80241538 46804220 */ cvt.s.w $f8, $f8 -/* C86FEC 8024153C 44064000 */ mfc1 $a2, $f8 -/* C86FF0 80241540 C648000C */ lwc1 $f8, 0xc($s2) -/* C86FF4 80241544 46804220 */ cvt.s.w $f8, $f8 -/* C86FF8 80241548 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C86FFC 8024154C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C87000 80241550 44074000 */ mfc1 $a3, $f8 -/* C87004 80241554 0C00A7B5 */ jal dist2D -/* C87008 80241558 00000000 */ nop -/* C8700C 8024155C C6420010 */ lwc1 $f2, 0x10($s2) -/* C87010 80241560 468010A0 */ cvt.s.w $f2, $f2 -/* C87014 80241564 4600103C */ c.lt.s $f2, $f0 -/* C87018 80241568 00000000 */ nop -/* C8701C 8024156C 45000043 */ bc1f .L8024167C -/* C87020 80241570 E7A00038 */ swc1 $f0, 0x38($sp) -/* C87024 80241574 C64C0008 */ lwc1 $f12, 8($s2) -/* C87028 80241578 46806320 */ cvt.s.w $f12, $f12 -/* C8702C 8024157C 8E260038 */ lw $a2, 0x38($s1) -/* C87030 80241580 8E270040 */ lw $a3, 0x40($s1) -/* C87034 80241584 C64E000C */ lwc1 $f14, 0xc($s2) -/* C87038 80241588 0C00A720 */ jal atan2 -/* C8703C 8024158C 468073A0 */ cvt.s.w $f14, $f14 -/* C87040 80241590 0200202D */ daddu $a0, $s0, $zero -/* C87044 80241594 44070000 */ mfc1 $a3, $f0 -/* C87048 80241598 C6400008 */ lwc1 $f0, 8($s2) -/* C8704C 8024159C 46800020 */ cvt.s.w $f0, $f0 -/* C87050 802415A0 E6200038 */ swc1 $f0, 0x38($s1) -/* C87054 802415A4 C640000C */ lwc1 $f0, 0xc($s2) -/* C87058 802415A8 46800020 */ cvt.s.w $f0, $f0 -/* C8705C 802415AC E6200040 */ swc1 $f0, 0x40($s1) -/* C87060 802415B0 C6480010 */ lwc1 $f8, 0x10($s2) -/* C87064 802415B4 46804220 */ cvt.s.w $f8, $f8 -/* C87068 802415B8 44064000 */ mfc1 $a2, $f8 -/* C8706C 802415BC 0C00A7E7 */ jal add_vec2D_polar -/* C87070 802415C0 0260282D */ daddu $a1, $s3, $zero -/* C87074 802415C4 0809059F */ j .L8024167C -/* C87078 802415C8 00000000 */ nop -.L802415CC: -/* C8707C 802415CC 8E420008 */ lw $v0, 8($s2) -/* C87080 802415D0 8E430010 */ lw $v1, 0x10($s2) -/* C87084 802415D4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C87088 802415D8 00431021 */ addu $v0, $v0, $v1 -/* C8708C 802415DC 44821000 */ mtc1 $v0, $f2 -/* C87090 802415E0 00000000 */ nop -/* C87094 802415E4 468010A0 */ cvt.s.w $f2, $f2 -/* C87098 802415E8 4600103C */ c.lt.s $f2, $f0 -/* C8709C 802415EC 00000000 */ nop -/* C870A0 802415F0 45030001 */ bc1tl .L802415F8 -/* C870A4 802415F4 E6220038 */ swc1 $f2, 0x38($s1) -.L802415F8: -/* C870A8 802415F8 8E420008 */ lw $v0, 8($s2) -/* C870AC 802415FC 8E430010 */ lw $v1, 0x10($s2) -/* C870B0 80241600 C6200038 */ lwc1 $f0, 0x38($s1) -/* C870B4 80241604 00431023 */ subu $v0, $v0, $v1 -/* C870B8 80241608 44821000 */ mtc1 $v0, $f2 -/* C870BC 8024160C 00000000 */ nop -/* C870C0 80241610 468010A0 */ cvt.s.w $f2, $f2 -/* C870C4 80241614 4602003C */ c.lt.s $f0, $f2 -/* C870C8 80241618 00000000 */ nop -/* C870CC 8024161C 45030001 */ bc1tl .L80241624 -/* C870D0 80241620 E6220038 */ swc1 $f2, 0x38($s1) -.L80241624: -/* C870D4 80241624 8E42000C */ lw $v0, 0xc($s2) -/* C870D8 80241628 8E430014 */ lw $v1, 0x14($s2) -/* C870DC 8024162C C6200040 */ lwc1 $f0, 0x40($s1) -/* C870E0 80241630 00431021 */ addu $v0, $v0, $v1 -/* C870E4 80241634 44821000 */ mtc1 $v0, $f2 -/* C870E8 80241638 00000000 */ nop -/* C870EC 8024163C 468010A0 */ cvt.s.w $f2, $f2 -/* C870F0 80241640 4600103C */ c.lt.s $f2, $f0 -/* C870F4 80241644 00000000 */ nop -/* C870F8 80241648 45030001 */ bc1tl .L80241650 -/* C870FC 8024164C E6220040 */ swc1 $f2, 0x40($s1) -.L80241650: -/* C87100 80241650 8E42000C */ lw $v0, 0xc($s2) -/* C87104 80241654 8E430014 */ lw $v1, 0x14($s2) -/* C87108 80241658 C6200040 */ lwc1 $f0, 0x40($s1) -/* C8710C 8024165C 00431023 */ subu $v0, $v0, $v1 -/* C87110 80241660 44821000 */ mtc1 $v0, $f2 -/* C87114 80241664 00000000 */ nop -/* C87118 80241668 468010A0 */ cvt.s.w $f2, $f2 -/* C8711C 8024166C 4602003C */ c.lt.s $f0, $f2 -/* C87120 80241670 00000000 */ nop -/* C87124 80241674 45030001 */ bc1tl .L8024167C -/* C87128 80241678 E6220040 */ swc1 $f2, 0x40($s1) -.L8024167C: -/* C8712C 8024167C 16E0001F */ bnez $s7, .L802416FC -/* C87130 80241680 00000000 */ nop -/* C87134 80241684 8E220000 */ lw $v0, ($s1) -/* C87138 80241688 30420008 */ andi $v0, $v0, 8 -/* C8713C 8024168C 10400003 */ beqz $v0, .L8024169C -/* C87140 80241690 27A50020 */ addiu $a1, $sp, 0x20 -/* C87144 80241694 13C00019 */ beqz $fp, .L802416FC -/* C87148 80241698 00000000 */ nop -.L8024169C: -/* C8714C 8024169C 27A60024 */ addiu $a2, $sp, 0x24 -/* C87150 802416A0 27A20038 */ addiu $v0, $sp, 0x38 -/* C87154 802416A4 C6220038 */ lwc1 $f2, 0x38($s1) -/* C87158 802416A8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C8715C 802416AC 3C0143C8 */ lui $at, 0x43c8 -/* C87160 802416B0 44813000 */ mtc1 $at, $f6 -/* C87164 802416B4 46000021 */ cvt.d.s $f0, $f0 -/* C87168 802416B8 E7A20020 */ swc1 $f2, 0x20($sp) -/* C8716C 802416BC 3C018024 */ lui $at, %hi(D_80246560_C8C010) -/* C87170 802416C0 D4226560 */ ldc1 $f2, %lo(D_80246560_C8C010)($at) -/* C87174 802416C4 C6240040 */ lwc1 $f4, 0x40($s1) -/* C87178 802416C8 46220000 */ add.d $f0, $f0, $f2 -/* C8717C 802416CC E7A60038 */ swc1 $f6, 0x38($sp) -/* C87180 802416D0 E7A40028 */ swc1 $f4, 0x28($sp) -/* C87184 802416D4 46200020 */ cvt.s.d $f0, $f0 -/* C87188 802416D8 E7A00024 */ swc1 $f0, 0x24($sp) -/* C8718C 802416DC AFA20010 */ sw $v0, 0x10($sp) -/* C87190 802416E0 8E240080 */ lw $a0, 0x80($s1) -/* C87194 802416E4 0C0372DF */ jal npc_raycast_down_sides -/* C87198 802416E8 27A70028 */ addiu $a3, $sp, 0x28 -/* C8719C 802416EC 10400003 */ beqz $v0, .L802416FC -/* C871A0 802416F0 00000000 */ nop -/* C871A4 802416F4 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C871A8 802416F8 E620003C */ swc1 $f0, 0x3c($s1) -.L802416FC: -/* C871AC 802416FC C62C0038 */ lwc1 $f12, 0x38($s1) -/* C871B0 80241700 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C871B4 80241704 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C871B8 80241708 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C871BC 8024170C 8C460028 */ lw $a2, 0x28($v0) -/* C871C0 80241710 0C00A720 */ jal atan2 -/* C871C4 80241714 8C470030 */ lw $a3, 0x30($v0) -/* C871C8 80241718 0220202D */ daddu $a0, $s1, $zero -/* C871CC 8024171C 24050321 */ addiu $a1, $zero, 0x321 -/* C871D0 80241720 0000302D */ daddu $a2, $zero, $zero -/* C871D4 80241724 0C012530 */ jal ai_enemy_play_sound -/* C871D8 80241728 E620000C */ swc1 $f0, 0xc($s1) -/* C871DC 8024172C 8EC200CC */ lw $v0, 0xcc($s6) -/* C871E0 80241730 8C420024 */ lw $v0, 0x24($v0) -/* C871E4 80241734 AE220028 */ sw $v0, 0x28($s1) -/* C871E8 80241738 96C20096 */ lhu $v0, 0x96($s6) -/* C871EC 8024173C A622008E */ sh $v0, 0x8e($s1) -/* C871F0 80241740 8FA80080 */ lw $t0, 0x80($sp) -/* C871F4 80241744 2402000B */ addiu $v0, $zero, 0xb -/* C871F8 80241748 AD020070 */ sw $v0, 0x70($t0) -.L8024174C: -/* C871FC 8024174C 8FBF0064 */ lw $ra, 0x64($sp) -/* C87200 80241750 8FBE0060 */ lw $fp, 0x60($sp) -/* C87204 80241754 8FB7005C */ lw $s7, 0x5c($sp) -/* C87208 80241758 8FB60058 */ lw $s6, 0x58($sp) -/* C8720C 8024175C 8FB50054 */ lw $s5, 0x54($sp) -/* C87210 80241760 8FB40050 */ lw $s4, 0x50($sp) -/* C87214 80241764 8FB3004C */ lw $s3, 0x4c($sp) -/* C87218 80241768 8FB20048 */ lw $s2, 0x48($sp) -/* C8721C 8024176C 8FB10044 */ lw $s1, 0x44($sp) -/* C87220 80241770 8FB00040 */ lw $s0, 0x40($sp) -/* C87224 80241774 D7B80078 */ ldc1 $f24, 0x78($sp) -/* C87228 80241778 D7B60070 */ ldc1 $f22, 0x70($sp) -/* C8722C 8024177C D7B40068 */ ldc1 $f20, 0x68($sp) -/* C87230 80241780 03E00008 */ jr $ra -/* C87234 80241784 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s deleted file mode 100644 index 943c6db395..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A64_C87514 -/* C87514 80241A64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C87518 80241A68 AFB20038 */ sw $s2, 0x38($sp) -/* C8751C 80241A6C 0080902D */ daddu $s2, $a0, $zero -/* C87520 80241A70 AFBF0048 */ sw $ra, 0x48($sp) -/* C87524 80241A74 AFB50044 */ sw $s5, 0x44($sp) -/* C87528 80241A78 AFB40040 */ sw $s4, 0x40($sp) -/* C8752C 80241A7C AFB3003C */ sw $s3, 0x3c($sp) -/* C87530 80241A80 AFB10034 */ sw $s1, 0x34($sp) -/* C87534 80241A84 AFB00030 */ sw $s0, 0x30($sp) -/* C87538 80241A88 8E510148 */ lw $s1, 0x148($s2) -/* C8753C 80241A8C 86240008 */ lh $a0, 8($s1) -/* C87540 80241A90 0C00EABB */ jal get_npc_unsafe -/* C87544 80241A94 00A0802D */ daddu $s0, $a1, $zero -/* C87548 80241A98 8E43000C */ lw $v1, 0xc($s2) -/* C8754C 80241A9C 0240202D */ daddu $a0, $s2, $zero -/* C87550 80241AA0 8C650000 */ lw $a1, ($v1) -/* C87554 80241AA4 0C0B1EAF */ jal evt_get_variable -/* C87558 80241AA8 0040A82D */ daddu $s5, $v0, $zero -/* C8755C 80241AAC AFA00010 */ sw $zero, 0x10($sp) -/* C87560 80241AB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87564 80241AB4 8C630030 */ lw $v1, 0x30($v1) -/* C87568 80241AB8 AFA30014 */ sw $v1, 0x14($sp) -/* C8756C 80241ABC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87570 80241AC0 8C63001C */ lw $v1, 0x1c($v1) -/* C87574 80241AC4 AFA30018 */ sw $v1, 0x18($sp) -/* C87578 80241AC8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C8757C 80241ACC 8C630024 */ lw $v1, 0x24($v1) -/* C87580 80241AD0 AFA3001C */ sw $v1, 0x1c($sp) -/* C87584 80241AD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87588 80241AD8 8C630028 */ lw $v1, 0x28($v1) -/* C8758C 80241ADC 27B40010 */ addiu $s4, $sp, 0x10 -/* C87590 80241AE0 AFA30020 */ sw $v1, 0x20($sp) -/* C87594 80241AE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87598 80241AE8 3C014348 */ lui $at, 0x4348 -/* C8759C 80241AEC 44810000 */ mtc1 $at, $f0 -/* C875A0 80241AF0 8C63002C */ lw $v1, 0x2c($v1) -/* C875A4 80241AF4 0040982D */ daddu $s3, $v0, $zero -/* C875A8 80241AF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C875AC 80241AFC A7A0002C */ sh $zero, 0x2c($sp) -/* C875B0 80241B00 16000005 */ bnez $s0, .L80241B18 -/* C875B4 80241B04 AFA30024 */ sw $v1, 0x24($sp) -/* C875B8 80241B08 8E2200B0 */ lw $v0, 0xb0($s1) -/* C875BC 80241B0C 30420004 */ andi $v0, $v0, 4 -/* C875C0 80241B10 10400011 */ beqz $v0, .L80241B58 -/* C875C4 80241B14 00000000 */ nop -.L80241B18: -/* C875C8 80241B18 AE400070 */ sw $zero, 0x70($s2) -/* C875CC 80241B1C A6A0008E */ sh $zero, 0x8e($s5) -/* C875D0 80241B20 8E2200CC */ lw $v0, 0xcc($s1) -/* C875D4 80241B24 8C420000 */ lw $v0, ($v0) -/* C875D8 80241B28 AEA20028 */ sw $v0, 0x28($s5) -/* C875DC 80241B2C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C875E0 80241B30 30420004 */ andi $v0, $v0, 4 -/* C875E4 80241B34 10400008 */ beqz $v0, .L80241B58 -/* C875E8 80241B38 AE20006C */ sw $zero, 0x6c($s1) -/* C875EC 80241B3C 24020063 */ addiu $v0, $zero, 0x63 -/* C875F0 80241B40 AE420070 */ sw $v0, 0x70($s2) -/* C875F4 80241B44 AE400074 */ sw $zero, 0x74($s2) -/* C875F8 80241B48 8E2200B0 */ lw $v0, 0xb0($s1) -/* C875FC 80241B4C 2403FFFB */ addiu $v1, $zero, -5 -/* C87600 80241B50 00431024 */ and $v0, $v0, $v1 -/* C87604 80241B54 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241B58: -/* C87608 80241B58 8E430070 */ lw $v1, 0x70($s2) -/* C8760C 80241B5C 2410000B */ addiu $s0, $zero, 0xb -/* C87610 80241B60 1070002A */ beq $v1, $s0, .L80241C0C -/* C87614 80241B64 2862000C */ slti $v0, $v1, 0xc -/* C87618 80241B68 1040000D */ beqz $v0, .L80241BA0 -/* C8761C 80241B6C 24020001 */ addiu $v0, $zero, 1 -/* C87620 80241B70 1062001A */ beq $v1, $v0, .L80241BDC -/* C87624 80241B74 28620002 */ slti $v0, $v1, 2 -/* C87628 80241B78 10400005 */ beqz $v0, .L80241B90 -/* C8762C 80241B7C 2402000A */ addiu $v0, $zero, 0xa -/* C87630 80241B80 10600013 */ beqz $v1, .L80241BD0 -/* C87634 80241B84 0240202D */ daddu $a0, $s2, $zero -/* C87638 80241B88 08090723 */ j .L80241C8C -/* C8763C 80241B8C 00000000 */ nop -.L80241B90: -/* C87640 80241B90 10620018 */ beq $v1, $v0, .L80241BF4 -/* C87644 80241B94 0240202D */ daddu $a0, $s2, $zero -/* C87648 80241B98 08090723 */ j .L80241C8C -/* C8764C 80241B9C 00000000 */ nop -.L80241BA0: -/* C87650 80241BA0 2402000D */ addiu $v0, $zero, 0xd -/* C87654 80241BA4 10620029 */ beq $v1, $v0, .L80241C4C -/* C87658 80241BA8 0062102A */ slt $v0, $v1, $v0 -/* C8765C 80241BAC 14400020 */ bnez $v0, .L80241C30 -/* C87660 80241BB0 0240202D */ daddu $a0, $s2, $zero -/* C87664 80241BB4 2402000E */ addiu $v0, $zero, 0xe -/* C87668 80241BB8 1062002D */ beq $v1, $v0, .L80241C70 -/* C8766C 80241BBC 24020063 */ addiu $v0, $zero, 0x63 -/* C87670 80241BC0 10620030 */ beq $v1, $v0, .L80241C84 -/* C87674 80241BC4 00000000 */ nop -/* C87678 80241BC8 08090723 */ j .L80241C8C -/* C8767C 80241BCC 00000000 */ nop -.L80241BD0: -/* C87680 80241BD0 0260282D */ daddu $a1, $s3, $zero -/* C87684 80241BD4 0C0902F8 */ jal kzn_17_UnkNpcAIFunc31 -/* C87688 80241BD8 0280302D */ daddu $a2, $s4, $zero -.L80241BDC: -/* C8768C 80241BDC 0240202D */ daddu $a0, $s2, $zero -/* C87690 80241BE0 0260282D */ daddu $a1, $s3, $zero -/* C87694 80241BE4 0C090313 */ jal kzn_17_UnkNpcAIFunc32 -/* C87698 80241BE8 0280302D */ daddu $a2, $s4, $zero -/* C8769C 80241BEC 08090723 */ j .L80241C8C -/* C876A0 80241BF0 00000000 */ nop -.L80241BF4: -/* C876A4 80241BF4 0260282D */ daddu $a1, $s3, $zero -/* C876A8 80241BF8 0C090352 */ jal func_80240D48_C867F8 -/* C876AC 80241BFC 0280302D */ daddu $a2, $s4, $zero -/* C876B0 80241C00 8E420070 */ lw $v0, 0x70($s2) -/* C876B4 80241C04 14500021 */ bne $v0, $s0, .L80241C8C -/* C876B8 80241C08 00000000 */ nop -.L80241C0C: -/* C876BC 80241C0C 0240202D */ daddu $a0, $s2, $zero -/* C876C0 80241C10 0260282D */ daddu $a1, $s3, $zero -/* C876C4 80241C14 0C0905E2 */ jal kzn_17_UnkNpcDurationFlagFunc3 -/* C876C8 80241C18 0280302D */ daddu $a2, $s4, $zero -/* C876CC 80241C1C 8E430070 */ lw $v1, 0x70($s2) -/* C876D0 80241C20 2402000C */ addiu $v0, $zero, 0xc -/* C876D4 80241C24 14620019 */ bne $v1, $v0, .L80241C8C -/* C876D8 80241C28 00000000 */ nop -/* C876DC 80241C2C 0240202D */ daddu $a0, $s2, $zero -.L80241C30: -/* C876E0 80241C30 0260282D */ daddu $a1, $s3, $zero -/* C876E4 80241C34 0C090606 */ jal kzn_17_UnkNpcAIFunc33 -/* C876E8 80241C38 0280302D */ daddu $a2, $s4, $zero -/* C876EC 80241C3C 8E430070 */ lw $v1, 0x70($s2) -/* C876F0 80241C40 2402000D */ addiu $v0, $zero, 0xd -/* C876F4 80241C44 14620011 */ bne $v1, $v0, .L80241C8C -/* C876F8 80241C48 00000000 */ nop -.L80241C4C: -/* C876FC 80241C4C 0240202D */ daddu $a0, $s2, $zero -/* C87700 80241C50 0260282D */ daddu $a1, $s3, $zero -/* C87704 80241C54 0C090646 */ jal kzn_17_UnkNpcDurationFlagFunc2 -/* C87708 80241C58 0280302D */ daddu $a2, $s4, $zero -/* C8770C 80241C5C 8E430070 */ lw $v1, 0x70($s2) -/* C87710 80241C60 2402000E */ addiu $v0, $zero, 0xe -/* C87714 80241C64 14620009 */ bne $v1, $v0, .L80241C8C -/* C87718 80241C68 00000000 */ nop -/* C8771C 80241C6C 0240202D */ daddu $a0, $s2, $zero -.L80241C70: -/* C87720 80241C70 0260282D */ daddu $a1, $s3, $zero -/* C87724 80241C74 0C09065E */ jal kzn_17_UnkNpcAIFunc30 -/* C87728 80241C78 0280302D */ daddu $a2, $s4, $zero -/* C8772C 80241C7C 08090723 */ j .L80241C8C -/* C87730 80241C80 00000000 */ nop -.L80241C84: -/* C87734 80241C84 0C0129CF */ jal func_8004A73C -/* C87738 80241C88 0240202D */ daddu $a0, $s2, $zero -.L80241C8C: -/* C8773C 80241C8C 8FBF0048 */ lw $ra, 0x48($sp) -/* C87740 80241C90 8FB50044 */ lw $s5, 0x44($sp) -/* C87744 80241C94 8FB40040 */ lw $s4, 0x40($sp) -/* C87748 80241C98 8FB3003C */ lw $s3, 0x3c($sp) -/* C8774C 80241C9C 8FB20038 */ lw $s2, 0x38($sp) -/* C87750 80241CA0 8FB10034 */ lw $s1, 0x34($sp) -/* C87754 80241CA4 8FB00030 */ lw $s0, 0x30($sp) -/* C87758 80241CA8 0000102D */ daddu $v0, $zero, $zero -/* C8775C 80241CAC 03E00008 */ jr $ra -/* C87760 80241CB0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s deleted file mode 100644 index 7209a565de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C84_C88734 -/* C88734 80242C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88738 80242C88 AFB00010 */ sw $s0, 0x10($sp) -/* C8873C 80242C8C 0080802D */ daddu $s0, $a0, $zero -/* C88740 80242C90 AFBF0014 */ sw $ra, 0x14($sp) -/* C88744 80242C94 0C00EABB */ jal get_npc_unsafe -/* C88748 80242C98 8E04008C */ lw $a0, 0x8c($s0) -/* C8874C 80242C9C 0040282D */ daddu $a1, $v0, $zero -/* C88750 80242CA0 8E040094 */ lw $a0, 0x94($s0) -/* C88754 80242CA4 8CA30028 */ lw $v1, 0x28($a1) -/* C88758 80242CA8 ACA40028 */ sw $a0, 0x28($a1) -/* C8875C 80242CAC 8FBF0014 */ lw $ra, 0x14($sp) -/* C88760 80242CB0 8FB00010 */ lw $s0, 0x10($sp) -/* C88764 80242CB4 24020002 */ addiu $v0, $zero, 2 -/* C88768 80242CB8 3C018024 */ lui $at, %hi(D_802467B4) -/* C8876C 80242CBC AC2367B4 */ sw $v1, %lo(D_802467B4)($at) -/* C88770 80242CC0 03E00008 */ jr $ra -/* C88774 80242CC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s deleted file mode 100644 index 4d5abb1b9e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CC8_C88778 -/* C88778 80242CC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8877C 80242CCC AFBF0010 */ sw $ra, 0x10($sp) -/* C88780 80242CD0 0C00EABB */ jal get_npc_unsafe -/* C88784 80242CD4 8C84008C */ lw $a0, 0x8c($a0) -/* C88788 80242CD8 3C038024 */ lui $v1, %hi(D_802467B4) -/* C8878C 80242CDC 8C6367B4 */ lw $v1, %lo(D_802467B4)($v1) -/* C88790 80242CE0 AC430028 */ sw $v1, 0x28($v0) -/* C88794 80242CE4 8FBF0010 */ lw $ra, 0x10($sp) -/* C88798 80242CE8 24020002 */ addiu $v0, $zero, 2 -/* C8879C 80242CEC 03E00008 */ jr $ra -/* C887A0 80242CF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C887A4 80242CF4 00000000 */ nop -/* C887A8 80242CF8 00000000 */ nop -/* C887AC 80242CFC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s deleted file mode 100644 index b048b12ef9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B50_C8F700 -/* C8F700 80241B50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8F704 80241B54 AFB00010 */ sw $s0, 0x10($sp) -/* C8F708 80241B58 0080802D */ daddu $s0, $a0, $zero -/* C8F70C 80241B5C AFBF0014 */ sw $ra, 0x14($sp) -/* C8F710 80241B60 0C00EABB */ jal get_npc_unsafe -/* C8F714 80241B64 8E04008C */ lw $a0, 0x8c($s0) -/* C8F718 80241B68 0040282D */ daddu $a1, $v0, $zero -/* C8F71C 80241B6C 8E040094 */ lw $a0, 0x94($s0) -/* C8F720 80241B70 8CA30028 */ lw $v1, 0x28($a1) -/* C8F724 80241B74 ACA40028 */ sw $a0, 0x28($a1) -/* C8F728 80241B78 8FBF0014 */ lw $ra, 0x14($sp) -/* C8F72C 80241B7C 8FB00010 */ lw $s0, 0x10($sp) -/* C8F730 80241B80 24020002 */ addiu $v0, $zero, 2 -/* C8F734 80241B84 3C018025 */ lui $at, %hi(D_8024854C_kzn_19) -/* C8F738 80241B88 AC23854C */ sw $v1, %lo(D_8024854C_kzn_19)($at) -/* C8F73C 80241B8C 03E00008 */ jr $ra -/* C8F740 80241B90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s deleted file mode 100644 index 0d59b04736..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B94_C8F744 -/* C8F744 80241B94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8F748 80241B98 AFBF0010 */ sw $ra, 0x10($sp) -/* C8F74C 80241B9C 0C00EABB */ jal get_npc_unsafe -/* C8F750 80241BA0 8C84008C */ lw $a0, 0x8c($a0) -/* C8F754 80241BA4 3C038025 */ lui $v1, %hi(D_8024854C_kzn_19) -/* C8F758 80241BA8 8C63854C */ lw $v1, %lo(D_8024854C_kzn_19)($v1) -/* C8F75C 80241BAC AC430028 */ sw $v1, 0x28($v0) -/* C8F760 80241BB0 8FBF0010 */ lw $ra, 0x10($sp) -/* C8F764 80241BB4 24020002 */ addiu $v0, $zero, 2 -/* C8F768 80241BB8 03E00008 */ jr $ra -/* C8F76C 80241BBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s deleted file mode 100644 index 54c71ad699..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F8_C96928 -/* C96928 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9692C 802409FC AFB00010 */ sw $s0, 0x10($sp) -/* C96930 80240A00 0080802D */ daddu $s0, $a0, $zero -/* C96934 80240A04 AFBF0014 */ sw $ra, 0x14($sp) -/* C96938 80240A08 0C00EABB */ jal get_npc_unsafe -/* C9693C 80240A0C 8E04008C */ lw $a0, 0x8c($s0) -/* C96940 80240A10 0040282D */ daddu $a1, $v0, $zero -/* C96944 80240A14 8E040094 */ lw $a0, 0x94($s0) -/* C96948 80240A18 8CA30028 */ lw $v1, 0x28($a1) -/* C9694C 80240A1C ACA40028 */ sw $a0, 0x28($a1) -/* C96950 80240A20 8FBF0014 */ lw $ra, 0x14($sp) -/* C96954 80240A24 8FB00010 */ lw $s0, 0x10($sp) -/* C96958 80240A28 24020002 */ addiu $v0, $zero, 2 -/* C9695C 80240A2C 3C018024 */ lui $at, %hi(D_80244494) -/* C96960 80240A30 AC234494 */ sw $v1, %lo(D_80244494)($at) -/* C96964 80240A34 03E00008 */ jr $ra -/* C96968 80240A38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s deleted file mode 100644 index 679711d2b5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A3C_C9696C -/* C9696C 80240A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C96970 80240A40 AFBF0010 */ sw $ra, 0x10($sp) -/* C96974 80240A44 0C00EABB */ jal get_npc_unsafe -/* C96978 80240A48 8C84008C */ lw $a0, 0x8c($a0) -/* C9697C 80240A4C 3C038024 */ lui $v1, %hi(D_80244494) -/* C96980 80240A50 8C634494 */ lw $v1, %lo(D_80244494)($v1) -/* C96984 80240A54 AC430028 */ sw $v1, 0x28($v0) -/* C96988 80240A58 8FBF0010 */ lw $ra, 0x10($sp) -/* C9698C 80240A5C 24020002 */ addiu $v0, $zero, 2 -/* C96990 80240A60 03E00008 */ jr $ra -/* C96994 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s deleted file mode 100644 index 46145266e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D30_7ECA40 -/* 7ECA40 80241D30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECA44 80241D34 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECA48 80241D38 0080802D */ daddu $s0, $a0, $zero -/* 7ECA4C 80241D3C AFBF0014 */ sw $ra, 0x14($sp) -/* 7ECA50 80241D40 0C00EABB */ jal get_npc_unsafe -/* 7ECA54 80241D44 8E04008C */ lw $a0, 0x8c($s0) -/* 7ECA58 80241D48 0040282D */ daddu $a1, $v0, $zero -/* 7ECA5C 80241D4C 8E040094 */ lw $a0, 0x94($s0) -/* 7ECA60 80241D50 8CA30028 */ lw $v1, 0x28($a1) -/* 7ECA64 80241D54 ACA40028 */ sw $a0, 0x28($a1) -/* 7ECA68 80241D58 8FBF0014 */ lw $ra, 0x14($sp) -/* 7ECA6C 80241D5C 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECA70 80241D60 24020002 */ addiu $v0, $zero, 2 -/* 7ECA74 80241D64 3C018025 */ lui $at, %hi(D_80255ED8) -/* 7ECA78 80241D68 AC235ED8 */ sw $v1, %lo(D_80255ED8)($at) -/* 7ECA7C 80241D6C 03E00008 */ jr $ra -/* 7ECA80 80241D70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s deleted file mode 100644 index 78fae68bc4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D74_7ECA84 -/* 7ECA84 80241D74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECA88 80241D78 AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECA8C 80241D7C 0C00EABB */ jal get_npc_unsafe -/* 7ECA90 80241D80 8C84008C */ lw $a0, 0x8c($a0) -/* 7ECA94 80241D84 3C038025 */ lui $v1, %hi(D_80255ED8) -/* 7ECA98 80241D88 8C635ED8 */ lw $v1, %lo(D_80255ED8)($v1) -/* 7ECA9C 80241D8C AC430028 */ sw $v1, 0x28($v0) -/* 7ECAA0 80241D90 8FBF0010 */ lw $ra, 0x10($sp) -/* 7ECAA4 80241D94 24020002 */ addiu $v0, $zero, 2 -/* 7ECAA8 80241D98 03E00008 */ jr $ra -/* 7ECAAC 80241D9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s deleted file mode 100644 index d4bddf18fa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243AE8_7EE7F8 -/* 7EE7F8 80243AE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE7FC 80243AEC AFB00010 */ sw $s0, 0x10($sp) -/* 7EE800 80243AF0 0080802D */ daddu $s0, $a0, $zero -/* 7EE804 80243AF4 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EE808 80243AF8 0C00EABB */ jal get_npc_unsafe -/* 7EE80C 80243AFC 8E04008C */ lw $a0, 0x8c($s0) -/* 7EE810 80243B00 0040282D */ daddu $a1, $v0, $zero -/* 7EE814 80243B04 8E040094 */ lw $a0, 0x94($s0) -/* 7EE818 80243B08 8CA30028 */ lw $v1, 0x28($a1) -/* 7EE81C 80243B0C ACA40028 */ sw $a0, 0x28($a1) -/* 7EE820 80243B10 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EE824 80243B14 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE828 80243B18 24020002 */ addiu $v0, $zero, 2 -/* 7EE82C 80243B1C 3C018025 */ lui $at, %hi(D_802560A4) -/* 7EE830 80243B20 AC2360A4 */ sw $v1, %lo(D_802560A4)($at) -/* 7EE834 80243B24 03E00008 */ jr $ra -/* 7EE838 80243B28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s deleted file mode 100644 index e9e13698ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B2C_7EE83C -/* 7EE83C 80243B2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE840 80243B30 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EE844 80243B34 0C00EABB */ jal get_npc_unsafe -/* 7EE848 80243B38 8C84008C */ lw $a0, 0x8c($a0) -/* 7EE84C 80243B3C 3C038025 */ lui $v1, %hi(D_802560A4) -/* 7EE850 80243B40 8C6360A4 */ lw $v1, %lo(D_802560A4)($v1) -/* 7EE854 80243B44 AC430028 */ sw $v1, 0x28($v0) -/* 7EE858 80243B48 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EE85C 80243B4C 24020002 */ addiu $v0, $zero, 2 -/* 7EE860 80243B50 03E00008 */ jr $ra -/* 7EE864 80243B54 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7EE868 80243B58 00000000 */ nop -/* 7EE86C 80243B5C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s deleted file mode 100644 index 76f2528e83..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244078_8048F8 -/* 8048F8 80244078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8048FC 8024407C AFB00010 */ sw $s0, 0x10($sp) -/* 804900 80244080 0080802D */ daddu $s0, $a0, $zero -/* 804904 80244084 AFBF0014 */ sw $ra, 0x14($sp) -/* 804908 80244088 0C00EABB */ jal get_npc_unsafe -/* 80490C 8024408C 8E04008C */ lw $a0, 0x8c($s0) -/* 804910 80244090 0040282D */ daddu $a1, $v0, $zero -/* 804914 80244094 8E040094 */ lw $a0, 0x94($s0) -/* 804918 80244098 8CA30028 */ lw $v1, 0x28($a1) -/* 80491C 8024409C ACA40028 */ sw $a0, 0x28($a1) -/* 804920 802440A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 804924 802440A4 8FB00010 */ lw $s0, 0x10($sp) -/* 804928 802440A8 24020002 */ addiu $v0, $zero, 2 -/* 80492C 802440AC 3C018026 */ lui $at, %hi(D_80262C34) -/* 804930 802440B0 AC232C34 */ sw $v1, %lo(D_80262C34)($at) -/* 804934 802440B4 03E00008 */ jr $ra -/* 804938 802440B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s deleted file mode 100644 index 9f3a6a3788..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802440BC_80493C -/* 80493C 802440BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804940 802440C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804944 802440C4 0C00EABB */ jal get_npc_unsafe -/* 804948 802440C8 8C84008C */ lw $a0, 0x8c($a0) -/* 80494C 802440CC 3C038026 */ lui $v1, %hi(D_80262C34) -/* 804950 802440D0 8C632C34 */ lw $v1, %lo(D_80262C34)($v1) -/* 804954 802440D4 AC430028 */ sw $v1, 0x28($v0) -/* 804958 802440D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 80495C 802440DC 24020002 */ addiu $v0, $zero, 2 -/* 804960 802440E0 03E00008 */ jr $ra -/* 804964 802440E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s deleted file mode 100644 index 2cef5c0502..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel filemenu_update_show_name_input_826640 -/* 826640 80243380 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 826644 80243384 AFB00010 */ sw $s0, 0x10($sp) -/* 826648 80243388 0080802D */ daddu $s0, $a0, $zero -/* 82664C 8024338C AFBF0014 */ sw $ra, 0x14($sp) -/* 826650 80243390 0C00EABB */ jal get_npc_unsafe -/* 826654 80243394 8E04008C */ lw $a0, 0x8c($s0) -/* 826658 80243398 0040282D */ daddu $a1, $v0, $zero -/* 82665C 8024339C 8E040094 */ lw $a0, 0x94($s0) -/* 826660 802433A0 8CA30028 */ lw $v1, 0x28($a1) -/* 826664 802433A4 ACA40028 */ sw $a0, 0x28($a1) -/* 826668 802433A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 82666C 802433AC 8FB00010 */ lw $s0, 0x10($sp) -/* 826670 802433B0 24020002 */ addiu $v0, $zero, 2 -/* 826674 802433B4 3C018025 */ lui $at, %hi(D_8024EA18) -/* 826678 802433B8 AC23EA18 */ sw $v1, %lo(D_8024EA18)($at) -/* 82667C 802433BC 03E00008 */ jr $ra -/* 826680 802433C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s deleted file mode 100644 index 51a22dfedb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433C4_826684 -/* 826684 802433C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 826688 802433C8 AFBF0010 */ sw $ra, 0x10($sp) -/* 82668C 802433CC 0C00EABB */ jal get_npc_unsafe -/* 826690 802433D0 8C84008C */ lw $a0, 0x8c($a0) -/* 826694 802433D4 3C038025 */ lui $v1, %hi(D_8024EA18) -/* 826698 802433D8 8C63EA18 */ lw $v1, %lo(D_8024EA18)($v1) -/* 82669C 802433DC AC430028 */ sw $v1, 0x28($v0) -/* 8266A0 802433E0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8266A4 802433E4 24020002 */ addiu $v0, $zero, 2 -/* 8266A8 802433E8 03E00008 */ jr $ra -/* 8266AC 802433EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s deleted file mode 100644 index a7cc4989c4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B14_833314 -/* 833314 80241B14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833318 80241B18 AFB00010 */ sw $s0, 0x10($sp) -/* 83331C 80241B1C 0080802D */ daddu $s0, $a0, $zero -/* 833320 80241B20 AFBF0014 */ sw $ra, 0x14($sp) -/* 833324 80241B24 0C00EABB */ jal get_npc_unsafe -/* 833328 80241B28 8E04008C */ lw $a0, 0x8c($s0) -/* 83332C 80241B2C 0040282D */ daddu $a1, $v0, $zero -/* 833330 80241B30 8E040094 */ lw $a0, 0x94($s0) -/* 833334 80241B34 8CA30028 */ lw $v1, 0x28($a1) -/* 833338 80241B38 ACA40028 */ sw $a0, 0x28($a1) -/* 83333C 80241B3C 8FBF0014 */ lw $ra, 0x14($sp) -/* 833340 80241B40 8FB00010 */ lw $s0, 0x10($sp) -/* 833344 80241B44 24020002 */ addiu $v0, $zero, 2 -/* 833348 80241B48 3C018025 */ lui $at, %hi(D_802515C4) -/* 83334C 80241B4C AC2315C4 */ sw $v1, %lo(D_802515C4)($at) -/* 833350 80241B50 03E00008 */ jr $ra -/* 833354 80241B54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s deleted file mode 100644 index 1fb9c7d45b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B58_833358 -/* 833358 80241B58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 83335C 80241B5C AFBF0010 */ sw $ra, 0x10($sp) -/* 833360 80241B60 0C00EABB */ jal get_npc_unsafe -/* 833364 80241B64 8C84008C */ lw $a0, 0x8c($a0) -/* 833368 80241B68 3C038025 */ lui $v1, %hi(D_802515C4) -/* 83336C 80241B6C 8C6315C4 */ lw $v1, %lo(D_802515C4)($v1) -/* 833370 80241B70 AC430028 */ sw $v1, 0x28($v0) -/* 833374 80241B74 8FBF0010 */ lw $ra, 0x10($sp) -/* 833378 80241B78 24020002 */ addiu $v0, $zero, 2 -/* 83337C 80241B7C 03E00008 */ jr $ra -/* 833380 80241B80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s deleted file mode 100644 index 6ba48cf339..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A20_854B90 -/* 854B90 80242A20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 854B94 80242A24 AFB00010 */ sw $s0, 0x10($sp) -/* 854B98 80242A28 0080802D */ daddu $s0, $a0, $zero -/* 854B9C 80242A2C AFBF0014 */ sw $ra, 0x14($sp) -/* 854BA0 80242A30 0C00EABB */ jal get_npc_unsafe -/* 854BA4 80242A34 8E04008C */ lw $a0, 0x8c($s0) -/* 854BA8 80242A38 0040282D */ daddu $a1, $v0, $zero -/* 854BAC 80242A3C 8E040094 */ lw $a0, 0x94($s0) -/* 854BB0 80242A40 8CA30028 */ lw $v1, 0x28($a1) -/* 854BB4 80242A44 ACA40028 */ sw $a0, 0x28($a1) -/* 854BB8 80242A48 8FBF0014 */ lw $ra, 0x14($sp) -/* 854BBC 80242A4C 8FB00010 */ lw $s0, 0x10($sp) -/* 854BC0 80242A50 24020002 */ addiu $v0, $zero, 2 -/* 854BC4 80242A54 3C018025 */ lui $at, %hi(D_80252D38) -/* 854BC8 80242A58 AC232D38 */ sw $v1, %lo(D_80252D38)($at) -/* 854BCC 80242A5C 03E00008 */ jr $ra -/* 854BD0 80242A60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s deleted file mode 100644 index afee376f02..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A64_854BD4 -/* 854BD4 80242A64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 854BD8 80242A68 AFBF0010 */ sw $ra, 0x10($sp) -/* 854BDC 80242A6C 0C00EABB */ jal get_npc_unsafe -/* 854BE0 80242A70 8C84008C */ lw $a0, 0x8c($a0) -/* 854BE4 80242A74 3C038025 */ lui $v1, %hi(D_80252D38) -/* 854BE8 80242A78 8C632D38 */ lw $v1, %lo(D_80252D38)($v1) -/* 854BEC 80242A7C AC430028 */ sw $v1, 0x28($v0) -/* 854BF0 80242A80 8FBF0010 */ lw $ra, 0x10($sp) -/* 854BF4 80242A84 24020002 */ addiu $v0, $zero, 2 -/* 854BF8 80242A88 03E00008 */ jr $ra -/* 854BFC 80242A8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s deleted file mode 100644 index 50abe8ea02..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C4_BA1EF4 -/* BA1EF4 802417C4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BA1EF8 802417C8 AFB20038 */ sw $s2, 0x38($sp) -/* BA1EFC 802417CC 0080902D */ daddu $s2, $a0, $zero -/* BA1F00 802417D0 AFBF0048 */ sw $ra, 0x48($sp) -/* BA1F04 802417D4 AFB50044 */ sw $s5, 0x44($sp) -/* BA1F08 802417D8 AFB40040 */ sw $s4, 0x40($sp) -/* BA1F0C 802417DC AFB3003C */ sw $s3, 0x3c($sp) -/* BA1F10 802417E0 AFB10034 */ sw $s1, 0x34($sp) -/* BA1F14 802417E4 AFB00030 */ sw $s0, 0x30($sp) -/* BA1F18 802417E8 8E510148 */ lw $s1, 0x148($s2) -/* BA1F1C 802417EC 86240008 */ lh $a0, 8($s1) -/* BA1F20 802417F0 0C00EABB */ jal get_npc_unsafe -/* BA1F24 802417F4 00A0802D */ daddu $s0, $a1, $zero -/* BA1F28 802417F8 8E43000C */ lw $v1, 0xc($s2) -/* BA1F2C 802417FC 0240202D */ daddu $a0, $s2, $zero -/* BA1F30 80241800 8C650000 */ lw $a1, ($v1) -/* BA1F34 80241804 0C0B1EAF */ jal evt_get_variable -/* BA1F38 80241808 0040A82D */ daddu $s5, $v0, $zero -/* BA1F3C 8024180C AFA00010 */ sw $zero, 0x10($sp) -/* BA1F40 80241810 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F44 80241814 8C630030 */ lw $v1, 0x30($v1) -/* BA1F48 80241818 AFA30014 */ sw $v1, 0x14($sp) -/* BA1F4C 8024181C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F50 80241820 8C63001C */ lw $v1, 0x1c($v1) -/* BA1F54 80241824 AFA30018 */ sw $v1, 0x18($sp) -/* BA1F58 80241828 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F5C 8024182C 8C630024 */ lw $v1, 0x24($v1) -/* BA1F60 80241830 AFA3001C */ sw $v1, 0x1c($sp) -/* BA1F64 80241834 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F68 80241838 8C630028 */ lw $v1, 0x28($v1) -/* BA1F6C 8024183C 27B40010 */ addiu $s4, $sp, 0x10 -/* BA1F70 80241840 AFA30020 */ sw $v1, 0x20($sp) -/* BA1F74 80241844 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA1F78 80241848 3C014348 */ lui $at, 0x4348 -/* BA1F7C 8024184C 44810000 */ mtc1 $at, $f0 -/* BA1F80 80241850 8C63002C */ lw $v1, 0x2c($v1) -/* BA1F84 80241854 0040982D */ daddu $s3, $v0, $zero -/* BA1F88 80241858 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA1F8C 8024185C A7A0002C */ sh $zero, 0x2c($sp) -/* BA1F90 80241860 16000005 */ bnez $s0, .L80241878 -/* BA1F94 80241864 AFA30024 */ sw $v1, 0x24($sp) -/* BA1F98 80241868 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA1F9C 8024186C 30420004 */ andi $v0, $v0, 4 -/* BA1FA0 80241870 10400011 */ beqz $v0, .L802418B8 -/* BA1FA4 80241874 00000000 */ nop -.L80241878: -/* BA1FA8 80241878 AE400070 */ sw $zero, 0x70($s2) -/* BA1FAC 8024187C A6A0008E */ sh $zero, 0x8e($s5) -/* BA1FB0 80241880 8E2200CC */ lw $v0, 0xcc($s1) -/* BA1FB4 80241884 8C420000 */ lw $v0, ($v0) -/* BA1FB8 80241888 AEA20028 */ sw $v0, 0x28($s5) -/* BA1FBC 8024188C 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA1FC0 80241890 30420004 */ andi $v0, $v0, 4 -/* BA1FC4 80241894 10400008 */ beqz $v0, .L802418B8 -/* BA1FC8 80241898 AE20006C */ sw $zero, 0x6c($s1) -/* BA1FCC 8024189C 24020063 */ addiu $v0, $zero, 0x63 -/* BA1FD0 802418A0 AE420070 */ sw $v0, 0x70($s2) -/* BA1FD4 802418A4 AE400074 */ sw $zero, 0x74($s2) -/* BA1FD8 802418A8 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA1FDC 802418AC 2403FFFB */ addiu $v1, $zero, -5 -/* BA1FE0 802418B0 00431024 */ and $v0, $v0, $v1 -/* BA1FE4 802418B4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802418B8: -/* BA1FE8 802418B8 8E430070 */ lw $v1, 0x70($s2) -/* BA1FEC 802418BC 2410000B */ addiu $s0, $zero, 0xb -/* BA1FF0 802418C0 1070002A */ beq $v1, $s0, .L8024196C -/* BA1FF4 802418C4 2862000C */ slti $v0, $v1, 0xc -/* BA1FF8 802418C8 1040000D */ beqz $v0, .L80241900 -/* BA1FFC 802418CC 24020001 */ addiu $v0, $zero, 1 -/* BA2000 802418D0 1062001A */ beq $v1, $v0, .L8024193C -/* BA2004 802418D4 28620002 */ slti $v0, $v1, 2 -/* BA2008 802418D8 10400005 */ beqz $v0, .L802418F0 -/* BA200C 802418DC 2402000A */ addiu $v0, $zero, 0xa -/* BA2010 802418E0 10600013 */ beqz $v1, .L80241930 -/* BA2014 802418E4 0240202D */ daddu $a0, $s2, $zero -/* BA2018 802418E8 0809067B */ j .L802419EC -/* BA201C 802418EC 00000000 */ nop -.L802418F0: -/* BA2020 802418F0 10620018 */ beq $v1, $v0, .L80241954 -/* BA2024 802418F4 0240202D */ daddu $a0, $s2, $zero -/* BA2028 802418F8 0809067B */ j .L802419EC -/* BA202C 802418FC 00000000 */ nop -.L80241900: -/* BA2030 80241900 2402000D */ addiu $v0, $zero, 0xd -/* BA2034 80241904 10620029 */ beq $v1, $v0, .L802419AC -/* BA2038 80241908 0062102A */ slt $v0, $v1, $v0 -/* BA203C 8024190C 14400020 */ bnez $v0, .L80241990 -/* BA2040 80241910 0240202D */ daddu $a0, $s2, $zero -/* BA2044 80241914 2402000E */ addiu $v0, $zero, 0xe -/* BA2048 80241918 1062002D */ beq $v1, $v0, .L802419D0 -/* BA204C 8024191C 24020063 */ addiu $v0, $zero, 0x63 -/* BA2050 80241920 10620030 */ beq $v1, $v0, .L802419E4 -/* BA2054 80241924 00000000 */ nop -/* BA2058 80241928 0809067B */ j .L802419EC -/* BA205C 8024192C 00000000 */ nop -.L80241930: -/* BA2060 80241930 0260282D */ daddu $a1, $s3, $zero -/* BA2064 80241934 0C090250 */ jal mim_05_UnkNpcAIFunc31 -/* BA2068 80241938 0280302D */ daddu $a2, $s4, $zero -.L8024193C: -/* BA206C 8024193C 0240202D */ daddu $a0, $s2, $zero -/* BA2070 80241940 0260282D */ daddu $a1, $s3, $zero -/* BA2074 80241944 0C09026B */ jal mim_05_UnkNpcAIFunc32 -/* BA2078 80241948 0280302D */ daddu $a2, $s4, $zero -/* BA207C 8024194C 0809067B */ j .L802419EC -/* BA2080 80241950 00000000 */ nop -.L80241954: -/* BA2084 80241954 0260282D */ daddu $a1, $s3, $zero -/* BA2088 80241958 0C0902AA */ jal mim_05_UnkNpcAIFunc46 -/* BA208C 8024195C 0280302D */ daddu $a2, $s4, $zero -/* BA2090 80241960 8E420070 */ lw $v0, 0x70($s2) -/* BA2094 80241964 14500021 */ bne $v0, $s0, .L802419EC -/* BA2098 80241968 00000000 */ nop -.L8024196C: -/* BA209C 8024196C 0240202D */ daddu $a0, $s2, $zero -/* BA20A0 80241970 0260282D */ daddu $a1, $s3, $zero -/* BA20A4 80241974 0C09053A */ jal mim_05_UnkNpcDurationFlagFunc3 -/* BA20A8 80241978 0280302D */ daddu $a2, $s4, $zero -/* BA20AC 8024197C 8E430070 */ lw $v1, 0x70($s2) -/* BA20B0 80241980 2402000C */ addiu $v0, $zero, 0xc -/* BA20B4 80241984 14620019 */ bne $v1, $v0, .L802419EC -/* BA20B8 80241988 00000000 */ nop -/* BA20BC 8024198C 0240202D */ daddu $a0, $s2, $zero -.L80241990: -/* BA20C0 80241990 0260282D */ daddu $a1, $s3, $zero -/* BA20C4 80241994 0C09055E */ jal mim_05_UnkNpcAIFunc33 -/* BA20C8 80241998 0280302D */ daddu $a2, $s4, $zero -/* BA20CC 8024199C 8E430070 */ lw $v1, 0x70($s2) -/* BA20D0 802419A0 2402000D */ addiu $v0, $zero, 0xd -/* BA20D4 802419A4 14620011 */ bne $v1, $v0, .L802419EC -/* BA20D8 802419A8 00000000 */ nop -.L802419AC: -/* BA20DC 802419AC 0240202D */ daddu $a0, $s2, $zero -/* BA20E0 802419B0 0260282D */ daddu $a1, $s3, $zero -/* BA20E4 802419B4 0C09059E */ jal mim_05_UnkNpcDurationFlagFunc2 -/* BA20E8 802419B8 0280302D */ daddu $a2, $s4, $zero -/* BA20EC 802419BC 8E430070 */ lw $v1, 0x70($s2) -/* BA20F0 802419C0 2402000E */ addiu $v0, $zero, 0xe -/* BA20F4 802419C4 14620009 */ bne $v1, $v0, .L802419EC -/* BA20F8 802419C8 00000000 */ nop -/* BA20FC 802419CC 0240202D */ daddu $a0, $s2, $zero -.L802419D0: -/* BA2100 802419D0 0260282D */ daddu $a1, $s3, $zero -/* BA2104 802419D4 0C0905B6 */ jal mim_05_UnkNpcAIFunc30 -/* BA2108 802419D8 0280302D */ daddu $a2, $s4, $zero -/* BA210C 802419DC 0809067B */ j .L802419EC -/* BA2110 802419E0 00000000 */ nop -.L802419E4: -/* BA2114 802419E4 0C0129CF */ jal func_8004A73C -/* BA2118 802419E8 0240202D */ daddu $a0, $s2, $zero -.L802419EC: -/* BA211C 802419EC 8FBF0048 */ lw $ra, 0x48($sp) -/* BA2120 802419F0 8FB50044 */ lw $s5, 0x44($sp) -/* BA2124 802419F4 8FB40040 */ lw $s4, 0x40($sp) -/* BA2128 802419F8 8FB3003C */ lw $s3, 0x3c($sp) -/* BA212C 802419FC 8FB20038 */ lw $s2, 0x38($sp) -/* BA2130 80241A00 8FB10034 */ lw $s1, 0x34($sp) -/* BA2134 80241A04 8FB00030 */ lw $s0, 0x30($sp) -/* BA2138 80241A08 0000102D */ daddu $v0, $zero, $zero -/* BA213C 80241A0C 03E00008 */ jr $ra -/* BA2140 80241A10 27BD0050 */ addiu $sp, $sp, 0x50 -/* BA2144 80241A14 00000000 */ nop -/* BA2148 80241A18 00000000 */ nop -/* BA214C 80241A1C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s deleted file mode 100644 index caafc5df0d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CC4_BA6444 -/* BA6444 80241CC4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BA6448 80241CC8 AFB20038 */ sw $s2, 0x38($sp) -/* BA644C 80241CCC 0080902D */ daddu $s2, $a0, $zero -/* BA6450 80241CD0 AFBF0048 */ sw $ra, 0x48($sp) -/* BA6454 80241CD4 AFB50044 */ sw $s5, 0x44($sp) -/* BA6458 80241CD8 AFB40040 */ sw $s4, 0x40($sp) -/* BA645C 80241CDC AFB3003C */ sw $s3, 0x3c($sp) -/* BA6460 80241CE0 AFB10034 */ sw $s1, 0x34($sp) -/* BA6464 80241CE4 AFB00030 */ sw $s0, 0x30($sp) -/* BA6468 80241CE8 8E510148 */ lw $s1, 0x148($s2) -/* BA646C 80241CEC 86240008 */ lh $a0, 8($s1) -/* BA6470 80241CF0 0C00EABB */ jal get_npc_unsafe -/* BA6474 80241CF4 00A0802D */ daddu $s0, $a1, $zero -/* BA6478 80241CF8 8E43000C */ lw $v1, 0xc($s2) -/* BA647C 80241CFC 0240202D */ daddu $a0, $s2, $zero -/* BA6480 80241D00 8C650000 */ lw $a1, ($v1) -/* BA6484 80241D04 0C0B1EAF */ jal evt_get_variable -/* BA6488 80241D08 0040A82D */ daddu $s5, $v0, $zero -/* BA648C 80241D0C AFA00010 */ sw $zero, 0x10($sp) -/* BA6490 80241D10 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA6494 80241D14 8C630030 */ lw $v1, 0x30($v1) -/* BA6498 80241D18 AFA30014 */ sw $v1, 0x14($sp) -/* BA649C 80241D1C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64A0 80241D20 8C63001C */ lw $v1, 0x1c($v1) -/* BA64A4 80241D24 AFA30018 */ sw $v1, 0x18($sp) -/* BA64A8 80241D28 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64AC 80241D2C 8C630024 */ lw $v1, 0x24($v1) -/* BA64B0 80241D30 AFA3001C */ sw $v1, 0x1c($sp) -/* BA64B4 80241D34 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64B8 80241D38 8C630028 */ lw $v1, 0x28($v1) -/* BA64BC 80241D3C 27B40010 */ addiu $s4, $sp, 0x10 -/* BA64C0 80241D40 AFA30020 */ sw $v1, 0x20($sp) -/* BA64C4 80241D44 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64C8 80241D48 3C014348 */ lui $at, 0x4348 -/* BA64CC 80241D4C 44810000 */ mtc1 $at, $f0 -/* BA64D0 80241D50 8C63002C */ lw $v1, 0x2c($v1) -/* BA64D4 80241D54 0040982D */ daddu $s3, $v0, $zero -/* BA64D8 80241D58 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA64DC 80241D5C A7A0002C */ sh $zero, 0x2c($sp) -/* BA64E0 80241D60 16000005 */ bnez $s0, .L80241D78 -/* BA64E4 80241D64 AFA30024 */ sw $v1, 0x24($sp) -/* BA64E8 80241D68 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA64EC 80241D6C 30420004 */ andi $v0, $v0, 4 -/* BA64F0 80241D70 10400011 */ beqz $v0, .L80241DB8 -/* BA64F4 80241D74 00000000 */ nop -.L80241D78: -/* BA64F8 80241D78 AE400070 */ sw $zero, 0x70($s2) -/* BA64FC 80241D7C A6A0008E */ sh $zero, 0x8e($s5) -/* BA6500 80241D80 8E2200CC */ lw $v0, 0xcc($s1) -/* BA6504 80241D84 8C420000 */ lw $v0, ($v0) -/* BA6508 80241D88 AEA20028 */ sw $v0, 0x28($s5) -/* BA650C 80241D8C 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA6510 80241D90 30420004 */ andi $v0, $v0, 4 -/* BA6514 80241D94 10400008 */ beqz $v0, .L80241DB8 -/* BA6518 80241D98 AE20006C */ sw $zero, 0x6c($s1) -/* BA651C 80241D9C 24020063 */ addiu $v0, $zero, 0x63 -/* BA6520 80241DA0 AE420070 */ sw $v0, 0x70($s2) -/* BA6524 80241DA4 AE400074 */ sw $zero, 0x74($s2) -/* BA6528 80241DA8 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA652C 80241DAC 2403FFFB */ addiu $v1, $zero, -5 -/* BA6530 80241DB0 00431024 */ and $v0, $v0, $v1 -/* BA6534 80241DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241DB8: -/* BA6538 80241DB8 8E430070 */ lw $v1, 0x70($s2) -/* BA653C 80241DBC 2410000B */ addiu $s0, $zero, 0xb -/* BA6540 80241DC0 1070002A */ beq $v1, $s0, .L80241E6C -/* BA6544 80241DC4 2862000C */ slti $v0, $v1, 0xc -/* BA6548 80241DC8 1040000D */ beqz $v0, .L80241E00 -/* BA654C 80241DCC 24020001 */ addiu $v0, $zero, 1 -/* BA6550 80241DD0 1062001A */ beq $v1, $v0, .L80241E3C -/* BA6554 80241DD4 28620002 */ slti $v0, $v1, 2 -/* BA6558 80241DD8 10400005 */ beqz $v0, .L80241DF0 -/* BA655C 80241DDC 2402000A */ addiu $v0, $zero, 0xa -/* BA6560 80241DE0 10600013 */ beqz $v1, .L80241E30 -/* BA6564 80241DE4 0240202D */ daddu $a0, $s2, $zero -/* BA6568 80241DE8 080907BB */ j .L80241EEC -/* BA656C 80241DEC 00000000 */ nop -.L80241DF0: -/* BA6570 80241DF0 10620018 */ beq $v1, $v0, .L80241E54 -/* BA6574 80241DF4 0240202D */ daddu $a0, $s2, $zero -/* BA6578 80241DF8 080907BB */ j .L80241EEC -/* BA657C 80241DFC 00000000 */ nop -.L80241E00: -/* BA6580 80241E00 2402000D */ addiu $v0, $zero, 0xd -/* BA6584 80241E04 10620029 */ beq $v1, $v0, .L80241EAC -/* BA6588 80241E08 0062102A */ slt $v0, $v1, $v0 -/* BA658C 80241E0C 14400020 */ bnez $v0, .L80241E90 -/* BA6590 80241E10 0240202D */ daddu $a0, $s2, $zero -/* BA6594 80241E14 2402000E */ addiu $v0, $zero, 0xe -/* BA6598 80241E18 1062002D */ beq $v1, $v0, .L80241ED0 -/* BA659C 80241E1C 24020063 */ addiu $v0, $zero, 0x63 -/* BA65A0 80241E20 10620030 */ beq $v1, $v0, .L80241EE4 -/* BA65A4 80241E24 00000000 */ nop -/* BA65A8 80241E28 080907BB */ j .L80241EEC -/* BA65AC 80241E2C 00000000 */ nop -.L80241E30: -/* BA65B0 80241E30 0260282D */ daddu $a1, $s3, $zero -/* BA65B4 80241E34 0C090390 */ jal mim_06_UnkNpcAIFunc31 -/* BA65B8 80241E38 0280302D */ daddu $a2, $s4, $zero -.L80241E3C: -/* BA65BC 80241E3C 0240202D */ daddu $a0, $s2, $zero -/* BA65C0 80241E40 0260282D */ daddu $a1, $s3, $zero -/* BA65C4 80241E44 0C0903AB */ jal mim_06_UnkNpcAIFunc32 -/* BA65C8 80241E48 0280302D */ daddu $a2, $s4, $zero -/* BA65CC 80241E4C 080907BB */ j .L80241EEC -/* BA65D0 80241E50 00000000 */ nop -.L80241E54: -/* BA65D4 80241E54 0260282D */ daddu $a1, $s3, $zero -/* BA65D8 80241E58 0C0903EA */ jal mim_06_UnkNpcAIFunc46 -/* BA65DC 80241E5C 0280302D */ daddu $a2, $s4, $zero -/* BA65E0 80241E60 8E420070 */ lw $v0, 0x70($s2) -/* BA65E4 80241E64 14500021 */ bne $v0, $s0, .L80241EEC -/* BA65E8 80241E68 00000000 */ nop -.L80241E6C: -/* BA65EC 80241E6C 0240202D */ daddu $a0, $s2, $zero -/* BA65F0 80241E70 0260282D */ daddu $a1, $s3, $zero -/* BA65F4 80241E74 0C09067A */ jal mim_06_UnkNpcDurationFlagFunc3 -/* BA65F8 80241E78 0280302D */ daddu $a2, $s4, $zero -/* BA65FC 80241E7C 8E430070 */ lw $v1, 0x70($s2) -/* BA6600 80241E80 2402000C */ addiu $v0, $zero, 0xc -/* BA6604 80241E84 14620019 */ bne $v1, $v0, .L80241EEC -/* BA6608 80241E88 00000000 */ nop -/* BA660C 80241E8C 0240202D */ daddu $a0, $s2, $zero -.L80241E90: -/* BA6610 80241E90 0260282D */ daddu $a1, $s3, $zero -/* BA6614 80241E94 0C09069E */ jal mim_06_UnkNpcAIFunc33 -/* BA6618 80241E98 0280302D */ daddu $a2, $s4, $zero -/* BA661C 80241E9C 8E430070 */ lw $v1, 0x70($s2) -/* BA6620 80241EA0 2402000D */ addiu $v0, $zero, 0xd -/* BA6624 80241EA4 14620011 */ bne $v1, $v0, .L80241EEC -/* BA6628 80241EA8 00000000 */ nop -.L80241EAC: -/* BA662C 80241EAC 0240202D */ daddu $a0, $s2, $zero -/* BA6630 80241EB0 0260282D */ daddu $a1, $s3, $zero -/* BA6634 80241EB4 0C0906DE */ jal mim_06_UnkNpcDurationFlagFunc2 -/* BA6638 80241EB8 0280302D */ daddu $a2, $s4, $zero -/* BA663C 80241EBC 8E430070 */ lw $v1, 0x70($s2) -/* BA6640 80241EC0 2402000E */ addiu $v0, $zero, 0xe -/* BA6644 80241EC4 14620009 */ bne $v1, $v0, .L80241EEC -/* BA6648 80241EC8 00000000 */ nop -/* BA664C 80241ECC 0240202D */ daddu $a0, $s2, $zero -.L80241ED0: -/* BA6650 80241ED0 0260282D */ daddu $a1, $s3, $zero -/* BA6654 80241ED4 0C0906F6 */ jal mim_06_UnkNpcAIFunc30 -/* BA6658 80241ED8 0280302D */ daddu $a2, $s4, $zero -/* BA665C 80241EDC 080907BB */ j .L80241EEC -/* BA6660 80241EE0 00000000 */ nop -.L80241EE4: -/* BA6664 80241EE4 0C0129CF */ jal func_8004A73C -/* BA6668 80241EE8 0240202D */ daddu $a0, $s2, $zero -.L80241EEC: -/* BA666C 80241EEC 8FBF0048 */ lw $ra, 0x48($sp) -/* BA6670 80241EF0 8FB50044 */ lw $s5, 0x44($sp) -/* BA6674 80241EF4 8FB40040 */ lw $s4, 0x40($sp) -/* BA6678 80241EF8 8FB3003C */ lw $s3, 0x3c($sp) -/* BA667C 80241EFC 8FB20038 */ lw $s2, 0x38($sp) -/* BA6680 80241F00 8FB10034 */ lw $s1, 0x34($sp) -/* BA6684 80241F04 8FB00030 */ lw $s0, 0x30($sp) -/* BA6688 80241F08 0000102D */ daddu $v0, $zero, $zero -/* BA668C 80241F0C 03E00008 */ jr $ra -/* BA6690 80241F10 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240068_BAD9A8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240068_BAD9A8.s deleted file mode 100644 index 73c7d0fcdb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240068_BAD9A8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_BAD9A8 -/* BAD9A8 80240068 44806000 */ mtc1 $zero, $f12 -/* BAD9AC 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAD9B0 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* BAD9B4 80240074 0080802D */ daddu $s0, $a0, $zero -/* BAD9B8 80240078 AFBF0014 */ sw $ra, 0x14($sp) -/* BAD9BC 8024007C 0C038022 */ jal get_xz_dist_to_player -/* BAD9C0 80240080 46006386 */ mov.s $f14, $f12 -/* BAD9C4 80240084 4600008D */ trunc.w.s $f2, $f0 -/* BAD9C8 80240088 E6020084 */ swc1 $f2, 0x84($s0) -/* BAD9CC 8024008C 8FBF0014 */ lw $ra, 0x14($sp) -/* BAD9D0 80240090 8FB00010 */ lw $s0, 0x10($sp) -/* BAD9D4 80240094 24020002 */ addiu $v0, $zero, 2 -/* BAD9D8 80240098 03E00008 */ jr $ra -/* BAD9DC 8024009C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s deleted file mode 100644 index 9cc801ef6f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s +++ /dev/null @@ -1,166 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CEC_BB062C -/* BB062C 80242CEC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BB0630 80242CF0 AFB20038 */ sw $s2, 0x38($sp) -/* BB0634 80242CF4 0080902D */ daddu $s2, $a0, $zero -/* BB0638 80242CF8 AFBF0048 */ sw $ra, 0x48($sp) -/* BB063C 80242CFC AFB50044 */ sw $s5, 0x44($sp) -/* BB0640 80242D00 AFB40040 */ sw $s4, 0x40($sp) -/* BB0644 80242D04 AFB3003C */ sw $s3, 0x3c($sp) -/* BB0648 80242D08 AFB10034 */ sw $s1, 0x34($sp) -/* BB064C 80242D0C AFB00030 */ sw $s0, 0x30($sp) -/* BB0650 80242D10 8E510148 */ lw $s1, 0x148($s2) -/* BB0654 80242D14 86240008 */ lh $a0, 8($s1) -/* BB0658 80242D18 0C00EABB */ jal get_npc_unsafe -/* BB065C 80242D1C 00A0802D */ daddu $s0, $a1, $zero -/* BB0660 80242D20 8E43000C */ lw $v1, 0xc($s2) -/* BB0664 80242D24 0240202D */ daddu $a0, $s2, $zero -/* BB0668 80242D28 8C650000 */ lw $a1, ($v1) -/* BB066C 80242D2C 0C0B1EAF */ jal evt_get_variable -/* BB0670 80242D30 0040A82D */ daddu $s5, $v0, $zero -/* BB0674 80242D34 AFA00010 */ sw $zero, 0x10($sp) -/* BB0678 80242D38 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB067C 80242D3C 8C630030 */ lw $v1, 0x30($v1) -/* BB0680 80242D40 AFA30014 */ sw $v1, 0x14($sp) -/* BB0684 80242D44 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB0688 80242D48 8C63001C */ lw $v1, 0x1c($v1) -/* BB068C 80242D4C AFA30018 */ sw $v1, 0x18($sp) -/* BB0690 80242D50 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB0694 80242D54 8C630024 */ lw $v1, 0x24($v1) -/* BB0698 80242D58 AFA3001C */ sw $v1, 0x1c($sp) -/* BB069C 80242D5C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB06A0 80242D60 8C630028 */ lw $v1, 0x28($v1) -/* BB06A4 80242D64 27B40010 */ addiu $s4, $sp, 0x10 -/* BB06A8 80242D68 AFA30020 */ sw $v1, 0x20($sp) -/* BB06AC 80242D6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB06B0 80242D70 3C014348 */ lui $at, 0x4348 -/* BB06B4 80242D74 44810000 */ mtc1 $at, $f0 -/* BB06B8 80242D78 8C63002C */ lw $v1, 0x2c($v1) -/* BB06BC 80242D7C 0040982D */ daddu $s3, $v0, $zero -/* BB06C0 80242D80 E7A00028 */ swc1 $f0, 0x28($sp) -/* BB06C4 80242D84 A7A0002C */ sh $zero, 0x2c($sp) -/* BB06C8 80242D88 16000005 */ bnez $s0, .L80242DA0 -/* BB06CC 80242D8C AFA30024 */ sw $v1, 0x24($sp) -/* BB06D0 80242D90 8E2200B0 */ lw $v0, 0xb0($s1) -/* BB06D4 80242D94 30420004 */ andi $v0, $v0, 4 -/* BB06D8 80242D98 10400011 */ beqz $v0, .L80242DE0 -/* BB06DC 80242D9C 00000000 */ nop -.L80242DA0: -/* BB06E0 80242DA0 AE400070 */ sw $zero, 0x70($s2) -/* BB06E4 80242DA4 A6A0008E */ sh $zero, 0x8e($s5) -/* BB06E8 80242DA8 8E2200CC */ lw $v0, 0xcc($s1) -/* BB06EC 80242DAC 8C420000 */ lw $v0, ($v0) -/* BB06F0 80242DB0 AEA20028 */ sw $v0, 0x28($s5) -/* BB06F4 80242DB4 8E2200B0 */ lw $v0, 0xb0($s1) -/* BB06F8 80242DB8 30420004 */ andi $v0, $v0, 4 -/* BB06FC 80242DBC 10400008 */ beqz $v0, .L80242DE0 -/* BB0700 80242DC0 AE20006C */ sw $zero, 0x6c($s1) -/* BB0704 80242DC4 24020063 */ addiu $v0, $zero, 0x63 -/* BB0708 80242DC8 AE420070 */ sw $v0, 0x70($s2) -/* BB070C 80242DCC AE400074 */ sw $zero, 0x74($s2) -/* BB0710 80242DD0 8E2200B0 */ lw $v0, 0xb0($s1) -/* BB0714 80242DD4 2403FFFB */ addiu $v1, $zero, -5 -/* BB0718 80242DD8 00431024 */ and $v0, $v0, $v1 -/* BB071C 80242DDC AE2200B0 */ sw $v0, 0xb0($s1) -.L80242DE0: -/* BB0720 80242DE0 8E430070 */ lw $v1, 0x70($s2) -/* BB0724 80242DE4 2410000B */ addiu $s0, $zero, 0xb -/* BB0728 80242DE8 1070002A */ beq $v1, $s0, .L80242E94 -/* BB072C 80242DEC 2862000C */ slti $v0, $v1, 0xc -/* BB0730 80242DF0 1040000D */ beqz $v0, .L80242E28 -/* BB0734 80242DF4 24020001 */ addiu $v0, $zero, 1 -/* BB0738 80242DF8 1062001A */ beq $v1, $v0, .L80242E64 -/* BB073C 80242DFC 28620002 */ slti $v0, $v1, 2 -/* BB0740 80242E00 10400005 */ beqz $v0, .L80242E18 -/* BB0744 80242E04 2402000A */ addiu $v0, $zero, 0xa -/* BB0748 80242E08 10600013 */ beqz $v1, .L80242E58 -/* BB074C 80242E0C 0240202D */ daddu $a0, $s2, $zero -/* BB0750 80242E10 08090BC5 */ j .L80242F14 -/* BB0754 80242E14 00000000 */ nop -.L80242E18: -/* BB0758 80242E18 10620018 */ beq $v1, $v0, .L80242E7C -/* BB075C 80242E1C 0240202D */ daddu $a0, $s2, $zero -/* BB0760 80242E20 08090BC5 */ j .L80242F14 -/* BB0764 80242E24 00000000 */ nop -.L80242E28: -/* BB0768 80242E28 2402000D */ addiu $v0, $zero, 0xd -/* BB076C 80242E2C 10620029 */ beq $v1, $v0, .L80242ED4 -/* BB0770 80242E30 0062102A */ slt $v0, $v1, $v0 -/* BB0774 80242E34 14400020 */ bnez $v0, .L80242EB8 -/* BB0778 80242E38 0240202D */ daddu $a0, $s2, $zero -/* BB077C 80242E3C 2402000E */ addiu $v0, $zero, 0xe -/* BB0780 80242E40 1062002D */ beq $v1, $v0, .L80242EF8 -/* BB0784 80242E44 24020063 */ addiu $v0, $zero, 0x63 -/* BB0788 80242E48 10620030 */ beq $v1, $v0, .L80242F0C -/* BB078C 80242E4C 00000000 */ nop -/* BB0790 80242E50 08090BC5 */ j .L80242F14 -/* BB0794 80242E54 00000000 */ nop -.L80242E58: -/* BB0798 80242E58 0260282D */ daddu $a1, $s3, $zero -/* BB079C 80242E5C 0C09079A */ jal mim_08_UnkNpcAIFunc31 -/* BB07A0 80242E60 0280302D */ daddu $a2, $s4, $zero -.L80242E64: -/* BB07A4 80242E64 0240202D */ daddu $a0, $s2, $zero -/* BB07A8 80242E68 0260282D */ daddu $a1, $s3, $zero -/* BB07AC 80242E6C 0C0907B5 */ jal mim_08_UnkNpcAIFunc32 -/* BB07B0 80242E70 0280302D */ daddu $a2, $s4, $zero -/* BB07B4 80242E74 08090BC5 */ j .L80242F14 -/* BB07B8 80242E78 00000000 */ nop -.L80242E7C: -/* BB07BC 80242E7C 0260282D */ daddu $a1, $s3, $zero -/* BB07C0 80242E80 0C0907F4 */ jal mim_08_UnkNpcAIFunc46 -/* BB07C4 80242E84 0280302D */ daddu $a2, $s4, $zero -/* BB07C8 80242E88 8E420070 */ lw $v0, 0x70($s2) -/* BB07CC 80242E8C 14500021 */ bne $v0, $s0, .L80242F14 -/* BB07D0 80242E90 00000000 */ nop -.L80242E94: -/* BB07D4 80242E94 0240202D */ daddu $a0, $s2, $zero -/* BB07D8 80242E98 0260282D */ daddu $a1, $s3, $zero -/* BB07DC 80242E9C 0C090A84 */ jal mim_08_UnkNpcDurationFlagFunc3 -/* BB07E0 80242EA0 0280302D */ daddu $a2, $s4, $zero -/* BB07E4 80242EA4 8E430070 */ lw $v1, 0x70($s2) -/* BB07E8 80242EA8 2402000C */ addiu $v0, $zero, 0xc -/* BB07EC 80242EAC 14620019 */ bne $v1, $v0, .L80242F14 -/* BB07F0 80242EB0 00000000 */ nop -/* BB07F4 80242EB4 0240202D */ daddu $a0, $s2, $zero -.L80242EB8: -/* BB07F8 80242EB8 0260282D */ daddu $a1, $s3, $zero -/* BB07FC 80242EBC 0C090AA8 */ jal mim_08_UnkNpcAIFunc33 -/* BB0800 80242EC0 0280302D */ daddu $a2, $s4, $zero -/* BB0804 80242EC4 8E430070 */ lw $v1, 0x70($s2) -/* BB0808 80242EC8 2402000D */ addiu $v0, $zero, 0xd -/* BB080C 80242ECC 14620011 */ bne $v1, $v0, .L80242F14 -/* BB0810 80242ED0 00000000 */ nop -.L80242ED4: -/* BB0814 80242ED4 0240202D */ daddu $a0, $s2, $zero -/* BB0818 80242ED8 0260282D */ daddu $a1, $s3, $zero -/* BB081C 80242EDC 0C090AE8 */ jal mim_08_UnkNpcDurationFlagFunc2 -/* BB0820 80242EE0 0280302D */ daddu $a2, $s4, $zero -/* BB0824 80242EE4 8E430070 */ lw $v1, 0x70($s2) -/* BB0828 80242EE8 2402000E */ addiu $v0, $zero, 0xe -/* BB082C 80242EEC 14620009 */ bne $v1, $v0, .L80242F14 -/* BB0830 80242EF0 00000000 */ nop -/* BB0834 80242EF4 0240202D */ daddu $a0, $s2, $zero -.L80242EF8: -/* BB0838 80242EF8 0260282D */ daddu $a1, $s3, $zero -/* BB083C 80242EFC 0C090B00 */ jal mim_08_UnkNpcAIFunc30 -/* BB0840 80242F00 0280302D */ daddu $a2, $s4, $zero -/* BB0844 80242F04 08090BC5 */ j .L80242F14 -/* BB0848 80242F08 00000000 */ nop -.L80242F0C: -/* BB084C 80242F0C 0C0129CF */ jal func_8004A73C -/* BB0850 80242F10 0240202D */ daddu $a0, $s2, $zero -.L80242F14: -/* BB0854 80242F14 8FBF0048 */ lw $ra, 0x48($sp) -/* BB0858 80242F18 8FB50044 */ lw $s5, 0x44($sp) -/* BB085C 80242F1C 8FB40040 */ lw $s4, 0x40($sp) -/* BB0860 80242F20 8FB3003C */ lw $s3, 0x3c($sp) -/* BB0864 80242F24 8FB20038 */ lw $s2, 0x38($sp) -/* BB0868 80242F28 8FB10034 */ lw $s1, 0x34($sp) -/* BB086C 80242F2C 8FB00030 */ lw $s0, 0x30($sp) -/* BB0870 80242F30 0000102D */ daddu $v0, $zero, $zero -/* BB0874 80242F34 03E00008 */ jr $ra -/* BB0878 80242F38 27BD0050 */ addiu $sp, $sp, 0x50 -/* BB087C 80242F3C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s deleted file mode 100644 index 67dbb0932d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423CC_9C77AC -/* 9C77AC 802423CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C77B0 802423D0 AFB00010 */ sw $s0, 0x10($sp) -/* 9C77B4 802423D4 0080802D */ daddu $s0, $a0, $zero -/* 9C77B8 802423D8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C77BC 802423DC 0C00EABB */ jal get_npc_unsafe -/* 9C77C0 802423E0 8E04008C */ lw $a0, 0x8c($s0) -/* 9C77C4 802423E4 0040282D */ daddu $a1, $v0, $zero -/* 9C77C8 802423E8 8E040094 */ lw $a0, 0x94($s0) -/* 9C77CC 802423EC 8CA30028 */ lw $v1, 0x28($a1) -/* 9C77D0 802423F0 ACA40028 */ sw $a0, 0x28($a1) -/* 9C77D4 802423F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C77D8 802423F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C77DC 802423FC 24020002 */ addiu $v0, $zero, 2 -/* 9C77E0 80242400 3C018025 */ lui $at, %hi(D_80251E34) -/* 9C77E4 80242404 AC231E34 */ sw $v1, %lo(D_80251E34)($at) -/* 9C77E8 80242408 03E00008 */ jr $ra -/* 9C77EC 8024240C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s deleted file mode 100644 index 0a6d8da8b4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242410_9C77F0 -/* 9C77F0 80242410 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C77F4 80242414 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C77F8 80242418 0C00EABB */ jal get_npc_unsafe -/* 9C77FC 8024241C 8C84008C */ lw $a0, 0x8c($a0) -/* 9C7800 80242420 3C038025 */ lui $v1, %hi(D_80251E34) -/* 9C7804 80242424 8C631E34 */ lw $v1, %lo(D_80251E34)($v1) -/* 9C7808 80242428 AC430028 */ sw $v1, 0x28($v0) -/* 9C780C 8024242C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7810 80242430 24020002 */ addiu $v0, $zero, 2 -/* 9C7814 80242434 03E00008 */ jr $ra -/* 9C7818 80242438 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s deleted file mode 100644 index 1be58a0fa1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74_9D9F94 -/* 9D9F94 80242F74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9F98 80242F78 AFB00010 */ sw $s0, 0x10($sp) -/* 9D9F9C 80242F7C 0080802D */ daddu $s0, $a0, $zero -/* 9D9FA0 80242F80 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D9FA4 80242F84 0C00EABB */ jal get_npc_unsafe -/* 9D9FA8 80242F88 8E04008C */ lw $a0, 0x8c($s0) -/* 9D9FAC 80242F8C 0040282D */ daddu $a1, $v0, $zero -/* 9D9FB0 80242F90 8E040094 */ lw $a0, 0x94($s0) -/* 9D9FB4 80242F94 8CA30028 */ lw $v1, 0x28($a1) -/* 9D9FB8 80242F98 ACA40028 */ sw $a0, 0x28($a1) -/* 9D9FBC 80242F9C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D9FC0 80242FA0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9FC4 80242FA4 24020002 */ addiu $v0, $zero, 2 -/* 9D9FC8 80242FA8 3C018025 */ lui $at, %hi(D_80254B94) -/* 9D9FCC 80242FAC AC234B94 */ sw $v1, %lo(D_80254B94)($at) -/* 9D9FD0 80242FB0 03E00008 */ jr $ra -/* 9D9FD4 80242FB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s deleted file mode 100644 index a3ee8e5415..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FB8_9D9FD8 -/* 9D9FD8 80242FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9FDC 80242FBC AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9FE0 80242FC0 0C00EABB */ jal get_npc_unsafe -/* 9D9FE4 80242FC4 8C84008C */ lw $a0, 0x8c($a0) -/* 9D9FE8 80242FC8 3C038025 */ lui $v1, %hi(D_80254B94) -/* 9D9FEC 80242FCC 8C634B94 */ lw $v1, %lo(D_80254B94)($v1) -/* 9D9FF0 80242FD0 AC430028 */ sw $v1, 0x28($v0) -/* 9D9FF4 80242FD4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9FF8 80242FD8 24020002 */ addiu $v0, $zero, 2 -/* 9D9FFC 80242FDC 03E00008 */ jr $ra -/* 9DA000 80242FE0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s deleted file mode 100644 index 21c856e8d0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241E8C_A046CC.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E8C_A046CC -/* A046CC 80241E8C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A046D0 80241E90 AFB3001C */ sw $s3, 0x1c($sp) -/* A046D4 80241E94 0080982D */ daddu $s3, $a0, $zero -/* A046D8 80241E98 AFBF0020 */ sw $ra, 0x20($sp) -/* A046DC 80241E9C AFB20018 */ sw $s2, 0x18($sp) -/* A046E0 80241EA0 AFB10014 */ sw $s1, 0x14($sp) -/* A046E4 80241EA4 AFB00010 */ sw $s0, 0x10($sp) -/* A046E8 80241EA8 8E710148 */ lw $s1, 0x148($s3) -/* A046EC 80241EAC 0C00EABB */ jal get_npc_unsafe -/* A046F0 80241EB0 86240008 */ lh $a0, 8($s1) -/* A046F4 80241EB4 0040802D */ daddu $s0, $v0, $zero -/* A046F8 80241EB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A046FC 80241EBC 8E2200CC */ lw $v0, 0xcc($s1) -/* A04700 80241EC0 3C01C0A0 */ lui $at, 0xc0a0 -/* A04704 80241EC4 44811000 */ mtc1 $at, $f2 -/* A04708 80241EC8 3C013E19 */ lui $at, 0x3e19 -/* A0470C 80241ECC 3421999A */ ori $at, $at, 0x999a -/* A04710 80241ED0 44810000 */ mtc1 $at, $f0 -/* A04714 80241ED4 8C420024 */ lw $v0, 0x24($v0) -/* A04718 80241ED8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* A0471C 80241EDC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* A04720 80241EE0 E602001C */ swc1 $f2, 0x1c($s0) -/* A04724 80241EE4 E6000014 */ swc1 $f0, 0x14($s0) -/* A04728 80241EE8 AE020028 */ sw $v0, 0x28($s0) -/* A0472C 80241EEC 8E22008C */ lw $v0, 0x8c($s1) -/* A04730 80241EF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A04734 80241EF4 00021FC2 */ srl $v1, $v0, 0x1f -/* A04738 80241EF8 00431021 */ addu $v0, $v0, $v1 -/* A0473C 80241EFC 8E430000 */ lw $v1, ($s2) -/* A04740 80241F00 00021043 */ sra $v0, $v0, 1 -/* A04744 80241F04 A60200A8 */ sh $v0, 0xa8($s0) -/* A04748 80241F08 8C660028 */ lw $a2, 0x28($v1) -/* A0474C 80241F0C 0C00A7B5 */ jal dist2D -/* A04750 80241F10 8C670030 */ lw $a3, 0x30($v1) -/* A04754 80241F14 0200202D */ daddu $a0, $s0, $zero -/* A04758 80241F18 0000302D */ daddu $a2, $zero, $zero -/* A0475C 80241F1C C6020038 */ lwc1 $f2, 0x38($s0) -/* A04760 80241F20 3C0140E0 */ lui $at, 0x40e0 -/* A04764 80241F24 44810000 */ mtc1 $at, $f0 -/* A04768 80241F28 4600110D */ trunc.w.s $f4, $f2 -/* A0476C 80241F2C 44022000 */ mfc1 $v0, $f4 -/* A04770 80241F30 E6000018 */ swc1 $f0, 0x18($s0) -/* A04774 80241F34 A6220010 */ sh $v0, 0x10($s1) -/* A04778 80241F38 C600003C */ lwc1 $f0, 0x3c($s0) -/* A0477C 80241F3C 240502C1 */ addiu $a1, $zero, 0x2c1 -/* A04780 80241F40 4600010D */ trunc.w.s $f4, $f0 -/* A04784 80241F44 44022000 */ mfc1 $v0, $f4 -/* A04788 80241F48 00000000 */ nop -/* A0478C 80241F4C A6220012 */ sh $v0, 0x12($s1) -/* A04790 80241F50 C6000040 */ lwc1 $f0, 0x40($s0) -/* A04794 80241F54 24020001 */ addiu $v0, $zero, 1 -/* A04798 80241F58 A2220007 */ sb $v0, 7($s1) -/* A0479C 80241F5C 4600010D */ trunc.w.s $f4, $f0 -/* A047A0 80241F60 44022000 */ mfc1 $v0, $f4 -/* A047A4 80241F64 0C012530 */ jal ai_enemy_play_sound -/* A047A8 80241F68 A6220014 */ sh $v0, 0x14($s1) -/* A047AC 80241F6C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A047B0 80241F70 8E420000 */ lw $v0, ($s2) -/* A047B4 80241F74 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A047B8 80241F78 8C460028 */ lw $a2, 0x28($v0) -/* A047BC 80241F7C 0C00A720 */ jal atan2 -/* A047C0 80241F80 8C470030 */ lw $a3, 0x30($v0) -/* A047C4 80241F84 2402000C */ addiu $v0, $zero, 0xc -/* A047C8 80241F88 A602008E */ sh $v0, 0x8e($s0) -/* A047CC 80241F8C 2402000D */ addiu $v0, $zero, 0xd -/* A047D0 80241F90 E600000C */ swc1 $f0, 0xc($s0) -/* A047D4 80241F94 AE620070 */ sw $v0, 0x70($s3) -/* A047D8 80241F98 8FBF0020 */ lw $ra, 0x20($sp) -/* A047DC 80241F9C 8FB3001C */ lw $s3, 0x1c($sp) -/* A047E0 80241FA0 8FB20018 */ lw $s2, 0x18($sp) -/* A047E4 80241FA4 8FB10014 */ lw $s1, 0x14($sp) -/* A047E8 80241FA8 8FB00010 */ lw $s0, 0x10($sp) -/* A047EC 80241FAC 03E00008 */ jr $ra -/* A047F0 80241FB0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s deleted file mode 100644 index dd22bd0eb3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FB4_A047F4 -/* A047F4 80241FB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A047F8 80241FB8 AFB20018 */ sw $s2, 0x18($sp) -/* A047FC 80241FBC 0080902D */ daddu $s2, $a0, $zero -/* A04800 80241FC0 AFBF001C */ sw $ra, 0x1c($sp) -/* A04804 80241FC4 AFB10014 */ sw $s1, 0x14($sp) -/* A04808 80241FC8 AFB00010 */ sw $s0, 0x10($sp) -/* A0480C 80241FCC 8E510148 */ lw $s1, 0x148($s2) -/* A04810 80241FD0 0C00EABB */ jal get_npc_unsafe -/* A04814 80241FD4 86240008 */ lh $a0, 8($s1) -/* A04818 80241FD8 0040802D */ daddu $s0, $v0, $zero -/* A0481C 80241FDC C602001C */ lwc1 $f2, 0x1c($s0) -/* A04820 80241FE0 C6000014 */ lwc1 $f0, 0x14($s0) -/* A04824 80241FE4 8E050018 */ lw $a1, 0x18($s0) -/* A04828 80241FE8 46001080 */ add.s $f2, $f2, $f0 -/* A0482C 80241FEC C600003C */ lwc1 $f0, 0x3c($s0) -/* A04830 80241FF0 8E06000C */ lw $a2, 0xc($s0) -/* A04834 80241FF4 46020000 */ add.s $f0, $f0, $f2 -/* A04838 80241FF8 0200202D */ daddu $a0, $s0, $zero -/* A0483C 80241FFC E602001C */ swc1 $f2, 0x1c($s0) -/* A04840 80242000 0C00EA95 */ jal npc_move_heading -/* A04844 80242004 E600003C */ swc1 $f0, 0x3c($s0) -/* A04848 80242008 9602008E */ lhu $v0, 0x8e($s0) -/* A0484C 8024200C 2442FFFF */ addiu $v0, $v0, -1 -/* A04850 80242010 A602008E */ sh $v0, 0x8e($s0) -/* A04854 80242014 00021400 */ sll $v0, $v0, 0x10 -/* A04858 80242018 1C40000F */ bgtz $v0, .L80242058 -/* A0485C 8024201C 00000000 */ nop -/* A04860 80242020 3C013E99 */ lui $at, 0x3e99 -/* A04864 80242024 3421999A */ ori $at, $at, 0x999a -/* A04868 80242028 44810000 */ mtc1 $at, $f0 -/* A0486C 8024202C 3C014040 */ lui $at, 0x4040 -/* A04870 80242030 44811000 */ mtc1 $at, $f2 -/* A04874 80242034 A2200007 */ sb $zero, 7($s1) -/* A04878 80242038 AE00001C */ sw $zero, 0x1c($s0) -/* A0487C 8024203C E6000014 */ swc1 $f0, 0x14($s0) -/* A04880 80242040 E6020018 */ swc1 $f2, 0x18($s0) -/* A04884 80242044 8E2200CC */ lw $v0, 0xcc($s1) -/* A04888 80242048 8C420028 */ lw $v0, 0x28($v0) -/* A0488C 8024204C AE020028 */ sw $v0, 0x28($s0) -/* A04890 80242050 2402000E */ addiu $v0, $zero, 0xe -/* A04894 80242054 AE420070 */ sw $v0, 0x70($s2) -.L80242058: -/* A04898 80242058 8FBF001C */ lw $ra, 0x1c($sp) -/* A0489C 8024205C 8FB20018 */ lw $s2, 0x18($sp) -/* A048A0 80242060 8FB10014 */ lw $s1, 0x14($sp) -/* A048A4 80242064 8FB00010 */ lw $s0, 0x10($sp) -/* A048A8 80242068 03E00008 */ jr $ra -/* A048AC 8024206C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s deleted file mode 100644 index 62c329d83b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242070_A048B0 -/* A048B0 80242070 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A048B4 80242074 AFB20030 */ sw $s2, 0x30($sp) -/* A048B8 80242078 0080902D */ daddu $s2, $a0, $zero -/* A048BC 8024207C AFBF0034 */ sw $ra, 0x34($sp) -/* A048C0 80242080 AFB1002C */ sw $s1, 0x2c($sp) -/* A048C4 80242084 AFB00028 */ sw $s0, 0x28($sp) -/* A048C8 80242088 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A048CC 8024208C 8E510148 */ lw $s1, 0x148($s2) -/* A048D0 80242090 0C00EABB */ jal get_npc_unsafe -/* A048D4 80242094 86240008 */ lh $a0, 8($s1) -/* A048D8 80242098 0040802D */ daddu $s0, $v0, $zero -/* A048DC 8024209C C604001C */ lwc1 $f4, 0x1c($s0) -/* A048E0 802420A0 C6000014 */ lwc1 $f0, 0x14($s0) -/* A048E4 802420A4 0200202D */ daddu $a0, $s0, $zero -/* A048E8 802420A8 46002100 */ add.s $f4, $f4, $f0 -/* A048EC 802420AC C602003C */ lwc1 $f2, 0x3c($s0) -/* A048F0 802420B0 8E050018 */ lw $a1, 0x18($s0) -/* A048F4 802420B4 46041080 */ add.s $f2, $f2, $f4 -/* A048F8 802420B8 8E06000C */ lw $a2, 0xc($s0) -/* A048FC 802420BC C6200078 */ lwc1 $f0, 0x78($s1) -/* A04900 802420C0 46800020 */ cvt.s.w $f0, $f0 -/* A04904 802420C4 E602003C */ swc1 $f2, 0x3c($s0) -/* A04908 802420C8 3C014059 */ lui $at, 0x4059 -/* A0490C 802420CC 44811800 */ mtc1 $at, $f3 -/* A04910 802420D0 44801000 */ mtc1 $zero, $f2 -/* A04914 802420D4 46000021 */ cvt.d.s $f0, $f0 -/* A04918 802420D8 E604001C */ swc1 $f4, 0x1c($s0) -/* A0491C 802420DC 46220003 */ div.d $f0, $f0, $f2 -/* A04920 802420E0 0C00EA95 */ jal npc_move_heading -/* A04924 802420E4 46200520 */ cvt.s.d $f20, $f0 -/* A04928 802420E8 27A50018 */ addiu $a1, $sp, 0x18 -/* A0492C 802420EC 27A6001C */ addiu $a2, $sp, 0x1c -/* A04930 802420F0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A04934 802420F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* A04938 802420F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0493C 802420FC 3C01447A */ lui $at, 0x447a -/* A04940 80242100 44813000 */ mtc1 $at, $f6 -/* A04944 80242104 27A20024 */ addiu $v0, $sp, 0x24 -/* A04948 80242108 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0494C 8024210C E7A2001C */ swc1 $f2, 0x1c($sp) -/* A04950 80242110 E7A40020 */ swc1 $f4, 0x20($sp) -/* A04954 80242114 E7A60024 */ swc1 $f6, 0x24($sp) -/* A04958 80242118 AFA20010 */ sw $v0, 0x10($sp) -/* A0495C 8024211C 8E040080 */ lw $a0, 0x80($s0) -/* A04960 80242120 0C0372DF */ jal npc_raycast_down_sides -/* A04964 80242124 27A70020 */ addiu $a3, $sp, 0x20 -/* A04968 80242128 10400003 */ beqz $v0, .L80242138 -/* A0496C 8024212C 4600A086 */ mov.s $f2, $f20 -/* A04970 80242130 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04974 80242134 46140080 */ add.s $f2, $f0, $f20 -.L80242138: -/* A04978 80242138 C600003C */ lwc1 $f0, 0x3c($s0) -/* A0497C 8024213C 4602003C */ c.lt.s $f0, $f2 -/* A04980 80242140 00000000 */ nop -/* A04984 80242144 45010009 */ bc1t .L8024216C -/* A04988 80242148 2402000A */ addiu $v0, $zero, 0xa -/* A0498C 8024214C A602008E */ sh $v0, 0x8e($s0) -/* A04990 80242150 8E2200CC */ lw $v0, 0xcc($s1) -/* A04994 80242154 8C42002C */ lw $v0, 0x2c($v0) -/* A04998 80242158 AE020028 */ sw $v0, 0x28($s0) -/* A0499C 8024215C 9622008E */ lhu $v0, 0x8e($s1) -/* A049A0 80242160 A60200A8 */ sh $v0, 0xa8($s0) -/* A049A4 80242164 2402000F */ addiu $v0, $zero, 0xf -/* A049A8 80242168 AE420070 */ sw $v0, 0x70($s2) -.L8024216C: -/* A049AC 8024216C 8FBF0034 */ lw $ra, 0x34($sp) -/* A049B0 80242170 8FB20030 */ lw $s2, 0x30($sp) -/* A049B4 80242174 8FB1002C */ lw $s1, 0x2c($sp) -/* A049B8 80242178 8FB00028 */ lw $s0, 0x28($sp) -/* A049BC 8024217C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A049C0 80242180 03E00008 */ jr $ra -/* A049C4 80242184 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s deleted file mode 100644 index 7dee796da0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ /dev/null @@ -1,174 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244678_A06EB8 -.word .L802422E4_A04B24, .L802422F4_A04B34, .L80242314_A04B54, .L80242324_A04B64, .L802423F4_A04C34, .L802423F4_A04C34, .L802423F4_A04C34, .L802423F4_A04C34, .L802423F4_A04C34, .L802423F4_A04C34, .L80242344_A04B84, .L80242364_A04BA4, .L80242384_A04BC4, .L802423A4_A04BE4, .L802423C4_A04C04, .L802423E4_A04C24, 0, 0 - -.section .text - -glabel func_802421CC_A04A0C -/* A04A0C 802421CC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A04A10 802421D0 AFB3003C */ sw $s3, 0x3c($sp) -/* A04A14 802421D4 0080982D */ daddu $s3, $a0, $zero -/* A04A18 802421D8 AFBF0048 */ sw $ra, 0x48($sp) -/* A04A1C 802421DC AFB50044 */ sw $s5, 0x44($sp) -/* A04A20 802421E0 AFB40040 */ sw $s4, 0x40($sp) -/* A04A24 802421E4 AFB20038 */ sw $s2, 0x38($sp) -/* A04A28 802421E8 AFB10034 */ sw $s1, 0x34($sp) -/* A04A2C 802421EC AFB00030 */ sw $s0, 0x30($sp) -/* A04A30 802421F0 8E720148 */ lw $s2, 0x148($s3) -/* A04A34 802421F4 86440008 */ lh $a0, 8($s2) -/* A04A38 802421F8 8E70000C */ lw $s0, 0xc($s3) -/* A04A3C 802421FC 0C00EABB */ jal get_npc_unsafe -/* A04A40 80242200 00A0882D */ daddu $s1, $a1, $zero -/* A04A44 80242204 0260202D */ daddu $a0, $s3, $zero -/* A04A48 80242208 8E050000 */ lw $a1, ($s0) -/* A04A4C 8024220C 0C0B1EAF */ jal evt_get_variable -/* A04A50 80242210 0040A82D */ daddu $s5, $v0, $zero -/* A04A54 80242214 AFA00010 */ sw $zero, 0x10($sp) -/* A04A58 80242218 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A5C 8024221C 8C630030 */ lw $v1, 0x30($v1) -/* A04A60 80242220 AFA30014 */ sw $v1, 0x14($sp) -/* A04A64 80242224 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A68 80242228 8C63001C */ lw $v1, 0x1c($v1) -/* A04A6C 8024222C AFA30018 */ sw $v1, 0x18($sp) -/* A04A70 80242230 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A74 80242234 8C630024 */ lw $v1, 0x24($v1) -/* A04A78 80242238 AFA3001C */ sw $v1, 0x1c($sp) -/* A04A7C 8024223C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A80 80242240 8C630028 */ lw $v1, 0x28($v1) -/* A04A84 80242244 27B40010 */ addiu $s4, $sp, 0x10 -/* A04A88 80242248 AFA30020 */ sw $v1, 0x20($sp) -/* A04A8C 8024224C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A90 80242250 3C0142F0 */ lui $at, 0x42f0 -/* A04A94 80242254 44810000 */ mtc1 $at, $f0 -/* A04A98 80242258 8C63002C */ lw $v1, 0x2c($v1) -/* A04A9C 8024225C 0040802D */ daddu $s0, $v0, $zero -/* A04AA0 80242260 E7A00028 */ swc1 $f0, 0x28($sp) -/* A04AA4 80242264 A7A0002C */ sh $zero, 0x2c($sp) -/* A04AA8 80242268 12200009 */ beqz $s1, .L80242290 -/* A04AAC 8024226C AFA30024 */ sw $v1, 0x24($sp) -/* A04AB0 80242270 02A0202D */ daddu $a0, $s5, $zero -/* A04AB4 80242274 0240282D */ daddu $a1, $s2, $zero -/* A04AB8 80242278 0260302D */ daddu $a2, $s3, $zero -/* A04ABC 8024227C 0C0906DF */ jal nok_14_UnkFunc5 -/* A04AC0 80242280 0200382D */ daddu $a3, $s0, $zero -/* A04AC4 80242284 86A200A8 */ lh $v0, 0xa8($s5) -/* A04AC8 80242288 AE42008C */ sw $v0, 0x8c($s2) -/* A04ACC 8024228C AE600070 */ sw $zero, 0x70($s3) -.L80242290: -/* A04AD0 80242290 2402FFFD */ addiu $v0, $zero, -3 -/* A04AD4 80242294 A2A200AB */ sb $v0, 0xab($s5) -/* A04AD8 80242298 8E4300B0 */ lw $v1, 0xb0($s2) -/* A04ADC 8024229C 30620004 */ andi $v0, $v1, 4 -/* A04AE0 802422A0 10400007 */ beqz $v0, .L802422C0 -/* A04AE4 802422A4 00000000 */ nop -/* A04AE8 802422A8 824200B4 */ lb $v0, 0xb4($s2) -/* A04AEC 802422AC 14400052 */ bnez $v0, .L802423F8 -/* A04AF0 802422B0 0000102D */ daddu $v0, $zero, $zero -/* A04AF4 802422B4 2402FFFB */ addiu $v0, $zero, -5 -/* A04AF8 802422B8 00621024 */ and $v0, $v1, $v0 -/* A04AFC 802422BC AE4200B0 */ sw $v0, 0xb0($s2) -.L802422C0: -/* A04B00 802422C0 8E630070 */ lw $v1, 0x70($s3) -/* A04B04 802422C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* A04B08 802422C8 1040004A */ beqz $v0, .L802423F4_A04C34 -/* A04B0C 802422CC 00031080 */ sll $v0, $v1, 2 -/* A04B10 802422D0 3C018024 */ lui $at, %hi(jtbl_80244678_A06EB8) -/* A04B14 802422D4 00220821 */ addu $at, $at, $v0 -/* A04B18 802422D8 8C224678 */ lw $v0, %lo(jtbl_80244678_A06EB8)($at) -/* A04B1C 802422DC 00400008 */ jr $v0 -/* A04B20 802422E0 00000000 */ nop -.L802422E4_A04B24: -/* A04B24 802422E4 0260202D */ daddu $a0, $s3, $zero -/* A04B28 802422E8 0200282D */ daddu $a1, $s0, $zero -/* A04B2C 802422EC 0C090265 */ jal nok_14_UnkNpcAIFunc23 -/* A04B30 802422F0 0280302D */ daddu $a2, $s4, $zero -.L802422F4_A04B34: -/* A04B34 802422F4 0260202D */ daddu $a0, $s3, $zero -/* A04B38 802422F8 0200282D */ daddu $a1, $s0, $zero -/* A04B3C 802422FC 0C0902D1 */ jal nok_14_UnkNpcAIFunc35 -/* A04B40 80242300 0280302D */ daddu $a2, $s4, $zero -/* A04B44 80242304 8E630070 */ lw $v1, 0x70($s3) -/* A04B48 80242308 24020002 */ addiu $v0, $zero, 2 -/* A04B4C 8024230C 1462003A */ bne $v1, $v0, .L802423F8 -/* A04B50 80242310 0000102D */ daddu $v0, $zero, $zero -.L80242314_A04B54: -/* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero -/* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero -/* A04B5C 8024231C 0C09045B */ jal nok_14_UnkNpcAIFunc1_copy -/* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero -.L80242324_A04B64: -/* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero -/* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero -/* A04B6C 8024232C 0C09048B */ jal nok_14_UnkFunc4 -/* A04B70 80242330 0280302D */ daddu $a2, $s4, $zero -/* A04B74 80242334 8E630070 */ lw $v1, 0x70($s3) -/* A04B78 80242338 2402000A */ addiu $v0, $zero, 0xa -/* A04B7C 8024233C 1462002E */ bne $v1, $v0, .L802423F8 -/* A04B80 80242340 0000102D */ daddu $v0, $zero, $zero -.L80242344_A04B84: -/* A04B84 80242344 0260202D */ daddu $a0, $s3, $zero -/* A04B88 80242348 0200282D */ daddu $a1, $s0, $zero -/* A04B8C 8024234C 0C09055C */ jal nok_14_UnkNpcAIFunc2 -/* A04B90 80242350 0280302D */ daddu $a2, $s4, $zero -/* A04B94 80242354 8E630070 */ lw $v1, 0x70($s3) -/* A04B98 80242358 2402000B */ addiu $v0, $zero, 0xb -/* A04B9C 8024235C 14620026 */ bne $v1, $v0, .L802423F8 -/* A04BA0 80242360 0000102D */ daddu $v0, $zero, $zero -.L80242364_A04BA4: -/* A04BA4 80242364 0260202D */ daddu $a0, $s3, $zero -/* A04BA8 80242368 0200282D */ daddu $a1, $s0, $zero -/* A04BAC 8024236C 0C09057A */ jal nok_14_SixFloatsFunc -/* A04BB0 80242370 0280302D */ daddu $a2, $s4, $zero -/* A04BB4 80242374 8E630070 */ lw $v1, 0x70($s3) -/* A04BB8 80242378 2402000C */ addiu $v0, $zero, 0xc -/* A04BBC 8024237C 1462001E */ bne $v1, $v0, .L802423F8 -/* A04BC0 80242380 0000102D */ daddu $v0, $zero, $zero -.L80242384_A04BC4: -/* A04BC4 80242384 0260202D */ daddu $a0, $s3, $zero -/* A04BC8 80242388 0200282D */ daddu $a1, $s0, $zero -/* A04BCC 8024238C 0C0907A3 */ jal func_80241E8C_A046CC -/* A04BD0 80242390 0280302D */ daddu $a2, $s4, $zero -/* A04BD4 80242394 8E630070 */ lw $v1, 0x70($s3) -/* A04BD8 80242398 2402000D */ addiu $v0, $zero, 0xd -/* A04BDC 8024239C 14620016 */ bne $v1, $v0, .L802423F8 -/* A04BE0 802423A0 0000102D */ daddu $v0, $zero, $zero -.L802423A4_A04BE4: -/* A04BE4 802423A4 0260202D */ daddu $a0, $s3, $zero -/* A04BE8 802423A8 0200282D */ daddu $a1, $s0, $zero -/* A04BEC 802423AC 0C0907ED */ jal func_80241FB4_A047F4 -/* A04BF0 802423B0 0280302D */ daddu $a2, $s4, $zero -/* A04BF4 802423B4 8E630070 */ lw $v1, 0x70($s3) -/* A04BF8 802423B8 2402000E */ addiu $v0, $zero, 0xe -/* A04BFC 802423BC 1462000E */ bne $v1, $v0, .L802423F8 -/* A04C00 802423C0 0000102D */ daddu $v0, $zero, $zero -.L802423C4_A04C04: -/* A04C04 802423C4 0260202D */ daddu $a0, $s3, $zero -/* A04C08 802423C8 0200282D */ daddu $a1, $s0, $zero -/* A04C0C 802423CC 0C09081C */ jal func_80242070_A048B0 -/* A04C10 802423D0 0280302D */ daddu $a2, $s4, $zero -/* A04C14 802423D4 8E630070 */ lw $v1, 0x70($s3) -/* A04C18 802423D8 2402000F */ addiu $v0, $zero, 0xf -/* A04C1C 802423DC 14620006 */ bne $v1, $v0, .L802423F8 -/* A04C20 802423E0 0000102D */ daddu $v0, $zero, $zero -.L802423E4_A04C24: -/* A04C24 802423E4 0260202D */ daddu $a0, $s3, $zero -/* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero -/* A04C2C 802423EC 0C090862 */ jal nok_14_UnkDurationCheck -/* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero -.L802423F4_A04C34: -/* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero -.L802423F8: -/* A04C38 802423F8 8FBF0048 */ lw $ra, 0x48($sp) -/* A04C3C 802423FC 8FB50044 */ lw $s5, 0x44($sp) -/* A04C40 80242400 8FB40040 */ lw $s4, 0x40($sp) -/* A04C44 80242404 8FB3003C */ lw $s3, 0x3c($sp) -/* A04C48 80242408 8FB20038 */ lw $s2, 0x38($sp) -/* A04C4C 8024240C 8FB10034 */ lw $s1, 0x34($sp) -/* A04C50 80242410 8FB00030 */ lw $s0, 0x30($sp) -/* A04C54 80242414 03E00008 */ jr $ra -/* A04C58 80242418 27BD0050 */ addiu $sp, $sp, 0x50 -/* A04C5C 8024241C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s deleted file mode 100644 index cd400f7c8c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241FAC_A08EAC.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FAC_A08EAC -/* A08EAC 80241FAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A08EB0 80241FB0 AFB3001C */ sw $s3, 0x1c($sp) -/* A08EB4 80241FB4 0080982D */ daddu $s3, $a0, $zero -/* A08EB8 80241FB8 AFBF0020 */ sw $ra, 0x20($sp) -/* A08EBC 80241FBC AFB20018 */ sw $s2, 0x18($sp) -/* A08EC0 80241FC0 AFB10014 */ sw $s1, 0x14($sp) -/* A08EC4 80241FC4 AFB00010 */ sw $s0, 0x10($sp) -/* A08EC8 80241FC8 8E710148 */ lw $s1, 0x148($s3) -/* A08ECC 80241FCC 0C00EABB */ jal get_npc_unsafe -/* A08ED0 80241FD0 86240008 */ lh $a0, 8($s1) -/* A08ED4 80241FD4 0040802D */ daddu $s0, $v0, $zero -/* A08ED8 80241FD8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A08EDC 80241FDC 8E2200CC */ lw $v0, 0xcc($s1) -/* A08EE0 80241FE0 3C01C0A0 */ lui $at, 0xc0a0 -/* A08EE4 80241FE4 44811000 */ mtc1 $at, $f2 -/* A08EE8 80241FE8 3C013E19 */ lui $at, 0x3e19 -/* A08EEC 80241FEC 3421999A */ ori $at, $at, 0x999a -/* A08EF0 80241FF0 44810000 */ mtc1 $at, $f0 -/* A08EF4 80241FF4 8C420024 */ lw $v0, 0x24($v0) -/* A08EF8 80241FF8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* A08EFC 80241FFC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* A08F00 80242000 E602001C */ swc1 $f2, 0x1c($s0) -/* A08F04 80242004 E6000014 */ swc1 $f0, 0x14($s0) -/* A08F08 80242008 AE020028 */ sw $v0, 0x28($s0) -/* A08F0C 8024200C 8E22008C */ lw $v0, 0x8c($s1) -/* A08F10 80242010 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A08F14 80242014 00021FC2 */ srl $v1, $v0, 0x1f -/* A08F18 80242018 00431021 */ addu $v0, $v0, $v1 -/* A08F1C 8024201C 8E430000 */ lw $v1, ($s2) -/* A08F20 80242020 00021043 */ sra $v0, $v0, 1 -/* A08F24 80242024 A60200A8 */ sh $v0, 0xa8($s0) -/* A08F28 80242028 8C660028 */ lw $a2, 0x28($v1) -/* A08F2C 8024202C 0C00A7B5 */ jal dist2D -/* A08F30 80242030 8C670030 */ lw $a3, 0x30($v1) -/* A08F34 80242034 0200202D */ daddu $a0, $s0, $zero -/* A08F38 80242038 0000302D */ daddu $a2, $zero, $zero -/* A08F3C 8024203C C6020038 */ lwc1 $f2, 0x38($s0) -/* A08F40 80242040 3C0140E0 */ lui $at, 0x40e0 -/* A08F44 80242044 44810000 */ mtc1 $at, $f0 -/* A08F48 80242048 4600110D */ trunc.w.s $f4, $f2 -/* A08F4C 8024204C 44022000 */ mfc1 $v0, $f4 -/* A08F50 80242050 E6000018 */ swc1 $f0, 0x18($s0) -/* A08F54 80242054 A6220010 */ sh $v0, 0x10($s1) -/* A08F58 80242058 C600003C */ lwc1 $f0, 0x3c($s0) -/* A08F5C 8024205C 240502C1 */ addiu $a1, $zero, 0x2c1 -/* A08F60 80242060 4600010D */ trunc.w.s $f4, $f0 -/* A08F64 80242064 44022000 */ mfc1 $v0, $f4 -/* A08F68 80242068 00000000 */ nop -/* A08F6C 8024206C A6220012 */ sh $v0, 0x12($s1) -/* A08F70 80242070 C6000040 */ lwc1 $f0, 0x40($s0) -/* A08F74 80242074 24020001 */ addiu $v0, $zero, 1 -/* A08F78 80242078 A2220007 */ sb $v0, 7($s1) -/* A08F7C 8024207C 4600010D */ trunc.w.s $f4, $f0 -/* A08F80 80242080 44022000 */ mfc1 $v0, $f4 -/* A08F84 80242084 0C012530 */ jal ai_enemy_play_sound -/* A08F88 80242088 A6220014 */ sh $v0, 0x14($s1) -/* A08F8C 8024208C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A08F90 80242090 8E420000 */ lw $v0, ($s2) -/* A08F94 80242094 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A08F98 80242098 8C460028 */ lw $a2, 0x28($v0) -/* A08F9C 8024209C 0C00A720 */ jal atan2 -/* A08FA0 802420A0 8C470030 */ lw $a3, 0x30($v0) -/* A08FA4 802420A4 2402000C */ addiu $v0, $zero, 0xc -/* A08FA8 802420A8 A602008E */ sh $v0, 0x8e($s0) -/* A08FAC 802420AC 2402000D */ addiu $v0, $zero, 0xd -/* A08FB0 802420B0 E600000C */ swc1 $f0, 0xc($s0) -/* A08FB4 802420B4 AE620070 */ sw $v0, 0x70($s3) -/* A08FB8 802420B8 8FBF0020 */ lw $ra, 0x20($sp) -/* A08FBC 802420BC 8FB3001C */ lw $s3, 0x1c($sp) -/* A08FC0 802420C0 8FB20018 */ lw $s2, 0x18($sp) -/* A08FC4 802420C4 8FB10014 */ lw $s1, 0x14($sp) -/* A08FC8 802420C8 8FB00010 */ lw $s0, 0x10($sp) -/* A08FCC 802420CC 03E00008 */ jr $ra -/* A08FD0 802420D0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s deleted file mode 100644 index 16234173ea..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420D4_A08FD4 -/* A08FD4 802420D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A08FD8 802420D8 AFB20018 */ sw $s2, 0x18($sp) -/* A08FDC 802420DC 0080902D */ daddu $s2, $a0, $zero -/* A08FE0 802420E0 AFBF001C */ sw $ra, 0x1c($sp) -/* A08FE4 802420E4 AFB10014 */ sw $s1, 0x14($sp) -/* A08FE8 802420E8 AFB00010 */ sw $s0, 0x10($sp) -/* A08FEC 802420EC 8E510148 */ lw $s1, 0x148($s2) -/* A08FF0 802420F0 0C00EABB */ jal get_npc_unsafe -/* A08FF4 802420F4 86240008 */ lh $a0, 8($s1) -/* A08FF8 802420F8 0040802D */ daddu $s0, $v0, $zero -/* A08FFC 802420FC C602001C */ lwc1 $f2, 0x1c($s0) -/* A09000 80242100 C6000014 */ lwc1 $f0, 0x14($s0) -/* A09004 80242104 8E050018 */ lw $a1, 0x18($s0) -/* A09008 80242108 46001080 */ add.s $f2, $f2, $f0 -/* A0900C 8024210C C600003C */ lwc1 $f0, 0x3c($s0) -/* A09010 80242110 8E06000C */ lw $a2, 0xc($s0) -/* A09014 80242114 46020000 */ add.s $f0, $f0, $f2 -/* A09018 80242118 0200202D */ daddu $a0, $s0, $zero -/* A0901C 8024211C E602001C */ swc1 $f2, 0x1c($s0) -/* A09020 80242120 0C00EA95 */ jal npc_move_heading -/* A09024 80242124 E600003C */ swc1 $f0, 0x3c($s0) -/* A09028 80242128 9602008E */ lhu $v0, 0x8e($s0) -/* A0902C 8024212C 2442FFFF */ addiu $v0, $v0, -1 -/* A09030 80242130 A602008E */ sh $v0, 0x8e($s0) -/* A09034 80242134 00021400 */ sll $v0, $v0, 0x10 -/* A09038 80242138 1C40000F */ bgtz $v0, .L80242178 -/* A0903C 8024213C 00000000 */ nop -/* A09040 80242140 3C013E99 */ lui $at, 0x3e99 -/* A09044 80242144 3421999A */ ori $at, $at, 0x999a -/* A09048 80242148 44810000 */ mtc1 $at, $f0 -/* A0904C 8024214C 3C014040 */ lui $at, 0x4040 -/* A09050 80242150 44811000 */ mtc1 $at, $f2 -/* A09054 80242154 A2200007 */ sb $zero, 7($s1) -/* A09058 80242158 AE00001C */ sw $zero, 0x1c($s0) -/* A0905C 8024215C E6000014 */ swc1 $f0, 0x14($s0) -/* A09060 80242160 E6020018 */ swc1 $f2, 0x18($s0) -/* A09064 80242164 8E2200CC */ lw $v0, 0xcc($s1) -/* A09068 80242168 8C420028 */ lw $v0, 0x28($v0) -/* A0906C 8024216C AE020028 */ sw $v0, 0x28($s0) -/* A09070 80242170 2402000E */ addiu $v0, $zero, 0xe -/* A09074 80242174 AE420070 */ sw $v0, 0x70($s2) -.L80242178: -/* A09078 80242178 8FBF001C */ lw $ra, 0x1c($sp) -/* A0907C 8024217C 8FB20018 */ lw $s2, 0x18($sp) -/* A09080 80242180 8FB10014 */ lw $s1, 0x14($sp) -/* A09084 80242184 8FB00010 */ lw $s0, 0x10($sp) -/* A09088 80242188 03E00008 */ jr $ra -/* A0908C 8024218C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s deleted file mode 100644 index 933454faf3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242190_A09090 -/* A09090 80242190 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A09094 80242194 AFB20030 */ sw $s2, 0x30($sp) -/* A09098 80242198 0080902D */ daddu $s2, $a0, $zero -/* A0909C 8024219C AFBF0034 */ sw $ra, 0x34($sp) -/* A090A0 802421A0 AFB1002C */ sw $s1, 0x2c($sp) -/* A090A4 802421A4 AFB00028 */ sw $s0, 0x28($sp) -/* A090A8 802421A8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A090AC 802421AC 8E510148 */ lw $s1, 0x148($s2) -/* A090B0 802421B0 0C00EABB */ jal get_npc_unsafe -/* A090B4 802421B4 86240008 */ lh $a0, 8($s1) -/* A090B8 802421B8 0040802D */ daddu $s0, $v0, $zero -/* A090BC 802421BC C604001C */ lwc1 $f4, 0x1c($s0) -/* A090C0 802421C0 C6000014 */ lwc1 $f0, 0x14($s0) -/* A090C4 802421C4 0200202D */ daddu $a0, $s0, $zero -/* A090C8 802421C8 46002100 */ add.s $f4, $f4, $f0 -/* A090CC 802421CC C602003C */ lwc1 $f2, 0x3c($s0) -/* A090D0 802421D0 8E050018 */ lw $a1, 0x18($s0) -/* A090D4 802421D4 46041080 */ add.s $f2, $f2, $f4 -/* A090D8 802421D8 8E06000C */ lw $a2, 0xc($s0) -/* A090DC 802421DC C6200078 */ lwc1 $f0, 0x78($s1) -/* A090E0 802421E0 46800020 */ cvt.s.w $f0, $f0 -/* A090E4 802421E4 E602003C */ swc1 $f2, 0x3c($s0) -/* A090E8 802421E8 3C014059 */ lui $at, 0x4059 -/* A090EC 802421EC 44811800 */ mtc1 $at, $f3 -/* A090F0 802421F0 44801000 */ mtc1 $zero, $f2 -/* A090F4 802421F4 46000021 */ cvt.d.s $f0, $f0 -/* A090F8 802421F8 E604001C */ swc1 $f4, 0x1c($s0) -/* A090FC 802421FC 46220003 */ div.d $f0, $f0, $f2 -/* A09100 80242200 0C00EA95 */ jal npc_move_heading -/* A09104 80242204 46200520 */ cvt.s.d $f20, $f0 -/* A09108 80242208 27A50018 */ addiu $a1, $sp, 0x18 -/* A0910C 8024220C 27A6001C */ addiu $a2, $sp, 0x1c -/* A09110 80242210 C6000038 */ lwc1 $f0, 0x38($s0) -/* A09114 80242214 C602003C */ lwc1 $f2, 0x3c($s0) -/* A09118 80242218 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0911C 8024221C 3C01447A */ lui $at, 0x447a -/* A09120 80242220 44813000 */ mtc1 $at, $f6 -/* A09124 80242224 27A20024 */ addiu $v0, $sp, 0x24 -/* A09128 80242228 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0912C 8024222C E7A2001C */ swc1 $f2, 0x1c($sp) -/* A09130 80242230 E7A40020 */ swc1 $f4, 0x20($sp) -/* A09134 80242234 E7A60024 */ swc1 $f6, 0x24($sp) -/* A09138 80242238 AFA20010 */ sw $v0, 0x10($sp) -/* A0913C 8024223C 8E040080 */ lw $a0, 0x80($s0) -/* A09140 80242240 0C0372DF */ jal npc_raycast_down_sides -/* A09144 80242244 27A70020 */ addiu $a3, $sp, 0x20 -/* A09148 80242248 10400003 */ beqz $v0, .L80242258 -/* A0914C 8024224C 4600A086 */ mov.s $f2, $f20 -/* A09150 80242250 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A09154 80242254 46140080 */ add.s $f2, $f0, $f20 -.L80242258: -/* A09158 80242258 C600003C */ lwc1 $f0, 0x3c($s0) -/* A0915C 8024225C 4602003C */ c.lt.s $f0, $f2 -/* A09160 80242260 00000000 */ nop -/* A09164 80242264 45010009 */ bc1t .L8024228C -/* A09168 80242268 2402000A */ addiu $v0, $zero, 0xa -/* A0916C 8024226C A602008E */ sh $v0, 0x8e($s0) -/* A09170 80242270 8E2200CC */ lw $v0, 0xcc($s1) -/* A09174 80242274 8C42002C */ lw $v0, 0x2c($v0) -/* A09178 80242278 AE020028 */ sw $v0, 0x28($s0) -/* A0917C 8024227C 9622008E */ lhu $v0, 0x8e($s1) -/* A09180 80242280 A60200A8 */ sh $v0, 0xa8($s0) -/* A09184 80242284 2402000F */ addiu $v0, $zero, 0xf -/* A09188 80242288 AE420070 */ sw $v0, 0x70($s2) -.L8024228C: -/* A0918C 8024228C 8FBF0034 */ lw $ra, 0x34($sp) -/* A09190 80242290 8FB20030 */ lw $s2, 0x30($sp) -/* A09194 80242294 8FB1002C */ lw $s1, 0x2c($sp) -/* A09198 80242298 8FB00028 */ lw $s0, 0x28($sp) -/* A0919C 8024229C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A091A0 802422A0 03E00008 */ jr $ra -/* A091A4 802422A4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s deleted file mode 100644 index 3b9d477e7e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ /dev/null @@ -1,174 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244DA8_A0BCA8 -.word .L80242404_A09304, .L80242414_A09314, .L80242434_A09334, .L80242444_A09344, .L80242514_A09414, .L80242514_A09414, .L80242514_A09414, .L80242514_A09414, .L80242514_A09414, .L80242514_A09414, .L80242464_A09364, .L80242484_A09384, .L802424A4_A093A4, .L802424C4_A093C4, .L802424E4_A093E4, .L80242504_A09404, 0, 0 - -.section .text - -glabel func_802422EC_A091EC -/* A091EC 802422EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A091F0 802422F0 AFB3003C */ sw $s3, 0x3c($sp) -/* A091F4 802422F4 0080982D */ daddu $s3, $a0, $zero -/* A091F8 802422F8 AFBF0048 */ sw $ra, 0x48($sp) -/* A091FC 802422FC AFB50044 */ sw $s5, 0x44($sp) -/* A09200 80242300 AFB40040 */ sw $s4, 0x40($sp) -/* A09204 80242304 AFB20038 */ sw $s2, 0x38($sp) -/* A09208 80242308 AFB10034 */ sw $s1, 0x34($sp) -/* A0920C 8024230C AFB00030 */ sw $s0, 0x30($sp) -/* A09210 80242310 8E720148 */ lw $s2, 0x148($s3) -/* A09214 80242314 86440008 */ lh $a0, 8($s2) -/* A09218 80242318 8E70000C */ lw $s0, 0xc($s3) -/* A0921C 8024231C 0C00EABB */ jal get_npc_unsafe -/* A09220 80242320 00A0882D */ daddu $s1, $a1, $zero -/* A09224 80242324 0260202D */ daddu $a0, $s3, $zero -/* A09228 80242328 8E050000 */ lw $a1, ($s0) -/* A0922C 8024232C 0C0B1EAF */ jal evt_get_variable -/* A09230 80242330 0040A82D */ daddu $s5, $v0, $zero -/* A09234 80242334 AFA00010 */ sw $zero, 0x10($sp) -/* A09238 80242338 8E4300D0 */ lw $v1, 0xd0($s2) -/* A0923C 8024233C 8C630030 */ lw $v1, 0x30($v1) -/* A09240 80242340 AFA30014 */ sw $v1, 0x14($sp) -/* A09244 80242344 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09248 80242348 8C63001C */ lw $v1, 0x1c($v1) -/* A0924C 8024234C AFA30018 */ sw $v1, 0x18($sp) -/* A09250 80242350 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09254 80242354 8C630024 */ lw $v1, 0x24($v1) -/* A09258 80242358 AFA3001C */ sw $v1, 0x1c($sp) -/* A0925C 8024235C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09260 80242360 8C630028 */ lw $v1, 0x28($v1) -/* A09264 80242364 27B40010 */ addiu $s4, $sp, 0x10 -/* A09268 80242368 AFA30020 */ sw $v1, 0x20($sp) -/* A0926C 8024236C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09270 80242370 3C0142F0 */ lui $at, 0x42f0 -/* A09274 80242374 44810000 */ mtc1 $at, $f0 -/* A09278 80242378 8C63002C */ lw $v1, 0x2c($v1) -/* A0927C 8024237C 0040802D */ daddu $s0, $v0, $zero -/* A09280 80242380 E7A00028 */ swc1 $f0, 0x28($sp) -/* A09284 80242384 A7A0002C */ sh $zero, 0x2c($sp) -/* A09288 80242388 12200009 */ beqz $s1, .L802423B0 -/* A0928C 8024238C AFA30024 */ sw $v1, 0x24($sp) -/* A09290 80242390 02A0202D */ daddu $a0, $s5, $zero -/* A09294 80242394 0240282D */ daddu $a1, $s2, $zero -/* A09298 80242398 0260302D */ daddu $a2, $s3, $zero -/* A0929C 8024239C 0C090727 */ jal nok_15_UnkFunc5 -/* A092A0 802423A0 0200382D */ daddu $a3, $s0, $zero -/* A092A4 802423A4 86A200A8 */ lh $v0, 0xa8($s5) -/* A092A8 802423A8 AE42008C */ sw $v0, 0x8c($s2) -/* A092AC 802423AC AE600070 */ sw $zero, 0x70($s3) -.L802423B0: -/* A092B0 802423B0 2402FFFD */ addiu $v0, $zero, -3 -/* A092B4 802423B4 A2A200AB */ sb $v0, 0xab($s5) -/* A092B8 802423B8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A092BC 802423BC 30620004 */ andi $v0, $v1, 4 -/* A092C0 802423C0 10400007 */ beqz $v0, .L802423E0 -/* A092C4 802423C4 00000000 */ nop -/* A092C8 802423C8 824200B4 */ lb $v0, 0xb4($s2) -/* A092CC 802423CC 14400052 */ bnez $v0, .L80242518 -/* A092D0 802423D0 0000102D */ daddu $v0, $zero, $zero -/* A092D4 802423D4 2402FFFB */ addiu $v0, $zero, -5 -/* A092D8 802423D8 00621024 */ and $v0, $v1, $v0 -/* A092DC 802423DC AE4200B0 */ sw $v0, 0xb0($s2) -.L802423E0: -/* A092E0 802423E0 8E630070 */ lw $v1, 0x70($s3) -/* A092E4 802423E4 2C620010 */ sltiu $v0, $v1, 0x10 -/* A092E8 802423E8 1040004A */ beqz $v0, .L80242514_A09414 -/* A092EC 802423EC 00031080 */ sll $v0, $v1, 2 -/* A092F0 802423F0 3C018024 */ lui $at, %hi(jtbl_80244DA8_A0BCA8) -/* A092F4 802423F4 00220821 */ addu $at, $at, $v0 -/* A092F8 802423F8 8C224DA8 */ lw $v0, %lo(jtbl_80244DA8_A0BCA8)($at) -/* A092FC 802423FC 00400008 */ jr $v0 -/* A09300 80242400 00000000 */ nop -.L80242404_A09304: -/* A09304 80242404 0260202D */ daddu $a0, $s3, $zero -/* A09308 80242408 0200282D */ daddu $a1, $s0, $zero -/* A0930C 8024240C 0C0902AD */ jal nok_15_UnkNpcAIFunc23 -/* A09310 80242410 0280302D */ daddu $a2, $s4, $zero -.L80242414_A09314: -/* A09314 80242414 0260202D */ daddu $a0, $s3, $zero -/* A09318 80242418 0200282D */ daddu $a1, $s0, $zero -/* A0931C 8024241C 0C090319 */ jal nok_15_UnkNpcAIFunc35 -/* A09320 80242420 0280302D */ daddu $a2, $s4, $zero -/* A09324 80242424 8E630070 */ lw $v1, 0x70($s3) -/* A09328 80242428 24020002 */ addiu $v0, $zero, 2 -/* A0932C 8024242C 1462003A */ bne $v1, $v0, .L80242518 -/* A09330 80242430 0000102D */ daddu $v0, $zero, $zero -.L80242434_A09334: -/* A09334 80242434 0260202D */ daddu $a0, $s3, $zero -/* A09338 80242438 0200282D */ daddu $a1, $s0, $zero -/* A0933C 8024243C 0C0904A3 */ jal nok_15_UnkNpcAIFunc1_copy -/* A09340 80242440 0280302D */ daddu $a2, $s4, $zero -.L80242444_A09344: -/* A09344 80242444 0260202D */ daddu $a0, $s3, $zero -/* A09348 80242448 0200282D */ daddu $a1, $s0, $zero -/* A0934C 8024244C 0C0904D3 */ jal nok_15_UnkFunc4 -/* A09350 80242450 0280302D */ daddu $a2, $s4, $zero -/* A09354 80242454 8E630070 */ lw $v1, 0x70($s3) -/* A09358 80242458 2402000A */ addiu $v0, $zero, 0xa -/* A0935C 8024245C 1462002E */ bne $v1, $v0, .L80242518 -/* A09360 80242460 0000102D */ daddu $v0, $zero, $zero -.L80242464_A09364: -/* A09364 80242464 0260202D */ daddu $a0, $s3, $zero -/* A09368 80242468 0200282D */ daddu $a1, $s0, $zero -/* A0936C 8024246C 0C0905A4 */ jal nok_15_UnkNpcAIFunc2 -/* A09370 80242470 0280302D */ daddu $a2, $s4, $zero -/* A09374 80242474 8E630070 */ lw $v1, 0x70($s3) -/* A09378 80242478 2402000B */ addiu $v0, $zero, 0xb -/* A0937C 8024247C 14620026 */ bne $v1, $v0, .L80242518 -/* A09380 80242480 0000102D */ daddu $v0, $zero, $zero -.L80242484_A09384: -/* A09384 80242484 0260202D */ daddu $a0, $s3, $zero -/* A09388 80242488 0200282D */ daddu $a1, $s0, $zero -/* A0938C 8024248C 0C0905C2 */ jal nok_15_SixFloatsFunc -/* A09390 80242490 0280302D */ daddu $a2, $s4, $zero -/* A09394 80242494 8E630070 */ lw $v1, 0x70($s3) -/* A09398 80242498 2402000C */ addiu $v0, $zero, 0xc -/* A0939C 8024249C 1462001E */ bne $v1, $v0, .L80242518 -/* A093A0 802424A0 0000102D */ daddu $v0, $zero, $zero -.L802424A4_A093A4: -/* A093A4 802424A4 0260202D */ daddu $a0, $s3, $zero -/* A093A8 802424A8 0200282D */ daddu $a1, $s0, $zero -/* A093AC 802424AC 0C0907EB */ jal func_80241FAC_A08EAC -/* A093B0 802424B0 0280302D */ daddu $a2, $s4, $zero -/* A093B4 802424B4 8E630070 */ lw $v1, 0x70($s3) -/* A093B8 802424B8 2402000D */ addiu $v0, $zero, 0xd -/* A093BC 802424BC 14620016 */ bne $v1, $v0, .L80242518 -/* A093C0 802424C0 0000102D */ daddu $v0, $zero, $zero -.L802424C4_A093C4: -/* A093C4 802424C4 0260202D */ daddu $a0, $s3, $zero -/* A093C8 802424C8 0200282D */ daddu $a1, $s0, $zero -/* A093CC 802424CC 0C090835 */ jal func_802420D4_A08FD4 -/* A093D0 802424D0 0280302D */ daddu $a2, $s4, $zero -/* A093D4 802424D4 8E630070 */ lw $v1, 0x70($s3) -/* A093D8 802424D8 2402000E */ addiu $v0, $zero, 0xe -/* A093DC 802424DC 1462000E */ bne $v1, $v0, .L80242518 -/* A093E0 802424E0 0000102D */ daddu $v0, $zero, $zero -.L802424E4_A093E4: -/* A093E4 802424E4 0260202D */ daddu $a0, $s3, $zero -/* A093E8 802424E8 0200282D */ daddu $a1, $s0, $zero -/* A093EC 802424EC 0C090864 */ jal func_80242190_A09090 -/* A093F0 802424F0 0280302D */ daddu $a2, $s4, $zero -/* A093F4 802424F4 8E630070 */ lw $v1, 0x70($s3) -/* A093F8 802424F8 2402000F */ addiu $v0, $zero, 0xf -/* A093FC 802424FC 14620006 */ bne $v1, $v0, .L80242518 -/* A09400 80242500 0000102D */ daddu $v0, $zero, $zero -.L80242504_A09404: -/* A09404 80242504 0260202D */ daddu $a0, $s3, $zero -/* A09408 80242508 0200282D */ daddu $a1, $s0, $zero -/* A0940C 8024250C 0C0908AA */ jal nok_15_UnkDurationCheck -/* A09410 80242510 0280302D */ daddu $a2, $s4, $zero -.L80242514_A09414: -/* A09414 80242514 0000102D */ daddu $v0, $zero, $zero -.L80242518: -/* A09418 80242518 8FBF0048 */ lw $ra, 0x48($sp) -/* A0941C 8024251C 8FB50044 */ lw $s5, 0x44($sp) -/* A09420 80242520 8FB40040 */ lw $s4, 0x40($sp) -/* A09424 80242524 8FB3003C */ lw $s3, 0x3c($sp) -/* A09428 80242528 8FB20038 */ lw $s2, 0x38($sp) -/* A0942C 8024252C 8FB10034 */ lw $s1, 0x34($sp) -/* A09430 80242530 8FB00030 */ lw $s0, 0x30($sp) -/* A09434 80242534 03E00008 */ jr $ra -/* A09438 80242538 27BD0050 */ addiu $sp, $sp, 0x50 -/* A0943C 8024253C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s deleted file mode 100644 index daead94852..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC8_BBE068 -/* BBE068 80240EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBE06C 80240ECC AFB00010 */ sw $s0, 0x10($sp) -/* BBE070 80240ED0 0080802D */ daddu $s0, $a0, $zero -/* BBE074 80240ED4 AFBF0014 */ sw $ra, 0x14($sp) -/* BBE078 80240ED8 0C00EABB */ jal get_npc_unsafe -/* BBE07C 80240EDC 8E04008C */ lw $a0, 0x8c($s0) -/* BBE080 80240EE0 0040282D */ daddu $a1, $v0, $zero -/* BBE084 80240EE4 8E040094 */ lw $a0, 0x94($s0) -/* BBE088 80240EE8 8CA30028 */ lw $v1, 0x28($a1) -/* BBE08C 80240EEC ACA40028 */ sw $a0, 0x28($a1) -/* BBE090 80240EF0 8FBF0014 */ lw $ra, 0x14($sp) -/* BBE094 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* BBE098 80240EF8 24020002 */ addiu $v0, $zero, 2 -/* BBE09C 80240EFC 3C018024 */ lui $at, %hi(D_80245AB4) -/* BBE0A0 80240F00 AC235AB4 */ sw $v1, %lo(D_80245AB4)($at) -/* BBE0A4 80240F04 03E00008 */ jr $ra -/* BBE0A8 80240F08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s deleted file mode 100644 index e1ea491f0d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F0C_BBE0AC -/* BBE0AC 80240F0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBE0B0 80240F10 AFBF0010 */ sw $ra, 0x10($sp) -/* BBE0B4 80240F14 0C00EABB */ jal get_npc_unsafe -/* BBE0B8 80240F18 8C84008C */ lw $a0, 0x8c($a0) -/* BBE0BC 80240F1C 3C038024 */ lui $v1, %hi(D_80245AB4) -/* BBE0C0 80240F20 8C635AB4 */ lw $v1, %lo(D_80245AB4)($v1) -/* BBE0C4 80240F24 AC430028 */ sw $v1, 0x28($v0) -/* BBE0C8 80240F28 8FBF0010 */ lw $ra, 0x10($sp) -/* BBE0CC 80240F2C 24020002 */ addiu $v0, $zero, 2 -/* BBE0D0 80240F30 03E00008 */ jr $ra -/* BBE0D4 80240F34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s deleted file mode 100644 index 2e26f4195e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240858_BC4AD8 -/* BC4AD8 80240858 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC4ADC 8024085C AFB00010 */ sw $s0, 0x10($sp) -/* BC4AE0 80240860 0080802D */ daddu $s0, $a0, $zero -/* BC4AE4 80240864 AFBF0014 */ sw $ra, 0x14($sp) -/* BC4AE8 80240868 0C00EABB */ jal get_npc_unsafe -/* BC4AEC 8024086C 8E04008C */ lw $a0, 0x8c($s0) -/* BC4AF0 80240870 0040282D */ daddu $a1, $v0, $zero -/* BC4AF4 80240874 8E040094 */ lw $a0, 0x94($s0) -/* BC4AF8 80240878 8CA30028 */ lw $v1, 0x28($a1) -/* BC4AFC 8024087C ACA40028 */ sw $a0, 0x28($a1) -/* BC4B00 80240880 8FBF0014 */ lw $ra, 0x14($sp) -/* BC4B04 80240884 8FB00010 */ lw $s0, 0x10($sp) -/* BC4B08 80240888 24020002 */ addiu $v0, $zero, 2 -/* BC4B0C 8024088C 3C018024 */ lui $at, %hi(flo_13_80243DA4) -/* BC4B10 80240890 AC233DA4 */ sw $v1, %lo(flo_13_80243DA4)($at) -/* BC4B14 80240894 03E00008 */ jr $ra -/* BC4B18 80240898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s deleted file mode 100644 index 60f83f8aaf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024089C_BC4B1C -/* BC4B1C 8024089C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC4B20 802408A0 AFBF0010 */ sw $ra, 0x10($sp) -/* BC4B24 802408A4 0C00EABB */ jal get_npc_unsafe -/* BC4B28 802408A8 8C84008C */ lw $a0, 0x8c($a0) -/* BC4B2C 802408AC 3C038024 */ lui $v1, %hi(flo_13_80243DA4) -/* BC4B30 802408B0 8C633DA4 */ lw $v1, %lo(flo_13_80243DA4)($v1) -/* BC4B34 802408B4 AC430028 */ sw $v1, 0x28($v0) -/* BC4B38 802408B8 8FBF0010 */ lw $ra, 0x10($sp) -/* BC4B3C 802408BC 24020002 */ addiu $v0, $zero, 2 -/* BC4B40 802408C0 03E00008 */ jr $ra -/* BC4B44 802408C4 27BD0018 */ addiu $sp, $sp, 0x18 -/* BC4B48 802408C8 00000000 */ nop -/* BC4B4C 802408CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s index ad3ca1fa99..9ab3c8a377 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240260_D9B150.s @@ -250,7 +250,7 @@ glabel func_80240260_D9B150 /* D9B514 80240624 AFA00010 */ sw $zero, 0x10($sp) /* D9B518 80240628 8E26000C */ lw $a2, 0xc($s1) /* D9B51C 8024062C 8E270010 */ lw $a3, 0x10($s1) -/* D9B520 80240630 0C01242D */ jal func_800490B4 +/* D9B520 80240630 0C01242D */ jal basic_ai_check_player_dist /* D9B524 80240634 0240282D */ daddu $a1, $s2, $zero /* D9B528 80240638 54400001 */ bnel $v0, $zero, .L80240640 /* D9B52C 8024063C 24130001 */ addiu $s3, $zero, 1 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s index 137600dd46..67257b8520 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_80240844_D9B734.s @@ -20,7 +20,7 @@ glabel func_80240844_D9B734 /* D9B770 80240880 AFA30010 */ sw $v1, 0x10($sp) /* D9B774 80240884 8E260024 */ lw $a2, 0x24($s1) /* D9B778 80240888 8E270028 */ lw $a3, 0x28($s1) -/* D9B77C 8024088C 0C01242D */ jal func_800490B4 +/* D9B77C 8024088C 0C01242D */ jal basic_ai_check_player_dist /* D9B780 80240890 0040802D */ daddu $s0, $v0, $zero /* D9B784 80240894 1440001D */ bnez $v0, .L8024090C /* D9B788 80240898 24040002 */ addiu $a0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s index d846116378..66befd87cf 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s @@ -100,36 +100,36 @@ glabel func_802409EC_D9B8DC .L80240B3C_D9BA2C: /* D9BA2C 80240B3C 0280202D */ daddu $a0, $s4, $zero /* D9BA30 80240B40 0240282D */ daddu $a1, $s2, $zero -/* D9BA34 80240B44 0C012568 */ jal func_800495A0 +/* D9BA34 80240B44 0C012568 */ jal basic_ai_wander_init /* D9BA38 80240B48 0260302D */ daddu $a2, $s3, $zero .L80240B4C_D9BA3C: /* D9BA3C 80240B4C 0280202D */ daddu $a0, $s4, $zero /* D9BA40 80240B50 0240282D */ daddu $a1, $s2, $zero -/* D9BA44 80240B54 0C0125AE */ jal func_800496B8 +/* D9BA44 80240B54 0C0125AE */ jal basic_ai_wander /* D9BA48 80240B58 0260302D */ daddu $a2, $s3, $zero /* D9BA4C 80240B5C 080902FF */ j .L80240BFC_D9BAEC /* D9BA50 80240B60 00000000 */ nop .L80240B64_D9BA54: /* D9BA54 80240B64 0280202D */ daddu $a0, $s4, $zero /* D9BA58 80240B68 0240282D */ daddu $a1, $s2, $zero -/* D9BA5C 80240B6C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D9BA5C 80240B6C 0C0126D1 */ jal basic_ai_loiter_init /* D9BA60 80240B70 0260302D */ daddu $a2, $s3, $zero .L80240B74_D9BA64: /* D9BA64 80240B74 0280202D */ daddu $a0, $s4, $zero /* D9BA68 80240B78 0240282D */ daddu $a1, $s2, $zero -/* D9BA6C 80240B7C 0C012701 */ jal func_80049C04 +/* D9BA6C 80240B7C 0C012701 */ jal basic_ai_loiter /* D9BA70 80240B80 0260302D */ daddu $a2, $s3, $zero /* D9BA74 80240B84 080902FF */ j .L80240BFC_D9BAEC /* D9BA78 80240B88 00000000 */ nop .L80240B8C_D9BA7C: /* D9BA7C 80240B8C 0280202D */ daddu $a0, $s4, $zero /* D9BA80 80240B90 0240282D */ daddu $a1, $s2, $zero -/* D9BA84 80240B94 0C01278F */ jal func_80049E3C +/* D9BA84 80240B94 0C01278F */ jal basic_ai_found_player_jump_init /* D9BA88 80240B98 0260302D */ daddu $a2, $s3, $zero .L80240B9C_D9BA8C: /* D9BA8C 80240B9C 0280202D */ daddu $a0, $s4, $zero /* D9BA90 80240BA0 0240282D */ daddu $a1, $s2, $zero -/* D9BA94 80240BA4 0C0127B3 */ jal func_80049ECC +/* D9BA94 80240BA4 0C0127B3 */ jal basic_ai_found_player_jump /* D9BA98 80240BA8 0260302D */ daddu $a2, $s3, $zero /* D9BA9C 80240BAC 080902FF */ j .L80240BFC_D9BAEC /* D9BAA0 80240BB0 00000000 */ nop @@ -153,7 +153,7 @@ glabel func_802409EC_D9B8DC /* D9BADC 80240BEC 080902FF */ j .L80240BFC_D9BAEC /* D9BAE0 80240BF0 00000000 */ nop .L80240BF4_D9BAE4: -/* D9BAE4 80240BF4 0C0129CF */ jal func_8004A73C +/* D9BAE4 80240BF4 0C0129CF */ jal basic_ai_suspend /* D9BAE8 80240BF8 0280202D */ daddu $a0, $s4, $zero .L80240BFC_D9BAEC: /* D9BAEC 80240BFC 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s deleted file mode 100644 index afe3583b77..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247870_DA4D40 -.double 0.6 - -.section .text - -glabel func_80240970_D9DE40 -/* D9DE40 80240970 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9DE44 80240974 AFB10014 */ sw $s1, 0x14($sp) -/* D9DE48 80240978 0080882D */ daddu $s1, $a0, $zero -/* D9DE4C 8024097C AFBF0018 */ sw $ra, 0x18($sp) -/* D9DE50 80240980 AFB00010 */ sw $s0, 0x10($sp) -/* D9DE54 80240984 8E300148 */ lw $s0, 0x148($s1) -/* D9DE58 80240988 0C00EABB */ jal get_npc_unsafe -/* D9DE5C 8024098C 86040008 */ lh $a0, 8($s0) -/* D9DE60 80240990 C4400018 */ lwc1 $f0, 0x18($v0) -/* D9DE64 80240994 3C018024 */ lui $at, %hi(D_80247870_DA4D40) -/* D9DE68 80240998 D4227870 */ ldc1 $f2, %lo(D_80247870_DA4D40)($at) -/* D9DE6C 8024099C 46000021 */ cvt.d.s $f0, $f0 -/* D9DE70 802409A0 46220002 */ mul.d $f0, $f0, $f2 -/* D9DE74 802409A4 00000000 */ nop -/* D9DE78 802409A8 46200020 */ cvt.s.d $f0, $f0 -/* D9DE7C 802409AC E4400018 */ swc1 $f0, 0x18($v0) -/* D9DE80 802409B0 8E0300CC */ lw $v1, 0xcc($s0) -/* D9DE84 802409B4 8C640030 */ lw $a0, 0x30($v1) -/* D9DE88 802409B8 24030005 */ addiu $v1, $zero, 5 -/* D9DE8C 802409BC A443008E */ sh $v1, 0x8e($v0) -/* D9DE90 802409C0 AC440028 */ sw $a0, 0x28($v0) -/* D9DE94 802409C4 2402000F */ addiu $v0, $zero, 0xf -/* D9DE98 802409C8 AE220070 */ sw $v0, 0x70($s1) -/* D9DE9C 802409CC 8FBF0018 */ lw $ra, 0x18($sp) -/* D9DEA0 802409D0 8FB10014 */ lw $s1, 0x14($sp) -/* D9DEA4 802409D4 8FB00010 */ lw $s0, 0x10($sp) -/* D9DEA8 802409D8 03E00008 */ jr $ra -/* D9DEAC 802409DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s deleted file mode 100644 index 87b427c606..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247878_DA4D48 -.double 0.6 - -.section .text - -glabel func_802409E0_D9DEB0 -/* D9DEB0 802409E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9DEB4 802409E4 AFB20028 */ sw $s2, 0x28($sp) -/* D9DEB8 802409E8 0080902D */ daddu $s2, $a0, $zero -/* D9DEBC 802409EC AFBF002C */ sw $ra, 0x2c($sp) -/* D9DEC0 802409F0 AFB10024 */ sw $s1, 0x24($sp) -/* D9DEC4 802409F4 AFB00020 */ sw $s0, 0x20($sp) -/* D9DEC8 802409F8 8E510148 */ lw $s1, 0x148($s2) -/* D9DECC 802409FC 0C00EABB */ jal get_npc_unsafe -/* D9DED0 80240A00 86240008 */ lh $a0, 8($s1) -/* D9DED4 80240A04 0040802D */ daddu $s0, $v0, $zero -/* D9DED8 80240A08 0200202D */ daddu $a0, $s0, $zero -/* D9DEDC 80240A0C C600000C */ lwc1 $f0, 0xc($s0) -/* D9DEE0 80240A10 27A60018 */ addiu $a2, $sp, 0x18 -/* D9DEE4 80240A14 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9DEE8 80240A18 AFA00010 */ sw $zero, 0x10($sp) -/* D9DEEC 80240A1C AFA00014 */ sw $zero, 0x14($sp) -/* D9DEF0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* D9DEF4 80240A24 0C0129E1 */ jal func_8004A784 -/* D9DEF8 80240A28 0000382D */ daddu $a3, $zero, $zero -/* D9DEFC 80240A2C 14400005 */ bnez $v0, .L80240A44 -/* D9DF00 80240A30 00000000 */ nop -/* D9DF04 80240A34 8E050018 */ lw $a1, 0x18($s0) -/* D9DF08 80240A38 8E06000C */ lw $a2, 0xc($s0) -/* D9DF0C 80240A3C 0C00EA95 */ jal npc_move_heading -/* D9DF10 80240A40 0200202D */ daddu $a0, $s0, $zero -.L80240A44: -/* D9DF14 80240A44 9602008E */ lhu $v0, 0x8e($s0) -/* D9DF18 80240A48 2442FFFF */ addiu $v0, $v0, -1 -/* D9DF1C 80240A4C A602008E */ sh $v0, 0x8e($s0) -/* D9DF20 80240A50 00021400 */ sll $v0, $v0, 0x10 -/* D9DF24 80240A54 14400010 */ bnez $v0, .L80240A98 -/* D9DF28 80240A58 00000000 */ nop -/* D9DF2C 80240A5C C6000018 */ lwc1 $f0, 0x18($s0) -/* D9DF30 80240A60 3C018024 */ lui $at, %hi(D_80247878_DA4D48) -/* D9DF34 80240A64 D4227878 */ ldc1 $f2, %lo(D_80247878_DA4D48)($at) -/* D9DF38 80240A68 46000021 */ cvt.d.s $f0, $f0 -/* D9DF3C 80240A6C 46220002 */ mul.d $f0, $f0, $f2 -/* D9DF40 80240A70 00000000 */ nop -/* D9DF44 80240A74 46200020 */ cvt.s.d $f0, $f0 -/* D9DF48 80240A78 E6000018 */ swc1 $f0, 0x18($s0) -/* D9DF4C 80240A7C 8E2200CC */ lw $v0, 0xcc($s1) -/* D9DF50 80240A80 8C43002C */ lw $v1, 0x2c($v0) -/* D9DF54 80240A84 2402000A */ addiu $v0, $zero, 0xa -/* D9DF58 80240A88 A602008E */ sh $v0, 0x8e($s0) -/* D9DF5C 80240A8C 24020010 */ addiu $v0, $zero, 0x10 -/* D9DF60 80240A90 AE030028 */ sw $v1, 0x28($s0) -/* D9DF64 80240A94 AE420070 */ sw $v0, 0x70($s2) -.L80240A98: -/* D9DF68 80240A98 8FBF002C */ lw $ra, 0x2c($sp) -/* D9DF6C 80240A9C 8FB20028 */ lw $s2, 0x28($sp) -/* D9DF70 80240AA0 8FB10024 */ lw $s1, 0x24($sp) -/* D9DF74 80240AA4 8FB00020 */ lw $s0, 0x20($sp) -/* D9DF78 80240AA8 03E00008 */ jr $ra -/* D9DF7C 80240AAC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s deleted file mode 100644 index ab42994748..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240AB0_D9DF80.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB0_D9DF80 -/* D9DF80 80240AB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9DF84 80240AB4 AFB10024 */ sw $s1, 0x24($sp) -/* D9DF88 80240AB8 0080882D */ daddu $s1, $a0, $zero -/* D9DF8C 80240ABC AFBF0028 */ sw $ra, 0x28($sp) -/* D9DF90 80240AC0 AFB00020 */ sw $s0, 0x20($sp) -/* D9DF94 80240AC4 8E220148 */ lw $v0, 0x148($s1) -/* D9DF98 80240AC8 0C00EABB */ jal get_npc_unsafe -/* D9DF9C 80240ACC 84440008 */ lh $a0, 8($v0) -/* D9DFA0 80240AD0 0040802D */ daddu $s0, $v0, $zero -/* D9DFA4 80240AD4 0200202D */ daddu $a0, $s0, $zero -/* D9DFA8 80240AD8 C600000C */ lwc1 $f0, 0xc($s0) -/* D9DFAC 80240ADC 27A60018 */ addiu $a2, $sp, 0x18 -/* D9DFB0 80240AE0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9DFB4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) -/* D9DFB8 80240AE8 AFA00014 */ sw $zero, 0x14($sp) -/* D9DFBC 80240AEC 8E050018 */ lw $a1, 0x18($s0) -/* D9DFC0 80240AF0 0C0129E1 */ jal func_8004A784 -/* D9DFC4 80240AF4 0000382D */ daddu $a3, $zero, $zero -/* D9DFC8 80240AF8 14400005 */ bnez $v0, .L80240B10 -/* D9DFCC 80240AFC 00000000 */ nop -/* D9DFD0 80240B00 8E050018 */ lw $a1, 0x18($s0) -/* D9DFD4 80240B04 8E06000C */ lw $a2, 0xc($s0) -/* D9DFD8 80240B08 0C00EA95 */ jal npc_move_heading -/* D9DFDC 80240B0C 0200202D */ daddu $a0, $s0, $zero -.L80240B10: -/* D9DFE0 80240B10 9602008E */ lhu $v0, 0x8e($s0) -/* D9DFE4 80240B14 2442FFFF */ addiu $v0, $v0, -1 -/* D9DFE8 80240B18 A602008E */ sh $v0, 0x8e($s0) -/* D9DFEC 80240B1C 00021400 */ sll $v0, $v0, 0x10 -/* D9DFF0 80240B20 14400004 */ bnez $v0, .L80240B34 -/* D9DFF4 80240B24 2402001E */ addiu $v0, $zero, 0x1e -/* D9DFF8 80240B28 A602008E */ sh $v0, 0x8e($s0) -/* D9DFFC 80240B2C 24020011 */ addiu $v0, $zero, 0x11 -/* D9E000 80240B30 AE220070 */ sw $v0, 0x70($s1) -.L80240B34: -/* D9E004 80240B34 8FBF0028 */ lw $ra, 0x28($sp) -/* D9E008 80240B38 8FB10024 */ lw $s1, 0x24($sp) -/* D9E00C 80240B3C 8FB00020 */ lw $s0, 0x20($sp) -/* D9E010 80240B40 03E00008 */ jr $ra -/* D9E014 80240B44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s deleted file mode 100644 index 7fb5343893..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247880_DA4D50 -.word .L80240D8C_D9E25C, .L80240D9C_D9E26C, .L80240DB4_D9E284, .L80240DC4_D9E294, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240DDC_D9E2AC, .L80240DEC_D9E2BC, .L80240E04_D9E2D4, .L80240E14_D9E2E4, .L80240E34_D9E304, .L80240E54_D9E324, .L80240E74_D9E344, .L80240E94_D9E364, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EB4_D9E384, .L80240EAC_D9E37C - -.section .text - -glabel func_80240BA8_D9E078 -/* D9E078 80240BA8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* D9E07C 80240BAC AFB30054 */ sw $s3, 0x54($sp) -/* D9E080 80240BB0 0080982D */ daddu $s3, $a0, $zero -/* D9E084 80240BB4 AFBF0060 */ sw $ra, 0x60($sp) -/* D9E088 80240BB8 AFB5005C */ sw $s5, 0x5c($sp) -/* D9E08C 80240BBC AFB40058 */ sw $s4, 0x58($sp) -/* D9E090 80240BC0 AFB20050 */ sw $s2, 0x50($sp) -/* D9E094 80240BC4 AFB1004C */ sw $s1, 0x4c($sp) -/* D9E098 80240BC8 AFB00048 */ sw $s0, 0x48($sp) -/* D9E09C 80240BCC 8E710148 */ lw $s1, 0x148($s3) -/* D9E0A0 80240BD0 86240008 */ lh $a0, 8($s1) -/* D9E0A4 80240BD4 0C00EABB */ jal get_npc_unsafe -/* D9E0A8 80240BD8 00A0802D */ daddu $s0, $a1, $zero -/* D9E0AC 80240BDC 8E63000C */ lw $v1, 0xc($s3) -/* D9E0B0 80240BE0 0260202D */ daddu $a0, $s3, $zero -/* D9E0B4 80240BE4 8C650000 */ lw $a1, ($v1) -/* D9E0B8 80240BE8 0C0B1EAF */ jal evt_get_variable -/* D9E0BC 80240BEC 0040902D */ daddu $s2, $v0, $zero -/* D9E0C0 80240BF0 AFA00018 */ sw $zero, 0x18($sp) -/* D9E0C4 80240BF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0C8 80240BF8 8C630030 */ lw $v1, 0x30($v1) -/* D9E0CC 80240BFC AFA3001C */ sw $v1, 0x1c($sp) -/* D9E0D0 80240C00 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0D4 80240C04 8C63001C */ lw $v1, 0x1c($v1) -/* D9E0D8 80240C08 AFA30020 */ sw $v1, 0x20($sp) -/* D9E0DC 80240C0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0E0 80240C10 8C630024 */ lw $v1, 0x24($v1) -/* D9E0E4 80240C14 AFA30024 */ sw $v1, 0x24($sp) -/* D9E0E8 80240C18 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0EC 80240C1C 8C630028 */ lw $v1, 0x28($v1) -/* D9E0F0 80240C20 27B50018 */ addiu $s5, $sp, 0x18 -/* D9E0F4 80240C24 AFA30028 */ sw $v1, 0x28($sp) -/* D9E0F8 80240C28 8E2300D0 */ lw $v1, 0xd0($s1) -/* D9E0FC 80240C2C 3C014282 */ lui $at, 0x4282 -/* D9E100 80240C30 44810000 */ mtc1 $at, $f0 -/* D9E104 80240C34 8C63002C */ lw $v1, 0x2c($v1) -/* D9E108 80240C38 0040A02D */ daddu $s4, $v0, $zero -/* D9E10C 80240C3C E7A00030 */ swc1 $f0, 0x30($sp) -/* D9E110 80240C40 A7A00034 */ sh $zero, 0x34($sp) -/* D9E114 80240C44 16000005 */ bnez $s0, .L80240C5C -/* D9E118 80240C48 AFA3002C */ sw $v1, 0x2c($sp) -/* D9E11C 80240C4C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9E120 80240C50 30420004 */ andi $v0, $v0, 4 -/* D9E124 80240C54 10400044 */ beqz $v0, .L80240D68 -/* D9E128 80240C58 00000000 */ nop -.L80240C5C: -/* D9E12C 80240C5C 2404F7FF */ addiu $a0, $zero, -0x801 -/* D9E130 80240C60 AE600070 */ sw $zero, 0x70($s3) -/* D9E134 80240C64 A640008E */ sh $zero, 0x8e($s2) -/* D9E138 80240C68 8E2200CC */ lw $v0, 0xcc($s1) -/* D9E13C 80240C6C 8E430000 */ lw $v1, ($s2) -/* D9E140 80240C70 8C420000 */ lw $v0, ($v0) -/* D9E144 80240C74 00641824 */ and $v1, $v1, $a0 -/* D9E148 80240C78 AE430000 */ sw $v1, ($s2) -/* D9E14C 80240C7C AE420028 */ sw $v0, 0x28($s2) -/* D9E150 80240C80 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9E154 80240C84 8C420034 */ lw $v0, 0x34($v0) -/* D9E158 80240C88 54400005 */ bnel $v0, $zero, .L80240CA0 -/* D9E15C 80240C8C 2402FDFF */ addiu $v0, $zero, -0x201 -/* D9E160 80240C90 34620200 */ ori $v0, $v1, 0x200 -/* D9E164 80240C94 2403FFF7 */ addiu $v1, $zero, -9 -/* D9E168 80240C98 0809032A */ j .L80240CA8 -/* D9E16C 80240C9C 00431024 */ and $v0, $v0, $v1 -.L80240CA0: -/* D9E170 80240CA0 00621024 */ and $v0, $v1, $v0 -/* D9E174 80240CA4 34420008 */ ori $v0, $v0, 8 -.L80240CA8: -/* D9E178 80240CA8 AE420000 */ sw $v0, ($s2) -/* D9E17C 80240CAC 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9E180 80240CB0 30420004 */ andi $v0, $v0, 4 -/* D9E184 80240CB4 10400004 */ beqz $v0, .L80240CC8 -/* D9E188 80240CB8 24020063 */ addiu $v0, $zero, 0x63 -/* D9E18C 80240CBC AE620070 */ sw $v0, 0x70($s3) -/* D9E190 80240CC0 08090338 */ j .L80240CE0 -/* D9E194 80240CC4 AE600074 */ sw $zero, 0x74($s3) -.L80240CC8: -/* D9E198 80240CC8 8E220000 */ lw $v0, ($s1) -/* D9E19C 80240CCC 3C034000 */ lui $v1, 0x4000 -/* D9E1A0 80240CD0 00431024 */ and $v0, $v0, $v1 -/* D9E1A4 80240CD4 10400002 */ beqz $v0, .L80240CE0 -/* D9E1A8 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* D9E1AC 80240CDC AE620070 */ sw $v0, 0x70($s3) -.L80240CE0: -/* D9E1B0 80240CE0 3C06BFFF */ lui $a2, 0xbfff -/* D9E1B4 80240CE4 34C6FFFF */ ori $a2, $a2, 0xffff -/* D9E1B8 80240CE8 27A50038 */ addiu $a1, $sp, 0x38 -/* D9E1BC 80240CEC 2404FFFB */ addiu $a0, $zero, -5 -/* D9E1C0 80240CF0 8E2200B0 */ lw $v0, 0xb0($s1) -/* D9E1C4 80240CF4 8E230000 */ lw $v1, ($s1) -/* D9E1C8 80240CF8 3C0142C8 */ lui $at, 0x42c8 -/* D9E1CC 80240CFC 44810000 */ mtc1 $at, $f0 -/* D9E1D0 80240D00 00441024 */ and $v0, $v0, $a0 -/* D9E1D4 80240D04 00661824 */ and $v1, $v1, $a2 -/* D9E1D8 80240D08 AE2200B0 */ sw $v0, 0xb0($s1) -/* D9E1DC 80240D0C AE230000 */ sw $v1, ($s1) -/* D9E1E0 80240D10 864200A8 */ lh $v0, 0xa8($s2) -/* D9E1E4 80240D14 27A70040 */ addiu $a3, $sp, 0x40 -/* D9E1E8 80240D18 E7A00044 */ swc1 $f0, 0x44($sp) -/* D9E1EC 80240D1C C6460038 */ lwc1 $f6, 0x38($s2) -/* D9E1F0 80240D20 C640003C */ lwc1 $f0, 0x3c($s2) -/* D9E1F4 80240D24 C6420040 */ lwc1 $f2, 0x40($s2) -/* D9E1F8 80240D28 44822000 */ mtc1 $v0, $f4 -/* D9E1FC 80240D2C 00000000 */ nop -/* D9E200 80240D30 46802120 */ cvt.s.w $f4, $f4 -/* D9E204 80240D34 27A20044 */ addiu $v0, $sp, 0x44 -/* D9E208 80240D38 46040000 */ add.s $f0, $f0, $f4 -/* D9E20C 80240D3C E7A60038 */ swc1 $f6, 0x38($sp) -/* D9E210 80240D40 E7A20040 */ swc1 $f2, 0x40($sp) -/* D9E214 80240D44 E7A0003C */ swc1 $f0, 0x3c($sp) -/* D9E218 80240D48 AFA20010 */ sw $v0, 0x10($sp) -/* D9E21C 80240D4C 8E440080 */ lw $a0, 0x80($s2) -/* D9E220 80240D50 0C0372DF */ jal npc_raycast_down_sides -/* D9E224 80240D54 27A6003C */ addiu $a2, $sp, 0x3c -/* D9E228 80240D58 10400003 */ beqz $v0, .L80240D68 -/* D9E22C 80240D5C 00000000 */ nop -/* D9E230 80240D60 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* D9E234 80240D64 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D68: -/* D9E238 80240D68 8E630070 */ lw $v1, 0x70($s3) -/* D9E23C 80240D6C 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9E240 80240D70 10400050 */ beqz $v0, .L80240EB4_D9E384 -/* D9E244 80240D74 00031080 */ sll $v0, $v1, 2 -/* D9E248 80240D78 3C018024 */ lui $at, %hi(jtbl_80247880_DA4D50) -/* D9E24C 80240D7C 00220821 */ addu $at, $at, $v0 -/* D9E250 80240D80 8C227880 */ lw $v0, %lo(jtbl_80247880_DA4D50)($at) -/* D9E254 80240D84 00400008 */ jr $v0 -/* D9E258 80240D88 00000000 */ nop -.L80240D8C_D9E25C: -/* D9E25C 80240D8C 0260202D */ daddu $a0, $s3, $zero -/* D9E260 80240D90 0280282D */ daddu $a1, $s4, $zero -/* D9E264 80240D94 0C012568 */ jal func_800495A0 -/* D9E268 80240D98 02A0302D */ daddu $a2, $s5, $zero -.L80240D9C_D9E26C: -/* D9E26C 80240D9C 0260202D */ daddu $a0, $s3, $zero -/* D9E270 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* D9E274 80240DA4 0C0125AE */ jal func_800496B8 -/* D9E278 80240DA8 02A0302D */ daddu $a2, $s5, $zero -/* D9E27C 80240DAC 080903AD */ j .L80240EB4_D9E384 -/* D9E280 80240DB0 00000000 */ nop -.L80240DB4_D9E284: -/* D9E284 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* D9E288 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* D9E28C 80240DBC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* D9E290 80240DC0 02A0302D */ daddu $a2, $s5, $zero -.L80240DC4_D9E294: -/* D9E294 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* D9E298 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* D9E29C 80240DCC 0C012701 */ jal func_80049C04 -/* D9E2A0 80240DD0 02A0302D */ daddu $a2, $s5, $zero -/* D9E2A4 80240DD4 080903AD */ j .L80240EB4_D9E384 -/* D9E2A8 80240DD8 00000000 */ nop -.L80240DDC_D9E2AC: -/* D9E2AC 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* D9E2B0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* D9E2B4 80240DE4 0C01278F */ jal func_80049E3C -/* D9E2B8 80240DE8 02A0302D */ daddu $a2, $s5, $zero -.L80240DEC_D9E2BC: -/* D9E2BC 80240DEC 0260202D */ daddu $a0, $s3, $zero -/* D9E2C0 80240DF0 0280282D */ daddu $a1, $s4, $zero -/* D9E2C4 80240DF4 0C0127B3 */ jal func_80049ECC -/* D9E2C8 80240DF8 02A0302D */ daddu $a2, $s5, $zero -/* D9E2CC 80240DFC 080903AD */ j .L80240EB4_D9E384 -/* D9E2D0 80240E00 00000000 */ nop -.L80240E04_D9E2D4: -/* D9E2D4 80240E04 0260202D */ daddu $a0, $s3, $zero -/* D9E2D8 80240E08 0280282D */ daddu $a1, $s4, $zero -/* D9E2DC 80240E0C 0C0127DF */ jal func_80049F7C -/* D9E2E0 80240E10 02A0302D */ daddu $a2, $s5, $zero -.L80240E14_D9E2E4: -/* D9E2E4 80240E14 0260202D */ daddu $a0, $s3, $zero -/* D9E2E8 80240E18 0280282D */ daddu $a1, $s4, $zero -/* D9E2EC 80240E1C 0C012849 */ jal func_8004A124 -/* D9E2F0 80240E20 02A0302D */ daddu $a2, $s5, $zero -/* D9E2F4 80240E24 8E630070 */ lw $v1, 0x70($s3) -/* D9E2F8 80240E28 2402000E */ addiu $v0, $zero, 0xe -/* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, .L80240EB4_D9E384 -/* D9E300 80240E30 00000000 */ nop -.L80240E34_D9E304: -/* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero -/* D9E308 80240E38 0280282D */ daddu $a1, $s4, $zero -/* D9E30C 80240E3C 0C09025C */ jal func_80240970_D9DE40 -/* D9E310 80240E40 02A0302D */ daddu $a2, $s5, $zero -/* D9E314 80240E44 8E630070 */ lw $v1, 0x70($s3) -/* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf -/* D9E31C 80240E4C 14620019 */ bne $v1, $v0, .L80240EB4_D9E384 -/* D9E320 80240E50 00000000 */ nop -.L80240E54_D9E324: -/* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero -/* D9E328 80240E58 0280282D */ daddu $a1, $s4, $zero -/* D9E32C 80240E5C 0C090278 */ jal func_802409E0_D9DEB0 -/* D9E330 80240E60 02A0302D */ daddu $a2, $s5, $zero -/* D9E334 80240E64 8E630070 */ lw $v1, 0x70($s3) -/* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 -/* D9E33C 80240E6C 14620011 */ bne $v1, $v0, .L80240EB4_D9E384 -/* D9E340 80240E70 00000000 */ nop -.L80240E74_D9E344: -/* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero -/* D9E348 80240E78 0280282D */ daddu $a1, $s4, $zero -/* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0_D9DF80 -/* D9E350 80240E80 02A0302D */ daddu $a2, $s5, $zero -/* D9E354 80240E84 8E630070 */ lw $v1, 0x70($s3) -/* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 -/* D9E35C 80240E8C 14620009 */ bne $v1, $v0, .L80240EB4_D9E384 -/* D9E360 80240E90 00000000 */ nop -.L80240E94_D9E364: -/* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero -/* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero -/* D9E36C 80240E9C 0C0902D2 */ jal omo_02_UnkNpcDurationAnimationFunc -/* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero -/* D9E374 80240EA4 080903AD */ j .L80240EB4_D9E384 -/* D9E378 80240EA8 00000000 */ nop -.L80240EAC_D9E37C: -/* D9E37C 80240EAC 0C0129CF */ jal func_8004A73C -/* D9E380 80240EB0 0260202D */ daddu $a0, $s3, $zero -.L80240EB4_D9E384: -/* D9E384 80240EB4 8FBF0060 */ lw $ra, 0x60($sp) -/* D9E388 80240EB8 8FB5005C */ lw $s5, 0x5c($sp) -/* D9E38C 80240EBC 8FB40058 */ lw $s4, 0x58($sp) -/* D9E390 80240EC0 8FB30054 */ lw $s3, 0x54($sp) -/* D9E394 80240EC4 8FB20050 */ lw $s2, 0x50($sp) -/* D9E398 80240EC8 8FB1004C */ lw $s1, 0x4c($sp) -/* D9E39C 80240ECC 8FB00048 */ lw $s0, 0x48($sp) -/* D9E3A0 80240ED0 0000102D */ daddu $v0, $zero, $zero -/* D9E3A4 80240ED4 03E00008 */ jr $ra -/* D9E3A8 80240ED8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s deleted file mode 100644 index 6f2734bf56..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402F4_DAD6F4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F4_DAD6F4 -/* DAD6F4 802402F4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAD6F8 802402F8 AFB00010 */ sw $s0, 0x10($sp) -/* DAD6FC 802402FC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* DAD700 80240300 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* DAD704 80240304 AFBF0018 */ sw $ra, 0x18($sp) -/* DAD708 80240308 AFB10014 */ sw $s1, 0x14($sp) -/* DAD70C 8024030C F7B60028 */ sdc1 $f22, 0x28($sp) -/* DAD710 80240310 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DAD714 80240314 C60C0080 */ lwc1 $f12, 0x80($s0) -/* DAD718 80240318 0C00A8BB */ jal sin_deg -/* DAD71C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* DAD720 80240320 C6140054 */ lwc1 $f20, 0x54($s0) -/* DAD724 80240324 3C0140A0 */ lui $at, 0x40a0 -/* DAD728 80240328 4481B000 */ mtc1 $at, $f22 -/* DAD72C 8024032C 00000000 */ nop -/* DAD730 80240330 4616A502 */ mul.s $f20, $f20, $f22 -/* DAD734 80240334 00000000 */ nop -/* DAD738 80240338 C60C0080 */ lwc1 $f12, 0x80($s0) -/* DAD73C 8024033C 4600A502 */ mul.s $f20, $f20, $f0 -/* DAD740 80240340 0C00A8D4 */ jal cos_deg -/* DAD744 80240344 00000000 */ nop -/* DAD748 80240348 C6040054 */ lwc1 $f4, 0x54($s0) -/* DAD74C 8024034C 46162102 */ mul.s $f4, $f4, $f22 -/* DAD750 80240350 00000000 */ nop -/* DAD754 80240354 C6020028 */ lwc1 $f2, 0x28($s0) -/* DAD758 80240358 46141080 */ add.s $f2, $f2, $f20 -/* DAD75C 8024035C 46000007 */ neg.s $f0, $f0 -/* DAD760 80240360 46002102 */ mul.s $f4, $f4, $f0 -/* DAD764 80240364 00000000 */ nop -/* DAD768 80240368 4600118D */ trunc.w.s $f6, $f2 -/* DAD76C 8024036C E6260084 */ swc1 $f6, 0x84($s1) -/* DAD770 80240370 C6000030 */ lwc1 $f0, 0x30($s0) -/* DAD774 80240374 46040000 */ add.s $f0, $f0, $f4 -/* DAD778 80240378 4600018D */ trunc.w.s $f6, $f0 -/* DAD77C 8024037C E6260088 */ swc1 $f6, 0x88($s1) -/* DAD780 80240380 8FBF0018 */ lw $ra, 0x18($sp) -/* DAD784 80240384 8FB10014 */ lw $s1, 0x14($sp) -/* DAD788 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* DAD78C 8024038C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DAD790 80240390 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DAD794 80240394 24020002 */ addiu $v0, $zero, 2 -/* DAD798 80240398 03E00008 */ jr $ra -/* DAD79C 8024039C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s deleted file mode 100644 index db6c5fe135..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244D08_DB2108 -.double 0.6 - -.section .text - -glabel func_80241898_DAEC98 -/* DAEC98 80241898 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAEC9C 8024189C AFB10014 */ sw $s1, 0x14($sp) -/* DAECA0 802418A0 0080882D */ daddu $s1, $a0, $zero -/* DAECA4 802418A4 AFBF0018 */ sw $ra, 0x18($sp) -/* DAECA8 802418A8 AFB00010 */ sw $s0, 0x10($sp) -/* DAECAC 802418AC 8E300148 */ lw $s0, 0x148($s1) -/* DAECB0 802418B0 0C00EABB */ jal get_npc_unsafe -/* DAECB4 802418B4 86040008 */ lh $a0, 8($s0) -/* DAECB8 802418B8 C4400018 */ lwc1 $f0, 0x18($v0) -/* DAECBC 802418BC 3C018024 */ lui $at, %hi(D_80244D08_DB2108) -/* DAECC0 802418C0 D4224D08 */ ldc1 $f2, %lo(D_80244D08_DB2108)($at) -/* DAECC4 802418C4 46000021 */ cvt.d.s $f0, $f0 -/* DAECC8 802418C8 46220002 */ mul.d $f0, $f0, $f2 -/* DAECCC 802418CC 00000000 */ nop -/* DAECD0 802418D0 46200020 */ cvt.s.d $f0, $f0 -/* DAECD4 802418D4 E4400018 */ swc1 $f0, 0x18($v0) -/* DAECD8 802418D8 8E0300CC */ lw $v1, 0xcc($s0) -/* DAECDC 802418DC 8C640030 */ lw $a0, 0x30($v1) -/* DAECE0 802418E0 24030005 */ addiu $v1, $zero, 5 -/* DAECE4 802418E4 A443008E */ sh $v1, 0x8e($v0) -/* DAECE8 802418E8 AC440028 */ sw $a0, 0x28($v0) -/* DAECEC 802418EC 2402000F */ addiu $v0, $zero, 0xf -/* DAECF0 802418F0 AE220070 */ sw $v0, 0x70($s1) -/* DAECF4 802418F4 8FBF0018 */ lw $ra, 0x18($sp) -/* DAECF8 802418F8 8FB10014 */ lw $s1, 0x14($sp) -/* DAECFC 802418FC 8FB00010 */ lw $s0, 0x10($sp) -/* DAED00 80241900 03E00008 */ jr $ra -/* DAED04 80241904 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s deleted file mode 100644 index 04a045762b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244D10_DB2110 -.double 0.6 - -.section .text - -glabel func_80241908_DAED08 -/* DAED08 80241908 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAED0C 8024190C AFB20028 */ sw $s2, 0x28($sp) -/* DAED10 80241910 0080902D */ daddu $s2, $a0, $zero -/* DAED14 80241914 AFBF002C */ sw $ra, 0x2c($sp) -/* DAED18 80241918 AFB10024 */ sw $s1, 0x24($sp) -/* DAED1C 8024191C AFB00020 */ sw $s0, 0x20($sp) -/* DAED20 80241920 8E510148 */ lw $s1, 0x148($s2) -/* DAED24 80241924 0C00EABB */ jal get_npc_unsafe -/* DAED28 80241928 86240008 */ lh $a0, 8($s1) -/* DAED2C 8024192C 0040802D */ daddu $s0, $v0, $zero -/* DAED30 80241930 0200202D */ daddu $a0, $s0, $zero -/* DAED34 80241934 C600000C */ lwc1 $f0, 0xc($s0) -/* DAED38 80241938 27A60018 */ addiu $a2, $sp, 0x18 -/* DAED3C 8024193C E7A00018 */ swc1 $f0, 0x18($sp) -/* DAED40 80241940 AFA00010 */ sw $zero, 0x10($sp) -/* DAED44 80241944 AFA00014 */ sw $zero, 0x14($sp) -/* DAED48 80241948 8E050018 */ lw $a1, 0x18($s0) -/* DAED4C 8024194C 0C0129E1 */ jal func_8004A784 -/* DAED50 80241950 0000382D */ daddu $a3, $zero, $zero -/* DAED54 80241954 14400005 */ bnez $v0, .L8024196C -/* DAED58 80241958 00000000 */ nop -/* DAED5C 8024195C 8E050018 */ lw $a1, 0x18($s0) -/* DAED60 80241960 8E06000C */ lw $a2, 0xc($s0) -/* DAED64 80241964 0C00EA95 */ jal npc_move_heading -/* DAED68 80241968 0200202D */ daddu $a0, $s0, $zero -.L8024196C: -/* DAED6C 8024196C 9602008E */ lhu $v0, 0x8e($s0) -/* DAED70 80241970 2442FFFF */ addiu $v0, $v0, -1 -/* DAED74 80241974 A602008E */ sh $v0, 0x8e($s0) -/* DAED78 80241978 00021400 */ sll $v0, $v0, 0x10 -/* DAED7C 8024197C 14400010 */ bnez $v0, .L802419C0 -/* DAED80 80241980 00000000 */ nop -/* DAED84 80241984 C6000018 */ lwc1 $f0, 0x18($s0) -/* DAED88 80241988 3C018024 */ lui $at, %hi(D_80244D10_DB2110) -/* DAED8C 8024198C D4224D10 */ ldc1 $f2, %lo(D_80244D10_DB2110)($at) -/* DAED90 80241990 46000021 */ cvt.d.s $f0, $f0 -/* DAED94 80241994 46220002 */ mul.d $f0, $f0, $f2 -/* DAED98 80241998 00000000 */ nop -/* DAED9C 8024199C 46200020 */ cvt.s.d $f0, $f0 -/* DAEDA0 802419A0 E6000018 */ swc1 $f0, 0x18($s0) -/* DAEDA4 802419A4 8E2200CC */ lw $v0, 0xcc($s1) -/* DAEDA8 802419A8 8C43002C */ lw $v1, 0x2c($v0) -/* DAEDAC 802419AC 2402000A */ addiu $v0, $zero, 0xa -/* DAEDB0 802419B0 A602008E */ sh $v0, 0x8e($s0) -/* DAEDB4 802419B4 24020010 */ addiu $v0, $zero, 0x10 -/* DAEDB8 802419B8 AE030028 */ sw $v1, 0x28($s0) -/* DAEDBC 802419BC AE420070 */ sw $v0, 0x70($s2) -.L802419C0: -/* DAEDC0 802419C0 8FBF002C */ lw $ra, 0x2c($sp) -/* DAEDC4 802419C4 8FB20028 */ lw $s2, 0x28($sp) -/* DAEDC8 802419C8 8FB10024 */ lw $s1, 0x24($sp) -/* DAEDCC 802419CC 8FB00020 */ lw $s0, 0x20($sp) -/* DAEDD0 802419D0 03E00008 */ jr $ra -/* DAEDD4 802419D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s deleted file mode 100644 index af0f8238a2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802419D8_DAEDD8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D8_DAEDD8 -/* DAEDD8 802419D8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAEDDC 802419DC AFB10024 */ sw $s1, 0x24($sp) -/* DAEDE0 802419E0 0080882D */ daddu $s1, $a0, $zero -/* DAEDE4 802419E4 AFBF0028 */ sw $ra, 0x28($sp) -/* DAEDE8 802419E8 AFB00020 */ sw $s0, 0x20($sp) -/* DAEDEC 802419EC 8E220148 */ lw $v0, 0x148($s1) -/* DAEDF0 802419F0 0C00EABB */ jal get_npc_unsafe -/* DAEDF4 802419F4 84440008 */ lh $a0, 8($v0) -/* DAEDF8 802419F8 0040802D */ daddu $s0, $v0, $zero -/* DAEDFC 802419FC 0200202D */ daddu $a0, $s0, $zero -/* DAEE00 80241A00 C600000C */ lwc1 $f0, 0xc($s0) -/* DAEE04 80241A04 27A60018 */ addiu $a2, $sp, 0x18 -/* DAEE08 80241A08 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAEE0C 80241A0C AFA00010 */ sw $zero, 0x10($sp) -/* DAEE10 80241A10 AFA00014 */ sw $zero, 0x14($sp) -/* DAEE14 80241A14 8E050018 */ lw $a1, 0x18($s0) -/* DAEE18 80241A18 0C0129E1 */ jal func_8004A784 -/* DAEE1C 80241A1C 0000382D */ daddu $a3, $zero, $zero -/* DAEE20 80241A20 14400005 */ bnez $v0, .L80241A38 -/* DAEE24 80241A24 00000000 */ nop -/* DAEE28 80241A28 8E050018 */ lw $a1, 0x18($s0) -/* DAEE2C 80241A2C 8E06000C */ lw $a2, 0xc($s0) -/* DAEE30 80241A30 0C00EA95 */ jal npc_move_heading -/* DAEE34 80241A34 0200202D */ daddu $a0, $s0, $zero -.L80241A38: -/* DAEE38 80241A38 9602008E */ lhu $v0, 0x8e($s0) -/* DAEE3C 80241A3C 2442FFFF */ addiu $v0, $v0, -1 -/* DAEE40 80241A40 A602008E */ sh $v0, 0x8e($s0) -/* DAEE44 80241A44 00021400 */ sll $v0, $v0, 0x10 -/* DAEE48 80241A48 14400004 */ bnez $v0, .L80241A5C -/* DAEE4C 80241A4C 2402001E */ addiu $v0, $zero, 0x1e -/* DAEE50 80241A50 A602008E */ sh $v0, 0x8e($s0) -/* DAEE54 80241A54 24020011 */ addiu $v0, $zero, 0x11 -/* DAEE58 80241A58 AE220070 */ sw $v0, 0x70($s1) -.L80241A5C: -/* DAEE5C 80241A5C 8FBF0028 */ lw $ra, 0x28($sp) -/* DAEE60 80241A60 8FB10024 */ lw $s1, 0x24($sp) -/* DAEE64 80241A64 8FB00020 */ lw $s0, 0x20($sp) -/* DAEE68 80241A68 03E00008 */ jr $ra -/* DAEE6C 80241A6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s deleted file mode 100644 index 7a82880e74..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244D18_DB2118 -.word .L80241CB4_DAF0B4, .L80241CC4_DAF0C4, .L80241CDC_DAF0DC, .L80241CEC_DAF0EC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241D04_DAF104, .L80241D14_DAF114, .L80241D2C_DAF12C, .L80241D3C_DAF13C, .L80241D5C_DAF15C, .L80241D7C_DAF17C, .L80241D9C_DAF19C, .L80241DBC_DAF1BC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DDC_DAF1DC, .L80241DD4_DAF1D4, 0, 0 - -.section .text - -glabel func_80241AD0_DAEED0 -/* DAEED0 80241AD0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DAEED4 80241AD4 AFB30054 */ sw $s3, 0x54($sp) -/* DAEED8 80241AD8 0080982D */ daddu $s3, $a0, $zero -/* DAEEDC 80241ADC AFBF0060 */ sw $ra, 0x60($sp) -/* DAEEE0 80241AE0 AFB5005C */ sw $s5, 0x5c($sp) -/* DAEEE4 80241AE4 AFB40058 */ sw $s4, 0x58($sp) -/* DAEEE8 80241AE8 AFB20050 */ sw $s2, 0x50($sp) -/* DAEEEC 80241AEC AFB1004C */ sw $s1, 0x4c($sp) -/* DAEEF0 80241AF0 AFB00048 */ sw $s0, 0x48($sp) -/* DAEEF4 80241AF4 8E710148 */ lw $s1, 0x148($s3) -/* DAEEF8 80241AF8 86240008 */ lh $a0, 8($s1) -/* DAEEFC 80241AFC 0C00EABB */ jal get_npc_unsafe -/* DAEF00 80241B00 00A0802D */ daddu $s0, $a1, $zero -/* DAEF04 80241B04 8E63000C */ lw $v1, 0xc($s3) -/* DAEF08 80241B08 0260202D */ daddu $a0, $s3, $zero -/* DAEF0C 80241B0C 8C650000 */ lw $a1, ($v1) -/* DAEF10 80241B10 0C0B1EAF */ jal evt_get_variable -/* DAEF14 80241B14 0040902D */ daddu $s2, $v0, $zero -/* DAEF18 80241B18 AFA00018 */ sw $zero, 0x18($sp) -/* DAEF1C 80241B1C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF20 80241B20 8C630030 */ lw $v1, 0x30($v1) -/* DAEF24 80241B24 AFA3001C */ sw $v1, 0x1c($sp) -/* DAEF28 80241B28 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF2C 80241B2C 8C63001C */ lw $v1, 0x1c($v1) -/* DAEF30 80241B30 AFA30020 */ sw $v1, 0x20($sp) -/* DAEF34 80241B34 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF38 80241B38 8C630024 */ lw $v1, 0x24($v1) -/* DAEF3C 80241B3C AFA30024 */ sw $v1, 0x24($sp) -/* DAEF40 80241B40 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF44 80241B44 8C630028 */ lw $v1, 0x28($v1) -/* DAEF48 80241B48 27B50018 */ addiu $s5, $sp, 0x18 -/* DAEF4C 80241B4C AFA30028 */ sw $v1, 0x28($sp) -/* DAEF50 80241B50 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAEF54 80241B54 3C014282 */ lui $at, 0x4282 -/* DAEF58 80241B58 44810000 */ mtc1 $at, $f0 -/* DAEF5C 80241B5C 8C63002C */ lw $v1, 0x2c($v1) -/* DAEF60 80241B60 0040A02D */ daddu $s4, $v0, $zero -/* DAEF64 80241B64 E7A00030 */ swc1 $f0, 0x30($sp) -/* DAEF68 80241B68 A7A00034 */ sh $zero, 0x34($sp) -/* DAEF6C 80241B6C 16000005 */ bnez $s0, .L80241B84 -/* DAEF70 80241B70 AFA3002C */ sw $v1, 0x2c($sp) -/* DAEF74 80241B74 8E2200B0 */ lw $v0, 0xb0($s1) -/* DAEF78 80241B78 30420004 */ andi $v0, $v0, 4 -/* DAEF7C 80241B7C 10400044 */ beqz $v0, .L80241C90 -/* DAEF80 80241B80 00000000 */ nop -.L80241B84: -/* DAEF84 80241B84 2404F7FF */ addiu $a0, $zero, -0x801 -/* DAEF88 80241B88 AE600070 */ sw $zero, 0x70($s3) -/* DAEF8C 80241B8C A640008E */ sh $zero, 0x8e($s2) -/* DAEF90 80241B90 8E2200CC */ lw $v0, 0xcc($s1) -/* DAEF94 80241B94 8E430000 */ lw $v1, ($s2) -/* DAEF98 80241B98 8C420000 */ lw $v0, ($v0) -/* DAEF9C 80241B9C 00641824 */ and $v1, $v1, $a0 -/* DAEFA0 80241BA0 AE430000 */ sw $v1, ($s2) -/* DAEFA4 80241BA4 AE420028 */ sw $v0, 0x28($s2) -/* DAEFA8 80241BA8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAEFAC 80241BAC 8C420034 */ lw $v0, 0x34($v0) -/* DAEFB0 80241BB0 54400005 */ bnel $v0, $zero, .L80241BC8 -/* DAEFB4 80241BB4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DAEFB8 80241BB8 34620200 */ ori $v0, $v1, 0x200 -/* DAEFBC 80241BBC 2403FFF7 */ addiu $v1, $zero, -9 -/* DAEFC0 80241BC0 080906F4 */ j .L80241BD0 -/* DAEFC4 80241BC4 00431024 */ and $v0, $v0, $v1 -.L80241BC8: -/* DAEFC8 80241BC8 00621024 */ and $v0, $v1, $v0 -/* DAEFCC 80241BCC 34420008 */ ori $v0, $v0, 8 -.L80241BD0: -/* DAEFD0 80241BD0 AE420000 */ sw $v0, ($s2) -/* DAEFD4 80241BD4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DAEFD8 80241BD8 30420004 */ andi $v0, $v0, 4 -/* DAEFDC 80241BDC 10400004 */ beqz $v0, .L80241BF0 -/* DAEFE0 80241BE0 24020063 */ addiu $v0, $zero, 0x63 -/* DAEFE4 80241BE4 AE620070 */ sw $v0, 0x70($s3) -/* DAEFE8 80241BE8 08090702 */ j .L80241C08 -/* DAEFEC 80241BEC AE600074 */ sw $zero, 0x74($s3) -.L80241BF0: -/* DAEFF0 80241BF0 8E220000 */ lw $v0, ($s1) -/* DAEFF4 80241BF4 3C034000 */ lui $v1, 0x4000 -/* DAEFF8 80241BF8 00431024 */ and $v0, $v0, $v1 -/* DAEFFC 80241BFC 10400002 */ beqz $v0, .L80241C08 -/* DAF000 80241C00 2402000C */ addiu $v0, $zero, 0xc -/* DAF004 80241C04 AE620070 */ sw $v0, 0x70($s3) -.L80241C08: -/* DAF008 80241C08 3C06BFFF */ lui $a2, 0xbfff -/* DAF00C 80241C0C 34C6FFFF */ ori $a2, $a2, 0xffff -/* DAF010 80241C10 27A50038 */ addiu $a1, $sp, 0x38 -/* DAF014 80241C14 2404FFFB */ addiu $a0, $zero, -5 -/* DAF018 80241C18 8E2200B0 */ lw $v0, 0xb0($s1) -/* DAF01C 80241C1C 8E230000 */ lw $v1, ($s1) -/* DAF020 80241C20 3C0142C8 */ lui $at, 0x42c8 -/* DAF024 80241C24 44810000 */ mtc1 $at, $f0 -/* DAF028 80241C28 00441024 */ and $v0, $v0, $a0 -/* DAF02C 80241C2C 00661824 */ and $v1, $v1, $a2 -/* DAF030 80241C30 AE2200B0 */ sw $v0, 0xb0($s1) -/* DAF034 80241C34 AE230000 */ sw $v1, ($s1) -/* DAF038 80241C38 864200A8 */ lh $v0, 0xa8($s2) -/* DAF03C 80241C3C 27A70040 */ addiu $a3, $sp, 0x40 -/* DAF040 80241C40 E7A00044 */ swc1 $f0, 0x44($sp) -/* DAF044 80241C44 C6460038 */ lwc1 $f6, 0x38($s2) -/* DAF048 80241C48 C640003C */ lwc1 $f0, 0x3c($s2) -/* DAF04C 80241C4C C6420040 */ lwc1 $f2, 0x40($s2) -/* DAF050 80241C50 44822000 */ mtc1 $v0, $f4 -/* DAF054 80241C54 00000000 */ nop -/* DAF058 80241C58 46802120 */ cvt.s.w $f4, $f4 -/* DAF05C 80241C5C 27A20044 */ addiu $v0, $sp, 0x44 -/* DAF060 80241C60 46040000 */ add.s $f0, $f0, $f4 -/* DAF064 80241C64 E7A60038 */ swc1 $f6, 0x38($sp) -/* DAF068 80241C68 E7A20040 */ swc1 $f2, 0x40($sp) -/* DAF06C 80241C6C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DAF070 80241C70 AFA20010 */ sw $v0, 0x10($sp) -/* DAF074 80241C74 8E440080 */ lw $a0, 0x80($s2) -/* DAF078 80241C78 0C0372DF */ jal npc_raycast_down_sides -/* DAF07C 80241C7C 27A6003C */ addiu $a2, $sp, 0x3c -/* DAF080 80241C80 10400003 */ beqz $v0, .L80241C90 -/* DAF084 80241C84 00000000 */ nop -/* DAF088 80241C88 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DAF08C 80241C8C E640003C */ swc1 $f0, 0x3c($s2) -.L80241C90: -/* DAF090 80241C90 8E630070 */ lw $v1, 0x70($s3) -/* DAF094 80241C94 2C620064 */ sltiu $v0, $v1, 0x64 -/* DAF098 80241C98 10400050 */ beqz $v0, .L80241DDC_DAF1DC -/* DAF09C 80241C9C 00031080 */ sll $v0, $v1, 2 -/* DAF0A0 80241CA0 3C018024 */ lui $at, %hi(jtbl_80244D18_DB2118) -/* DAF0A4 80241CA4 00220821 */ addu $at, $at, $v0 -/* DAF0A8 80241CA8 8C224D18 */ lw $v0, %lo(jtbl_80244D18_DB2118)($at) -/* DAF0AC 80241CAC 00400008 */ jr $v0 -/* DAF0B0 80241CB0 00000000 */ nop -.L80241CB4_DAF0B4: -/* DAF0B4 80241CB4 0260202D */ daddu $a0, $s3, $zero -/* DAF0B8 80241CB8 0280282D */ daddu $a1, $s4, $zero -/* DAF0BC 80241CBC 0C012568 */ jal func_800495A0 -/* DAF0C0 80241CC0 02A0302D */ daddu $a2, $s5, $zero -.L80241CC4_DAF0C4: -/* DAF0C4 80241CC4 0260202D */ daddu $a0, $s3, $zero -/* DAF0C8 80241CC8 0280282D */ daddu $a1, $s4, $zero -/* DAF0CC 80241CCC 0C0125AE */ jal func_800496B8 -/* DAF0D0 80241CD0 02A0302D */ daddu $a2, $s5, $zero -/* DAF0D4 80241CD4 08090777 */ j .L80241DDC_DAF1DC -/* DAF0D8 80241CD8 00000000 */ nop -.L80241CDC_DAF0DC: -/* DAF0DC 80241CDC 0260202D */ daddu $a0, $s3, $zero -/* DAF0E0 80241CE0 0280282D */ daddu $a1, $s4, $zero -/* DAF0E4 80241CE4 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DAF0E8 80241CE8 02A0302D */ daddu $a2, $s5, $zero -.L80241CEC_DAF0EC: -/* DAF0EC 80241CEC 0260202D */ daddu $a0, $s3, $zero -/* DAF0F0 80241CF0 0280282D */ daddu $a1, $s4, $zero -/* DAF0F4 80241CF4 0C012701 */ jal func_80049C04 -/* DAF0F8 80241CF8 02A0302D */ daddu $a2, $s5, $zero -/* DAF0FC 80241CFC 08090777 */ j .L80241DDC_DAF1DC -/* DAF100 80241D00 00000000 */ nop -.L80241D04_DAF104: -/* DAF104 80241D04 0260202D */ daddu $a0, $s3, $zero -/* DAF108 80241D08 0280282D */ daddu $a1, $s4, $zero -/* DAF10C 80241D0C 0C01278F */ jal func_80049E3C -/* DAF110 80241D10 02A0302D */ daddu $a2, $s5, $zero -.L80241D14_DAF114: -/* DAF114 80241D14 0260202D */ daddu $a0, $s3, $zero -/* DAF118 80241D18 0280282D */ daddu $a1, $s4, $zero -/* DAF11C 80241D1C 0C0127B3 */ jal func_80049ECC -/* DAF120 80241D20 02A0302D */ daddu $a2, $s5, $zero -/* DAF124 80241D24 08090777 */ j .L80241DDC_DAF1DC -/* DAF128 80241D28 00000000 */ nop -.L80241D2C_DAF12C: -/* DAF12C 80241D2C 0260202D */ daddu $a0, $s3, $zero -/* DAF130 80241D30 0280282D */ daddu $a1, $s4, $zero -/* DAF134 80241D34 0C0127DF */ jal func_80049F7C -/* DAF138 80241D38 02A0302D */ daddu $a2, $s5, $zero -.L80241D3C_DAF13C: -/* DAF13C 80241D3C 0260202D */ daddu $a0, $s3, $zero -/* DAF140 80241D40 0280282D */ daddu $a1, $s4, $zero -/* DAF144 80241D44 0C012849 */ jal func_8004A124 -/* DAF148 80241D48 02A0302D */ daddu $a2, $s5, $zero -/* DAF14C 80241D4C 8E630070 */ lw $v1, 0x70($s3) -/* DAF150 80241D50 2402000E */ addiu $v0, $zero, 0xe -/* DAF154 80241D54 14620021 */ bne $v1, $v0, .L80241DDC_DAF1DC -/* DAF158 80241D58 00000000 */ nop -.L80241D5C_DAF15C: -/* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero -/* DAF160 80241D60 0280282D */ daddu $a1, $s4, $zero -/* DAF164 80241D64 0C090626 */ jal func_80241898_DAEC98 -/* DAF168 80241D68 02A0302D */ daddu $a2, $s5, $zero -/* DAF16C 80241D6C 8E630070 */ lw $v1, 0x70($s3) -/* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf -/* DAF174 80241D74 14620019 */ bne $v1, $v0, .L80241DDC_DAF1DC -/* DAF178 80241D78 00000000 */ nop -.L80241D7C_DAF17C: -/* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero -/* DAF180 80241D80 0280282D */ daddu $a1, $s4, $zero -/* DAF184 80241D84 0C090642 */ jal func_80241908_DAED08 -/* DAF188 80241D88 02A0302D */ daddu $a2, $s5, $zero -/* DAF18C 80241D8C 8E630070 */ lw $v1, 0x70($s3) -/* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 -/* DAF194 80241D94 14620011 */ bne $v1, $v0, .L80241DDC_DAF1DC -/* DAF198 80241D98 00000000 */ nop -.L80241D9C_DAF19C: -/* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero -/* DAF1A0 80241DA0 0280282D */ daddu $a1, $s4, $zero -/* DAF1A4 80241DA4 0C090676 */ jal func_802419D8_DAEDD8 -/* DAF1A8 80241DA8 02A0302D */ daddu $a2, $s5, $zero -/* DAF1AC 80241DAC 8E630070 */ lw $v1, 0x70($s3) -/* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 -/* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, .L80241DDC_DAF1DC -/* DAF1B8 80241DB8 00000000 */ nop -.L80241DBC_DAF1BC: -/* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero -/* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero -/* DAF1C4 80241DC4 0C09069C */ jal omo_04_UnkNpcDurationAnimationFunc -/* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero -/* DAF1CC 80241DCC 08090777 */ j .L80241DDC_DAF1DC -/* DAF1D0 80241DD0 00000000 */ nop -.L80241DD4_DAF1D4: -/* DAF1D4 80241DD4 0C0129CF */ jal func_8004A73C -/* DAF1D8 80241DD8 0260202D */ daddu $a0, $s3, $zero -.L80241DDC_DAF1DC: -/* DAF1DC 80241DDC 8FBF0060 */ lw $ra, 0x60($sp) -/* DAF1E0 80241DE0 8FB5005C */ lw $s5, 0x5c($sp) -/* DAF1E4 80241DE4 8FB40058 */ lw $s4, 0x58($sp) -/* DAF1E8 80241DE8 8FB30054 */ lw $s3, 0x54($sp) -/* DAF1EC 80241DEC 8FB20050 */ lw $s2, 0x50($sp) -/* DAF1F0 80241DF0 8FB1004C */ lw $s1, 0x4c($sp) -/* DAF1F4 80241DF4 8FB00048 */ lw $s0, 0x48($sp) -/* DAF1F8 80241DF8 0000102D */ daddu $v0, $zero, $zero -/* DAF1FC 80241DFC 03E00008 */ jr $ra -/* DAF200 80241E00 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s deleted file mode 100644 index bcf392d8c8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802452B0_DB7570 -.double 0.6 - -.section .text - -glabel func_80240000_DB22C0 -/* DB22C0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB22C4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* DB22C8 80240008 0080882D */ daddu $s1, $a0, $zero -/* DB22CC 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* DB22D0 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* DB22D4 80240014 8E300148 */ lw $s0, 0x148($s1) -/* DB22D8 80240018 0C00EABB */ jal get_npc_unsafe -/* DB22DC 8024001C 86040008 */ lh $a0, 8($s0) -/* DB22E0 80240020 C4400018 */ lwc1 $f0, 0x18($v0) -/* DB22E4 80240024 3C018024 */ lui $at, %hi(D_802452B0_DB7570) -/* DB22E8 80240028 D42252B0 */ ldc1 $f2, %lo(D_802452B0_DB7570)($at) -/* DB22EC 8024002C 46000021 */ cvt.d.s $f0, $f0 -/* DB22F0 80240030 46220002 */ mul.d $f0, $f0, $f2 -/* DB22F4 80240034 00000000 */ nop -/* DB22F8 80240038 46200020 */ cvt.s.d $f0, $f0 -/* DB22FC 8024003C E4400018 */ swc1 $f0, 0x18($v0) -/* DB2300 80240040 8E0300CC */ lw $v1, 0xcc($s0) -/* DB2304 80240044 8C640030 */ lw $a0, 0x30($v1) -/* DB2308 80240048 24030005 */ addiu $v1, $zero, 5 -/* DB230C 8024004C A443008E */ sh $v1, 0x8e($v0) -/* DB2310 80240050 AC440028 */ sw $a0, 0x28($v0) -/* DB2314 80240054 2402000F */ addiu $v0, $zero, 0xf -/* DB2318 80240058 AE220070 */ sw $v0, 0x70($s1) -/* DB231C 8024005C 8FBF0018 */ lw $ra, 0x18($sp) -/* DB2320 80240060 8FB10014 */ lw $s1, 0x14($sp) -/* DB2324 80240064 8FB00010 */ lw $s0, 0x10($sp) -/* DB2328 80240068 03E00008 */ jr $ra -/* DB232C 8024006C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s deleted file mode 100644 index 9dc7c0fb4b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802452B8_DB7578 -.double 0.6 - -.section .text - -glabel func_80240070_DB2330 -/* DB2330 80240070 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DB2334 80240074 AFB20028 */ sw $s2, 0x28($sp) -/* DB2338 80240078 0080902D */ daddu $s2, $a0, $zero -/* DB233C 8024007C AFBF002C */ sw $ra, 0x2c($sp) -/* DB2340 80240080 AFB10024 */ sw $s1, 0x24($sp) -/* DB2344 80240084 AFB00020 */ sw $s0, 0x20($sp) -/* DB2348 80240088 8E510148 */ lw $s1, 0x148($s2) -/* DB234C 8024008C 0C00EABB */ jal get_npc_unsafe -/* DB2350 80240090 86240008 */ lh $a0, 8($s1) -/* DB2354 80240094 0040802D */ daddu $s0, $v0, $zero -/* DB2358 80240098 0200202D */ daddu $a0, $s0, $zero -/* DB235C 8024009C C600000C */ lwc1 $f0, 0xc($s0) -/* DB2360 802400A0 27A60018 */ addiu $a2, $sp, 0x18 -/* DB2364 802400A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB2368 802400A8 AFA00010 */ sw $zero, 0x10($sp) -/* DB236C 802400AC AFA00014 */ sw $zero, 0x14($sp) -/* DB2370 802400B0 8E050018 */ lw $a1, 0x18($s0) -/* DB2374 802400B4 0C0129E1 */ jal func_8004A784 -/* DB2378 802400B8 0000382D */ daddu $a3, $zero, $zero -/* DB237C 802400BC 14400005 */ bnez $v0, .L802400D4 -/* DB2380 802400C0 00000000 */ nop -/* DB2384 802400C4 8E050018 */ lw $a1, 0x18($s0) -/* DB2388 802400C8 8E06000C */ lw $a2, 0xc($s0) -/* DB238C 802400CC 0C00EA95 */ jal npc_move_heading -/* DB2390 802400D0 0200202D */ daddu $a0, $s0, $zero -.L802400D4: -/* DB2394 802400D4 9602008E */ lhu $v0, 0x8e($s0) -/* DB2398 802400D8 2442FFFF */ addiu $v0, $v0, -1 -/* DB239C 802400DC A602008E */ sh $v0, 0x8e($s0) -/* DB23A0 802400E0 00021400 */ sll $v0, $v0, 0x10 -/* DB23A4 802400E4 14400010 */ bnez $v0, .L80240128 -/* DB23A8 802400E8 00000000 */ nop -/* DB23AC 802400EC C6000018 */ lwc1 $f0, 0x18($s0) -/* DB23B0 802400F0 3C018024 */ lui $at, %hi(D_802452B8_DB7578) -/* DB23B4 802400F4 D42252B8 */ ldc1 $f2, %lo(D_802452B8_DB7578)($at) -/* DB23B8 802400F8 46000021 */ cvt.d.s $f0, $f0 -/* DB23BC 802400FC 46220002 */ mul.d $f0, $f0, $f2 -/* DB23C0 80240100 00000000 */ nop -/* DB23C4 80240104 46200020 */ cvt.s.d $f0, $f0 -/* DB23C8 80240108 E6000018 */ swc1 $f0, 0x18($s0) -/* DB23CC 8024010C 8E2200CC */ lw $v0, 0xcc($s1) -/* DB23D0 80240110 8C43002C */ lw $v1, 0x2c($v0) -/* DB23D4 80240114 2402000A */ addiu $v0, $zero, 0xa -/* DB23D8 80240118 A602008E */ sh $v0, 0x8e($s0) -/* DB23DC 8024011C 24020010 */ addiu $v0, $zero, 0x10 -/* DB23E0 80240120 AE030028 */ sw $v1, 0x28($s0) -/* DB23E4 80240124 AE420070 */ sw $v0, 0x70($s2) -.L80240128: -/* DB23E8 80240128 8FBF002C */ lw $ra, 0x2c($sp) -/* DB23EC 8024012C 8FB20028 */ lw $s2, 0x28($sp) -/* DB23F0 80240130 8FB10024 */ lw $s1, 0x24($sp) -/* DB23F4 80240134 8FB00020 */ lw $s0, 0x20($sp) -/* DB23F8 80240138 03E00008 */ jr $ra -/* DB23FC 8024013C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s deleted file mode 100644 index 143329a1fc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240140_DB2400.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_DB2400 -/* DB2400 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DB2404 80240144 AFB10024 */ sw $s1, 0x24($sp) -/* DB2408 80240148 0080882D */ daddu $s1, $a0, $zero -/* DB240C 8024014C AFBF0028 */ sw $ra, 0x28($sp) -/* DB2410 80240150 AFB00020 */ sw $s0, 0x20($sp) -/* DB2414 80240154 8E220148 */ lw $v0, 0x148($s1) -/* DB2418 80240158 0C00EABB */ jal get_npc_unsafe -/* DB241C 8024015C 84440008 */ lh $a0, 8($v0) -/* DB2420 80240160 0040802D */ daddu $s0, $v0, $zero -/* DB2424 80240164 0200202D */ daddu $a0, $s0, $zero -/* DB2428 80240168 C600000C */ lwc1 $f0, 0xc($s0) -/* DB242C 8024016C 27A60018 */ addiu $a2, $sp, 0x18 -/* DB2430 80240170 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB2434 80240174 AFA00010 */ sw $zero, 0x10($sp) -/* DB2438 80240178 AFA00014 */ sw $zero, 0x14($sp) -/* DB243C 8024017C 8E050018 */ lw $a1, 0x18($s0) -/* DB2440 80240180 0C0129E1 */ jal func_8004A784 -/* DB2444 80240184 0000382D */ daddu $a3, $zero, $zero -/* DB2448 80240188 14400005 */ bnez $v0, .L802401A0 -/* DB244C 8024018C 00000000 */ nop -/* DB2450 80240190 8E050018 */ lw $a1, 0x18($s0) -/* DB2454 80240194 8E06000C */ lw $a2, 0xc($s0) -/* DB2458 80240198 0C00EA95 */ jal npc_move_heading -/* DB245C 8024019C 0200202D */ daddu $a0, $s0, $zero -.L802401A0: -/* DB2460 802401A0 9602008E */ lhu $v0, 0x8e($s0) -/* DB2464 802401A4 2442FFFF */ addiu $v0, $v0, -1 -/* DB2468 802401A8 A602008E */ sh $v0, 0x8e($s0) -/* DB246C 802401AC 00021400 */ sll $v0, $v0, 0x10 -/* DB2470 802401B0 14400004 */ bnez $v0, .L802401C4 -/* DB2474 802401B4 2402001E */ addiu $v0, $zero, 0x1e -/* DB2478 802401B8 A602008E */ sh $v0, 0x8e($s0) -/* DB247C 802401BC 24020011 */ addiu $v0, $zero, 0x11 -/* DB2480 802401C0 AE220070 */ sw $v0, 0x70($s1) -.L802401C4: -/* DB2484 802401C4 8FBF0028 */ lw $ra, 0x28($sp) -/* DB2488 802401C8 8FB10024 */ lw $s1, 0x24($sp) -/* DB248C 802401CC 8FB00020 */ lw $s0, 0x20($sp) -/* DB2490 802401D0 03E00008 */ jr $ra -/* DB2494 802401D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s deleted file mode 100644 index f4d9ff0b42..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802452C0_DB7580 -.word .L8024041C_DB26DC, .L8024042C_DB26EC, .L80240444_DB2704, .L80240454_DB2714, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L8024046C_DB272C, .L8024047C_DB273C, .L80240494_DB2754, .L802404A4_DB2764, .L802404C4_DB2784, .L802404E4_DB27A4, .L80240504_DB27C4, .L80240524_DB27E4, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L80240544_DB2804, .L8024053C_DB27FC - -.section .text - -glabel func_80240238_DB24F8 -/* DB24F8 80240238 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DB24FC 8024023C AFB30054 */ sw $s3, 0x54($sp) -/* DB2500 80240240 0080982D */ daddu $s3, $a0, $zero -/* DB2504 80240244 AFBF0060 */ sw $ra, 0x60($sp) -/* DB2508 80240248 AFB5005C */ sw $s5, 0x5c($sp) -/* DB250C 8024024C AFB40058 */ sw $s4, 0x58($sp) -/* DB2510 80240250 AFB20050 */ sw $s2, 0x50($sp) -/* DB2514 80240254 AFB1004C */ sw $s1, 0x4c($sp) -/* DB2518 80240258 AFB00048 */ sw $s0, 0x48($sp) -/* DB251C 8024025C 8E710148 */ lw $s1, 0x148($s3) -/* DB2520 80240260 86240008 */ lh $a0, 8($s1) -/* DB2524 80240264 0C00EABB */ jal get_npc_unsafe -/* DB2528 80240268 00A0802D */ daddu $s0, $a1, $zero -/* DB252C 8024026C 8E63000C */ lw $v1, 0xc($s3) -/* DB2530 80240270 0260202D */ daddu $a0, $s3, $zero -/* DB2534 80240274 8C650000 */ lw $a1, ($v1) -/* DB2538 80240278 0C0B1EAF */ jal evt_get_variable -/* DB253C 8024027C 0040902D */ daddu $s2, $v0, $zero -/* DB2540 80240280 AFA00018 */ sw $zero, 0x18($sp) -/* DB2544 80240284 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2548 80240288 8C630030 */ lw $v1, 0x30($v1) -/* DB254C 8024028C AFA3001C */ sw $v1, 0x1c($sp) -/* DB2550 80240290 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2554 80240294 8C63001C */ lw $v1, 0x1c($v1) -/* DB2558 80240298 AFA30020 */ sw $v1, 0x20($sp) -/* DB255C 8024029C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2560 802402A0 8C630024 */ lw $v1, 0x24($v1) -/* DB2564 802402A4 AFA30024 */ sw $v1, 0x24($sp) -/* DB2568 802402A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB256C 802402AC 8C630028 */ lw $v1, 0x28($v1) -/* DB2570 802402B0 27B50018 */ addiu $s5, $sp, 0x18 -/* DB2574 802402B4 AFA30028 */ sw $v1, 0x28($sp) -/* DB2578 802402B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB257C 802402BC 3C014282 */ lui $at, 0x4282 -/* DB2580 802402C0 44810000 */ mtc1 $at, $f0 -/* DB2584 802402C4 8C63002C */ lw $v1, 0x2c($v1) -/* DB2588 802402C8 0040A02D */ daddu $s4, $v0, $zero -/* DB258C 802402CC E7A00030 */ swc1 $f0, 0x30($sp) -/* DB2590 802402D0 A7A00034 */ sh $zero, 0x34($sp) -/* DB2594 802402D4 16000005 */ bnez $s0, .L802402EC -/* DB2598 802402D8 AFA3002C */ sw $v1, 0x2c($sp) -/* DB259C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB25A0 802402E0 30420004 */ andi $v0, $v0, 4 -/* DB25A4 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DB25A8 802402E8 00000000 */ nop -.L802402EC: -/* DB25AC 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 -/* DB25B0 802402F0 AE600070 */ sw $zero, 0x70($s3) -/* DB25B4 802402F4 A640008E */ sh $zero, 0x8e($s2) -/* DB25B8 802402F8 8E2200CC */ lw $v0, 0xcc($s1) -/* DB25BC 802402FC 8E430000 */ lw $v1, ($s2) -/* DB25C0 80240300 8C420000 */ lw $v0, ($v0) -/* DB25C4 80240304 00641824 */ and $v1, $v1, $a0 -/* DB25C8 80240308 AE430000 */ sw $v1, ($s2) -/* DB25CC 8024030C AE420028 */ sw $v0, 0x28($s2) -/* DB25D0 80240310 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB25D4 80240314 8C420034 */ lw $v0, 0x34($v0) -/* DB25D8 80240318 54400005 */ bnel $v0, $zero, .L80240330 -/* DB25DC 8024031C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DB25E0 80240320 34620200 */ ori $v0, $v1, 0x200 -/* DB25E4 80240324 2403FFF7 */ addiu $v1, $zero, -9 -/* DB25E8 80240328 080900CE */ j .L80240338 -/* DB25EC 8024032C 00431024 */ and $v0, $v0, $v1 -.L80240330: -/* DB25F0 80240330 00621024 */ and $v0, $v1, $v0 -/* DB25F4 80240334 34420008 */ ori $v0, $v0, 8 -.L80240338: -/* DB25F8 80240338 AE420000 */ sw $v0, ($s2) -/* DB25FC 8024033C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2600 80240340 30420004 */ andi $v0, $v0, 4 -/* DB2604 80240344 10400004 */ beqz $v0, .L80240358 -/* DB2608 80240348 24020063 */ addiu $v0, $zero, 0x63 -/* DB260C 8024034C AE620070 */ sw $v0, 0x70($s3) -/* DB2610 80240350 080900DC */ j .L80240370 -/* DB2614 80240354 AE600074 */ sw $zero, 0x74($s3) -.L80240358: -/* DB2618 80240358 8E220000 */ lw $v0, ($s1) -/* DB261C 8024035C 3C034000 */ lui $v1, 0x4000 -/* DB2620 80240360 00431024 */ and $v0, $v0, $v1 -/* DB2624 80240364 10400002 */ beqz $v0, .L80240370 -/* DB2628 80240368 2402000C */ addiu $v0, $zero, 0xc -/* DB262C 8024036C AE620070 */ sw $v0, 0x70($s3) -.L80240370: -/* DB2630 80240370 3C06BFFF */ lui $a2, 0xbfff -/* DB2634 80240374 34C6FFFF */ ori $a2, $a2, 0xffff -/* DB2638 80240378 27A50038 */ addiu $a1, $sp, 0x38 -/* DB263C 8024037C 2404FFFB */ addiu $a0, $zero, -5 -/* DB2640 80240380 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2644 80240384 8E230000 */ lw $v1, ($s1) -/* DB2648 80240388 3C0142C8 */ lui $at, 0x42c8 -/* DB264C 8024038C 44810000 */ mtc1 $at, $f0 -/* DB2650 80240390 00441024 */ and $v0, $v0, $a0 -/* DB2654 80240394 00661824 */ and $v1, $v1, $a2 -/* DB2658 80240398 AE2200B0 */ sw $v0, 0xb0($s1) -/* DB265C 8024039C AE230000 */ sw $v1, ($s1) -/* DB2660 802403A0 864200A8 */ lh $v0, 0xa8($s2) -/* DB2664 802403A4 27A70040 */ addiu $a3, $sp, 0x40 -/* DB2668 802403A8 E7A00044 */ swc1 $f0, 0x44($sp) -/* DB266C 802403AC C6460038 */ lwc1 $f6, 0x38($s2) -/* DB2670 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) -/* DB2674 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) -/* DB2678 802403B8 44822000 */ mtc1 $v0, $f4 -/* DB267C 802403BC 00000000 */ nop -/* DB2680 802403C0 46802120 */ cvt.s.w $f4, $f4 -/* DB2684 802403C4 27A20044 */ addiu $v0, $sp, 0x44 -/* DB2688 802403C8 46040000 */ add.s $f0, $f0, $f4 -/* DB268C 802403CC E7A60038 */ swc1 $f6, 0x38($sp) -/* DB2690 802403D0 E7A20040 */ swc1 $f2, 0x40($sp) -/* DB2694 802403D4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DB2698 802403D8 AFA20010 */ sw $v0, 0x10($sp) -/* DB269C 802403DC 8E440080 */ lw $a0, 0x80($s2) -/* DB26A0 802403E0 0C0372DF */ jal npc_raycast_down_sides -/* DB26A4 802403E4 27A6003C */ addiu $a2, $sp, 0x3c -/* DB26A8 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DB26AC 802403EC 00000000 */ nop -/* DB26B0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DB26B4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) -.L802403F8: -/* DB26B8 802403F8 8E630070 */ lw $v1, 0x70($s3) -/* DB26BC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DB26C0 80240400 10400050 */ beqz $v0, .L80240544_DB2804 -/* DB26C4 80240404 00031080 */ sll $v0, $v1, 2 -/* DB26C8 80240408 3C018024 */ lui $at, %hi(jtbl_802452C0_DB7580) -/* DB26CC 8024040C 00220821 */ addu $at, $at, $v0 -/* DB26D0 80240410 8C2252C0 */ lw $v0, %lo(jtbl_802452C0_DB7580)($at) -/* DB26D4 80240414 00400008 */ jr $v0 -/* DB26D8 80240418 00000000 */ nop -.L8024041C_DB26DC: -/* DB26DC 8024041C 0260202D */ daddu $a0, $s3, $zero -/* DB26E0 80240420 0280282D */ daddu $a1, $s4, $zero -/* DB26E4 80240424 0C012568 */ jal func_800495A0 -/* DB26E8 80240428 02A0302D */ daddu $a2, $s5, $zero -.L8024042C_DB26EC: -/* DB26EC 8024042C 0260202D */ daddu $a0, $s3, $zero -/* DB26F0 80240430 0280282D */ daddu $a1, $s4, $zero -/* DB26F4 80240434 0C0125AE */ jal func_800496B8 -/* DB26F8 80240438 02A0302D */ daddu $a2, $s5, $zero -/* DB26FC 8024043C 08090151 */ j .L80240544_DB2804 -/* DB2700 80240440 00000000 */ nop -.L80240444_DB2704: -/* DB2704 80240444 0260202D */ daddu $a0, $s3, $zero -/* DB2708 80240448 0280282D */ daddu $a1, $s4, $zero -/* DB270C 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DB2710 80240450 02A0302D */ daddu $a2, $s5, $zero -.L80240454_DB2714: -/* DB2714 80240454 0260202D */ daddu $a0, $s3, $zero -/* DB2718 80240458 0280282D */ daddu $a1, $s4, $zero -/* DB271C 8024045C 0C012701 */ jal func_80049C04 -/* DB2720 80240460 02A0302D */ daddu $a2, $s5, $zero -/* DB2724 80240464 08090151 */ j .L80240544_DB2804 -/* DB2728 80240468 00000000 */ nop -.L8024046C_DB272C: -/* DB272C 8024046C 0260202D */ daddu $a0, $s3, $zero -/* DB2730 80240470 0280282D */ daddu $a1, $s4, $zero -/* DB2734 80240474 0C01278F */ jal func_80049E3C -/* DB2738 80240478 02A0302D */ daddu $a2, $s5, $zero -.L8024047C_DB273C: -/* DB273C 8024047C 0260202D */ daddu $a0, $s3, $zero -/* DB2740 80240480 0280282D */ daddu $a1, $s4, $zero -/* DB2744 80240484 0C0127B3 */ jal func_80049ECC -/* DB2748 80240488 02A0302D */ daddu $a2, $s5, $zero -/* DB274C 8024048C 08090151 */ j .L80240544_DB2804 -/* DB2750 80240490 00000000 */ nop -.L80240494_DB2754: -/* DB2754 80240494 0260202D */ daddu $a0, $s3, $zero -/* DB2758 80240498 0280282D */ daddu $a1, $s4, $zero -/* DB275C 8024049C 0C0127DF */ jal func_80049F7C -/* DB2760 802404A0 02A0302D */ daddu $a2, $s5, $zero -.L802404A4_DB2764: -/* DB2764 802404A4 0260202D */ daddu $a0, $s3, $zero -/* DB2768 802404A8 0280282D */ daddu $a1, $s4, $zero -/* DB276C 802404AC 0C012849 */ jal func_8004A124 -/* DB2770 802404B0 02A0302D */ daddu $a2, $s5, $zero -/* DB2774 802404B4 8E630070 */ lw $v1, 0x70($s3) -/* DB2778 802404B8 2402000E */ addiu $v0, $zero, 0xe -/* DB277C 802404BC 14620021 */ bne $v1, $v0, .L80240544_DB2804 -/* DB2780 802404C0 00000000 */ nop -.L802404C4_DB2784: -/* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero -/* DB2788 802404C8 0280282D */ daddu $a1, $s4, $zero -/* DB278C 802404CC 0C090000 */ jal func_80240000_DB22C0 -/* DB2790 802404D0 02A0302D */ daddu $a2, $s5, $zero -/* DB2794 802404D4 8E630070 */ lw $v1, 0x70($s3) -/* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf -/* DB279C 802404DC 14620019 */ bne $v1, $v0, .L80240544_DB2804 -/* DB27A0 802404E0 00000000 */ nop -.L802404E4_DB27A4: -/* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero -/* DB27A8 802404E8 0280282D */ daddu $a1, $s4, $zero -/* DB27AC 802404EC 0C09001C */ jal func_80240070_DB2330 -/* DB27B0 802404F0 02A0302D */ daddu $a2, $s5, $zero -/* DB27B4 802404F4 8E630070 */ lw $v1, 0x70($s3) -/* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 -/* DB27BC 802404FC 14620011 */ bne $v1, $v0, .L80240544_DB2804 -/* DB27C0 80240500 00000000 */ nop -.L80240504_DB27C4: -/* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero -/* DB27C8 80240508 0280282D */ daddu $a1, $s4, $zero -/* DB27CC 8024050C 0C090050 */ jal func_80240140_DB2400 -/* DB27D0 80240510 02A0302D */ daddu $a2, $s5, $zero -/* DB27D4 80240514 8E630070 */ lw $v1, 0x70($s3) -/* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 -/* DB27DC 8024051C 14620009 */ bne $v1, $v0, .L80240544_DB2804 -/* DB27E0 80240520 00000000 */ nop -.L80240524_DB27E4: -/* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero -/* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DB27EC 8024052C 0C090076 */ jal omo_05_UnkNpcDurationAnimationFunc -/* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero -/* DB27F4 80240534 08090151 */ j .L80240544_DB2804 -/* DB27F8 80240538 00000000 */ nop -.L8024053C_DB27FC: -/* DB27FC 8024053C 0C0129CF */ jal func_8004A73C -/* DB2800 80240540 0260202D */ daddu $a0, $s3, $zero -.L80240544_DB2804: -/* DB2804 80240544 8FBF0060 */ lw $ra, 0x60($sp) -/* DB2808 80240548 8FB5005C */ lw $s5, 0x5c($sp) -/* DB280C 8024054C 8FB40058 */ lw $s4, 0x58($sp) -/* DB2810 80240550 8FB30054 */ lw $s3, 0x54($sp) -/* DB2814 80240554 8FB20050 */ lw $s2, 0x50($sp) -/* DB2818 80240558 8FB1004C */ lw $s1, 0x4c($sp) -/* DB281C 8024055C 8FB00048 */ lw $s0, 0x48($sp) -/* DB2820 80240560 0000102D */ daddu $v0, $zero, $zero -/* DB2824 80240564 03E00008 */ jr $ra -/* DB2828 80240568 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s deleted file mode 100644 index 1360731d1a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245450_DB7710 -.double 35.0 - -dlabel D_80245458_DB7718 -.double 360.0 - -.section .text - -glabel func_802405BC_DB287C -/* DB287C 802405BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB2880 802405C0 AFB20018 */ sw $s2, 0x18($sp) -/* DB2884 802405C4 0080902D */ daddu $s2, $a0, $zero -/* DB2888 802405C8 AFBF001C */ sw $ra, 0x1c($sp) -/* DB288C 802405CC AFB10014 */ sw $s1, 0x14($sp) -/* DB2890 802405D0 AFB00010 */ sw $s0, 0x10($sp) -/* DB2894 802405D4 8E500148 */ lw $s0, 0x148($s2) -/* DB2898 802405D8 0C00EABB */ jal get_npc_unsafe -/* DB289C 802405DC 86040008 */ lh $a0, 8($s0) -/* DB28A0 802405E0 8E03006C */ lw $v1, 0x6c($s0) -/* DB28A4 802405E4 24060001 */ addiu $a2, $zero, 1 -/* DB28A8 802405E8 10660016 */ beq $v1, $a2, .L80240644 -/* DB28AC 802405EC 0040882D */ daddu $s1, $v0, $zero -/* DB28B0 802405F0 28620002 */ slti $v0, $v1, 2 -/* DB28B4 802405F4 50400005 */ beql $v0, $zero, .L8024060C -/* DB28B8 802405F8 24020002 */ addiu $v0, $zero, 2 -/* DB28BC 802405FC 10600009 */ beqz $v1, .L80240624 -/* DB28C0 80240600 3C02003C */ lui $v0, 0x3c -/* DB28C4 80240604 080901D4 */ j .L80240750 -/* DB28C8 80240608 24020004 */ addiu $v0, $zero, 4 -.L8024060C: -/* DB28CC 8024060C 10620030 */ beq $v1, $v0, .L802406D0 -/* DB28D0 80240610 24020003 */ addiu $v0, $zero, 3 -/* DB28D4 80240614 10620034 */ beq $v1, $v0, .L802406E8 -/* DB28D8 80240618 00000000 */ nop -/* DB28DC 8024061C 080901D2 */ j .L80240748 -/* DB28E0 80240620 00000000 */ nop -.L80240624: -/* DB28E4 80240624 3442000C */ ori $v0, $v0, 0xc -/* DB28E8 80240628 3C054387 */ lui $a1, 0x4387 -/* DB28EC 8024062C 0220202D */ daddu $a0, $s1, $zero -/* DB28F0 80240630 AE06006C */ sw $a2, 0x6c($s0) -/* DB28F4 80240634 AE000070 */ sw $zero, 0x70($s0) -/* DB28F8 80240638 0C00ECD0 */ jal set_npc_yaw -/* DB28FC 8024063C AE220028 */ sw $v0, 0x28($s1) -/* DB2900 80240640 AE200048 */ sw $zero, 0x48($s1) -.L80240644: -/* DB2904 80240644 8E030070 */ lw $v1, 0x70($s0) -/* DB2908 80240648 04610002 */ bgez $v1, .L80240654 -/* DB290C 8024064C 0060102D */ daddu $v0, $v1, $zero -/* DB2910 80240650 2462000F */ addiu $v0, $v1, 0xf -.L80240654: -/* DB2914 80240654 00022103 */ sra $a0, $v0, 4 -/* DB2918 80240658 00041100 */ sll $v0, $a0, 4 -/* DB291C 8024065C 00622023 */ subu $a0, $v1, $v0 -/* DB2920 80240660 28820004 */ slti $v0, $a0, 4 -/* DB2924 80240664 10400003 */ beqz $v0, .L80240674 -/* DB2928 80240668 3C02003C */ lui $v0, 0x3c -/* DB292C 8024066C 080901AB */ j .L802406AC -/* DB2930 80240670 3442000C */ ori $v0, $v0, 0xc -.L80240674: -/* DB2934 80240674 28820008 */ slti $v0, $a0, 8 -/* DB2938 80240678 10400003 */ beqz $v0, .L80240688 -/* DB293C 8024067C 3C02003C */ lui $v0, 0x3c -/* DB2940 80240680 080901AB */ j .L802406AC -/* DB2944 80240684 3442000B */ ori $v0, $v0, 0xb -.L80240688: -/* DB2948 80240688 2882000C */ slti $v0, $a0, 0xc -/* DB294C 8024068C 10400003 */ beqz $v0, .L8024069C -/* DB2950 80240690 3C02003C */ lui $v0, 0x3c -/* DB2954 80240694 080901AB */ j .L802406AC -/* DB2958 80240698 3442000C */ ori $v0, $v0, 0xc -.L8024069C: -/* DB295C 8024069C 28820010 */ slti $v0, $a0, 0x10 -/* DB2960 802406A0 10400003 */ beqz $v0, .L802406B0 -/* DB2964 802406A4 3C02003C */ lui $v0, 0x3c -/* DB2968 802406A8 3442000D */ ori $v0, $v0, 0xd -.L802406AC: -/* DB296C 802406AC AE220028 */ sw $v0, 0x28($s1) -.L802406B0: -/* DB2970 802406B0 8E020070 */ lw $v0, 0x70($s0) -/* DB2974 802406B4 24420001 */ addiu $v0, $v0, 1 -/* DB2978 802406B8 AE020070 */ sw $v0, 0x70($s0) -/* DB297C 802406BC 28420041 */ slti $v0, $v0, 0x41 -/* DB2980 802406C0 14400021 */ bnez $v0, .L80240748 -/* DB2984 802406C4 24020002 */ addiu $v0, $zero, 2 -/* DB2988 802406C8 080901D2 */ j .L80240748 -/* DB298C 802406CC AE02006C */ sw $v0, 0x6c($s0) -.L802406D0: -/* DB2990 802406D0 3C03003C */ lui $v1, 0x3c -/* DB2994 802406D4 3463000C */ ori $v1, $v1, 0xc -/* DB2998 802406D8 AE02006C */ sw $v0, 0x6c($s0) -/* DB299C 802406DC AE000070 */ sw $zero, 0x70($s0) -/* DB29A0 802406E0 AE200048 */ sw $zero, 0x48($s1) -/* DB29A4 802406E4 AE230028 */ sw $v1, 0x28($s1) -.L802406E8: -/* DB29A8 802406E8 C6200048 */ lwc1 $f0, 0x48($s1) -/* DB29AC 802406EC 3C018024 */ lui $at, %hi(D_80245450_DB7710) -/* DB29B0 802406F0 D4225450 */ ldc1 $f2, %lo(D_80245450_DB7710)($at) -/* DB29B4 802406F4 46000021 */ cvt.d.s $f0, $f0 -/* DB29B8 802406F8 46220000 */ add.d $f0, $f0, $f2 -/* DB29BC 802406FC 3C018024 */ lui $at, %hi(D_80245458_DB7718) -/* DB29C0 80240700 D4225458 */ ldc1 $f2, %lo(D_80245458_DB7718)($at) -/* DB29C4 80240704 46200020 */ cvt.s.d $f0, $f0 -/* DB29C8 80240708 E6200048 */ swc1 $f0, 0x48($s1) -/* DB29CC 8024070C 46000021 */ cvt.d.s $f0, $f0 -/* DB29D0 80240710 4620103C */ c.lt.d $f2, $f0 -/* DB29D4 80240714 00000000 */ nop -/* DB29D8 80240718 45000004 */ bc1f .L8024072C -/* DB29DC 8024071C 00000000 */ nop -/* DB29E0 80240720 46220001 */ sub.d $f0, $f0, $f2 -/* DB29E4 80240724 46200020 */ cvt.s.d $f0, $f0 -/* DB29E8 80240728 E6200048 */ swc1 $f0, 0x48($s1) -.L8024072C: -/* DB29EC 8024072C 8E020070 */ lw $v0, 0x70($s0) -/* DB29F0 80240730 24420001 */ addiu $v0, $v0, 1 -/* DB29F4 80240734 AE020070 */ sw $v0, 0x70($s0) -/* DB29F8 80240738 2842002E */ slti $v0, $v0, 0x2e -/* DB29FC 8024073C 14400002 */ bnez $v0, .L80240748 -/* DB2A00 80240740 24020004 */ addiu $v0, $zero, 4 -/* DB2A04 80240744 AE02006C */ sw $v0, 0x6c($s0) -.L80240748: -/* DB2A08 80240748 8E03006C */ lw $v1, 0x6c($s0) -/* DB2A0C 8024074C 24020004 */ addiu $v0, $zero, 4 -.L80240750: -/* DB2A10 80240750 14620005 */ bne $v1, $v0, .L80240768 -/* DB2A14 80240754 0220202D */ daddu $a0, $s1, $zero -/* DB2A18 80240758 3C054387 */ lui $a1, 0x4387 -/* DB2A1C 8024075C 0C00ECD0 */ jal set_npc_yaw -/* DB2A20 80240760 AC800048 */ sw $zero, 0x48($a0) -/* DB2A24 80240764 AE400070 */ sw $zero, 0x70($s2) -.L80240768: -/* DB2A28 80240768 8FBF001C */ lw $ra, 0x1c($sp) -/* DB2A2C 8024076C 8FB20018 */ lw $s2, 0x18($sp) -/* DB2A30 80240770 8FB10014 */ lw $s1, 0x14($sp) -/* DB2A34 80240774 8FB00010 */ lw $s0, 0x10($sp) -/* DB2A38 80240778 03E00008 */ jr $ra -/* DB2A3C 8024077C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s deleted file mode 100644 index e7a2adb435..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s +++ /dev/null @@ -1,209 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245460_DB7720 -.word .L80240964_DB2C24, .L80240974_DB2C34, .L8024098C_DB2C4C, .L8024099C_DB2C5C, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L802409B4_DB2C74, .L802409C4_DB2C84, .L802409DC_DB2C9C, .L802409EC_DB2CAC, .L80240A0C_DB2CCC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A2C_DB2CEC, .L80240A24_DB2CE4 - -.section .text - -glabel func_80240780_DB2A40 -/* DB2A40 80240780 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DB2A44 80240784 AFB30054 */ sw $s3, 0x54($sp) -/* DB2A48 80240788 0080982D */ daddu $s3, $a0, $zero -/* DB2A4C 8024078C AFBF0060 */ sw $ra, 0x60($sp) -/* DB2A50 80240790 AFB5005C */ sw $s5, 0x5c($sp) -/* DB2A54 80240794 AFB40058 */ sw $s4, 0x58($sp) -/* DB2A58 80240798 AFB20050 */ sw $s2, 0x50($sp) -/* DB2A5C 8024079C AFB1004C */ sw $s1, 0x4c($sp) -/* DB2A60 802407A0 AFB00048 */ sw $s0, 0x48($sp) -/* DB2A64 802407A4 8E710148 */ lw $s1, 0x148($s3) -/* DB2A68 802407A8 86240008 */ lh $a0, 8($s1) -/* DB2A6C 802407AC 0C00EABB */ jal get_npc_unsafe -/* DB2A70 802407B0 00A0802D */ daddu $s0, $a1, $zero -/* DB2A74 802407B4 8E63000C */ lw $v1, 0xc($s3) -/* DB2A78 802407B8 0260202D */ daddu $a0, $s3, $zero -/* DB2A7C 802407BC 8C650000 */ lw $a1, ($v1) -/* DB2A80 802407C0 0C0B1EAF */ jal evt_get_variable -/* DB2A84 802407C4 0040902D */ daddu $s2, $v0, $zero -/* DB2A88 802407C8 AFA00018 */ sw $zero, 0x18($sp) -/* DB2A8C 802407CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2A90 802407D0 8C630030 */ lw $v1, 0x30($v1) -/* DB2A94 802407D4 AFA3001C */ sw $v1, 0x1c($sp) -/* DB2A98 802407D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2A9C 802407DC 8C63001C */ lw $v1, 0x1c($v1) -/* DB2AA0 802407E0 AFA30020 */ sw $v1, 0x20($sp) -/* DB2AA4 802407E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2AA8 802407E8 8C630024 */ lw $v1, 0x24($v1) -/* DB2AAC 802407EC AFA30024 */ sw $v1, 0x24($sp) -/* DB2AB0 802407F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2AB4 802407F4 8C630028 */ lw $v1, 0x28($v1) -/* DB2AB8 802407F8 27B50018 */ addiu $s5, $sp, 0x18 -/* DB2ABC 802407FC AFA30028 */ sw $v1, 0x28($sp) -/* DB2AC0 80240800 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2AC4 80240804 3C014282 */ lui $at, 0x4282 -/* DB2AC8 80240808 44810000 */ mtc1 $at, $f0 -/* DB2ACC 8024080C 8C63002C */ lw $v1, 0x2c($v1) -/* DB2AD0 80240810 0040A02D */ daddu $s4, $v0, $zero -/* DB2AD4 80240814 E7A00030 */ swc1 $f0, 0x30($sp) -/* DB2AD8 80240818 A7A00034 */ sh $zero, 0x34($sp) -/* DB2ADC 8024081C 16000005 */ bnez $s0, .L80240834 -/* DB2AE0 80240820 AFA3002C */ sw $v1, 0x2c($sp) -/* DB2AE4 80240824 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2AE8 80240828 30420004 */ andi $v0, $v0, 4 -/* DB2AEC 8024082C 10400044 */ beqz $v0, .L80240940 -/* DB2AF0 80240830 00000000 */ nop -.L80240834: -/* DB2AF4 80240834 2404F7FF */ addiu $a0, $zero, -0x801 -/* DB2AF8 80240838 AE600070 */ sw $zero, 0x70($s3) -/* DB2AFC 8024083C A640008E */ sh $zero, 0x8e($s2) -/* DB2B00 80240840 8E2200CC */ lw $v0, 0xcc($s1) -/* DB2B04 80240844 8E430000 */ lw $v1, ($s2) -/* DB2B08 80240848 8C420000 */ lw $v0, ($v0) -/* DB2B0C 8024084C 00641824 */ and $v1, $v1, $a0 -/* DB2B10 80240850 AE430000 */ sw $v1, ($s2) -/* DB2B14 80240854 AE420028 */ sw $v0, 0x28($s2) -/* DB2B18 80240858 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2B1C 8024085C 8C420034 */ lw $v0, 0x34($v0) -/* DB2B20 80240860 54400005 */ bnel $v0, $zero, .L80240878 -/* DB2B24 80240864 2402FDFF */ addiu $v0, $zero, -0x201 -/* DB2B28 80240868 34620200 */ ori $v0, $v1, 0x200 -/* DB2B2C 8024086C 2403FFF7 */ addiu $v1, $zero, -9 -/* DB2B30 80240870 08090220 */ j .L80240880 -/* DB2B34 80240874 00431024 */ and $v0, $v0, $v1 -.L80240878: -/* DB2B38 80240878 00621024 */ and $v0, $v1, $v0 -/* DB2B3C 8024087C 34420008 */ ori $v0, $v0, 8 -.L80240880: -/* DB2B40 80240880 AE420000 */ sw $v0, ($s2) -/* DB2B44 80240884 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2B48 80240888 30420004 */ andi $v0, $v0, 4 -/* DB2B4C 8024088C 10400004 */ beqz $v0, .L802408A0 -/* DB2B50 80240890 24020063 */ addiu $v0, $zero, 0x63 -/* DB2B54 80240894 AE620070 */ sw $v0, 0x70($s3) -/* DB2B58 80240898 0809022E */ j .L802408B8 -/* DB2B5C 8024089C AE600074 */ sw $zero, 0x74($s3) -.L802408A0: -/* DB2B60 802408A0 8E220000 */ lw $v0, ($s1) -/* DB2B64 802408A4 3C034000 */ lui $v1, 0x4000 -/* DB2B68 802408A8 00431024 */ and $v0, $v0, $v1 -/* DB2B6C 802408AC 10400002 */ beqz $v0, .L802408B8 -/* DB2B70 802408B0 2402000C */ addiu $v0, $zero, 0xc -/* DB2B74 802408B4 AE620070 */ sw $v0, 0x70($s3) -.L802408B8: -/* DB2B78 802408B8 3C06BFFF */ lui $a2, 0xbfff -/* DB2B7C 802408BC 34C6FFFF */ ori $a2, $a2, 0xffff -/* DB2B80 802408C0 27A50038 */ addiu $a1, $sp, 0x38 -/* DB2B84 802408C4 2404FFFB */ addiu $a0, $zero, -5 -/* DB2B88 802408C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* DB2B8C 802408CC 8E230000 */ lw $v1, ($s1) -/* DB2B90 802408D0 3C0142C8 */ lui $at, 0x42c8 -/* DB2B94 802408D4 44810000 */ mtc1 $at, $f0 -/* DB2B98 802408D8 00441024 */ and $v0, $v0, $a0 -/* DB2B9C 802408DC 00661824 */ and $v1, $v1, $a2 -/* DB2BA0 802408E0 AE2200B0 */ sw $v0, 0xb0($s1) -/* DB2BA4 802408E4 AE230000 */ sw $v1, ($s1) -/* DB2BA8 802408E8 864200A8 */ lh $v0, 0xa8($s2) -/* DB2BAC 802408EC 27A70040 */ addiu $a3, $sp, 0x40 -/* DB2BB0 802408F0 E7A00044 */ swc1 $f0, 0x44($sp) -/* DB2BB4 802408F4 C6460038 */ lwc1 $f6, 0x38($s2) -/* DB2BB8 802408F8 C640003C */ lwc1 $f0, 0x3c($s2) -/* DB2BBC 802408FC C6420040 */ lwc1 $f2, 0x40($s2) -/* DB2BC0 80240900 44822000 */ mtc1 $v0, $f4 -/* DB2BC4 80240904 00000000 */ nop -/* DB2BC8 80240908 46802120 */ cvt.s.w $f4, $f4 -/* DB2BCC 8024090C 27A20044 */ addiu $v0, $sp, 0x44 -/* DB2BD0 80240910 46040000 */ add.s $f0, $f0, $f4 -/* DB2BD4 80240914 E7A60038 */ swc1 $f6, 0x38($sp) -/* DB2BD8 80240918 E7A20040 */ swc1 $f2, 0x40($sp) -/* DB2BDC 8024091C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DB2BE0 80240920 AFA20010 */ sw $v0, 0x10($sp) -/* DB2BE4 80240924 8E440080 */ lw $a0, 0x80($s2) -/* DB2BE8 80240928 0C0372DF */ jal npc_raycast_down_sides -/* DB2BEC 8024092C 27A6003C */ addiu $a2, $sp, 0x3c -/* DB2BF0 80240930 10400003 */ beqz $v0, .L80240940 -/* DB2BF4 80240934 00000000 */ nop -/* DB2BF8 80240938 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DB2BFC 8024093C E640003C */ swc1 $f0, 0x3c($s2) -.L80240940: -/* DB2C00 80240940 8E630070 */ lw $v1, 0x70($s3) -/* DB2C04 80240944 2C620064 */ sltiu $v0, $v1, 0x64 -/* DB2C08 80240948 10400038 */ beqz $v0, .L80240A2C_DB2CEC -/* DB2C0C 8024094C 00031080 */ sll $v0, $v1, 2 -/* DB2C10 80240950 3C018024 */ lui $at, %hi(jtbl_80245460_DB7720) -/* DB2C14 80240954 00220821 */ addu $at, $at, $v0 -/* DB2C18 80240958 8C225460 */ lw $v0, %lo(jtbl_80245460_DB7720)($at) -/* DB2C1C 8024095C 00400008 */ jr $v0 -/* DB2C20 80240960 00000000 */ nop -.L80240964_DB2C24: -/* DB2C24 80240964 0260202D */ daddu $a0, $s3, $zero -/* DB2C28 80240968 0280282D */ daddu $a1, $s4, $zero -/* DB2C2C 8024096C 0C012568 */ jal func_800495A0 -/* DB2C30 80240970 02A0302D */ daddu $a2, $s5, $zero -.L80240974_DB2C34: -/* DB2C34 80240974 0260202D */ daddu $a0, $s3, $zero -/* DB2C38 80240978 0280282D */ daddu $a1, $s4, $zero -/* DB2C3C 8024097C 0C0125AE */ jal func_800496B8 -/* DB2C40 80240980 02A0302D */ daddu $a2, $s5, $zero -/* DB2C44 80240984 0809028B */ j .L80240A2C_DB2CEC -/* DB2C48 80240988 00000000 */ nop -.L8024098C_DB2C4C: -/* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero -/* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero -/* DB2C54 80240994 0C09015B */ jal omo_05_UnkNpcAIFunc4 -/* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero -.L8024099C_DB2C5C: -/* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero -/* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero -/* DB2C64 802409A4 0C09016F */ jal func_802405BC_DB287C -/* DB2C68 802409A8 02A0302D */ daddu $a2, $s5, $zero -/* DB2C6C 802409AC 0809028B */ j .L80240A2C_DB2CEC -/* DB2C70 802409B0 00000000 */ nop -.L802409B4_DB2C74: -/* DB2C74 802409B4 0260202D */ daddu $a0, $s3, $zero -/* DB2C78 802409B8 0280282D */ daddu $a1, $s4, $zero -/* DB2C7C 802409BC 0C01278F */ jal func_80049E3C -/* DB2C80 802409C0 02A0302D */ daddu $a2, $s5, $zero -.L802409C4_DB2C84: -/* DB2C84 802409C4 0260202D */ daddu $a0, $s3, $zero -/* DB2C88 802409C8 0280282D */ daddu $a1, $s4, $zero -/* DB2C8C 802409CC 0C0127B3 */ jal func_80049ECC -/* DB2C90 802409D0 02A0302D */ daddu $a2, $s5, $zero -/* DB2C94 802409D4 0809028B */ j .L80240A2C_DB2CEC -/* DB2C98 802409D8 00000000 */ nop -.L802409DC_DB2C9C: -/* DB2C9C 802409DC 0260202D */ daddu $a0, $s3, $zero -/* DB2CA0 802409E0 0280282D */ daddu $a1, $s4, $zero -/* DB2CA4 802409E4 0C0127DF */ jal func_80049F7C -/* DB2CA8 802409E8 02A0302D */ daddu $a2, $s5, $zero -.L802409EC_DB2CAC: -/* DB2CAC 802409EC 0260202D */ daddu $a0, $s3, $zero -/* DB2CB0 802409F0 0280282D */ daddu $a1, $s4, $zero -/* DB2CB4 802409F4 0C012849 */ jal func_8004A124 -/* DB2CB8 802409F8 02A0302D */ daddu $a2, $s5, $zero -/* DB2CBC 802409FC 8E630070 */ lw $v1, 0x70($s3) -/* DB2CC0 80240A00 2402000E */ addiu $v0, $zero, 0xe -/* DB2CC4 80240A04 14620009 */ bne $v1, $v0, .L80240A2C_DB2CEC -/* DB2CC8 80240A08 00000000 */ nop -.L80240A0C_DB2CCC: -/* DB2CCC 80240A0C 0260202D */ daddu $a0, $s3, $zero -/* DB2CD0 80240A10 0280282D */ daddu $a1, $s4, $zero -/* DB2CD4 80240A14 0C0128FA */ jal func_8004A3E8 -/* DB2CD8 80240A18 02A0302D */ daddu $a2, $s5, $zero -/* DB2CDC 80240A1C 0809028B */ j .L80240A2C_DB2CEC -/* DB2CE0 80240A20 00000000 */ nop -.L80240A24_DB2CE4: -/* DB2CE4 80240A24 0C0129CF */ jal func_8004A73C -/* DB2CE8 80240A28 0260202D */ daddu $a0, $s3, $zero -.L80240A2C_DB2CEC: -/* DB2CEC 80240A2C 8FBF0060 */ lw $ra, 0x60($sp) -/* DB2CF0 80240A30 8FB5005C */ lw $s5, 0x5c($sp) -/* DB2CF4 80240A34 8FB40058 */ lw $s4, 0x58($sp) -/* DB2CF8 80240A38 8FB30054 */ lw $s3, 0x54($sp) -/* DB2CFC 80240A3C 8FB20050 */ lw $s2, 0x50($sp) -/* DB2D00 80240A40 8FB1004C */ lw $s1, 0x4c($sp) -/* DB2D04 80240A44 8FB00048 */ lw $s0, 0x48($sp) -/* DB2D08 80240A48 0000102D */ daddu $v0, $zero, $zero -/* DB2D0C 80240A4C 03E00008 */ jr $ra -/* DB2D10 80240A50 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s deleted file mode 100644 index b1ace71d26..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246BD0_DC3E80 -.double 0.6 - -.section .text - -glabel func_80240000_DBD2B0 -/* DBD2B0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBD2B4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* DBD2B8 80240008 0080882D */ daddu $s1, $a0, $zero -/* DBD2BC 8024000C AFBF0018 */ sw $ra, 0x18($sp) -/* DBD2C0 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* DBD2C4 80240014 8E300148 */ lw $s0, 0x148($s1) -/* DBD2C8 80240018 0C00EABB */ jal get_npc_unsafe -/* DBD2CC 8024001C 86040008 */ lh $a0, 8($s0) -/* DBD2D0 80240020 C4400018 */ lwc1 $f0, 0x18($v0) -/* DBD2D4 80240024 3C018024 */ lui $at, %hi(D_80246BD0_DC3E80) -/* DBD2D8 80240028 D4226BD0 */ ldc1 $f2, %lo(D_80246BD0_DC3E80)($at) -/* DBD2DC 8024002C 46000021 */ cvt.d.s $f0, $f0 -/* DBD2E0 80240030 46220002 */ mul.d $f0, $f0, $f2 -/* DBD2E4 80240034 00000000 */ nop -/* DBD2E8 80240038 46200020 */ cvt.s.d $f0, $f0 -/* DBD2EC 8024003C E4400018 */ swc1 $f0, 0x18($v0) -/* DBD2F0 80240040 8E0300CC */ lw $v1, 0xcc($s0) -/* DBD2F4 80240044 8C640030 */ lw $a0, 0x30($v1) -/* DBD2F8 80240048 24030005 */ addiu $v1, $zero, 5 -/* DBD2FC 8024004C A443008E */ sh $v1, 0x8e($v0) -/* DBD300 80240050 AC440028 */ sw $a0, 0x28($v0) -/* DBD304 80240054 2402000F */ addiu $v0, $zero, 0xf -/* DBD308 80240058 AE220070 */ sw $v0, 0x70($s1) -/* DBD30C 8024005C 8FBF0018 */ lw $ra, 0x18($sp) -/* DBD310 80240060 8FB10014 */ lw $s1, 0x14($sp) -/* DBD314 80240064 8FB00010 */ lw $s0, 0x10($sp) -/* DBD318 80240068 03E00008 */ jr $ra -/* DBD31C 8024006C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s deleted file mode 100644 index 48532dd4ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246BD8_DC3E88 -.double 0.6 - -.section .text - -glabel func_80240070_DBD320 -/* DBD320 80240070 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBD324 80240074 AFB20028 */ sw $s2, 0x28($sp) -/* DBD328 80240078 0080902D */ daddu $s2, $a0, $zero -/* DBD32C 8024007C AFBF002C */ sw $ra, 0x2c($sp) -/* DBD330 80240080 AFB10024 */ sw $s1, 0x24($sp) -/* DBD334 80240084 AFB00020 */ sw $s0, 0x20($sp) -/* DBD338 80240088 8E510148 */ lw $s1, 0x148($s2) -/* DBD33C 8024008C 0C00EABB */ jal get_npc_unsafe -/* DBD340 80240090 86240008 */ lh $a0, 8($s1) -/* DBD344 80240094 0040802D */ daddu $s0, $v0, $zero -/* DBD348 80240098 0200202D */ daddu $a0, $s0, $zero -/* DBD34C 8024009C C600000C */ lwc1 $f0, 0xc($s0) -/* DBD350 802400A0 27A60018 */ addiu $a2, $sp, 0x18 -/* DBD354 802400A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBD358 802400A8 AFA00010 */ sw $zero, 0x10($sp) -/* DBD35C 802400AC AFA00014 */ sw $zero, 0x14($sp) -/* DBD360 802400B0 8E050018 */ lw $a1, 0x18($s0) -/* DBD364 802400B4 0C0129E1 */ jal func_8004A784 -/* DBD368 802400B8 0000382D */ daddu $a3, $zero, $zero -/* DBD36C 802400BC 14400005 */ bnez $v0, .L802400D4 -/* DBD370 802400C0 00000000 */ nop -/* DBD374 802400C4 8E050018 */ lw $a1, 0x18($s0) -/* DBD378 802400C8 8E06000C */ lw $a2, 0xc($s0) -/* DBD37C 802400CC 0C00EA95 */ jal npc_move_heading -/* DBD380 802400D0 0200202D */ daddu $a0, $s0, $zero -.L802400D4: -/* DBD384 802400D4 9602008E */ lhu $v0, 0x8e($s0) -/* DBD388 802400D8 2442FFFF */ addiu $v0, $v0, -1 -/* DBD38C 802400DC A602008E */ sh $v0, 0x8e($s0) -/* DBD390 802400E0 00021400 */ sll $v0, $v0, 0x10 -/* DBD394 802400E4 14400010 */ bnez $v0, .L80240128 -/* DBD398 802400E8 00000000 */ nop -/* DBD39C 802400EC C6000018 */ lwc1 $f0, 0x18($s0) -/* DBD3A0 802400F0 3C018024 */ lui $at, %hi(D_80246BD8_DC3E88) -/* DBD3A4 802400F4 D4226BD8 */ ldc1 $f2, %lo(D_80246BD8_DC3E88)($at) -/* DBD3A8 802400F8 46000021 */ cvt.d.s $f0, $f0 -/* DBD3AC 802400FC 46220002 */ mul.d $f0, $f0, $f2 -/* DBD3B0 80240100 00000000 */ nop -/* DBD3B4 80240104 46200020 */ cvt.s.d $f0, $f0 -/* DBD3B8 80240108 E6000018 */ swc1 $f0, 0x18($s0) -/* DBD3BC 8024010C 8E2200CC */ lw $v0, 0xcc($s1) -/* DBD3C0 80240110 8C43002C */ lw $v1, 0x2c($v0) -/* DBD3C4 80240114 2402000A */ addiu $v0, $zero, 0xa -/* DBD3C8 80240118 A602008E */ sh $v0, 0x8e($s0) -/* DBD3CC 8024011C 24020010 */ addiu $v0, $zero, 0x10 -/* DBD3D0 80240120 AE030028 */ sw $v1, 0x28($s0) -/* DBD3D4 80240124 AE420070 */ sw $v0, 0x70($s2) -.L80240128: -/* DBD3D8 80240128 8FBF002C */ lw $ra, 0x2c($sp) -/* DBD3DC 8024012C 8FB20028 */ lw $s2, 0x28($sp) -/* DBD3E0 80240130 8FB10024 */ lw $s1, 0x24($sp) -/* DBD3E4 80240134 8FB00020 */ lw $s0, 0x20($sp) -/* DBD3E8 80240138 03E00008 */ jr $ra -/* DBD3EC 8024013C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s deleted file mode 100644 index f113f1e8d8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240140_DBD3F0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140_DBD3F0 -/* DBD3F0 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBD3F4 80240144 AFB10024 */ sw $s1, 0x24($sp) -/* DBD3F8 80240148 0080882D */ daddu $s1, $a0, $zero -/* DBD3FC 8024014C AFBF0028 */ sw $ra, 0x28($sp) -/* DBD400 80240150 AFB00020 */ sw $s0, 0x20($sp) -/* DBD404 80240154 8E220148 */ lw $v0, 0x148($s1) -/* DBD408 80240158 0C00EABB */ jal get_npc_unsafe -/* DBD40C 8024015C 84440008 */ lh $a0, 8($v0) -/* DBD410 80240160 0040802D */ daddu $s0, $v0, $zero -/* DBD414 80240164 0200202D */ daddu $a0, $s0, $zero -/* DBD418 80240168 C600000C */ lwc1 $f0, 0xc($s0) -/* DBD41C 8024016C 27A60018 */ addiu $a2, $sp, 0x18 -/* DBD420 80240170 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBD424 80240174 AFA00010 */ sw $zero, 0x10($sp) -/* DBD428 80240178 AFA00014 */ sw $zero, 0x14($sp) -/* DBD42C 8024017C 8E050018 */ lw $a1, 0x18($s0) -/* DBD430 80240180 0C0129E1 */ jal func_8004A784 -/* DBD434 80240184 0000382D */ daddu $a3, $zero, $zero -/* DBD438 80240188 14400005 */ bnez $v0, .L802401A0 -/* DBD43C 8024018C 00000000 */ nop -/* DBD440 80240190 8E050018 */ lw $a1, 0x18($s0) -/* DBD444 80240194 8E06000C */ lw $a2, 0xc($s0) -/* DBD448 80240198 0C00EA95 */ jal npc_move_heading -/* DBD44C 8024019C 0200202D */ daddu $a0, $s0, $zero -.L802401A0: -/* DBD450 802401A0 9602008E */ lhu $v0, 0x8e($s0) -/* DBD454 802401A4 2442FFFF */ addiu $v0, $v0, -1 -/* DBD458 802401A8 A602008E */ sh $v0, 0x8e($s0) -/* DBD45C 802401AC 00021400 */ sll $v0, $v0, 0x10 -/* DBD460 802401B0 14400004 */ bnez $v0, .L802401C4 -/* DBD464 802401B4 2402001E */ addiu $v0, $zero, 0x1e -/* DBD468 802401B8 A602008E */ sh $v0, 0x8e($s0) -/* DBD46C 802401BC 24020011 */ addiu $v0, $zero, 0x11 -/* DBD470 802401C0 AE220070 */ sw $v0, 0x70($s1) -.L802401C4: -/* DBD474 802401C4 8FBF0028 */ lw $ra, 0x28($sp) -/* DBD478 802401C8 8FB10024 */ lw $s1, 0x24($sp) -/* DBD47C 802401CC 8FB00020 */ lw $s0, 0x20($sp) -/* DBD480 802401D0 03E00008 */ jr $ra -/* DBD484 802401D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s deleted file mode 100644 index 242652b381..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80246BE0_DC3E90 -.word .L8024041C_DBD6CC, .L8024042C_DBD6DC, .L80240444_DBD6F4, .L80240454_DBD704, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L8024046C_DBD71C, .L8024047C_DBD72C, .L80240494_DBD744, .L802404A4_DBD754, .L802404C4_DBD774, .L802404E4_DBD794, .L80240504_DBD7B4, .L80240524_DBD7D4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L80240544_DBD7F4, .L8024053C_DBD7EC - -.section .text - -glabel func_80240238_DBD4E8 -/* DBD4E8 80240238 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DBD4EC 8024023C AFB30054 */ sw $s3, 0x54($sp) -/* DBD4F0 80240240 0080982D */ daddu $s3, $a0, $zero -/* DBD4F4 80240244 AFBF0060 */ sw $ra, 0x60($sp) -/* DBD4F8 80240248 AFB5005C */ sw $s5, 0x5c($sp) -/* DBD4FC 8024024C AFB40058 */ sw $s4, 0x58($sp) -/* DBD500 80240250 AFB20050 */ sw $s2, 0x50($sp) -/* DBD504 80240254 AFB1004C */ sw $s1, 0x4c($sp) -/* DBD508 80240258 AFB00048 */ sw $s0, 0x48($sp) -/* DBD50C 8024025C 8E710148 */ lw $s1, 0x148($s3) -/* DBD510 80240260 86240008 */ lh $a0, 8($s1) -/* DBD514 80240264 0C00EABB */ jal get_npc_unsafe -/* DBD518 80240268 00A0802D */ daddu $s0, $a1, $zero -/* DBD51C 8024026C 8E63000C */ lw $v1, 0xc($s3) -/* DBD520 80240270 0260202D */ daddu $a0, $s3, $zero -/* DBD524 80240274 8C650000 */ lw $a1, ($v1) -/* DBD528 80240278 0C0B1EAF */ jal evt_get_variable -/* DBD52C 8024027C 0040902D */ daddu $s2, $v0, $zero -/* DBD530 80240280 AFA00018 */ sw $zero, 0x18($sp) -/* DBD534 80240284 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD538 80240288 8C630030 */ lw $v1, 0x30($v1) -/* DBD53C 8024028C AFA3001C */ sw $v1, 0x1c($sp) -/* DBD540 80240290 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD544 80240294 8C63001C */ lw $v1, 0x1c($v1) -/* DBD548 80240298 AFA30020 */ sw $v1, 0x20($sp) -/* DBD54C 8024029C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD550 802402A0 8C630024 */ lw $v1, 0x24($v1) -/* DBD554 802402A4 AFA30024 */ sw $v1, 0x24($sp) -/* DBD558 802402A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD55C 802402AC 8C630028 */ lw $v1, 0x28($v1) -/* DBD560 802402B0 27B50018 */ addiu $s5, $sp, 0x18 -/* DBD564 802402B4 AFA30028 */ sw $v1, 0x28($sp) -/* DBD568 802402B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBD56C 802402BC 3C014282 */ lui $at, 0x4282 -/* DBD570 802402C0 44810000 */ mtc1 $at, $f0 -/* DBD574 802402C4 8C63002C */ lw $v1, 0x2c($v1) -/* DBD578 802402C8 0040A02D */ daddu $s4, $v0, $zero -/* DBD57C 802402CC E7A00030 */ swc1 $f0, 0x30($sp) -/* DBD580 802402D0 A7A00034 */ sh $zero, 0x34($sp) -/* DBD584 802402D4 16000005 */ bnez $s0, .L802402EC -/* DBD588 802402D8 AFA3002C */ sw $v1, 0x2c($sp) -/* DBD58C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBD590 802402E0 30420004 */ andi $v0, $v0, 4 -/* DBD594 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DBD598 802402E8 00000000 */ nop -.L802402EC: -/* DBD59C 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 -/* DBD5A0 802402F0 AE600070 */ sw $zero, 0x70($s3) -/* DBD5A4 802402F4 A640008E */ sh $zero, 0x8e($s2) -/* DBD5A8 802402F8 8E2200CC */ lw $v0, 0xcc($s1) -/* DBD5AC 802402FC 8E430000 */ lw $v1, ($s2) -/* DBD5B0 80240300 8C420000 */ lw $v0, ($v0) -/* DBD5B4 80240304 00641824 */ and $v1, $v1, $a0 -/* DBD5B8 80240308 AE430000 */ sw $v1, ($s2) -/* DBD5BC 8024030C AE420028 */ sw $v0, 0x28($s2) -/* DBD5C0 80240310 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBD5C4 80240314 8C420034 */ lw $v0, 0x34($v0) -/* DBD5C8 80240318 54400005 */ bnel $v0, $zero, .L80240330 -/* DBD5CC 8024031C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DBD5D0 80240320 34620200 */ ori $v0, $v1, 0x200 -/* DBD5D4 80240324 2403FFF7 */ addiu $v1, $zero, -9 -/* DBD5D8 80240328 080900CE */ j .L80240338 -/* DBD5DC 8024032C 00431024 */ and $v0, $v0, $v1 -.L80240330: -/* DBD5E0 80240330 00621024 */ and $v0, $v1, $v0 -/* DBD5E4 80240334 34420008 */ ori $v0, $v0, 8 -.L80240338: -/* DBD5E8 80240338 AE420000 */ sw $v0, ($s2) -/* DBD5EC 8024033C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBD5F0 80240340 30420004 */ andi $v0, $v0, 4 -/* DBD5F4 80240344 10400004 */ beqz $v0, .L80240358 -/* DBD5F8 80240348 24020063 */ addiu $v0, $zero, 0x63 -/* DBD5FC 8024034C AE620070 */ sw $v0, 0x70($s3) -/* DBD600 80240350 080900DC */ j .L80240370 -/* DBD604 80240354 AE600074 */ sw $zero, 0x74($s3) -.L80240358: -/* DBD608 80240358 8E220000 */ lw $v0, ($s1) -/* DBD60C 8024035C 3C034000 */ lui $v1, 0x4000 -/* DBD610 80240360 00431024 */ and $v0, $v0, $v1 -/* DBD614 80240364 10400002 */ beqz $v0, .L80240370 -/* DBD618 80240368 2402000C */ addiu $v0, $zero, 0xc -/* DBD61C 8024036C AE620070 */ sw $v0, 0x70($s3) -.L80240370: -/* DBD620 80240370 3C06BFFF */ lui $a2, 0xbfff -/* DBD624 80240374 34C6FFFF */ ori $a2, $a2, 0xffff -/* DBD628 80240378 27A50038 */ addiu $a1, $sp, 0x38 -/* DBD62C 8024037C 2404FFFB */ addiu $a0, $zero, -5 -/* DBD630 80240380 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBD634 80240384 8E230000 */ lw $v1, ($s1) -/* DBD638 80240388 3C0142C8 */ lui $at, 0x42c8 -/* DBD63C 8024038C 44810000 */ mtc1 $at, $f0 -/* DBD640 80240390 00441024 */ and $v0, $v0, $a0 -/* DBD644 80240394 00661824 */ and $v1, $v1, $a2 -/* DBD648 80240398 AE2200B0 */ sw $v0, 0xb0($s1) -/* DBD64C 8024039C AE230000 */ sw $v1, ($s1) -/* DBD650 802403A0 864200A8 */ lh $v0, 0xa8($s2) -/* DBD654 802403A4 27A70040 */ addiu $a3, $sp, 0x40 -/* DBD658 802403A8 E7A00044 */ swc1 $f0, 0x44($sp) -/* DBD65C 802403AC C6460038 */ lwc1 $f6, 0x38($s2) -/* DBD660 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) -/* DBD664 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) -/* DBD668 802403B8 44822000 */ mtc1 $v0, $f4 -/* DBD66C 802403BC 00000000 */ nop -/* DBD670 802403C0 46802120 */ cvt.s.w $f4, $f4 -/* DBD674 802403C4 27A20044 */ addiu $v0, $sp, 0x44 -/* DBD678 802403C8 46040000 */ add.s $f0, $f0, $f4 -/* DBD67C 802403CC E7A60038 */ swc1 $f6, 0x38($sp) -/* DBD680 802403D0 E7A20040 */ swc1 $f2, 0x40($sp) -/* DBD684 802403D4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DBD688 802403D8 AFA20010 */ sw $v0, 0x10($sp) -/* DBD68C 802403DC 8E440080 */ lw $a0, 0x80($s2) -/* DBD690 802403E0 0C0372DF */ jal npc_raycast_down_sides -/* DBD694 802403E4 27A6003C */ addiu $a2, $sp, 0x3c -/* DBD698 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DBD69C 802403EC 00000000 */ nop -/* DBD6A0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DBD6A4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) -.L802403F8: -/* DBD6A8 802403F8 8E630070 */ lw $v1, 0x70($s3) -/* DBD6AC 802403FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBD6B0 80240400 10400050 */ beqz $v0, .L80240544_DBD7F4 -/* DBD6B4 80240404 00031080 */ sll $v0, $v1, 2 -/* DBD6B8 80240408 3C018024 */ lui $at, %hi(jtbl_80246BE0_DC3E90) -/* DBD6BC 8024040C 00220821 */ addu $at, $at, $v0 -/* DBD6C0 80240410 8C226BE0 */ lw $v0, %lo(jtbl_80246BE0_DC3E90)($at) -/* DBD6C4 80240414 00400008 */ jr $v0 -/* DBD6C8 80240418 00000000 */ nop -.L8024041C_DBD6CC: -/* DBD6CC 8024041C 0260202D */ daddu $a0, $s3, $zero -/* DBD6D0 80240420 0280282D */ daddu $a1, $s4, $zero -/* DBD6D4 80240424 0C012568 */ jal func_800495A0 -/* DBD6D8 80240428 02A0302D */ daddu $a2, $s5, $zero -.L8024042C_DBD6DC: -/* DBD6DC 8024042C 0260202D */ daddu $a0, $s3, $zero -/* DBD6E0 80240430 0280282D */ daddu $a1, $s4, $zero -/* DBD6E4 80240434 0C0125AE */ jal func_800496B8 -/* DBD6E8 80240438 02A0302D */ daddu $a2, $s5, $zero -/* DBD6EC 8024043C 08090151 */ j .L80240544_DBD7F4 -/* DBD6F0 80240440 00000000 */ nop -.L80240444_DBD6F4: -/* DBD6F4 80240444 0260202D */ daddu $a0, $s3, $zero -/* DBD6F8 80240448 0280282D */ daddu $a1, $s4, $zero -/* DBD6FC 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DBD700 80240450 02A0302D */ daddu $a2, $s5, $zero -.L80240454_DBD704: -/* DBD704 80240454 0260202D */ daddu $a0, $s3, $zero -/* DBD708 80240458 0280282D */ daddu $a1, $s4, $zero -/* DBD70C 8024045C 0C012701 */ jal func_80049C04 -/* DBD710 80240460 02A0302D */ daddu $a2, $s5, $zero -/* DBD714 80240464 08090151 */ j .L80240544_DBD7F4 -/* DBD718 80240468 00000000 */ nop -.L8024046C_DBD71C: -/* DBD71C 8024046C 0260202D */ daddu $a0, $s3, $zero -/* DBD720 80240470 0280282D */ daddu $a1, $s4, $zero -/* DBD724 80240474 0C01278F */ jal func_80049E3C -/* DBD728 80240478 02A0302D */ daddu $a2, $s5, $zero -.L8024047C_DBD72C: -/* DBD72C 8024047C 0260202D */ daddu $a0, $s3, $zero -/* DBD730 80240480 0280282D */ daddu $a1, $s4, $zero -/* DBD734 80240484 0C0127B3 */ jal func_80049ECC -/* DBD738 80240488 02A0302D */ daddu $a2, $s5, $zero -/* DBD73C 8024048C 08090151 */ j .L80240544_DBD7F4 -/* DBD740 80240490 00000000 */ nop -.L80240494_DBD744: -/* DBD744 80240494 0260202D */ daddu $a0, $s3, $zero -/* DBD748 80240498 0280282D */ daddu $a1, $s4, $zero -/* DBD74C 8024049C 0C0127DF */ jal func_80049F7C -/* DBD750 802404A0 02A0302D */ daddu $a2, $s5, $zero -.L802404A4_DBD754: -/* DBD754 802404A4 0260202D */ daddu $a0, $s3, $zero -/* DBD758 802404A8 0280282D */ daddu $a1, $s4, $zero -/* DBD75C 802404AC 0C012849 */ jal func_8004A124 -/* DBD760 802404B0 02A0302D */ daddu $a2, $s5, $zero -/* DBD764 802404B4 8E630070 */ lw $v1, 0x70($s3) -/* DBD768 802404B8 2402000E */ addiu $v0, $zero, 0xe -/* DBD76C 802404BC 14620021 */ bne $v1, $v0, .L80240544_DBD7F4 -/* DBD770 802404C0 00000000 */ nop -.L802404C4_DBD774: -/* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero -/* DBD778 802404C8 0280282D */ daddu $a1, $s4, $zero -/* DBD77C 802404CC 0C090000 */ jal func_80240000_DBD2B0 -/* DBD780 802404D0 02A0302D */ daddu $a2, $s5, $zero -/* DBD784 802404D4 8E630070 */ lw $v1, 0x70($s3) -/* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf -/* DBD78C 802404DC 14620019 */ bne $v1, $v0, .L80240544_DBD7F4 -/* DBD790 802404E0 00000000 */ nop -.L802404E4_DBD794: -/* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero -/* DBD798 802404E8 0280282D */ daddu $a1, $s4, $zero -/* DBD79C 802404EC 0C09001C */ jal func_80240070_DBD320 -/* DBD7A0 802404F0 02A0302D */ daddu $a2, $s5, $zero -/* DBD7A4 802404F4 8E630070 */ lw $v1, 0x70($s3) -/* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 -/* DBD7AC 802404FC 14620011 */ bne $v1, $v0, .L80240544_DBD7F4 -/* DBD7B0 80240500 00000000 */ nop -.L80240504_DBD7B4: -/* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero -/* DBD7B8 80240508 0280282D */ daddu $a1, $s4, $zero -/* DBD7BC 8024050C 0C090050 */ jal func_80240140_DBD3F0 -/* DBD7C0 80240510 02A0302D */ daddu $a2, $s5, $zero -/* DBD7C4 80240514 8E630070 */ lw $v1, 0x70($s3) -/* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 -/* DBD7CC 8024051C 14620009 */ bne $v1, $v0, .L80240544_DBD7F4 -/* DBD7D0 80240520 00000000 */ nop -.L80240524_DBD7D4: -/* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero -/* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DBD7DC 8024052C 0C090076 */ jal omo_07_UnkNpcDurationAnimationFunc -/* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero -/* DBD7E4 80240534 08090151 */ j .L80240544_DBD7F4 -/* DBD7E8 80240538 00000000 */ nop -.L8024053C_DBD7EC: -/* DBD7EC 8024053C 0C0129CF */ jal func_8004A73C -/* DBD7F0 80240540 0260202D */ daddu $a0, $s3, $zero -.L80240544_DBD7F4: -/* DBD7F4 80240544 8FBF0060 */ lw $ra, 0x60($sp) -/* DBD7F8 80240548 8FB5005C */ lw $s5, 0x5c($sp) -/* DBD7FC 8024054C 8FB40058 */ lw $s4, 0x58($sp) -/* DBD800 80240550 8FB30054 */ lw $s3, 0x54($sp) -/* DBD804 80240554 8FB20050 */ lw $s2, 0x50($sp) -/* DBD808 80240558 8FB1004C */ lw $s1, 0x4c($sp) -/* DBD80C 8024055C 8FB00048 */ lw $s0, 0x48($sp) -/* DBD810 80240560 0000102D */ daddu $v0, $zero, $zero -/* DBD814 80240564 03E00008 */ jr $ra -/* DBD818 80240568 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s deleted file mode 100644 index db8a2af4d3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246F10_DC41C0 -.double 0.6 - -.section .text - -glabel func_802413FC_DBE6AC -/* DBE6AC 802413FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE6B0 80241400 AFB10014 */ sw $s1, 0x14($sp) -/* DBE6B4 80241404 0080882D */ daddu $s1, $a0, $zero -/* DBE6B8 80241408 AFBF0018 */ sw $ra, 0x18($sp) -/* DBE6BC 8024140C AFB00010 */ sw $s0, 0x10($sp) -/* DBE6C0 80241410 8E300148 */ lw $s0, 0x148($s1) -/* DBE6C4 80241414 0C00EABB */ jal get_npc_unsafe -/* DBE6C8 80241418 86040008 */ lh $a0, 8($s0) -/* DBE6CC 8024141C C4400018 */ lwc1 $f0, 0x18($v0) -/* DBE6D0 80241420 3C018024 */ lui $at, %hi(D_80246F10_DC41C0) -/* DBE6D4 80241424 D4226F10 */ ldc1 $f2, %lo(D_80246F10_DC41C0)($at) -/* DBE6D8 80241428 46000021 */ cvt.d.s $f0, $f0 -/* DBE6DC 8024142C 46220002 */ mul.d $f0, $f0, $f2 -/* DBE6E0 80241430 00000000 */ nop -/* DBE6E4 80241434 46200020 */ cvt.s.d $f0, $f0 -/* DBE6E8 80241438 E4400018 */ swc1 $f0, 0x18($v0) -/* DBE6EC 8024143C 8E0300CC */ lw $v1, 0xcc($s0) -/* DBE6F0 80241440 8C640030 */ lw $a0, 0x30($v1) -/* DBE6F4 80241444 24030005 */ addiu $v1, $zero, 5 -/* DBE6F8 80241448 A443008E */ sh $v1, 0x8e($v0) -/* DBE6FC 8024144C AC440028 */ sw $a0, 0x28($v0) -/* DBE700 80241450 2402000F */ addiu $v0, $zero, 0xf -/* DBE704 80241454 AE220070 */ sw $v0, 0x70($s1) -/* DBE708 80241458 8FBF0018 */ lw $ra, 0x18($sp) -/* DBE70C 8024145C 8FB10014 */ lw $s1, 0x14($sp) -/* DBE710 80241460 8FB00010 */ lw $s0, 0x10($sp) -/* DBE714 80241464 03E00008 */ jr $ra -/* DBE718 80241468 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s deleted file mode 100644 index c95214b3b8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246F18_DC41C8 -.double 0.6 - -.section .text - -glabel func_8024146C_DBE71C -/* DBE71C 8024146C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBE720 80241470 AFB20028 */ sw $s2, 0x28($sp) -/* DBE724 80241474 0080902D */ daddu $s2, $a0, $zero -/* DBE728 80241478 AFBF002C */ sw $ra, 0x2c($sp) -/* DBE72C 8024147C AFB10024 */ sw $s1, 0x24($sp) -/* DBE730 80241480 AFB00020 */ sw $s0, 0x20($sp) -/* DBE734 80241484 8E510148 */ lw $s1, 0x148($s2) -/* DBE738 80241488 0C00EABB */ jal get_npc_unsafe -/* DBE73C 8024148C 86240008 */ lh $a0, 8($s1) -/* DBE740 80241490 0040802D */ daddu $s0, $v0, $zero -/* DBE744 80241494 0200202D */ daddu $a0, $s0, $zero -/* DBE748 80241498 C600000C */ lwc1 $f0, 0xc($s0) -/* DBE74C 8024149C 27A60018 */ addiu $a2, $sp, 0x18 -/* DBE750 802414A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBE754 802414A4 AFA00010 */ sw $zero, 0x10($sp) -/* DBE758 802414A8 AFA00014 */ sw $zero, 0x14($sp) -/* DBE75C 802414AC 8E050018 */ lw $a1, 0x18($s0) -/* DBE760 802414B0 0C0129E1 */ jal func_8004A784 -/* DBE764 802414B4 0000382D */ daddu $a3, $zero, $zero -/* DBE768 802414B8 14400005 */ bnez $v0, .L802414D0 -/* DBE76C 802414BC 00000000 */ nop -/* DBE770 802414C0 8E050018 */ lw $a1, 0x18($s0) -/* DBE774 802414C4 8E06000C */ lw $a2, 0xc($s0) -/* DBE778 802414C8 0C00EA95 */ jal npc_move_heading -/* DBE77C 802414CC 0200202D */ daddu $a0, $s0, $zero -.L802414D0: -/* DBE780 802414D0 9602008E */ lhu $v0, 0x8e($s0) -/* DBE784 802414D4 2442FFFF */ addiu $v0, $v0, -1 -/* DBE788 802414D8 A602008E */ sh $v0, 0x8e($s0) -/* DBE78C 802414DC 00021400 */ sll $v0, $v0, 0x10 -/* DBE790 802414E0 14400010 */ bnez $v0, .L80241524 -/* DBE794 802414E4 00000000 */ nop -/* DBE798 802414E8 C6000018 */ lwc1 $f0, 0x18($s0) -/* DBE79C 802414EC 3C018024 */ lui $at, %hi(D_80246F18_DC41C8) -/* DBE7A0 802414F0 D4226F18 */ ldc1 $f2, %lo(D_80246F18_DC41C8)($at) -/* DBE7A4 802414F4 46000021 */ cvt.d.s $f0, $f0 -/* DBE7A8 802414F8 46220002 */ mul.d $f0, $f0, $f2 -/* DBE7AC 802414FC 00000000 */ nop -/* DBE7B0 80241500 46200020 */ cvt.s.d $f0, $f0 -/* DBE7B4 80241504 E6000018 */ swc1 $f0, 0x18($s0) -/* DBE7B8 80241508 8E2200CC */ lw $v0, 0xcc($s1) -/* DBE7BC 8024150C 8C43002C */ lw $v1, 0x2c($v0) -/* DBE7C0 80241510 2402000A */ addiu $v0, $zero, 0xa -/* DBE7C4 80241514 A602008E */ sh $v0, 0x8e($s0) -/* DBE7C8 80241518 24020010 */ addiu $v0, $zero, 0x10 -/* DBE7CC 8024151C AE030028 */ sw $v1, 0x28($s0) -/* DBE7D0 80241520 AE420070 */ sw $v0, 0x70($s2) -.L80241524: -/* DBE7D4 80241524 8FBF002C */ lw $ra, 0x2c($sp) -/* DBE7D8 80241528 8FB20028 */ lw $s2, 0x28($sp) -/* DBE7DC 8024152C 8FB10024 */ lw $s1, 0x24($sp) -/* DBE7E0 80241530 8FB00020 */ lw $s0, 0x20($sp) -/* DBE7E4 80241534 03E00008 */ jr $ra -/* DBE7E8 80241538 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s deleted file mode 100644 index 1b9fcfd3ba..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024153C_DBE7EC -/* DBE7EC 8024153C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBE7F0 80241540 AFB10024 */ sw $s1, 0x24($sp) -/* DBE7F4 80241544 0080882D */ daddu $s1, $a0, $zero -/* DBE7F8 80241548 AFBF0028 */ sw $ra, 0x28($sp) -/* DBE7FC 8024154C AFB00020 */ sw $s0, 0x20($sp) -/* DBE800 80241550 8E220148 */ lw $v0, 0x148($s1) -/* DBE804 80241554 0C00EABB */ jal get_npc_unsafe -/* DBE808 80241558 84440008 */ lh $a0, 8($v0) -/* DBE80C 8024155C 0040802D */ daddu $s0, $v0, $zero -/* DBE810 80241560 0200202D */ daddu $a0, $s0, $zero -/* DBE814 80241564 C600000C */ lwc1 $f0, 0xc($s0) -/* DBE818 80241568 27A60018 */ addiu $a2, $sp, 0x18 -/* DBE81C 8024156C E7A00018 */ swc1 $f0, 0x18($sp) -/* DBE820 80241570 AFA00010 */ sw $zero, 0x10($sp) -/* DBE824 80241574 AFA00014 */ sw $zero, 0x14($sp) -/* DBE828 80241578 8E050018 */ lw $a1, 0x18($s0) -/* DBE82C 8024157C 0C0129E1 */ jal func_8004A784 -/* DBE830 80241580 0000382D */ daddu $a3, $zero, $zero -/* DBE834 80241584 14400005 */ bnez $v0, .L8024159C -/* DBE838 80241588 00000000 */ nop -/* DBE83C 8024158C 8E050018 */ lw $a1, 0x18($s0) -/* DBE840 80241590 8E06000C */ lw $a2, 0xc($s0) -/* DBE844 80241594 0C00EA95 */ jal npc_move_heading -/* DBE848 80241598 0200202D */ daddu $a0, $s0, $zero -.L8024159C: -/* DBE84C 8024159C 9602008E */ lhu $v0, 0x8e($s0) -/* DBE850 802415A0 2442FFFF */ addiu $v0, $v0, -1 -/* DBE854 802415A4 A602008E */ sh $v0, 0x8e($s0) -/* DBE858 802415A8 00021400 */ sll $v0, $v0, 0x10 -/* DBE85C 802415AC 14400004 */ bnez $v0, .L802415C0 -/* DBE860 802415B0 2402001E */ addiu $v0, $zero, 0x1e -/* DBE864 802415B4 A602008E */ sh $v0, 0x8e($s0) -/* DBE868 802415B8 24020011 */ addiu $v0, $zero, 0x11 -/* DBE86C 802415BC AE220070 */ sw $v0, 0x70($s1) -.L802415C0: -/* DBE870 802415C0 8FBF0028 */ lw $ra, 0x28($sp) -/* DBE874 802415C4 8FB10024 */ lw $s1, 0x24($sp) -/* DBE878 802415C8 8FB00020 */ lw $s0, 0x20($sp) -/* DBE87C 802415CC 03E00008 */ jr $ra -/* DBE880 802415D0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s deleted file mode 100644 index 60c4f45b0d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ /dev/null @@ -1,241 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80246F20_DC41D0 -.word .L80241818_DBEAC8, .L80241828_DBEAD8, .L80241840_DBEAF0, .L80241850_DBEB00, .L80241868_DBEB18, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241880_DBEB30, .L80241890_DBEB40, .L802418A8_DBEB58, .L802418B8_DBEB68, .L802418D0_DBEB80, .L802418F0_DBEBA0, .L80241910_DBEBC0, .L80241930_DBEBE0, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241950_DBEC00, .L80241948_DBEBF8 - -.section .text - -glabel func_80241634_DBE8E4 -/* DBE8E4 80241634 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DBE8E8 80241638 AFB30054 */ sw $s3, 0x54($sp) -/* DBE8EC 8024163C 0080982D */ daddu $s3, $a0, $zero -/* DBE8F0 80241640 AFBF0060 */ sw $ra, 0x60($sp) -/* DBE8F4 80241644 AFB5005C */ sw $s5, 0x5c($sp) -/* DBE8F8 80241648 AFB40058 */ sw $s4, 0x58($sp) -/* DBE8FC 8024164C AFB20050 */ sw $s2, 0x50($sp) -/* DBE900 80241650 AFB1004C */ sw $s1, 0x4c($sp) -/* DBE904 80241654 AFB00048 */ sw $s0, 0x48($sp) -/* DBE908 80241658 8E710148 */ lw $s1, 0x148($s3) -/* DBE90C 8024165C 86240008 */ lh $a0, 8($s1) -/* DBE910 80241660 0C00EABB */ jal get_npc_unsafe -/* DBE914 80241664 00A0802D */ daddu $s0, $a1, $zero -/* DBE918 80241668 8E63000C */ lw $v1, 0xc($s3) -/* DBE91C 8024166C 0260202D */ daddu $a0, $s3, $zero -/* DBE920 80241670 8C650000 */ lw $a1, ($v1) -/* DBE924 80241674 0C0B1EAF */ jal evt_get_variable -/* DBE928 80241678 0040902D */ daddu $s2, $v0, $zero -/* DBE92C 8024167C AFA00018 */ sw $zero, 0x18($sp) -/* DBE930 80241680 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE934 80241684 8C630094 */ lw $v1, 0x94($v1) -/* DBE938 80241688 AFA3001C */ sw $v1, 0x1c($sp) -/* DBE93C 8024168C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE940 80241690 8C630080 */ lw $v1, 0x80($v1) -/* DBE944 80241694 AFA30020 */ sw $v1, 0x20($sp) -/* DBE948 80241698 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE94C 8024169C 8C630088 */ lw $v1, 0x88($v1) -/* DBE950 802416A0 AFA30024 */ sw $v1, 0x24($sp) -/* DBE954 802416A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE958 802416A8 8C63008C */ lw $v1, 0x8c($v1) -/* DBE95C 802416AC 27B50018 */ addiu $s5, $sp, 0x18 -/* DBE960 802416B0 AFA30028 */ sw $v1, 0x28($sp) -/* DBE964 802416B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE968 802416B8 3C014282 */ lui $at, 0x4282 -/* DBE96C 802416BC 44810000 */ mtc1 $at, $f0 -/* DBE970 802416C0 8C630090 */ lw $v1, 0x90($v1) -/* DBE974 802416C4 0040A02D */ daddu $s4, $v0, $zero -/* DBE978 802416C8 E7A00030 */ swc1 $f0, 0x30($sp) -/* DBE97C 802416CC A7A00034 */ sh $zero, 0x34($sp) -/* DBE980 802416D0 16000005 */ bnez $s0, .L802416E8 -/* DBE984 802416D4 AFA3002C */ sw $v1, 0x2c($sp) -/* DBE988 802416D8 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBE98C 802416DC 30420004 */ andi $v0, $v0, 4 -/* DBE990 802416E0 10400044 */ beqz $v0, .L802417F4 -/* DBE994 802416E4 00000000 */ nop -.L802416E8: -/* DBE998 802416E8 2404F7FF */ addiu $a0, $zero, -0x801 -/* DBE99C 802416EC AE600070 */ sw $zero, 0x70($s3) -/* DBE9A0 802416F0 A640008E */ sh $zero, 0x8e($s2) -/* DBE9A4 802416F4 8E2200CC */ lw $v0, 0xcc($s1) -/* DBE9A8 802416F8 8E430000 */ lw $v1, ($s2) -/* DBE9AC 802416FC 8C420000 */ lw $v0, ($v0) -/* DBE9B0 80241700 00641824 */ and $v1, $v1, $a0 -/* DBE9B4 80241704 AE430000 */ sw $v1, ($s2) -/* DBE9B8 80241708 AE420028 */ sw $v0, 0x28($s2) -/* DBE9BC 8024170C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBE9C0 80241710 8C420098 */ lw $v0, 0x98($v0) -/* DBE9C4 80241714 54400005 */ bnel $v0, $zero, .L8024172C -/* DBE9C8 80241718 2402FDFF */ addiu $v0, $zero, -0x201 -/* DBE9CC 8024171C 34620200 */ ori $v0, $v1, 0x200 -/* DBE9D0 80241720 2403FFF7 */ addiu $v1, $zero, -9 -/* DBE9D4 80241724 080905CD */ j .L80241734 -/* DBE9D8 80241728 00431024 */ and $v0, $v0, $v1 -.L8024172C: -/* DBE9DC 8024172C 00621024 */ and $v0, $v1, $v0 -/* DBE9E0 80241730 34420008 */ ori $v0, $v0, 8 -.L80241734: -/* DBE9E4 80241734 AE420000 */ sw $v0, ($s2) -/* DBE9E8 80241738 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBE9EC 8024173C 30420004 */ andi $v0, $v0, 4 -/* DBE9F0 80241740 10400008 */ beqz $v0, .L80241764 -/* DBE9F4 80241744 24020063 */ addiu $v0, $zero, 0x63 -/* DBE9F8 80241748 AE620070 */ sw $v0, 0x70($s3) -/* DBE9FC 8024174C AE600074 */ sw $zero, 0x74($s3) -/* DBEA00 80241750 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBEA04 80241754 2403FFFB */ addiu $v1, $zero, -5 -/* DBEA08 80241758 00431024 */ and $v0, $v0, $v1 -/* DBEA0C 8024175C 080905E4 */ j .L80241790 -/* DBEA10 80241760 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241764: -/* DBEA14 80241764 8E220000 */ lw $v0, ($s1) -/* DBEA18 80241768 3C034000 */ lui $v1, 0x4000 -/* DBEA1C 8024176C 00431024 */ and $v0, $v0, $v1 -/* DBEA20 80241770 10400007 */ beqz $v0, .L80241790 -/* DBEA24 80241774 3C03BFFF */ lui $v1, 0xbfff -/* DBEA28 80241778 2402000C */ addiu $v0, $zero, 0xc -/* DBEA2C 8024177C AE620070 */ sw $v0, 0x70($s3) -/* DBEA30 80241780 8E220000 */ lw $v0, ($s1) -/* DBEA34 80241784 3463FFFF */ ori $v1, $v1, 0xffff -/* DBEA38 80241788 00431024 */ and $v0, $v0, $v1 -/* DBEA3C 8024178C AE220000 */ sw $v0, ($s1) -.L80241790: -/* DBEA40 80241790 27A50038 */ addiu $a1, $sp, 0x38 -/* DBEA44 80241794 27A6003C */ addiu $a2, $sp, 0x3c -/* DBEA48 80241798 C6400038 */ lwc1 $f0, 0x38($s2) -/* DBEA4C 8024179C 864200A8 */ lh $v0, 0xa8($s2) -/* DBEA50 802417A0 3C0142C8 */ lui $at, 0x42c8 -/* DBEA54 802417A4 44812000 */ mtc1 $at, $f4 -/* DBEA58 802417A8 44823000 */ mtc1 $v0, $f6 -/* DBEA5C 802417AC 00000000 */ nop -/* DBEA60 802417B0 468031A0 */ cvt.s.w $f6, $f6 -/* DBEA64 802417B4 27A20044 */ addiu $v0, $sp, 0x44 -/* DBEA68 802417B8 E7A00038 */ swc1 $f0, 0x38($sp) -/* DBEA6C 802417BC C640003C */ lwc1 $f0, 0x3c($s2) -/* DBEA70 802417C0 C6420040 */ lwc1 $f2, 0x40($s2) -/* DBEA74 802417C4 46060000 */ add.s $f0, $f0, $f6 -/* DBEA78 802417C8 E7A40044 */ swc1 $f4, 0x44($sp) -/* DBEA7C 802417CC E7A20040 */ swc1 $f2, 0x40($sp) -/* DBEA80 802417D0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DBEA84 802417D4 AFA20010 */ sw $v0, 0x10($sp) -/* DBEA88 802417D8 8E440080 */ lw $a0, 0x80($s2) -/* DBEA8C 802417DC 0C0372DF */ jal npc_raycast_down_sides -/* DBEA90 802417E0 27A70040 */ addiu $a3, $sp, 0x40 -/* DBEA94 802417E4 10400003 */ beqz $v0, .L802417F4 -/* DBEA98 802417E8 00000000 */ nop -/* DBEA9C 802417EC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DBEAA0 802417F0 E640003C */ swc1 $f0, 0x3c($s2) -.L802417F4: -/* DBEAA4 802417F4 8E630070 */ lw $v1, 0x70($s3) -/* DBEAA8 802417F8 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBEAAC 802417FC 10400054 */ beqz $v0, .L80241950_DBEC00 -/* DBEAB0 80241800 00031080 */ sll $v0, $v1, 2 -/* DBEAB4 80241804 3C018024 */ lui $at, %hi(jtbl_80246F20_DC41D0) -/* DBEAB8 80241808 00220821 */ addu $at, $at, $v0 -/* DBEABC 8024180C 8C226F20 */ lw $v0, %lo(jtbl_80246F20_DC41D0)($at) -/* DBEAC0 80241810 00400008 */ jr $v0 -/* DBEAC4 80241814 00000000 */ nop -.L80241818_DBEAC8: -/* DBEAC8 80241818 0260202D */ daddu $a0, $s3, $zero -/* DBEACC 8024181C 0280282D */ daddu $a1, $s4, $zero -/* DBEAD0 80241820 0C09015B */ jal omo_07_UnkNpcAIFunc24 -/* DBEAD4 80241824 02A0302D */ daddu $a2, $s5, $zero -.L80241828_DBEAD8: -/* DBEAD8 80241828 0260202D */ daddu $a0, $s3, $zero -/* DBEADC 8024182C 0280282D */ daddu $a1, $s4, $zero -/* DBEAE0 80241830 0C0901B1 */ jal omo_07_UnkFunc13 -/* DBEAE4 80241834 02A0302D */ daddu $a2, $s5, $zero -/* DBEAE8 80241838 08090654 */ j .L80241950_DBEC00 -/* DBEAEC 8024183C 00000000 */ nop -.L80241840_DBEAF0: -/* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero -/* DBEAF4 80241844 0280282D */ daddu $a1, $s4, $zero -/* DBEAF8 80241848 0C09025B */ jal omo_07_UnkNpcAIFunc1 -/* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero -.L80241850_DBEB00: -/* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero -/* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero -/* DBEB08 80241858 0C09028B */ jal omo_07_UnkFunc14 -/* DBEB0C 8024185C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB10 80241860 08090654 */ j .L80241950_DBEC00 -/* DBEB14 80241864 00000000 */ nop -.L80241868_DBEB18: -/* DBEB18 80241868 0260202D */ daddu $a0, $s3, $zero -/* DBEB1C 8024186C 0280282D */ daddu $a1, $s4, $zero -/* DBEB20 80241870 0C0902FA */ jal omo_07_UnkNpcAIFunc25 -/* DBEB24 80241874 02A0302D */ daddu $a2, $s5, $zero -/* DBEB28 80241878 08090654 */ j .L80241950_DBEC00 -/* DBEB2C 8024187C 00000000 */ nop -.L80241880_DBEB30: -/* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero -/* DBEB34 80241884 0280282D */ daddu $a1, $s4, $zero -/* DBEB38 80241888 0C090327 */ jal omo_07_NpcJumpFunc2 -/* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero -.L80241890_DBEB40: -/* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero -/* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero -/* DBEB48 80241898 0C090344 */ jal omo_07_NpcJumpFunc -/* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero -/* DBEB50 802418A0 08090654 */ j .L80241950_DBEC00 -/* DBEB54 802418A4 00000000 */ nop -.L802418A8_DBEB58: -/* DBEB58 802418A8 0260202D */ daddu $a0, $s3, $zero -/* DBEB5C 802418AC 0280282D */ daddu $a1, $s4, $zero -/* DBEB60 802418B0 0C090362 */ jal omo_07_UnkNpcAIFunc13 -/* DBEB64 802418B4 02A0302D */ daddu $a2, $s5, $zero -.L802418B8_DBEB68: -/* DBEB68 802418B8 0260202D */ daddu $a0, $s3, $zero -/* DBEB6C 802418BC 0280282D */ daddu $a1, $s4, $zero -/* DBEB70 802418C0 0C0903AE */ jal omo_07_UnkFunc15 -/* DBEB74 802418C4 02A0302D */ daddu $a2, $s5, $zero -/* DBEB78 802418C8 08090654 */ j .L80241950_DBEC00 -/* DBEB7C 802418CC 00000000 */ nop -.L802418D0_DBEB80: -/* DBEB80 802418D0 0260202D */ daddu $a0, $s3, $zero -/* DBEB84 802418D4 0280282D */ daddu $a1, $s4, $zero -/* DBEB88 802418D8 0C0904FF */ jal func_802413FC_DBE6AC -/* DBEB8C 802418DC 02A0302D */ daddu $a2, $s5, $zero -/* DBEB90 802418E0 8E630070 */ lw $v1, 0x70($s3) -/* DBEB94 802418E4 2402000F */ addiu $v0, $zero, 0xf -/* DBEB98 802418E8 14620019 */ bne $v1, $v0, .L80241950_DBEC00 -/* DBEB9C 802418EC 00000000 */ nop -.L802418F0_DBEBA0: -/* DBEBA0 802418F0 0260202D */ daddu $a0, $s3, $zero -/* DBEBA4 802418F4 0280282D */ daddu $a1, $s4, $zero -/* DBEBA8 802418F8 0C09051B */ jal func_8024146C_DBE71C -/* DBEBAC 802418FC 02A0302D */ daddu $a2, $s5, $zero -/* DBEBB0 80241900 8E630070 */ lw $v1, 0x70($s3) -/* DBEBB4 80241904 24020010 */ addiu $v0, $zero, 0x10 -/* DBEBB8 80241908 14620011 */ bne $v1, $v0, .L80241950_DBEC00 -/* DBEBBC 8024190C 00000000 */ nop -.L80241910_DBEBC0: -/* DBEBC0 80241910 0260202D */ daddu $a0, $s3, $zero -/* DBEBC4 80241914 0280282D */ daddu $a1, $s4, $zero -/* DBEBC8 80241918 0C09054F */ jal func_8024153C_DBE7EC -/* DBEBCC 8024191C 02A0302D */ daddu $a2, $s5, $zero -/* DBEBD0 80241920 8E630070 */ lw $v1, 0x70($s3) -/* DBEBD4 80241924 24020011 */ addiu $v0, $zero, 0x11 -/* DBEBD8 80241928 14620009 */ bne $v1, $v0, .L80241950_DBEC00 -/* DBEBDC 8024192C 00000000 */ nop -.L80241930_DBEBE0: -/* DBEBE0 80241930 0260202D */ daddu $a0, $s3, $zero -/* DBEBE4 80241934 0280282D */ daddu $a1, $s4, $zero -/* DBEBE8 80241938 0C090575 */ jal dup_omo_07_UnkNpcDurationAnimationFunc -/* DBEBEC 8024193C 02A0302D */ daddu $a2, $s5, $zero -/* DBEBF0 80241940 08090654 */ j .L80241950_DBEC00 -/* DBEBF4 80241944 00000000 */ nop -.L80241948_DBEBF8: -/* DBEBF8 80241948 0C0129CF */ jal func_8004A73C -/* DBEBFC 8024194C 0260202D */ daddu $a0, $s3, $zero -.L80241950_DBEC00: -/* DBEC00 80241950 8FBF0060 */ lw $ra, 0x60($sp) -/* DBEC04 80241954 8FB5005C */ lw $s5, 0x5c($sp) -/* DBEC08 80241958 8FB40058 */ lw $s4, 0x58($sp) -/* DBEC0C 8024195C 8FB30054 */ lw $s3, 0x54($sp) -/* DBEC10 80241960 8FB20050 */ lw $s2, 0x50($sp) -/* DBEC14 80241964 8FB1004C */ lw $s1, 0x4c($sp) -/* DBEC18 80241968 8FB00048 */ lw $s0, 0x48($sp) -/* DBEC1C 8024196C 0000102D */ daddu $v0, $zero, $zero -/* DBEC20 80241970 03E00008 */ jr $ra -/* DBEC24 80241974 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s deleted file mode 100644 index 79a31626ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80248760_DCCB30 -.double 0.6 - -.section .text - -glabel func_80240870_DC4C40 -/* DC4C40 80240870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC4C44 80240874 AFB10014 */ sw $s1, 0x14($sp) -/* DC4C48 80240878 0080882D */ daddu $s1, $a0, $zero -/* DC4C4C 8024087C AFBF0018 */ sw $ra, 0x18($sp) -/* DC4C50 80240880 AFB00010 */ sw $s0, 0x10($sp) -/* DC4C54 80240884 8E300148 */ lw $s0, 0x148($s1) -/* DC4C58 80240888 0C00EABB */ jal get_npc_unsafe -/* DC4C5C 8024088C 86040008 */ lh $a0, 8($s0) -/* DC4C60 80240890 C4400018 */ lwc1 $f0, 0x18($v0) -/* DC4C64 80240894 3C018025 */ lui $at, %hi(D_80248760_DCCB30) -/* DC4C68 80240898 D4228760 */ ldc1 $f2, %lo(D_80248760_DCCB30)($at) -/* DC4C6C 8024089C 46000021 */ cvt.d.s $f0, $f0 -/* DC4C70 802408A0 46220002 */ mul.d $f0, $f0, $f2 -/* DC4C74 802408A4 00000000 */ nop -/* DC4C78 802408A8 46200020 */ cvt.s.d $f0, $f0 -/* DC4C7C 802408AC E4400018 */ swc1 $f0, 0x18($v0) -/* DC4C80 802408B0 8E0300CC */ lw $v1, 0xcc($s0) -/* DC4C84 802408B4 8C640030 */ lw $a0, 0x30($v1) -/* DC4C88 802408B8 24030005 */ addiu $v1, $zero, 5 -/* DC4C8C 802408BC A443008E */ sh $v1, 0x8e($v0) -/* DC4C90 802408C0 AC440028 */ sw $a0, 0x28($v0) -/* DC4C94 802408C4 2402000F */ addiu $v0, $zero, 0xf -/* DC4C98 802408C8 AE220070 */ sw $v0, 0x70($s1) -/* DC4C9C 802408CC 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4CA0 802408D0 8FB10014 */ lw $s1, 0x14($sp) -/* DC4CA4 802408D4 8FB00010 */ lw $s0, 0x10($sp) -/* DC4CA8 802408D8 03E00008 */ jr $ra -/* DC4CAC 802408DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s deleted file mode 100644 index d8f589b6d5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80248768_DCCB38 -.double 0.6 - -.section .text - -glabel func_802408E0_DC4CB0 -/* DC4CB0 802408E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DC4CB4 802408E4 AFB20028 */ sw $s2, 0x28($sp) -/* DC4CB8 802408E8 0080902D */ daddu $s2, $a0, $zero -/* DC4CBC 802408EC AFBF002C */ sw $ra, 0x2c($sp) -/* DC4CC0 802408F0 AFB10024 */ sw $s1, 0x24($sp) -/* DC4CC4 802408F4 AFB00020 */ sw $s0, 0x20($sp) -/* DC4CC8 802408F8 8E510148 */ lw $s1, 0x148($s2) -/* DC4CCC 802408FC 0C00EABB */ jal get_npc_unsafe -/* DC4CD0 80240900 86240008 */ lh $a0, 8($s1) -/* DC4CD4 80240904 0040802D */ daddu $s0, $v0, $zero -/* DC4CD8 80240908 0200202D */ daddu $a0, $s0, $zero -/* DC4CDC 8024090C C600000C */ lwc1 $f0, 0xc($s0) -/* DC4CE0 80240910 27A60018 */ addiu $a2, $sp, 0x18 -/* DC4CE4 80240914 E7A00018 */ swc1 $f0, 0x18($sp) -/* DC4CE8 80240918 AFA00010 */ sw $zero, 0x10($sp) -/* DC4CEC 8024091C AFA00014 */ sw $zero, 0x14($sp) -/* DC4CF0 80240920 8E050018 */ lw $a1, 0x18($s0) -/* DC4CF4 80240924 0C0129E1 */ jal func_8004A784 -/* DC4CF8 80240928 0000382D */ daddu $a3, $zero, $zero -/* DC4CFC 8024092C 14400005 */ bnez $v0, .L80240944 -/* DC4D00 80240930 00000000 */ nop -/* DC4D04 80240934 8E050018 */ lw $a1, 0x18($s0) -/* DC4D08 80240938 8E06000C */ lw $a2, 0xc($s0) -/* DC4D0C 8024093C 0C00EA95 */ jal npc_move_heading -/* DC4D10 80240940 0200202D */ daddu $a0, $s0, $zero -.L80240944: -/* DC4D14 80240944 9602008E */ lhu $v0, 0x8e($s0) -/* DC4D18 80240948 2442FFFF */ addiu $v0, $v0, -1 -/* DC4D1C 8024094C A602008E */ sh $v0, 0x8e($s0) -/* DC4D20 80240950 00021400 */ sll $v0, $v0, 0x10 -/* DC4D24 80240954 14400010 */ bnez $v0, .L80240998 -/* DC4D28 80240958 00000000 */ nop -/* DC4D2C 8024095C C6000018 */ lwc1 $f0, 0x18($s0) -/* DC4D30 80240960 3C018025 */ lui $at, %hi(D_80248768_DCCB38) -/* DC4D34 80240964 D4228768 */ ldc1 $f2, %lo(D_80248768_DCCB38)($at) -/* DC4D38 80240968 46000021 */ cvt.d.s $f0, $f0 -/* DC4D3C 8024096C 46220002 */ mul.d $f0, $f0, $f2 -/* DC4D40 80240970 00000000 */ nop -/* DC4D44 80240974 46200020 */ cvt.s.d $f0, $f0 -/* DC4D48 80240978 E6000018 */ swc1 $f0, 0x18($s0) -/* DC4D4C 8024097C 8E2200CC */ lw $v0, 0xcc($s1) -/* DC4D50 80240980 8C43002C */ lw $v1, 0x2c($v0) -/* DC4D54 80240984 2402000A */ addiu $v0, $zero, 0xa -/* DC4D58 80240988 A602008E */ sh $v0, 0x8e($s0) -/* DC4D5C 8024098C 24020010 */ addiu $v0, $zero, 0x10 -/* DC4D60 80240990 AE030028 */ sw $v1, 0x28($s0) -/* DC4D64 80240994 AE420070 */ sw $v0, 0x70($s2) -.L80240998: -/* DC4D68 80240998 8FBF002C */ lw $ra, 0x2c($sp) -/* DC4D6C 8024099C 8FB20028 */ lw $s2, 0x28($sp) -/* DC4D70 802409A0 8FB10024 */ lw $s1, 0x24($sp) -/* DC4D74 802409A4 8FB00020 */ lw $s0, 0x20($sp) -/* DC4D78 802409A8 03E00008 */ jr $ra -/* DC4D7C 802409AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s deleted file mode 100644 index 8cdffdcb4c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802409B0_DC4D80.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409B0_DC4D80 -/* DC4D80 802409B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DC4D84 802409B4 AFB10024 */ sw $s1, 0x24($sp) -/* DC4D88 802409B8 0080882D */ daddu $s1, $a0, $zero -/* DC4D8C 802409BC AFBF0028 */ sw $ra, 0x28($sp) -/* DC4D90 802409C0 AFB00020 */ sw $s0, 0x20($sp) -/* DC4D94 802409C4 8E220148 */ lw $v0, 0x148($s1) -/* DC4D98 802409C8 0C00EABB */ jal get_npc_unsafe -/* DC4D9C 802409CC 84440008 */ lh $a0, 8($v0) -/* DC4DA0 802409D0 0040802D */ daddu $s0, $v0, $zero -/* DC4DA4 802409D4 0200202D */ daddu $a0, $s0, $zero -/* DC4DA8 802409D8 C600000C */ lwc1 $f0, 0xc($s0) -/* DC4DAC 802409DC 27A60018 */ addiu $a2, $sp, 0x18 -/* DC4DB0 802409E0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DC4DB4 802409E4 AFA00010 */ sw $zero, 0x10($sp) -/* DC4DB8 802409E8 AFA00014 */ sw $zero, 0x14($sp) -/* DC4DBC 802409EC 8E050018 */ lw $a1, 0x18($s0) -/* DC4DC0 802409F0 0C0129E1 */ jal func_8004A784 -/* DC4DC4 802409F4 0000382D */ daddu $a3, $zero, $zero -/* DC4DC8 802409F8 14400005 */ bnez $v0, .L80240A10 -/* DC4DCC 802409FC 00000000 */ nop -/* DC4DD0 80240A00 8E050018 */ lw $a1, 0x18($s0) -/* DC4DD4 80240A04 8E06000C */ lw $a2, 0xc($s0) -/* DC4DD8 80240A08 0C00EA95 */ jal npc_move_heading -/* DC4DDC 80240A0C 0200202D */ daddu $a0, $s0, $zero -.L80240A10: -/* DC4DE0 80240A10 9602008E */ lhu $v0, 0x8e($s0) -/* DC4DE4 80240A14 2442FFFF */ addiu $v0, $v0, -1 -/* DC4DE8 80240A18 A602008E */ sh $v0, 0x8e($s0) -/* DC4DEC 80240A1C 00021400 */ sll $v0, $v0, 0x10 -/* DC4DF0 80240A20 14400004 */ bnez $v0, .L80240A34 -/* DC4DF4 80240A24 2402001E */ addiu $v0, $zero, 0x1e -/* DC4DF8 80240A28 A602008E */ sh $v0, 0x8e($s0) -/* DC4DFC 80240A2C 24020011 */ addiu $v0, $zero, 0x11 -/* DC4E00 80240A30 AE220070 */ sw $v0, 0x70($s1) -.L80240A34: -/* DC4E04 80240A34 8FBF0028 */ lw $ra, 0x28($sp) -/* DC4E08 80240A38 8FB10024 */ lw $s1, 0x24($sp) -/* DC4E0C 80240A3C 8FB00020 */ lw $s0, 0x20($sp) -/* DC4E10 80240A40 03E00008 */ jr $ra -/* DC4E14 80240A44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s deleted file mode 100644 index ced7e57054..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ /dev/null @@ -1,237 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80248770_DCCB40 -.word .L80240C8C_DC505C, .L80240C9C_DC506C, .L80240CB4_DC5084, .L80240CC4_DC5094, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240CDC_DC50AC, .L80240CEC_DC50BC, .L80240D04_DC50D4, .L80240D14_DC50E4, .L80240D34_DC5104, .L80240D54_DC5124, .L80240D74_DC5144, .L80240D94_DC5164, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DB4_DC5184, .L80240DAC_DC517C - -.section .text - -glabel btl_restore_world_cameras_DC4E78 -/* DC4E78 80240AA8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DC4E7C 80240AAC AFB30054 */ sw $s3, 0x54($sp) -/* DC4E80 80240AB0 0080982D */ daddu $s3, $a0, $zero -/* DC4E84 80240AB4 AFBF0060 */ sw $ra, 0x60($sp) -/* DC4E88 80240AB8 AFB5005C */ sw $s5, 0x5c($sp) -/* DC4E8C 80240ABC AFB40058 */ sw $s4, 0x58($sp) -/* DC4E90 80240AC0 AFB20050 */ sw $s2, 0x50($sp) -/* DC4E94 80240AC4 AFB1004C */ sw $s1, 0x4c($sp) -/* DC4E98 80240AC8 AFB00048 */ sw $s0, 0x48($sp) -/* DC4E9C 80240ACC 8E710148 */ lw $s1, 0x148($s3) -/* DC4EA0 80240AD0 86240008 */ lh $a0, 8($s1) -/* DC4EA4 80240AD4 0C00EABB */ jal get_npc_unsafe -/* DC4EA8 80240AD8 00A0802D */ daddu $s0, $a1, $zero -/* DC4EAC 80240ADC 8E63000C */ lw $v1, 0xc($s3) -/* DC4EB0 80240AE0 0260202D */ daddu $a0, $s3, $zero -/* DC4EB4 80240AE4 8C650000 */ lw $a1, ($v1) -/* DC4EB8 80240AE8 0C0B1EAF */ jal evt_get_variable -/* DC4EBC 80240AEC 0040902D */ daddu $s2, $v0, $zero -/* DC4EC0 80240AF0 AFA00018 */ sw $zero, 0x18($sp) -/* DC4EC4 80240AF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EC8 80240AF8 8C630030 */ lw $v1, 0x30($v1) -/* DC4ECC 80240AFC AFA3001C */ sw $v1, 0x1c($sp) -/* DC4ED0 80240B00 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4ED4 80240B04 8C63001C */ lw $v1, 0x1c($v1) -/* DC4ED8 80240B08 AFA30020 */ sw $v1, 0x20($sp) -/* DC4EDC 80240B0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EE0 80240B10 8C630024 */ lw $v1, 0x24($v1) -/* DC4EE4 80240B14 AFA30024 */ sw $v1, 0x24($sp) -/* DC4EE8 80240B18 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EEC 80240B1C 8C630028 */ lw $v1, 0x28($v1) -/* DC4EF0 80240B20 27B50018 */ addiu $s5, $sp, 0x18 -/* DC4EF4 80240B24 AFA30028 */ sw $v1, 0x28($sp) -/* DC4EF8 80240B28 8E2300D0 */ lw $v1, 0xd0($s1) -/* DC4EFC 80240B2C 3C014282 */ lui $at, 0x4282 -/* DC4F00 80240B30 44810000 */ mtc1 $at, $f0 -/* DC4F04 80240B34 8C63002C */ lw $v1, 0x2c($v1) -/* DC4F08 80240B38 0040A02D */ daddu $s4, $v0, $zero -/* DC4F0C 80240B3C E7A00030 */ swc1 $f0, 0x30($sp) -/* DC4F10 80240B40 A7A00034 */ sh $zero, 0x34($sp) -/* DC4F14 80240B44 16000005 */ bnez $s0, .L80240B5C -/* DC4F18 80240B48 AFA3002C */ sw $v1, 0x2c($sp) -/* DC4F1C 80240B4C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DC4F20 80240B50 30420004 */ andi $v0, $v0, 4 -/* DC4F24 80240B54 10400044 */ beqz $v0, .L80240C68 -/* DC4F28 80240B58 00000000 */ nop -.L80240B5C: -/* DC4F2C 80240B5C 2404F7FF */ addiu $a0, $zero, -0x801 -/* DC4F30 80240B60 AE600070 */ sw $zero, 0x70($s3) -/* DC4F34 80240B64 A640008E */ sh $zero, 0x8e($s2) -/* DC4F38 80240B68 8E2200CC */ lw $v0, 0xcc($s1) -/* DC4F3C 80240B6C 8E430000 */ lw $v1, ($s2) -/* DC4F40 80240B70 8C420000 */ lw $v0, ($v0) -/* DC4F44 80240B74 00641824 */ and $v1, $v1, $a0 -/* DC4F48 80240B78 AE430000 */ sw $v1, ($s2) -/* DC4F4C 80240B7C AE420028 */ sw $v0, 0x28($s2) -/* DC4F50 80240B80 8E2200D0 */ lw $v0, 0xd0($s1) -/* DC4F54 80240B84 8C420034 */ lw $v0, 0x34($v0) -/* DC4F58 80240B88 54400005 */ bnel $v0, $zero, .L80240BA0 -/* DC4F5C 80240B8C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DC4F60 80240B90 34620200 */ ori $v0, $v1, 0x200 -/* DC4F64 80240B94 2403FFF7 */ addiu $v1, $zero, -9 -/* DC4F68 80240B98 080902EA */ j .L80240BA8 -/* DC4F6C 80240B9C 00431024 */ and $v0, $v0, $v1 -.L80240BA0: -/* DC4F70 80240BA0 00621024 */ and $v0, $v1, $v0 -/* DC4F74 80240BA4 34420008 */ ori $v0, $v0, 8 -.L80240BA8: -/* DC4F78 80240BA8 AE420000 */ sw $v0, ($s2) -/* DC4F7C 80240BAC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DC4F80 80240BB0 30420004 */ andi $v0, $v0, 4 -/* DC4F84 80240BB4 10400004 */ beqz $v0, .L80240BC8 -/* DC4F88 80240BB8 24020063 */ addiu $v0, $zero, 0x63 -/* DC4F8C 80240BBC AE620070 */ sw $v0, 0x70($s3) -/* DC4F90 80240BC0 080902F8 */ j .L80240BE0 -/* DC4F94 80240BC4 AE600074 */ sw $zero, 0x74($s3) -.L80240BC8: -/* DC4F98 80240BC8 8E220000 */ lw $v0, ($s1) -/* DC4F9C 80240BCC 3C034000 */ lui $v1, 0x4000 -/* DC4FA0 80240BD0 00431024 */ and $v0, $v0, $v1 -/* DC4FA4 80240BD4 10400002 */ beqz $v0, .L80240BE0 -/* DC4FA8 80240BD8 2402000C */ addiu $v0, $zero, 0xc -/* DC4FAC 80240BDC AE620070 */ sw $v0, 0x70($s3) -.L80240BE0: -/* DC4FB0 80240BE0 3C06BFFF */ lui $a2, 0xbfff -/* DC4FB4 80240BE4 34C6FFFF */ ori $a2, $a2, 0xffff -/* DC4FB8 80240BE8 27A50038 */ addiu $a1, $sp, 0x38 -/* DC4FBC 80240BEC 2404FFFB */ addiu $a0, $zero, -5 -/* DC4FC0 80240BF0 8E2200B0 */ lw $v0, 0xb0($s1) -/* DC4FC4 80240BF4 8E230000 */ lw $v1, ($s1) -/* DC4FC8 80240BF8 3C0142C8 */ lui $at, 0x42c8 -/* DC4FCC 80240BFC 44810000 */ mtc1 $at, $f0 -/* DC4FD0 80240C00 00441024 */ and $v0, $v0, $a0 -/* DC4FD4 80240C04 00661824 */ and $v1, $v1, $a2 -/* DC4FD8 80240C08 AE2200B0 */ sw $v0, 0xb0($s1) -/* DC4FDC 80240C0C AE230000 */ sw $v1, ($s1) -/* DC4FE0 80240C10 864200A8 */ lh $v0, 0xa8($s2) -/* DC4FE4 80240C14 27A70040 */ addiu $a3, $sp, 0x40 -/* DC4FE8 80240C18 E7A00044 */ swc1 $f0, 0x44($sp) -/* DC4FEC 80240C1C C6460038 */ lwc1 $f6, 0x38($s2) -/* DC4FF0 80240C20 C640003C */ lwc1 $f0, 0x3c($s2) -/* DC4FF4 80240C24 C6420040 */ lwc1 $f2, 0x40($s2) -/* DC4FF8 80240C28 44822000 */ mtc1 $v0, $f4 -/* DC4FFC 80240C2C 00000000 */ nop -/* DC5000 80240C30 46802120 */ cvt.s.w $f4, $f4 -/* DC5004 80240C34 27A20044 */ addiu $v0, $sp, 0x44 -/* DC5008 80240C38 46040000 */ add.s $f0, $f0, $f4 -/* DC500C 80240C3C E7A60038 */ swc1 $f6, 0x38($sp) -/* DC5010 80240C40 E7A20040 */ swc1 $f2, 0x40($sp) -/* DC5014 80240C44 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DC5018 80240C48 AFA20010 */ sw $v0, 0x10($sp) -/* DC501C 80240C4C 8E440080 */ lw $a0, 0x80($s2) -/* DC5020 80240C50 0C0372DF */ jal npc_raycast_down_sides -/* DC5024 80240C54 27A6003C */ addiu $a2, $sp, 0x3c -/* DC5028 80240C58 10400003 */ beqz $v0, .L80240C68 -/* DC502C 80240C5C 00000000 */ nop -/* DC5030 80240C60 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DC5034 80240C64 E640003C */ swc1 $f0, 0x3c($s2) -.L80240C68: -/* DC5038 80240C68 8E630070 */ lw $v1, 0x70($s3) -/* DC503C 80240C6C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DC5040 80240C70 10400050 */ beqz $v0, .L80240DB4_DC5184 -/* DC5044 80240C74 00031080 */ sll $v0, $v1, 2 -/* DC5048 80240C78 3C018025 */ lui $at, %hi(jtbl_80248770_DCCB40) -/* DC504C 80240C7C 00220821 */ addu $at, $at, $v0 -/* DC5050 80240C80 8C228770 */ lw $v0, %lo(jtbl_80248770_DCCB40)($at) -/* DC5054 80240C84 00400008 */ jr $v0 -/* DC5058 80240C88 00000000 */ nop -.L80240C8C_DC505C: -/* DC505C 80240C8C 0260202D */ daddu $a0, $s3, $zero -/* DC5060 80240C90 0280282D */ daddu $a1, $s4, $zero -/* DC5064 80240C94 0C012568 */ jal func_800495A0 -/* DC5068 80240C98 02A0302D */ daddu $a2, $s5, $zero -.L80240C9C_DC506C: -/* DC506C 80240C9C 0260202D */ daddu $a0, $s3, $zero -/* DC5070 80240CA0 0280282D */ daddu $a1, $s4, $zero -/* DC5074 80240CA4 0C0125AE */ jal func_800496B8 -/* DC5078 80240CA8 02A0302D */ daddu $a2, $s5, $zero -/* DC507C 80240CAC 0809036D */ j .L80240DB4_DC5184 -/* DC5080 80240CB0 00000000 */ nop -.L80240CB4_DC5084: -/* DC5084 80240CB4 0260202D */ daddu $a0, $s3, $zero -/* DC5088 80240CB8 0280282D */ daddu $a1, $s4, $zero -/* DC508C 80240CBC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DC5090 80240CC0 02A0302D */ daddu $a2, $s5, $zero -.L80240CC4_DC5094: -/* DC5094 80240CC4 0260202D */ daddu $a0, $s3, $zero -/* DC5098 80240CC8 0280282D */ daddu $a1, $s4, $zero -/* DC509C 80240CCC 0C012701 */ jal func_80049C04 -/* DC50A0 80240CD0 02A0302D */ daddu $a2, $s5, $zero -/* DC50A4 80240CD4 0809036D */ j .L80240DB4_DC5184 -/* DC50A8 80240CD8 00000000 */ nop -.L80240CDC_DC50AC: -/* DC50AC 80240CDC 0260202D */ daddu $a0, $s3, $zero -/* DC50B0 80240CE0 0280282D */ daddu $a1, $s4, $zero -/* DC50B4 80240CE4 0C01278F */ jal func_80049E3C -/* DC50B8 80240CE8 02A0302D */ daddu $a2, $s5, $zero -.L80240CEC_DC50BC: -/* DC50BC 80240CEC 0260202D */ daddu $a0, $s3, $zero -/* DC50C0 80240CF0 0280282D */ daddu $a1, $s4, $zero -/* DC50C4 80240CF4 0C0127B3 */ jal func_80049ECC -/* DC50C8 80240CF8 02A0302D */ daddu $a2, $s5, $zero -/* DC50CC 80240CFC 0809036D */ j .L80240DB4_DC5184 -/* DC50D0 80240D00 00000000 */ nop -.L80240D04_DC50D4: -/* DC50D4 80240D04 0260202D */ daddu $a0, $s3, $zero -/* DC50D8 80240D08 0280282D */ daddu $a1, $s4, $zero -/* DC50DC 80240D0C 0C0127DF */ jal func_80049F7C -/* DC50E0 80240D10 02A0302D */ daddu $a2, $s5, $zero -.L80240D14_DC50E4: -/* DC50E4 80240D14 0260202D */ daddu $a0, $s3, $zero -/* DC50E8 80240D18 0280282D */ daddu $a1, $s4, $zero -/* DC50EC 80240D1C 0C012849 */ jal func_8004A124 -/* DC50F0 80240D20 02A0302D */ daddu $a2, $s5, $zero -/* DC50F4 80240D24 8E630070 */ lw $v1, 0x70($s3) -/* DC50F8 80240D28 2402000E */ addiu $v0, $zero, 0xe -/* DC50FC 80240D2C 14620021 */ bne $v1, $v0, .L80240DB4_DC5184 -/* DC5100 80240D30 00000000 */ nop -.L80240D34_DC5104: -/* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero -/* DC5108 80240D38 0280282D */ daddu $a1, $s4, $zero -/* DC510C 80240D3C 0C09021C */ jal func_80240870_DC4C40 -/* DC5110 80240D40 02A0302D */ daddu $a2, $s5, $zero -/* DC5114 80240D44 8E630070 */ lw $v1, 0x70($s3) -/* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf -/* DC511C 80240D4C 14620019 */ bne $v1, $v0, .L80240DB4_DC5184 -/* DC5120 80240D50 00000000 */ nop -.L80240D54_DC5124: -/* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero -/* DC5128 80240D58 0280282D */ daddu $a1, $s4, $zero -/* DC512C 80240D5C 0C090238 */ jal func_802408E0_DC4CB0 -/* DC5130 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* DC5134 80240D64 8E630070 */ lw $v1, 0x70($s3) -/* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 -/* DC513C 80240D6C 14620011 */ bne $v1, $v0, .L80240DB4_DC5184 -/* DC5140 80240D70 00000000 */ nop -.L80240D74_DC5144: -/* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero -/* DC5148 80240D78 0280282D */ daddu $a1, $s4, $zero -/* DC514C 80240D7C 0C09026C */ jal func_802409B0_DC4D80 -/* DC5150 80240D80 02A0302D */ daddu $a2, $s5, $zero -/* DC5154 80240D84 8E630070 */ lw $v1, 0x70($s3) -/* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 -/* DC515C 80240D8C 14620009 */ bne $v1, $v0, .L80240DB4_DC5184 -/* DC5160 80240D90 00000000 */ nop -.L80240D94_DC5164: -/* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero -/* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero -/* DC516C 80240D9C 0C090292 */ jal omo_08_UnkNpcDurationAnimationFunc -/* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* DC5174 80240DA4 0809036D */ j .L80240DB4_DC5184 -/* DC5178 80240DA8 00000000 */ nop -.L80240DAC_DC517C: -/* DC517C 80240DAC 0C0129CF */ jal func_8004A73C -/* DC5180 80240DB0 0260202D */ daddu $a0, $s3, $zero -.L80240DB4_DC5184: -/* DC5184 80240DB4 8FBF0060 */ lw $ra, 0x60($sp) -/* DC5188 80240DB8 8FB5005C */ lw $s5, 0x5c($sp) -/* DC518C 80240DBC 8FB40058 */ lw $s4, 0x58($sp) -/* DC5190 80240DC0 8FB30054 */ lw $s3, 0x54($sp) -/* DC5194 80240DC4 8FB20050 */ lw $s2, 0x50($sp) -/* DC5198 80240DC8 8FB1004C */ lw $s1, 0x4c($sp) -/* DC519C 80240DCC 8FB00048 */ lw $s0, 0x48($sp) -/* DC51A0 80240DD0 0000102D */ daddu $v0, $zero, $zero -/* DC51A4 80240DD4 03E00008 */ jr $ra -/* DC51A8 80240DD8 27BD0068 */ addiu $sp, $sp, 0x68 -/* DC51AC 80240DDC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s deleted file mode 100644 index 1abc510075..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024A630_DD7300 -.double 0.6 - -.section .text - -glabel func_802409E0_DCD6B0 -/* DCD6B0 802409E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD6B4 802409E4 AFB10014 */ sw $s1, 0x14($sp) -/* DCD6B8 802409E8 0080882D */ daddu $s1, $a0, $zero -/* DCD6BC 802409EC AFBF0018 */ sw $ra, 0x18($sp) -/* DCD6C0 802409F0 AFB00010 */ sw $s0, 0x10($sp) -/* DCD6C4 802409F4 8E300148 */ lw $s0, 0x148($s1) -/* DCD6C8 802409F8 0C00EABB */ jal get_npc_unsafe -/* DCD6CC 802409FC 86040008 */ lh $a0, 8($s0) -/* DCD6D0 80240A00 C4400018 */ lwc1 $f0, 0x18($v0) -/* DCD6D4 80240A04 3C018025 */ lui $at, %hi(D_8024A630_DD7300) -/* DCD6D8 80240A08 D422A630 */ ldc1 $f2, %lo(D_8024A630_DD7300)($at) -/* DCD6DC 80240A0C 46000021 */ cvt.d.s $f0, $f0 -/* DCD6E0 80240A10 46220002 */ mul.d $f0, $f0, $f2 -/* DCD6E4 80240A14 00000000 */ nop -/* DCD6E8 80240A18 46200020 */ cvt.s.d $f0, $f0 -/* DCD6EC 80240A1C E4400018 */ swc1 $f0, 0x18($v0) -/* DCD6F0 80240A20 8E0300CC */ lw $v1, 0xcc($s0) -/* DCD6F4 80240A24 8C640030 */ lw $a0, 0x30($v1) -/* DCD6F8 80240A28 24030005 */ addiu $v1, $zero, 5 -/* DCD6FC 80240A2C A443008E */ sh $v1, 0x8e($v0) -/* DCD700 80240A30 AC440028 */ sw $a0, 0x28($v0) -/* DCD704 80240A34 2402000F */ addiu $v0, $zero, 0xf -/* DCD708 80240A38 AE220070 */ sw $v0, 0x70($s1) -/* DCD70C 80240A3C 8FBF0018 */ lw $ra, 0x18($sp) -/* DCD710 80240A40 8FB10014 */ lw $s1, 0x14($sp) -/* DCD714 80240A44 8FB00010 */ lw $s0, 0x10($sp) -/* DCD718 80240A48 03E00008 */ jr $ra -/* DCD71C 80240A4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s deleted file mode 100644 index 5386247d69..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024A638_DD7308 -.double 0.6 - -.section .text - -glabel func_80240A50_DCD720 -/* DCD720 80240A50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCD724 80240A54 AFB20028 */ sw $s2, 0x28($sp) -/* DCD728 80240A58 0080902D */ daddu $s2, $a0, $zero -/* DCD72C 80240A5C AFBF002C */ sw $ra, 0x2c($sp) -/* DCD730 80240A60 AFB10024 */ sw $s1, 0x24($sp) -/* DCD734 80240A64 AFB00020 */ sw $s0, 0x20($sp) -/* DCD738 80240A68 8E510148 */ lw $s1, 0x148($s2) -/* DCD73C 80240A6C 0C00EABB */ jal get_npc_unsafe -/* DCD740 80240A70 86240008 */ lh $a0, 8($s1) -/* DCD744 80240A74 0040802D */ daddu $s0, $v0, $zero -/* DCD748 80240A78 0200202D */ daddu $a0, $s0, $zero -/* DCD74C 80240A7C C600000C */ lwc1 $f0, 0xc($s0) -/* DCD750 80240A80 27A60018 */ addiu $a2, $sp, 0x18 -/* DCD754 80240A84 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCD758 80240A88 AFA00010 */ sw $zero, 0x10($sp) -/* DCD75C 80240A8C AFA00014 */ sw $zero, 0x14($sp) -/* DCD760 80240A90 8E050018 */ lw $a1, 0x18($s0) -/* DCD764 80240A94 0C0129E1 */ jal func_8004A784 -/* DCD768 80240A98 0000382D */ daddu $a3, $zero, $zero -/* DCD76C 80240A9C 14400005 */ bnez $v0, .L80240AB4 -/* DCD770 80240AA0 00000000 */ nop -/* DCD774 80240AA4 8E050018 */ lw $a1, 0x18($s0) -/* DCD778 80240AA8 8E06000C */ lw $a2, 0xc($s0) -/* DCD77C 80240AAC 0C00EA95 */ jal npc_move_heading -/* DCD780 80240AB0 0200202D */ daddu $a0, $s0, $zero -.L80240AB4: -/* DCD784 80240AB4 9602008E */ lhu $v0, 0x8e($s0) -/* DCD788 80240AB8 2442FFFF */ addiu $v0, $v0, -1 -/* DCD78C 80240ABC A602008E */ sh $v0, 0x8e($s0) -/* DCD790 80240AC0 00021400 */ sll $v0, $v0, 0x10 -/* DCD794 80240AC4 14400010 */ bnez $v0, .L80240B08 -/* DCD798 80240AC8 00000000 */ nop -/* DCD79C 80240ACC C6000018 */ lwc1 $f0, 0x18($s0) -/* DCD7A0 80240AD0 3C018025 */ lui $at, %hi(D_8024A638_DD7308) -/* DCD7A4 80240AD4 D422A638 */ ldc1 $f2, %lo(D_8024A638_DD7308)($at) -/* DCD7A8 80240AD8 46000021 */ cvt.d.s $f0, $f0 -/* DCD7AC 80240ADC 46220002 */ mul.d $f0, $f0, $f2 -/* DCD7B0 80240AE0 00000000 */ nop -/* DCD7B4 80240AE4 46200020 */ cvt.s.d $f0, $f0 -/* DCD7B8 80240AE8 E6000018 */ swc1 $f0, 0x18($s0) -/* DCD7BC 80240AEC 8E2200CC */ lw $v0, 0xcc($s1) -/* DCD7C0 80240AF0 8C43002C */ lw $v1, 0x2c($v0) -/* DCD7C4 80240AF4 2402000A */ addiu $v0, $zero, 0xa -/* DCD7C8 80240AF8 A602008E */ sh $v0, 0x8e($s0) -/* DCD7CC 80240AFC 24020010 */ addiu $v0, $zero, 0x10 -/* DCD7D0 80240B00 AE030028 */ sw $v1, 0x28($s0) -/* DCD7D4 80240B04 AE420070 */ sw $v0, 0x70($s2) -.L80240B08: -/* DCD7D8 80240B08 8FBF002C */ lw $ra, 0x2c($sp) -/* DCD7DC 80240B0C 8FB20028 */ lw $s2, 0x28($sp) -/* DCD7E0 80240B10 8FB10024 */ lw $s1, 0x24($sp) -/* DCD7E4 80240B14 8FB00020 */ lw $s0, 0x20($sp) -/* DCD7E8 80240B18 03E00008 */ jr $ra -/* DCD7EC 80240B1C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s deleted file mode 100644 index e09f87a355..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240B20_DCD7F0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20_DCD7F0 -/* DCD7F0 80240B20 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCD7F4 80240B24 AFB10024 */ sw $s1, 0x24($sp) -/* DCD7F8 80240B28 0080882D */ daddu $s1, $a0, $zero -/* DCD7FC 80240B2C AFBF0028 */ sw $ra, 0x28($sp) -/* DCD800 80240B30 AFB00020 */ sw $s0, 0x20($sp) -/* DCD804 80240B34 8E220148 */ lw $v0, 0x148($s1) -/* DCD808 80240B38 0C00EABB */ jal get_npc_unsafe -/* DCD80C 80240B3C 84440008 */ lh $a0, 8($v0) -/* DCD810 80240B40 0040802D */ daddu $s0, $v0, $zero -/* DCD814 80240B44 0200202D */ daddu $a0, $s0, $zero -/* DCD818 80240B48 C600000C */ lwc1 $f0, 0xc($s0) -/* DCD81C 80240B4C 27A60018 */ addiu $a2, $sp, 0x18 -/* DCD820 80240B50 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCD824 80240B54 AFA00010 */ sw $zero, 0x10($sp) -/* DCD828 80240B58 AFA00014 */ sw $zero, 0x14($sp) -/* DCD82C 80240B5C 8E050018 */ lw $a1, 0x18($s0) -/* DCD830 80240B60 0C0129E1 */ jal func_8004A784 -/* DCD834 80240B64 0000382D */ daddu $a3, $zero, $zero -/* DCD838 80240B68 14400005 */ bnez $v0, .L80240B80 -/* DCD83C 80240B6C 00000000 */ nop -/* DCD840 80240B70 8E050018 */ lw $a1, 0x18($s0) -/* DCD844 80240B74 8E06000C */ lw $a2, 0xc($s0) -/* DCD848 80240B78 0C00EA95 */ jal npc_move_heading -/* DCD84C 80240B7C 0200202D */ daddu $a0, $s0, $zero -.L80240B80: -/* DCD850 80240B80 9602008E */ lhu $v0, 0x8e($s0) -/* DCD854 80240B84 2442FFFF */ addiu $v0, $v0, -1 -/* DCD858 80240B88 A602008E */ sh $v0, 0x8e($s0) -/* DCD85C 80240B8C 00021400 */ sll $v0, $v0, 0x10 -/* DCD860 80240B90 14400004 */ bnez $v0, .L80240BA4 -/* DCD864 80240B94 2402001E */ addiu $v0, $zero, 0x1e -/* DCD868 80240B98 A602008E */ sh $v0, 0x8e($s0) -/* DCD86C 80240B9C 24020011 */ addiu $v0, $zero, 0x11 -/* DCD870 80240BA0 AE220070 */ sw $v0, 0x70($s1) -.L80240BA4: -/* DCD874 80240BA4 8FBF0028 */ lw $ra, 0x28($sp) -/* DCD878 80240BA8 8FB10024 */ lw $s1, 0x24($sp) -/* DCD87C 80240BAC 8FB00020 */ lw $s0, 0x20($sp) -/* DCD880 80240BB0 03E00008 */ jr $ra -/* DCD884 80240BB4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s deleted file mode 100644 index 40d3975a1b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8024A640_DD7310 -.word .L80240DFC_DCDACC, .L80240E0C_DCDADC, .L80240E24_DCDAF4, .L80240E34_DCDB04, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240E4C_DCDB1C, .L80240E5C_DCDB2C, .L80240E74_DCDB44, .L80240E84_DCDB54, .L80240EA4_DCDB74, .L80240EC4_DCDB94, .L80240EE4_DCDBB4, .L80240F04_DCDBD4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F24_DCDBF4, .L80240F1C_DCDBEC - -.section .text - -glabel func_80240C18_DCD8E8 -/* DCD8E8 80240C18 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DCD8EC 80240C1C AFB30054 */ sw $s3, 0x54($sp) -/* DCD8F0 80240C20 0080982D */ daddu $s3, $a0, $zero -/* DCD8F4 80240C24 AFBF0060 */ sw $ra, 0x60($sp) -/* DCD8F8 80240C28 AFB5005C */ sw $s5, 0x5c($sp) -/* DCD8FC 80240C2C AFB40058 */ sw $s4, 0x58($sp) -/* DCD900 80240C30 AFB20050 */ sw $s2, 0x50($sp) -/* DCD904 80240C34 AFB1004C */ sw $s1, 0x4c($sp) -/* DCD908 80240C38 AFB00048 */ sw $s0, 0x48($sp) -/* DCD90C 80240C3C 8E710148 */ lw $s1, 0x148($s3) -/* DCD910 80240C40 86240008 */ lh $a0, 8($s1) -/* DCD914 80240C44 0C00EABB */ jal get_npc_unsafe -/* DCD918 80240C48 00A0802D */ daddu $s0, $a1, $zero -/* DCD91C 80240C4C 8E63000C */ lw $v1, 0xc($s3) -/* DCD920 80240C50 0260202D */ daddu $a0, $s3, $zero -/* DCD924 80240C54 8C650000 */ lw $a1, ($v1) -/* DCD928 80240C58 0C0B1EAF */ jal evt_get_variable -/* DCD92C 80240C5C 0040902D */ daddu $s2, $v0, $zero -/* DCD930 80240C60 AFA00018 */ sw $zero, 0x18($sp) -/* DCD934 80240C64 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD938 80240C68 8C630030 */ lw $v1, 0x30($v1) -/* DCD93C 80240C6C AFA3001C */ sw $v1, 0x1c($sp) -/* DCD940 80240C70 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD944 80240C74 8C63001C */ lw $v1, 0x1c($v1) -/* DCD948 80240C78 AFA30020 */ sw $v1, 0x20($sp) -/* DCD94C 80240C7C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD950 80240C80 8C630024 */ lw $v1, 0x24($v1) -/* DCD954 80240C84 AFA30024 */ sw $v1, 0x24($sp) -/* DCD958 80240C88 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD95C 80240C8C 8C630028 */ lw $v1, 0x28($v1) -/* DCD960 80240C90 27B50018 */ addiu $s5, $sp, 0x18 -/* DCD964 80240C94 AFA30028 */ sw $v1, 0x28($sp) -/* DCD968 80240C98 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCD96C 80240C9C 3C014282 */ lui $at, 0x4282 -/* DCD970 80240CA0 44810000 */ mtc1 $at, $f0 -/* DCD974 80240CA4 8C63002C */ lw $v1, 0x2c($v1) -/* DCD978 80240CA8 0040A02D */ daddu $s4, $v0, $zero -/* DCD97C 80240CAC E7A00030 */ swc1 $f0, 0x30($sp) -/* DCD980 80240CB0 A7A00034 */ sh $zero, 0x34($sp) -/* DCD984 80240CB4 16000005 */ bnez $s0, .L80240CCC -/* DCD988 80240CB8 AFA3002C */ sw $v1, 0x2c($sp) -/* DCD98C 80240CBC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCD990 80240CC0 30420004 */ andi $v0, $v0, 4 -/* DCD994 80240CC4 10400044 */ beqz $v0, .L80240DD8 -/* DCD998 80240CC8 00000000 */ nop -.L80240CCC: -/* DCD99C 80240CCC 2404F7FF */ addiu $a0, $zero, -0x801 -/* DCD9A0 80240CD0 AE600070 */ sw $zero, 0x70($s3) -/* DCD9A4 80240CD4 A640008E */ sh $zero, 0x8e($s2) -/* DCD9A8 80240CD8 8E2200CC */ lw $v0, 0xcc($s1) -/* DCD9AC 80240CDC 8E430000 */ lw $v1, ($s2) -/* DCD9B0 80240CE0 8C420000 */ lw $v0, ($v0) -/* DCD9B4 80240CE4 00641824 */ and $v1, $v1, $a0 -/* DCD9B8 80240CE8 AE430000 */ sw $v1, ($s2) -/* DCD9BC 80240CEC AE420028 */ sw $v0, 0x28($s2) -/* DCD9C0 80240CF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DCD9C4 80240CF4 8C420034 */ lw $v0, 0x34($v0) -/* DCD9C8 80240CF8 54400005 */ bnel $v0, $zero, .L80240D10 -/* DCD9CC 80240CFC 2402FDFF */ addiu $v0, $zero, -0x201 -/* DCD9D0 80240D00 34620200 */ ori $v0, $v1, 0x200 -/* DCD9D4 80240D04 2403FFF7 */ addiu $v1, $zero, -9 -/* DCD9D8 80240D08 08090346 */ j .L80240D18 -/* DCD9DC 80240D0C 00431024 */ and $v0, $v0, $v1 -.L80240D10: -/* DCD9E0 80240D10 00621024 */ and $v0, $v1, $v0 -/* DCD9E4 80240D14 34420008 */ ori $v0, $v0, 8 -.L80240D18: -/* DCD9E8 80240D18 AE420000 */ sw $v0, ($s2) -/* DCD9EC 80240D1C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCD9F0 80240D20 30420004 */ andi $v0, $v0, 4 -/* DCD9F4 80240D24 10400004 */ beqz $v0, .L80240D38 -/* DCD9F8 80240D28 24020063 */ addiu $v0, $zero, 0x63 -/* DCD9FC 80240D2C AE620070 */ sw $v0, 0x70($s3) -/* DCDA00 80240D30 08090354 */ j .L80240D50 -/* DCDA04 80240D34 AE600074 */ sw $zero, 0x74($s3) -.L80240D38: -/* DCDA08 80240D38 8E220000 */ lw $v0, ($s1) -/* DCDA0C 80240D3C 3C034000 */ lui $v1, 0x4000 -/* DCDA10 80240D40 00431024 */ and $v0, $v0, $v1 -/* DCDA14 80240D44 10400002 */ beqz $v0, .L80240D50 -/* DCDA18 80240D48 2402000C */ addiu $v0, $zero, 0xc -/* DCDA1C 80240D4C AE620070 */ sw $v0, 0x70($s3) -.L80240D50: -/* DCDA20 80240D50 3C06BFFF */ lui $a2, 0xbfff -/* DCDA24 80240D54 34C6FFFF */ ori $a2, $a2, 0xffff -/* DCDA28 80240D58 27A50038 */ addiu $a1, $sp, 0x38 -/* DCDA2C 80240D5C 2404FFFB */ addiu $a0, $zero, -5 -/* DCDA30 80240D60 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCDA34 80240D64 8E230000 */ lw $v1, ($s1) -/* DCDA38 80240D68 3C0142C8 */ lui $at, 0x42c8 -/* DCDA3C 80240D6C 44810000 */ mtc1 $at, $f0 -/* DCDA40 80240D70 00441024 */ and $v0, $v0, $a0 -/* DCDA44 80240D74 00661824 */ and $v1, $v1, $a2 -/* DCDA48 80240D78 AE2200B0 */ sw $v0, 0xb0($s1) -/* DCDA4C 80240D7C AE230000 */ sw $v1, ($s1) -/* DCDA50 80240D80 864200A8 */ lh $v0, 0xa8($s2) -/* DCDA54 80240D84 27A70040 */ addiu $a3, $sp, 0x40 -/* DCDA58 80240D88 E7A00044 */ swc1 $f0, 0x44($sp) -/* DCDA5C 80240D8C C6460038 */ lwc1 $f6, 0x38($s2) -/* DCDA60 80240D90 C640003C */ lwc1 $f0, 0x3c($s2) -/* DCDA64 80240D94 C6420040 */ lwc1 $f2, 0x40($s2) -/* DCDA68 80240D98 44822000 */ mtc1 $v0, $f4 -/* DCDA6C 80240D9C 00000000 */ nop -/* DCDA70 80240DA0 46802120 */ cvt.s.w $f4, $f4 -/* DCDA74 80240DA4 27A20044 */ addiu $v0, $sp, 0x44 -/* DCDA78 80240DA8 46040000 */ add.s $f0, $f0, $f4 -/* DCDA7C 80240DAC E7A60038 */ swc1 $f6, 0x38($sp) -/* DCDA80 80240DB0 E7A20040 */ swc1 $f2, 0x40($sp) -/* DCDA84 80240DB4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DCDA88 80240DB8 AFA20010 */ sw $v0, 0x10($sp) -/* DCDA8C 80240DBC 8E440080 */ lw $a0, 0x80($s2) -/* DCDA90 80240DC0 0C0372DF */ jal npc_raycast_down_sides -/* DCDA94 80240DC4 27A6003C */ addiu $a2, $sp, 0x3c -/* DCDA98 80240DC8 10400003 */ beqz $v0, .L80240DD8 -/* DCDA9C 80240DCC 00000000 */ nop -/* DCDAA0 80240DD0 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DCDAA4 80240DD4 E640003C */ swc1 $f0, 0x3c($s2) -.L80240DD8: -/* DCDAA8 80240DD8 8E630070 */ lw $v1, 0x70($s3) -/* DCDAAC 80240DDC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCDAB0 80240DE0 10400050 */ beqz $v0, .L80240F24_DCDBF4 -/* DCDAB4 80240DE4 00031080 */ sll $v0, $v1, 2 -/* DCDAB8 80240DE8 3C018025 */ lui $at, %hi(jtbl_8024A640_DD7310) -/* DCDABC 80240DEC 00220821 */ addu $at, $at, $v0 -/* DCDAC0 80240DF0 8C22A640 */ lw $v0, %lo(jtbl_8024A640_DD7310)($at) -/* DCDAC4 80240DF4 00400008 */ jr $v0 -/* DCDAC8 80240DF8 00000000 */ nop -.L80240DFC_DCDACC: -/* DCDACC 80240DFC 0260202D */ daddu $a0, $s3, $zero -/* DCDAD0 80240E00 0280282D */ daddu $a1, $s4, $zero -/* DCDAD4 80240E04 0C012568 */ jal func_800495A0 -/* DCDAD8 80240E08 02A0302D */ daddu $a2, $s5, $zero -.L80240E0C_DCDADC: -/* DCDADC 80240E0C 0260202D */ daddu $a0, $s3, $zero -/* DCDAE0 80240E10 0280282D */ daddu $a1, $s4, $zero -/* DCDAE4 80240E14 0C0125AE */ jal func_800496B8 -/* DCDAE8 80240E18 02A0302D */ daddu $a2, $s5, $zero -/* DCDAEC 80240E1C 080903C9 */ j .L80240F24_DCDBF4 -/* DCDAF0 80240E20 00000000 */ nop -.L80240E24_DCDAF4: -/* DCDAF4 80240E24 0260202D */ daddu $a0, $s3, $zero -/* DCDAF8 80240E28 0280282D */ daddu $a1, $s4, $zero -/* DCDAFC 80240E2C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DCDB00 80240E30 02A0302D */ daddu $a2, $s5, $zero -.L80240E34_DCDB04: -/* DCDB04 80240E34 0260202D */ daddu $a0, $s3, $zero -/* DCDB08 80240E38 0280282D */ daddu $a1, $s4, $zero -/* DCDB0C 80240E3C 0C012701 */ jal func_80049C04 -/* DCDB10 80240E40 02A0302D */ daddu $a2, $s5, $zero -/* DCDB14 80240E44 080903C9 */ j .L80240F24_DCDBF4 -/* DCDB18 80240E48 00000000 */ nop -.L80240E4C_DCDB1C: -/* DCDB1C 80240E4C 0260202D */ daddu $a0, $s3, $zero -/* DCDB20 80240E50 0280282D */ daddu $a1, $s4, $zero -/* DCDB24 80240E54 0C01278F */ jal func_80049E3C -/* DCDB28 80240E58 02A0302D */ daddu $a2, $s5, $zero -.L80240E5C_DCDB2C: -/* DCDB2C 80240E5C 0260202D */ daddu $a0, $s3, $zero -/* DCDB30 80240E60 0280282D */ daddu $a1, $s4, $zero -/* DCDB34 80240E64 0C0127B3 */ jal func_80049ECC -/* DCDB38 80240E68 02A0302D */ daddu $a2, $s5, $zero -/* DCDB3C 80240E6C 080903C9 */ j .L80240F24_DCDBF4 -/* DCDB40 80240E70 00000000 */ nop -.L80240E74_DCDB44: -/* DCDB44 80240E74 0260202D */ daddu $a0, $s3, $zero -/* DCDB48 80240E78 0280282D */ daddu $a1, $s4, $zero -/* DCDB4C 80240E7C 0C0127DF */ jal func_80049F7C -/* DCDB50 80240E80 02A0302D */ daddu $a2, $s5, $zero -.L80240E84_DCDB54: -/* DCDB54 80240E84 0260202D */ daddu $a0, $s3, $zero -/* DCDB58 80240E88 0280282D */ daddu $a1, $s4, $zero -/* DCDB5C 80240E8C 0C012849 */ jal func_8004A124 -/* DCDB60 80240E90 02A0302D */ daddu $a2, $s5, $zero -/* DCDB64 80240E94 8E630070 */ lw $v1, 0x70($s3) -/* DCDB68 80240E98 2402000E */ addiu $v0, $zero, 0xe -/* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, .L80240F24_DCDBF4 -/* DCDB70 80240EA0 00000000 */ nop -.L80240EA4_DCDB74: -/* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero -/* DCDB78 80240EA8 0280282D */ daddu $a1, $s4, $zero -/* DCDB7C 80240EAC 0C090278 */ jal func_802409E0_DCD6B0 -/* DCDB80 80240EB0 02A0302D */ daddu $a2, $s5, $zero -/* DCDB84 80240EB4 8E630070 */ lw $v1, 0x70($s3) -/* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf -/* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, .L80240F24_DCDBF4 -/* DCDB90 80240EC0 00000000 */ nop -.L80240EC4_DCDB94: -/* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero -/* DCDB98 80240EC8 0280282D */ daddu $a1, $s4, $zero -/* DCDB9C 80240ECC 0C090294 */ jal func_80240A50_DCD720 -/* DCDBA0 80240ED0 02A0302D */ daddu $a2, $s5, $zero -/* DCDBA4 80240ED4 8E630070 */ lw $v1, 0x70($s3) -/* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 -/* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, .L80240F24_DCDBF4 -/* DCDBB0 80240EE0 00000000 */ nop -.L80240EE4_DCDBB4: -/* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero -/* DCDBB8 80240EE8 0280282D */ daddu $a1, $s4, $zero -/* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20_DCD7F0 -/* DCDBC0 80240EF0 02A0302D */ daddu $a2, $s5, $zero -/* DCDBC4 80240EF4 8E630070 */ lw $v1, 0x70($s3) -/* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 -/* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, .L80240F24_DCDBF4 -/* DCDBD0 80240F00 00000000 */ nop -.L80240F04_DCDBD4: -/* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero -/* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero -/* DCDBDC 80240F0C 0C0902EE */ jal omo_09_UnkNpcDurationAnimationFunc -/* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero -/* DCDBE4 80240F14 080903C9 */ j .L80240F24_DCDBF4 -/* DCDBE8 80240F18 00000000 */ nop -.L80240F1C_DCDBEC: -/* DCDBEC 80240F1C 0C0129CF */ jal func_8004A73C -/* DCDBF0 80240F20 0260202D */ daddu $a0, $s3, $zero -.L80240F24_DCDBF4: -/* DCDBF4 80240F24 8FBF0060 */ lw $ra, 0x60($sp) -/* DCDBF8 80240F28 8FB5005C */ lw $s5, 0x5c($sp) -/* DCDBFC 80240F2C 8FB40058 */ lw $s4, 0x58($sp) -/* DCDC00 80240F30 8FB30054 */ lw $s3, 0x54($sp) -/* DCDC04 80240F34 8FB20050 */ lw $s2, 0x50($sp) -/* DCDC08 80240F38 8FB1004C */ lw $s1, 0x4c($sp) -/* DCDC0C 80240F3C 8FB00048 */ lw $s0, 0x48($sp) -/* DCDC10 80240F40 0000102D */ daddu $v0, $zero, $zero -/* DCDC14 80240F44 03E00008 */ jr $ra -/* DCDC18 80240F48 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s deleted file mode 100644 index f2b8da3765..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024A970_DD7640 -.double 0.6 - -.section .text - -glabel func_80241DDC_DCEAAC -/* DCEAAC 80241DDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCEAB0 80241DE0 AFB10014 */ sw $s1, 0x14($sp) -/* DCEAB4 80241DE4 0080882D */ daddu $s1, $a0, $zero -/* DCEAB8 80241DE8 AFBF0018 */ sw $ra, 0x18($sp) -/* DCEABC 80241DEC AFB00010 */ sw $s0, 0x10($sp) -/* DCEAC0 80241DF0 8E300148 */ lw $s0, 0x148($s1) -/* DCEAC4 80241DF4 0C00EABB */ jal get_npc_unsafe -/* DCEAC8 80241DF8 86040008 */ lh $a0, 8($s0) -/* DCEACC 80241DFC C4400018 */ lwc1 $f0, 0x18($v0) -/* DCEAD0 80241E00 3C018025 */ lui $at, %hi(D_8024A970_DD7640) -/* DCEAD4 80241E04 D422A970 */ ldc1 $f2, %lo(D_8024A970_DD7640)($at) -/* DCEAD8 80241E08 46000021 */ cvt.d.s $f0, $f0 -/* DCEADC 80241E0C 46220002 */ mul.d $f0, $f0, $f2 -/* DCEAE0 80241E10 00000000 */ nop -/* DCEAE4 80241E14 46200020 */ cvt.s.d $f0, $f0 -/* DCEAE8 80241E18 E4400018 */ swc1 $f0, 0x18($v0) -/* DCEAEC 80241E1C 8E0300CC */ lw $v1, 0xcc($s0) -/* DCEAF0 80241E20 8C640030 */ lw $a0, 0x30($v1) -/* DCEAF4 80241E24 24030005 */ addiu $v1, $zero, 5 -/* DCEAF8 80241E28 A443008E */ sh $v1, 0x8e($v0) -/* DCEAFC 80241E2C AC440028 */ sw $a0, 0x28($v0) -/* DCEB00 80241E30 2402000F */ addiu $v0, $zero, 0xf -/* DCEB04 80241E34 AE220070 */ sw $v0, 0x70($s1) -/* DCEB08 80241E38 8FBF0018 */ lw $ra, 0x18($sp) -/* DCEB0C 80241E3C 8FB10014 */ lw $s1, 0x14($sp) -/* DCEB10 80241E40 8FB00010 */ lw $s0, 0x10($sp) -/* DCEB14 80241E44 03E00008 */ jr $ra -/* DCEB18 80241E48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s deleted file mode 100644 index 77464e2c1a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024A978_DD7648 -.double 0.6 - -.section .text - -glabel func_80241E4C_DCEB1C -/* DCEB1C 80241E4C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCEB20 80241E50 AFB20028 */ sw $s2, 0x28($sp) -/* DCEB24 80241E54 0080902D */ daddu $s2, $a0, $zero -/* DCEB28 80241E58 AFBF002C */ sw $ra, 0x2c($sp) -/* DCEB2C 80241E5C AFB10024 */ sw $s1, 0x24($sp) -/* DCEB30 80241E60 AFB00020 */ sw $s0, 0x20($sp) -/* DCEB34 80241E64 8E510148 */ lw $s1, 0x148($s2) -/* DCEB38 80241E68 0C00EABB */ jal get_npc_unsafe -/* DCEB3C 80241E6C 86240008 */ lh $a0, 8($s1) -/* DCEB40 80241E70 0040802D */ daddu $s0, $v0, $zero -/* DCEB44 80241E74 0200202D */ daddu $a0, $s0, $zero -/* DCEB48 80241E78 C600000C */ lwc1 $f0, 0xc($s0) -/* DCEB4C 80241E7C 27A60018 */ addiu $a2, $sp, 0x18 -/* DCEB50 80241E80 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCEB54 80241E84 AFA00010 */ sw $zero, 0x10($sp) -/* DCEB58 80241E88 AFA00014 */ sw $zero, 0x14($sp) -/* DCEB5C 80241E8C 8E050018 */ lw $a1, 0x18($s0) -/* DCEB60 80241E90 0C0129E1 */ jal func_8004A784 -/* DCEB64 80241E94 0000382D */ daddu $a3, $zero, $zero -/* DCEB68 80241E98 14400005 */ bnez $v0, .L80241EB0 -/* DCEB6C 80241E9C 00000000 */ nop -/* DCEB70 80241EA0 8E050018 */ lw $a1, 0x18($s0) -/* DCEB74 80241EA4 8E06000C */ lw $a2, 0xc($s0) -/* DCEB78 80241EA8 0C00EA95 */ jal npc_move_heading -/* DCEB7C 80241EAC 0200202D */ daddu $a0, $s0, $zero -.L80241EB0: -/* DCEB80 80241EB0 9602008E */ lhu $v0, 0x8e($s0) -/* DCEB84 80241EB4 2442FFFF */ addiu $v0, $v0, -1 -/* DCEB88 80241EB8 A602008E */ sh $v0, 0x8e($s0) -/* DCEB8C 80241EBC 00021400 */ sll $v0, $v0, 0x10 -/* DCEB90 80241EC0 14400010 */ bnez $v0, .L80241F04 -/* DCEB94 80241EC4 00000000 */ nop -/* DCEB98 80241EC8 C6000018 */ lwc1 $f0, 0x18($s0) -/* DCEB9C 80241ECC 3C018025 */ lui $at, %hi(D_8024A978_DD7648) -/* DCEBA0 80241ED0 D422A978 */ ldc1 $f2, %lo(D_8024A978_DD7648)($at) -/* DCEBA4 80241ED4 46000021 */ cvt.d.s $f0, $f0 -/* DCEBA8 80241ED8 46220002 */ mul.d $f0, $f0, $f2 -/* DCEBAC 80241EDC 00000000 */ nop -/* DCEBB0 80241EE0 46200020 */ cvt.s.d $f0, $f0 -/* DCEBB4 80241EE4 E6000018 */ swc1 $f0, 0x18($s0) -/* DCEBB8 80241EE8 8E2200CC */ lw $v0, 0xcc($s1) -/* DCEBBC 80241EEC 8C43002C */ lw $v1, 0x2c($v0) -/* DCEBC0 80241EF0 2402000A */ addiu $v0, $zero, 0xa -/* DCEBC4 80241EF4 A602008E */ sh $v0, 0x8e($s0) -/* DCEBC8 80241EF8 24020010 */ addiu $v0, $zero, 0x10 -/* DCEBCC 80241EFC AE030028 */ sw $v1, 0x28($s0) -/* DCEBD0 80241F00 AE420070 */ sw $v0, 0x70($s2) -.L80241F04: -/* DCEBD4 80241F04 8FBF002C */ lw $ra, 0x2c($sp) -/* DCEBD8 80241F08 8FB20028 */ lw $s2, 0x28($sp) -/* DCEBDC 80241F0C 8FB10024 */ lw $s1, 0x24($sp) -/* DCEBE0 80241F10 8FB00020 */ lw $s0, 0x20($sp) -/* DCEBE4 80241F14 03E00008 */ jr $ra -/* DCEBE8 80241F18 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s deleted file mode 100644 index 823ed077a1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F1C_DCEBEC -/* DCEBEC 80241F1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCEBF0 80241F20 AFB10024 */ sw $s1, 0x24($sp) -/* DCEBF4 80241F24 0080882D */ daddu $s1, $a0, $zero -/* DCEBF8 80241F28 AFBF0028 */ sw $ra, 0x28($sp) -/* DCEBFC 80241F2C AFB00020 */ sw $s0, 0x20($sp) -/* DCEC00 80241F30 8E220148 */ lw $v0, 0x148($s1) -/* DCEC04 80241F34 0C00EABB */ jal get_npc_unsafe -/* DCEC08 80241F38 84440008 */ lh $a0, 8($v0) -/* DCEC0C 80241F3C 0040802D */ daddu $s0, $v0, $zero -/* DCEC10 80241F40 0200202D */ daddu $a0, $s0, $zero -/* DCEC14 80241F44 C600000C */ lwc1 $f0, 0xc($s0) -/* DCEC18 80241F48 27A60018 */ addiu $a2, $sp, 0x18 -/* DCEC1C 80241F4C E7A00018 */ swc1 $f0, 0x18($sp) -/* DCEC20 80241F50 AFA00010 */ sw $zero, 0x10($sp) -/* DCEC24 80241F54 AFA00014 */ sw $zero, 0x14($sp) -/* DCEC28 80241F58 8E050018 */ lw $a1, 0x18($s0) -/* DCEC2C 80241F5C 0C0129E1 */ jal func_8004A784 -/* DCEC30 80241F60 0000382D */ daddu $a3, $zero, $zero -/* DCEC34 80241F64 14400005 */ bnez $v0, .L80241F7C -/* DCEC38 80241F68 00000000 */ nop -/* DCEC3C 80241F6C 8E050018 */ lw $a1, 0x18($s0) -/* DCEC40 80241F70 8E06000C */ lw $a2, 0xc($s0) -/* DCEC44 80241F74 0C00EA95 */ jal npc_move_heading -/* DCEC48 80241F78 0200202D */ daddu $a0, $s0, $zero -.L80241F7C: -/* DCEC4C 80241F7C 9602008E */ lhu $v0, 0x8e($s0) -/* DCEC50 80241F80 2442FFFF */ addiu $v0, $v0, -1 -/* DCEC54 80241F84 A602008E */ sh $v0, 0x8e($s0) -/* DCEC58 80241F88 00021400 */ sll $v0, $v0, 0x10 -/* DCEC5C 80241F8C 14400004 */ bnez $v0, .L80241FA0 -/* DCEC60 80241F90 2402001E */ addiu $v0, $zero, 0x1e -/* DCEC64 80241F94 A602008E */ sh $v0, 0x8e($s0) -/* DCEC68 80241F98 24020011 */ addiu $v0, $zero, 0x11 -/* DCEC6C 80241F9C AE220070 */ sw $v0, 0x70($s1) -.L80241FA0: -/* DCEC70 80241FA0 8FBF0028 */ lw $ra, 0x28($sp) -/* DCEC74 80241FA4 8FB10024 */ lw $s1, 0x24($sp) -/* DCEC78 80241FA8 8FB00020 */ lw $s0, 0x20($sp) -/* DCEC7C 80241FAC 03E00008 */ jr $ra -/* DCEC80 80241FB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s deleted file mode 100644 index e51a7eda16..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ /dev/null @@ -1,241 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8024A980_DD7650 -.word .L802421F8_DCEEC8, .L80242208_DCEED8, .L80242220_DCEEF0, .L80242230_DCEF00, .L80242248_DCEF18, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242260_DCEF30, .L80242270_DCEF40, .L80242288_DCEF58, .L80242298_DCEF68, .L802422B0_DCEF80, .L802422D0_DCEFA0, .L802422F0_DCEFC0, .L80242310_DCEFE0, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242330_DCF000, .L80242328_DCEFF8 - -.section .text - -glabel func_80242014_DCECE4 -/* DCECE4 80242014 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DCECE8 80242018 AFB30054 */ sw $s3, 0x54($sp) -/* DCECEC 8024201C 0080982D */ daddu $s3, $a0, $zero -/* DCECF0 80242020 AFBF0060 */ sw $ra, 0x60($sp) -/* DCECF4 80242024 AFB5005C */ sw $s5, 0x5c($sp) -/* DCECF8 80242028 AFB40058 */ sw $s4, 0x58($sp) -/* DCECFC 8024202C AFB20050 */ sw $s2, 0x50($sp) -/* DCED00 80242030 AFB1004C */ sw $s1, 0x4c($sp) -/* DCED04 80242034 AFB00048 */ sw $s0, 0x48($sp) -/* DCED08 80242038 8E710148 */ lw $s1, 0x148($s3) -/* DCED0C 8024203C 86240008 */ lh $a0, 8($s1) -/* DCED10 80242040 0C00EABB */ jal get_npc_unsafe -/* DCED14 80242044 00A0802D */ daddu $s0, $a1, $zero -/* DCED18 80242048 8E63000C */ lw $v1, 0xc($s3) -/* DCED1C 8024204C 0260202D */ daddu $a0, $s3, $zero -/* DCED20 80242050 8C650000 */ lw $a1, ($v1) -/* DCED24 80242054 0C0B1EAF */ jal evt_get_variable -/* DCED28 80242058 0040902D */ daddu $s2, $v0, $zero -/* DCED2C 8024205C AFA00018 */ sw $zero, 0x18($sp) -/* DCED30 80242060 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED34 80242064 8C630094 */ lw $v1, 0x94($v1) -/* DCED38 80242068 AFA3001C */ sw $v1, 0x1c($sp) -/* DCED3C 8024206C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED40 80242070 8C630080 */ lw $v1, 0x80($v1) -/* DCED44 80242074 AFA30020 */ sw $v1, 0x20($sp) -/* DCED48 80242078 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED4C 8024207C 8C630088 */ lw $v1, 0x88($v1) -/* DCED50 80242080 AFA30024 */ sw $v1, 0x24($sp) -/* DCED54 80242084 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED58 80242088 8C63008C */ lw $v1, 0x8c($v1) -/* DCED5C 8024208C 27B50018 */ addiu $s5, $sp, 0x18 -/* DCED60 80242090 AFA30028 */ sw $v1, 0x28($sp) -/* DCED64 80242094 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCED68 80242098 3C014282 */ lui $at, 0x4282 -/* DCED6C 8024209C 44810000 */ mtc1 $at, $f0 -/* DCED70 802420A0 8C630090 */ lw $v1, 0x90($v1) -/* DCED74 802420A4 0040A02D */ daddu $s4, $v0, $zero -/* DCED78 802420A8 E7A00030 */ swc1 $f0, 0x30($sp) -/* DCED7C 802420AC A7A00034 */ sh $zero, 0x34($sp) -/* DCED80 802420B0 16000005 */ bnez $s0, .L802420C8 -/* DCED84 802420B4 AFA3002C */ sw $v1, 0x2c($sp) -/* DCED88 802420B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCED8C 802420BC 30420004 */ andi $v0, $v0, 4 -/* DCED90 802420C0 10400044 */ beqz $v0, .L802421D4 -/* DCED94 802420C4 00000000 */ nop -.L802420C8: -/* DCED98 802420C8 2404F7FF */ addiu $a0, $zero, -0x801 -/* DCED9C 802420CC AE600070 */ sw $zero, 0x70($s3) -/* DCEDA0 802420D0 A640008E */ sh $zero, 0x8e($s2) -/* DCEDA4 802420D4 8E2200CC */ lw $v0, 0xcc($s1) -/* DCEDA8 802420D8 8E430000 */ lw $v1, ($s2) -/* DCEDAC 802420DC 8C420000 */ lw $v0, ($v0) -/* DCEDB0 802420E0 00641824 */ and $v1, $v1, $a0 -/* DCEDB4 802420E4 AE430000 */ sw $v1, ($s2) -/* DCEDB8 802420E8 AE420028 */ sw $v0, 0x28($s2) -/* DCEDBC 802420EC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DCEDC0 802420F0 8C420098 */ lw $v0, 0x98($v0) -/* DCEDC4 802420F4 54400005 */ bnel $v0, $zero, .L8024210C -/* DCEDC8 802420F8 2402FDFF */ addiu $v0, $zero, -0x201 -/* DCEDCC 802420FC 34620200 */ ori $v0, $v1, 0x200 -/* DCEDD0 80242100 2403FFF7 */ addiu $v1, $zero, -9 -/* DCEDD4 80242104 08090845 */ j .L80242114 -/* DCEDD8 80242108 00431024 */ and $v0, $v0, $v1 -.L8024210C: -/* DCEDDC 8024210C 00621024 */ and $v0, $v1, $v0 -/* DCEDE0 80242110 34420008 */ ori $v0, $v0, 8 -.L80242114: -/* DCEDE4 80242114 AE420000 */ sw $v0, ($s2) -/* DCEDE8 80242118 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCEDEC 8024211C 30420004 */ andi $v0, $v0, 4 -/* DCEDF0 80242120 10400008 */ beqz $v0, .L80242144 -/* DCEDF4 80242124 24020063 */ addiu $v0, $zero, 0x63 -/* DCEDF8 80242128 AE620070 */ sw $v0, 0x70($s3) -/* DCEDFC 8024212C AE600074 */ sw $zero, 0x74($s3) -/* DCEE00 80242130 8E2200B0 */ lw $v0, 0xb0($s1) -/* DCEE04 80242134 2403FFFB */ addiu $v1, $zero, -5 -/* DCEE08 80242138 00431024 */ and $v0, $v0, $v1 -/* DCEE0C 8024213C 0809085C */ j .L80242170 -/* DCEE10 80242140 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242144: -/* DCEE14 80242144 8E220000 */ lw $v0, ($s1) -/* DCEE18 80242148 3C034000 */ lui $v1, 0x4000 -/* DCEE1C 8024214C 00431024 */ and $v0, $v0, $v1 -/* DCEE20 80242150 10400007 */ beqz $v0, .L80242170 -/* DCEE24 80242154 3C03BFFF */ lui $v1, 0xbfff -/* DCEE28 80242158 2402000C */ addiu $v0, $zero, 0xc -/* DCEE2C 8024215C AE620070 */ sw $v0, 0x70($s3) -/* DCEE30 80242160 8E220000 */ lw $v0, ($s1) -/* DCEE34 80242164 3463FFFF */ ori $v1, $v1, 0xffff -/* DCEE38 80242168 00431024 */ and $v0, $v0, $v1 -/* DCEE3C 8024216C AE220000 */ sw $v0, ($s1) -.L80242170: -/* DCEE40 80242170 27A50038 */ addiu $a1, $sp, 0x38 -/* DCEE44 80242174 27A6003C */ addiu $a2, $sp, 0x3c -/* DCEE48 80242178 C6400038 */ lwc1 $f0, 0x38($s2) -/* DCEE4C 8024217C 864200A8 */ lh $v0, 0xa8($s2) -/* DCEE50 80242180 3C0142C8 */ lui $at, 0x42c8 -/* DCEE54 80242184 44812000 */ mtc1 $at, $f4 -/* DCEE58 80242188 44823000 */ mtc1 $v0, $f6 -/* DCEE5C 8024218C 00000000 */ nop -/* DCEE60 80242190 468031A0 */ cvt.s.w $f6, $f6 -/* DCEE64 80242194 27A20044 */ addiu $v0, $sp, 0x44 -/* DCEE68 80242198 E7A00038 */ swc1 $f0, 0x38($sp) -/* DCEE6C 8024219C C640003C */ lwc1 $f0, 0x3c($s2) -/* DCEE70 802421A0 C6420040 */ lwc1 $f2, 0x40($s2) -/* DCEE74 802421A4 46060000 */ add.s $f0, $f0, $f6 -/* DCEE78 802421A8 E7A40044 */ swc1 $f4, 0x44($sp) -/* DCEE7C 802421AC E7A20040 */ swc1 $f2, 0x40($sp) -/* DCEE80 802421B0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DCEE84 802421B4 AFA20010 */ sw $v0, 0x10($sp) -/* DCEE88 802421B8 8E440080 */ lw $a0, 0x80($s2) -/* DCEE8C 802421BC 0C0372DF */ jal npc_raycast_down_sides -/* DCEE90 802421C0 27A70040 */ addiu $a3, $sp, 0x40 -/* DCEE94 802421C4 10400003 */ beqz $v0, .L802421D4 -/* DCEE98 802421C8 00000000 */ nop -/* DCEE9C 802421CC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DCEEA0 802421D0 E640003C */ swc1 $f0, 0x3c($s2) -.L802421D4: -/* DCEEA4 802421D4 8E630070 */ lw $v1, 0x70($s3) -/* DCEEA8 802421D8 2C620064 */ sltiu $v0, $v1, 0x64 -/* DCEEAC 802421DC 10400054 */ beqz $v0, .L80242330_DCF000 -/* DCEEB0 802421E0 00031080 */ sll $v0, $v1, 2 -/* DCEEB4 802421E4 3C018025 */ lui $at, %hi(jtbl_8024A980_DD7650) -/* DCEEB8 802421E8 00220821 */ addu $at, $at, $v0 -/* DCEEBC 802421EC 8C22A980 */ lw $v0, %lo(jtbl_8024A980_DD7650)($at) -/* DCEEC0 802421F0 00400008 */ jr $v0 -/* DCEEC4 802421F4 00000000 */ nop -.L802421F8_DCEEC8: -/* DCEEC8 802421F8 0260202D */ daddu $a0, $s3, $zero -/* DCEECC 802421FC 0280282D */ daddu $a1, $s4, $zero -/* DCEED0 80242200 0C0903D3 */ jal omo_09_UnkNpcAIFunc24 -/* DCEED4 80242204 02A0302D */ daddu $a2, $s5, $zero -.L80242208_DCEED8: -/* DCEED8 80242208 0260202D */ daddu $a0, $s3, $zero -/* DCEEDC 8024220C 0280282D */ daddu $a1, $s4, $zero -/* DCEEE0 80242210 0C090429 */ jal omo_09_UnkFunc13 -/* DCEEE4 80242214 02A0302D */ daddu $a2, $s5, $zero -/* DCEEE8 80242218 080908CC */ j .L80242330_DCF000 -/* DCEEEC 8024221C 00000000 */ nop -.L80242220_DCEEF0: -/* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero -/* DCEEF4 80242224 0280282D */ daddu $a1, $s4, $zero -/* DCEEF8 80242228 0C0904D3 */ jal omo_09_UnkNpcAIFunc1 -/* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero -.L80242230_DCEF00: -/* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero -/* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero -/* DCEF08 80242238 0C090503 */ jal omo_09_UnkFunc14 -/* DCEF0C 8024223C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF10 80242240 080908CC */ j .L80242330_DCF000 -/* DCEF14 80242244 00000000 */ nop -.L80242248_DCEF18: -/* DCEF18 80242248 0260202D */ daddu $a0, $s3, $zero -/* DCEF1C 8024224C 0280282D */ daddu $a1, $s4, $zero -/* DCEF20 80242250 0C090572 */ jal omo_09_UnkNpcAIFunc25 -/* DCEF24 80242254 02A0302D */ daddu $a2, $s5, $zero -/* DCEF28 80242258 080908CC */ j .L80242330_DCF000 -/* DCEF2C 8024225C 00000000 */ nop -.L80242260_DCEF30: -/* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero -/* DCEF34 80242264 0280282D */ daddu $a1, $s4, $zero -/* DCEF38 80242268 0C09059F */ jal omo_09_NpcJumpFunc2 -/* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero -.L80242270_DCEF40: -/* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero -/* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero -/* DCEF48 80242278 0C0905BC */ jal omo_09_NpcJumpFunc -/* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero -/* DCEF50 80242280 080908CC */ j .L80242330_DCF000 -/* DCEF54 80242284 00000000 */ nop -.L80242288_DCEF58: -/* DCEF58 80242288 0260202D */ daddu $a0, $s3, $zero -/* DCEF5C 8024228C 0280282D */ daddu $a1, $s4, $zero -/* DCEF60 80242290 0C0905DA */ jal omo_09_UnkNpcAIFunc13 -/* DCEF64 80242294 02A0302D */ daddu $a2, $s5, $zero -.L80242298_DCEF68: -/* DCEF68 80242298 0260202D */ daddu $a0, $s3, $zero -/* DCEF6C 8024229C 0280282D */ daddu $a1, $s4, $zero -/* DCEF70 802422A0 0C090626 */ jal omo_09_UnkFunc15 -/* DCEF74 802422A4 02A0302D */ daddu $a2, $s5, $zero -/* DCEF78 802422A8 080908CC */ j .L80242330_DCF000 -/* DCEF7C 802422AC 00000000 */ nop -.L802422B0_DCEF80: -/* DCEF80 802422B0 0260202D */ daddu $a0, $s3, $zero -/* DCEF84 802422B4 0280282D */ daddu $a1, $s4, $zero -/* DCEF88 802422B8 0C090777 */ jal func_80241DDC_DCEAAC -/* DCEF8C 802422BC 02A0302D */ daddu $a2, $s5, $zero -/* DCEF90 802422C0 8E630070 */ lw $v1, 0x70($s3) -/* DCEF94 802422C4 2402000F */ addiu $v0, $zero, 0xf -/* DCEF98 802422C8 14620019 */ bne $v1, $v0, .L80242330_DCF000 -/* DCEF9C 802422CC 00000000 */ nop -.L802422D0_DCEFA0: -/* DCEFA0 802422D0 0260202D */ daddu $a0, $s3, $zero -/* DCEFA4 802422D4 0280282D */ daddu $a1, $s4, $zero -/* DCEFA8 802422D8 0C090793 */ jal func_80241E4C_DCEB1C -/* DCEFAC 802422DC 02A0302D */ daddu $a2, $s5, $zero -/* DCEFB0 802422E0 8E630070 */ lw $v1, 0x70($s3) -/* DCEFB4 802422E4 24020010 */ addiu $v0, $zero, 0x10 -/* DCEFB8 802422E8 14620011 */ bne $v1, $v0, .L80242330_DCF000 -/* DCEFBC 802422EC 00000000 */ nop -.L802422F0_DCEFC0: -/* DCEFC0 802422F0 0260202D */ daddu $a0, $s3, $zero -/* DCEFC4 802422F4 0280282D */ daddu $a1, $s4, $zero -/* DCEFC8 802422F8 0C0907C7 */ jal func_80241F1C_DCEBEC -/* DCEFCC 802422FC 02A0302D */ daddu $a2, $s5, $zero -/* DCEFD0 80242300 8E630070 */ lw $v1, 0x70($s3) -/* DCEFD4 80242304 24020011 */ addiu $v0, $zero, 0x11 -/* DCEFD8 80242308 14620009 */ bne $v1, $v0, .L80242330_DCF000 -/* DCEFDC 8024230C 00000000 */ nop -.L80242310_DCEFE0: -/* DCEFE0 80242310 0260202D */ daddu $a0, $s3, $zero -/* DCEFE4 80242314 0280282D */ daddu $a1, $s4, $zero -/* DCEFE8 80242318 0C0907ED */ jal dup_omo_09_UnkNpcDurationAnimationFunc -/* DCEFEC 8024231C 02A0302D */ daddu $a2, $s5, $zero -/* DCEFF0 80242320 080908CC */ j .L80242330_DCF000 -/* DCEFF4 80242324 00000000 */ nop -.L80242328_DCEFF8: -/* DCEFF8 80242328 0C0129CF */ jal func_8004A73C -/* DCEFFC 8024232C 0260202D */ daddu $a0, $s3, $zero -.L80242330_DCF000: -/* DCF000 80242330 8FBF0060 */ lw $ra, 0x60($sp) -/* DCF004 80242334 8FB5005C */ lw $s5, 0x5c($sp) -/* DCF008 80242338 8FB40058 */ lw $s4, 0x58($sp) -/* DCF00C 8024233C 8FB30054 */ lw $s3, 0x54($sp) -/* DCF010 80242340 8FB20050 */ lw $s2, 0x50($sp) -/* DCF014 80242344 8FB1004C */ lw $s1, 0x4c($sp) -/* DCF018 80242348 8FB00048 */ lw $s0, 0x48($sp) -/* DCF01C 8024234C 0000102D */ daddu $v0, $zero, $zero -/* DCF020 80242350 03E00008 */ jr $ra -/* DCF024 80242354 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s deleted file mode 100644 index 3c416c443f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242EE0_DE5370 -.double 0.6 - -.section .text - -glabel func_80240280_DE2710 -/* DE2710 80240280 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE2714 80240284 AFB10014 */ sw $s1, 0x14($sp) -/* DE2718 80240288 0080882D */ daddu $s1, $a0, $zero -/* DE271C 8024028C AFBF0018 */ sw $ra, 0x18($sp) -/* DE2720 80240290 AFB00010 */ sw $s0, 0x10($sp) -/* DE2724 80240294 8E300148 */ lw $s0, 0x148($s1) -/* DE2728 80240298 0C00EABB */ jal get_npc_unsafe -/* DE272C 8024029C 86040008 */ lh $a0, 8($s0) -/* DE2730 802402A0 C4400018 */ lwc1 $f0, 0x18($v0) -/* DE2734 802402A4 3C018024 */ lui $at, %hi(D_80242EE0_DE5370) -/* DE2738 802402A8 D4222EE0 */ ldc1 $f2, %lo(D_80242EE0_DE5370)($at) -/* DE273C 802402AC 46000021 */ cvt.d.s $f0, $f0 -/* DE2740 802402B0 46220002 */ mul.d $f0, $f0, $f2 -/* DE2744 802402B4 00000000 */ nop -/* DE2748 802402B8 46200020 */ cvt.s.d $f0, $f0 -/* DE274C 802402BC E4400018 */ swc1 $f0, 0x18($v0) -/* DE2750 802402C0 8E0300CC */ lw $v1, 0xcc($s0) -/* DE2754 802402C4 8C640030 */ lw $a0, 0x30($v1) -/* DE2758 802402C8 24030005 */ addiu $v1, $zero, 5 -/* DE275C 802402CC A443008E */ sh $v1, 0x8e($v0) -/* DE2760 802402D0 AC440028 */ sw $a0, 0x28($v0) -/* DE2764 802402D4 2402000F */ addiu $v0, $zero, 0xf -/* DE2768 802402D8 AE220070 */ sw $v0, 0x70($s1) -/* DE276C 802402DC 8FBF0018 */ lw $ra, 0x18($sp) -/* DE2770 802402E0 8FB10014 */ lw $s1, 0x14($sp) -/* DE2774 802402E4 8FB00010 */ lw $s0, 0x10($sp) -/* DE2778 802402E8 03E00008 */ jr $ra -/* DE277C 802402EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s deleted file mode 100644 index 9682fb7dac..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242EE8_DE5378 -.double 0.6 - -.section .text - -glabel func_802402F0_DE2780 -/* DE2780 802402F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DE2784 802402F4 AFB20028 */ sw $s2, 0x28($sp) -/* DE2788 802402F8 0080902D */ daddu $s2, $a0, $zero -/* DE278C 802402FC AFBF002C */ sw $ra, 0x2c($sp) -/* DE2790 80240300 AFB10024 */ sw $s1, 0x24($sp) -/* DE2794 80240304 AFB00020 */ sw $s0, 0x20($sp) -/* DE2798 80240308 8E510148 */ lw $s1, 0x148($s2) -/* DE279C 8024030C 0C00EABB */ jal get_npc_unsafe -/* DE27A0 80240310 86240008 */ lh $a0, 8($s1) -/* DE27A4 80240314 0040802D */ daddu $s0, $v0, $zero -/* DE27A8 80240318 0200202D */ daddu $a0, $s0, $zero -/* DE27AC 8024031C C600000C */ lwc1 $f0, 0xc($s0) -/* DE27B0 80240320 27A60018 */ addiu $a2, $sp, 0x18 -/* DE27B4 80240324 E7A00018 */ swc1 $f0, 0x18($sp) -/* DE27B8 80240328 AFA00010 */ sw $zero, 0x10($sp) -/* DE27BC 8024032C AFA00014 */ sw $zero, 0x14($sp) -/* DE27C0 80240330 8E050018 */ lw $a1, 0x18($s0) -/* DE27C4 80240334 0C0129E1 */ jal func_8004A784 -/* DE27C8 80240338 0000382D */ daddu $a3, $zero, $zero -/* DE27CC 8024033C 14400005 */ bnez $v0, .L80240354 -/* DE27D0 80240340 00000000 */ nop -/* DE27D4 80240344 8E050018 */ lw $a1, 0x18($s0) -/* DE27D8 80240348 8E06000C */ lw $a2, 0xc($s0) -/* DE27DC 8024034C 0C00EA95 */ jal npc_move_heading -/* DE27E0 80240350 0200202D */ daddu $a0, $s0, $zero -.L80240354: -/* DE27E4 80240354 9602008E */ lhu $v0, 0x8e($s0) -/* DE27E8 80240358 2442FFFF */ addiu $v0, $v0, -1 -/* DE27EC 8024035C A602008E */ sh $v0, 0x8e($s0) -/* DE27F0 80240360 00021400 */ sll $v0, $v0, 0x10 -/* DE27F4 80240364 14400010 */ bnez $v0, .L802403A8 -/* DE27F8 80240368 00000000 */ nop -/* DE27FC 8024036C C6000018 */ lwc1 $f0, 0x18($s0) -/* DE2800 80240370 3C018024 */ lui $at, %hi(D_80242EE8_DE5378) -/* DE2804 80240374 D4222EE8 */ ldc1 $f2, %lo(D_80242EE8_DE5378)($at) -/* DE2808 80240378 46000021 */ cvt.d.s $f0, $f0 -/* DE280C 8024037C 46220002 */ mul.d $f0, $f0, $f2 -/* DE2810 80240380 00000000 */ nop -/* DE2814 80240384 46200020 */ cvt.s.d $f0, $f0 -/* DE2818 80240388 E6000018 */ swc1 $f0, 0x18($s0) -/* DE281C 8024038C 8E2200CC */ lw $v0, 0xcc($s1) -/* DE2820 80240390 8C43002C */ lw $v1, 0x2c($v0) -/* DE2824 80240394 2402000A */ addiu $v0, $zero, 0xa -/* DE2828 80240398 A602008E */ sh $v0, 0x8e($s0) -/* DE282C 8024039C 24020010 */ addiu $v0, $zero, 0x10 -/* DE2830 802403A0 AE030028 */ sw $v1, 0x28($s0) -/* DE2834 802403A4 AE420070 */ sw $v0, 0x70($s2) -.L802403A8: -/* DE2838 802403A8 8FBF002C */ lw $ra, 0x2c($sp) -/* DE283C 802403AC 8FB20028 */ lw $s2, 0x28($sp) -/* DE2840 802403B0 8FB10024 */ lw $s1, 0x24($sp) -/* DE2844 802403B4 8FB00020 */ lw $s0, 0x20($sp) -/* DE2848 802403B8 03E00008 */ jr $ra -/* DE284C 802403BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s deleted file mode 100644 index 7b4fff1e63..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802403C0_DE2850.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C0_DE2850 -/* DE2850 802403C0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DE2854 802403C4 AFB10024 */ sw $s1, 0x24($sp) -/* DE2858 802403C8 0080882D */ daddu $s1, $a0, $zero -/* DE285C 802403CC AFBF0028 */ sw $ra, 0x28($sp) -/* DE2860 802403D0 AFB00020 */ sw $s0, 0x20($sp) -/* DE2864 802403D4 8E220148 */ lw $v0, 0x148($s1) -/* DE2868 802403D8 0C00EABB */ jal get_npc_unsafe -/* DE286C 802403DC 84440008 */ lh $a0, 8($v0) -/* DE2870 802403E0 0040802D */ daddu $s0, $v0, $zero -/* DE2874 802403E4 0200202D */ daddu $a0, $s0, $zero -/* DE2878 802403E8 C600000C */ lwc1 $f0, 0xc($s0) -/* DE287C 802403EC 27A60018 */ addiu $a2, $sp, 0x18 -/* DE2880 802403F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DE2884 802403F4 AFA00010 */ sw $zero, 0x10($sp) -/* DE2888 802403F8 AFA00014 */ sw $zero, 0x14($sp) -/* DE288C 802403FC 8E050018 */ lw $a1, 0x18($s0) -/* DE2890 80240400 0C0129E1 */ jal func_8004A784 -/* DE2894 80240404 0000382D */ daddu $a3, $zero, $zero -/* DE2898 80240408 14400005 */ bnez $v0, .L80240420 -/* DE289C 8024040C 00000000 */ nop -/* DE28A0 80240410 8E050018 */ lw $a1, 0x18($s0) -/* DE28A4 80240414 8E06000C */ lw $a2, 0xc($s0) -/* DE28A8 80240418 0C00EA95 */ jal npc_move_heading -/* DE28AC 8024041C 0200202D */ daddu $a0, $s0, $zero -.L80240420: -/* DE28B0 80240420 9602008E */ lhu $v0, 0x8e($s0) -/* DE28B4 80240424 2442FFFF */ addiu $v0, $v0, -1 -/* DE28B8 80240428 A602008E */ sh $v0, 0x8e($s0) -/* DE28BC 8024042C 00021400 */ sll $v0, $v0, 0x10 -/* DE28C0 80240430 14400004 */ bnez $v0, .L80240444 -/* DE28C4 80240434 2402001E */ addiu $v0, $zero, 0x1e -/* DE28C8 80240438 A602008E */ sh $v0, 0x8e($s0) -/* DE28CC 8024043C 24020011 */ addiu $v0, $zero, 0x11 -/* DE28D0 80240440 AE220070 */ sw $v0, 0x70($s1) -.L80240444: -/* DE28D4 80240444 8FBF0028 */ lw $ra, 0x28($sp) -/* DE28D8 80240448 8FB10024 */ lw $s1, 0x24($sp) -/* DE28DC 8024044C 8FB00020 */ lw $s0, 0x20($sp) -/* DE28E0 80240450 03E00008 */ jr $ra -/* DE28E4 80240454 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s deleted file mode 100644 index dc80171ede..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242EF0_DE5380 -.word .L8024069C_DE2B2C, .L802406AC_DE2B3C, .L802406C4_DE2B54, .L802406D4_DE2B64, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802406EC_DE2B7C, .L802406FC_DE2B8C, .L80240714_DE2BA4, .L80240724_DE2BB4, .L80240744_DE2BD4, .L80240764_DE2BF4, .L80240784_DE2C14, .L802407A4_DE2C34, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407C4_DE2C54, .L802407BC_DE2C4C - -.section .text - -glabel func_802404B8_DE2948 -/* DE2948 802404B8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DE294C 802404BC AFB30054 */ sw $s3, 0x54($sp) -/* DE2950 802404C0 0080982D */ daddu $s3, $a0, $zero -/* DE2954 802404C4 AFBF0060 */ sw $ra, 0x60($sp) -/* DE2958 802404C8 AFB5005C */ sw $s5, 0x5c($sp) -/* DE295C 802404CC AFB40058 */ sw $s4, 0x58($sp) -/* DE2960 802404D0 AFB20050 */ sw $s2, 0x50($sp) -/* DE2964 802404D4 AFB1004C */ sw $s1, 0x4c($sp) -/* DE2968 802404D8 AFB00048 */ sw $s0, 0x48($sp) -/* DE296C 802404DC 8E710148 */ lw $s1, 0x148($s3) -/* DE2970 802404E0 86240008 */ lh $a0, 8($s1) -/* DE2974 802404E4 0C00EABB */ jal get_npc_unsafe -/* DE2978 802404E8 00A0802D */ daddu $s0, $a1, $zero -/* DE297C 802404EC 8E63000C */ lw $v1, 0xc($s3) -/* DE2980 802404F0 0260202D */ daddu $a0, $s3, $zero -/* DE2984 802404F4 8C650000 */ lw $a1, ($v1) -/* DE2988 802404F8 0C0B1EAF */ jal evt_get_variable -/* DE298C 802404FC 0040902D */ daddu $s2, $v0, $zero -/* DE2990 80240500 AFA00018 */ sw $zero, 0x18($sp) -/* DE2994 80240504 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2998 80240508 8C630030 */ lw $v1, 0x30($v1) -/* DE299C 8024050C AFA3001C */ sw $v1, 0x1c($sp) -/* DE29A0 80240510 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29A4 80240514 8C63001C */ lw $v1, 0x1c($v1) -/* DE29A8 80240518 AFA30020 */ sw $v1, 0x20($sp) -/* DE29AC 8024051C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29B0 80240520 8C630024 */ lw $v1, 0x24($v1) -/* DE29B4 80240524 AFA30024 */ sw $v1, 0x24($sp) -/* DE29B8 80240528 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29BC 8024052C 8C630028 */ lw $v1, 0x28($v1) -/* DE29C0 80240530 27B50018 */ addiu $s5, $sp, 0x18 -/* DE29C4 80240534 AFA30028 */ sw $v1, 0x28($sp) -/* DE29C8 80240538 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE29CC 8024053C 3C014282 */ lui $at, 0x4282 -/* DE29D0 80240540 44810000 */ mtc1 $at, $f0 -/* DE29D4 80240544 8C63002C */ lw $v1, 0x2c($v1) -/* DE29D8 80240548 0040A02D */ daddu $s4, $v0, $zero -/* DE29DC 8024054C E7A00030 */ swc1 $f0, 0x30($sp) -/* DE29E0 80240550 A7A00034 */ sh $zero, 0x34($sp) -/* DE29E4 80240554 16000005 */ bnez $s0, .L8024056C -/* DE29E8 80240558 AFA3002C */ sw $v1, 0x2c($sp) -/* DE29EC 8024055C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE29F0 80240560 30420004 */ andi $v0, $v0, 4 -/* DE29F4 80240564 10400044 */ beqz $v0, .L80240678 -/* DE29F8 80240568 00000000 */ nop -.L8024056C: -/* DE29FC 8024056C 2404F7FF */ addiu $a0, $zero, -0x801 -/* DE2A00 80240570 AE600070 */ sw $zero, 0x70($s3) -/* DE2A04 80240574 A640008E */ sh $zero, 0x8e($s2) -/* DE2A08 80240578 8E2200CC */ lw $v0, 0xcc($s1) -/* DE2A0C 8024057C 8E430000 */ lw $v1, ($s2) -/* DE2A10 80240580 8C420000 */ lw $v0, ($v0) -/* DE2A14 80240584 00641824 */ and $v1, $v1, $a0 -/* DE2A18 80240588 AE430000 */ sw $v1, ($s2) -/* DE2A1C 8024058C AE420028 */ sw $v0, 0x28($s2) -/* DE2A20 80240590 8E2200D0 */ lw $v0, 0xd0($s1) -/* DE2A24 80240594 8C420034 */ lw $v0, 0x34($v0) -/* DE2A28 80240598 54400005 */ bnel $v0, $zero, .L802405B0 -/* DE2A2C 8024059C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DE2A30 802405A0 34620200 */ ori $v0, $v1, 0x200 -/* DE2A34 802405A4 2403FFF7 */ addiu $v1, $zero, -9 -/* DE2A38 802405A8 0809016E */ j .L802405B8 -/* DE2A3C 802405AC 00431024 */ and $v0, $v0, $v1 -.L802405B0: -/* DE2A40 802405B0 00621024 */ and $v0, $v1, $v0 -/* DE2A44 802405B4 34420008 */ ori $v0, $v0, 8 -.L802405B8: -/* DE2A48 802405B8 AE420000 */ sw $v0, ($s2) -/* DE2A4C 802405BC 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2A50 802405C0 30420004 */ andi $v0, $v0, 4 -/* DE2A54 802405C4 10400004 */ beqz $v0, .L802405D8 -/* DE2A58 802405C8 24020063 */ addiu $v0, $zero, 0x63 -/* DE2A5C 802405CC AE620070 */ sw $v0, 0x70($s3) -/* DE2A60 802405D0 0809017C */ j .L802405F0 -/* DE2A64 802405D4 AE600074 */ sw $zero, 0x74($s3) -.L802405D8: -/* DE2A68 802405D8 8E220000 */ lw $v0, ($s1) -/* DE2A6C 802405DC 3C034000 */ lui $v1, 0x4000 -/* DE2A70 802405E0 00431024 */ and $v0, $v0, $v1 -/* DE2A74 802405E4 10400002 */ beqz $v0, .L802405F0 -/* DE2A78 802405E8 2402000C */ addiu $v0, $zero, 0xc -/* DE2A7C 802405EC AE620070 */ sw $v0, 0x70($s3) -.L802405F0: -/* DE2A80 802405F0 3C06BFFF */ lui $a2, 0xbfff -/* DE2A84 802405F4 34C6FFFF */ ori $a2, $a2, 0xffff -/* DE2A88 802405F8 27A50038 */ addiu $a1, $sp, 0x38 -/* DE2A8C 802405FC 2404FFFB */ addiu $a0, $zero, -5 -/* DE2A90 80240600 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2A94 80240604 8E230000 */ lw $v1, ($s1) -/* DE2A98 80240608 3C0142C8 */ lui $at, 0x42c8 -/* DE2A9C 8024060C 44810000 */ mtc1 $at, $f0 -/* DE2AA0 80240610 00441024 */ and $v0, $v0, $a0 -/* DE2AA4 80240614 00661824 */ and $v1, $v1, $a2 -/* DE2AA8 80240618 AE2200B0 */ sw $v0, 0xb0($s1) -/* DE2AAC 8024061C AE230000 */ sw $v1, ($s1) -/* DE2AB0 80240620 864200A8 */ lh $v0, 0xa8($s2) -/* DE2AB4 80240624 27A70040 */ addiu $a3, $sp, 0x40 -/* DE2AB8 80240628 E7A00044 */ swc1 $f0, 0x44($sp) -/* DE2ABC 8024062C C6460038 */ lwc1 $f6, 0x38($s2) -/* DE2AC0 80240630 C640003C */ lwc1 $f0, 0x3c($s2) -/* DE2AC4 80240634 C6420040 */ lwc1 $f2, 0x40($s2) -/* DE2AC8 80240638 44822000 */ mtc1 $v0, $f4 -/* DE2ACC 8024063C 00000000 */ nop -/* DE2AD0 80240640 46802120 */ cvt.s.w $f4, $f4 -/* DE2AD4 80240644 27A20044 */ addiu $v0, $sp, 0x44 -/* DE2AD8 80240648 46040000 */ add.s $f0, $f0, $f4 -/* DE2ADC 8024064C E7A60038 */ swc1 $f6, 0x38($sp) -/* DE2AE0 80240650 E7A20040 */ swc1 $f2, 0x40($sp) -/* DE2AE4 80240654 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DE2AE8 80240658 AFA20010 */ sw $v0, 0x10($sp) -/* DE2AEC 8024065C 8E440080 */ lw $a0, 0x80($s2) -/* DE2AF0 80240660 0C0372DF */ jal npc_raycast_down_sides -/* DE2AF4 80240664 27A6003C */ addiu $a2, $sp, 0x3c -/* DE2AF8 80240668 10400003 */ beqz $v0, .L80240678 -/* DE2AFC 8024066C 00000000 */ nop -/* DE2B00 80240670 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DE2B04 80240674 E640003C */ swc1 $f0, 0x3c($s2) -.L80240678: -/* DE2B08 80240678 8E630070 */ lw $v1, 0x70($s3) -/* DE2B0C 8024067C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DE2B10 80240680 10400050 */ beqz $v0, .L802407C4_DE2C54 -/* DE2B14 80240684 00031080 */ sll $v0, $v1, 2 -/* DE2B18 80240688 3C018024 */ lui $at, %hi(jtbl_80242EF0_DE5380) -/* DE2B1C 8024068C 00220821 */ addu $at, $at, $v0 -/* DE2B20 80240690 8C222EF0 */ lw $v0, %lo(jtbl_80242EF0_DE5380)($at) -/* DE2B24 80240694 00400008 */ jr $v0 -/* DE2B28 80240698 00000000 */ nop -.L8024069C_DE2B2C: -/* DE2B2C 8024069C 0260202D */ daddu $a0, $s3, $zero -/* DE2B30 802406A0 0280282D */ daddu $a1, $s4, $zero -/* DE2B34 802406A4 0C012568 */ jal func_800495A0 -/* DE2B38 802406A8 02A0302D */ daddu $a2, $s5, $zero -.L802406AC_DE2B3C: -/* DE2B3C 802406AC 0260202D */ daddu $a0, $s3, $zero -/* DE2B40 802406B0 0280282D */ daddu $a1, $s4, $zero -/* DE2B44 802406B4 0C0125AE */ jal func_800496B8 -/* DE2B48 802406B8 02A0302D */ daddu $a2, $s5, $zero -/* DE2B4C 802406BC 080901F1 */ j .L802407C4_DE2C54 -/* DE2B50 802406C0 00000000 */ nop -.L802406C4_DE2B54: -/* DE2B54 802406C4 0260202D */ daddu $a0, $s3, $zero -/* DE2B58 802406C8 0280282D */ daddu $a1, $s4, $zero -/* DE2B5C 802406CC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DE2B60 802406D0 02A0302D */ daddu $a2, $s5, $zero -.L802406D4_DE2B64: -/* DE2B64 802406D4 0260202D */ daddu $a0, $s3, $zero -/* DE2B68 802406D8 0280282D */ daddu $a1, $s4, $zero -/* DE2B6C 802406DC 0C012701 */ jal func_80049C04 -/* DE2B70 802406E0 02A0302D */ daddu $a2, $s5, $zero -/* DE2B74 802406E4 080901F1 */ j .L802407C4_DE2C54 -/* DE2B78 802406E8 00000000 */ nop -.L802406EC_DE2B7C: -/* DE2B7C 802406EC 0260202D */ daddu $a0, $s3, $zero -/* DE2B80 802406F0 0280282D */ daddu $a1, $s4, $zero -/* DE2B84 802406F4 0C01278F */ jal func_80049E3C -/* DE2B88 802406F8 02A0302D */ daddu $a2, $s5, $zero -.L802406FC_DE2B8C: -/* DE2B8C 802406FC 0260202D */ daddu $a0, $s3, $zero -/* DE2B90 80240700 0280282D */ daddu $a1, $s4, $zero -/* DE2B94 80240704 0C0127B3 */ jal func_80049ECC -/* DE2B98 80240708 02A0302D */ daddu $a2, $s5, $zero -/* DE2B9C 8024070C 080901F1 */ j .L802407C4_DE2C54 -/* DE2BA0 80240710 00000000 */ nop -.L80240714_DE2BA4: -/* DE2BA4 80240714 0260202D */ daddu $a0, $s3, $zero -/* DE2BA8 80240718 0280282D */ daddu $a1, $s4, $zero -/* DE2BAC 8024071C 0C0127DF */ jal func_80049F7C -/* DE2BB0 80240720 02A0302D */ daddu $a2, $s5, $zero -.L80240724_DE2BB4: -/* DE2BB4 80240724 0260202D */ daddu $a0, $s3, $zero -/* DE2BB8 80240728 0280282D */ daddu $a1, $s4, $zero -/* DE2BBC 8024072C 0C012849 */ jal func_8004A124 -/* DE2BC0 80240730 02A0302D */ daddu $a2, $s5, $zero -/* DE2BC4 80240734 8E630070 */ lw $v1, 0x70($s3) -/* DE2BC8 80240738 2402000E */ addiu $v0, $zero, 0xe -/* DE2BCC 8024073C 14620021 */ bne $v1, $v0, .L802407C4_DE2C54 -/* DE2BD0 80240740 00000000 */ nop -.L80240744_DE2BD4: -/* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero -/* DE2BD8 80240748 0280282D */ daddu $a1, $s4, $zero -/* DE2BDC 8024074C 0C0900A0 */ jal func_80240280_DE2710 -/* DE2BE0 80240750 02A0302D */ daddu $a2, $s5, $zero -/* DE2BE4 80240754 8E630070 */ lw $v1, 0x70($s3) -/* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf -/* DE2BEC 8024075C 14620019 */ bne $v1, $v0, .L802407C4_DE2C54 -/* DE2BF0 80240760 00000000 */ nop -.L80240764_DE2BF4: -/* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero -/* DE2BF8 80240768 0280282D */ daddu $a1, $s4, $zero -/* DE2BFC 8024076C 0C0900BC */ jal func_802402F0_DE2780 -/* DE2C00 80240770 02A0302D */ daddu $a2, $s5, $zero -/* DE2C04 80240774 8E630070 */ lw $v1, 0x70($s3) -/* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 -/* DE2C0C 8024077C 14620011 */ bne $v1, $v0, .L802407C4_DE2C54 -/* DE2C10 80240780 00000000 */ nop -.L80240784_DE2C14: -/* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero -/* DE2C18 80240788 0280282D */ daddu $a1, $s4, $zero -/* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0_DE2850 -/* DE2C20 80240790 02A0302D */ daddu $a2, $s5, $zero -/* DE2C24 80240794 8E630070 */ lw $v1, 0x70($s3) -/* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 -/* DE2C2C 8024079C 14620009 */ bne $v1, $v0, .L802407C4_DE2C54 -/* DE2C30 802407A0 00000000 */ nop -.L802407A4_DE2C34: -/* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero -/* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero -/* DE2C3C 802407AC 0C090116 */ jal omo_13_UnkNpcDurationAnimationFunc -/* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero -/* DE2C44 802407B4 080901F1 */ j .L802407C4_DE2C54 -/* DE2C48 802407B8 00000000 */ nop -.L802407BC_DE2C4C: -/* DE2C4C 802407BC 0C0129CF */ jal func_8004A73C -/* DE2C50 802407C0 0260202D */ daddu $a0, $s3, $zero -.L802407C4_DE2C54: -/* DE2C54 802407C4 8FBF0060 */ lw $ra, 0x60($sp) -/* DE2C58 802407C8 8FB5005C */ lw $s5, 0x5c($sp) -/* DE2C5C 802407CC 8FB40058 */ lw $s4, 0x58($sp) -/* DE2C60 802407D0 8FB30054 */ lw $s3, 0x54($sp) -/* DE2C64 802407D4 8FB20050 */ lw $s2, 0x50($sp) -/* DE2C68 802407D8 8FB1004C */ lw $s1, 0x4c($sp) -/* DE2C6C 802407DC 8FB00048 */ lw $s0, 0x48($sp) -/* DE2C70 802407E0 0000102D */ daddu $v0, $zero, $zero -/* DE2C74 802407E4 03E00008 */ jr $ra -/* DE2C78 802407E8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s deleted file mode 100644 index 741b9bdc61..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243080_DE5510 -.double 35.0 - -dlabel D_80243088_DE5518 -.double 360.0 - -.section .text - -glabel func_8024083C_DE2CCC -/* DE2CCC 8024083C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE2CD0 80240840 AFB20018 */ sw $s2, 0x18($sp) -/* DE2CD4 80240844 0080902D */ daddu $s2, $a0, $zero -/* DE2CD8 80240848 AFBF001C */ sw $ra, 0x1c($sp) -/* DE2CDC 8024084C AFB10014 */ sw $s1, 0x14($sp) -/* DE2CE0 80240850 AFB00010 */ sw $s0, 0x10($sp) -/* DE2CE4 80240854 8E500148 */ lw $s0, 0x148($s2) -/* DE2CE8 80240858 0C00EABB */ jal get_npc_unsafe -/* DE2CEC 8024085C 86040008 */ lh $a0, 8($s0) -/* DE2CF0 80240860 8E03006C */ lw $v1, 0x6c($s0) -/* DE2CF4 80240864 24060001 */ addiu $a2, $zero, 1 -/* DE2CF8 80240868 10660016 */ beq $v1, $a2, .L802408C4 -/* DE2CFC 8024086C 0040882D */ daddu $s1, $v0, $zero -/* DE2D00 80240870 28620002 */ slti $v0, $v1, 2 -/* DE2D04 80240874 50400005 */ beql $v0, $zero, .L8024088C -/* DE2D08 80240878 24020002 */ addiu $v0, $zero, 2 -/* DE2D0C 8024087C 10600009 */ beqz $v1, .L802408A4 -/* DE2D10 80240880 3C02003C */ lui $v0, 0x3c -/* DE2D14 80240884 08090274 */ j .L802409D0 -/* DE2D18 80240888 24020004 */ addiu $v0, $zero, 4 -.L8024088C: -/* DE2D1C 8024088C 10620030 */ beq $v1, $v0, .L80240950 -/* DE2D20 80240890 24020003 */ addiu $v0, $zero, 3 -/* DE2D24 80240894 10620034 */ beq $v1, $v0, .L80240968 -/* DE2D28 80240898 00000000 */ nop -/* DE2D2C 8024089C 08090272 */ j .L802409C8 -/* DE2D30 802408A0 00000000 */ nop -.L802408A4: -/* DE2D34 802408A4 3442000C */ ori $v0, $v0, 0xc -/* DE2D38 802408A8 3C054387 */ lui $a1, 0x4387 -/* DE2D3C 802408AC 0220202D */ daddu $a0, $s1, $zero -/* DE2D40 802408B0 AE06006C */ sw $a2, 0x6c($s0) -/* DE2D44 802408B4 AE000070 */ sw $zero, 0x70($s0) -/* DE2D48 802408B8 0C00ECD0 */ jal set_npc_yaw -/* DE2D4C 802408BC AE220028 */ sw $v0, 0x28($s1) -/* DE2D50 802408C0 AE200048 */ sw $zero, 0x48($s1) -.L802408C4: -/* DE2D54 802408C4 8E030070 */ lw $v1, 0x70($s0) -/* DE2D58 802408C8 04610002 */ bgez $v1, .L802408D4 -/* DE2D5C 802408CC 0060102D */ daddu $v0, $v1, $zero -/* DE2D60 802408D0 2462000F */ addiu $v0, $v1, 0xf -.L802408D4: -/* DE2D64 802408D4 00022103 */ sra $a0, $v0, 4 -/* DE2D68 802408D8 00041100 */ sll $v0, $a0, 4 -/* DE2D6C 802408DC 00622023 */ subu $a0, $v1, $v0 -/* DE2D70 802408E0 28820004 */ slti $v0, $a0, 4 -/* DE2D74 802408E4 10400003 */ beqz $v0, .L802408F4 -/* DE2D78 802408E8 3C02003C */ lui $v0, 0x3c -/* DE2D7C 802408EC 0809024B */ j .L8024092C -/* DE2D80 802408F0 3442000C */ ori $v0, $v0, 0xc -.L802408F4: -/* DE2D84 802408F4 28820008 */ slti $v0, $a0, 8 -/* DE2D88 802408F8 10400003 */ beqz $v0, .L80240908 -/* DE2D8C 802408FC 3C02003C */ lui $v0, 0x3c -/* DE2D90 80240900 0809024B */ j .L8024092C -/* DE2D94 80240904 3442000B */ ori $v0, $v0, 0xb -.L80240908: -/* DE2D98 80240908 2882000C */ slti $v0, $a0, 0xc -/* DE2D9C 8024090C 10400003 */ beqz $v0, .L8024091C -/* DE2DA0 80240910 3C02003C */ lui $v0, 0x3c -/* DE2DA4 80240914 0809024B */ j .L8024092C -/* DE2DA8 80240918 3442000C */ ori $v0, $v0, 0xc -.L8024091C: -/* DE2DAC 8024091C 28820010 */ slti $v0, $a0, 0x10 -/* DE2DB0 80240920 10400003 */ beqz $v0, .L80240930 -/* DE2DB4 80240924 3C02003C */ lui $v0, 0x3c -/* DE2DB8 80240928 3442000D */ ori $v0, $v0, 0xd -.L8024092C: -/* DE2DBC 8024092C AE220028 */ sw $v0, 0x28($s1) -.L80240930: -/* DE2DC0 80240930 8E020070 */ lw $v0, 0x70($s0) -/* DE2DC4 80240934 24420001 */ addiu $v0, $v0, 1 -/* DE2DC8 80240938 AE020070 */ sw $v0, 0x70($s0) -/* DE2DCC 8024093C 28420041 */ slti $v0, $v0, 0x41 -/* DE2DD0 80240940 14400021 */ bnez $v0, .L802409C8 -/* DE2DD4 80240944 24020002 */ addiu $v0, $zero, 2 -/* DE2DD8 80240948 08090272 */ j .L802409C8 -/* DE2DDC 8024094C AE02006C */ sw $v0, 0x6c($s0) -.L80240950: -/* DE2DE0 80240950 3C03003C */ lui $v1, 0x3c -/* DE2DE4 80240954 3463000C */ ori $v1, $v1, 0xc -/* DE2DE8 80240958 AE02006C */ sw $v0, 0x6c($s0) -/* DE2DEC 8024095C AE000070 */ sw $zero, 0x70($s0) -/* DE2DF0 80240960 AE200048 */ sw $zero, 0x48($s1) -/* DE2DF4 80240964 AE230028 */ sw $v1, 0x28($s1) -.L80240968: -/* DE2DF8 80240968 C6200048 */ lwc1 $f0, 0x48($s1) -/* DE2DFC 8024096C 3C018024 */ lui $at, %hi(D_80243080_DE5510) -/* DE2E00 80240970 D4223080 */ ldc1 $f2, %lo(D_80243080_DE5510)($at) -/* DE2E04 80240974 46000021 */ cvt.d.s $f0, $f0 -/* DE2E08 80240978 46220000 */ add.d $f0, $f0, $f2 -/* DE2E0C 8024097C 3C018024 */ lui $at, %hi(D_80243088_DE5518) -/* DE2E10 80240980 D4223088 */ ldc1 $f2, %lo(D_80243088_DE5518)($at) -/* DE2E14 80240984 46200020 */ cvt.s.d $f0, $f0 -/* DE2E18 80240988 E6200048 */ swc1 $f0, 0x48($s1) -/* DE2E1C 8024098C 46000021 */ cvt.d.s $f0, $f0 -/* DE2E20 80240990 4620103C */ c.lt.d $f2, $f0 -/* DE2E24 80240994 00000000 */ nop -/* DE2E28 80240998 45000004 */ bc1f .L802409AC -/* DE2E2C 8024099C 00000000 */ nop -/* DE2E30 802409A0 46220001 */ sub.d $f0, $f0, $f2 -/* DE2E34 802409A4 46200020 */ cvt.s.d $f0, $f0 -/* DE2E38 802409A8 E6200048 */ swc1 $f0, 0x48($s1) -.L802409AC: -/* DE2E3C 802409AC 8E020070 */ lw $v0, 0x70($s0) -/* DE2E40 802409B0 24420001 */ addiu $v0, $v0, 1 -/* DE2E44 802409B4 AE020070 */ sw $v0, 0x70($s0) -/* DE2E48 802409B8 2842002E */ slti $v0, $v0, 0x2e -/* DE2E4C 802409BC 14400002 */ bnez $v0, .L802409C8 -/* DE2E50 802409C0 24020004 */ addiu $v0, $zero, 4 -/* DE2E54 802409C4 AE02006C */ sw $v0, 0x6c($s0) -.L802409C8: -/* DE2E58 802409C8 8E03006C */ lw $v1, 0x6c($s0) -/* DE2E5C 802409CC 24020004 */ addiu $v0, $zero, 4 -.L802409D0: -/* DE2E60 802409D0 14620005 */ bne $v1, $v0, .L802409E8 -/* DE2E64 802409D4 0220202D */ daddu $a0, $s1, $zero -/* DE2E68 802409D8 3C054387 */ lui $a1, 0x4387 -/* DE2E6C 802409DC 0C00ECD0 */ jal set_npc_yaw -/* DE2E70 802409E0 AC800048 */ sw $zero, 0x48($a0) -/* DE2E74 802409E4 AE400070 */ sw $zero, 0x70($s2) -.L802409E8: -/* DE2E78 802409E8 8FBF001C */ lw $ra, 0x1c($sp) -/* DE2E7C 802409EC 8FB20018 */ lw $s2, 0x18($sp) -/* DE2E80 802409F0 8FB10014 */ lw $s1, 0x14($sp) -/* DE2E84 802409F4 8FB00010 */ lw $s0, 0x10($sp) -/* DE2E88 802409F8 03E00008 */ jr $ra -/* DE2E8C 802409FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s deleted file mode 100644 index 0092ecda75..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s +++ /dev/null @@ -1,209 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243090_DE5520 -.word .L80240BE4_DE3074, .L80240BF4_DE3084, .L80240C0C_DE309C, .L80240C1C_DE30AC, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240C34_DE30C4, .L80240C44_DE30D4, .L80240C5C_DE30EC, .L80240C6C_DE30FC, .L80240C8C_DE311C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CAC_DE313C, .L80240CA4_DE3134 - -.section .text - -glabel func_80240A00_DE2E90 -/* DE2E90 80240A00 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DE2E94 80240A04 AFB30054 */ sw $s3, 0x54($sp) -/* DE2E98 80240A08 0080982D */ daddu $s3, $a0, $zero -/* DE2E9C 80240A0C AFBF0060 */ sw $ra, 0x60($sp) -/* DE2EA0 80240A10 AFB5005C */ sw $s5, 0x5c($sp) -/* DE2EA4 80240A14 AFB40058 */ sw $s4, 0x58($sp) -/* DE2EA8 80240A18 AFB20050 */ sw $s2, 0x50($sp) -/* DE2EAC 80240A1C AFB1004C */ sw $s1, 0x4c($sp) -/* DE2EB0 80240A20 AFB00048 */ sw $s0, 0x48($sp) -/* DE2EB4 80240A24 8E710148 */ lw $s1, 0x148($s3) -/* DE2EB8 80240A28 86240008 */ lh $a0, 8($s1) -/* DE2EBC 80240A2C 0C00EABB */ jal get_npc_unsafe -/* DE2EC0 80240A30 00A0802D */ daddu $s0, $a1, $zero -/* DE2EC4 80240A34 8E63000C */ lw $v1, 0xc($s3) -/* DE2EC8 80240A38 0260202D */ daddu $a0, $s3, $zero -/* DE2ECC 80240A3C 8C650000 */ lw $a1, ($v1) -/* DE2ED0 80240A40 0C0B1EAF */ jal evt_get_variable -/* DE2ED4 80240A44 0040902D */ daddu $s2, $v0, $zero -/* DE2ED8 80240A48 AFA00018 */ sw $zero, 0x18($sp) -/* DE2EDC 80240A4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2EE0 80240A50 8C630030 */ lw $v1, 0x30($v1) -/* DE2EE4 80240A54 AFA3001C */ sw $v1, 0x1c($sp) -/* DE2EE8 80240A58 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2EEC 80240A5C 8C63001C */ lw $v1, 0x1c($v1) -/* DE2EF0 80240A60 AFA30020 */ sw $v1, 0x20($sp) -/* DE2EF4 80240A64 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2EF8 80240A68 8C630024 */ lw $v1, 0x24($v1) -/* DE2EFC 80240A6C AFA30024 */ sw $v1, 0x24($sp) -/* DE2F00 80240A70 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2F04 80240A74 8C630028 */ lw $v1, 0x28($v1) -/* DE2F08 80240A78 27B50018 */ addiu $s5, $sp, 0x18 -/* DE2F0C 80240A7C AFA30028 */ sw $v1, 0x28($sp) -/* DE2F10 80240A80 8E2300D0 */ lw $v1, 0xd0($s1) -/* DE2F14 80240A84 3C014282 */ lui $at, 0x4282 -/* DE2F18 80240A88 44810000 */ mtc1 $at, $f0 -/* DE2F1C 80240A8C 8C63002C */ lw $v1, 0x2c($v1) -/* DE2F20 80240A90 0040A02D */ daddu $s4, $v0, $zero -/* DE2F24 80240A94 E7A00030 */ swc1 $f0, 0x30($sp) -/* DE2F28 80240A98 A7A00034 */ sh $zero, 0x34($sp) -/* DE2F2C 80240A9C 16000005 */ bnez $s0, .L80240AB4 -/* DE2F30 80240AA0 AFA3002C */ sw $v1, 0x2c($sp) -/* DE2F34 80240AA4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2F38 80240AA8 30420004 */ andi $v0, $v0, 4 -/* DE2F3C 80240AAC 10400044 */ beqz $v0, .L80240BC0 -/* DE2F40 80240AB0 00000000 */ nop -.L80240AB4: -/* DE2F44 80240AB4 2404F7FF */ addiu $a0, $zero, -0x801 -/* DE2F48 80240AB8 AE600070 */ sw $zero, 0x70($s3) -/* DE2F4C 80240ABC A640008E */ sh $zero, 0x8e($s2) -/* DE2F50 80240AC0 8E2200CC */ lw $v0, 0xcc($s1) -/* DE2F54 80240AC4 8E430000 */ lw $v1, ($s2) -/* DE2F58 80240AC8 8C420000 */ lw $v0, ($v0) -/* DE2F5C 80240ACC 00641824 */ and $v1, $v1, $a0 -/* DE2F60 80240AD0 AE430000 */ sw $v1, ($s2) -/* DE2F64 80240AD4 AE420028 */ sw $v0, 0x28($s2) -/* DE2F68 80240AD8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DE2F6C 80240ADC 8C420034 */ lw $v0, 0x34($v0) -/* DE2F70 80240AE0 54400005 */ bnel $v0, $zero, .L80240AF8 -/* DE2F74 80240AE4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DE2F78 80240AE8 34620200 */ ori $v0, $v1, 0x200 -/* DE2F7C 80240AEC 2403FFF7 */ addiu $v1, $zero, -9 -/* DE2F80 80240AF0 080902C0 */ j .L80240B00 -/* DE2F84 80240AF4 00431024 */ and $v0, $v0, $v1 -.L80240AF8: -/* DE2F88 80240AF8 00621024 */ and $v0, $v1, $v0 -/* DE2F8C 80240AFC 34420008 */ ori $v0, $v0, 8 -.L80240B00: -/* DE2F90 80240B00 AE420000 */ sw $v0, ($s2) -/* DE2F94 80240B04 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2F98 80240B08 30420004 */ andi $v0, $v0, 4 -/* DE2F9C 80240B0C 10400004 */ beqz $v0, .L80240B20 -/* DE2FA0 80240B10 24020063 */ addiu $v0, $zero, 0x63 -/* DE2FA4 80240B14 AE620070 */ sw $v0, 0x70($s3) -/* DE2FA8 80240B18 080902CE */ j .L80240B38 -/* DE2FAC 80240B1C AE600074 */ sw $zero, 0x74($s3) -.L80240B20: -/* DE2FB0 80240B20 8E220000 */ lw $v0, ($s1) -/* DE2FB4 80240B24 3C034000 */ lui $v1, 0x4000 -/* DE2FB8 80240B28 00431024 */ and $v0, $v0, $v1 -/* DE2FBC 80240B2C 10400002 */ beqz $v0, .L80240B38 -/* DE2FC0 80240B30 2402000C */ addiu $v0, $zero, 0xc -/* DE2FC4 80240B34 AE620070 */ sw $v0, 0x70($s3) -.L80240B38: -/* DE2FC8 80240B38 3C06BFFF */ lui $a2, 0xbfff -/* DE2FCC 80240B3C 34C6FFFF */ ori $a2, $a2, 0xffff -/* DE2FD0 80240B40 27A50038 */ addiu $a1, $sp, 0x38 -/* DE2FD4 80240B44 2404FFFB */ addiu $a0, $zero, -5 -/* DE2FD8 80240B48 8E2200B0 */ lw $v0, 0xb0($s1) -/* DE2FDC 80240B4C 8E230000 */ lw $v1, ($s1) -/* DE2FE0 80240B50 3C0142C8 */ lui $at, 0x42c8 -/* DE2FE4 80240B54 44810000 */ mtc1 $at, $f0 -/* DE2FE8 80240B58 00441024 */ and $v0, $v0, $a0 -/* DE2FEC 80240B5C 00661824 */ and $v1, $v1, $a2 -/* DE2FF0 80240B60 AE2200B0 */ sw $v0, 0xb0($s1) -/* DE2FF4 80240B64 AE230000 */ sw $v1, ($s1) -/* DE2FF8 80240B68 864200A8 */ lh $v0, 0xa8($s2) -/* DE2FFC 80240B6C 27A70040 */ addiu $a3, $sp, 0x40 -/* DE3000 80240B70 E7A00044 */ swc1 $f0, 0x44($sp) -/* DE3004 80240B74 C6460038 */ lwc1 $f6, 0x38($s2) -/* DE3008 80240B78 C640003C */ lwc1 $f0, 0x3c($s2) -/* DE300C 80240B7C C6420040 */ lwc1 $f2, 0x40($s2) -/* DE3010 80240B80 44822000 */ mtc1 $v0, $f4 -/* DE3014 80240B84 00000000 */ nop -/* DE3018 80240B88 46802120 */ cvt.s.w $f4, $f4 -/* DE301C 80240B8C 27A20044 */ addiu $v0, $sp, 0x44 -/* DE3020 80240B90 46040000 */ add.s $f0, $f0, $f4 -/* DE3024 80240B94 E7A60038 */ swc1 $f6, 0x38($sp) -/* DE3028 80240B98 E7A20040 */ swc1 $f2, 0x40($sp) -/* DE302C 80240B9C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DE3030 80240BA0 AFA20010 */ sw $v0, 0x10($sp) -/* DE3034 80240BA4 8E440080 */ lw $a0, 0x80($s2) -/* DE3038 80240BA8 0C0372DF */ jal npc_raycast_down_sides -/* DE303C 80240BAC 27A6003C */ addiu $a2, $sp, 0x3c -/* DE3040 80240BB0 10400003 */ beqz $v0, .L80240BC0 -/* DE3044 80240BB4 00000000 */ nop -/* DE3048 80240BB8 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DE304C 80240BBC E640003C */ swc1 $f0, 0x3c($s2) -.L80240BC0: -/* DE3050 80240BC0 8E630070 */ lw $v1, 0x70($s3) -/* DE3054 80240BC4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DE3058 80240BC8 10400038 */ beqz $v0, .L80240CAC_DE313C -/* DE305C 80240BCC 00031080 */ sll $v0, $v1, 2 -/* DE3060 80240BD0 3C018024 */ lui $at, %hi(jtbl_80243090_DE5520) -/* DE3064 80240BD4 00220821 */ addu $at, $at, $v0 -/* DE3068 80240BD8 8C223090 */ lw $v0, %lo(jtbl_80243090_DE5520)($at) -/* DE306C 80240BDC 00400008 */ jr $v0 -/* DE3070 80240BE0 00000000 */ nop -.L80240BE4_DE3074: -/* DE3074 80240BE4 0260202D */ daddu $a0, $s3, $zero -/* DE3078 80240BE8 0280282D */ daddu $a1, $s4, $zero -/* DE307C 80240BEC 0C012568 */ jal func_800495A0 -/* DE3080 80240BF0 02A0302D */ daddu $a2, $s5, $zero -.L80240BF4_DE3084: -/* DE3084 80240BF4 0260202D */ daddu $a0, $s3, $zero -/* DE3088 80240BF8 0280282D */ daddu $a1, $s4, $zero -/* DE308C 80240BFC 0C0125AE */ jal func_800496B8 -/* DE3090 80240C00 02A0302D */ daddu $a2, $s5, $zero -/* DE3094 80240C04 0809032B */ j .L80240CAC_DE313C -/* DE3098 80240C08 00000000 */ nop -.L80240C0C_DE309C: -/* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero -/* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero -/* DE30A4 80240C14 0C0901FB */ jal omo_13_UnkNpcAIFunc4 -/* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero -.L80240C1C_DE30AC: -/* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero -/* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero -/* DE30B4 80240C24 0C09020F */ jal func_8024083C_DE2CCC -/* DE30B8 80240C28 02A0302D */ daddu $a2, $s5, $zero -/* DE30BC 80240C2C 0809032B */ j .L80240CAC_DE313C -/* DE30C0 80240C30 00000000 */ nop -.L80240C34_DE30C4: -/* DE30C4 80240C34 0260202D */ daddu $a0, $s3, $zero -/* DE30C8 80240C38 0280282D */ daddu $a1, $s4, $zero -/* DE30CC 80240C3C 0C01278F */ jal func_80049E3C -/* DE30D0 80240C40 02A0302D */ daddu $a2, $s5, $zero -.L80240C44_DE30D4: -/* DE30D4 80240C44 0260202D */ daddu $a0, $s3, $zero -/* DE30D8 80240C48 0280282D */ daddu $a1, $s4, $zero -/* DE30DC 80240C4C 0C0127B3 */ jal func_80049ECC -/* DE30E0 80240C50 02A0302D */ daddu $a2, $s5, $zero -/* DE30E4 80240C54 0809032B */ j .L80240CAC_DE313C -/* DE30E8 80240C58 00000000 */ nop -.L80240C5C_DE30EC: -/* DE30EC 80240C5C 0260202D */ daddu $a0, $s3, $zero -/* DE30F0 80240C60 0280282D */ daddu $a1, $s4, $zero -/* DE30F4 80240C64 0C0127DF */ jal func_80049F7C -/* DE30F8 80240C68 02A0302D */ daddu $a2, $s5, $zero -.L80240C6C_DE30FC: -/* DE30FC 80240C6C 0260202D */ daddu $a0, $s3, $zero -/* DE3100 80240C70 0280282D */ daddu $a1, $s4, $zero -/* DE3104 80240C74 0C012849 */ jal func_8004A124 -/* DE3108 80240C78 02A0302D */ daddu $a2, $s5, $zero -/* DE310C 80240C7C 8E630070 */ lw $v1, 0x70($s3) -/* DE3110 80240C80 2402000E */ addiu $v0, $zero, 0xe -/* DE3114 80240C84 14620009 */ bne $v1, $v0, .L80240CAC_DE313C -/* DE3118 80240C88 00000000 */ nop -.L80240C8C_DE311C: -/* DE311C 80240C8C 0260202D */ daddu $a0, $s3, $zero -/* DE3120 80240C90 0280282D */ daddu $a1, $s4, $zero -/* DE3124 80240C94 0C0128FA */ jal func_8004A3E8 -/* DE3128 80240C98 02A0302D */ daddu $a2, $s5, $zero -/* DE312C 80240C9C 0809032B */ j .L80240CAC_DE313C -/* DE3130 80240CA0 00000000 */ nop -.L80240CA4_DE3134: -/* DE3134 80240CA4 0C0129CF */ jal func_8004A73C -/* DE3138 80240CA8 0260202D */ daddu $a0, $s3, $zero -.L80240CAC_DE313C: -/* DE313C 80240CAC 8FBF0060 */ lw $ra, 0x60($sp) -/* DE3140 80240CB0 8FB5005C */ lw $s5, 0x5c($sp) -/* DE3144 80240CB4 8FB40058 */ lw $s4, 0x58($sp) -/* DE3148 80240CB8 8FB30054 */ lw $s3, 0x54($sp) -/* DE314C 80240CBC 8FB20050 */ lw $s2, 0x50($sp) -/* DE3150 80240CC0 8FB1004C */ lw $s1, 0x4c($sp) -/* DE3154 80240CC4 8FB00048 */ lw $s0, 0x48($sp) -/* DE3158 80240CC8 0000102D */ daddu $v0, $zero, $zero -/* DE315C 80240CCC 03E00008 */ jr $ra -/* DE3160 80240CD0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s deleted file mode 100644 index f8ac214886..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247610_DF64B0 -.double 0.6 - -.section .text - -glabel func_80240560_DEF400 -/* DEF400 80240560 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF404 80240564 AFB10014 */ sw $s1, 0x14($sp) -/* DEF408 80240568 0080882D */ daddu $s1, $a0, $zero -/* DEF40C 8024056C AFBF0018 */ sw $ra, 0x18($sp) -/* DEF410 80240570 AFB00010 */ sw $s0, 0x10($sp) -/* DEF414 80240574 8E300148 */ lw $s0, 0x148($s1) -/* DEF418 80240578 0C00EABB */ jal get_npc_unsafe -/* DEF41C 8024057C 86040008 */ lh $a0, 8($s0) -/* DEF420 80240580 C4400018 */ lwc1 $f0, 0x18($v0) -/* DEF424 80240584 3C018024 */ lui $at, %hi(D_80247610_DF64B0) -/* DEF428 80240588 D4227610 */ ldc1 $f2, %lo(D_80247610_DF64B0)($at) -/* DEF42C 8024058C 46000021 */ cvt.d.s $f0, $f0 -/* DEF430 80240590 46220002 */ mul.d $f0, $f0, $f2 -/* DEF434 80240594 00000000 */ nop -/* DEF438 80240598 46200020 */ cvt.s.d $f0, $f0 -/* DEF43C 8024059C E4400018 */ swc1 $f0, 0x18($v0) -/* DEF440 802405A0 8E0300CC */ lw $v1, 0xcc($s0) -/* DEF444 802405A4 8C640030 */ lw $a0, 0x30($v1) -/* DEF448 802405A8 24030005 */ addiu $v1, $zero, 5 -/* DEF44C 802405AC A443008E */ sh $v1, 0x8e($v0) -/* DEF450 802405B0 AC440028 */ sw $a0, 0x28($v0) -/* DEF454 802405B4 2402000F */ addiu $v0, $zero, 0xf -/* DEF458 802405B8 AE220070 */ sw $v0, 0x70($s1) -/* DEF45C 802405BC 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF460 802405C0 8FB10014 */ lw $s1, 0x14($sp) -/* DEF464 802405C4 8FB00010 */ lw $s0, 0x10($sp) -/* DEF468 802405C8 03E00008 */ jr $ra -/* DEF46C 802405CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s deleted file mode 100644 index e69296f98d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247618_DF64B8 -.double 0.6 - -.section .text - -glabel func_802405D0_DEF470 -/* DEF470 802405D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DEF474 802405D4 AFB20028 */ sw $s2, 0x28($sp) -/* DEF478 802405D8 0080902D */ daddu $s2, $a0, $zero -/* DEF47C 802405DC AFBF002C */ sw $ra, 0x2c($sp) -/* DEF480 802405E0 AFB10024 */ sw $s1, 0x24($sp) -/* DEF484 802405E4 AFB00020 */ sw $s0, 0x20($sp) -/* DEF488 802405E8 8E510148 */ lw $s1, 0x148($s2) -/* DEF48C 802405EC 0C00EABB */ jal get_npc_unsafe -/* DEF490 802405F0 86240008 */ lh $a0, 8($s1) -/* DEF494 802405F4 0040802D */ daddu $s0, $v0, $zero -/* DEF498 802405F8 0200202D */ daddu $a0, $s0, $zero -/* DEF49C 802405FC C600000C */ lwc1 $f0, 0xc($s0) -/* DEF4A0 80240600 27A60018 */ addiu $a2, $sp, 0x18 -/* DEF4A4 80240604 E7A00018 */ swc1 $f0, 0x18($sp) -/* DEF4A8 80240608 AFA00010 */ sw $zero, 0x10($sp) -/* DEF4AC 8024060C AFA00014 */ sw $zero, 0x14($sp) -/* DEF4B0 80240610 8E050018 */ lw $a1, 0x18($s0) -/* DEF4B4 80240614 0C0129E1 */ jal func_8004A784 -/* DEF4B8 80240618 0000382D */ daddu $a3, $zero, $zero -/* DEF4BC 8024061C 14400005 */ bnez $v0, .L80240634 -/* DEF4C0 80240620 00000000 */ nop -/* DEF4C4 80240624 8E050018 */ lw $a1, 0x18($s0) -/* DEF4C8 80240628 8E06000C */ lw $a2, 0xc($s0) -/* DEF4CC 8024062C 0C00EA95 */ jal npc_move_heading -/* DEF4D0 80240630 0200202D */ daddu $a0, $s0, $zero -.L80240634: -/* DEF4D4 80240634 9602008E */ lhu $v0, 0x8e($s0) -/* DEF4D8 80240638 2442FFFF */ addiu $v0, $v0, -1 -/* DEF4DC 8024063C A602008E */ sh $v0, 0x8e($s0) -/* DEF4E0 80240640 00021400 */ sll $v0, $v0, 0x10 -/* DEF4E4 80240644 14400010 */ bnez $v0, .L80240688 -/* DEF4E8 80240648 00000000 */ nop -/* DEF4EC 8024064C C6000018 */ lwc1 $f0, 0x18($s0) -/* DEF4F0 80240650 3C018024 */ lui $at, %hi(D_80247618_DF64B8) -/* DEF4F4 80240654 D4227618 */ ldc1 $f2, %lo(D_80247618_DF64B8)($at) -/* DEF4F8 80240658 46000021 */ cvt.d.s $f0, $f0 -/* DEF4FC 8024065C 46220002 */ mul.d $f0, $f0, $f2 -/* DEF500 80240660 00000000 */ nop -/* DEF504 80240664 46200020 */ cvt.s.d $f0, $f0 -/* DEF508 80240668 E6000018 */ swc1 $f0, 0x18($s0) -/* DEF50C 8024066C 8E2200CC */ lw $v0, 0xcc($s1) -/* DEF510 80240670 8C43002C */ lw $v1, 0x2c($v0) -/* DEF514 80240674 2402000A */ addiu $v0, $zero, 0xa -/* DEF518 80240678 A602008E */ sh $v0, 0x8e($s0) -/* DEF51C 8024067C 24020010 */ addiu $v0, $zero, 0x10 -/* DEF520 80240680 AE030028 */ sw $v1, 0x28($s0) -/* DEF524 80240684 AE420070 */ sw $v0, 0x70($s2) -.L80240688: -/* DEF528 80240688 8FBF002C */ lw $ra, 0x2c($sp) -/* DEF52C 8024068C 8FB20028 */ lw $s2, 0x28($sp) -/* DEF530 80240690 8FB10024 */ lw $s1, 0x24($sp) -/* DEF534 80240694 8FB00020 */ lw $s0, 0x20($sp) -/* DEF538 80240698 03E00008 */ jr $ra -/* DEF53C 8024069C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s deleted file mode 100644 index 6487a645ca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802406A0_DEF540.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A0_DEF540 -/* DEF540 802406A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DEF544 802406A4 AFB10024 */ sw $s1, 0x24($sp) -/* DEF548 802406A8 0080882D */ daddu $s1, $a0, $zero -/* DEF54C 802406AC AFBF0028 */ sw $ra, 0x28($sp) -/* DEF550 802406B0 AFB00020 */ sw $s0, 0x20($sp) -/* DEF554 802406B4 8E220148 */ lw $v0, 0x148($s1) -/* DEF558 802406B8 0C00EABB */ jal get_npc_unsafe -/* DEF55C 802406BC 84440008 */ lh $a0, 8($v0) -/* DEF560 802406C0 0040802D */ daddu $s0, $v0, $zero -/* DEF564 802406C4 0200202D */ daddu $a0, $s0, $zero -/* DEF568 802406C8 C600000C */ lwc1 $f0, 0xc($s0) -/* DEF56C 802406CC 27A60018 */ addiu $a2, $sp, 0x18 -/* DEF570 802406D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DEF574 802406D4 AFA00010 */ sw $zero, 0x10($sp) -/* DEF578 802406D8 AFA00014 */ sw $zero, 0x14($sp) -/* DEF57C 802406DC 8E050018 */ lw $a1, 0x18($s0) -/* DEF580 802406E0 0C0129E1 */ jal func_8004A784 -/* DEF584 802406E4 0000382D */ daddu $a3, $zero, $zero -/* DEF588 802406E8 14400005 */ bnez $v0, .L80240700 -/* DEF58C 802406EC 00000000 */ nop -/* DEF590 802406F0 8E050018 */ lw $a1, 0x18($s0) -/* DEF594 802406F4 8E06000C */ lw $a2, 0xc($s0) -/* DEF598 802406F8 0C00EA95 */ jal npc_move_heading -/* DEF59C 802406FC 0200202D */ daddu $a0, $s0, $zero -.L80240700: -/* DEF5A0 80240700 9602008E */ lhu $v0, 0x8e($s0) -/* DEF5A4 80240704 2442FFFF */ addiu $v0, $v0, -1 -/* DEF5A8 80240708 A602008E */ sh $v0, 0x8e($s0) -/* DEF5AC 8024070C 00021400 */ sll $v0, $v0, 0x10 -/* DEF5B0 80240710 14400004 */ bnez $v0, .L80240724 -/* DEF5B4 80240714 2402001E */ addiu $v0, $zero, 0x1e -/* DEF5B8 80240718 A602008E */ sh $v0, 0x8e($s0) -/* DEF5BC 8024071C 24020011 */ addiu $v0, $zero, 0x11 -/* DEF5C0 80240720 AE220070 */ sw $v0, 0x70($s1) -.L80240724: -/* DEF5C4 80240724 8FBF0028 */ lw $ra, 0x28($sp) -/* DEF5C8 80240728 8FB10024 */ lw $s1, 0x24($sp) -/* DEF5CC 8024072C 8FB00020 */ lw $s0, 0x20($sp) -/* DEF5D0 80240730 03E00008 */ jr $ra -/* DEF5D4 80240734 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s deleted file mode 100644 index c3870f86a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247620_DF64C0 -.word .L8024097C_DEF81C, .L8024098C_DEF82C, .L802409A4_DEF844, .L802409B4_DEF854, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L802409CC_DEF86C, .L802409DC_DEF87C, .L802409F4_DEF894, .L80240A04_DEF8A4, .L80240A24_DEF8C4, .L80240A44_DEF8E4, .L80240A64_DEF904, .L80240A84_DEF924, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240AA4_DEF944, .L80240A9C_DEF93C - -.section .text - -glabel func_80240798_DEF638 -/* DEF638 80240798 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DEF63C 8024079C AFB30054 */ sw $s3, 0x54($sp) -/* DEF640 802407A0 0080982D */ daddu $s3, $a0, $zero -/* DEF644 802407A4 AFBF0060 */ sw $ra, 0x60($sp) -/* DEF648 802407A8 AFB5005C */ sw $s5, 0x5c($sp) -/* DEF64C 802407AC AFB40058 */ sw $s4, 0x58($sp) -/* DEF650 802407B0 AFB20050 */ sw $s2, 0x50($sp) -/* DEF654 802407B4 AFB1004C */ sw $s1, 0x4c($sp) -/* DEF658 802407B8 AFB00048 */ sw $s0, 0x48($sp) -/* DEF65C 802407BC 8E710148 */ lw $s1, 0x148($s3) -/* DEF660 802407C0 86240008 */ lh $a0, 8($s1) -/* DEF664 802407C4 0C00EABB */ jal get_npc_unsafe -/* DEF668 802407C8 00A0802D */ daddu $s0, $a1, $zero -/* DEF66C 802407CC 8E63000C */ lw $v1, 0xc($s3) -/* DEF670 802407D0 0260202D */ daddu $a0, $s3, $zero -/* DEF674 802407D4 8C650000 */ lw $a1, ($v1) -/* DEF678 802407D8 0C0B1EAF */ jal evt_get_variable -/* DEF67C 802407DC 0040902D */ daddu $s2, $v0, $zero -/* DEF680 802407E0 AFA00018 */ sw $zero, 0x18($sp) -/* DEF684 802407E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF688 802407E8 8C630030 */ lw $v1, 0x30($v1) -/* DEF68C 802407EC AFA3001C */ sw $v1, 0x1c($sp) -/* DEF690 802407F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF694 802407F4 8C63001C */ lw $v1, 0x1c($v1) -/* DEF698 802407F8 AFA30020 */ sw $v1, 0x20($sp) -/* DEF69C 802407FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF6A0 80240800 8C630024 */ lw $v1, 0x24($v1) -/* DEF6A4 80240804 AFA30024 */ sw $v1, 0x24($sp) -/* DEF6A8 80240808 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF6AC 8024080C 8C630028 */ lw $v1, 0x28($v1) -/* DEF6B0 80240810 27B50018 */ addiu $s5, $sp, 0x18 -/* DEF6B4 80240814 AFA30028 */ sw $v1, 0x28($sp) -/* DEF6B8 80240818 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEF6BC 8024081C 3C014282 */ lui $at, 0x4282 -/* DEF6C0 80240820 44810000 */ mtc1 $at, $f0 -/* DEF6C4 80240824 8C63002C */ lw $v1, 0x2c($v1) -/* DEF6C8 80240828 0040A02D */ daddu $s4, $v0, $zero -/* DEF6CC 8024082C E7A00030 */ swc1 $f0, 0x30($sp) -/* DEF6D0 80240830 A7A00034 */ sh $zero, 0x34($sp) -/* DEF6D4 80240834 16000005 */ bnez $s0, .L8024084C -/* DEF6D8 80240838 AFA3002C */ sw $v1, 0x2c($sp) -/* DEF6DC 8024083C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEF6E0 80240840 30420004 */ andi $v0, $v0, 4 -/* DEF6E4 80240844 10400044 */ beqz $v0, .L80240958 -/* DEF6E8 80240848 00000000 */ nop -.L8024084C: -/* DEF6EC 8024084C 2404F7FF */ addiu $a0, $zero, -0x801 -/* DEF6F0 80240850 AE600070 */ sw $zero, 0x70($s3) -/* DEF6F4 80240854 A640008E */ sh $zero, 0x8e($s2) -/* DEF6F8 80240858 8E2200CC */ lw $v0, 0xcc($s1) -/* DEF6FC 8024085C 8E430000 */ lw $v1, ($s2) -/* DEF700 80240860 8C420000 */ lw $v0, ($v0) -/* DEF704 80240864 00641824 */ and $v1, $v1, $a0 -/* DEF708 80240868 AE430000 */ sw $v1, ($s2) -/* DEF70C 8024086C AE420028 */ sw $v0, 0x28($s2) -/* DEF710 80240870 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEF714 80240874 8C420034 */ lw $v0, 0x34($v0) -/* DEF718 80240878 54400005 */ bnel $v0, $zero, .L80240890 -/* DEF71C 8024087C 2402FDFF */ addiu $v0, $zero, -0x201 -/* DEF720 80240880 34620200 */ ori $v0, $v1, 0x200 -/* DEF724 80240884 2403FFF7 */ addiu $v1, $zero, -9 -/* DEF728 80240888 08090226 */ j .L80240898 -/* DEF72C 8024088C 00431024 */ and $v0, $v0, $v1 -.L80240890: -/* DEF730 80240890 00621024 */ and $v0, $v1, $v0 -/* DEF734 80240894 34420008 */ ori $v0, $v0, 8 -.L80240898: -/* DEF738 80240898 AE420000 */ sw $v0, ($s2) -/* DEF73C 8024089C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEF740 802408A0 30420004 */ andi $v0, $v0, 4 -/* DEF744 802408A4 10400004 */ beqz $v0, .L802408B8 -/* DEF748 802408A8 24020063 */ addiu $v0, $zero, 0x63 -/* DEF74C 802408AC AE620070 */ sw $v0, 0x70($s3) -/* DEF750 802408B0 08090234 */ j .L802408D0 -/* DEF754 802408B4 AE600074 */ sw $zero, 0x74($s3) -.L802408B8: -/* DEF758 802408B8 8E220000 */ lw $v0, ($s1) -/* DEF75C 802408BC 3C034000 */ lui $v1, 0x4000 -/* DEF760 802408C0 00431024 */ and $v0, $v0, $v1 -/* DEF764 802408C4 10400002 */ beqz $v0, .L802408D0 -/* DEF768 802408C8 2402000C */ addiu $v0, $zero, 0xc -/* DEF76C 802408CC AE620070 */ sw $v0, 0x70($s3) -.L802408D0: -/* DEF770 802408D0 3C06BFFF */ lui $a2, 0xbfff -/* DEF774 802408D4 34C6FFFF */ ori $a2, $a2, 0xffff -/* DEF778 802408D8 27A50038 */ addiu $a1, $sp, 0x38 -/* DEF77C 802408DC 2404FFFB */ addiu $a0, $zero, -5 -/* DEF780 802408E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEF784 802408E4 8E230000 */ lw $v1, ($s1) -/* DEF788 802408E8 3C0142C8 */ lui $at, 0x42c8 -/* DEF78C 802408EC 44810000 */ mtc1 $at, $f0 -/* DEF790 802408F0 00441024 */ and $v0, $v0, $a0 -/* DEF794 802408F4 00661824 */ and $v1, $v1, $a2 -/* DEF798 802408F8 AE2200B0 */ sw $v0, 0xb0($s1) -/* DEF79C 802408FC AE230000 */ sw $v1, ($s1) -/* DEF7A0 80240900 864200A8 */ lh $v0, 0xa8($s2) -/* DEF7A4 80240904 27A70040 */ addiu $a3, $sp, 0x40 -/* DEF7A8 80240908 E7A00044 */ swc1 $f0, 0x44($sp) -/* DEF7AC 8024090C C6460038 */ lwc1 $f6, 0x38($s2) -/* DEF7B0 80240910 C640003C */ lwc1 $f0, 0x3c($s2) -/* DEF7B4 80240914 C6420040 */ lwc1 $f2, 0x40($s2) -/* DEF7B8 80240918 44822000 */ mtc1 $v0, $f4 -/* DEF7BC 8024091C 00000000 */ nop -/* DEF7C0 80240920 46802120 */ cvt.s.w $f4, $f4 -/* DEF7C4 80240924 27A20044 */ addiu $v0, $sp, 0x44 -/* DEF7C8 80240928 46040000 */ add.s $f0, $f0, $f4 -/* DEF7CC 8024092C E7A60038 */ swc1 $f6, 0x38($sp) -/* DEF7D0 80240930 E7A20040 */ swc1 $f2, 0x40($sp) -/* DEF7D4 80240934 E7A0003C */ swc1 $f0, 0x3c($sp) -/* DEF7D8 80240938 AFA20010 */ sw $v0, 0x10($sp) -/* DEF7DC 8024093C 8E440080 */ lw $a0, 0x80($s2) -/* DEF7E0 80240940 0C0372DF */ jal npc_raycast_down_sides -/* DEF7E4 80240944 27A6003C */ addiu $a2, $sp, 0x3c -/* DEF7E8 80240948 10400003 */ beqz $v0, .L80240958 -/* DEF7EC 8024094C 00000000 */ nop -/* DEF7F0 80240950 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DEF7F4 80240954 E640003C */ swc1 $f0, 0x3c($s2) -.L80240958: -/* DEF7F8 80240958 8E630070 */ lw $v1, 0x70($s3) -/* DEF7FC 8024095C 2C620064 */ sltiu $v0, $v1, 0x64 -/* DEF800 80240960 10400050 */ beqz $v0, .L80240AA4_DEF944 -/* DEF804 80240964 00031080 */ sll $v0, $v1, 2 -/* DEF808 80240968 3C018024 */ lui $at, %hi(jtbl_80247620_DF64C0) -/* DEF80C 8024096C 00220821 */ addu $at, $at, $v0 -/* DEF810 80240970 8C227620 */ lw $v0, %lo(jtbl_80247620_DF64C0)($at) -/* DEF814 80240974 00400008 */ jr $v0 -/* DEF818 80240978 00000000 */ nop -.L8024097C_DEF81C: -/* DEF81C 8024097C 0260202D */ daddu $a0, $s3, $zero -/* DEF820 80240980 0280282D */ daddu $a1, $s4, $zero -/* DEF824 80240984 0C012568 */ jal func_800495A0 -/* DEF828 80240988 02A0302D */ daddu $a2, $s5, $zero -.L8024098C_DEF82C: -/* DEF82C 8024098C 0260202D */ daddu $a0, $s3, $zero -/* DEF830 80240990 0280282D */ daddu $a1, $s4, $zero -/* DEF834 80240994 0C0125AE */ jal func_800496B8 -/* DEF838 80240998 02A0302D */ daddu $a2, $s5, $zero -/* DEF83C 8024099C 080902A9 */ j .L80240AA4_DEF944 -/* DEF840 802409A0 00000000 */ nop -.L802409A4_DEF844: -/* DEF844 802409A4 0260202D */ daddu $a0, $s3, $zero -/* DEF848 802409A8 0280282D */ daddu $a1, $s4, $zero -/* DEF84C 802409AC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DEF850 802409B0 02A0302D */ daddu $a2, $s5, $zero -.L802409B4_DEF854: -/* DEF854 802409B4 0260202D */ daddu $a0, $s3, $zero -/* DEF858 802409B8 0280282D */ daddu $a1, $s4, $zero -/* DEF85C 802409BC 0C012701 */ jal func_80049C04 -/* DEF860 802409C0 02A0302D */ daddu $a2, $s5, $zero -/* DEF864 802409C4 080902A9 */ j .L80240AA4_DEF944 -/* DEF868 802409C8 00000000 */ nop -.L802409CC_DEF86C: -/* DEF86C 802409CC 0260202D */ daddu $a0, $s3, $zero -/* DEF870 802409D0 0280282D */ daddu $a1, $s4, $zero -/* DEF874 802409D4 0C01278F */ jal func_80049E3C -/* DEF878 802409D8 02A0302D */ daddu $a2, $s5, $zero -.L802409DC_DEF87C: -/* DEF87C 802409DC 0260202D */ daddu $a0, $s3, $zero -/* DEF880 802409E0 0280282D */ daddu $a1, $s4, $zero -/* DEF884 802409E4 0C0127B3 */ jal func_80049ECC -/* DEF888 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* DEF88C 802409EC 080902A9 */ j .L80240AA4_DEF944 -/* DEF890 802409F0 00000000 */ nop -.L802409F4_DEF894: -/* DEF894 802409F4 0260202D */ daddu $a0, $s3, $zero -/* DEF898 802409F8 0280282D */ daddu $a1, $s4, $zero -/* DEF89C 802409FC 0C0127DF */ jal func_80049F7C -/* DEF8A0 80240A00 02A0302D */ daddu $a2, $s5, $zero -.L80240A04_DEF8A4: -/* DEF8A4 80240A04 0260202D */ daddu $a0, $s3, $zero -/* DEF8A8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* DEF8AC 80240A0C 0C012849 */ jal func_8004A124 -/* DEF8B0 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* DEF8B4 80240A14 8E630070 */ lw $v1, 0x70($s3) -/* DEF8B8 80240A18 2402000E */ addiu $v0, $zero, 0xe -/* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, .L80240AA4_DEF944 -/* DEF8C0 80240A20 00000000 */ nop -.L80240A24_DEF8C4: -/* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero -/* DEF8C8 80240A28 0280282D */ daddu $a1, $s4, $zero -/* DEF8CC 80240A2C 0C090158 */ jal func_80240560_DEF400 -/* DEF8D0 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* DEF8D4 80240A34 8E630070 */ lw $v1, 0x70($s3) -/* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf -/* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, .L80240AA4_DEF944 -/* DEF8E0 80240A40 00000000 */ nop -.L80240A44_DEF8E4: -/* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero -/* DEF8E8 80240A48 0280282D */ daddu $a1, $s4, $zero -/* DEF8EC 80240A4C 0C090174 */ jal func_802405D0_DEF470 -/* DEF8F0 80240A50 02A0302D */ daddu $a2, $s5, $zero -/* DEF8F4 80240A54 8E630070 */ lw $v1, 0x70($s3) -/* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 -/* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, .L80240AA4_DEF944 -/* DEF900 80240A60 00000000 */ nop -.L80240A64_DEF904: -/* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero -/* DEF908 80240A68 0280282D */ daddu $a1, $s4, $zero -/* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0_DEF540 -/* DEF910 80240A70 02A0302D */ daddu $a2, $s5, $zero -/* DEF914 80240A74 8E630070 */ lw $v1, 0x70($s3) -/* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 -/* DEF91C 80240A7C 14620009 */ bne $v1, $v0, .L80240AA4_DEF944 -/* DEF920 80240A80 00000000 */ nop -.L80240A84_DEF924: -/* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero -/* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero -/* DEF92C 80240A8C 0C0901CE */ jal omo_17_UnkNpcDurationAnimationFunc -/* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero -/* DEF934 80240A94 080902A9 */ j .L80240AA4_DEF944 -/* DEF938 80240A98 00000000 */ nop -.L80240A9C_DEF93C: -/* DEF93C 80240A9C 0C0129CF */ jal func_8004A73C -/* DEF940 80240AA0 0260202D */ daddu $a0, $s3, $zero -.L80240AA4_DEF944: -/* DEF944 80240AA4 8FBF0060 */ lw $ra, 0x60($sp) -/* DEF948 80240AA8 8FB5005C */ lw $s5, 0x5c($sp) -/* DEF94C 80240AAC 8FB40058 */ lw $s4, 0x58($sp) -/* DEF950 80240AB0 8FB30054 */ lw $s3, 0x54($sp) -/* DEF954 80240AB4 8FB20050 */ lw $s2, 0x50($sp) -/* DEF958 80240AB8 8FB1004C */ lw $s1, 0x4c($sp) -/* DEF95C 80240ABC 8FB00048 */ lw $s0, 0x48($sp) -/* DEF960 80240AC0 0000102D */ daddu $v0, $zero, $zero -/* DEF964 80240AC4 03E00008 */ jr $ra -/* DEF968 80240AC8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s deleted file mode 100644 index 67ecfef4c0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802477B0_DF6650 -.double 35.0 - -dlabel D_802477B8_DF6658 -.double 360.0 - -.section .text - -glabel func_80240B1C_DEF9BC -/* DEF9BC 80240B1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF9C0 80240B20 AFB20018 */ sw $s2, 0x18($sp) -/* DEF9C4 80240B24 0080902D */ daddu $s2, $a0, $zero -/* DEF9C8 80240B28 AFBF001C */ sw $ra, 0x1c($sp) -/* DEF9CC 80240B2C AFB10014 */ sw $s1, 0x14($sp) -/* DEF9D0 80240B30 AFB00010 */ sw $s0, 0x10($sp) -/* DEF9D4 80240B34 8E500148 */ lw $s0, 0x148($s2) -/* DEF9D8 80240B38 0C00EABB */ jal get_npc_unsafe -/* DEF9DC 80240B3C 86040008 */ lh $a0, 8($s0) -/* DEF9E0 80240B40 8E03006C */ lw $v1, 0x6c($s0) -/* DEF9E4 80240B44 24060001 */ addiu $a2, $zero, 1 -/* DEF9E8 80240B48 10660016 */ beq $v1, $a2, .L80240BA4 -/* DEF9EC 80240B4C 0040882D */ daddu $s1, $v0, $zero -/* DEF9F0 80240B50 28620002 */ slti $v0, $v1, 2 -/* DEF9F4 80240B54 50400005 */ beql $v0, $zero, .L80240B6C -/* DEF9F8 80240B58 24020002 */ addiu $v0, $zero, 2 -/* DEF9FC 80240B5C 10600009 */ beqz $v1, .L80240B84 -/* DEFA00 80240B60 3C02003C */ lui $v0, 0x3c -/* DEFA04 80240B64 0809032C */ j .L80240CB0 -/* DEFA08 80240B68 24020004 */ addiu $v0, $zero, 4 -.L80240B6C: -/* DEFA0C 80240B6C 10620030 */ beq $v1, $v0, .L80240C30 -/* DEFA10 80240B70 24020003 */ addiu $v0, $zero, 3 -/* DEFA14 80240B74 10620034 */ beq $v1, $v0, .L80240C48 -/* DEFA18 80240B78 00000000 */ nop -/* DEFA1C 80240B7C 0809032A */ j .L80240CA8 -/* DEFA20 80240B80 00000000 */ nop -.L80240B84: -/* DEFA24 80240B84 3442000C */ ori $v0, $v0, 0xc -/* DEFA28 80240B88 3C054387 */ lui $a1, 0x4387 -/* DEFA2C 80240B8C 0220202D */ daddu $a0, $s1, $zero -/* DEFA30 80240B90 AE06006C */ sw $a2, 0x6c($s0) -/* DEFA34 80240B94 AE000070 */ sw $zero, 0x70($s0) -/* DEFA38 80240B98 0C00ECD0 */ jal set_npc_yaw -/* DEFA3C 80240B9C AE220028 */ sw $v0, 0x28($s1) -/* DEFA40 80240BA0 AE200048 */ sw $zero, 0x48($s1) -.L80240BA4: -/* DEFA44 80240BA4 8E030070 */ lw $v1, 0x70($s0) -/* DEFA48 80240BA8 04610002 */ bgez $v1, .L80240BB4 -/* DEFA4C 80240BAC 0060102D */ daddu $v0, $v1, $zero -/* DEFA50 80240BB0 2462000F */ addiu $v0, $v1, 0xf -.L80240BB4: -/* DEFA54 80240BB4 00022103 */ sra $a0, $v0, 4 -/* DEFA58 80240BB8 00041100 */ sll $v0, $a0, 4 -/* DEFA5C 80240BBC 00622023 */ subu $a0, $v1, $v0 -/* DEFA60 80240BC0 28820004 */ slti $v0, $a0, 4 -/* DEFA64 80240BC4 10400003 */ beqz $v0, .L80240BD4 -/* DEFA68 80240BC8 3C02003C */ lui $v0, 0x3c -/* DEFA6C 80240BCC 08090303 */ j .L80240C0C -/* DEFA70 80240BD0 3442000C */ ori $v0, $v0, 0xc -.L80240BD4: -/* DEFA74 80240BD4 28820008 */ slti $v0, $a0, 8 -/* DEFA78 80240BD8 10400003 */ beqz $v0, .L80240BE8 -/* DEFA7C 80240BDC 3C02003C */ lui $v0, 0x3c -/* DEFA80 80240BE0 08090303 */ j .L80240C0C -/* DEFA84 80240BE4 3442000B */ ori $v0, $v0, 0xb -.L80240BE8: -/* DEFA88 80240BE8 2882000C */ slti $v0, $a0, 0xc -/* DEFA8C 80240BEC 10400003 */ beqz $v0, .L80240BFC -/* DEFA90 80240BF0 3C02003C */ lui $v0, 0x3c -/* DEFA94 80240BF4 08090303 */ j .L80240C0C -/* DEFA98 80240BF8 3442000C */ ori $v0, $v0, 0xc -.L80240BFC: -/* DEFA9C 80240BFC 28820010 */ slti $v0, $a0, 0x10 -/* DEFAA0 80240C00 10400003 */ beqz $v0, .L80240C10 -/* DEFAA4 80240C04 3C02003C */ lui $v0, 0x3c -/* DEFAA8 80240C08 3442000D */ ori $v0, $v0, 0xd -.L80240C0C: -/* DEFAAC 80240C0C AE220028 */ sw $v0, 0x28($s1) -.L80240C10: -/* DEFAB0 80240C10 8E020070 */ lw $v0, 0x70($s0) -/* DEFAB4 80240C14 24420001 */ addiu $v0, $v0, 1 -/* DEFAB8 80240C18 AE020070 */ sw $v0, 0x70($s0) -/* DEFABC 80240C1C 28420041 */ slti $v0, $v0, 0x41 -/* DEFAC0 80240C20 14400021 */ bnez $v0, .L80240CA8 -/* DEFAC4 80240C24 24020002 */ addiu $v0, $zero, 2 -/* DEFAC8 80240C28 0809032A */ j .L80240CA8 -/* DEFACC 80240C2C AE02006C */ sw $v0, 0x6c($s0) -.L80240C30: -/* DEFAD0 80240C30 3C03003C */ lui $v1, 0x3c -/* DEFAD4 80240C34 3463000C */ ori $v1, $v1, 0xc -/* DEFAD8 80240C38 AE02006C */ sw $v0, 0x6c($s0) -/* DEFADC 80240C3C AE000070 */ sw $zero, 0x70($s0) -/* DEFAE0 80240C40 AE200048 */ sw $zero, 0x48($s1) -/* DEFAE4 80240C44 AE230028 */ sw $v1, 0x28($s1) -.L80240C48: -/* DEFAE8 80240C48 C6200048 */ lwc1 $f0, 0x48($s1) -/* DEFAEC 80240C4C 3C018024 */ lui $at, %hi(D_802477B0_DF6650) -/* DEFAF0 80240C50 D42277B0 */ ldc1 $f2, %lo(D_802477B0_DF6650)($at) -/* DEFAF4 80240C54 46000021 */ cvt.d.s $f0, $f0 -/* DEFAF8 80240C58 46220000 */ add.d $f0, $f0, $f2 -/* DEFAFC 80240C5C 3C018024 */ lui $at, %hi(D_802477B8_DF6658) -/* DEFB00 80240C60 D42277B8 */ ldc1 $f2, %lo(D_802477B8_DF6658)($at) -/* DEFB04 80240C64 46200020 */ cvt.s.d $f0, $f0 -/* DEFB08 80240C68 E6200048 */ swc1 $f0, 0x48($s1) -/* DEFB0C 80240C6C 46000021 */ cvt.d.s $f0, $f0 -/* DEFB10 80240C70 4620103C */ c.lt.d $f2, $f0 -/* DEFB14 80240C74 00000000 */ nop -/* DEFB18 80240C78 45000004 */ bc1f .L80240C8C -/* DEFB1C 80240C7C 00000000 */ nop -/* DEFB20 80240C80 46220001 */ sub.d $f0, $f0, $f2 -/* DEFB24 80240C84 46200020 */ cvt.s.d $f0, $f0 -/* DEFB28 80240C88 E6200048 */ swc1 $f0, 0x48($s1) -.L80240C8C: -/* DEFB2C 80240C8C 8E020070 */ lw $v0, 0x70($s0) -/* DEFB30 80240C90 24420001 */ addiu $v0, $v0, 1 -/* DEFB34 80240C94 AE020070 */ sw $v0, 0x70($s0) -/* DEFB38 80240C98 2842002E */ slti $v0, $v0, 0x2e -/* DEFB3C 80240C9C 14400002 */ bnez $v0, .L80240CA8 -/* DEFB40 80240CA0 24020004 */ addiu $v0, $zero, 4 -/* DEFB44 80240CA4 AE02006C */ sw $v0, 0x6c($s0) -.L80240CA8: -/* DEFB48 80240CA8 8E03006C */ lw $v1, 0x6c($s0) -/* DEFB4C 80240CAC 24020004 */ addiu $v0, $zero, 4 -.L80240CB0: -/* DEFB50 80240CB0 14620005 */ bne $v1, $v0, .L80240CC8 -/* DEFB54 80240CB4 0220202D */ daddu $a0, $s1, $zero -/* DEFB58 80240CB8 3C054387 */ lui $a1, 0x4387 -/* DEFB5C 80240CBC 0C00ECD0 */ jal set_npc_yaw -/* DEFB60 80240CC0 AC800048 */ sw $zero, 0x48($a0) -/* DEFB64 80240CC4 AE400070 */ sw $zero, 0x70($s2) -.L80240CC8: -/* DEFB68 80240CC8 8FBF001C */ lw $ra, 0x1c($sp) -/* DEFB6C 80240CCC 8FB20018 */ lw $s2, 0x18($sp) -/* DEFB70 80240CD0 8FB10014 */ lw $s1, 0x14($sp) -/* DEFB74 80240CD4 8FB00010 */ lw $s0, 0x10($sp) -/* DEFB78 80240CD8 03E00008 */ jr $ra -/* DEFB7C 80240CDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s deleted file mode 100644 index a641293bb6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s +++ /dev/null @@ -1,209 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802477C0_DF6660 -.word .L80240EC4_DEFD64, .L80240ED4_DEFD74, .L80240EEC_DEFD8C, .L80240EFC_DEFD9C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F14_DEFDB4, .L80240F24_DEFDC4, .L80240F3C_DEFDDC, .L80240F4C_DEFDEC, .L80240F6C_DEFE0C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F8C_DEFE2C, .L80240F84_DEFE24 - -.section .text - -glabel func_80240CE0_DEFB80 -/* DEFB80 80240CE0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DEFB84 80240CE4 AFB30054 */ sw $s3, 0x54($sp) -/* DEFB88 80240CE8 0080982D */ daddu $s3, $a0, $zero -/* DEFB8C 80240CEC AFBF0060 */ sw $ra, 0x60($sp) -/* DEFB90 80240CF0 AFB5005C */ sw $s5, 0x5c($sp) -/* DEFB94 80240CF4 AFB40058 */ sw $s4, 0x58($sp) -/* DEFB98 80240CF8 AFB20050 */ sw $s2, 0x50($sp) -/* DEFB9C 80240CFC AFB1004C */ sw $s1, 0x4c($sp) -/* DEFBA0 80240D00 AFB00048 */ sw $s0, 0x48($sp) -/* DEFBA4 80240D04 8E710148 */ lw $s1, 0x148($s3) -/* DEFBA8 80240D08 86240008 */ lh $a0, 8($s1) -/* DEFBAC 80240D0C 0C00EABB */ jal get_npc_unsafe -/* DEFBB0 80240D10 00A0802D */ daddu $s0, $a1, $zero -/* DEFBB4 80240D14 8E63000C */ lw $v1, 0xc($s3) -/* DEFBB8 80240D18 0260202D */ daddu $a0, $s3, $zero -/* DEFBBC 80240D1C 8C650000 */ lw $a1, ($v1) -/* DEFBC0 80240D20 0C0B1EAF */ jal evt_get_variable -/* DEFBC4 80240D24 0040902D */ daddu $s2, $v0, $zero -/* DEFBC8 80240D28 AFA00018 */ sw $zero, 0x18($sp) -/* DEFBCC 80240D2C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBD0 80240D30 8C630030 */ lw $v1, 0x30($v1) -/* DEFBD4 80240D34 AFA3001C */ sw $v1, 0x1c($sp) -/* DEFBD8 80240D38 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBDC 80240D3C 8C63001C */ lw $v1, 0x1c($v1) -/* DEFBE0 80240D40 AFA30020 */ sw $v1, 0x20($sp) -/* DEFBE4 80240D44 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBE8 80240D48 8C630024 */ lw $v1, 0x24($v1) -/* DEFBEC 80240D4C AFA30024 */ sw $v1, 0x24($sp) -/* DEFBF0 80240D50 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBF4 80240D54 8C630028 */ lw $v1, 0x28($v1) -/* DEFBF8 80240D58 27B50018 */ addiu $s5, $sp, 0x18 -/* DEFBFC 80240D5C AFA30028 */ sw $v1, 0x28($sp) -/* DEFC00 80240D60 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFC04 80240D64 3C014282 */ lui $at, 0x4282 -/* DEFC08 80240D68 44810000 */ mtc1 $at, $f0 -/* DEFC0C 80240D6C 8C63002C */ lw $v1, 0x2c($v1) -/* DEFC10 80240D70 0040A02D */ daddu $s4, $v0, $zero -/* DEFC14 80240D74 E7A00030 */ swc1 $f0, 0x30($sp) -/* DEFC18 80240D78 A7A00034 */ sh $zero, 0x34($sp) -/* DEFC1C 80240D7C 16000005 */ bnez $s0, .L80240D94 -/* DEFC20 80240D80 AFA3002C */ sw $v1, 0x2c($sp) -/* DEFC24 80240D84 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEFC28 80240D88 30420004 */ andi $v0, $v0, 4 -/* DEFC2C 80240D8C 10400044 */ beqz $v0, .L80240EA0 -/* DEFC30 80240D90 00000000 */ nop -.L80240D94: -/* DEFC34 80240D94 2404F7FF */ addiu $a0, $zero, -0x801 -/* DEFC38 80240D98 AE600070 */ sw $zero, 0x70($s3) -/* DEFC3C 80240D9C A640008E */ sh $zero, 0x8e($s2) -/* DEFC40 80240DA0 8E2200CC */ lw $v0, 0xcc($s1) -/* DEFC44 80240DA4 8E430000 */ lw $v1, ($s2) -/* DEFC48 80240DA8 8C420000 */ lw $v0, ($v0) -/* DEFC4C 80240DAC 00641824 */ and $v1, $v1, $a0 -/* DEFC50 80240DB0 AE430000 */ sw $v1, ($s2) -/* DEFC54 80240DB4 AE420028 */ sw $v0, 0x28($s2) -/* DEFC58 80240DB8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFC5C 80240DBC 8C420034 */ lw $v0, 0x34($v0) -/* DEFC60 80240DC0 54400005 */ bnel $v0, $zero, .L80240DD8 -/* DEFC64 80240DC4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DEFC68 80240DC8 34620200 */ ori $v0, $v1, 0x200 -/* DEFC6C 80240DCC 2403FFF7 */ addiu $v1, $zero, -9 -/* DEFC70 80240DD0 08090378 */ j .L80240DE0 -/* DEFC74 80240DD4 00431024 */ and $v0, $v0, $v1 -.L80240DD8: -/* DEFC78 80240DD8 00621024 */ and $v0, $v1, $v0 -/* DEFC7C 80240DDC 34420008 */ ori $v0, $v0, 8 -.L80240DE0: -/* DEFC80 80240DE0 AE420000 */ sw $v0, ($s2) -/* DEFC84 80240DE4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEFC88 80240DE8 30420004 */ andi $v0, $v0, 4 -/* DEFC8C 80240DEC 10400004 */ beqz $v0, .L80240E00 -/* DEFC90 80240DF0 24020063 */ addiu $v0, $zero, 0x63 -/* DEFC94 80240DF4 AE620070 */ sw $v0, 0x70($s3) -/* DEFC98 80240DF8 08090386 */ j .L80240E18 -/* DEFC9C 80240DFC AE600074 */ sw $zero, 0x74($s3) -.L80240E00: -/* DEFCA0 80240E00 8E220000 */ lw $v0, ($s1) -/* DEFCA4 80240E04 3C034000 */ lui $v1, 0x4000 -/* DEFCA8 80240E08 00431024 */ and $v0, $v0, $v1 -/* DEFCAC 80240E0C 10400002 */ beqz $v0, .L80240E18 -/* DEFCB0 80240E10 2402000C */ addiu $v0, $zero, 0xc -/* DEFCB4 80240E14 AE620070 */ sw $v0, 0x70($s3) -.L80240E18: -/* DEFCB8 80240E18 3C06BFFF */ lui $a2, 0xbfff -/* DEFCBC 80240E1C 34C6FFFF */ ori $a2, $a2, 0xffff -/* DEFCC0 80240E20 27A50038 */ addiu $a1, $sp, 0x38 -/* DEFCC4 80240E24 2404FFFB */ addiu $a0, $zero, -5 -/* DEFCC8 80240E28 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEFCCC 80240E2C 8E230000 */ lw $v1, ($s1) -/* DEFCD0 80240E30 3C0142C8 */ lui $at, 0x42c8 -/* DEFCD4 80240E34 44810000 */ mtc1 $at, $f0 -/* DEFCD8 80240E38 00441024 */ and $v0, $v0, $a0 -/* DEFCDC 80240E3C 00661824 */ and $v1, $v1, $a2 -/* DEFCE0 80240E40 AE2200B0 */ sw $v0, 0xb0($s1) -/* DEFCE4 80240E44 AE230000 */ sw $v1, ($s1) -/* DEFCE8 80240E48 864200A8 */ lh $v0, 0xa8($s2) -/* DEFCEC 80240E4C 27A70040 */ addiu $a3, $sp, 0x40 -/* DEFCF0 80240E50 E7A00044 */ swc1 $f0, 0x44($sp) -/* DEFCF4 80240E54 C6460038 */ lwc1 $f6, 0x38($s2) -/* DEFCF8 80240E58 C640003C */ lwc1 $f0, 0x3c($s2) -/* DEFCFC 80240E5C C6420040 */ lwc1 $f2, 0x40($s2) -/* DEFD00 80240E60 44822000 */ mtc1 $v0, $f4 -/* DEFD04 80240E64 00000000 */ nop -/* DEFD08 80240E68 46802120 */ cvt.s.w $f4, $f4 -/* DEFD0C 80240E6C 27A20044 */ addiu $v0, $sp, 0x44 -/* DEFD10 80240E70 46040000 */ add.s $f0, $f0, $f4 -/* DEFD14 80240E74 E7A60038 */ swc1 $f6, 0x38($sp) -/* DEFD18 80240E78 E7A20040 */ swc1 $f2, 0x40($sp) -/* DEFD1C 80240E7C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DEFD20 80240E80 AFA20010 */ sw $v0, 0x10($sp) -/* DEFD24 80240E84 8E440080 */ lw $a0, 0x80($s2) -/* DEFD28 80240E88 0C0372DF */ jal npc_raycast_down_sides -/* DEFD2C 80240E8C 27A6003C */ addiu $a2, $sp, 0x3c -/* DEFD30 80240E90 10400003 */ beqz $v0, .L80240EA0 -/* DEFD34 80240E94 00000000 */ nop -/* DEFD38 80240E98 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DEFD3C 80240E9C E640003C */ swc1 $f0, 0x3c($s2) -.L80240EA0: -/* DEFD40 80240EA0 8E630070 */ lw $v1, 0x70($s3) -/* DEFD44 80240EA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DEFD48 80240EA8 10400038 */ beqz $v0, .L80240F8C_DEFE2C -/* DEFD4C 80240EAC 00031080 */ sll $v0, $v1, 2 -/* DEFD50 80240EB0 3C018024 */ lui $at, %hi(jtbl_802477C0_DF6660) -/* DEFD54 80240EB4 00220821 */ addu $at, $at, $v0 -/* DEFD58 80240EB8 8C2277C0 */ lw $v0, %lo(jtbl_802477C0_DF6660)($at) -/* DEFD5C 80240EBC 00400008 */ jr $v0 -/* DEFD60 80240EC0 00000000 */ nop -.L80240EC4_DEFD64: -/* DEFD64 80240EC4 0260202D */ daddu $a0, $s3, $zero -/* DEFD68 80240EC8 0280282D */ daddu $a1, $s4, $zero -/* DEFD6C 80240ECC 0C012568 */ jal func_800495A0 -/* DEFD70 80240ED0 02A0302D */ daddu $a2, $s5, $zero -.L80240ED4_DEFD74: -/* DEFD74 80240ED4 0260202D */ daddu $a0, $s3, $zero -/* DEFD78 80240ED8 0280282D */ daddu $a1, $s4, $zero -/* DEFD7C 80240EDC 0C0125AE */ jal func_800496B8 -/* DEFD80 80240EE0 02A0302D */ daddu $a2, $s5, $zero -/* DEFD84 80240EE4 080903E3 */ j .L80240F8C_DEFE2C -/* DEFD88 80240EE8 00000000 */ nop -.L80240EEC_DEFD8C: -/* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero -/* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero -/* DEFD94 80240EF4 0C0902B3 */ jal omo_17_UnkNpcAIFunc4 -/* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero -.L80240EFC_DEFD9C: -/* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero -/* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero -/* DEFDA4 80240F04 0C0902C7 */ jal func_80240B1C_DEF9BC -/* DEFDA8 80240F08 02A0302D */ daddu $a2, $s5, $zero -/* DEFDAC 80240F0C 080903E3 */ j .L80240F8C_DEFE2C -/* DEFDB0 80240F10 00000000 */ nop -.L80240F14_DEFDB4: -/* DEFDB4 80240F14 0260202D */ daddu $a0, $s3, $zero -/* DEFDB8 80240F18 0280282D */ daddu $a1, $s4, $zero -/* DEFDBC 80240F1C 0C01278F */ jal func_80049E3C -/* DEFDC0 80240F20 02A0302D */ daddu $a2, $s5, $zero -.L80240F24_DEFDC4: -/* DEFDC4 80240F24 0260202D */ daddu $a0, $s3, $zero -/* DEFDC8 80240F28 0280282D */ daddu $a1, $s4, $zero -/* DEFDCC 80240F2C 0C0127B3 */ jal func_80049ECC -/* DEFDD0 80240F30 02A0302D */ daddu $a2, $s5, $zero -/* DEFDD4 80240F34 080903E3 */ j .L80240F8C_DEFE2C -/* DEFDD8 80240F38 00000000 */ nop -.L80240F3C_DEFDDC: -/* DEFDDC 80240F3C 0260202D */ daddu $a0, $s3, $zero -/* DEFDE0 80240F40 0280282D */ daddu $a1, $s4, $zero -/* DEFDE4 80240F44 0C0127DF */ jal func_80049F7C -/* DEFDE8 80240F48 02A0302D */ daddu $a2, $s5, $zero -.L80240F4C_DEFDEC: -/* DEFDEC 80240F4C 0260202D */ daddu $a0, $s3, $zero -/* DEFDF0 80240F50 0280282D */ daddu $a1, $s4, $zero -/* DEFDF4 80240F54 0C012849 */ jal func_8004A124 -/* DEFDF8 80240F58 02A0302D */ daddu $a2, $s5, $zero -/* DEFDFC 80240F5C 8E630070 */ lw $v1, 0x70($s3) -/* DEFE00 80240F60 2402000E */ addiu $v0, $zero, 0xe -/* DEFE04 80240F64 14620009 */ bne $v1, $v0, .L80240F8C_DEFE2C -/* DEFE08 80240F68 00000000 */ nop -.L80240F6C_DEFE0C: -/* DEFE0C 80240F6C 0260202D */ daddu $a0, $s3, $zero -/* DEFE10 80240F70 0280282D */ daddu $a1, $s4, $zero -/* DEFE14 80240F74 0C0128FA */ jal func_8004A3E8 -/* DEFE18 80240F78 02A0302D */ daddu $a2, $s5, $zero -/* DEFE1C 80240F7C 080903E3 */ j .L80240F8C_DEFE2C -/* DEFE20 80240F80 00000000 */ nop -.L80240F84_DEFE24: -/* DEFE24 80240F84 0C0129CF */ jal func_8004A73C -/* DEFE28 80240F88 0260202D */ daddu $a0, $s3, $zero -.L80240F8C_DEFE2C: -/* DEFE2C 80240F8C 8FBF0060 */ lw $ra, 0x60($sp) -/* DEFE30 80240F90 8FB5005C */ lw $s5, 0x5c($sp) -/* DEFE34 80240F94 8FB40058 */ lw $s4, 0x58($sp) -/* DEFE38 80240F98 8FB30054 */ lw $s3, 0x54($sp) -/* DEFE3C 80240F9C 8FB20050 */ lw $s2, 0x50($sp) -/* DEFE40 80240FA0 8FB1004C */ lw $s1, 0x4c($sp) -/* DEFE44 80240FA4 8FB00048 */ lw $s0, 0x48($sp) -/* DEFE48 80240FA8 0000102D */ daddu $v0, $zero, $zero -/* DEFE4C 80240FAC 03E00008 */ jr $ra -/* DEFE50 80240FB0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240678_AACEA8.s b/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240678_AACEA8.s deleted file mode 100644 index 625f21e142..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240678_AACEA8.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240678_AACEA8 -/* AACEA8 80240678 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AACEAC 8024067C AFBF0018 */ sw $ra, 0x18($sp) -/* AACEB0 80240680 8C82000C */ lw $v0, 0xc($a0) -/* AACEB4 80240684 8C440000 */ lw $a0, ($v0) -/* AACEB8 80240688 24420004 */ addiu $v0, $v0, 4 -/* AACEBC 8024068C 8C450000 */ lw $a1, ($v0) -/* AACEC0 80240690 24420004 */ addiu $v0, $v0, 4 -/* AACEC4 80240694 8C460000 */ lw $a2, ($v0) -/* AACEC8 80240698 24420004 */ addiu $v0, $v0, 4 -/* AACECC 8024069C 8C470000 */ lw $a3, ($v0) -/* AACED0 802406A0 24420004 */ addiu $v0, $v0, 4 -/* AACED4 802406A4 8C430000 */ lw $v1, ($v0) -/* AACED8 802406A8 8C420004 */ lw $v0, 4($v0) -/* AACEDC 802406AC 306300FF */ andi $v1, $v1, 0xff -/* AACEE0 802406B0 304200FF */ andi $v0, $v0, 0xff -/* AACEE4 802406B4 308400FF */ andi $a0, $a0, 0xff -/* AACEE8 802406B8 30A500FF */ andi $a1, $a1, 0xff -/* AACEEC 802406BC 30C600FF */ andi $a2, $a2, 0xff -/* AACEF0 802406C0 30E700FF */ andi $a3, $a3, 0xff -/* AACEF4 802406C4 AFA30010 */ sw $v1, 0x10($sp) -/* AACEF8 802406C8 0C046FE6 */ jal set_model_env_color_parameters -/* AACEFC 802406CC AFA20014 */ sw $v0, 0x14($sp) -/* AACF00 802406D0 8FBF0018 */ lw $ra, 0x18($sp) -/* AACF04 802406D4 24020002 */ addiu $v0, $zero, 2 -/* AACF08 802406D8 03E00008 */ jr $ra -/* AACF0C 802406DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s deleted file mode 100644 index 0b977f9023..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A48_AB0A38 -/* AB0A38 80240A48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0A3C 80240A4C AFB00010 */ sw $s0, 0x10($sp) -/* AB0A40 80240A50 0080802D */ daddu $s0, $a0, $zero -/* AB0A44 80240A54 AFBF0014 */ sw $ra, 0x14($sp) -/* AB0A48 80240A58 0C00EABB */ jal get_npc_unsafe -/* AB0A4C 80240A5C 8E04008C */ lw $a0, 0x8c($s0) -/* AB0A50 80240A60 0040282D */ daddu $a1, $v0, $zero -/* AB0A54 80240A64 8E040094 */ lw $a0, 0x94($s0) -/* AB0A58 80240A68 8CA30028 */ lw $v1, 0x28($a1) -/* AB0A5C 80240A6C ACA40028 */ sw $a0, 0x28($a1) -/* AB0A60 80240A70 8FBF0014 */ lw $ra, 0x14($sp) -/* AB0A64 80240A74 8FB00010 */ lw $s0, 0x10($sp) -/* AB0A68 80240A78 24020002 */ addiu $v0, $zero, 2 -/* AB0A6C 80240A7C 3C018024 */ lui $at, %hi(D_80242344) -/* AB0A70 80240A80 AC232344 */ sw $v1, %lo(D_80242344)($at) -/* AB0A74 80240A84 03E00008 */ jr $ra -/* AB0A78 80240A88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s deleted file mode 100644 index be3baecd3a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A8C_AB0A7C -/* AB0A7C 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB0A80 80240A90 AFBF0010 */ sw $ra, 0x10($sp) -/* AB0A84 80240A94 0C00EABB */ jal get_npc_unsafe -/* AB0A88 80240A98 8C84008C */ lw $a0, 0x8c($a0) -/* AB0A8C 80240A9C 3C038024 */ lui $v1, %hi(D_80242344) -/* AB0A90 80240AA0 8C632344 */ lw $v1, %lo(D_80242344)($v1) -/* AB0A94 80240AA4 AC430028 */ sw $v1, 0x28($v0) -/* AB0A98 80240AA8 8FBF0010 */ lw $ra, 0x10($sp) -/* AB0A9C 80240AAC 24020002 */ addiu $v0, $zero, 2 -/* AB0AA0 80240AB0 03E00008 */ jr $ra -/* AB0AA4 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AB0AA8 80240AB8 00000000 */ nop -/* AB0AAC 80240ABC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s index 0a57b26bd4..3a4ae71920 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s @@ -129,7 +129,7 @@ glabel func_802401B0_D54840 /* D549EC 8024035C AFA00010 */ sw $zero, 0x10($sp) /* D549F0 80240360 8E86000C */ lw $a2, 0xc($s4) /* D549F4 80240364 8E870010 */ lw $a3, 0x10($s4) -/* D549F8 80240368 0C01242D */ jal func_800490B4 +/* D549F8 80240368 0C01242D */ jal basic_ai_check_player_dist /* D549FC 8024036C 0240282D */ daddu $a1, $s2, $zero /* D54A00 80240370 10400006 */ beqz $v0, .L8024038C /* D54A04 80240374 0220202D */ daddu $a0, $s1, $zero diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s index ee3681c6c1..1e2ef9aaf5 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s @@ -129,7 +129,7 @@ glabel func_80240F20_D601D0 /* D6037C 802410CC AFA00010 */ sw $zero, 0x10($sp) /* D60380 802410D0 8E86000C */ lw $a2, 0xc($s4) /* D60384 802410D4 8E870010 */ lw $a3, 0x10($s4) -/* D60388 802410D8 0C01242D */ jal func_800490B4 +/* D60388 802410D8 0C01242D */ jal basic_ai_check_player_dist /* D6038C 802410DC 0240282D */ daddu $a1, $s2, $zero /* D60390 802410E0 10400006 */ beqz $v0, .L802410FC /* D60394 802410E4 0220202D */ daddu $a0, $s1, $zero diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index c358b847a7..09497bee53 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -97,7 +97,7 @@ glabel func_802423CC_D8F61C /* D8F75C 8024250C 8E22006C */ lw $v0, 0x6c($s1) /* D8F760 80242510 14400006 */ bnez $v0, .L8024252C /* D8F764 80242514 00000000 */ nop -/* D8F768 80242518 0C0907EE */ jal pra_35_UnkNpcAIFunc26 +/* D8F768 80242518 0C0907EE */ jal pra_35_MeleeHitbox_CanSeePlayer /* D8F76C 8024251C 0240202D */ daddu $a0, $s2, $zero /* D8F770 80242520 10400002 */ beqz $v0, .L8024252C /* D8F774 80242524 2402001E */ addiu $v0, $zero, 0x1e @@ -115,89 +115,89 @@ glabel func_802423CC_D8F61C .L80242550_D8F7A0: /* D8F7A0 80242550 0240202D */ daddu $a0, $s2, $zero /* D8F7A4 80242554 0260282D */ daddu $a1, $s3, $zero -/* D8F7A8 80242558 0C0903C8 */ jal pra_35_UnkNpcAIFunc24 +/* D8F7A8 80242558 0C0903C8 */ jal pra_35_PatrolAI_MoveInit /* D8F7AC 8024255C 0280302D */ daddu $a2, $s4, $zero .L80242560_D8F7B0: /* D8F7B0 80242560 0240202D */ daddu $a0, $s2, $zero /* D8F7B4 80242564 0260282D */ daddu $a1, $s3, $zero -/* D8F7B8 80242568 0C09041E */ jal pra_35_UnkFunc13 +/* D8F7B8 80242568 0C09041E */ jal pra_35_PatrolAI_Move /* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero /* D8F7C0 80242570 0809099C */ j .L80242670_D8F8C0 /* D8F7C4 80242574 00000000 */ nop .L80242578_D8F7C8: /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero -/* D8F7D0 80242580 0C0904C8 */ jal pra_35_UnkNpcAIFunc1 +/* D8F7D0 80242580 0C0904C8 */ jal pra_35_PatrolAI_LoiterInit /* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero .L80242588_D8F7D8: /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero -/* D8F7E0 80242590 0C0904F8 */ jal pra_35_UnkFunc14 +/* D8F7E0 80242590 0C0904F8 */ jal pra_35_PatrolAI_Loiter /* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero /* D8F7E8 80242598 0809099C */ j .L80242670_D8F8C0 /* D8F7EC 8024259C 00000000 */ nop .L802425A0_D8F7F0: /* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero /* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero -/* D8F7F8 802425A8 0C090567 */ jal pra_35_UnkNpcAIFunc25 +/* D8F7F8 802425A8 0C090567 */ jal pra_35_PatrolAI_PostLoiter /* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero /* D8F800 802425B0 0809099C */ j .L80242670_D8F8C0 /* D8F804 802425B4 00000000 */ nop .L802425B8_D8F808: /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero /* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero -/* D8F810 802425C0 0C090594 */ jal pra_35_NpcJumpFunc2 +/* D8F810 802425C0 0C090594 */ jal pra_35_PatrolAI_JumpInit /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero .L802425C8_D8F818: /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero -/* D8F820 802425D0 0C0905B1 */ jal pra_35_NpcJumpFunc +/* D8F820 802425D0 0C0905B1 */ jal pra_35_PatrolAI_Jump /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero /* D8F828 802425D8 0809099C */ j .L80242670_D8F8C0 /* D8F82C 802425DC 00000000 */ nop .L802425E0_D8F830: /* D8F830 802425E0 0240202D */ daddu $a0, $s2, $zero /* D8F834 802425E4 0260282D */ daddu $a1, $s3, $zero -/* D8F838 802425E8 0C0905CF */ jal pra_35_UnkNpcAIFunc13 +/* D8F838 802425E8 0C0905CF */ jal pra_35_PatrolAI_ChaseInit /* D8F83C 802425EC 0280302D */ daddu $a2, $s4, $zero .L802425F0_D8F840: /* D8F840 802425F0 0240202D */ daddu $a0, $s2, $zero /* D8F844 802425F4 0260282D */ daddu $a1, $s3, $zero -/* D8F848 802425F8 0C09061B */ jal pra_35_UnkFunc15 +/* D8F848 802425F8 0C09061B */ jal pra_35_PatrolAI_Chase /* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero /* D8F850 80242600 0809099C */ j .L80242670_D8F8C0 /* D8F854 80242604 00000000 */ nop .L80242608_D8F858: /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero -/* D8F860 80242610 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc +/* D8F860 80242610 0C090663 */ jal pra_35_PatrolAI_LosePlayer /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670_D8F8C0 /* D8F86C 8024261C 00000000 */ nop .L80242620_D8F870: -/* D8F870 80242620 0C09076C */ jal pra_35_UnkNpcAIFunc6 +/* D8F870 80242620 0C09076C */ jal pra_35_MeleeHitbox_30 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero .L80242628_D8F878: -/* D8F878 80242628 0C090787 */ jal pra_35_UnkNpcAIFunc7 +/* D8F878 80242628 0C090787 */ jal pra_35_MeleeHitbox_31 /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 /* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670_D8F8C0 /* D8F88C 8024263C 00000000 */ nop .L80242640_D8F890: -/* D8F890 80242640 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 +/* D8F890 80242640 0C0907A3 */ jal pra_35_MeleeHitbox_32 /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670_D8F8C0 /* D8F8A4 80242654 00000000 */ nop .L80242658_D8F8A8: -/* D8F8A8 80242658 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 +/* D8F8A8 80242658 0C0907D9 */ jal pra_35_MeleeHitbox_33 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670_D8F8C0 /* D8F8B4 80242664 00000000 */ nop .L80242668_D8F8B8: -/* D8F8B8 80242668 0C0129CF */ jal func_8004A73C +/* D8F8B8 80242668 0C0129CF */ jal basic_ai_suspend /* D8F8BC 8024266C 0240202D */ daddu $a0, $s2, $zero .L80242670_D8F8C0: /* D8F8C0 80242670 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s b/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s index 6e7c8ad56a..26e7437eac 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s @@ -129,7 +129,7 @@ glabel func_80240F50_D96540 /* D966EC 802410FC AFA00010 */ sw $zero, 0x10($sp) /* D966F0 80241100 8E86000C */ lw $a2, 0xc($s4) /* D966F4 80241104 8E870010 */ lw $a3, 0x10($s4) -/* D966F8 80241108 0C01242D */ jal func_800490B4 +/* D966F8 80241108 0C01242D */ jal basic_ai_check_player_dist /* D966FC 8024110C 0240282D */ daddu $a1, $s2, $zero /* D96700 80241110 10400006 */ beqz $v0, .L8024112C /* D96704 80241114 0220202D */ daddu $a0, $s1, $zero diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s index c3deb9dc2c..9a0375fa2c 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s @@ -129,7 +129,7 @@ glabel func_80240F50_D987E0 /* D9898C 802410FC AFA00010 */ sw $zero, 0x10($sp) /* D98990 80241100 8E86000C */ lw $a2, 0xc($s4) /* D98994 80241104 8E870010 */ lw $a3, 0x10($s4) -/* D98998 80241108 0C01242D */ jal func_800490B4 +/* D98998 80241108 0C01242D */ jal basic_ai_check_player_dist /* D9899C 8024110C 0240282D */ daddu $a1, $s2, $zero /* D989A0 80241110 10400006 */ beqz $v0, .L8024112C /* D989A4 80241114 0220202D */ daddu $a0, $s1, $zero diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s deleted file mode 100644 index 6a70c793d0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A10_CF9580 -/* CF9580 80241A10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF9584 80241A14 AFB00010 */ sw $s0, 0x10($sp) -/* CF9588 80241A18 0080802D */ daddu $s0, $a0, $zero -/* CF958C 80241A1C AFBF0014 */ sw $ra, 0x14($sp) -/* CF9590 80241A20 0C00EABB */ jal get_npc_unsafe -/* CF9594 80241A24 8E04008C */ lw $a0, 0x8c($s0) -/* CF9598 80241A28 0040282D */ daddu $a1, $v0, $zero -/* CF959C 80241A2C 8E040094 */ lw $a0, 0x94($s0) -/* CF95A0 80241A30 8CA30028 */ lw $v1, 0x28($a1) -/* CF95A4 80241A34 ACA40028 */ sw $a0, 0x28($a1) -/* CF95A8 80241A38 8FBF0014 */ lw $ra, 0x14($sp) -/* CF95AC 80241A3C 8FB00010 */ lw $s0, 0x10($sp) -/* CF95B0 80241A40 24020002 */ addiu $v0, $zero, 2 -/* CF95B4 80241A44 3C018025 */ lui $at, %hi(D_8024DF24) -/* CF95B8 80241A48 AC23DF24 */ sw $v1, %lo(D_8024DF24)($at) -/* CF95BC 80241A4C 03E00008 */ jr $ra -/* CF95C0 80241A50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s deleted file mode 100644 index 4915b82485..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A54_CF95C4 -/* CF95C4 80241A54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF95C8 80241A58 AFBF0010 */ sw $ra, 0x10($sp) -/* CF95CC 80241A5C 0C00EABB */ jal get_npc_unsafe -/* CF95D0 80241A60 8C84008C */ lw $a0, 0x8c($a0) -/* CF95D4 80241A64 3C038025 */ lui $v1, %hi(D_8024DF24) -/* CF95D8 80241A68 8C63DF24 */ lw $v1, %lo(D_8024DF24)($v1) -/* CF95DC 80241A6C AC430028 */ sw $v1, 0x28($v0) -/* CF95E0 80241A70 8FBF0010 */ lw $ra, 0x10($sp) -/* CF95E4 80241A74 24020002 */ addiu $v0, $zero, 2 -/* CF95E8 80241A78 03E00008 */ jr $ra -/* CF95EC 80241A7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240000_D110C0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240000_D110C0.s deleted file mode 100644 index 0fd6c4fa8b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240000_D110C0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D110C0 -/* D110C0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D110C4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* D110C8 80240008 0080802D */ daddu $s0, $a0, $zero -/* D110CC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* D110D0 80240010 0C00EABB */ jal get_npc_unsafe -/* D110D4 80240014 0000202D */ daddu $a0, $zero, $zero -/* D110D8 80240018 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D110DC 8024001C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D110E0 80240020 C44C0038 */ lwc1 $f12, 0x38($v0) -/* D110E4 80240024 C44E0040 */ lwc1 $f14, 0x40($v0) -/* D110E8 80240028 8C660028 */ lw $a2, 0x28($v1) -/* D110EC 8024002C 0C00A720 */ jal atan2 -/* D110F0 80240030 8C670030 */ lw $a3, 0x30($v1) -/* D110F4 80240034 4600008D */ trunc.w.s $f2, $f0 -/* D110F8 80240038 E6020084 */ swc1 $f2, 0x84($s0) -/* D110FC 8024003C 8FBF0014 */ lw $ra, 0x14($sp) -/* D11100 80240040 8FB00010 */ lw $s0, 0x10($sp) -/* D11104 80240044 24020002 */ addiu $v0, $zero, 2 -/* D11108 80240048 03E00008 */ jr $ra -/* D1110C 8024004C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s deleted file mode 100644 index c20949f70f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241754_D19F34 -/* D19F34 80241754 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D19F38 80241758 AFB20038 */ sw $s2, 0x38($sp) -/* D19F3C 8024175C 0080902D */ daddu $s2, $a0, $zero -/* D19F40 80241760 AFBF0048 */ sw $ra, 0x48($sp) -/* D19F44 80241764 AFB50044 */ sw $s5, 0x44($sp) -/* D19F48 80241768 AFB40040 */ sw $s4, 0x40($sp) -/* D19F4C 8024176C AFB3003C */ sw $s3, 0x3c($sp) -/* D19F50 80241770 AFB10034 */ sw $s1, 0x34($sp) -/* D19F54 80241774 AFB00030 */ sw $s0, 0x30($sp) -/* D19F58 80241778 8E510148 */ lw $s1, 0x148($s2) -/* D19F5C 8024177C 86240008 */ lh $a0, 8($s1) -/* D19F60 80241780 0C00EABB */ jal get_npc_unsafe -/* D19F64 80241784 00A0802D */ daddu $s0, $a1, $zero -/* D19F68 80241788 8E43000C */ lw $v1, 0xc($s2) -/* D19F6C 8024178C 0240202D */ daddu $a0, $s2, $zero -/* D19F70 80241790 8C650000 */ lw $a1, ($v1) -/* D19F74 80241794 0C0B1EAF */ jal evt_get_variable -/* D19F78 80241798 0040A82D */ daddu $s5, $v0, $zero -/* D19F7C 8024179C AFA00010 */ sw $zero, 0x10($sp) -/* D19F80 802417A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19F84 802417A4 8C630030 */ lw $v1, 0x30($v1) -/* D19F88 802417A8 AFA30014 */ sw $v1, 0x14($sp) -/* D19F8C 802417AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19F90 802417B0 8C63001C */ lw $v1, 0x1c($v1) -/* D19F94 802417B4 AFA30018 */ sw $v1, 0x18($sp) -/* D19F98 802417B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19F9C 802417BC 8C630024 */ lw $v1, 0x24($v1) -/* D19FA0 802417C0 AFA3001C */ sw $v1, 0x1c($sp) -/* D19FA4 802417C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19FA8 802417C8 8C630028 */ lw $v1, 0x28($v1) -/* D19FAC 802417CC 27B40010 */ addiu $s4, $sp, 0x10 -/* D19FB0 802417D0 AFA30020 */ sw $v1, 0x20($sp) -/* D19FB4 802417D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D19FB8 802417D8 3C014348 */ lui $at, 0x4348 -/* D19FBC 802417DC 44810000 */ mtc1 $at, $f0 -/* D19FC0 802417E0 8C63002C */ lw $v1, 0x2c($v1) -/* D19FC4 802417E4 0040982D */ daddu $s3, $v0, $zero -/* D19FC8 802417E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* D19FCC 802417EC A7A0002C */ sh $zero, 0x2c($sp) -/* D19FD0 802417F0 16000005 */ bnez $s0, .L80241808 -/* D19FD4 802417F4 AFA30024 */ sw $v1, 0x24($sp) -/* D19FD8 802417F8 8E2200B0 */ lw $v0, 0xb0($s1) -/* D19FDC 802417FC 30420004 */ andi $v0, $v0, 4 -/* D19FE0 80241800 10400011 */ beqz $v0, .L80241848 -/* D19FE4 80241804 00000000 */ nop -.L80241808: -/* D19FE8 80241808 AE400070 */ sw $zero, 0x70($s2) -/* D19FEC 8024180C A6A0008E */ sh $zero, 0x8e($s5) -/* D19FF0 80241810 8E2200CC */ lw $v0, 0xcc($s1) -/* D19FF4 80241814 8C420000 */ lw $v0, ($v0) -/* D19FF8 80241818 AEA20028 */ sw $v0, 0x28($s5) -/* D19FFC 8024181C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D1A000 80241820 30420004 */ andi $v0, $v0, 4 -/* D1A004 80241824 10400008 */ beqz $v0, .L80241848 -/* D1A008 80241828 AE20006C */ sw $zero, 0x6c($s1) -/* D1A00C 8024182C 24020063 */ addiu $v0, $zero, 0x63 -/* D1A010 80241830 AE420070 */ sw $v0, 0x70($s2) -/* D1A014 80241834 AE400074 */ sw $zero, 0x74($s2) -/* D1A018 80241838 8E2200B0 */ lw $v0, 0xb0($s1) -/* D1A01C 8024183C 2403FFFB */ addiu $v1, $zero, -5 -/* D1A020 80241840 00431024 */ and $v0, $v0, $v1 -/* D1A024 80241844 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241848: -/* D1A028 80241848 8E430070 */ lw $v1, 0x70($s2) -/* D1A02C 8024184C 2410000B */ addiu $s0, $zero, 0xb -/* D1A030 80241850 1070002A */ beq $v1, $s0, .L802418FC -/* D1A034 80241854 2862000C */ slti $v0, $v1, 0xc -/* D1A038 80241858 1040000D */ beqz $v0, .L80241890 -/* D1A03C 8024185C 24020001 */ addiu $v0, $zero, 1 -/* D1A040 80241860 1062001A */ beq $v1, $v0, .L802418CC -/* D1A044 80241864 28620002 */ slti $v0, $v1, 2 -/* D1A048 80241868 10400005 */ beqz $v0, .L80241880 -/* D1A04C 8024186C 2402000A */ addiu $v0, $zero, 0xa -/* D1A050 80241870 10600013 */ beqz $v1, .L802418C0 -/* D1A054 80241874 0240202D */ daddu $a0, $s2, $zero -/* D1A058 80241878 0809065F */ j .L8024197C -/* D1A05C 8024187C 00000000 */ nop -.L80241880: -/* D1A060 80241880 10620018 */ beq $v1, $v0, .L802418E4 -/* D1A064 80241884 0240202D */ daddu $a0, $s2, $zero -/* D1A068 80241888 0809065F */ j .L8024197C -/* D1A06C 8024188C 00000000 */ nop -.L80241890: -/* D1A070 80241890 2402000D */ addiu $v0, $zero, 0xd -/* D1A074 80241894 10620029 */ beq $v1, $v0, .L8024193C -/* D1A078 80241898 0062102A */ slt $v0, $v1, $v0 -/* D1A07C 8024189C 14400020 */ bnez $v0, .L80241920 -/* D1A080 802418A0 0240202D */ daddu $a0, $s2, $zero -/* D1A084 802418A4 2402000E */ addiu $v0, $zero, 0xe -/* D1A088 802418A8 1062002D */ beq $v1, $v0, .L80241960 -/* D1A08C 802418AC 24020063 */ addiu $v0, $zero, 0x63 -/* D1A090 802418B0 10620030 */ beq $v1, $v0, .L80241974 -/* D1A094 802418B4 00000000 */ nop -/* D1A098 802418B8 0809065F */ j .L8024197C -/* D1A09C 802418BC 00000000 */ nop -.L802418C0: -/* D1A0A0 802418C0 0260282D */ daddu $a1, $s3, $zero -/* D1A0A4 802418C4 0C090234 */ jal sam_05_UnkNpcAIFunc31 -/* D1A0A8 802418C8 0280302D */ daddu $a2, $s4, $zero -.L802418CC: -/* D1A0AC 802418CC 0240202D */ daddu $a0, $s2, $zero -/* D1A0B0 802418D0 0260282D */ daddu $a1, $s3, $zero -/* D1A0B4 802418D4 0C09024F */ jal sam_05_UnkNpcAIFunc32 -/* D1A0B8 802418D8 0280302D */ daddu $a2, $s4, $zero -/* D1A0BC 802418DC 0809065F */ j .L8024197C -/* D1A0C0 802418E0 00000000 */ nop -.L802418E4: -/* D1A0C4 802418E4 0260282D */ daddu $a1, $s3, $zero -/* D1A0C8 802418E8 0C09028E */ jal sam_05_UnkNpcAIFunc46 -/* D1A0CC 802418EC 0280302D */ daddu $a2, $s4, $zero -/* D1A0D0 802418F0 8E420070 */ lw $v0, 0x70($s2) -/* D1A0D4 802418F4 14500021 */ bne $v0, $s0, .L8024197C -/* D1A0D8 802418F8 00000000 */ nop -.L802418FC: -/* D1A0DC 802418FC 0240202D */ daddu $a0, $s2, $zero -/* D1A0E0 80241900 0260282D */ daddu $a1, $s3, $zero -/* D1A0E4 80241904 0C09051E */ jal sam_05_UnkNpcDurationFlagFunc3 -/* D1A0E8 80241908 0280302D */ daddu $a2, $s4, $zero -/* D1A0EC 8024190C 8E430070 */ lw $v1, 0x70($s2) -/* D1A0F0 80241910 2402000C */ addiu $v0, $zero, 0xc -/* D1A0F4 80241914 14620019 */ bne $v1, $v0, .L8024197C -/* D1A0F8 80241918 00000000 */ nop -/* D1A0FC 8024191C 0240202D */ daddu $a0, $s2, $zero -.L80241920: -/* D1A100 80241920 0260282D */ daddu $a1, $s3, $zero -/* D1A104 80241924 0C090542 */ jal sam_05_UnkNpcAIFunc33 -/* D1A108 80241928 0280302D */ daddu $a2, $s4, $zero -/* D1A10C 8024192C 8E430070 */ lw $v1, 0x70($s2) -/* D1A110 80241930 2402000D */ addiu $v0, $zero, 0xd -/* D1A114 80241934 14620011 */ bne $v1, $v0, .L8024197C -/* D1A118 80241938 00000000 */ nop -.L8024193C: -/* D1A11C 8024193C 0240202D */ daddu $a0, $s2, $zero -/* D1A120 80241940 0260282D */ daddu $a1, $s3, $zero -/* D1A124 80241944 0C090582 */ jal sam_05_UnkNpcDurationFlagFunc2 -/* D1A128 80241948 0280302D */ daddu $a2, $s4, $zero -/* D1A12C 8024194C 8E430070 */ lw $v1, 0x70($s2) -/* D1A130 80241950 2402000E */ addiu $v0, $zero, 0xe -/* D1A134 80241954 14620009 */ bne $v1, $v0, .L8024197C -/* D1A138 80241958 00000000 */ nop -/* D1A13C 8024195C 0240202D */ daddu $a0, $s2, $zero -.L80241960: -/* D1A140 80241960 0260282D */ daddu $a1, $s3, $zero -/* D1A144 80241964 0C09059A */ jal sam_05_UnkNpcAIFunc30 -/* D1A148 80241968 0280302D */ daddu $a2, $s4, $zero -/* D1A14C 8024196C 0809065F */ j .L8024197C -/* D1A150 80241970 00000000 */ nop -.L80241974: -/* D1A154 80241974 0C0129CF */ jal func_8004A73C -/* D1A158 80241978 0240202D */ daddu $a0, $s2, $zero -.L8024197C: -/* D1A15C 8024197C 8FBF0048 */ lw $ra, 0x48($sp) -/* D1A160 80241980 8FB50044 */ lw $s5, 0x44($sp) -/* D1A164 80241984 8FB40040 */ lw $s4, 0x40($sp) -/* D1A168 80241988 8FB3003C */ lw $s3, 0x3c($sp) -/* D1A16C 8024198C 8FB20038 */ lw $s2, 0x38($sp) -/* D1A170 80241990 8FB10034 */ lw $s1, 0x34($sp) -/* D1A174 80241994 8FB00030 */ lw $s0, 0x30($sp) -/* D1A178 80241998 0000102D */ daddu $v0, $zero, $zero -/* D1A17C 8024199C 03E00008 */ jr $ra -/* D1A180 802419A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s deleted file mode 100644 index 19b9911da1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424C8_D22358 -/* D22358 802424C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D2235C 802424CC AFB00010 */ sw $s0, 0x10($sp) -/* D22360 802424D0 0080802D */ daddu $s0, $a0, $zero -/* D22364 802424D4 AFBF0014 */ sw $ra, 0x14($sp) -/* D22368 802424D8 0C00EABB */ jal get_npc_unsafe -/* D2236C 802424DC 8E04008C */ lw $a0, 0x8c($s0) -/* D22370 802424E0 0040282D */ daddu $a1, $v0, $zero -/* D22374 802424E4 8E040094 */ lw $a0, 0x94($s0) -/* D22378 802424E8 8CA30028 */ lw $v1, 0x28($a1) -/* D2237C 802424EC ACA40028 */ sw $a0, 0x28($a1) -/* D22380 802424F0 8FBF0014 */ lw $ra, 0x14($sp) -/* D22384 802424F4 8FB00010 */ lw $s0, 0x10($sp) -/* D22388 802424F8 24020002 */ addiu $v0, $zero, 2 -/* D2238C 802424FC 3C018025 */ lui $at, %hi(D_8024C1D8) -/* D22390 80242500 AC23C1D8 */ sw $v1, %lo(D_8024C1D8)($at) -/* D22394 80242504 03E00008 */ jr $ra -/* D22398 80242508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s deleted file mode 100644 index 1386233260..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024250C_D2239C -/* D2239C 8024250C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D223A0 80242510 AFBF0010 */ sw $ra, 0x10($sp) -/* D223A4 80242514 0C00EABB */ jal get_npc_unsafe -/* D223A8 80242518 8C84008C */ lw $a0, 0x8c($a0) -/* D223AC 8024251C 3C038025 */ lui $v1, %hi(D_8024C1D8) -/* D223B0 80242520 8C63C1D8 */ lw $v1, %lo(D_8024C1D8)($v1) -/* D223B4 80242524 AC430028 */ sw $v1, 0x28($v0) -/* D223B8 80242528 8FBF0010 */ lw $ra, 0x10($sp) -/* D223BC 8024252C 24020002 */ addiu $v0, $zero, 2 -/* D223C0 80242530 03E00008 */ jr $ra -/* D223C4 80242534 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s deleted file mode 100644 index af31e85518..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA4_D2DAD4 -/* D2DAD4 80241DA4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D2DAD8 80241DA8 AFB20038 */ sw $s2, 0x38($sp) -/* D2DADC 80241DAC 0080902D */ daddu $s2, $a0, $zero -/* D2DAE0 80241DB0 AFBF0048 */ sw $ra, 0x48($sp) -/* D2DAE4 80241DB4 AFB50044 */ sw $s5, 0x44($sp) -/* D2DAE8 80241DB8 AFB40040 */ sw $s4, 0x40($sp) -/* D2DAEC 80241DBC AFB3003C */ sw $s3, 0x3c($sp) -/* D2DAF0 80241DC0 AFB10034 */ sw $s1, 0x34($sp) -/* D2DAF4 80241DC4 AFB00030 */ sw $s0, 0x30($sp) -/* D2DAF8 80241DC8 8E510148 */ lw $s1, 0x148($s2) -/* D2DAFC 80241DCC 86240008 */ lh $a0, 8($s1) -/* D2DB00 80241DD0 0C00EABB */ jal get_npc_unsafe -/* D2DB04 80241DD4 00A0802D */ daddu $s0, $a1, $zero -/* D2DB08 80241DD8 8E43000C */ lw $v1, 0xc($s2) -/* D2DB0C 80241DDC 0240202D */ daddu $a0, $s2, $zero -/* D2DB10 80241DE0 8C650000 */ lw $a1, ($v1) -/* D2DB14 80241DE4 0C0B1EAF */ jal evt_get_variable -/* D2DB18 80241DE8 0040A82D */ daddu $s5, $v0, $zero -/* D2DB1C 80241DEC AFA00010 */ sw $zero, 0x10($sp) -/* D2DB20 80241DF0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB24 80241DF4 8C630030 */ lw $v1, 0x30($v1) -/* D2DB28 80241DF8 AFA30014 */ sw $v1, 0x14($sp) -/* D2DB2C 80241DFC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB30 80241E00 8C63001C */ lw $v1, 0x1c($v1) -/* D2DB34 80241E04 AFA30018 */ sw $v1, 0x18($sp) -/* D2DB38 80241E08 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB3C 80241E0C 8C630024 */ lw $v1, 0x24($v1) -/* D2DB40 80241E10 AFA3001C */ sw $v1, 0x1c($sp) -/* D2DB44 80241E14 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB48 80241E18 8C630028 */ lw $v1, 0x28($v1) -/* D2DB4C 80241E1C 27B40010 */ addiu $s4, $sp, 0x10 -/* D2DB50 80241E20 AFA30020 */ sw $v1, 0x20($sp) -/* D2DB54 80241E24 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB58 80241E28 3C014348 */ lui $at, 0x4348 -/* D2DB5C 80241E2C 44810000 */ mtc1 $at, $f0 -/* D2DB60 80241E30 8C63002C */ lw $v1, 0x2c($v1) -/* D2DB64 80241E34 0040982D */ daddu $s3, $v0, $zero -/* D2DB68 80241E38 E7A00028 */ swc1 $f0, 0x28($sp) -/* D2DB6C 80241E3C A7A0002C */ sh $zero, 0x2c($sp) -/* D2DB70 80241E40 16000005 */ bnez $s0, .L80241E58 -/* D2DB74 80241E44 AFA30024 */ sw $v1, 0x24($sp) -/* D2DB78 80241E48 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2DB7C 80241E4C 30420004 */ andi $v0, $v0, 4 -/* D2DB80 80241E50 10400011 */ beqz $v0, .L80241E98 -/* D2DB84 80241E54 00000000 */ nop -.L80241E58: -/* D2DB88 80241E58 AE400070 */ sw $zero, 0x70($s2) -/* D2DB8C 80241E5C A6A0008E */ sh $zero, 0x8e($s5) -/* D2DB90 80241E60 8E2200CC */ lw $v0, 0xcc($s1) -/* D2DB94 80241E64 8C420000 */ lw $v0, ($v0) -/* D2DB98 80241E68 AEA20028 */ sw $v0, 0x28($s5) -/* D2DB9C 80241E6C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2DBA0 80241E70 30420004 */ andi $v0, $v0, 4 -/* D2DBA4 80241E74 10400008 */ beqz $v0, .L80241E98 -/* D2DBA8 80241E78 AE20006C */ sw $zero, 0x6c($s1) -/* D2DBAC 80241E7C 24020063 */ addiu $v0, $zero, 0x63 -/* D2DBB0 80241E80 AE420070 */ sw $v0, 0x70($s2) -/* D2DBB4 80241E84 AE400074 */ sw $zero, 0x74($s2) -/* D2DBB8 80241E88 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2DBBC 80241E8C 2403FFFB */ addiu $v1, $zero, -5 -/* D2DBC0 80241E90 00431024 */ and $v0, $v0, $v1 -/* D2DBC4 80241E94 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241E98: -/* D2DBC8 80241E98 8E430070 */ lw $v1, 0x70($s2) -/* D2DBCC 80241E9C 2410000B */ addiu $s0, $zero, 0xb -/* D2DBD0 80241EA0 1070002A */ beq $v1, $s0, .L80241F4C -/* D2DBD4 80241EA4 2862000C */ slti $v0, $v1, 0xc -/* D2DBD8 80241EA8 1040000D */ beqz $v0, .L80241EE0 -/* D2DBDC 80241EAC 24020001 */ addiu $v0, $zero, 1 -/* D2DBE0 80241EB0 1062001A */ beq $v1, $v0, .L80241F1C -/* D2DBE4 80241EB4 28620002 */ slti $v0, $v1, 2 -/* D2DBE8 80241EB8 10400005 */ beqz $v0, .L80241ED0 -/* D2DBEC 80241EBC 2402000A */ addiu $v0, $zero, 0xa -/* D2DBF0 80241EC0 10600013 */ beqz $v1, .L80241F10 -/* D2DBF4 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* D2DBF8 80241EC8 080907F3 */ j .L80241FCC -/* D2DBFC 80241ECC 00000000 */ nop -.L80241ED0: -/* D2DC00 80241ED0 10620018 */ beq $v1, $v0, .L80241F34 -/* D2DC04 80241ED4 0240202D */ daddu $a0, $s2, $zero -/* D2DC08 80241ED8 080907F3 */ j .L80241FCC -/* D2DC0C 80241EDC 00000000 */ nop -.L80241EE0: -/* D2DC10 80241EE0 2402000D */ addiu $v0, $zero, 0xd -/* D2DC14 80241EE4 10620029 */ beq $v1, $v0, .L80241F8C -/* D2DC18 80241EE8 0062102A */ slt $v0, $v1, $v0 -/* D2DC1C 80241EEC 14400020 */ bnez $v0, .L80241F70 -/* D2DC20 80241EF0 0240202D */ daddu $a0, $s2, $zero -/* D2DC24 80241EF4 2402000E */ addiu $v0, $zero, 0xe -/* D2DC28 80241EF8 1062002D */ beq $v1, $v0, .L80241FB0 -/* D2DC2C 80241EFC 24020063 */ addiu $v0, $zero, 0x63 -/* D2DC30 80241F00 10620030 */ beq $v1, $v0, .L80241FC4 -/* D2DC34 80241F04 00000000 */ nop -/* D2DC38 80241F08 080907F3 */ j .L80241FCC -/* D2DC3C 80241F0C 00000000 */ nop -.L80241F10: -/* D2DC40 80241F10 0260282D */ daddu $a1, $s3, $zero -/* D2DC44 80241F14 0C0903C8 */ jal sam_07_UnkNpcAIFunc31 -/* D2DC48 80241F18 0280302D */ daddu $a2, $s4, $zero -.L80241F1C: -/* D2DC4C 80241F1C 0240202D */ daddu $a0, $s2, $zero -/* D2DC50 80241F20 0260282D */ daddu $a1, $s3, $zero -/* D2DC54 80241F24 0C0903E3 */ jal sam_07_UnkNpcAIFunc32 -/* D2DC58 80241F28 0280302D */ daddu $a2, $s4, $zero -/* D2DC5C 80241F2C 080907F3 */ j .L80241FCC -/* D2DC60 80241F30 00000000 */ nop -.L80241F34: -/* D2DC64 80241F34 0260282D */ daddu $a1, $s3, $zero -/* D2DC68 80241F38 0C090422 */ jal sam_07_UnkNpcAIFunc46 -/* D2DC6C 80241F3C 0280302D */ daddu $a2, $s4, $zero -/* D2DC70 80241F40 8E420070 */ lw $v0, 0x70($s2) -/* D2DC74 80241F44 14500021 */ bne $v0, $s0, .L80241FCC -/* D2DC78 80241F48 00000000 */ nop -.L80241F4C: -/* D2DC7C 80241F4C 0240202D */ daddu $a0, $s2, $zero -/* D2DC80 80241F50 0260282D */ daddu $a1, $s3, $zero -/* D2DC84 80241F54 0C0906B2 */ jal sam_07_UnkNpcDurationFlagFunc3 -/* D2DC88 80241F58 0280302D */ daddu $a2, $s4, $zero -/* D2DC8C 80241F5C 8E430070 */ lw $v1, 0x70($s2) -/* D2DC90 80241F60 2402000C */ addiu $v0, $zero, 0xc -/* D2DC94 80241F64 14620019 */ bne $v1, $v0, .L80241FCC -/* D2DC98 80241F68 00000000 */ nop -/* D2DC9C 80241F6C 0240202D */ daddu $a0, $s2, $zero -.L80241F70: -/* D2DCA0 80241F70 0260282D */ daddu $a1, $s3, $zero -/* D2DCA4 80241F74 0C0906D6 */ jal sam_07_UnkNpcAIFunc33 -/* D2DCA8 80241F78 0280302D */ daddu $a2, $s4, $zero -/* D2DCAC 80241F7C 8E430070 */ lw $v1, 0x70($s2) -/* D2DCB0 80241F80 2402000D */ addiu $v0, $zero, 0xd -/* D2DCB4 80241F84 14620011 */ bne $v1, $v0, .L80241FCC -/* D2DCB8 80241F88 00000000 */ nop -.L80241F8C: -/* D2DCBC 80241F8C 0240202D */ daddu $a0, $s2, $zero -/* D2DCC0 80241F90 0260282D */ daddu $a1, $s3, $zero -/* D2DCC4 80241F94 0C090716 */ jal sam_07_UnkNpcDurationFlagFunc2 -/* D2DCC8 80241F98 0280302D */ daddu $a2, $s4, $zero -/* D2DCCC 80241F9C 8E430070 */ lw $v1, 0x70($s2) -/* D2DCD0 80241FA0 2402000E */ addiu $v0, $zero, 0xe -/* D2DCD4 80241FA4 14620009 */ bne $v1, $v0, .L80241FCC -/* D2DCD8 80241FA8 00000000 */ nop -/* D2DCDC 80241FAC 0240202D */ daddu $a0, $s2, $zero -.L80241FB0: -/* D2DCE0 80241FB0 0260282D */ daddu $a1, $s3, $zero -/* D2DCE4 80241FB4 0C09072E */ jal sam_07_UnkNpcAIFunc30 -/* D2DCE8 80241FB8 0280302D */ daddu $a2, $s4, $zero -/* D2DCEC 80241FBC 080907F3 */ j .L80241FCC -/* D2DCF0 80241FC0 00000000 */ nop -.L80241FC4: -/* D2DCF4 80241FC4 0C0129CF */ jal func_8004A73C -/* D2DCF8 80241FC8 0240202D */ daddu $a0, $s2, $zero -.L80241FCC: -/* D2DCFC 80241FCC 8FBF0048 */ lw $ra, 0x48($sp) -/* D2DD00 80241FD0 8FB50044 */ lw $s5, 0x44($sp) -/* D2DD04 80241FD4 8FB40040 */ lw $s4, 0x40($sp) -/* D2DD08 80241FD8 8FB3003C */ lw $s3, 0x3c($sp) -/* D2DD0C 80241FDC 8FB20038 */ lw $s2, 0x38($sp) -/* D2DD10 80241FE0 8FB10034 */ lw $s1, 0x34($sp) -/* D2DD14 80241FE4 8FB00030 */ lw $s0, 0x30($sp) -/* D2DD18 80241FE8 0000102D */ daddu $v0, $zero, $zero -/* D2DD1C 80241FEC 03E00008 */ jr $ra -/* D2DD20 80241FF0 27BD0050 */ addiu $sp, $sp, 0x50 -/* D2DD24 80241FF4 00000000 */ nop -/* D2DD28 80241FF8 00000000 */ nop -/* D2DD2C 80241FFC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s deleted file mode 100644 index 5e4dc90d45..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_D31290 -/* D31290 80241610 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D31294 80241614 AFB10014 */ sw $s1, 0x14($sp) -/* D31298 80241618 0080882D */ daddu $s1, $a0, $zero -/* D3129C 8024161C AFBF001C */ sw $ra, 0x1c($sp) -/* D312A0 80241620 AFB20018 */ sw $s2, 0x18($sp) -/* D312A4 80241624 AFB00010 */ sw $s0, 0x10($sp) -/* D312A8 80241628 8E30000C */ lw $s0, 0xc($s1) -/* D312AC 8024162C 8E050000 */ lw $a1, ($s0) -/* D312B0 80241630 0C0B1EAF */ jal evt_get_variable -/* D312B4 80241634 26100004 */ addiu $s0, $s0, 4 -/* D312B8 80241638 8E050000 */ lw $a1, ($s0) -/* D312BC 8024163C 26100004 */ addiu $s0, $s0, 4 -/* D312C0 80241640 0220202D */ daddu $a0, $s1, $zero -/* D312C4 80241644 0C0B1EAF */ jal evt_get_variable -/* D312C8 80241648 0040902D */ daddu $s2, $v0, $zero -/* D312CC 8024164C 0220202D */ daddu $a0, $s1, $zero -/* D312D0 80241650 8E050000 */ lw $a1, ($s0) -/* D312D4 80241654 0C0B1EAF */ jal evt_get_variable -/* D312D8 80241658 0040802D */ daddu $s0, $v0, $zero -/* D312DC 8024165C 44926000 */ mtc1 $s2, $f12 -/* D312E0 80241660 00000000 */ nop -/* D312E4 80241664 46806320 */ cvt.s.w $f12, $f12 -/* D312E8 80241668 44820000 */ mtc1 $v0, $f0 -/* D312EC 8024166C 00000000 */ nop -/* D312F0 80241670 46800020 */ cvt.s.w $f0, $f0 -/* D312F4 80241674 44060000 */ mfc1 $a2, $f0 -/* D312F8 80241678 44907000 */ mtc1 $s0, $f14 -/* D312FC 8024167C 00000000 */ nop -/* D31300 80241680 0C01BE3C */ jal fx_big_smoke_puff -/* D31304 80241684 468073A0 */ cvt.s.w $f14, $f14 -/* D31308 80241688 8FBF001C */ lw $ra, 0x1c($sp) -/* D3130C 8024168C 8FB20018 */ lw $s2, 0x18($sp) -/* D31310 80241690 8FB10014 */ lw $s1, 0x14($sp) -/* D31314 80241694 8FB00010 */ lw $s0, 0x10($sp) -/* D31318 80241698 24020002 */ addiu $v0, $zero, 2 -/* D3131C 8024169C 03E00008 */ jr $ra -/* D31320 802416A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s deleted file mode 100644 index 8bbdb78231..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802416A4_D31324.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416A4_D31324 -/* D31324 802416A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D31328 802416A8 AFB1001C */ sw $s1, 0x1c($sp) -/* D3132C 802416AC 0080882D */ daddu $s1, $a0, $zero -/* D31330 802416B0 AFBF0024 */ sw $ra, 0x24($sp) -/* D31334 802416B4 AFB20020 */ sw $s2, 0x20($sp) -/* D31338 802416B8 AFB00018 */ sw $s0, 0x18($sp) -/* D3133C 802416BC 8E30000C */ lw $s0, 0xc($s1) -/* D31340 802416C0 8E050000 */ lw $a1, ($s0) -/* D31344 802416C4 0C0B1EAF */ jal evt_get_variable -/* D31348 802416C8 26100004 */ addiu $s0, $s0, 4 -/* D3134C 802416CC 8E050000 */ lw $a1, ($s0) -/* D31350 802416D0 26100004 */ addiu $s0, $s0, 4 -/* D31354 802416D4 0220202D */ daddu $a0, $s1, $zero -/* D31358 802416D8 0C0B1EAF */ jal evt_get_variable -/* D3135C 802416DC 0040902D */ daddu $s2, $v0, $zero -/* D31360 802416E0 0220202D */ daddu $a0, $s1, $zero -/* D31364 802416E4 8E050000 */ lw $a1, ($s0) -/* D31368 802416E8 0C0B1EAF */ jal evt_get_variable -/* D3136C 802416EC 0040802D */ daddu $s0, $v0, $zero -/* D31370 802416F0 3C048000 */ lui $a0, 0x8000 -/* D31374 802416F4 3484006C */ ori $a0, $a0, 0x6c -/* D31378 802416F8 0000282D */ daddu $a1, $zero, $zero -/* D3137C 802416FC 44921000 */ mtc1 $s2, $f2 -/* D31380 80241700 00000000 */ nop -/* D31384 80241704 468010A0 */ cvt.s.w $f2, $f2 -/* D31388 80241708 44061000 */ mfc1 $a2, $f2 -/* D3138C 8024170C 44901000 */ mtc1 $s0, $f2 -/* D31390 80241710 00000000 */ nop -/* D31394 80241714 468010A0 */ cvt.s.w $f2, $f2 -/* D31398 80241718 44071000 */ mfc1 $a3, $f2 -/* D3139C 8024171C 44820000 */ mtc1 $v0, $f0 -/* D313A0 80241720 00000000 */ nop -/* D313A4 80241724 46800020 */ cvt.s.w $f0, $f0 -/* D313A8 80241728 0C05267B */ jal sfx_adjust_env_sound_pos -/* D313AC 8024172C E7A00010 */ swc1 $f0, 0x10($sp) -/* D313B0 80241730 8FBF0024 */ lw $ra, 0x24($sp) -/* D313B4 80241734 8FB20020 */ lw $s2, 0x20($sp) -/* D313B8 80241738 8FB1001C */ lw $s1, 0x1c($sp) -/* D313BC 8024173C 8FB00018 */ lw $s0, 0x18($sp) -/* D313C0 80241740 24020002 */ addiu $v0, $zero, 2 -/* D313C4 80241744 03E00008 */ jr $ra -/* D313C8 80241748 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s deleted file mode 100644 index 3d8fc83ecd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024174C_D313CC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_D313CC -/* D313CC 8024174C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D313D0 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* D313D4 80241754 0080882D */ daddu $s1, $a0, $zero -/* D313D8 80241758 AFBF0018 */ sw $ra, 0x18($sp) -/* D313DC 8024175C AFB00010 */ sw $s0, 0x10($sp) -/* D313E0 80241760 8E30000C */ lw $s0, 0xc($s1) -/* D313E4 80241764 8E050000 */ lw $a1, ($s0) -/* D313E8 80241768 0C0B1EAF */ jal evt_get_variable -/* D313EC 8024176C 26100004 */ addiu $s0, $s0, 4 -/* D313F0 80241770 0220202D */ daddu $a0, $s1, $zero -/* D313F4 80241774 8E050000 */ lw $a1, ($s0) -/* D313F8 80241778 0C0B1EAF */ jal evt_get_variable -/* D313FC 8024177C 0040802D */ daddu $s0, $v0, $zero -/* D31400 80241780 320400FF */ andi $a0, $s0, 0xff -/* D31404 80241784 0C00A3C2 */ jal start_rumble -/* D31408 80241788 3045FFFF */ andi $a1, $v0, 0xffff -/* D3140C 8024178C 8FBF0018 */ lw $ra, 0x18($sp) -/* D31410 80241790 8FB10014 */ lw $s1, 0x14($sp) -/* D31414 80241794 8FB00010 */ lw $s0, 0x10($sp) -/* D31418 80241798 24020002 */ addiu $v0, $zero, 2 -/* D3141C 8024179C 03E00008 */ jr $ra -/* D31420 802417A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* D31424 802417A4 00000000 */ nop -/* D31428 802417A8 00000000 */ nop -/* D3142C 802417AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240B98_92AE48.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240B98_92AE48.s deleted file mode 100644 index c3c22ad64a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240B98_92AE48.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B98_92AE48 -/* 92AE48 80240B98 3C038011 */ lui $v1, %hi(gPlayerData) -/* 92AE4C 80240B9C 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 92AE50 80240BA0 8C6202BC */ lw $v0, 0x2bc($v1) -/* 92AE54 80240BA4 8C630324 */ lw $v1, 0x324($v1) -/* 92AE58 80240BA8 00431023 */ subu $v0, $v0, $v1 -/* 92AE5C 80240BAC 3C0391A2 */ lui $v1, 0x91a2 -/* 92AE60 80240BB0 3463B3C5 */ ori $v1, $v1, 0xb3c5 -/* 92AE64 80240BB4 00430019 */ multu $v0, $v1 -/* 92AE68 80240BB8 8C830084 */ lw $v1, 0x84($a0) -/* 92AE6C 80240BBC 00002810 */ mfhi $a1 -/* 92AE70 80240BC0 000512C2 */ srl $v0, $a1, 0xb -/* 92AE74 80240BC4 0043102A */ slt $v0, $v0, $v1 -/* 92AE78 80240BC8 AC820084 */ sw $v0, 0x84($a0) -/* 92AE7C 80240BCC 03E00008 */ jr $ra -/* 92AE80 80240BD0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s deleted file mode 100644 index 86bad5eee8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241560_940B10 -/* 940B10 80241560 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940B14 80241564 AFB00010 */ sw $s0, 0x10($sp) -/* 940B18 80241568 0080802D */ daddu $s0, $a0, $zero -/* 940B1C 8024156C AFBF0014 */ sw $ra, 0x14($sp) -/* 940B20 80241570 0C00EABB */ jal get_npc_unsafe -/* 940B24 80241574 8E04008C */ lw $a0, 0x8c($s0) -/* 940B28 80241578 0040282D */ daddu $a1, $v0, $zero -/* 940B2C 8024157C 8E040094 */ lw $a0, 0x94($s0) -/* 940B30 80241580 8CA30028 */ lw $v1, 0x28($a1) -/* 940B34 80241584 ACA40028 */ sw $a0, 0x28($a1) -/* 940B38 80241588 8FBF0014 */ lw $ra, 0x14($sp) -/* 940B3C 8024158C 8FB00010 */ lw $s0, 0x10($sp) -/* 940B40 80241590 24020002 */ addiu $v0, $zero, 2 -/* 940B44 80241594 3C018024 */ lui $at, %hi(D_80244D88) -/* 940B48 80241598 AC234D88 */ sw $v1, %lo(D_80244D88)($at) -/* 940B4C 8024159C 03E00008 */ jr $ra -/* 940B50 802415A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s deleted file mode 100644 index 532167f7a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415A4_940B54 -/* 940B54 802415A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940B58 802415A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 940B5C 802415AC 0C00EABB */ jal get_npc_unsafe -/* 940B60 802415B0 8C84008C */ lw $a0, 0x8c($a0) -/* 940B64 802415B4 3C038024 */ lui $v1, %hi(D_80244D88) -/* 940B68 802415B8 8C634D88 */ lw $v1, %lo(D_80244D88)($v1) -/* 940B6C 802415BC AC430028 */ sw $v1, 0x28($v0) -/* 940B70 802415C0 8FBF0010 */ lw $ra, 0x10($sp) -/* 940B74 802415C4 24020002 */ addiu $v0, $zero, 2 -/* 940B78 802415C8 03E00008 */ jr $ra -/* 940B7C 802415CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s deleted file mode 100644 index a093507475..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_9465F8 -/* 9465F8 80240728 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9465FC 8024072C AFB00010 */ sw $s0, 0x10($sp) -/* 946600 80240730 0080802D */ daddu $s0, $a0, $zero -/* 946604 80240734 AFBF0014 */ sw $ra, 0x14($sp) -/* 946608 80240738 0C00EABB */ jal get_npc_unsafe -/* 94660C 8024073C 8E04008C */ lw $a0, 0x8c($s0) -/* 946610 80240740 0040282D */ daddu $a1, $v0, $zero -/* 946614 80240744 8E040094 */ lw $a0, 0x94($s0) -/* 946618 80240748 8CA30028 */ lw $v1, 0x28($a1) -/* 94661C 8024074C ACA40028 */ sw $a0, 0x28($a1) -/* 946620 80240750 8FBF0014 */ lw $ra, 0x14($sp) -/* 946624 80240754 8FB00010 */ lw $s0, 0x10($sp) -/* 946628 80240758 24020002 */ addiu $v0, $zero, 2 -/* 94662C 8024075C 3C018024 */ lui $at, %hi(nok_02_GetNpcCollisionHeight) -/* 946630 80240760 AC2329A4 */ sw $v1, %lo(nok_02_GetNpcCollisionHeight)($at) -/* 946634 80240764 03E00008 */ jr $ra -/* 946638 80240768 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s deleted file mode 100644 index d026395461..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024076C_94663C -/* 94663C 8024076C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 946640 80240770 AFBF0010 */ sw $ra, 0x10($sp) -/* 946644 80240774 0C00EABB */ jal get_npc_unsafe -/* 946648 80240778 8C84008C */ lw $a0, 0x8c($a0) -/* 94664C 8024077C 3C038024 */ lui $v1, %hi(nok_02_GetNpcCollisionHeight) -/* 946650 80240780 8C6329A4 */ lw $v1, %lo(nok_02_GetNpcCollisionHeight)($v1) -/* 946654 80240784 AC430028 */ sw $v1, 0x28($v0) -/* 946658 80240788 8FBF0010 */ lw $ra, 0x10($sp) -/* 94665C 8024078C 24020002 */ addiu $v0, $zero, 2 -/* 946660 80240790 03E00008 */ jr $ra -/* 946664 80240794 27BD0018 */ addiu $sp, $sp, 0x18 -/* 946668 80240798 00000000 */ nop -/* 94666C 8024079C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s deleted file mode 100644 index ec3fd17e5c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434F4_9AB8E4 -/* 9AB8E4 802434F4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9AB8E8 802434F8 AFB20030 */ sw $s2, 0x30($sp) -/* 9AB8EC 802434FC 0080902D */ daddu $s2, $a0, $zero -/* 9AB8F0 80243500 AFBF0034 */ sw $ra, 0x34($sp) -/* 9AB8F4 80243504 AFB1002C */ sw $s1, 0x2c($sp) -/* 9AB8F8 80243508 AFB00028 */ sw $s0, 0x28($sp) -/* 9AB8FC 8024350C F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9AB900 80243510 8E510148 */ lw $s1, 0x148($s2) -/* 9AB904 80243514 0C00EABB */ jal get_npc_unsafe -/* 9AB908 80243518 86240008 */ lh $a0, 8($s1) -/* 9AB90C 8024351C 0040802D */ daddu $s0, $v0, $zero -/* 9AB910 80243520 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB914 80243524 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9AB918 80243528 0200202D */ daddu $a0, $s0, $zero -/* 9AB91C 8024352C 46002100 */ add.s $f4, $f4, $f0 -/* 9AB920 80243530 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB924 80243534 8E050018 */ lw $a1, 0x18($s0) -/* 9AB928 80243538 46041080 */ add.s $f2, $f2, $f4 -/* 9AB92C 8024353C 8E06000C */ lw $a2, 0xc($s0) -/* 9AB930 80243540 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AB934 80243544 46800020 */ cvt.s.w $f0, $f0 -/* 9AB938 80243548 E602003C */ swc1 $f2, 0x3c($s0) -/* 9AB93C 8024354C 3C014059 */ lui $at, 0x4059 -/* 9AB940 80243550 44811800 */ mtc1 $at, $f3 -/* 9AB944 80243554 44801000 */ mtc1 $zero, $f2 -/* 9AB948 80243558 46000021 */ cvt.d.s $f0, $f0 -/* 9AB94C 8024355C E604001C */ swc1 $f4, 0x1c($s0) -/* 9AB950 80243560 46220003 */ div.d $f0, $f0, $f2 -/* 9AB954 80243564 0C00EA95 */ jal npc_move_heading -/* 9AB958 80243568 46200520 */ cvt.s.d $f20, $f0 -/* 9AB95C 8024356C 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB960 80243570 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB964 80243574 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AB968 80243578 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB96C 8024357C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AB970 80243580 3C01447A */ lui $at, 0x447a -/* 9AB974 80243584 44813000 */ mtc1 $at, $f6 -/* 9AB978 80243588 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB97C 8024358C E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB980 80243590 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9AB984 80243594 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9AB988 80243598 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9AB98C 8024359C AFA20010 */ sw $v0, 0x10($sp) -/* 9AB990 802435A0 8E040080 */ lw $a0, 0x80($s0) -/* 9AB994 802435A4 0C0372DF */ jal npc_raycast_down_sides -/* 9AB998 802435A8 27A70020 */ addiu $a3, $sp, 0x20 -/* 9AB99C 802435AC 10400003 */ beqz $v0, .L802435BC -/* 9AB9A0 802435B0 4600A086 */ mov.s $f2, $f20 -/* 9AB9A4 802435B4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB9A8 802435B8 46140080 */ add.s $f2, $f0, $f20 -.L802435BC: -/* 9AB9AC 802435BC C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB9B0 802435C0 4602003C */ c.lt.s $f0, $f2 -/* 9AB9B4 802435C4 00000000 */ nop -/* 9AB9B8 802435C8 45010009 */ bc1t .L802435F0 -/* 9AB9BC 802435CC 2402000A */ addiu $v0, $zero, 0xa -/* 9AB9C0 802435D0 A602008E */ sh $v0, 0x8e($s0) -/* 9AB9C4 802435D4 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AB9C8 802435D8 8C42002C */ lw $v0, 0x2c($v0) -/* 9AB9CC 802435DC AE020028 */ sw $v0, 0x28($s0) -/* 9AB9D0 802435E0 9622008E */ lhu $v0, 0x8e($s1) -/* 9AB9D4 802435E4 A60200A8 */ sh $v0, 0xa8($s0) -/* 9AB9D8 802435E8 2402000F */ addiu $v0, $zero, 0xf -/* 9AB9DC 802435EC AE420070 */ sw $v0, 0x70($s2) -.L802435F0: -/* 9AB9E0 802435F0 8FBF0034 */ lw $ra, 0x34($sp) -/* 9AB9E4 802435F4 8FB20030 */ lw $s2, 0x30($sp) -/* 9AB9E8 802435F8 8FB1002C */ lw $s1, 0x2c($sp) -/* 9AB9EC 802435FC 8FB00028 */ lw $s0, 0x28($sp) -/* 9AB9F0 80243600 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9AB9F4 80243604 03E00008 */ jr $ra -/* 9AB9F8 80243608 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s deleted file mode 100644 index 64ec268dbc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ /dev/null @@ -1,173 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802462C8_9AE6B8 -.word .L80243768_9ABB58, .L80243778_9ABB68, .L80243798_9ABB88, .L802437A8_9ABB98, .L80243878_9ABC68, .L80243878_9ABC68, .L80243878_9ABC68, .L80243878_9ABC68, .L80243878_9ABC68, .L80243878_9ABC68, .L802437C8_9ABBB8, .L802437E8_9ABBD8, .L80243808_9ABBF8, .L80243828_9ABC18, .L80243848_9ABC38, .L80243868_9ABC58, 0, 0 - -.section .text - -glabel func_80243650_9ABA40 -/* 9ABA40 80243650 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9ABA44 80243654 AFB3003C */ sw $s3, 0x3c($sp) -/* 9ABA48 80243658 0080982D */ daddu $s3, $a0, $zero -/* 9ABA4C 8024365C AFBF0048 */ sw $ra, 0x48($sp) -/* 9ABA50 80243660 AFB50044 */ sw $s5, 0x44($sp) -/* 9ABA54 80243664 AFB40040 */ sw $s4, 0x40($sp) -/* 9ABA58 80243668 AFB20038 */ sw $s2, 0x38($sp) -/* 9ABA5C 8024366C AFB10034 */ sw $s1, 0x34($sp) -/* 9ABA60 80243670 AFB00030 */ sw $s0, 0x30($sp) -/* 9ABA64 80243674 8E720148 */ lw $s2, 0x148($s3) -/* 9ABA68 80243678 86440008 */ lh $a0, 8($s2) -/* 9ABA6C 8024367C 8E70000C */ lw $s0, 0xc($s3) -/* 9ABA70 80243680 0C00EABB */ jal get_npc_unsafe -/* 9ABA74 80243684 00A0882D */ daddu $s1, $a1, $zero -/* 9ABA78 80243688 0260202D */ daddu $a0, $s3, $zero -/* 9ABA7C 8024368C 8E050000 */ lw $a1, ($s0) -/* 9ABA80 80243690 0C0B1EAF */ jal evt_get_variable -/* 9ABA84 80243694 0040A82D */ daddu $s5, $v0, $zero -/* 9ABA88 80243698 AFA00010 */ sw $zero, 0x10($sp) -/* 9ABA8C 8024369C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABA90 802436A0 8C630030 */ lw $v1, 0x30($v1) -/* 9ABA94 802436A4 AFA30014 */ sw $v1, 0x14($sp) -/* 9ABA98 802436A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABA9C 802436AC 8C63001C */ lw $v1, 0x1c($v1) -/* 9ABAA0 802436B0 AFA30018 */ sw $v1, 0x18($sp) -/* 9ABAA4 802436B4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABAA8 802436B8 8C630024 */ lw $v1, 0x24($v1) -/* 9ABAAC 802436BC AFA3001C */ sw $v1, 0x1c($sp) -/* 9ABAB0 802436C0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABAB4 802436C4 8C630028 */ lw $v1, 0x28($v1) -/* 9ABAB8 802436C8 27B40010 */ addiu $s4, $sp, 0x10 -/* 9ABABC 802436CC AFA30020 */ sw $v1, 0x20($sp) -/* 9ABAC0 802436D0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABAC4 802436D4 3C0142F0 */ lui $at, 0x42f0 -/* 9ABAC8 802436D8 44810000 */ mtc1 $at, $f0 -/* 9ABACC 802436DC 8C63002C */ lw $v1, 0x2c($v1) -/* 9ABAD0 802436E0 0040802D */ daddu $s0, $v0, $zero -/* 9ABAD4 802436E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9ABAD8 802436E8 A7A0002C */ sh $zero, 0x2c($sp) -/* 9ABADC 802436EC 12200009 */ beqz $s1, .L80243714 -/* 9ABAE0 802436F0 AFA30024 */ sw $v1, 0x24($sp) -/* 9ABAE4 802436F4 02A0202D */ daddu $a0, $s5, $zero -/* 9ABAE8 802436F8 0240282D */ daddu $a1, $s2, $zero -/* 9ABAEC 802436FC 0260302D */ daddu $a2, $s3, $zero -/* 9ABAF0 80243700 0C090C00 */ jal trd_04_UnkFunc5 -/* 9ABAF4 80243704 0200382D */ daddu $a3, $s0, $zero -/* 9ABAF8 80243708 86A200A8 */ lh $v0, 0xa8($s5) -/* 9ABAFC 8024370C AE42008C */ sw $v0, 0x8c($s2) -/* 9ABB00 80243710 AE600070 */ sw $zero, 0x70($s3) -.L80243714: -/* 9ABB04 80243714 2402FFFD */ addiu $v0, $zero, -3 -/* 9ABB08 80243718 A2A200AB */ sb $v0, 0xab($s5) -/* 9ABB0C 8024371C 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9ABB10 80243720 30620004 */ andi $v0, $v1, 4 -/* 9ABB14 80243724 10400007 */ beqz $v0, .L80243744 -/* 9ABB18 80243728 00000000 */ nop -/* 9ABB1C 8024372C 824200B4 */ lb $v0, 0xb4($s2) -/* 9ABB20 80243730 14400052 */ bnez $v0, .L8024387C -/* 9ABB24 80243734 0000102D */ daddu $v0, $zero, $zero -/* 9ABB28 80243738 2402FFFB */ addiu $v0, $zero, -5 -/* 9ABB2C 8024373C 00621024 */ and $v0, $v1, $v0 -/* 9ABB30 80243740 AE4200B0 */ sw $v0, 0xb0($s2) -.L80243744: -/* 9ABB34 80243744 8E630070 */ lw $v1, 0x70($s3) -/* 9ABB38 80243748 2C620010 */ sltiu $v0, $v1, 0x10 -/* 9ABB3C 8024374C 1040004A */ beqz $v0, .L80243878_9ABC68 -/* 9ABB40 80243750 00031080 */ sll $v0, $v1, 2 -/* 9ABB44 80243754 3C018024 */ lui $at, %hi(jtbl_802462C8_9AE6B8) -/* 9ABB48 80243758 00220821 */ addu $at, $at, $v0 -/* 9ABB4C 8024375C 8C2262C8 */ lw $v0, %lo(jtbl_802462C8_9AE6B8)($at) -/* 9ABB50 80243760 00400008 */ jr $v0 -/* 9ABB54 80243764 00000000 */ nop -.L80243768_9ABB58: -/* 9ABB58 80243768 0260202D */ daddu $a0, $s3, $zero -/* 9ABB5C 8024376C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB60 80243770 0C090786 */ jal trd_04_UnkNpcAIFunc23 -/* 9ABB64 80243774 0280302D */ daddu $a2, $s4, $zero -.L80243778_9ABB68: -/* 9ABB68 80243778 0260202D */ daddu $a0, $s3, $zero -/* 9ABB6C 8024377C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB70 80243780 0C0907F2 */ jal trd_04_UnkNpcAIFunc35 -/* 9ABB74 80243784 0280302D */ daddu $a2, $s4, $zero -/* 9ABB78 80243788 8E630070 */ lw $v1, 0x70($s3) -/* 9ABB7C 8024378C 24020002 */ addiu $v0, $zero, 2 -/* 9ABB80 80243790 1462003A */ bne $v1, $v0, .L8024387C -/* 9ABB84 80243794 0000102D */ daddu $v0, $zero, $zero -.L80243798_9ABB88: -/* 9ABB88 80243798 0260202D */ daddu $a0, $s3, $zero -/* 9ABB8C 8024379C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB90 802437A0 0C09097C */ jal trd_04_UnkNpcAIFunc1_copy -/* 9ABB94 802437A4 0280302D */ daddu $a2, $s4, $zero -.L802437A8_9ABB98: -/* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero -/* 9ABB9C 802437AC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBA0 802437B0 0C0909AC */ jal trd_04_UnkFunc4 -/* 9ABBA4 802437B4 0280302D */ daddu $a2, $s4, $zero -/* 9ABBA8 802437B8 8E630070 */ lw $v1, 0x70($s3) -/* 9ABBAC 802437BC 2402000A */ addiu $v0, $zero, 0xa -/* 9ABBB0 802437C0 1462002E */ bne $v1, $v0, .L8024387C -/* 9ABBB4 802437C4 0000102D */ daddu $v0, $zero, $zero -.L802437C8_9ABBB8: -/* 9ABBB8 802437C8 0260202D */ daddu $a0, $s3, $zero -/* 9ABBBC 802437CC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBC0 802437D0 0C090A7D */ jal trd_04_UnkNpcAIFunc2 -/* 9ABBC4 802437D4 0280302D */ daddu $a2, $s4, $zero -/* 9ABBC8 802437D8 8E630070 */ lw $v1, 0x70($s3) -/* 9ABBCC 802437DC 2402000B */ addiu $v0, $zero, 0xb -/* 9ABBD0 802437E0 14620026 */ bne $v1, $v0, .L8024387C -/* 9ABBD4 802437E4 0000102D */ daddu $v0, $zero, $zero -.L802437E8_9ABBD8: -/* 9ABBD8 802437E8 0260202D */ daddu $a0, $s3, $zero -/* 9ABBDC 802437EC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBE0 802437F0 0C090A9B */ jal trd_04_SixFloatsFunc -/* 9ABBE4 802437F4 0280302D */ daddu $a2, $s4, $zero -/* 9ABBE8 802437F8 8E630070 */ lw $v1, 0x70($s3) -/* 9ABBEC 802437FC 2402000C */ addiu $v0, $zero, 0xc -/* 9ABBF0 80243800 1462001E */ bne $v1, $v0, .L8024387C -/* 9ABBF4 80243804 0000102D */ daddu $v0, $zero, $zero -.L80243808_9ABBF8: -/* 9ABBF8 80243808 0260202D */ daddu $a0, $s3, $zero -/* 9ABBFC 8024380C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC00 80243810 0C090CC4 */ jal func_80243310_9AB700 -/* 9ABC04 80243814 0280302D */ daddu $a2, $s4, $zero -/* 9ABC08 80243818 8E630070 */ lw $v1, 0x70($s3) -/* 9ABC0C 8024381C 2402000D */ addiu $v0, $zero, 0xd -/* 9ABC10 80243820 14620016 */ bne $v1, $v0, .L8024387C -/* 9ABC14 80243824 0000102D */ daddu $v0, $zero, $zero -.L80243828_9ABC18: -/* 9ABC18 80243828 0260202D */ daddu $a0, $s3, $zero -/* 9ABC1C 8024382C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC20 80243830 0C090D0E */ jal func_80243438_9AB828 -/* 9ABC24 80243834 0280302D */ daddu $a2, $s4, $zero -/* 9ABC28 80243838 8E630070 */ lw $v1, 0x70($s3) -/* 9ABC2C 8024383C 2402000E */ addiu $v0, $zero, 0xe -/* 9ABC30 80243840 1462000E */ bne $v1, $v0, .L8024387C -/* 9ABC34 80243844 0000102D */ daddu $v0, $zero, $zero -.L80243848_9ABC38: -/* 9ABC38 80243848 0260202D */ daddu $a0, $s3, $zero -/* 9ABC3C 8024384C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC40 80243850 0C090D3D */ jal func_802434F4_9AB8E4 -/* 9ABC44 80243854 0280302D */ daddu $a2, $s4, $zero -/* 9ABC48 80243858 8E630070 */ lw $v1, 0x70($s3) -/* 9ABC4C 8024385C 2402000F */ addiu $v0, $zero, 0xf -/* 9ABC50 80243860 14620006 */ bne $v1, $v0, .L8024387C -/* 9ABC54 80243864 0000102D */ daddu $v0, $zero, $zero -.L80243868_9ABC58: -/* 9ABC58 80243868 0260202D */ daddu $a0, $s3, $zero -/* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC60 80243870 0C090D83 */ jal trd_04_UnkDurationCheck -/* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero -.L80243878_9ABC68: -/* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero -.L8024387C: -/* 9ABC6C 8024387C 8FBF0048 */ lw $ra, 0x48($sp) -/* 9ABC70 80243880 8FB50044 */ lw $s5, 0x44($sp) -/* 9ABC74 80243884 8FB40040 */ lw $s4, 0x40($sp) -/* 9ABC78 80243888 8FB3003C */ lw $s3, 0x3c($sp) -/* 9ABC7C 8024388C 8FB20038 */ lw $s2, 0x38($sp) -/* 9ABC80 80243890 8FB10034 */ lw $s1, 0x34($sp) -/* 9ABC84 80243894 8FB00030 */ lw $s0, 0x30($sp) -/* 9ABC88 80243898 03E00008 */ jr $ra -/* 9ABC8C 8024389C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s deleted file mode 100644 index 42cc93e6c6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241FDC_9B895C.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FDC_9B895C -/* 9B895C 80241FDC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B8960 80241FE0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B8964 80241FE4 0080982D */ daddu $s3, $a0, $zero -/* 9B8968 80241FE8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B896C 80241FEC AFB20018 */ sw $s2, 0x18($sp) -/* 9B8970 80241FF0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8974 80241FF4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8978 80241FF8 8E710148 */ lw $s1, 0x148($s3) -/* 9B897C 80241FFC 0C00EABB */ jal get_npc_unsafe -/* 9B8980 80242000 86240008 */ lh $a0, 8($s1) -/* 9B8984 80242004 0040802D */ daddu $s0, $v0, $zero -/* 9B8988 80242008 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B898C 8024200C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8990 80242010 3C01C0A0 */ lui $at, 0xc0a0 -/* 9B8994 80242014 44811000 */ mtc1 $at, $f2 -/* 9B8998 80242018 3C013E19 */ lui $at, 0x3e19 -/* 9B899C 8024201C 3421999A */ ori $at, $at, 0x999a -/* 9B89A0 80242020 44810000 */ mtc1 $at, $f0 -/* 9B89A4 80242024 8C420024 */ lw $v0, 0x24($v0) -/* 9B89A8 80242028 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 9B89AC 8024202C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 9B89B0 80242030 E602001C */ swc1 $f2, 0x1c($s0) -/* 9B89B4 80242034 E6000014 */ swc1 $f0, 0x14($s0) -/* 9B89B8 80242038 AE020028 */ sw $v0, 0x28($s0) -/* 9B89BC 8024203C 8E22008C */ lw $v0, 0x8c($s1) -/* 9B89C0 80242040 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B89C4 80242044 00021FC2 */ srl $v1, $v0, 0x1f -/* 9B89C8 80242048 00431021 */ addu $v0, $v0, $v1 -/* 9B89CC 8024204C 8E430000 */ lw $v1, ($s2) -/* 9B89D0 80242050 00021043 */ sra $v0, $v0, 1 -/* 9B89D4 80242054 A60200A8 */ sh $v0, 0xa8($s0) -/* 9B89D8 80242058 8C660028 */ lw $a2, 0x28($v1) -/* 9B89DC 8024205C 0C00A7B5 */ jal dist2D -/* 9B89E0 80242060 8C670030 */ lw $a3, 0x30($v1) -/* 9B89E4 80242064 0200202D */ daddu $a0, $s0, $zero -/* 9B89E8 80242068 0000302D */ daddu $a2, $zero, $zero -/* 9B89EC 8024206C C6020038 */ lwc1 $f2, 0x38($s0) -/* 9B89F0 80242070 3C0140E0 */ lui $at, 0x40e0 -/* 9B89F4 80242074 44810000 */ mtc1 $at, $f0 -/* 9B89F8 80242078 4600110D */ trunc.w.s $f4, $f2 -/* 9B89FC 8024207C 44022000 */ mfc1 $v0, $f4 -/* 9B8A00 80242080 E6000018 */ swc1 $f0, 0x18($s0) -/* 9B8A04 80242084 A6220010 */ sh $v0, 0x10($s1) -/* 9B8A08 80242088 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B8A0C 8024208C 240502C1 */ addiu $a1, $zero, 0x2c1 -/* 9B8A10 80242090 4600010D */ trunc.w.s $f4, $f0 -/* 9B8A14 80242094 44022000 */ mfc1 $v0, $f4 -/* 9B8A18 80242098 00000000 */ nop -/* 9B8A1C 8024209C A6220012 */ sh $v0, 0x12($s1) -/* 9B8A20 802420A0 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9B8A24 802420A4 24020001 */ addiu $v0, $zero, 1 -/* 9B8A28 802420A8 A2220007 */ sb $v0, 7($s1) -/* 9B8A2C 802420AC 4600010D */ trunc.w.s $f4, $f0 -/* 9B8A30 802420B0 44022000 */ mfc1 $v0, $f4 -/* 9B8A34 802420B4 0C012530 */ jal ai_enemy_play_sound -/* 9B8A38 802420B8 A6220014 */ sh $v0, 0x14($s1) -/* 9B8A3C 802420BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B8A40 802420C0 8E420000 */ lw $v0, ($s2) -/* 9B8A44 802420C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B8A48 802420C8 8C460028 */ lw $a2, 0x28($v0) -/* 9B8A4C 802420CC 0C00A720 */ jal atan2 -/* 9B8A50 802420D0 8C470030 */ lw $a3, 0x30($v0) -/* 9B8A54 802420D4 2402000C */ addiu $v0, $zero, 0xc -/* 9B8A58 802420D8 A602008E */ sh $v0, 0x8e($s0) -/* 9B8A5C 802420DC 2402000D */ addiu $v0, $zero, 0xd -/* 9B8A60 802420E0 E600000C */ swc1 $f0, 0xc($s0) -/* 9B8A64 802420E4 AE620070 */ sw $v0, 0x70($s3) -/* 9B8A68 802420E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B8A6C 802420EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B8A70 802420F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9B8A74 802420F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9B8A78 802420F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8A7C 802420FC 03E00008 */ jr $ra -/* 9B8A80 80242100 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s deleted file mode 100644 index c865b2bb2c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242104_9B8A84 -/* 9B8A84 80242104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B8A88 80242108 AFB20018 */ sw $s2, 0x18($sp) -/* 9B8A8C 8024210C 0080902D */ daddu $s2, $a0, $zero -/* 9B8A90 80242110 AFBF001C */ sw $ra, 0x1c($sp) -/* 9B8A94 80242114 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8A98 80242118 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8A9C 8024211C 8E510148 */ lw $s1, 0x148($s2) -/* 9B8AA0 80242120 0C00EABB */ jal get_npc_unsafe -/* 9B8AA4 80242124 86240008 */ lh $a0, 8($s1) -/* 9B8AA8 80242128 0040802D */ daddu $s0, $v0, $zero -/* 9B8AAC 8024212C C602001C */ lwc1 $f2, 0x1c($s0) -/* 9B8AB0 80242130 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9B8AB4 80242134 8E050018 */ lw $a1, 0x18($s0) -/* 9B8AB8 80242138 46001080 */ add.s $f2, $f2, $f0 -/* 9B8ABC 8024213C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B8AC0 80242140 8E06000C */ lw $a2, 0xc($s0) -/* 9B8AC4 80242144 46020000 */ add.s $f0, $f0, $f2 -/* 9B8AC8 80242148 0200202D */ daddu $a0, $s0, $zero -/* 9B8ACC 8024214C E602001C */ swc1 $f2, 0x1c($s0) -/* 9B8AD0 80242150 0C00EA95 */ jal npc_move_heading -/* 9B8AD4 80242154 E600003C */ swc1 $f0, 0x3c($s0) -/* 9B8AD8 80242158 9602008E */ lhu $v0, 0x8e($s0) -/* 9B8ADC 8024215C 2442FFFF */ addiu $v0, $v0, -1 -/* 9B8AE0 80242160 A602008E */ sh $v0, 0x8e($s0) -/* 9B8AE4 80242164 00021400 */ sll $v0, $v0, 0x10 -/* 9B8AE8 80242168 1C40000F */ bgtz $v0, .L802421A8 -/* 9B8AEC 8024216C 00000000 */ nop -/* 9B8AF0 80242170 3C013E99 */ lui $at, 0x3e99 -/* 9B8AF4 80242174 3421999A */ ori $at, $at, 0x999a -/* 9B8AF8 80242178 44810000 */ mtc1 $at, $f0 -/* 9B8AFC 8024217C 3C014040 */ lui $at, 0x4040 -/* 9B8B00 80242180 44811000 */ mtc1 $at, $f2 -/* 9B8B04 80242184 A2200007 */ sb $zero, 7($s1) -/* 9B8B08 80242188 AE00001C */ sw $zero, 0x1c($s0) -/* 9B8B0C 8024218C E6000014 */ swc1 $f0, 0x14($s0) -/* 9B8B10 80242190 E6020018 */ swc1 $f2, 0x18($s0) -/* 9B8B14 80242194 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8B18 80242198 8C420028 */ lw $v0, 0x28($v0) -/* 9B8B1C 8024219C AE020028 */ sw $v0, 0x28($s0) -/* 9B8B20 802421A0 2402000E */ addiu $v0, $zero, 0xe -/* 9B8B24 802421A4 AE420070 */ sw $v0, 0x70($s2) -.L802421A8: -/* 9B8B28 802421A8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9B8B2C 802421AC 8FB20018 */ lw $s2, 0x18($sp) -/* 9B8B30 802421B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9B8B34 802421B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8B38 802421B8 03E00008 */ jr $ra -/* 9B8B3C 802421BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s deleted file mode 100644 index e4a345afad..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421C0_9B8B40 -/* 9B8B40 802421C0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9B8B44 802421C4 AFB20030 */ sw $s2, 0x30($sp) -/* 9B8B48 802421C8 0080902D */ daddu $s2, $a0, $zero -/* 9B8B4C 802421CC AFBF0034 */ sw $ra, 0x34($sp) -/* 9B8B50 802421D0 AFB1002C */ sw $s1, 0x2c($sp) -/* 9B8B54 802421D4 AFB00028 */ sw $s0, 0x28($sp) -/* 9B8B58 802421D8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9B8B5C 802421DC 8E510148 */ lw $s1, 0x148($s2) -/* 9B8B60 802421E0 0C00EABB */ jal get_npc_unsafe -/* 9B8B64 802421E4 86240008 */ lh $a0, 8($s1) -/* 9B8B68 802421E8 0040802D */ daddu $s0, $v0, $zero -/* 9B8B6C 802421EC C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B8B70 802421F0 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9B8B74 802421F4 0200202D */ daddu $a0, $s0, $zero -/* 9B8B78 802421F8 46002100 */ add.s $f4, $f4, $f0 -/* 9B8B7C 802421FC C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8B80 80242200 8E050018 */ lw $a1, 0x18($s0) -/* 9B8B84 80242204 46041080 */ add.s $f2, $f2, $f4 -/* 9B8B88 80242208 8E06000C */ lw $a2, 0xc($s0) -/* 9B8B8C 8024220C C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B8B90 80242210 46800020 */ cvt.s.w $f0, $f0 -/* 9B8B94 80242214 E602003C */ swc1 $f2, 0x3c($s0) -/* 9B8B98 80242218 3C014059 */ lui $at, 0x4059 -/* 9B8B9C 8024221C 44811800 */ mtc1 $at, $f3 -/* 9B8BA0 80242220 44801000 */ mtc1 $zero, $f2 -/* 9B8BA4 80242224 46000021 */ cvt.d.s $f0, $f0 -/* 9B8BA8 80242228 E604001C */ swc1 $f4, 0x1c($s0) -/* 9B8BAC 8024222C 46220003 */ div.d $f0, $f0, $f2 -/* 9B8BB0 80242230 0C00EA95 */ jal npc_move_heading -/* 9B8BB4 80242234 46200520 */ cvt.s.d $f20, $f0 -/* 9B8BB8 80242238 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B8BBC 8024223C 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B8BC0 80242240 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B8BC4 80242244 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8BC8 80242248 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B8BCC 8024224C 3C01447A */ lui $at, 0x447a -/* 9B8BD0 80242250 44813000 */ mtc1 $at, $f6 -/* 9B8BD4 80242254 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B8BD8 80242258 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B8BDC 8024225C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9B8BE0 80242260 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9B8BE4 80242264 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9B8BE8 80242268 AFA20010 */ sw $v0, 0x10($sp) -/* 9B8BEC 8024226C 8E040080 */ lw $a0, 0x80($s0) -/* 9B8BF0 80242270 0C0372DF */ jal npc_raycast_down_sides -/* 9B8BF4 80242274 27A70020 */ addiu $a3, $sp, 0x20 -/* 9B8BF8 80242278 10400003 */ beqz $v0, .L80242288 -/* 9B8BFC 8024227C 4600A086 */ mov.s $f2, $f20 -/* 9B8C00 80242280 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B8C04 80242284 46140080 */ add.s $f2, $f0, $f20 -.L80242288: -/* 9B8C08 80242288 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B8C0C 8024228C 4602003C */ c.lt.s $f0, $f2 -/* 9B8C10 80242290 00000000 */ nop -/* 9B8C14 80242294 45010009 */ bc1t .L802422BC -/* 9B8C18 80242298 2402000A */ addiu $v0, $zero, 0xa -/* 9B8C1C 8024229C A602008E */ sh $v0, 0x8e($s0) -/* 9B8C20 802422A0 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8C24 802422A4 8C42002C */ lw $v0, 0x2c($v0) -/* 9B8C28 802422A8 AE020028 */ sw $v0, 0x28($s0) -/* 9B8C2C 802422AC 9622008E */ lhu $v0, 0x8e($s1) -/* 9B8C30 802422B0 A60200A8 */ sh $v0, 0xa8($s0) -/* 9B8C34 802422B4 2402000F */ addiu $v0, $zero, 0xf -/* 9B8C38 802422B8 AE420070 */ sw $v0, 0x70($s2) -.L802422BC: -/* 9B8C3C 802422BC 8FBF0034 */ lw $ra, 0x34($sp) -/* 9B8C40 802422C0 8FB20030 */ lw $s2, 0x30($sp) -/* 9B8C44 802422C4 8FB1002C */ lw $s1, 0x2c($sp) -/* 9B8C48 802422C8 8FB00028 */ lw $s0, 0x28($sp) -/* 9B8C4C 802422CC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9B8C50 802422D0 03E00008 */ jr $ra -/* 9B8C54 802422D4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s deleted file mode 100644 index d85d31268b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ /dev/null @@ -1,173 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802448D8_9BB258 -.word .L80242434_9B8DB4, .L80242444_9B8DC4, .L80242464_9B8DE4, .L80242474_9B8DF4, .L80242544_9B8EC4, .L80242544_9B8EC4, .L80242544_9B8EC4, .L80242544_9B8EC4, .L80242544_9B8EC4, .L80242544_9B8EC4, .L80242494_9B8E14, .L802424B4_9B8E34, .L802424D4_9B8E54, .L802424F4_9B8E74, .L80242514_9B8E94, .L80242534_9B8EB4, 0, 0 - -.section .text - -glabel func_8024231C_9B8C9C -/* 9B8C9C 8024231C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B8CA0 80242320 AFB3003C */ sw $s3, 0x3c($sp) -/* 9B8CA4 80242324 0080982D */ daddu $s3, $a0, $zero -/* 9B8CA8 80242328 AFBF0048 */ sw $ra, 0x48($sp) -/* 9B8CAC 8024232C AFB50044 */ sw $s5, 0x44($sp) -/* 9B8CB0 80242330 AFB40040 */ sw $s4, 0x40($sp) -/* 9B8CB4 80242334 AFB20038 */ sw $s2, 0x38($sp) -/* 9B8CB8 80242338 AFB10034 */ sw $s1, 0x34($sp) -/* 9B8CBC 8024233C AFB00030 */ sw $s0, 0x30($sp) -/* 9B8CC0 80242340 8E720148 */ lw $s2, 0x148($s3) -/* 9B8CC4 80242344 86440008 */ lh $a0, 8($s2) -/* 9B8CC8 80242348 8E70000C */ lw $s0, 0xc($s3) -/* 9B8CCC 8024234C 0C00EABB */ jal get_npc_unsafe -/* 9B8CD0 80242350 00A0882D */ daddu $s1, $a1, $zero -/* 9B8CD4 80242354 0260202D */ daddu $a0, $s3, $zero -/* 9B8CD8 80242358 8E050000 */ lw $a1, ($s0) -/* 9B8CDC 8024235C 0C0B1EAF */ jal evt_get_variable -/* 9B8CE0 80242360 0040A82D */ daddu $s5, $v0, $zero -/* 9B8CE4 80242364 AFA00010 */ sw $zero, 0x10($sp) -/* 9B8CE8 80242368 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8CEC 8024236C 8C630030 */ lw $v1, 0x30($v1) -/* 9B8CF0 80242370 AFA30014 */ sw $v1, 0x14($sp) -/* 9B8CF4 80242374 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8CF8 80242378 8C63001C */ lw $v1, 0x1c($v1) -/* 9B8CFC 8024237C AFA30018 */ sw $v1, 0x18($sp) -/* 9B8D00 80242380 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8D04 80242384 8C630024 */ lw $v1, 0x24($v1) -/* 9B8D08 80242388 AFA3001C */ sw $v1, 0x1c($sp) -/* 9B8D0C 8024238C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8D10 80242390 8C630028 */ lw $v1, 0x28($v1) -/* 9B8D14 80242394 27B40010 */ addiu $s4, $sp, 0x10 -/* 9B8D18 80242398 AFA30020 */ sw $v1, 0x20($sp) -/* 9B8D1C 8024239C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8D20 802423A0 3C0142F0 */ lui $at, 0x42f0 -/* 9B8D24 802423A4 44810000 */ mtc1 $at, $f0 -/* 9B8D28 802423A8 8C63002C */ lw $v1, 0x2c($v1) -/* 9B8D2C 802423AC 0040802D */ daddu $s0, $v0, $zero -/* 9B8D30 802423B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B8D34 802423B4 A7A0002C */ sh $zero, 0x2c($sp) -/* 9B8D38 802423B8 12200009 */ beqz $s1, .L802423E0 -/* 9B8D3C 802423BC AFA30024 */ sw $v1, 0x24($sp) -/* 9B8D40 802423C0 02A0202D */ daddu $a0, $s5, $zero -/* 9B8D44 802423C4 0240282D */ daddu $a1, $s2, $zero -/* 9B8D48 802423C8 0260302D */ daddu $a2, $s3, $zero -/* 9B8D4C 802423CC 0C090733 */ jal trd_07_UnkFunc5 -/* 9B8D50 802423D0 0200382D */ daddu $a3, $s0, $zero -/* 9B8D54 802423D4 86A200A8 */ lh $v0, 0xa8($s5) -/* 9B8D58 802423D8 AE42008C */ sw $v0, 0x8c($s2) -/* 9B8D5C 802423DC AE600070 */ sw $zero, 0x70($s3) -.L802423E0: -/* 9B8D60 802423E0 2402FFFD */ addiu $v0, $zero, -3 -/* 9B8D64 802423E4 A2A200AB */ sb $v0, 0xab($s5) -/* 9B8D68 802423E8 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9B8D6C 802423EC 30620004 */ andi $v0, $v1, 4 -/* 9B8D70 802423F0 10400007 */ beqz $v0, .L80242410 -/* 9B8D74 802423F4 00000000 */ nop -/* 9B8D78 802423F8 824200B4 */ lb $v0, 0xb4($s2) -/* 9B8D7C 802423FC 14400052 */ bnez $v0, .L80242548 -/* 9B8D80 80242400 0000102D */ daddu $v0, $zero, $zero -/* 9B8D84 80242404 2402FFFB */ addiu $v0, $zero, -5 -/* 9B8D88 80242408 00621024 */ and $v0, $v1, $v0 -/* 9B8D8C 8024240C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242410: -/* 9B8D90 80242410 8E630070 */ lw $v1, 0x70($s3) -/* 9B8D94 80242414 2C620010 */ sltiu $v0, $v1, 0x10 -/* 9B8D98 80242418 1040004A */ beqz $v0, .L80242544_9B8EC4 -/* 9B8D9C 8024241C 00031080 */ sll $v0, $v1, 2 -/* 9B8DA0 80242420 3C018024 */ lui $at, %hi(jtbl_802448D8_9BB258) -/* 9B8DA4 80242424 00220821 */ addu $at, $at, $v0 -/* 9B8DA8 80242428 8C2248D8 */ lw $v0, %lo(jtbl_802448D8_9BB258)($at) -/* 9B8DAC 8024242C 00400008 */ jr $v0 -/* 9B8DB0 80242430 00000000 */ nop -.L80242434_9B8DB4: -/* 9B8DB4 80242434 0260202D */ daddu $a0, $s3, $zero -/* 9B8DB8 80242438 0200282D */ daddu $a1, $s0, $zero -/* 9B8DBC 8024243C 0C0902B9 */ jal trd_07_UnkNpcAIFunc23 -/* 9B8DC0 80242440 0280302D */ daddu $a2, $s4, $zero -.L80242444_9B8DC4: -/* 9B8DC4 80242444 0260202D */ daddu $a0, $s3, $zero -/* 9B8DC8 80242448 0200282D */ daddu $a1, $s0, $zero -/* 9B8DCC 8024244C 0C090325 */ jal trd_07_UnkNpcAIFunc35 -/* 9B8DD0 80242450 0280302D */ daddu $a2, $s4, $zero -/* 9B8DD4 80242454 8E630070 */ lw $v1, 0x70($s3) -/* 9B8DD8 80242458 24020002 */ addiu $v0, $zero, 2 -/* 9B8DDC 8024245C 1462003A */ bne $v1, $v0, .L80242548 -/* 9B8DE0 80242460 0000102D */ daddu $v0, $zero, $zero -.L80242464_9B8DE4: -/* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero -/* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero -/* 9B8DEC 8024246C 0C0904AF */ jal trd_07_UnkNpcAIFunc1_copy -/* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero -.L80242474_9B8DF4: -/* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero -/* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero -/* 9B8DFC 8024247C 0C0904DF */ jal trd_07_UnkFunc4 -/* 9B8E00 80242480 0280302D */ daddu $a2, $s4, $zero -/* 9B8E04 80242484 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E08 80242488 2402000A */ addiu $v0, $zero, 0xa -/* 9B8E0C 8024248C 1462002E */ bne $v1, $v0, .L80242548 -/* 9B8E10 80242490 0000102D */ daddu $v0, $zero, $zero -.L80242494_9B8E14: -/* 9B8E14 80242494 0260202D */ daddu $a0, $s3, $zero -/* 9B8E18 80242498 0200282D */ daddu $a1, $s0, $zero -/* 9B8E1C 8024249C 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 -/* 9B8E20 802424A0 0280302D */ daddu $a2, $s4, $zero -/* 9B8E24 802424A4 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E28 802424A8 2402000B */ addiu $v0, $zero, 0xb -/* 9B8E2C 802424AC 14620026 */ bne $v1, $v0, .L80242548 -/* 9B8E30 802424B0 0000102D */ daddu $v0, $zero, $zero -.L802424B4_9B8E34: -/* 9B8E34 802424B4 0260202D */ daddu $a0, $s3, $zero -/* 9B8E38 802424B8 0200282D */ daddu $a1, $s0, $zero -/* 9B8E3C 802424BC 0C0905CE */ jal trd_07_SixFloatsFunc -/* 9B8E40 802424C0 0280302D */ daddu $a2, $s4, $zero -/* 9B8E44 802424C4 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E48 802424C8 2402000C */ addiu $v0, $zero, 0xc -/* 9B8E4C 802424CC 1462001E */ bne $v1, $v0, .L80242548 -/* 9B8E50 802424D0 0000102D */ daddu $v0, $zero, $zero -.L802424D4_9B8E54: -/* 9B8E54 802424D4 0260202D */ daddu $a0, $s3, $zero -/* 9B8E58 802424D8 0200282D */ daddu $a1, $s0, $zero -/* 9B8E5C 802424DC 0C0907F7 */ jal func_80241FDC_9B895C -/* 9B8E60 802424E0 0280302D */ daddu $a2, $s4, $zero -/* 9B8E64 802424E4 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E68 802424E8 2402000D */ addiu $v0, $zero, 0xd -/* 9B8E6C 802424EC 14620016 */ bne $v1, $v0, .L80242548 -/* 9B8E70 802424F0 0000102D */ daddu $v0, $zero, $zero -.L802424F4_9B8E74: -/* 9B8E74 802424F4 0260202D */ daddu $a0, $s3, $zero -/* 9B8E78 802424F8 0200282D */ daddu $a1, $s0, $zero -/* 9B8E7C 802424FC 0C090841 */ jal func_80242104_9B8A84 -/* 9B8E80 80242500 0280302D */ daddu $a2, $s4, $zero -/* 9B8E84 80242504 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E88 80242508 2402000E */ addiu $v0, $zero, 0xe -/* 9B8E8C 8024250C 1462000E */ bne $v1, $v0, .L80242548 -/* 9B8E90 80242510 0000102D */ daddu $v0, $zero, $zero -.L80242514_9B8E94: -/* 9B8E94 80242514 0260202D */ daddu $a0, $s3, $zero -/* 9B8E98 80242518 0200282D */ daddu $a1, $s0, $zero -/* 9B8E9C 8024251C 0C090870 */ jal func_802421C0_9B8B40 -/* 9B8EA0 80242520 0280302D */ daddu $a2, $s4, $zero -/* 9B8EA4 80242524 8E630070 */ lw $v1, 0x70($s3) -/* 9B8EA8 80242528 2402000F */ addiu $v0, $zero, 0xf -/* 9B8EAC 8024252C 14620006 */ bne $v1, $v0, .L80242548 -/* 9B8EB0 80242530 0000102D */ daddu $v0, $zero, $zero -.L80242534_9B8EB4: -/* 9B8EB4 80242534 0260202D */ daddu $a0, $s3, $zero -/* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero -/* 9B8EBC 8024253C 0C0908B6 */ jal trd_07_UnkDurationCheck -/* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero -.L80242544_9B8EC4: -/* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero -.L80242548: -/* 9B8EC8 80242548 8FBF0048 */ lw $ra, 0x48($sp) -/* 9B8ECC 8024254C 8FB50044 */ lw $s5, 0x44($sp) -/* 9B8ED0 80242550 8FB40040 */ lw $s4, 0x40($sp) -/* 9B8ED4 80242554 8FB3003C */ lw $s3, 0x3c($sp) -/* 9B8ED8 80242558 8FB20038 */ lw $s2, 0x38($sp) -/* 9B8EDC 8024255C 8FB10034 */ lw $s1, 0x34($sp) -/* 9B8EE0 80242560 8FB00030 */ lw $s0, 0x30($sp) -/* 9B8EE4 80242564 03E00008 */ jr $ra -/* 9B8EE8 80242568 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s deleted file mode 100644 index 9f7b60da76..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024256C_9B8EEC -/* 9B8EEC 8024256C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B8EF0 80242570 0000502D */ daddu $t2, $zero, $zero -/* 9B8EF4 80242574 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 9B8EF8 80242578 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 9B8EFC 8024257C AFBF0010 */ sw $ra, 0x10($sp) -/* 9B8F00 80242580 8062001C */ lb $v0, 0x1c($v1) -/* 9B8F04 80242584 8C85000C */ lw $a1, 0xc($a0) -/* 9B8F08 80242588 18400016 */ blez $v0, .L802425E4 -/* 9B8F0C 8024258C 0140302D */ daddu $a2, $t2, $zero -/* 9B8F10 80242590 0040582D */ daddu $t3, $v0, $zero -/* 9B8F14 80242594 0060482D */ daddu $t1, $v1, $zero -.L80242598: -/* 9B8F18 80242598 8D220028 */ lw $v0, 0x28($t1) -/* 9B8F1C 8024259C 5040000E */ beql $v0, $zero, .L802425D8 -/* 9B8F20 802425A0 254A0001 */ addiu $t2, $t2, 1 -/* 9B8F24 802425A4 8C430000 */ lw $v1, ($v0) -/* 9B8F28 802425A8 1860000A */ blez $v1, .L802425D4 -/* 9B8F2C 802425AC 0000382D */ daddu $a3, $zero, $zero -/* 9B8F30 802425B0 0060402D */ daddu $t0, $v1, $zero -/* 9B8F34 802425B4 0040182D */ daddu $v1, $v0, $zero -.L802425B8: -/* 9B8F38 802425B8 8C620004 */ lw $v0, 4($v1) -/* 9B8F3C 802425BC 54400001 */ bnel $v0, $zero, .L802425C4 -/* 9B8F40 802425C0 24C60001 */ addiu $a2, $a2, 1 -.L802425C4: -/* 9B8F44 802425C4 24E70001 */ addiu $a3, $a3, 1 -/* 9B8F48 802425C8 00E8102A */ slt $v0, $a3, $t0 -/* 9B8F4C 802425CC 1440FFFA */ bnez $v0, .L802425B8 -/* 9B8F50 802425D0 24630004 */ addiu $v1, $v1, 4 -.L802425D4: -/* 9B8F54 802425D4 254A0001 */ addiu $t2, $t2, 1 -.L802425D8: -/* 9B8F58 802425D8 014B102A */ slt $v0, $t2, $t3 -/* 9B8F5C 802425DC 1440FFEE */ bnez $v0, .L80242598 -/* 9B8F60 802425E0 25290004 */ addiu $t1, $t1, 4 -.L802425E4: -/* 9B8F64 802425E4 8CA50000 */ lw $a1, ($a1) -/* 9B8F68 802425E8 0C0B2026 */ jal evt_set_variable -/* 9B8F6C 802425EC 00000000 */ nop -/* 9B8F70 802425F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9B8F74 802425F4 24020002 */ addiu $v0, $zero, 2 -/* 9B8F78 802425F8 03E00008 */ jr $ra -/* 9B8F7C 802425FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s deleted file mode 100644 index 22d9a2ae68..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242600_9B8F80 -/* 9B8F80 80242600 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B8F84 80242604 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8F88 80242608 0080882D */ daddu $s1, $a0, $zero -/* 9B8F8C 8024260C AFBF0018 */ sw $ra, 0x18($sp) -/* 9B8F90 80242610 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8F94 80242614 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* 9B8F98 80242618 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* 9B8F9C 8024261C F7BA0038 */ sdc1 $f26, 0x38($sp) -/* 9B8FA0 80242620 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 9B8FA4 80242624 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9B8FA8 80242628 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9B8FAC 8024262C 8E30000C */ lw $s0, 0xc($s1) -/* 9B8FB0 80242630 8E050000 */ lw $a1, ($s0) -/* 9B8FB4 80242634 0C0B210B */ jal evt_get_float_variable -/* 9B8FB8 80242638 26100004 */ addiu $s0, $s0, 4 -/* 9B8FBC 8024263C 8E050000 */ lw $a1, ($s0) -/* 9B8FC0 80242640 26100004 */ addiu $s0, $s0, 4 -/* 9B8FC4 80242644 0220202D */ daddu $a0, $s1, $zero -/* 9B8FC8 80242648 0C0B210B */ jal evt_get_float_variable -/* 9B8FCC 8024264C 46000506 */ mov.s $f20, $f0 -/* 9B8FD0 80242650 0220202D */ daddu $a0, $s1, $zero -/* 9B8FD4 80242654 8E050000 */ lw $a1, ($s0) -/* 9B8FD8 80242658 0C0B210B */ jal evt_get_float_variable -/* 9B8FDC 8024265C 46000586 */ mov.s $f22, $f0 -/* 9B8FE0 80242660 3C10800B */ lui $s0, %hi(gCameras) -/* 9B8FE4 80242664 26101D80 */ addiu $s0, $s0, %lo(gCameras) -/* 9B8FE8 80242668 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B8FEC 8024266C 46000786 */ mov.s $f30, $f0 -/* 9B8FF0 80242670 461E6300 */ add.s $f12, $f12, $f30 -/* 9B8FF4 80242674 3C014387 */ lui $at, 0x4387 -/* 9B8FF8 80242678 4481D000 */ mtc1 $at, $f26 -/* 9B8FFC 8024267C 0C00A6C9 */ jal clamp_angle -/* 9B9000 80242680 461A6300 */ add.s $f12, $f12, $f26 -/* 9B9004 80242684 0C00A8BB */ jal sin_deg -/* 9B9008 80242688 46000306 */ mov.s $f12, $f0 -/* 9B900C 8024268C 3C01447A */ lui $at, 0x447a -/* 9B9010 80242690 44811000 */ mtc1 $at, $f2 -/* 9B9014 80242694 00000000 */ nop -/* 9B9018 80242698 46020002 */ mul.s $f0, $f0, $f2 -/* 9B901C 8024269C 00000000 */ nop -/* 9B9020 802426A0 4600A000 */ add.s $f0, $f20, $f0 -/* 9B9024 802426A4 3C014480 */ lui $at, 0x4480 -/* 9B9028 802426A8 44811000 */ mtc1 $at, $f2 -/* 9B902C 802426AC 00000000 */ nop -/* 9B9030 802426B0 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9034 802426B4 00000000 */ nop -/* 9B9038 802426B8 3C01CD5B */ lui $at, 0xcd5b -/* 9B903C 802426BC 34215858 */ ori $at, $at, 0x5858 -/* 9B9040 802426C0 4481C000 */ mtc1 $at, $f24 -/* 9B9044 802426C4 00000000 */ nop -/* 9B9048 802426C8 46180000 */ add.s $f0, $f0, $f24 -/* 9B904C 802426CC 4600008D */ trunc.w.s $f2, $f0 -/* 9B9050 802426D0 E6220084 */ swc1 $f2, 0x84($s1) -/* 9B9054 802426D4 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B9058 802426D8 461E6300 */ add.s $f12, $f12, $f30 -/* 9B905C 802426DC 0C00A6C9 */ jal clamp_angle -/* 9B9060 802426E0 461A6300 */ add.s $f12, $f12, $f26 -/* 9B9064 802426E4 0C00A8D4 */ jal cos_deg -/* 9B9068 802426E8 46000306 */ mov.s $f12, $f0 -/* 9B906C 802426EC 3C01447A */ lui $at, 0x447a -/* 9B9070 802426F0 44811000 */ mtc1 $at, $f2 -/* 9B9074 802426F4 00000000 */ nop -/* 9B9078 802426F8 46020002 */ mul.s $f0, $f0, $f2 -/* 9B907C 802426FC 00000000 */ nop -/* 9B9080 80242700 4600B001 */ sub.s $f0, $f22, $f0 -/* 9B9084 80242704 3C014480 */ lui $at, 0x4480 -/* 9B9088 80242708 44811000 */ mtc1 $at, $f2 -/* 9B908C 8024270C 00000000 */ nop -/* 9B9090 80242710 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9094 80242714 00000000 */ nop -/* 9B9098 80242718 46180000 */ add.s $f0, $f0, $f24 -/* 9B909C 8024271C 4600008D */ trunc.w.s $f2, $f0 -/* 9B90A0 80242720 E6220088 */ swc1 $f2, 0x88($s1) -/* 9B90A4 80242724 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B90A8 80242728 461E6300 */ add.s $f12, $f12, $f30 -/* 9B90AC 8024272C 3C0142B4 */ lui $at, 0x42b4 -/* 9B90B0 80242730 4481E000 */ mtc1 $at, $f28 -/* 9B90B4 80242734 0C00A6C9 */ jal clamp_angle -/* 9B90B8 80242738 461C6300 */ add.s $f12, $f12, $f28 -/* 9B90BC 8024273C 0C00A8BB */ jal sin_deg -/* 9B90C0 80242740 46000306 */ mov.s $f12, $f0 -/* 9B90C4 80242744 3C01447A */ lui $at, 0x447a -/* 9B90C8 80242748 44811000 */ mtc1 $at, $f2 -/* 9B90CC 8024274C 00000000 */ nop -/* 9B90D0 80242750 46020002 */ mul.s $f0, $f0, $f2 -/* 9B90D4 80242754 00000000 */ nop -/* 9B90D8 80242758 4600A500 */ add.s $f20, $f20, $f0 -/* 9B90DC 8024275C 3C014480 */ lui $at, 0x4480 -/* 9B90E0 80242760 44811000 */ mtc1 $at, $f2 -/* 9B90E4 80242764 00000000 */ nop -/* 9B90E8 80242768 4602A502 */ mul.s $f20, $f20, $f2 -/* 9B90EC 8024276C 00000000 */ nop -/* 9B90F0 80242770 4618A500 */ add.s $f20, $f20, $f24 -/* 9B90F4 80242774 4600A08D */ trunc.w.s $f2, $f20 -/* 9B90F8 80242778 E622008C */ swc1 $f2, 0x8c($s1) -/* 9B90FC 8024277C C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B9100 80242780 461E6300 */ add.s $f12, $f12, $f30 -/* 9B9104 80242784 0C00A6C9 */ jal clamp_angle -/* 9B9108 80242788 461C6300 */ add.s $f12, $f12, $f28 -/* 9B910C 8024278C 0C00A8D4 */ jal cos_deg -/* 9B9110 80242790 46000306 */ mov.s $f12, $f0 -/* 9B9114 80242794 3C01447A */ lui $at, 0x447a -/* 9B9118 80242798 44811000 */ mtc1 $at, $f2 -/* 9B911C 8024279C 00000000 */ nop -/* 9B9120 802427A0 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9124 802427A4 00000000 */ nop -/* 9B9128 802427A8 4600B581 */ sub.s $f22, $f22, $f0 -/* 9B912C 802427AC 3C014480 */ lui $at, 0x4480 -/* 9B9130 802427B0 44811000 */ mtc1 $at, $f2 -/* 9B9134 802427B4 00000000 */ nop -/* 9B9138 802427B8 4602B582 */ mul.s $f22, $f22, $f2 -/* 9B913C 802427BC 00000000 */ nop -/* 9B9140 802427C0 4618B580 */ add.s $f22, $f22, $f24 -/* 9B9144 802427C4 4600B08D */ trunc.w.s $f2, $f22 -/* 9B9148 802427C8 E6220090 */ swc1 $f2, 0x90($s1) -/* 9B914C 802427CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9B9150 802427D0 8FB10014 */ lw $s1, 0x14($sp) -/* 9B9154 802427D4 8FB00010 */ lw $s0, 0x10($sp) -/* 9B9158 802427D8 D7BE0048 */ ldc1 $f30, 0x48($sp) -/* 9B915C 802427DC D7BC0040 */ ldc1 $f28, 0x40($sp) -/* 9B9160 802427E0 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* 9B9164 802427E4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 9B9168 802427E8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9B916C 802427EC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9B9170 802427F0 24020002 */ addiu $v0, $zero, 2 -/* 9B9174 802427F4 03E00008 */ jr $ra -/* 9B9178 802427F8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s deleted file mode 100644 index 7bce15444e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427FC_9B917C -/* 9B917C 802427FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9B9180 80242800 AFB1001C */ sw $s1, 0x1c($sp) -/* 9B9184 80242804 0080882D */ daddu $s1, $a0, $zero -/* 9B9188 80242808 AFBF0028 */ sw $ra, 0x28($sp) -/* 9B918C 8024280C AFB30024 */ sw $s3, 0x24($sp) -/* 9B9190 80242810 AFB20020 */ sw $s2, 0x20($sp) -/* 9B9194 80242814 AFB00018 */ sw $s0, 0x18($sp) -/* 9B9198 80242818 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9B919C 8024281C 8E30000C */ lw $s0, 0xc($s1) -/* 9B91A0 80242820 8E050000 */ lw $a1, ($s0) -/* 9B91A4 80242824 0C0B1EAF */ jal evt_get_variable -/* 9B91A8 80242828 26100004 */ addiu $s0, $s0, 4 -/* 9B91AC 8024282C 8E050000 */ lw $a1, ($s0) -/* 9B91B0 80242830 26100004 */ addiu $s0, $s0, 4 -/* 9B91B4 80242834 0220202D */ daddu $a0, $s1, $zero -/* 9B91B8 80242838 0C0B1EAF */ jal evt_get_variable -/* 9B91BC 8024283C 0040982D */ daddu $s3, $v0, $zero -/* 9B91C0 80242840 8E050000 */ lw $a1, ($s0) -/* 9B91C4 80242844 26100004 */ addiu $s0, $s0, 4 -/* 9B91C8 80242848 0220202D */ daddu $a0, $s1, $zero -/* 9B91CC 8024284C 0C0B1EAF */ jal evt_get_variable -/* 9B91D0 80242850 0040902D */ daddu $s2, $v0, $zero -/* 9B91D4 80242854 0220202D */ daddu $a0, $s1, $zero -/* 9B91D8 80242858 8E050000 */ lw $a1, ($s0) -/* 9B91DC 8024285C 0C0B1EAF */ jal evt_get_variable -/* 9B91E0 80242860 0040802D */ daddu $s0, $v0, $zero -/* 9B91E4 80242864 4482A000 */ mtc1 $v0, $f20 -/* 9B91E8 80242868 00000000 */ nop -/* 9B91EC 8024286C 4680A520 */ cvt.s.w $f20, $f20 -/* 9B91F0 80242870 0C00A8BB */ jal sin_deg -/* 9B91F4 80242874 4600A306 */ mov.s $f12, $f20 -/* 9B91F8 80242878 4600A306 */ mov.s $f12, $f20 -/* 9B91FC 8024287C 0C00A8D4 */ jal cos_deg -/* 9B9200 80242880 46000506 */ mov.s $f20, $f0 -/* 9B9204 80242884 24040001 */ addiu $a0, $zero, 1 -/* 9B9208 80242888 44931000 */ mtc1 $s3, $f2 -/* 9B920C 8024288C 00000000 */ nop -/* 9B9210 80242890 468010A0 */ cvt.s.w $f2, $f2 -/* 9B9214 80242894 2652000A */ addiu $s2, $s2, 0xa -/* 9B9218 80242898 44051000 */ mfc1 $a1, $f2 -/* 9B921C 8024289C 44921000 */ mtc1 $s2, $f2 -/* 9B9220 802428A0 00000000 */ nop -/* 9B9224 802428A4 468010A0 */ cvt.s.w $f2, $f2 -/* 9B9228 802428A8 44061000 */ mfc1 $a2, $f2 -/* 9B922C 802428AC 44901000 */ mtc1 $s0, $f2 -/* 9B9230 802428B0 00000000 */ nop -/* 9B9234 802428B4 468010A0 */ cvt.s.w $f2, $f2 -/* 9B9238 802428B8 44071000 */ mfc1 $a3, $f2 -/* 9B923C 802428BC 46000007 */ neg.s $f0, $f0 -/* 9B9240 802428C0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 9B9244 802428C4 0C01BECC */ jal fx_walking_dust -/* 9B9248 802428C8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9B924C 802428CC 8FBF0028 */ lw $ra, 0x28($sp) -/* 9B9250 802428D0 8FB30024 */ lw $s3, 0x24($sp) -/* 9B9254 802428D4 8FB20020 */ lw $s2, 0x20($sp) -/* 9B9258 802428D8 8FB1001C */ lw $s1, 0x1c($sp) -/* 9B925C 802428DC 8FB00018 */ lw $s0, 0x18($sp) -/* 9B9260 802428E0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9B9264 802428E4 24020002 */ addiu $v0, $zero, 2 -/* 9B9268 802428E8 03E00008 */ jr $ra -/* 9B926C 802428EC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index f82260254b..8f17f3f469 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -471,23 +471,23 @@ get_coin_drop_amount = 0x80048D50; // type:func rom:0x24150 func_80048E34 = 0x80048E34; // type:func rom:0x24234 func_80048F0C = 0x80048F0C; // type:func rom:0x2430C is_point_within_region = 0x80048FD4; // type:func rom:0x243D4 -func_800490B4 = 0x800490B4; // type:func rom:0x244B4 -func_800493EC = 0x800493EC; // type:func rom:0x247EC +basic_ai_check_player_dist = 0x800490B4; // type:func rom:0x244B4 +ai_check_player_dist = 0x800493EC; // type:func rom:0x247EC ai_enemy_play_sound = 0x800494C0; // type:func rom:0x248C0 func_80049550 = 0x80049550; // type:func rom:0x24950 -func_800495A0 = 0x800495A0; // type:func rom:0x249A0 -func_800496B8 = 0x800496B8; // type:func rom:0x24AB8 -base_UnkNpcAIFunc1 = 0x80049B44; // type:func rom:0x24F44 -func_80049C04 = 0x80049C04; // type:func rom:0x25004 -func_80049E3C = 0x80049E3C; // type:func rom:0x2523C -func_80049ECC = 0x80049ECC; // type:func rom:0x252CC -func_80049F7C = 0x80049F7C; // type:func rom:0x2537C -func_8004A124 = 0x8004A124; // type:func rom:0x25524 -func_8004A3E8 = 0x8004A3E8; // type:func rom:0x257E8 -DoBasicAI = 0x8004A47C; // type:func rom:0x2587C -func_8004A6F0 = 0x8004A6F0; // type:func rom:0x25AF0 -func_8004A73C = 0x8004A73C; // type:func rom:0x25B3C -func_8004A784 = 0x8004A784; // type:func rom:0x25B84 +basic_ai_wander_init = 0x800495A0; // type:func rom:0x249A0 +basic_ai_wander = 0x800496B8; // type:func rom:0x24AB8 +basic_ai_loiter_init = 0x80049B44; // type:func rom:0x24F44 +basic_ai_loiter = 0x80049C04; // type:func rom:0x25004 +basic_ai_found_player_jump_init = 0x80049E3C; // type:func rom:0x2523C +basic_ai_found_player_jump = 0x80049ECC; // type:func rom:0x252CC +basic_ai_chase_init = 0x80049F7C; // type:func rom:0x2537C +basic_ai_chase = 0x8004A124; // type:func rom:0x25524 +basic_ai_lose_player = 0x8004A3E8; // type:func rom:0x257E8 +BasicAI_Main = 0x8004A47C; // type:func rom:0x2587C +ai_suspend_for_time = 0x8004A6F0; // type:func rom:0x25AF0 +basic_ai_suspend = 0x8004A73C; // type:func rom:0x25B3C +ai_check_fwd_collisions = 0x8004A784; // type:func rom:0x25B84 create_audio_system = 0x8004AB00; // type:func rom:0x25F00 nuAuPreNMIFuncSet = 0x8004ADD0; // type:func rom:0x261D0 nuAuMgr = 0x8004AE08; // type:func rom:0x26208 @@ -11988,10 +11988,10 @@ func_802418F0_7EC600 = 0x802418F0; // type:func rom:0x7EC600 func_80241944_7EC654 = 0x80241944; // type:func rom:0x7EC654 func_8024197C_7EC68C = 0x8024197C; // type:func rom:0x7EC68C func_80241A18_7EC728 = 0x80241A18; // type:func rom:0x7EC728 -mac_00_SetManyVars = 0x80241AB4; // type:func rom:0x7EC7C4 -mac_00_UnkYawFunc = 0x80241BA4; // type:func rom:0x7EC8B4 -func_80241D30_7ECA40 = 0x80241D30; // type:func rom:0x7ECA40 -func_80241D74_7ECA84 = 0x80241D74; // type:func rom:0x7ECA84 +mac_00_LetterDelivery_Init = 0x80241AB4; // type:func rom:0x7EC7C4 +mac_00_LetterDelivery_CalcLetterPos = 0x80241BA4; // type:func rom:0x7EC8B4 +mac_00_LetterDelivery_SaveNpcAnim = 0x80241D30; // type:func rom:0x7ECA40 +mac_00_LetterDelivery_RestoreNpcAnim = 0x80241D74; // type:func rom:0x7ECA84 func_80241DA0_7ECAB0 = 0x80241DA0; // type:func rom:0x7ECAB0 func_80241E04_7ECB14 = 0x80241E04; // type:func rom:0x7ECB14 func_80241E80_7ECB90 = 0x80241E80; // type:func rom:0x7ECB90 @@ -12004,18 +12004,18 @@ func_80242250_7ECF60 = 0x80242250; // type:func rom:0x7ECF60 func_8024228C_7ECF9C = 0x8024228C; // type:func rom:0x7ECF9C mac_00_UnkMusicFunc = 0x802422C0; // type:func rom:0x7ECFD0 func_802423F0_7ED100 = 0x802423F0; // type:func rom:0x7ED100 -mac_00_UnkNpcAIFunc24 = 0x80242570; // type:func rom:0x7ED280 -mac_00_UnkFunc13 = 0x802426C8; // type:func rom:0x7ED3D8 -mac_00_UnkNpcAIFunc1 = 0x80242970; // type:func rom:0x7ED680 -mac_00_UnkFunc14 = 0x80242A30; // type:func rom:0x7ED740 -mac_00_UnkNpcAIFunc25 = 0x80242BEC; // type:func rom:0x7ED8FC -mac_00_NpcJumpFunc2 = 0x80242CA0; // type:func rom:0x7ED9B0 -mac_00_NpcJumpFunc = 0x80242D14; // type:func rom:0x7EDA24 -mac_00_UnkNpcAIFunc13 = 0x80242D8C; // type:func rom:0x7EDA9C -mac_00_UnkFunc15 = 0x80242EBC; // type:func rom:0x7EDBCC -mac_00_UnkNpcDurationFlagFunc = 0x80242FDC; // type:func rom:0x7EDCEC -mac_00_UnkFunc16 = 0x80243044; // type:func rom:0x7EDD54 -mac_00_UnkNpcAIMainFunc = 0x80243104; // type:func rom:0x7EDE14 +mac_00_PatrolAI_MoveInit = 0x80242570; // type:func rom:0x7ED280 +mac_00_PatrolAI_Move = 0x802426C8; // type:func rom:0x7ED3D8 +mac_00_PatrolAI_LoiterInit = 0x80242970; // type:func rom:0x7ED680 +mac_00_PatrolAI_Loiter = 0x80242A30; // type:func rom:0x7ED740 +mac_00_PatrolAI_PostLoiter = 0x80242BEC; // type:func rom:0x7ED8FC +mac_00_PatrolAI_JumpInit = 0x80242CA0; // type:func rom:0x7ED9B0 +mac_00_PatrolAI_Jump = 0x80242D14; // type:func rom:0x7EDA24 +mac_00_PatrolAI_ChaseInit = 0x80242D8C; // type:func rom:0x7EDA9C +mac_00_PatrolAI_Chase = 0x80242EBC; // type:func rom:0x7EDBCC +mac_00_PatrolAI_LosePlayer = 0x80242FDC; // type:func rom:0x7EDCEC +mac_00_PatrolNoAttackAI_15 = 0x80243044; // type:func rom:0x7EDD54 +mac_00_PatrolNoAttackAI_Main = 0x80243104; // type:func rom:0x7EDE14 dup_mac_00_StashVars = 0x80243400; // type:func rom:0x7EE110 dup_mac_00_GetItemName = 0x802434B4; // type:func rom:0x7EE1C4 dup_mac_00_GetNpcCollisionHeight = 0x80243518; // type:func rom:0x7EE228 @@ -12023,10 +12023,10 @@ dup_mac_00_AddPlayerHandsOffset = 0x80243574; // type:func rom:0x7EE284 func_80243744_7EE454 = 0x80243744; // type:func rom:0x7EE454 func_80243798_7EE4A8 = 0x80243798; // type:func rom:0x7EE4A8 func_802437D0_7EE4E0 = 0x802437D0; // type:func rom:0x7EE4E0 -dup_mac_00_SetManyVars = 0x8024386C; // type:func rom:0x7EE57C -dup_mac_00_UnkYawFunc = 0x8024395C; // type:func rom:0x7EE66C -func_80243AE8_7EE7F8 = 0x80243AE8; // type:func rom:0x7EE7F8 -func_80243B2C_7EE83C = 0x80243B2C; // type:func rom:0x7EE83C +dup_mac_00_LetterDelivery_Init = 0x8024386C; // type:func rom:0x7EE57C +dup_mac_00_LetterDelivery_CalcLetterPos = 0x8024395C; // type:func rom:0x7EE66C +dup_mac_00_LetterDelivery_SaveNpcAnim = 0x80243AE8; // type:func rom:0x7EE7F8 +dup_mac_00_LetterDelivery_RestoreNpcAnim = 0x80243B2C; // type:func rom:0x7EE83C mac_00_Quizmo_varStash = 0x80245DC0; // type:data rom:0x7F0AD0 mac_00_Quizmo_Answers = 0x80245E24; // type:data rom:0x7F0B34 D_80245E64_7F0B74 = 0x80245E64; // type:data rom:0x7F0B74 @@ -12050,17 +12050,17 @@ func_80240628_800EA8 = 0x80240628; // type:func rom:0x800EA8 func_80240E80_801700 = 0x80240E80; // type:func rom:0x801700 func_80240ED8_801758 = 0x80240ED8; // type:func rom:0x801758 mac_01_UnkMusicFunc = 0x80240F50; // type:func rom:0x8017D0 -dup_mac_01_UnkNpcAIFunc24 = 0x80241080; // type:func rom:0x801900 -mac_01_UnkFunc13 = 0x802411D8; // type:func rom:0x801A58 -dup_mac_01_UnkNpcAIFunc1 = 0x80241480; // type:func rom:0x801D00 -mac_01_UnkFunc14 = 0x80241540; // type:func rom:0x801DC0 -dup_mac_01_UnkNpcAIFunc25 = 0x802416FC; // type:func rom:0x801F7C -dup_mac_01_NpcJumpFunc2 = 0x802417B0; // type:func rom:0x802030 -dup_mac_01_NpcJumpFunc = 0x80241824; // type:func rom:0x8020A4 -dup_mac_01_UnkNpcAIFunc13 = 0x8024189C; // type:func rom:0x80211C -mac_01_UnkFunc15 = 0x802419CC; // type:func rom:0x80224C -dup_mac_01_UnkNpcDurationFlagFunc = 0x80241AEC; // type:func rom:0x80236C -mac_01_UnkFunc16 = 0x80241B54; // type:func rom:0x8023D4 +dup_mac_01_PatrolAI_MoveInit = 0x80241080; // type:func rom:0x801900 +mac_01_PatrolAI_Move = 0x802411D8; // type:func rom:0x801A58 +dup_mac_01_PatrolAI_LoiterInit = 0x80241480; // type:func rom:0x801D00 +mac_01_PatrolAI_Loiter = 0x80241540; // type:func rom:0x801DC0 +dup_mac_01_PatrolAI_PostLoiter = 0x802416FC; // type:func rom:0x801F7C +dup_mac_01_PatrolAI_JumpInit = 0x802417B0; // type:func rom:0x802030 +dup_mac_01_PatrolAI_Jump = 0x80241824; // type:func rom:0x8020A4 +dup_mac_01_PatrolAI_ChaseInit = 0x8024189C; // type:func rom:0x80211C +mac_01_PatrolAI_Chase = 0x802419CC; // type:func rom:0x80224C +dup_mac_01_PatrolAI_LosePlayer = 0x80241AEC; // type:func rom:0x80236C +mac_01_PatrolNoAttackAI_15 = 0x80241B54; // type:func rom:0x8023D4 func_80241C14_802494 = 0x80241C14; // type:func rom:0x802494 mac_01_Quizmo_StashVars = 0x80241F10; // type:func rom:0x802790 mac_01_Quizmo_GetItemName = 0x80241FC4; // type:func rom:0x802844 @@ -12113,10 +12113,10 @@ mac_01_AddPlayerHandsOffset = 0x80243B04; // type:func rom:0x804384 func_80243CD4_804554 = 0x80243CD4; // type:func rom:0x804554 func_80243D28_8045A8 = 0x80243D28; // type:func rom:0x8045A8 func_80243D60_8045E0 = 0x80243D60; // type:func rom:0x8045E0 -mac_01_SetManyVars = 0x80243DFC; // type:func rom:0x80467C -mac_01_UnkYawFunc = 0x80243EEC; // type:func rom:0x80476C -func_80244078_8048F8 = 0x80244078; // type:func rom:0x8048F8 -func_802440BC_80493C = 0x802440BC; // type:func rom:0x80493C +mac_01_LetterDelivery_Init = 0x80243DFC; // type:func rom:0x80467C +mac_01_LetterDelivery_CalcLetterPos = 0x80243EEC; // type:func rom:0x80476C +mac_01_LetterDelivery_SaveNpcAnim = 0x80244078; // type:func rom:0x8048F8 +mac_01_LetterDelivery_RestoreNpcAnim = 0x802440BC; // type:func rom:0x80493C mac_01_GetPlayerCoins = 0x802440E8; // type:func rom:0x804968 func_802440FC_80497C = 0x802440FC; // type:func rom:0x80497C func_802441EC_804A6C = 0x802441EC; // type:func rom:0x804A6C @@ -12143,17 +12143,17 @@ func_80245488_805D08 = 0x80245488; // type:func rom:0x805D08 func_802454B4_805D34 = 0x802454B4; // type:func rom:0x805D34 func_80245504_805D84 = 0x80245504; // type:func rom:0x805D84 func_8024552C_805DAC = 0x8024552C; // type:func rom:0x805DAC -mac_01_UnkNpcAIFunc24 = 0x80245550; // type:func rom:0x805DD0 -dup_mac_01_UnkFunc13 = 0x802456A8; // type:func rom:0x805F28 -mac_01_UnkNpcAIFunc1 = 0x80245950; // type:func rom:0x8061D0 -dup_mac_01_UnkFunc14 = 0x80245A10; // type:func rom:0x806290 -mac_01_UnkNpcAIFunc25 = 0x80245BCC; // type:func rom:0x80644C -mac_01_NpcJumpFunc2 = 0x80245C80; // type:func rom:0x806500 -mac_01_NpcJumpFunc = 0x80245CF4; // type:func rom:0x806574 -mac_01_UnkNpcAIFunc13 = 0x80245D6C; // type:func rom:0x8065EC -dup_mac_01_UnkFunc15 = 0x80245E9C; // type:func rom:0x80671C -mac_01_UnkNpcDurationFlagFunc = 0x80245FBC; // type:func rom:0x80683C -dup_mac_01_UnkFunc16 = 0x80246024; // type:func rom:0x8068A4 +mac_01_PatrolAI_MoveInit = 0x80245550; // type:func rom:0x805DD0 +dup_mac_01_PatrolAI_Move = 0x802456A8; // type:func rom:0x805F28 +mac_01_PatrolAI_LoiterInit = 0x80245950; // type:func rom:0x8061D0 +dup_mac_01_PatrolAI_Loiter = 0x80245A10; // type:func rom:0x806290 +mac_01_PatrolAI_PostLoiter = 0x80245BCC; // type:func rom:0x80644C +mac_01_PatrolAI_JumpInit = 0x80245C80; // type:func rom:0x806500 +mac_01_PatrolAI_Jump = 0x80245CF4; // type:func rom:0x806574 +mac_01_PatrolAI_ChaseInit = 0x80245D6C; // type:func rom:0x8065EC +dup_mac_01_PatrolAI_Chase = 0x80245E9C; // type:func rom:0x80671C +mac_01_PatrolAI_LosePlayer = 0x80245FBC; // type:func rom:0x80683C +dup_mac_01_PatrolNoAttackAI_15 = 0x80246024; // type:func rom:0x8068A4 func_802460E4_806964 = 0x802460E4; // type:func rom:0x806964 func_802463E0_806C60 = 0x802463E0; // type:func rom:0x806C60 mac_01_foliage_setup_shear_mtx = 0x80246490; // type:func rom:0x806D10 @@ -12187,18 +12187,18 @@ func_802405F0_8238B0 = 0x802405F0; // type:func rom:0x8238B0 mac_02_foliage_setup_shear_mtx = 0x802406B0; // type:func rom:0x823970 mac_02_TransformFoliage = 0x80240720; // type:func rom:0x8239E0 mac_02_SetEntityFlags100000 = 0x802408F0; // type:func rom:0x823BB0 -mac_02_UnkNpcAIFunc24 = 0x80240930; // type:func rom:0x823BF0 -mac_02_UnkFunc13 = 0x80240A88; // type:func rom:0x823D48 -mac_02_UnkNpcAIFunc1 = 0x80240D30; // type:func rom:0x823FF0 -mac_02_UnkFunc14 = 0x80240DF0; // type:func rom:0x8240B0 -mac_02_UnkNpcAIFunc25 = 0x80240FAC; // type:func rom:0x82426C -mac_02_NpcJumpFunc2 = 0x80241060; // type:func rom:0x824320 -mac_02_NpcJumpFunc = 0x802410D4; // type:func rom:0x824394 -mac_02_UnkNpcAIFunc13 = 0x8024114C; // type:func rom:0x82440C -mac_02_UnkFunc15 = 0x8024127C; // type:func rom:0x82453C -mac_02_UnkNpcDurationFlagFunc = 0x8024139C; // type:func rom:0x82465C -mac_02_UnkFunc16 = 0x80241404; // type:func rom:0x8246C4 -mac_02_UnkNpcAIMainFunc = 0x802414C4; // type:func rom:0x824784 +mac_02_PatrolAI_MoveInit = 0x80240930; // type:func rom:0x823BF0 +mac_02_PatrolAI_Move = 0x80240A88; // type:func rom:0x823D48 +mac_02_PatrolAI_LoiterInit = 0x80240D30; // type:func rom:0x823FF0 +mac_02_PatrolAI_Loiter = 0x80240DF0; // type:func rom:0x8240B0 +mac_02_PatrolAI_PostLoiter = 0x80240FAC; // type:func rom:0x82426C +mac_02_PatrolAI_JumpInit = 0x80241060; // type:func rom:0x824320 +mac_02_PatrolAI_Jump = 0x802410D4; // type:func rom:0x824394 +mac_02_PatrolAI_ChaseInit = 0x8024114C; // type:func rom:0x82440C +mac_02_PatrolAI_Chase = 0x8024127C; // type:func rom:0x82453C +mac_02_PatrolAI_LosePlayer = 0x8024139C; // type:func rom:0x82465C +mac_02_PatrolNoAttackAI_15 = 0x80241404; // type:func rom:0x8246C4 +mac_02_PatrolNoAttackAI_Main = 0x802414C4; // type:func rom:0x824784 mac_02_Quizmo_StashVars = 0x802417C0; // type:func rom:0x824A80 mac_02_Quizmo_GetItemName = 0x80241874; // type:func rom:0x824B34 mac_02_Quizmo_HideEntities = 0x802418D8; // type:func rom:0x824B98 @@ -12238,10 +12238,10 @@ func_80242F60_826220 = 0x80242F60; // type:func rom:0x826220 func_80243040_826300 = 0x80243040; // type:func rom:0x826300 func_80243088_826348 = 0x80243088; // type:func rom:0x826348 func_802430D0_826390 = 0x802430D0; // type:func rom:0x826390 -mac_02_SetManyVars = 0x80243104; // type:func rom:0x8263C4 -mac_02_UnkYawFunc = 0x802431F4; // type:func rom:0x8264B4 -filemenu_update_show_name_input_826640 = 0x80243380; // type:func rom:0x826640 -func_802433C4_826684 = 0x802433C4; // type:func rom:0x826684 +mac_02_LetterDelivery_Init = 0x80243104; // type:func rom:0x8263C4 +mac_02_LetterDelivery_CalcLetterPos = 0x802431F4; // type:func rom:0x8264B4 +mac_02_LetterDelivery_SaveNpcAnim = 0x80243380; // type:func rom:0x826640 +mac_02_LetterDelivery_RestoreNpcAnim = 0x802433C4; // type:func rom:0x826684 mac_02_UnkMusicFunc = 0x802433F0; // type:func rom:0x8266B0 mac_02_Quizmo_varStash = 0x80246150; // type:data rom:0x829410 mac_02_Quizmo_Answers = 0x802461B4; // type:data rom:0x829474 @@ -12299,10 +12299,10 @@ mac_03_AddPlayerHandsOffset = 0x802415A0; // type:func rom:0x832DA0 func_80241770_832F70 = 0x80241770; // type:func rom:0x832F70 func_802417C4_832FC4 = 0x802417C4; // type:func rom:0x832FC4 func_802417FC_832FFC = 0x802417FC; // type:func rom:0x832FFC -mac_03_SetManyVars = 0x80241898; // type:func rom:0x833098 -mac_03_UnkYawFunc = 0x80241988; // type:func rom:0x833188 -func_80241B14_833314 = 0x80241B14; // type:func rom:0x833314 -func_80241B58_833358 = 0x80241B58; // type:func rom:0x833358 +mac_03_LetterDelivery_Init = 0x80241898; // type:func rom:0x833098 +mac_03_LetterDelivery_CalcLetterPos = 0x80241988; // type:func rom:0x833188 +mac_03_LetterDelivery_SaveNpcAnim = 0x80241B14; // type:func rom:0x833314 +mac_03_LetterDelivery_RestoreNpcAnim = 0x80241B58; // type:func rom:0x833358 func_80241B84_833384 = 0x80241B84; // type:func rom:0x833384 func_80241BD8_8333D8 = 0x80241BD8; // type:func rom:0x8333D8 mac_03_foliage_setup_shear_mtx = 0x80241D00; // type:func rom:0x833500 @@ -12393,18 +12393,18 @@ mac_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x852170 mac_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x852294 func_8024030C_85247C = 0x8024030C; // type:func rom:0x85247C func_8024047C_8525EC = 0x8024047C; // type:func rom:0x8525EC -mac_05_UnkNpcAIFunc24 = 0x80240490; // type:func rom:0x852600 -mac_05_UnkFunc13 = 0x802405E8; // type:func rom:0x852758 -mac_05_UnkNpcAIFunc1 = 0x80240890; // type:func rom:0x852A00 -mac_05_UnkFunc14 = 0x80240950; // type:func rom:0x852AC0 -mac_05_UnkNpcAIFunc25 = 0x80240B0C; // type:func rom:0x852C7C -mac_05_NpcJumpFunc2 = 0x80240BC0; // type:func rom:0x852D30 -mac_05_NpcJumpFunc = 0x80240C34; // type:func rom:0x852DA4 -mac_05_UnkNpcAIFunc13 = 0x80240CAC; // type:func rom:0x852E1C -mac_05_UnkFunc15 = 0x80240DDC; // type:func rom:0x852F4C -mac_05_UnkNpcDurationFlagFunc = 0x80240EFC; // type:func rom:0x85306C -mac_05_UnkFunc16 = 0x80240F64; // type:func rom:0x8530D4 -mac_05_UnkNpcAIMainFunc = 0x80241024; // type:func rom:0x853194 +mac_05_PatrolAI_MoveInit = 0x80240490; // type:func rom:0x852600 +mac_05_PatrolAI_Move = 0x802405E8; // type:func rom:0x852758 +mac_05_PatrolAI_LoiterInit = 0x80240890; // type:func rom:0x852A00 +mac_05_PatrolAI_Loiter = 0x80240950; // type:func rom:0x852AC0 +mac_05_PatrolAI_PostLoiter = 0x80240B0C; // type:func rom:0x852C7C +mac_05_PatrolAI_JumpInit = 0x80240BC0; // type:func rom:0x852D30 +mac_05_PatrolAI_Jump = 0x80240C34; // type:func rom:0x852DA4 +mac_05_PatrolAI_ChaseInit = 0x80240CAC; // type:func rom:0x852E1C +mac_05_PatrolAI_Chase = 0x80240DDC; // type:func rom:0x852F4C +mac_05_PatrolAI_LosePlayer = 0x80240EFC; // type:func rom:0x85306C +mac_05_PatrolNoAttackAI_15 = 0x80240F64; // type:func rom:0x8530D4 +mac_05_PatrolNoAttackAI_Main = 0x80241024; // type:func rom:0x853194 mac_05_Quizmo_StashVars = 0x80241320; // type:func rom:0x853490 mac_05_Quizmo_GetItemName = 0x802413D4; // type:func rom:0x853544 mac_05_Quizmo_HideEntities = 0x80241438; // type:func rom:0x8535A8 @@ -12438,10 +12438,10 @@ func_802425E0_854750 = 0x802425E0; // type:func rom:0x854750 func_80242634_8547A4 = 0x80242634; // type:func rom:0x8547A4 func_8024266C_8547DC = 0x8024266C; // type:func rom:0x8547DC func_80242708_854878 = 0x80242708; // type:func rom:0x854878 -mac_05_SetManyVars = 0x802427A4; // type:func rom:0x854914 -mac_05_UnkYawFunc = 0x80242894; // type:func rom:0x854A04 -func_80242A20_854B90 = 0x80242A20; // type:func rom:0x854B90 -func_80242A64_854BD4 = 0x80242A64; // type:func rom:0x854BD4 +mac_05_LetterDelivery_Init = 0x802427A4; // type:func rom:0x854914 +mac_05_LetterDelivery_CalcLetterPos = 0x80242894; // type:func rom:0x854A04 +mac_05_LetterDelivery_SaveNpcAnim = 0x80242A20; // type:func rom:0x854B90 +mac_05_LetterDelivery_RestoreNpcAnim = 0x80242A64; // type:func rom:0x854BD4 func_80242A90_854C00 = 0x80242A90; // type:func rom:0x854C00 func_80242C78_854DE8 = 0x80242C78; // type:func rom:0x854DE8 func_80242E84_854FF4 = 0x80242E84; // type:func rom:0x854FF4 @@ -12598,23 +12598,23 @@ tik_07_SuperBlock_PartnerSparkles4 = 0x80240FA0; // type:func rom:0x87AB80 tik_07_SuperBlock_WaitForPlayerToLand = 0x80240FE8; // type:func rom:0x87ABC8 tik_07_UnkPosFunc2 = 0x80241020; // type:func rom:0x87AC00 func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70 -tik_07_UnkNpcAIFunc23 = 0x802413F0; // type:func rom:0x87AFD0 -tik_07_UnkNpcAIFunc35 = 0x802415A0; // type:func rom:0x87B180 -tik_07_UnkNpcAIFunc1_copy = 0x80241BC8; // type:func rom:0x87B7A8 -tik_07_UnkFunc4 = 0x80241C88; // type:func rom:0x87B868 -tik_07_UnkNpcAIFunc2 = 0x80241FCC; // type:func rom:0x87BBAC -tik_07_SixFloatsFunc = 0x80242044; // type:func rom:0x87BC24 -tik_07_UnkNpcAIFunc14 = 0x802420B0; // type:func rom:0x87BC90 -tik_07_UnkNpcAIFunc3 = 0x802421E4; // type:func rom:0x87BDC4 -tik_07_UnkFunc6 = 0x80242248; // type:func rom:0x87BE28 -tik_07_UnkFunc5 = 0x802425D8; // type:func rom:0x87C1B8 -tik_07_UnkNpcAIMainFunc9 = 0x802426FC; // type:func rom:0x87C2DC +tik_07_FlyingAI_WanderInit = 0x802413F0; // type:func rom:0x87AFD0 +tik_07_FlyingAI_Wander = 0x802415A0; // type:func rom:0x87B180 +tik_07_FlyingAI_LoiterInit = 0x80241BC8; // type:func rom:0x87B7A8 +tik_07_FlyingAI_Loiter = 0x80241C88; // type:func rom:0x87B868 +tik_07_FlyingAI_JumpInit = 0x80241FCC; // type:func rom:0x87BBAC +tik_07_FlyingAI_Jump = 0x80242044; // type:func rom:0x87BC24 +tik_07_FlyingAI_ChaseInit = 0x802420B0; // type:func rom:0x87BC90 +tik_07_FlyingAI_Chase = 0x802421E4; // type:func rom:0x87BDC4 +tik_07_FlyingAI_LosePlayer = 0x80242248; // type:func rom:0x87BE28 +tik_07_FlyingAI_Init = 0x802425D8; // type:func rom:0x87C1B8 +tik_07_FlyingAI_Main = 0x802426FC; // type:func rom:0x87C2DC tik_07_SuperBlock_CantUpgradeMessages = 0x802439F0; // type:data rom:0x87D5D0 tik_07_SuperBlock_PartnerIDs = 0x802439F8; // type:data rom:0x87D5D8 tik_07_SuperBlock_UpgradeDescMessages = 0x80243A08; // type:data rom:0x87D5E8 tik_07_SuperBlock_UpgradeOrbAngles = 0x80243A48; // type:data rom:0x87D628 D_802449B0_87E590 = 0x802449B0; // type:data rom:0x87E590 -tik_07_sixFloats = 0x80244CB0; // type:data rom:0x87E890 +tik_07_FlyingAI_JumpVels = 0x80244CB0; // type:data rom:0x87E890 D_802451B0_87ED90 = 0x802451B0; // type:data rom:0x87ED90 D_802451B8_87ED98 = 0x802451B8; // type:data rom:0x87ED98 D_802451C0_87EDA0 = 0x802451C0; // type:data rom:0x87EDA0 @@ -12645,8 +12645,8 @@ tik_09_set_script_owner_npc_anim = 0x80240A30; // type:func rom:0x882BF0 tik_09_UnkDistFunc = 0x80240AAC; // type:func rom:0x882C6C tik_09_UnkNpcAIFunc12 = 0x80240BE0; // type:func rom:0x882DA0 tik_09_set_script_owner_npc_col_height = 0x80240D44; // type:func rom:0x882F04 -tik_09_UnkNpcAIMainFunc5 = 0x80240DC4; // type:func rom:0x882F84 -func_80241204_8833C4 = 0x80241204; // type:func rom:0x8833C4 +tik_09_TackleAI_Main = 0x80240DC4; // type:func rom:0x882F84 +tik_09_GetDefeatedEnemyCount = 0x80241204; // type:func rom:0x8833C4 D_802441A0_886360 = 0x802441A0; // type:data rom:0x886360 tik_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8863C0 tik_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x8864E4 @@ -12708,7 +12708,7 @@ tik_12_set_script_owner_npc_anim = 0x80241960; // type:func rom:0x88A530 tik_12_UnkDistFunc = 0x802419DC; // type:func rom:0x88A5AC tik_12_UnkNpcAIFunc12 = 0x80241B10; // type:func rom:0x88A6E0 tik_12_set_script_owner_npc_col_height = 0x80241C74; // type:func rom:0x88A844 -tik_12_UnkNpcAIMainFunc5 = 0x80241CF4; // type:func rom:0x88A8C4 +tik_12_TackleAI_Main = 0x80241CF4; // type:func rom:0x88A8C4 tik_12_func_80240814_97BE44 = 0x80242134; // type:func rom:0x88AD04 tik_12_AwaitPlayerNearNpc = 0x8024217C; // type:func rom:0x88AD4C tik_12_func_802408B4_97BEE4 = 0x802421D4; // type:func rom:0x88ADA4 @@ -12821,7 +12821,7 @@ tik_20_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x89ACB0 tik_20_UnkDistFunc = 0x802409DC; // type:func rom:0x89AD2C tik_20_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x89AE60 tik_20_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x89AFC4 -tik_20_UnkNpcAIMainFunc5 = 0x80240CF4; // type:func rom:0x89B044 +tik_20_TackleAI_Main = 0x80240CF4; // type:func rom:0x89B044 D_802433F0_89D740 = 0x802433F0; // type:data rom:0x89D740 tik_21_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x89D7A0 tik_21_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x89D8C4 @@ -12856,7 +12856,7 @@ tik_23_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x8A2D30 tik_23_UnkDistFunc = 0x802409DC; // type:func rom:0x8A2DAC tik_23_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x8A2EE0 tik_23_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x8A3044 -tik_23_UnkNpcAIMainFunc5 = 0x80240CF4; // type:func rom:0x8A30C4 +tik_23_TackleAI_Main = 0x80240CF4; // type:func rom:0x8A30C4 D_80243650_8A5A20 = 0x80243650; // type:data rom:0x8A5A20 func_80240000_8A5A80 = 0x80240000; // type:func rom:0x8A5A80 tik_24_UpdateTexturePanSmooth = 0x80240050; // type:func rom:0x8A5AD0 @@ -12866,7 +12866,7 @@ tik_24_set_script_owner_npc_anim = 0x802406D0; // type:func rom:0x8A6150 tik_24_UnkDistFunc = 0x8024074C; // type:func rom:0x8A61CC tik_24_UnkNpcAIFunc12 = 0x80240880; // type:func rom:0x8A6300 tik_24_set_script_owner_npc_col_height = 0x802409E4; // type:func rom:0x8A6464 -tik_24_UnkNpcAIMainFunc5 = 0x80240A64; // type:func rom:0x8A64E4 +tik_24_TackleAI_Main = 0x80240A64; // type:func rom:0x8A64E4 D_80242470_8A7EF0 = 0x80242470; // type:data rom:0x8A7EF0 D_80242480_8A7F00 = 0x80242480; // type:data rom:0x8A7F00 D_802424A0_8A7F20 = 0x802424A0; // type:data rom:0x8A7F20 @@ -12938,16 +12938,16 @@ kmr_02_Quizmo_SpinPartner = 0x80241210; // type:func rom:0x8B1280 kmr_02_Quizmo_UpdatePartnerPosition = 0x802412A0; // type:func rom:0x8B1310 kmr_02_Quizmo_CreateReactionEffect = 0x80241388; // type:func rom:0x8B13F8 kmr_02_Quizmo_CreateWorker = 0x802413F4; // type:func rom:0x8B1464 -kmr_02_UnkNpcAIFunc43 = 0x80241424; // type:func rom:0x8B1494 -kmr_02_UnkNpcAIFunc44 = 0x802414D8; // type:func rom:0x8B1548 -kmr_02_NpcJumpFunc3 = 0x802415F8; // type:func rom:0x8B1668 -kmr_02_NpcJumpFunc = 0x80241658; // type:func rom:0x8B16C8 -kmr_02_UnkNpcAIFunc13_2 = 0x802416D0; // type:func rom:0x8B1740 -kmr_02_UnkNpcAIFunc11 = 0x80241800; // type:func rom:0x8B1870 -kmr_02_UnkNpcAIFunc10 = 0x8024191C; // type:func rom:0x8B198C -kmr_02_UnkNpcAIFunc42 = 0x80241964; // type:func rom:0x8B19D4 -kmr_02_UnkNpcAIFunc45 = 0x80241A10; // type:func rom:0x8B1A80 -kmr_02_UnkNpcAIMainFunc4 = 0x80241C18; // type:func rom:0x8B1C88 +kmr_02_StationaryAI_IdleInit = 0x80241424; // type:func rom:0x8B1494 +kmr_02_StationaryAI_Idle = 0x802414D8; // type:func rom:0x8B1548 +kmr_02_StationaryAI_AlertInit = 0x802415F8; // type:func rom:0x8B1668 +kmr_02_StationaryAI_Alert = 0x80241658; // type:func rom:0x8B16C8 +kmr_02_StationaryAI_ChaseInit = 0x802416D0; // type:func rom:0x8B1740 +kmr_02_StationaryAI_Chase = 0x80241800; // type:func rom:0x8B1870 +kmr_02_StationaryAI_LosePlayer = 0x8024191C; // type:func rom:0x8B198C +kmr_02_StationaryAI_ReturnHomeInit = 0x80241964; // type:func rom:0x8B19D4 +kmr_02_StationaryAI_ReturnHome = 0x80241A10; // type:func rom:0x8B1A80 +kmr_02_StationaryAI_Main = 0x80241C18; // type:func rom:0x8B1C88 kmr_02_UnkFunc41 = 0x80241E90; // type:func rom:0x8B1F00 func_80242014_8B2084 = 0x80242014; // type:func rom:0x8B2084 func_80242040_8B20B0 = 0x80242040; // type:func rom:0x8B20B0 @@ -12956,10 +12956,10 @@ func_8024226C_8B22DC = 0x8024226C; // type:func rom:0x8B22DC func_802422C0_8B2330 = 0x802422C0; // type:func rom:0x8B2330 func_802422F8_8B2368 = 0x802422F8; // type:func rom:0x8B2368 func_80242394_8B2404 = 0x80242394; // type:func rom:0x8B2404 -kmr_02_SetManyVars = 0x80242424; // type:func rom:0x8B2494 -kmr_02_UnkYawFunc = 0x80242514; // type:func rom:0x8B2584 -func_802426A0_8B2710 = 0x802426A0; // type:func rom:0x8B2710 -func_802426E4_8B2754 = 0x802426E4; // type:func rom:0x8B2754 +kmr_02_LetterDelivery_Init = 0x80242424; // type:func rom:0x8B2494 +kmr_02_LetterDelivery_CalcLetterPos = 0x80242514; // type:func rom:0x8B2584 +kmr_02_LetterDelivery_SaveNpcAnim = 0x802426A0; // type:func rom:0x8B2710 +kmr_02_LetterDelivery_RestoreNpcAnim = 0x802426E4; // type:func rom:0x8B2754 func_80242710_8B2780 = 0x80242710; // type:func rom:0x8B2780 func_80242734_8B27A4 = 0x80242734; // type:func rom:0x8B27A4 func_80242788_8B27F8 = 0x80242788; // type:func rom:0x8B27F8 @@ -13069,35 +13069,35 @@ kmr_04_func_80240444_8CAD44 = 0x80240444; // type:func rom:0x8CAD44 D_80241BF0_8CC4F0 = 0x80241BF0; // type:data rom:0x8CC4F0 D_80242070_8CC970 = 0x80242070; // type:data rom:0x8CC970 kmr_04_varStash = 0x802429F4; // type:data rom:0x8CD2F4 -kmr_05_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8CE070 -kmr_05_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0x8CE220 -kmr_05_UnkNpcAIFunc1_copy = 0x802407D8; // type:func rom:0x8CE848 -kmr_05_UnkFunc4 = 0x80240898; // type:func rom:0x8CE908 -kmr_05_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8CEC4C -kmr_05_SixFloatsFunc = 0x80240C54; // type:func rom:0x8CECC4 -kmr_05_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8CED30 -kmr_05_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8CEE64 -kmr_05_UnkFunc6 = 0x80240E58; // type:func rom:0x8CEEC8 -kmr_05_UnkFunc5 = 0x802411E8; // type:func rom:0x8CF258 -kmr_05_UnkNpcAIMainFunc9 = 0x8024130C; // type:func rom:0x8CF37C +kmr_05_FlyingAI_WanderInit = 0x80240000; // type:func rom:0x8CE070 +kmr_05_FlyingAI_Wander = 0x802401B0; // type:func rom:0x8CE220 +kmr_05_FlyingAI_LoiterInit = 0x802407D8; // type:func rom:0x8CE848 +kmr_05_FlyingAI_Loiter = 0x80240898; // type:func rom:0x8CE908 +kmr_05_FlyingAI_JumpInit = 0x80240BDC; // type:func rom:0x8CEC4C +kmr_05_FlyingAI_Jump = 0x80240C54; // type:func rom:0x8CECC4 +kmr_05_FlyingAI_ChaseInit = 0x80240CC0; // type:func rom:0x8CED30 +kmr_05_FlyingAI_Chase = 0x80240DF4; // type:func rom:0x8CEE64 +kmr_05_FlyingAI_LosePlayer = 0x80240E58; // type:func rom:0x8CEEC8 +kmr_05_FlyingAI_Init = 0x802411E8; // type:func rom:0x8CF258 +kmr_05_FlyingAI_Main = 0x8024130C; // type:func rom:0x8CF37C kmr_05_foliage_setup_shear_mtx = 0x80241500; // type:func rom:0x8CF570 kmr_05_TransformFoliage = 0x80241570; // type:func rom:0x8CF5E0 func_8024173C_8CF7AC = 0x8024173C; // type:func rom:0x8CF7AC -kmr_05_sixFloats = 0x80241B2C; // type:data rom:0x8CFB9C +kmr_05_FlyingAI_JumpVels = 0x80241B2C; // type:data rom:0x8CFB9C D_80243440_8D14B0 = 0x80243440; // type:data rom:0x8D14B0 D_80243448_8D14B8 = 0x80243448; // type:data rom:0x8D14B8 D_80243450_8D14C0 = 0x80243450; // type:data rom:0x8D14C0 -kmr_06_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8D1510 -kmr_06_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0x8D16C0 -kmr_06_UnkNpcAIFunc1_copy = 0x802407D8; // type:func rom:0x8D1CE8 -kmr_06_UnkFunc4 = 0x80240898; // type:func rom:0x8D1DA8 -kmr_06_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D20EC -kmr_06_SixFloatsFunc = 0x80240C54; // type:func rom:0x8D2164 -kmr_06_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8D21D0 -kmr_06_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8D2304 -kmr_06_UnkFunc6 = 0x80240E58; // type:func rom:0x8D2368 -kmr_06_UnkFunc5 = 0x802411E8; // type:func rom:0x8D26F8 -kmr_06_UnkNpcAIMainFunc9 = 0x8024130C; // type:func rom:0x8D281C +kmr_06_FlyingAI_WanderInit = 0x80240000; // type:func rom:0x8D1510 +kmr_06_FlyingAI_Wander = 0x802401B0; // type:func rom:0x8D16C0 +kmr_06_FlyingAI_LoiterInit = 0x802407D8; // type:func rom:0x8D1CE8 +kmr_06_FlyingAI_Loiter = 0x80240898; // type:func rom:0x8D1DA8 +kmr_06_FlyingAI_JumpInit = 0x80240BDC; // type:func rom:0x8D20EC +kmr_06_FlyingAI_Jump = 0x80240C54; // type:func rom:0x8D2164 +kmr_06_FlyingAI_ChaseInit = 0x80240CC0; // type:func rom:0x8D21D0 +kmr_06_FlyingAI_Chase = 0x80240DF4; // type:func rom:0x8D2304 +kmr_06_FlyingAI_LosePlayer = 0x80240E58; // type:func rom:0x8D2368 +kmr_06_FlyingAI_Init = 0x802411E8; // type:func rom:0x8D26F8 +kmr_06_FlyingAI_Main = 0x8024130C; // type:func rom:0x8D281C func_80241500_8D2A10 = 0x80241500; // type:func rom:0x8D2A10 func_802417A8_8D2CB8 = 0x802417A8; // type:func rom:0x8D2CB8 func_802417E0_8D2CF0 = 0x802417E0; // type:func rom:0x8D2CF0 @@ -13106,37 +13106,37 @@ func_802419EC_8D2EFC = 0x802419EC; // type:func rom:0x8D2EFC func_80241A68_8D2F78 = 0x80241A68; // type:func rom:0x8D2F78 func_80241C78_8D3188 = 0x80241C78; // type:func rom:0x8D3188 func_80241CC8_8D31D8 = 0x80241CC8; // type:func rom:0x8D31D8 -kmr_06_sixFloats = 0x802420BC; // type:data rom:0x8D35CC +kmr_06_FlyingAI_JumpVels = 0x802420BC; // type:data rom:0x8D35CC D_80242850_8D3D60 = 0x80242850; // type:data rom:0x8D3D60 D_80242858_8D3D68 = 0x80242858; // type:data rom:0x8D3D68 D_80242860_8D3D70 = 0x80242860; // type:data rom:0x8D3D70 -kmr_07_UnkNpcAIFunc43 = 0x80240000; // type:func rom:0x8D3DC0 -kmr_07_UnkNpcAIFunc44 = 0x802400B4; // type:func rom:0x8D3E74 -kmr_07_NpcJumpFunc3 = 0x802401D4; // type:func rom:0x8D3F94 -kmr_07_NpcJumpFunc = 0x80240234; // type:func rom:0x8D3FF4 -kmr_07_UnkNpcAIFunc13_2 = 0x802402AC; // type:func rom:0x8D406C -kmr_07_UnkNpcAIFunc11 = 0x802403DC; // type:func rom:0x8D419C -kmr_07_UnkNpcAIFunc10 = 0x802404F8; // type:func rom:0x8D42B8 -kmr_07_UnkNpcAIFunc42 = 0x80240540; // type:func rom:0x8D4300 -kmr_07_UnkNpcAIFunc45 = 0x802405EC; // type:func rom:0x8D43AC -kmr_07_UnkNpcAIMainFunc4 = 0x802407F4; // type:func rom:0x8D45B4 +kmr_07_StationaryAI_IdleInit = 0x80240000; // type:func rom:0x8D3DC0 +kmr_07_StationaryAI_Idle = 0x802400B4; // type:func rom:0x8D3E74 +kmr_07_StationaryAI_AlertInit = 0x802401D4; // type:func rom:0x8D3F94 +kmr_07_StationaryAI_Alert = 0x80240234; // type:func rom:0x8D3FF4 +kmr_07_StationaryAI_ChaseInit = 0x802402AC; // type:func rom:0x8D406C +kmr_07_StationaryAI_Chase = 0x802403DC; // type:func rom:0x8D419C +kmr_07_StationaryAI_LosePlayer = 0x802404F8; // type:func rom:0x8D42B8 +kmr_07_StationaryAI_ReturnHomeInit = 0x80240540; // type:func rom:0x8D4300 +kmr_07_StationaryAI_ReturnHome = 0x802405EC; // type:func rom:0x8D43AC +kmr_07_StationaryAI_Main = 0x802407F4; // type:func rom:0x8D45B4 func_80240A6C_8D482C = 0x80240A6C; // type:func rom:0x8D482C D_80241E90_8D5C50 = 0x80241E90; // type:data rom:0x8D5C50 D_80241E98_8D5C58 = 0x80241E98; // type:data rom:0x8D5C58 D_80241EA0_8D5C60 = 0x80241EA0; // type:data rom:0x8D5C60 -kmr_09_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8D5E00 -kmr_09_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0x8D5FB0 -kmr_09_UnkNpcAIFunc1_copy = 0x802407D8; // type:func rom:0x8D65D8 -kmr_09_UnkFunc4 = 0x80240898; // type:func rom:0x8D6698 -kmr_09_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D69DC -kmr_09_SixFloatsFunc = 0x80240C54; // type:func rom:0x8D6A54 -kmr_09_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8D6AC0 -kmr_09_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8D6BF4 -kmr_09_UnkFunc6 = 0x80240E58; // type:func rom:0x8D6C58 -kmr_09_UnkFunc5 = 0x802411E8; // type:func rom:0x8D6FE8 -kmr_09_UnkNpcAIMainFunc9 = 0x8024130C; // type:func rom:0x8D710C +kmr_09_FlyingAI_WanderInit = 0x80240000; // type:func rom:0x8D5E00 +kmr_09_FlyingAI_Wander = 0x802401B0; // type:func rom:0x8D5FB0 +kmr_09_FlyingAI_LoiterInit = 0x802407D8; // type:func rom:0x8D65D8 +kmr_09_FlyingAI_Loiter = 0x80240898; // type:func rom:0x8D6698 +kmr_09_FlyingAI_JumpInit = 0x80240BDC; // type:func rom:0x8D69DC +kmr_09_FlyingAI_Jump = 0x80240C54; // type:func rom:0x8D6A54 +kmr_09_FlyingAI_ChaseInit = 0x80240CC0; // type:func rom:0x8D6AC0 +kmr_09_FlyingAI_Chase = 0x80240DF4; // type:func rom:0x8D6BF4 +kmr_09_FlyingAI_LosePlayer = 0x80240E58; // type:func rom:0x8D6C58 +kmr_09_FlyingAI_Init = 0x802411E8; // type:func rom:0x8D6FE8 +kmr_09_FlyingAI_Main = 0x8024130C; // type:func rom:0x8D710C func_802414F8_8D72F8 = 0x802414F8; // type:func rom:0x8D72F8 -kmr_09_sixFloats = 0x8024186C; // type:data rom:0x8D766C +kmr_09_FlyingAI_JumpVels = 0x8024186C; // type:data rom:0x8D766C D_80242670_8D8470 = 0x80242670; // type:data rom:0x8D8470 D_80242678_8D8478 = 0x80242678; // type:data rom:0x8D8478 D_80242680_8D8480 = 0x80242680; // type:data rom:0x8D8480 @@ -13155,16 +13155,16 @@ kmr_11_UnkFogFunc = 0x8024023C; // type:func rom:0x8DA33C func_8024027C_8DA37C = 0x8024027C; // type:func rom:0x8DA37C func_802402A0_8DA3A0 = 0x802402A0; // type:func rom:0x8DA3A0 func_80240344_8DA444 = 0x80240344; // type:func rom:0x8DA444 -kmr_11_UnkNpcAIFunc43 = 0x80240370; // type:func rom:0x8DA470 -kmr_11_UnkNpcAIFunc44 = 0x80240424; // type:func rom:0x8DA524 -kmr_11_NpcJumpFunc3 = 0x80240544; // type:func rom:0x8DA644 -kmr_11_NpcJumpFunc = 0x802405A4; // type:func rom:0x8DA6A4 -kmr_11_UnkNpcAIFunc13_2 = 0x8024061C; // type:func rom:0x8DA71C -kmr_11_UnkNpcAIFunc11 = 0x8024074C; // type:func rom:0x8DA84C -kmr_11_UnkNpcAIFunc10 = 0x80240868; // type:func rom:0x8DA968 -kmr_11_UnkNpcAIFunc42 = 0x802408B0; // type:func rom:0x8DA9B0 -kmr_11_UnkNpcAIFunc45 = 0x8024095C; // type:func rom:0x8DAA5C -kmr_11_UnkNpcAIMainFunc4 = 0x80240B64; // type:func rom:0x8DAC64 +kmr_11_StationaryAI_IdleInit = 0x80240370; // type:func rom:0x8DA470 +kmr_11_StationaryAI_Idle = 0x80240424; // type:func rom:0x8DA524 +kmr_11_StationaryAI_AlertInit = 0x80240544; // type:func rom:0x8DA644 +kmr_11_StationaryAI_Alert = 0x802405A4; // type:func rom:0x8DA6A4 +kmr_11_StationaryAI_ChaseInit = 0x8024061C; // type:func rom:0x8DA71C +kmr_11_StationaryAI_Chase = 0x8024074C; // type:func rom:0x8DA84C +kmr_11_StationaryAI_LosePlayer = 0x80240868; // type:func rom:0x8DA968 +kmr_11_StationaryAI_ReturnHomeInit = 0x802408B0; // type:func rom:0x8DA9B0 +kmr_11_StationaryAI_ReturnHome = 0x8024095C; // type:func rom:0x8DAA5C +kmr_11_StationaryAI_Main = 0x80240B64; // type:func rom:0x8DAC64 func_80240DDC_8DAEDC = 0x80240DDC; // type:func rom:0x8DAEDC func_80240EC0_8DAFC0 = 0x80240EC0; // type:func rom:0x8DAFC0 dup_kmr_11_foliage_setup_shear_mtx = 0x80240F20; // type:func rom:0x8DB020 @@ -13340,14 +13340,14 @@ func_802402B0_90CEF0 = 0x802402B0; // type:func rom:0x90CEF0 iwa_00_varStash = 0x80240FF8; // type:data rom:0x90DC38 func_80240000_90F6B0 = 0x80240000; // type:func rom:0x90F6B0 func_80240398_90FA48 = 0x80240398; // type:func rom:0x90FA48 -iwa_01_UnkFunc61 = 0x80240520; // type:func rom:0x90FBD0 +iwa_01_ProjectileHitbox_GetUsableProjectileID = 0x80240520; // type:func rom:0x90FBD0 iwa_01_UnkNpcAIFunc48 = 0x80240710; // type:func rom:0x90FDC0 -iwa_01_UnkNpcAIFunc49 = 0x80240854; // type:func rom:0x90FF04 -iwa_01_UnkSetDurationFunc = 0x80240954; // type:func rom:0x910004 -iwa_01_UnkNpcAIFunc9 = 0x80240998; // type:func rom:0x910048 -iwa_01_UnkDurationCheckNoArgs = 0x80240A38; // type:func rom:0x9100E8 -iwa_01_UnkFunc54 = 0x80240A7C; // type:func rom:0x91012C -iwa_01_UnkFunc55 = 0x80240FB8; // type:func rom:0x910668 +iwa_01_ProjectileHitbox_30 = 0x80240854; // type:func rom:0x90FF04 +iwa_01_ProjectileHitbox_31 = 0x80240954; // type:func rom:0x910004 +iwa_01_ProjectileHitbox_32 = 0x80240998; // type:func rom:0x910048 +iwa_01_ProjectileHitbox_33 = 0x80240A38; // type:func rom:0x9100E8 +iwa_01_ProjectileAI_Main = 0x80240A7C; // type:func rom:0x91012C +iwa_01_ProjectileAI_Reflect = 0x80240FB8; // type:func rom:0x910668 iwa_01_MontyMoleAI_CanAttack = 0x80241414; // type:func rom:0x910AC4 iwa_01_MontyMoleAI_Init = 0x802415E0; // type:func rom:0x910C90 iwa_01_MontyMoleAI_Wander = 0x802416F0; // type:func rom:0x910DA0 @@ -13358,24 +13358,24 @@ iwa_01_MontyMoleAI_ThrowRock = 0x80241B74; // type:func rom:0x911224 iwa_01_MontyMoleAI_PreBurrow = 0x80241C78; // type:func rom:0x911328 iwa_01_MontyMoleAI_Burrow = 0x80241CF0; // type:func rom:0x9113A0 iwa_01_MontyMoleAI_Main = 0x80241D70; // type:func rom:0x911420 -iwa_01_UnkNpcAIMainFunc7 = 0x80241F6C; // type:func rom:0x91161C +iwa_01_RangedAttackAI_Main = 0x80241F6C; // type:func rom:0x91161C iwa_01_GetEncounterEnemyIsOwner = 0x8024228C; // type:func rom:0x91193C -func_802422C4_911974 = 0x802422C4; // type:func rom:0x911974 -iwa_01_UnkNpcAIFunc18 = 0x80242424; // type:func rom:0x911AD4 -func_80242498_911B48 = 0x80242498; // type:func rom:0x911B48 -iwa_01_UnkNpcAIFunc21 = 0x802425C8; // type:func rom:0x911C78 -iwa_01_UnkNpcAIFunc20 = 0x80242664; // type:func rom:0x911D14 -iwa_01_UnkNpcAIFunc22 = 0x802426EC; // type:func rom:0x911D9C -iwa_01_UnkFunc8 = 0x80242794; // type:func rom:0x911E44 -iwa_01_UnkNpcAIFunc16 = 0x80242908; // type:func rom:0x911FB8 -func_80242958_912008 = 0x80242958; // type:func rom:0x912008 -iwa_01_UnkFunc10 = 0x80242AF8; // type:func rom:0x9121A8 -func_80242C48_9122F8 = 0x80242C48; // type:func rom:0x9122F8 -iwa_01_UnkFunc9 = 0x80242CF4; // type:func rom:0x9123A4 -iwa_01_UnkNpcAIFunc19 = 0x80242E2C; // type:func rom:0x9124DC -iwa_01_UnkNpcAIFunc17 = 0x80242EA8; // type:func rom:0x912558 -dup_iwa_01_UnkDurationCheck = 0x80242F10; // type:func rom:0x9125C0 -func_80242F54_912604 = 0x80242F54; // type:func rom:0x912604 +iwa_01_CleftAI_CanSeePlayer = 0x802422C4; // type:func rom:0x911974 +iwa_01_CleftAI_HidingInit = 0x80242424; // type:func rom:0x911AD4 +iwa_01_CleftAI_Hiding = 0x80242498; // type:func rom:0x911B48 +iwa_01_CleftAI_PreAmbush = 0x802425C8; // type:func rom:0x911C78 +iwa_01_CleftAI_Ambush = 0x80242664; // type:func rom:0x911D14 +iwa_01_CleftAI_FindPlayerInit = 0x802426EC; // type:func rom:0x911D9C +iwa_01_CleftAI_FindPlayer = 0x80242794; // type:func rom:0x911E44 +iwa_01_CleftAI_20 = 0x80242908; // type:func rom:0x911FB8 +iwa_01_CleftAI_21 = 0x80242958; // type:func rom:0x912008 +iwa_01_CleftAI_Tackle = 0x80242AF8; // type:func rom:0x9121A8 +iwa_01_CleftAI_LosePlayer = 0x80242C48; // type:func rom:0x9122F8 +iwa_01_CleftAI_ReturnHome = 0x80242CF4; // type:func rom:0x9123A4 +iwa_01_CleftAI_DisguiseInit = 0x80242E2C; // type:func rom:0x9124DC +iwa_01_CleftAI_Disguise = 0x80242EA8; // type:func rom:0x912558 +iwa_01_ParatroopaAI_Reset = 0x80242F10; // type:func rom:0x9125C0 +iwa_01_CleftAI_Main = 0x80242F54; // type:func rom:0x912604 func_802432B0_912960 = 0x802432B0; // type:func rom:0x912960 D_80243E00_9134B0 = 0x80243E00; // type:data rom:0x9134B0 D_80246370_915A20 = 0x80246370; // type:data rom:0x915A20 @@ -13392,25 +13392,25 @@ D_802463C8_915A78 = 0x802463C8; // type:data rom:0x915A78 D_802463D0_915A80 = 0x802463D0; // type:data rom:0x915A80 D_802465C0_915C70 = 0x802465C0; // type:data rom:0x915C70 D_802465C8_915C78 = 0x802465C8; // type:data rom:0x915C78 -D_802465D0_915C80 = 0x802465D0; // type:data rom:0x915C80 +D_802465D0_kzn_02 = 0x802465D0; // type:data rom:0x915C80 D_802465D8_915C88 = 0x802465D8; // type:data rom:0x915C88 D_802465E0_915C90 = 0x802465E0; // type:data rom:0x915C90 -func_80240000_915D70 = 0x80240000; // type:func rom:0x915D70 -iwa_02_UnkNpcAIFunc18 = 0x80240160; // type:func rom:0x915ED0 -func_802401D4_915F44 = 0x802401D4; // type:func rom:0x915F44 -iwa_02_UnkNpcAIFunc21 = 0x80240304; // type:func rom:0x916074 -iwa_02_UnkNpcAIFunc20 = 0x802403A0; // type:func rom:0x916110 -iwa_02_UnkNpcAIFunc22 = 0x80240428; // type:func rom:0x916198 -iwa_02_UnkFunc8 = 0x802404D0; // type:func rom:0x916240 -iwa_02_UnkNpcAIFunc16 = 0x80240644; // type:func rom:0x9163B4 -func_80240694_916404 = 0x80240694; // type:func rom:0x916404 -iwa_02_UnkFunc10 = 0x80240834; // type:func rom:0x9165A4 -func_80240984_9166F4 = 0x80240984; // type:func rom:0x9166F4 -iwa_02_UnkFunc9 = 0x80240A30; // type:func rom:0x9167A0 -iwa_02_UnkNpcAIFunc19 = 0x80240B68; // type:func rom:0x9168D8 -iwa_02_UnkNpcAIFunc17 = 0x80240BE4; // type:func rom:0x916954 -iwa_02_UnkDurationCheck = 0x80240C4C; // type:func rom:0x9169BC -func_80240C90_916A00 = 0x80240C90; // type:func rom:0x916A00 +iwa_02_CleftAI_CanSeePlayer = 0x80240000; // type:func rom:0x915D70 +iwa_02_CleftAI_HidingInit = 0x80240160; // type:func rom:0x915ED0 +iwa_02_CleftAI_Hiding = 0x802401D4; // type:func rom:0x915F44 +iwa_02_CleftAI_PreAmbush = 0x80240304; // type:func rom:0x916074 +iwa_02_CleftAI_Ambush = 0x802403A0; // type:func rom:0x916110 +iwa_02_CleftAI_FindPlayerInit = 0x80240428; // type:func rom:0x916198 +iwa_02_CleftAI_FindPlayer = 0x802404D0; // type:func rom:0x916240 +iwa_02_CleftAI_20 = 0x80240644; // type:func rom:0x9163B4 +iwa_02_CleftAI_21 = 0x80240694; // type:func rom:0x916404 +iwa_02_CleftAI_Tackle = 0x80240834; // type:func rom:0x9165A4 +iwa_02_CleftAI_LosePlayer = 0x80240984; // type:func rom:0x9166F4 +iwa_02_CleftAI_ReturnHome = 0x80240A30; // type:func rom:0x9167A0 +iwa_02_CleftAI_DisguiseInit = 0x80240B68; // type:func rom:0x9168D8 +iwa_02_CleftAI_Disguise = 0x80240BE4; // type:func rom:0x916954 +iwa_02_CleftAI_PostDisguise = 0x80240C4C; // type:func rom:0x9169BC +iwa_02_CleftAI_Main = 0x80240C90; // type:func rom:0x916A00 iwa_02_StashVars = 0x80240FE0; // type:func rom:0x916D50 iwa_02_GetItemName = 0x80241094; // type:func rom:0x916E04 iwa_02_varStash = 0x80241DA8; // type:data rom:0x917B18 @@ -13424,22 +13424,22 @@ iwa_03_GetItemName = 0x802400B4; // type:func rom:0x918C64 iwa_03_SomeItemEntityFunc = 0x80240118; // type:func rom:0x918CC8 iwa_03_CheckItemFlags40 = 0x80240268; // type:func rom:0x918E18 func_802402BC_918E6C = 0x802402BC; // type:func rom:0x918E6C -func_80240340_918EF0 = 0x80240340; // type:func rom:0x918EF0 -iwa_03_UnkNpcAIFunc18 = 0x802404A0; // type:func rom:0x919050 -func_80240514_9190C4 = 0x80240514; // type:func rom:0x9190C4 -iwa_03_UnkNpcAIFunc21 = 0x80240644; // type:func rom:0x9191F4 -iwa_03_UnkNpcAIFunc20 = 0x802406E0; // type:func rom:0x919290 -iwa_03_UnkNpcAIFunc22 = 0x80240768; // type:func rom:0x919318 -iwa_03_UnkFunc8 = 0x80240810; // type:func rom:0x9193C0 -iwa_03_UnkNpcAIFunc16 = 0x80240984; // type:func rom:0x919534 -func_802409D4_919584 = 0x802409D4; // type:func rom:0x919584 -iwa_03_UnkFunc10 = 0x80240B74; // type:func rom:0x919724 -func_80240CC4_919874 = 0x80240CC4; // type:func rom:0x919874 -iwa_03_UnkFunc9 = 0x80240D70; // type:func rom:0x919920 -iwa_03_UnkNpcAIFunc19 = 0x80240EA8; // type:func rom:0x919A58 -iwa_03_UnkNpcAIFunc17 = 0x80240F24; // type:func rom:0x919AD4 -iwa_03_UnkDurationCheck = 0x80240F8C; // type:func rom:0x919B3C -func_80240FD0_919B80 = 0x80240FD0; // type:func rom:0x919B80 +iwa_03_CleftAI_CanSeePlayer = 0x80240340; // type:func rom:0x918EF0 +iwa_03_CleftAI_HidingInit = 0x802404A0; // type:func rom:0x919050 +iwa_03_CleftAI_Hiding = 0x80240514; // type:func rom:0x9190C4 +iwa_03_CleftAI_PreAmbush = 0x80240644; // type:func rom:0x9191F4 +iwa_03_CleftAI_Ambush = 0x802406E0; // type:func rom:0x919290 +iwa_03_CleftAI_FindPlayerInit = 0x80240768; // type:func rom:0x919318 +iwa_03_CleftAI_FindPlayer = 0x80240810; // type:func rom:0x9193C0 +iwa_03_CleftAI_20 = 0x80240984; // type:func rom:0x919534 +iwa_03_CleftAI_21 = 0x802409D4; // type:func rom:0x919584 +iwa_03_CleftAI_Tackle = 0x80240B74; // type:func rom:0x919724 +iwa_03_CleftAI_LosePlayer = 0x80240CC4; // type:func rom:0x919874 +iwa_03_CleftAI_ReturnHome = 0x80240D70; // type:func rom:0x919920 +iwa_03_CleftAI_DisguiseInit = 0x80240EA8; // type:func rom:0x919A58 +iwa_03_CleftAI_Disguise = 0x80240F24; // type:func rom:0x919AD4 +iwa_03_CleftAI_PostDisguise = 0x80240F8C; // type:func rom:0x919B3C +iwa_03_CleftAI_Main = 0x80240FD0; // type:func rom:0x919B80 func_80241320_919ED0 = 0x80241320; // type:func rom:0x919ED0 iwa_03_varStash = 0x80241530; // type:data rom:0x91A0E0 D_80242C30_91B7E0 = 0x80242C30; // type:data rom:0x91B7E0 @@ -13448,22 +13448,22 @@ D_80242C40_91B7F0 = 0x80242C40; // type:data rom:0x91B7F0 D_80242C48_91B7F8 = 0x80242C48; // type:data rom:0x91B7F8 D_80242C50_91B800 = 0x80242C50; // type:data rom:0x91B800 func_80240000_91B8E0 = 0x80240000; // type:func rom:0x91B8E0 -func_80240080_91B960 = 0x80240080; // type:func rom:0x91B960 -iwa_04_UnkNpcAIFunc18 = 0x802401E0; // type:func rom:0x91BAC0 -func_80240254_91BB34 = 0x80240254; // type:func rom:0x91BB34 -iwa_04_UnkNpcAIFunc21 = 0x80240384; // type:func rom:0x91BC64 -iwa_04_UnkNpcAIFunc20 = 0x80240420; // type:func rom:0x91BD00 -iwa_04_UnkNpcAIFunc22 = 0x802404A8; // type:func rom:0x91BD88 -iwa_04_UnkFunc8 = 0x80240550; // type:func rom:0x91BE30 -iwa_04_UnkNpcAIFunc16 = 0x802406C4; // type:func rom:0x91BFA4 -func_80240714_91BFF4 = 0x80240714; // type:func rom:0x91BFF4 -iwa_04_UnkFunc10 = 0x802408B4; // type:func rom:0x91C194 -func_80240A04_91C2E4 = 0x80240A04; // type:func rom:0x91C2E4 -iwa_04_UnkFunc9 = 0x80240AB0; // type:func rom:0x91C390 -iwa_04_UnkNpcAIFunc19 = 0x80240BE8; // type:func rom:0x91C4C8 -iwa_04_UnkNpcAIFunc17 = 0x80240C64; // type:func rom:0x91C544 -iwa_04_UnkDurationCheck = 0x80240CCC; // type:func rom:0x91C5AC -func_80240D10_91C5F0 = 0x80240D10; // type:func rom:0x91C5F0 +iwa_04_CleftAI_CanSeePlayer = 0x80240080; // type:func rom:0x91B960 +iwa_04_CleftAI_HidingInit = 0x802401E0; // type:func rom:0x91BAC0 +iwa_04_CleftAI_Hiding = 0x80240254; // type:func rom:0x91BB34 +iwa_04_CleftAI_PreAmbush = 0x80240384; // type:func rom:0x91BC64 +iwa_04_CleftAI_Ambush = 0x80240420; // type:func rom:0x91BD00 +iwa_04_CleftAI_FindPlayerInit = 0x802404A8; // type:func rom:0x91BD88 +iwa_04_CleftAI_FindPlayer = 0x80240550; // type:func rom:0x91BE30 +iwa_04_CleftAI_20 = 0x802406C4; // type:func rom:0x91BFA4 +iwa_04_CleftAI_21 = 0x80240714; // type:func rom:0x91BFF4 +iwa_04_CleftAI_Tackle = 0x802408B4; // type:func rom:0x91C194 +iwa_04_CleftAI_LosePlayer = 0x80240A04; // type:func rom:0x91C2E4 +iwa_04_CleftAI_ReturnHome = 0x80240AB0; // type:func rom:0x91C390 +iwa_04_CleftAI_DisguiseInit = 0x80240BE8; // type:func rom:0x91C4C8 +iwa_04_CleftAI_Disguise = 0x80240C64; // type:func rom:0x91C544 +iwa_04_CleftAI_PostDisguise = 0x80240CCC; // type:func rom:0x91C5AC +iwa_04_CleftAI_Main = 0x80240D10; // type:func rom:0x91C5F0 func_80241060_91C940 = 0x80241060; // type:func rom:0x91C940 func_8024107C_91C95C = 0x8024107C; // type:func rom:0x91C95C D_80242B90_91E470 = 0x80242B90; // type:data rom:0x91E470 @@ -13559,7 +13559,7 @@ 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 -func_80240B98_92AE48 = 0x80240B98; // type:func rom:0x92AE48 +sbk_02_CheckTradeEventTime = 0x80240B98; // type:func rom:0x92AE48 GetItemCount = 0x80240BD4; // type:func rom:0x92AE84 D_8024404C_92E2FC = 0x8024404C; // type:data rom:0x92E2FC D_80244050_92E300 = 0x80244050; // type:data rom:0x92E300 @@ -13613,16 +13613,16 @@ func_80240000_93F5B0 = 0x80240000; // type:func rom:0x93F5B0 sbk_30_UnkFunc27 = 0x80240040; // type:func rom:0x93F5F0 sbk_30_UnkFunc26 = 0x80240164; // type:func rom:0x93F714 sbk_30_SpawnSunEffect = 0x80240338; // type:func rom:0x93F8E8 -sbk_30_UnkNpcAIFunc43 = 0x80240370; // type:func rom:0x93F920 -sbk_30_UnkNpcAIFunc44 = 0x80240424; // type:func rom:0x93F9D4 -sbk_30_NpcJumpFunc3 = 0x80240544; // type:func rom:0x93FAF4 -sbk_30_NpcJumpFunc = 0x802405A4; // type:func rom:0x93FB54 -sbk_30_UnkNpcAIFunc13_2 = 0x8024061C; // type:func rom:0x93FBCC -sbk_30_UnkNpcAIFunc11 = 0x8024074C; // type:func rom:0x93FCFC -sbk_30_UnkNpcAIFunc10 = 0x80240868; // type:func rom:0x93FE18 -sbk_30_UnkNpcAIFunc42 = 0x802408B0; // type:func rom:0x93FE60 -sbk_30_UnkNpcAIFunc45 = 0x8024095C; // type:func rom:0x93FF0C -sbk_30_UnkNpcAIMainFunc4 = 0x80240B64; // type:func rom:0x940114 +sbk_30_StationaryAI_IdleInit = 0x80240370; // type:func rom:0x93F920 +sbk_30_StationaryAI_Idle = 0x80240424; // type:func rom:0x93F9D4 +sbk_30_StationaryAI_AlertInit = 0x80240544; // type:func rom:0x93FAF4 +sbk_30_StationaryAI_Alert = 0x802405A4; // type:func rom:0x93FB54 +sbk_30_StationaryAI_ChaseInit = 0x8024061C; // type:func rom:0x93FBCC +sbk_30_StationaryAI_Chase = 0x8024074C; // type:func rom:0x93FCFC +sbk_30_StationaryAI_LosePlayer = 0x80240868; // type:func rom:0x93FE18 +sbk_30_StationaryAI_ReturnHomeInit = 0x802408B0; // type:func rom:0x93FE60 +sbk_30_StationaryAI_ReturnHome = 0x8024095C; // type:func rom:0x93FF0C +sbk_30_StationaryAI_Main = 0x80240B64; // type:func rom:0x940114 sbk_30_StashVars = 0x80240DDC; // type:func rom:0x94038C sbk_30_GetItemName = 0x80240E90; // type:func rom:0x940440 sbk_30_GetNpcCollisionHeight = 0x80240EF4; // type:func rom:0x9404A4 @@ -13631,10 +13631,10 @@ func_80241120_9406D0 = 0x80241120; // type:func rom:0x9406D0 func_80241174_940724 = 0x80241174; // type:func rom:0x940724 func_802411AC_94075C = 0x802411AC; // type:func rom:0x94075C func_80241248_9407F8 = 0x80241248; // type:func rom:0x9407F8 -sbk_30_SetManyVars = 0x802412E4; // type:func rom:0x940894 -sbk_30_UnkYawFunc = 0x802413D4; // type:func rom:0x940984 -func_80241560_940B10 = 0x80241560; // type:func rom:0x940B10 -func_802415A4_940B54 = 0x802415A4; // type:func rom:0x940B54 +sbk_30_LetterDelivery_Init = 0x802412E4; // type:func rom:0x940894 +sbk_30_LetterDelivery_CalcLetterPos = 0x802413D4; // type:func rom:0x940984 +sbk_30_LetterDelivery_SaveNpcAnim = 0x80241560; // type:func rom:0x940B10 +sbk_30_LetterDelivery_RestoreNpcAnim = 0x802415A4; // type:func rom:0x940B54 sbk_30_foliage_setup_shear_mtx = 0x802415D0; // type:func rom:0x940B80 sbk_30_TransformFoliage = 0x80241640; // type:func rom:0x940BF0 sbk_30_varStash = 0x80241FF4; // type:data rom:0x9415A4 @@ -13657,10 +13657,10 @@ sbk_34_AddPlayerHandsOffset = 0x802401B4; // type:func rom:0x946084 func_80240384_946254 = 0x80240384; // type:func rom:0x946254 func_802403D8_9462A8 = 0x802403D8; // type:func rom:0x9462A8 func_80240410_9462E0 = 0x80240410; // type:func rom:0x9462E0 -sbk_34_SetManyVars = 0x802404AC; // type:func rom:0x94637C -sbk_34_UnkYawFunc = 0x8024059C; // type:func rom:0x94646C -func_80240728_9465F8 = 0x80240728; // type:func rom:0x9465F8 -func_8024076C_94663C = 0x8024076C; // type:func rom:0x94663C +sbk_34_LetterDelivery_Init = 0x802404AC; // type:func rom:0x94637C +sbk_34_LetterDelivery_CalcLetterPos = 0x8024059C; // type:func rom:0x94646C +sbk_34_LetterDelivery_SaveNpcAnim = 0x80240728; // type:func rom:0x9465F8 +sbk_34_LetterDelivery_RestoreNpcAnim = 0x8024076C; // type:func rom:0x94663C sbk_34_foliage_setup_shear_mtx = 0x802407A0; // type:func rom:0x946670 sbk_34_TransformFoliage = 0x80240810; // type:func rom:0x9466E0 sbk_34_varStash = 0x80240D9C; // type:data rom:0x946C6C @@ -13748,18 +13748,18 @@ dro_01_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x95B3D0 dro_01_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x95B43C dro_01_UnkFunc27 = 0x802402E0; // type:func rom:0x95B4E0 dro_01_UnkFunc26 = 0x80240404; // type:func rom:0x95B604 -dro_01_UnkNpcAIFunc24 = 0x802405E0; // type:func rom:0x95B7E0 -dro_01_UnkFunc13 = 0x80240738; // type:func rom:0x95B938 -dro_01_UnkNpcAIFunc1 = 0x802409E0; // type:func rom:0x95BBE0 -dro_01_UnkFunc14 = 0x80240AA0; // type:func rom:0x95BCA0 -dro_01_UnkNpcAIFunc25 = 0x80240C5C; // type:func rom:0x95BE5C -dro_01_NpcJumpFunc2 = 0x80240D10; // type:func rom:0x95BF10 -dro_01_NpcJumpFunc = 0x80240D84; // type:func rom:0x95BF84 -dro_01_UnkNpcAIFunc13 = 0x80240DFC; // type:func rom:0x95BFFC -dro_01_UnkFunc15 = 0x80240F2C; // type:func rom:0x95C12C -dro_01_UnkNpcDurationFlagFunc = 0x8024104C; // type:func rom:0x95C24C -dro_01_UnkFunc16 = 0x802410B4; // type:func rom:0x95C2B4 -dro_01_UnkNpcAIMainFunc = 0x80241174; // type:func rom:0x95C374 +dro_01_PatrolAI_MoveInit = 0x802405E0; // type:func rom:0x95B7E0 +dro_01_PatrolAI_Move = 0x80240738; // type:func rom:0x95B938 +dro_01_PatrolAI_LoiterInit = 0x802409E0; // type:func rom:0x95BBE0 +dro_01_PatrolAI_Loiter = 0x80240AA0; // type:func rom:0x95BCA0 +dro_01_PatrolAI_PostLoiter = 0x80240C5C; // type:func rom:0x95BE5C +dro_01_PatrolAI_JumpInit = 0x80240D10; // type:func rom:0x95BF10 +dro_01_PatrolAI_Jump = 0x80240D84; // type:func rom:0x95BF84 +dro_01_PatrolAI_ChaseInit = 0x80240DFC; // type:func rom:0x95BFFC +dro_01_PatrolAI_Chase = 0x80240F2C; // type:func rom:0x95C12C +dro_01_PatrolAI_LosePlayer = 0x8024104C; // type:func rom:0x95C24C +dro_01_PatrolNoAttackAI_15 = 0x802410B4; // type:func rom:0x95C2B4 +dro_01_PatrolNoAttackAI_Main = 0x80241174; // type:func rom:0x95C374 dro_01_Quizmo_StashVars = 0x80241470; // type:func rom:0x95C670 dro_01_Quizmo_GetItemName = 0x80241524; // type:func rom:0x95C724 dro_01_Quizmo_HideEntities = 0x80241588; // type:func rom:0x95C788 @@ -13793,10 +13793,10 @@ dro_01_func_80242730_95D930 = 0x80242730; // type:func rom:0x95D930 dro_01_func_80242784_95D984 = 0x80242784; // type:func rom:0x95D984 dro_01_BigArrayFunc = 0x802427BC; // type:func rom:0x95D9BC dro_01_func_80242858_95DA58 = 0x80242858; // type:func rom:0x95DA58 -dro_01_SetManyVars = 0x80242D98; // type:func rom:0x95DF98 -dro_01_UnkYawFunc = 0x80242E88; // type:func rom:0x95E088 -dro_01_func_80243014_95E214 = 0x80243014; // type:func rom:0x95E214 -dro_01_func_80243058_95E258 = 0x80243058; // type:func rom:0x95E258 +dro_01_LetterDelivery_Init = 0x80242D98; // type:func rom:0x95DF98 +dro_01_LetterDelivery_CalcLetterPos = 0x80242E88; // type:func rom:0x95E088 +dro_01_LetterDelivery_SaveNpcAnim = 0x80243014; // type:func rom:0x95E214 +dro_01_LetterDelivery_RestoreNpcAnim = 0x80243058; // type:func rom:0x95E258 dro_01_func_80243084_95E284 = 0x80243084; // type:func rom:0x95E284 dro_01_GetFloorCollider = 0x8024309C; // type:func rom:0x95E29C dro_01_func_802430C8_95E2C8 = 0x802430C8; // type:func rom:0x95E2C8 @@ -13839,7 +13839,6 @@ dro_01_npcSettings_80245108 = 0x80245108; // type:data rom:0x960308 dro_01_npcSettings_80245134 = 0x80245134; // type:data rom:0x960334 dro_01_npcSettings_80245160 = 0x80245160; // type:data rom:0x960360 dro_01_npcSettings_8024518C = 0x8024518C; // type:data rom:0x96038C -<<<<<<< HEAD dro_01_Quizmo_varStash = 0x802451B8; // type:data rom:0x9603B8 dro_01_EVS_Quizmo_GiveItem_0 = 0x802451BC; // type:data rom:0x9603BC dro_01_EVS_Quizmo_GiveItem_16 = 0x802451EC; // type:data rom:0x9603EC @@ -13868,36 +13867,6 @@ dro_01_Quizmo_Npc_AIScript = 0x80247738; // type:data rom:0x962938 dro_01_EVS_Quizmo_Npc_AI = 0x80247768; // type:data rom:0x962968 dro_01_Quizmo_NpcSettings = 0x80247788; // type:data rom:0x962988 dro_01_Quizmo_AltNpcSettings = 0x802477B4; // type:data rom:0x9629B4 -======= -dro_01_varStash = 0x802451B8; // type:data rom:0x9603B8 -dro_01_802451BC = 0x802451BC; // type:data rom:0x9603BC -dro_01_802451EC = 0x802451EC; // type:data rom:0x9603EC -dro_01_quizAnswers = 0x8024521C; // type:data rom:0x96041C -dro_01_quizRequirements = 0x8024525C; // type:data rom:0x96045C -dro_01_802452AC = 0x802452AC; // type:data rom:0x9604AC -dro_01_8024535C = 0x8024535C; // type:data rom:0x96055C -dro_01_802454F8 = 0x802454F8; // type:data rom:0x9606F8 -dro_01_802455F4 = 0x802455F4; // type:data rom:0x9607F4 -dro_01_80245630 = 0x80245630; // type:data rom:0x960830 -dro_01_802457E0 = 0x802457E0; // type:data rom:0x9609E0 -dro_01_80245918 = 0x80245918; // type:data rom:0x960B18 -dro_01_80245A84 = 0x80245A84; // type:data rom:0x960C84 -dro_01_80245AB8 = 0x80245AB8; // type:data rom:0x960CB8 -dro_01_80245AF8 = 0x80245AF8; // type:data rom:0x960CF8 -dro_01_80245B34 = 0x80245B34; // type:data rom:0x960D34 -dro_01_8024667C = 0x8024667C; // type:data rom:0x96187C -dro_01_802466BC = 0x802466BC; // type:data rom:0x9618BC -dro_01_80246798 = 0x80246798; // type:data rom:0x961998 -dro_01_80246848 = 0x80246848; // type:data rom:0x961A48 -dro_01_802468F8 = 0x802468F8; // type:data rom:0x961AF8 -dro_01_80247628 = 0x80247628; // type:data rom:0x962828 -dro_01_8024769C = 0x8024769C; // type:data rom:0x96289C -dro_01_8024771C = 0x8024771C; // type:data rom:0x96291C -dro_01_npcAISettings_80247738 = 0x80247738; // type:data rom:0x962938 -dro_01_80247768 = 0x80247768; // type:data rom:0x962968 -dro_01_npcSettings_80247788 = 0x80247788; // type:data rom:0x962988 -dro_01_npcSettings_802477B4 = 0x802477B4; // type:data rom:0x9629B4 ->>>>>>> master dro_01_D_802477E0_9629E0 = 0x802477E0; // type:data rom:0x9629E0 dro_01_D_802477E4_9629E4 = 0x802477E4; // type:data rom:0x9629E4 dro_01_802477E8 = 0x802477E8; // type:data rom:0x9629E8 @@ -14047,10 +14016,10 @@ dro_02_ToadHouse_InitScreenOverlay = 0x80243698; // type:func rom:0x96C858 dro_02_ToadHouse_PutPartnerAway = 0x80243714; // type:func rom:0x96C8D4 dro_02_ToadHouse_GetPartnerBackOut = 0x80243748; // type:func rom:0x96C908 dro_02_ToadHouse_Stub = 0x80243778; // type:func rom:0x96C938 -dro_02_SetManyVars = 0x80243780; // type:func rom:0x96C940 -dro_02_UnkYawFunc = 0x80243870; // type:func rom:0x96CA30 -dro_02_func_802439FC_96CBBC = 0x802439FC; // type:func rom:0x96CBBC -dro_02_func_80243A40_96CC00 = 0x80243A40; // type:func rom:0x96CC00 +dro_02_LetterDelivery_Init = 0x80243780; // type:func rom:0x96C940 +dro_02_LetterDelivery_CalcLetterPos = 0x80243870; // type:func rom:0x96CA30 +dro_02_LetterDelivery_SaveNpcAnim = 0x802439FC; // type:func rom:0x96CBBC +dro_02_LetterDelivery_RestoreNpcAnim = 0x80243A40; // type:func rom:0x96CC00 dro_02_entryList = 0x80243A70; // type:data rom:0x96CC30 dro_02_config = 0x80243AB0; // type:data rom:0x96CC70 dro_02_80243AF0 = 0x80243AF0; // type:data rom:0x96CCB0 @@ -14211,7 +14180,7 @@ isk_04_set_script_owner_npc_anim = 0x80240040; // type:func rom:0x97B670 isk_04_UnkDistFunc = 0x802400BC; // type:func rom:0x97B6EC isk_04_UnkNpcAIFunc12 = 0x802401F0; // type:func rom:0x97B820 isk_04_set_script_owner_npc_col_height = 0x80240354; // type:func rom:0x97B984 -isk_04_UnkNpcAIMainFunc5 = 0x802403D4; // type:func rom:0x97BA04 +isk_04_TackleAI_Main = 0x802403D4; // type:func rom:0x97BA04 isk_04_func_80240814_97BE44 = 0x80240814; // type:func rom:0x97BE44 isk_04_AwaitPlayerNearNpc = 0x8024085C; // type:func rom:0x97BE8C isk_04_func_802408B4_97BEE4 = 0x802408B4; // type:func rom:0x97BEE4 @@ -14219,17 +14188,17 @@ isk_04_SwitchToPartner = 0x80240930; // type:func rom:0x97BF60 func_8024095C_97BF8C = 0x8024095C; // type:func rom:0x97BF8C D_80242288_97D8B8 = 0x80242288; // type:data rom:0x97D8B8 D_80242430_97DA60 = 0x80242430; // type:data rom:0x97DA60 -isk_05_UnkNpcAIFunc36 = 0x80240000; // type:func rom:0x97DAD0 -isk_05_UnkNpcAIFunc37 = 0x80240230; // type:func rom:0x97DD00 -isk_05_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x97E038 -isk_05_UnkNpcAIFunc38 = 0x80240628; // type:func rom:0x97E0F8 -isk_05_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x97E29C -isk_05_UnkNpcAIFunc39 = 0x802408AC; // type:func rom:0x97E37C -isk_05_UnkDurationCheck = 0x80240BAC; // type:func rom:0x97E67C -isk_05_UnkNpcAIMainFunc2 = 0x80240BF0; // type:func rom:0x97E6C0 -isk_05_UnkNpcAIFunc40 = 0x80240E14; // type:func rom:0x97E8E4 -isk_05_UnkNpcAIFunc41 = 0x80240EA8; // type:func rom:0x97E978 -isk_05_UnkNpcAIMainFunc3 = 0x80240F3C; // type:func rom:0x97EA0C +isk_05_HoppingAI_HopInit = 0x80240000; // type:func rom:0x97DAD0 +isk_05_HoppingAI_Hop = 0x80240230; // type:func rom:0x97DD00 +isk_05_HoppingAI_LoiterInit = 0x80240568; // type:func rom:0x97E038 +isk_05_HoppingAI_Loiter = 0x80240628; // type:func rom:0x97E0F8 +isk_05_HoppingAI_ChaseInit = 0x802407CC; // type:func rom:0x97E29C +isk_05_HoppingAI_Chase = 0x802408AC; // type:func rom:0x97E37C +isk_05_HoppingAI_LosePlayer = 0x80240BAC; // type:func rom:0x97E67C +isk_05_HoppingAI_Main = 0x80240BF0; // type:func rom:0x97E6C0 +isk_05_StoneChompAI_HopInit = 0x80240E14; // type:func rom:0x97E8E4 +isk_05_StoneChompAI_ChaseInit = 0x80240EA8; // type:func rom:0x97E978 +isk_05_StoneChompAI_Main = 0x80240F3C; // type:func rom:0x97EA0C isk_05_UnkFunc53 = 0x80241108; // type:func rom:0x97EBD8 func_802411F8_97ECC8 = 0x802411F8; // type:func rom:0x97ECC8 func_802415C0_97F090 = 0x802415C0; // type:func rom:0x97F090 @@ -14254,7 +14223,7 @@ isk_08_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x984E30 isk_08_UnkDistFunc = 0x8024007C; // type:func rom:0x984EAC isk_08_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x984FE0 isk_08_set_script_owner_npc_col_height = 0x80240314; // type:func rom:0x985144 -isk_08_UnkNpcAIMainFunc5 = 0x80240394; // type:func rom:0x9851C4 +isk_08_TackleAI_Main = 0x80240394; // type:func rom:0x9851C4 isk_08_func_80240814_97BE44 = 0x802407D4; // type:func rom:0x985604 isk_08_AwaitPlayerNearNpc = 0x8024081C; // type:func rom:0x98564C isk_08_func_802408B4_97BEE4 = 0x80240874; // type:func rom:0x9856A4 @@ -14294,17 +14263,17 @@ D_80241EA8_98AA08 = 0x80241EA8; // type:data rom:0x98AA08 func_80240000_98AA10 = 0x80240000; // type:func rom:0x98AA10 func_802400B0_98AAC0 = 0x802400B0; // type:func rom:0x98AAC0 isk_11_SetEntityFlags100000 = 0x80240120; // type:func rom:0x98AB30 -isk_13_UnkNpcAIFunc36 = 0x80240000; // type:func rom:0x98F7E0 -isk_13_UnkNpcAIFunc37 = 0x80240230; // type:func rom:0x98FA10 -isk_13_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x98FD48 -isk_13_UnkNpcAIFunc38 = 0x80240628; // type:func rom:0x98FE08 -isk_13_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x98FFAC -isk_13_UnkNpcAIFunc39 = 0x802408AC; // type:func rom:0x99008C -isk_13_UnkDurationCheck = 0x80240BAC; // type:func rom:0x99038C -isk_13_UnkNpcAIMainFunc2 = 0x80240BF0; // type:func rom:0x9903D0 -isk_13_UnkNpcAIFunc40 = 0x80240E14; // type:func rom:0x9905F4 -isk_13_UnkNpcAIFunc41 = 0x80240EA8; // type:func rom:0x990688 -isk_13_UnkNpcAIMainFunc3 = 0x80240F3C; // type:func rom:0x99071C +isk_13_HoppingAI_HopInit = 0x80240000; // type:func rom:0x98F7E0 +isk_13_HoppingAI_Hop = 0x80240230; // type:func rom:0x98FA10 +isk_13_HoppingAI_LoiterInit = 0x80240568; // type:func rom:0x98FD48 +isk_13_HoppingAI_Loiter = 0x80240628; // type:func rom:0x98FE08 +isk_13_HoppingAI_ChaseInit = 0x802407CC; // type:func rom:0x98FFAC +isk_13_HoppingAI_Chase = 0x802408AC; // type:func rom:0x99008C +isk_13_HoppingAI_LosePlayer = 0x80240BAC; // type:func rom:0x99038C +isk_13_HoppingAI_Main = 0x80240BF0; // type:func rom:0x9903D0 +isk_13_StoneChompAI_HopInit = 0x80240E14; // type:func rom:0x9905F4 +isk_13_StoneChompAI_ChaseInit = 0x80240EA8; // type:func rom:0x990688 +isk_13_StoneChompAI_Main = 0x80240F3C; // type:func rom:0x99071C isk_13_UnkFunc53 = 0x80241108; // type:func rom:0x9908E8 func_802411F8_9909D8 = 0x802411F8; // type:func rom:0x9909D8 func_802415C0_990DA0 = 0x802415C0; // type:func rom:0x990DA0 @@ -14318,17 +14287,17 @@ func_80242044_991824 = 0x80242044; // type:func rom:0x991824 D_80242EB0_992690 = 0x80242EB0; // type:data rom:0x992690 D_80242F38_992718 = 0x80242F38; // type:data rom:0x992718 D_80242F40_992720 = 0x80242F40; // type:data rom:0x992720 -isk_14_UnkNpcAIFunc36 = 0x80240000; // type:func rom:0x992730 -isk_14_UnkNpcAIFunc37 = 0x80240230; // type:func rom:0x992960 -isk_14_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x992C98 -isk_14_UnkNpcAIFunc38 = 0x80240628; // type:func rom:0x992D58 -isk_14_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x992EFC -isk_14_UnkNpcAIFunc39 = 0x802408AC; // type:func rom:0x992FDC -isk_14_UnkDurationCheck = 0x80240BAC; // type:func rom:0x9932DC -isk_14_UnkNpcAIMainFunc2 = 0x80240BF0; // type:func rom:0x993320 -isk_14_UnkNpcAIFunc40 = 0x80240E14; // type:func rom:0x993544 -isk_14_UnkNpcAIFunc41 = 0x80240EA8; // type:func rom:0x9935D8 -isk_14_UnkNpcAIMainFunc3 = 0x80240F3C; // type:func rom:0x99366C +isk_14_HoppingAI_HopInit = 0x80240000; // type:func rom:0x992730 +isk_14_HoppingAI_Hop = 0x80240230; // type:func rom:0x992960 +isk_14_HoppingAI_LoiterInit = 0x80240568; // type:func rom:0x992C98 +isk_14_HoppingAI_Loiter = 0x80240628; // type:func rom:0x992D58 +isk_14_HoppingAI_ChaseInit = 0x802407CC; // type:func rom:0x992EFC +isk_14_HoppingAI_Chase = 0x802408AC; // type:func rom:0x992FDC +isk_14_HoppingAI_LosePlayer = 0x80240BAC; // type:func rom:0x9932DC +isk_14_HoppingAI_Main = 0x80240BF0; // type:func rom:0x993320 +isk_14_StoneChompAI_HopInit = 0x80240E14; // type:func rom:0x993544 +isk_14_StoneChompAI_ChaseInit = 0x80240EA8; // type:func rom:0x9935D8 +isk_14_StoneChompAI_Main = 0x80240F3C; // type:func rom:0x99366C isk_14_UnkFunc53 = 0x80241108; // type:func rom:0x993838 func_802411F8_993928 = 0x802411F8; // type:func rom:0x993928 func_802415C0_993CF0 = 0x802415C0; // type:func rom:0x993CF0 @@ -14350,7 +14319,7 @@ isk_18_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x997F70 isk_18_UnkDistFunc = 0x8024007C; // type:func rom:0x997FEC isk_18_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x998120 isk_18_set_script_owner_npc_col_height = 0x80240314; // type:func rom:0x998284 -isk_18_UnkNpcAIMainFunc5 = 0x80240394; // type:func rom:0x998304 +isk_18_TackleAI_Main = 0x80240394; // type:func rom:0x998304 isk_18_func_80240814_97BE44 = 0x802407D4; // type:func rom:0x998744 isk_18_AwaitPlayerNearNpc = 0x8024081C; // type:func rom:0x99878C isk_18_func_802408B4_97BEE4 = 0x80240874; // type:func rom:0x9987E4 @@ -14372,17 +14341,17 @@ trd_01_set_script_owner_npc_anim = 0x802403F0; // type:func rom:0x99CD80 trd_01_UnkDistFunc = 0x8024046C; // type:func rom:0x99CDFC trd_01_UnkNpcAIFunc12 = 0x802405A0; // type:func rom:0x99CF30 trd_01_set_script_owner_npc_col_height = 0x80240704; // type:func rom:0x99D094 -trd_01_UnkNpcAIMainFunc5 = 0x80240784; // type:func rom:0x99D114 -trd_01_UnkNpcAIFunc43 = 0x80240BC4; // type:func rom:0x99D554 -trd_01_UnkNpcAIFunc44 = 0x80240C78; // type:func rom:0x99D608 -trd_01_NpcJumpFunc3 = 0x80240D98; // type:func rom:0x99D728 -trd_01_NpcJumpFunc = 0x80240DF8; // type:func rom:0x99D788 -trd_01_UnkNpcAIFunc13_2 = 0x80240E70; // type:func rom:0x99D800 -trd_01_UnkNpcAIFunc11 = 0x80240FA0; // type:func rom:0x99D930 -trd_01_UnkNpcAIFunc10 = 0x802410BC; // type:func rom:0x99DA4C -trd_01_UnkNpcAIFunc42 = 0x80241104; // type:func rom:0x99DA94 -trd_01_UnkNpcAIFunc45 = 0x802411B0; // type:func rom:0x99DB40 -trd_01_UnkNpcAIMainFunc4 = 0x802413B8; // type:func rom:0x99DD48 +trd_01_TackleAI_Main = 0x80240784; // type:func rom:0x99D114 +trd_01_StationaryAI_IdleInit = 0x80240BC4; // type:func rom:0x99D554 +trd_01_StationaryAI_Idle = 0x80240C78; // type:func rom:0x99D608 +trd_01_StationaryAI_AlertInit = 0x80240D98; // type:func rom:0x99D728 +trd_01_StationaryAI_Alert = 0x80240DF8; // type:func rom:0x99D788 +trd_01_StationaryAI_ChaseInit = 0x80240E70; // type:func rom:0x99D800 +trd_01_StationaryAI_Chase = 0x80240FA0; // type:func rom:0x99D930 +trd_01_StationaryAI_LosePlayer = 0x802410BC; // type:func rom:0x99DA4C +trd_01_StationaryAI_ReturnHomeInit = 0x80241104; // type:func rom:0x99DA94 +trd_01_StationaryAI_ReturnHome = 0x802411B0; // type:func rom:0x99DB40 +trd_01_StationaryAI_Main = 0x802413B8; // type:func rom:0x99DD48 func_80241630_99DFC0 = 0x80241630; // type:func rom:0x99DFC0 D_80244440_9A0DD0 = 0x80244440; // type:data rom:0x9A0DD0 D_802444A0_9A0E30 = 0x802444A0; // type:data rom:0x9A0E30 @@ -14394,20 +14363,20 @@ trd_02_set_script_owner_npc_anim = 0x802400E0; // type:func rom:0x9A10C0 trd_02_UnkDistFunc = 0x8024015C; // type:func rom:0x9A113C trd_02_UnkNpcAIFunc12 = 0x80240290; // type:func rom:0x9A1270 trd_02_set_script_owner_npc_col_height = 0x802403F4; // type:func rom:0x9A13D4 -trd_02_UnkNpcAIMainFunc5 = 0x80240474; // type:func rom:0x9A1454 -trd_02_UnkNpcAIFunc24 = 0x802408B4; // type:func rom:0x9A1894 -trd_02_UnkFunc13 = 0x80240A0C; // type:func rom:0x9A19EC -trd_02_UnkNpcAIFunc1 = 0x80240CB4; // type:func rom:0x9A1C94 -trd_02_UnkFunc14 = 0x80240D74; // type:func rom:0x9A1D54 -trd_02_UnkNpcAIFunc25 = 0x80240F30; // type:func rom:0x9A1F10 -trd_02_NpcJumpFunc2 = 0x80240FE4; // type:func rom:0x9A1FC4 -trd_02_NpcJumpFunc = 0x80241058; // type:func rom:0x9A2038 -trd_02_UnkNpcAIFunc13 = 0x802410D0; // type:func rom:0x9A20B0 -trd_02_UnkFunc15 = 0x80241200; // type:func rom:0x9A21E0 -trd_02_UnkNpcDurationFlagFunc = 0x80241320; // type:func rom:0x9A2300 -trd_02_UnkFunc16 = 0x80241388; // type:func rom:0x9A2368 -trd_02_UnkNpcAIMainFunc = 0x80241448; // type:func rom:0x9A2428 -trd_02_UnkNpcAIMainFunc8 = 0x80241744; // type:func rom:0x9A2724 +trd_02_TackleAI_Main = 0x80240474; // type:func rom:0x9A1454 +trd_02_PatrolAI_MoveInit = 0x802408B4; // type:func rom:0x9A1894 +trd_02_PatrolAI_Move = 0x80240A0C; // type:func rom:0x9A19EC +trd_02_PatrolAI_LoiterInit = 0x80240CB4; // type:func rom:0x9A1C94 +trd_02_PatrolAI_Loiter = 0x80240D74; // type:func rom:0x9A1D54 +trd_02_PatrolAI_PostLoiter = 0x80240F30; // type:func rom:0x9A1F10 +trd_02_PatrolAI_JumpInit = 0x80240FE4; // type:func rom:0x9A1FC4 +trd_02_PatrolAI_Jump = 0x80241058; // type:func rom:0x9A2038 +trd_02_PatrolAI_ChaseInit = 0x802410D0; // type:func rom:0x9A20B0 +trd_02_PatrolAI_Chase = 0x80241200; // type:func rom:0x9A21E0 +trd_02_PatrolAI_LosePlayer = 0x80241320; // type:func rom:0x9A2300 +trd_02_PatrolNoAttackAI_15 = 0x80241388; // type:func rom:0x9A2368 +trd_02_PatrolNoAttackAI_Main = 0x80241448; // type:func rom:0x9A2428 +trd_02_KoopaPatrolAI_Main = 0x80241744; // type:func rom:0x9A2724 D_802432E0_9A42C0 = 0x802432E0; // type:data rom:0x9A42C0 D_80243340_9A4320 = 0x80243340; // type:data rom:0x9A4320 D_80243348_9A4328 = 0x80243348; // type:data rom:0x9A4328 @@ -14417,7 +14386,7 @@ trd_03_set_script_owner_npc_anim = 0x802400A0; // type:func rom:0x9A46F0 trd_03_UnkDistFunc = 0x8024011C; // type:func rom:0x9A476C trd_03_UnkNpcAIFunc12 = 0x80240250; // type:func rom:0x9A48A0 trd_03_set_script_owner_npc_col_height = 0x802403B4; // type:func rom:0x9A4A04 -trd_03_UnkNpcAIMainFunc5 = 0x80240434; // type:func rom:0x9A4A84 +trd_03_TackleAI_Main = 0x80240434; // type:func rom:0x9A4A84 func_80240880_9A4ED0 = 0x80240880; // type:func rom:0x9A4ED0 D_80243D40_9A8390 = 0x80243D40; // type:data rom:0x9A8390 trd_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9A83F0 @@ -14429,37 +14398,37 @@ trd_04_set_script_owner_npc_anim = 0x802404B0; // type:func rom:0x9A88A0 trd_04_UnkDistFunc = 0x8024052C; // type:func rom:0x9A891C trd_04_UnkNpcAIFunc12 = 0x80240660; // type:func rom:0x9A8A50 trd_04_set_script_owner_npc_col_height = 0x802407C4; // type:func rom:0x9A8BB4 -trd_04_UnkNpcAIMainFunc5 = 0x80240844; // type:func rom:0x9A8C34 -trd_04_UnkNpcAIFunc24 = 0x80240C84; // type:func rom:0x9A9074 -trd_04_UnkFunc13 = 0x80240DDC; // type:func rom:0x9A91CC -trd_04_UnkNpcAIFunc1 = 0x80241084; // type:func rom:0x9A9474 -trd_04_UnkFunc14 = 0x80241144; // type:func rom:0x9A9534 -trd_04_UnkNpcAIFunc25 = 0x80241300; // type:func rom:0x9A96F0 -trd_04_NpcJumpFunc2 = 0x802413B4; // type:func rom:0x9A97A4 -trd_04_NpcJumpFunc = 0x80241428; // type:func rom:0x9A9818 -trd_04_UnkNpcAIFunc13 = 0x802414A0; // type:func rom:0x9A9890 -trd_04_UnkFunc15 = 0x802415D0; // type:func rom:0x9A99C0 -trd_04_UnkNpcDurationFlagFunc = 0x802416F0; // type:func rom:0x9A9AE0 -trd_04_UnkFunc16 = 0x80241758; // type:func rom:0x9A9B48 -trd_04_UnkNpcAIMainFunc = 0x80241818; // type:func rom:0x9A9C08 -trd_04_UnkNpcAIMainFunc8 = 0x80241B14; // type:func rom:0x9A9F04 -trd_04_UnkNpcAIFunc23 = 0x80241E18; // type:func rom:0x9AA208 -trd_04_UnkNpcAIFunc35 = 0x80241FC8; // type:func rom:0x9AA3B8 -trd_04_UnkNpcAIFunc1_copy = 0x802425F0; // type:func rom:0x9AA9E0 -trd_04_UnkFunc4 = 0x802426B0; // type:func rom:0x9AAAA0 -trd_04_UnkNpcAIFunc2 = 0x802429F4; // type:func rom:0x9AADE4 -trd_04_SixFloatsFunc = 0x80242A6C; // type:func rom:0x9AAE5C -trd_04_UnkNpcAIFunc14 = 0x80242AD8; // type:func rom:0x9AAEC8 -trd_04_UnkNpcAIFunc3 = 0x80242C0C; // type:func rom:0x9AAFFC -trd_04_UnkFunc6 = 0x80242C70; // type:func rom:0x9AB060 -trd_04_UnkFunc5 = 0x80243000; // type:func rom:0x9AB3F0 -trd_04_UnkNpcAIMainFunc9 = 0x80243124; // type:func rom:0x9AB514 -func_80243310_9AB700 = 0x80243310; // type:func rom:0x9AB700 -func_80243438_9AB828 = 0x80243438; // type:func rom:0x9AB828 -func_802434F4_9AB8E4 = 0x802434F4; // type:func rom:0x9AB8E4 -trd_04_UnkDurationCheck = 0x8024360C; // type:func rom:0x9AB9FC -func_80243650_9ABA40 = 0x80243650; // type:func rom:0x9ABA40 -trd_04_sixFloats = 0x802456F4; // type:data rom:0x9ADAE4 +trd_04_TackleAI_Main = 0x80240844; // type:func rom:0x9A8C34 +trd_04_PatrolAI_MoveInit = 0x80240C84; // type:func rom:0x9A9074 +trd_04_PatrolAI_Move = 0x80240DDC; // type:func rom:0x9A91CC +trd_04_PatrolAI_LoiterInit = 0x80241084; // type:func rom:0x9A9474 +trd_04_PatrolAI_Loiter = 0x80241144; // type:func rom:0x9A9534 +trd_04_PatrolAI_PostLoiter = 0x80241300; // type:func rom:0x9A96F0 +trd_04_PatrolAI_JumpInit = 0x802413B4; // type:func rom:0x9A97A4 +trd_04_PatrolAI_Jump = 0x80241428; // type:func rom:0x9A9818 +trd_04_PatrolAI_ChaseInit = 0x802414A0; // type:func rom:0x9A9890 +trd_04_PatrolAI_Chase = 0x802415D0; // type:func rom:0x9A99C0 +trd_04_PatrolAI_LosePlayer = 0x802416F0; // type:func rom:0x9A9AE0 +trd_04_PatrolNoAttackAI_15 = 0x80241758; // type:func rom:0x9A9B48 +trd_04_PatrolNoAttackAI_Main = 0x80241818; // type:func rom:0x9A9C08 +trd_04_KoopaPatrolAI_Main = 0x80241B14; // type:func rom:0x9A9F04 +trd_04_FlyingAI_WanderInit = 0x80241E18; // type:func rom:0x9AA208 +trd_04_FlyingAI_Wander = 0x80241FC8; // type:func rom:0x9AA3B8 +trd_04_FlyingAI_LoiterInit = 0x802425F0; // type:func rom:0x9AA9E0 +trd_04_FlyingAI_Loiter = 0x802426B0; // type:func rom:0x9AAAA0 +trd_04_FlyingAI_JumpInit = 0x802429F4; // type:func rom:0x9AADE4 +trd_04_FlyingAI_Jump = 0x80242A6C; // type:func rom:0x9AAE5C +trd_04_FlyingAI_ChaseInit = 0x80242AD8; // type:func rom:0x9AAEC8 +trd_04_FlyingAI_Chase = 0x80242C0C; // type:func rom:0x9AAFFC +trd_04_FlyingAI_LosePlayer = 0x80242C70; // type:func rom:0x9AB060 +trd_04_FlyingAI_Init = 0x80243000; // type:func rom:0x9AB3F0 +trd_04_FlyingAI_Main = 0x80243124; // type:func rom:0x9AB514 +trd_04_ParatroopaAI_Windup = 0x80243310; // type:func rom:0x9AB700 +trd_04_ParatroopaAI_Dive = 0x80243438; // type:func rom:0x9AB828 +trd_04_ParatroopaAI_Overshoot = 0x802434F4; // type:func rom:0x9AB8E4 +trd_04_ParatroopaAI_Reset = 0x8024360C; // type:func rom:0x9AB9FC +trd_04_ParatroopaAI_Main = 0x80243650; // type:func rom:0x9ABA40 +trd_04_FlyingAI_JumpVels = 0x802456F4; // type:data rom:0x9ADAE4 D_80245EE0_9AE2D0 = 0x80245EE0; // type:data rom:0x9AE2D0 D_80245F40_9AE330 = 0x80245F40; // type:data rom:0x9AE330 D_80245F48_9AE338 = 0x80245F48; // type:data rom:0x9AE338 @@ -14496,27 +14465,27 @@ trd_07_set_script_owner_npc_anim = 0x80240310; // type:func rom:0x9B6C90 trd_07_UnkDistFunc = 0x8024038C; // type:func rom:0x9B6D0C trd_07_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0x9B6E40 trd_07_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0x9B6FA4 -trd_07_UnkNpcAIMainFunc5 = 0x802406A4; // type:func rom:0x9B7024 -trd_07_UnkNpcAIFunc23 = 0x80240AE4; // type:func rom:0x9B7464 -trd_07_UnkNpcAIFunc35 = 0x80240C94; // type:func rom:0x9B7614 -trd_07_UnkNpcAIFunc1_copy = 0x802412BC; // type:func rom:0x9B7C3C -trd_07_UnkFunc4 = 0x8024137C; // type:func rom:0x9B7CFC -trd_07_UnkNpcAIFunc2 = 0x802416C0; // type:func rom:0x9B8040 -trd_07_SixFloatsFunc = 0x80241738; // type:func rom:0x9B80B8 -trd_07_UnkNpcAIFunc14 = 0x802417A4; // type:func rom:0x9B8124 -trd_07_UnkNpcAIFunc3 = 0x802418D8; // type:func rom:0x9B8258 -trd_07_UnkFunc6 = 0x8024193C; // type:func rom:0x9B82BC -trd_07_UnkFunc5 = 0x80241CCC; // type:func rom:0x9B864C -trd_07_UnkNpcAIMainFunc9 = 0x80241DF0; // type:func rom:0x9B8770 -func_80241FDC_9B895C = 0x80241FDC; // type:func rom:0x9B895C -func_80242104_9B8A84 = 0x80242104; // type:func rom:0x9B8A84 -func_802421C0_9B8B40 = 0x802421C0; // type:func rom:0x9B8B40 -trd_07_UnkDurationCheck = 0x802422D8; // type:func rom:0x9B8C58 -func_8024231C_9B8C9C = 0x8024231C; // type:func rom:0x9B8C9C -func_8024256C_9B8EEC = 0x8024256C; // type:func rom:0x9B8EEC +trd_07_TackleAI_Main = 0x802406A4; // type:func rom:0x9B7024 +trd_07_FlyingAI_WanderInit = 0x80240AE4; // type:func rom:0x9B7464 +trd_07_FlyingAI_Wander = 0x80240C94; // type:func rom:0x9B7614 +trd_07_FlyingAI_LoiterInit = 0x802412BC; // type:func rom:0x9B7C3C +trd_07_FlyingAI_Loiter = 0x8024137C; // type:func rom:0x9B7CFC +trd_07_FlyingAI_JumpInit = 0x802416C0; // type:func rom:0x9B8040 +trd_07_FlyingAI_Jump = 0x80241738; // type:func rom:0x9B80B8 +trd_07_FlyingAI_ChaseInit = 0x802417A4; // type:func rom:0x9B8124 +trd_07_FlyingAI_Chase = 0x802418D8; // type:func rom:0x9B8258 +trd_07_FlyingAI_LosePlayer = 0x8024193C; // type:func rom:0x9B82BC +trd_07_FlyingAI_Init = 0x80241CCC; // type:func rom:0x9B864C +trd_07_FlyingAI_Main = 0x80241DF0; // type:func rom:0x9B8770 +trd_07_ParatroopaAI_Windup = 0x80241FDC; // type:func rom:0x9B895C +trd_07_ParatroopaAI_Dive = 0x80242104; // type:func rom:0x9B8A84 +trd_07_ParatroopaAI_Overshoot = 0x802421C0; // type:func rom:0x9B8B40 +trd_07_ParatroopaAI_Reset = 0x802422D8; // type:func rom:0x9B8C58 +trd_07_ParatroopaAI_Main = 0x8024231C; // type:func rom:0x9B8C9C +trd_07_GetDefeatedEnemyCount = 0x8024256C; // type:func rom:0x9B8EEC func_80242600_9B8F80 = 0x80242600; // type:func rom:0x9B8F80 func_802427FC_9B917C = 0x802427FC; // type:func rom:0x9B917C -trd_07_sixFloats = 0x80242EAC; // type:data rom:0x9B982C +trd_07_FlyingAI_JumpVels = 0x80242EAC; // type:data rom:0x9B982C D_80244820_9BB1A0 = 0x80244820; // type:data rom:0x9BB1A0 D_80244880_9BB200 = 0x80244880; // type:data rom:0x9BB200 D_80244888_9BB208 = 0x80244888; // type:data rom:0x9BB208 @@ -14538,16 +14507,16 @@ trd_10_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0x9C2F0C trd_10_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0x9C3018 func_802407F4_9C3104 = 0x802407F4; // type:func rom:0x9C3104 func_80240820_9C3130 = 0x80240820; // type:func rom:0x9C3130 -nok_01_UnkNpcAIFunc43 = 0x80240000; // type:func rom:0x9C53E0 -nok_01_UnkNpcAIFunc44 = 0x802400B4; // type:func rom:0x9C5494 -nok_01_NpcJumpFunc3 = 0x802401D4; // type:func rom:0x9C55B4 -nok_01_NpcJumpFunc = 0x80240234; // type:func rom:0x9C5614 -nok_01_UnkNpcAIFunc13_2 = 0x802402AC; // type:func rom:0x9C568C -nok_01_UnkNpcAIFunc11 = 0x802403DC; // type:func rom:0x9C57BC -nok_01_UnkNpcAIFunc10 = 0x802404F8; // type:func rom:0x9C58D8 -nok_01_UnkNpcAIFunc42 = 0x80240540; // type:func rom:0x9C5920 -nok_01_UnkNpcAIFunc45 = 0x802405EC; // type:func rom:0x9C59CC -nok_01_UnkNpcAIMainFunc4 = 0x802407F4; // type:func rom:0x9C5BD4 +nok_01_StationaryAI_IdleInit = 0x80240000; // type:func rom:0x9C53E0 +nok_01_StationaryAI_Idle = 0x802400B4; // type:func rom:0x9C5494 +nok_01_StationaryAI_AlertInit = 0x802401D4; // type:func rom:0x9C55B4 +nok_01_StationaryAI_Alert = 0x80240234; // type:func rom:0x9C5614 +nok_01_StationaryAI_ChaseInit = 0x802402AC; // type:func rom:0x9C568C +nok_01_StationaryAI_Chase = 0x802403DC; // type:func rom:0x9C57BC +nok_01_StationaryAI_LosePlayer = 0x802404F8; // type:func rom:0x9C58D8 +nok_01_StationaryAI_ReturnHomeInit = 0x80240540; // type:func rom:0x9C5920 +nok_01_StationaryAI_ReturnHome = 0x802405EC; // type:func rom:0x9C59CC +nok_01_StationaryAI_Main = 0x802407F4; // type:func rom:0x9C5BD4 nok_01_ToadHouse_DisableStatusMenu = 0x80240A6C; // type:func rom:0x9C5E4C nok_01_ToadHouse_ShowStatusMenu = 0x80240A8C; // type:func rom:0x9C5E6C nok_01_ToadHouse_UpdateScreenOverlay = 0x80240AB4; // type:func rom:0x9C5E94 @@ -14592,10 +14561,10 @@ nok_01_AddPlayerHandsOffset = 0x80241E58; // type:func rom:0x9C7238 func_80242028_9C7408 = 0x80242028; // type:func rom:0x9C7408 func_8024207C_9C745C = 0x8024207C; // type:func rom:0x9C745C func_802420B4_9C7494 = 0x802420B4; // type:func rom:0x9C7494 -nok_01_SetManyVars = 0x80242150; // type:func rom:0x9C7530 -nok_01_UnkYawFunc = 0x80242240; // type:func rom:0x9C7620 -func_802423CC_9C77AC = 0x802423CC; // type:func rom:0x9C77AC -func_80242410_9C77F0 = 0x80242410; // type:func rom:0x9C77F0 +nok_01_LetterDelivery_Init = 0x80242150; // type:func rom:0x9C7530 +nok_01_LetterDelivery_CalcLetterPos = 0x80242240; // type:func rom:0x9C7620 +nok_01_LetterDelivery_SaveNpcAnim = 0x802423CC; // type:func rom:0x9C77AC +nok_01_LetterDelivery_RestoreNpcAnim = 0x80242410; // type:func rom:0x9C77F0 func_8024243C_9C781C = 0x8024243C; // type:func rom:0x9C781C nok_01_UnkFloatFunc = 0x80242514; // type:func rom:0x9C78F4 func_802426A4_9C7A84 = 0x802426A4; // type:func rom:0x9C7A84 @@ -14634,18 +14603,18 @@ func_80240678_9D7698 = 0x80240678; // type:func rom:0x9D7698 func_802406B0_9D76D0 = 0x802406B0; // type:func rom:0x9D76D0 nok_02_ItemEntityJumpToPos = 0x80240750; // type:func rom:0x9D7770 func_80240970_9D7990 = 0x80240970; // type:func rom:0x9D7990 -nok_02_UnkNpcAIFunc24 = 0x80240A80; // type:func rom:0x9D7AA0 -nok_02_UnkFunc13 = 0x80240BD8; // type:func rom:0x9D7BF8 -nok_02_UnkNpcAIFunc1 = 0x80240E80; // type:func rom:0x9D7EA0 -nok_02_UnkFunc14 = 0x80240F40; // type:func rom:0x9D7F60 -nok_02_UnkNpcAIFunc25 = 0x802410FC; // type:func rom:0x9D811C -nok_02_NpcJumpFunc2 = 0x802411B0; // type:func rom:0x9D81D0 -nok_02_NpcJumpFunc = 0x80241224; // type:func rom:0x9D8244 -nok_02_UnkNpcAIFunc13 = 0x8024129C; // type:func rom:0x9D82BC -nok_02_UnkFunc15 = 0x802413CC; // type:func rom:0x9D83EC -nok_02_UnkNpcDurationFlagFunc = 0x802414EC; // type:func rom:0x9D850C -nok_02_UnkFunc16 = 0x80241554; // type:func rom:0x9D8574 -nok_02_UnkNpcAIMainFunc = 0x80241614; // type:func rom:0x9D8634 +nok_02_PatrolAI_MoveInit = 0x80240A80; // type:func rom:0x9D7AA0 +nok_02_PatrolAI_Move = 0x80240BD8; // type:func rom:0x9D7BF8 +nok_02_PatrolAI_LoiterInit = 0x80240E80; // type:func rom:0x9D7EA0 +nok_02_PatrolAI_Loiter = 0x80240F40; // type:func rom:0x9D7F60 +nok_02_PatrolAI_PostLoiter = 0x802410FC; // type:func rom:0x9D811C +nok_02_PatrolAI_JumpInit = 0x802411B0; // type:func rom:0x9D81D0 +nok_02_PatrolAI_Jump = 0x80241224; // type:func rom:0x9D8244 +nok_02_PatrolAI_ChaseInit = 0x8024129C; // type:func rom:0x9D82BC +nok_02_PatrolAI_Chase = 0x802413CC; // type:func rom:0x9D83EC +nok_02_PatrolAI_LosePlayer = 0x802414EC; // type:func rom:0x9D850C +nok_02_PatrolNoAttackAI_15 = 0x80241554; // type:func rom:0x9D8574 +nok_02_PatrolNoAttackAI_Main = 0x80241614; // type:func rom:0x9D8634 nok_02_Quizmo_StashVars = 0x80241910; // type:func rom:0x9D8930 nok_02_Quizmo_GetItemName = 0x802419C4; // type:func rom:0x9D89E4 nok_02_Quizmo_HideEntities = 0x80241A28; // type:func rom:0x9D8A48 @@ -14678,10 +14647,10 @@ nok_02_AddPlayerHandsOffset = 0x80242A00; // type:func rom:0x9D9A20 func_80242BD0_9D9BF0 = 0x80242BD0; // type:func rom:0x9D9BF0 func_80242C24_9D9C44 = 0x80242C24; // type:func rom:0x9D9C44 func_80242C5C_9D9C7C = 0x80242C5C; // type:func rom:0x9D9C7C -nok_02_SetManyVars = 0x80242CF8; // type:func rom:0x9D9D18 -nok_02_UnkYawFunc = 0x80242DE8; // type:func rom:0x9D9E08 -func_80242F74_9D9F94 = 0x80242F74; // type:func rom:0x9D9F94 -func_80242FB8_9D9FD8 = 0x80242FB8; // type:func rom:0x9D9FD8 +nok_02_LetterDelivery_Init = 0x80242CF8; // type:func rom:0x9D9D18 +nok_02_LetterDelivery_CalcLetterPos = 0x80242DE8; // type:func rom:0x9D9E08 +nok_02_LetterDelivery_SaveNpcAnim = 0x80242F74; // type:func rom:0x9D9F94 +nok_02_LetterDelivery_RestoreNpcAnim = 0x80242FB8; // type:func rom:0x9D9FD8 nok_02_SwitchToPartner = 0x80242FE4; // type:func rom:0x9DA004 func_80243010_9DA030 = 0x80243010; // type:func rom:0x9DA030 func_802430CC_9DA0EC = 0x802430CC; // type:func rom:0x9DA0EC @@ -14725,14 +14694,14 @@ D_8025279C_9E97BC = 0x8025279C; // type:data rom:0x9E97BC D_802529B4_9E99D4 = 0x802529B4; // type:data rom:0x9E99D4 D_80254620_9EB640 = 0x80254620; // type:data rom:0x9EB640 D_80254628_9EB648 = 0x80254628; // type:data rom:0x9EB648 -nok_03_UnkNpcAIFunc36 = 0x80240000; // type:func rom:0x9EB7F0 -nok_03_UnkNpcAIFunc37 = 0x80240230; // type:func rom:0x9EBA20 -nok_03_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0x9EBD58 -nok_03_UnkNpcAIFunc38 = 0x80240628; // type:func rom:0x9EBE18 -nok_03_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0x9EBFBC -nok_03_UnkNpcAIFunc39 = 0x802408AC; // type:func rom:0x9EC09C -nok_03_UnkDurationCheck = 0x80240BAC; // type:func rom:0x9EC39C -nok_03_UnkNpcAIMainFunc2 = 0x80240BF0; // type:func rom:0x9EC3E0 +nok_03_HoppingAI_HopInit = 0x80240000; // type:func rom:0x9EB7F0 +nok_03_HoppingAI_Hop = 0x80240230; // type:func rom:0x9EBA20 +nok_03_HoppingAI_LoiterInit = 0x80240568; // type:func rom:0x9EBD58 +nok_03_HoppingAI_Loiter = 0x80240628; // type:func rom:0x9EBE18 +nok_03_HoppingAI_ChaseInit = 0x802407CC; // type:func rom:0x9EBFBC +nok_03_HoppingAI_Chase = 0x802408AC; // type:func rom:0x9EC09C +nok_03_HoppingAI_LosePlayer = 0x80240BAC; // type:func rom:0x9EC39C +nok_03_HoppingAI_Main = 0x80240BF0; // type:func rom:0x9EC3E0 D_802423B0_9EDBA0 = 0x802423B0; // type:data rom:0x9EDBA0 nok_04_UnkFunc41 = 0x80240000; // type:func rom:0x9EDBF0 nok_04_UnkFloatFunc = 0x80240184; // type:func rom:0x9EDD74 @@ -14765,23 +14734,23 @@ nok_11_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x9F4A40 nok_11_UnkDistFunc = 0x8024007C; // type:func rom:0x9F4ABC nok_11_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x9F4BF0 nok_11_set_script_owner_npc_col_height = 0x80240314; // type:func rom:0x9F4D54 -nok_11_UnkNpcAIMainFunc5 = 0x80240394; // type:func rom:0x9F4DD4 -nok_11_UnkNpcAIFunc23 = 0x802407D4; // type:func rom:0x9F5214 -nok_11_UnkNpcAIFunc35 = 0x80240984; // type:func rom:0x9F53C4 -nok_11_UnkNpcAIFunc1_copy = 0x80240FAC; // type:func rom:0x9F59EC -nok_11_UnkFunc4 = 0x8024106C; // type:func rom:0x9F5AAC -nok_11_UnkNpcAIFunc2 = 0x802413B0; // type:func rom:0x9F5DF0 -nok_11_SixFloatsFunc = 0x80241428; // type:func rom:0x9F5E68 -nok_11_UnkNpcAIFunc14 = 0x80241494; // type:func rom:0x9F5ED4 -nok_11_UnkNpcAIFunc3 = 0x802415C8; // type:func rom:0x9F6008 -nok_11_UnkFunc6 = 0x8024162C; // type:func rom:0x9F606C -nok_11_UnkFunc5 = 0x802419BC; // type:func rom:0x9F63FC -nok_11_UnkNpcAIMainFunc9 = 0x80241AE0; // type:func rom:0x9F6520 +nok_11_TackleAI_Main = 0x80240394; // type:func rom:0x9F4DD4 +nok_11_FlyingAI_WanderInit = 0x802407D4; // type:func rom:0x9F5214 +nok_11_FlyingAI_Wander = 0x80240984; // type:func rom:0x9F53C4 +nok_11_FlyingAI_LoiterInit = 0x80240FAC; // type:func rom:0x9F59EC +nok_11_FlyingAI_Loiter = 0x8024106C; // type:func rom:0x9F5AAC +nok_11_FlyingAI_JumpInit = 0x802413B0; // type:func rom:0x9F5DF0 +nok_11_FlyingAI_Jump = 0x80241428; // type:func rom:0x9F5E68 +nok_11_FlyingAI_ChaseInit = 0x80241494; // type:func rom:0x9F5ED4 +nok_11_FlyingAI_Chase = 0x802415C8; // type:func rom:0x9F6008 +nok_11_FlyingAI_LosePlayer = 0x8024162C; // type:func rom:0x9F606C +nok_11_FlyingAI_Init = 0x802419BC; // type:func rom:0x9F63FC +nok_11_FlyingAI_Main = 0x80241AE0; // type:func rom:0x9F6520 nok_11_foliage_setup_shear_mtx = 0x80241CCC; // type:func rom:0x9F670C nok_11_TransformFoliage = 0x80241D3C; // type:func rom:0x9F677C func_80241F08_9F6948 = 0x80241F08; // type:func rom:0x9F6948 func_80241F30_9F6970 = 0x80241F30; // type:func rom:0x9F6970 -nok_11_sixFloats = 0x80242888; // type:data rom:0x9F72C8 +nok_11_FlyingAI_JumpVels = 0x80242888; // type:data rom:0x9F72C8 D_80245CF0_9FA730 = 0x80245CF0; // type:data rom:0x9FA730 D_80245D50_9FA790 = 0x80245D50; // type:data rom:0x9FA790 D_80245D58_9FA798 = 0x80245D58; // type:data rom:0x9FA798 @@ -14797,20 +14766,20 @@ nok_12_set_script_owner_npc_anim = 0x80240570; // type:func rom:0x9FAD60 nok_12_UnkDistFunc = 0x802405EC; // type:func rom:0x9FADDC nok_12_UnkNpcAIFunc12 = 0x80240720; // type:func rom:0x9FAF10 nok_12_set_script_owner_npc_col_height = 0x80240884; // type:func rom:0x9FB074 -nok_12_UnkNpcAIMainFunc5 = 0x80240904; // type:func rom:0x9FB0F4 -nok_12_UnkNpcAIFunc24 = 0x80240D44; // type:func rom:0x9FB534 -nok_12_UnkFunc13 = 0x80240E9C; // type:func rom:0x9FB68C -nok_12_UnkNpcAIFunc1 = 0x80241144; // type:func rom:0x9FB934 -nok_12_UnkFunc14 = 0x80241204; // type:func rom:0x9FB9F4 -nok_12_UnkNpcAIFunc25 = 0x802413C0; // type:func rom:0x9FBBB0 -nok_12_NpcJumpFunc2 = 0x80241474; // type:func rom:0x9FBC64 -nok_12_NpcJumpFunc = 0x802414E8; // type:func rom:0x9FBCD8 -nok_12_UnkNpcAIFunc13 = 0x80241560; // type:func rom:0x9FBD50 -nok_12_UnkFunc15 = 0x80241690; // type:func rom:0x9FBE80 -nok_12_UnkNpcDurationFlagFunc = 0x802417B0; // type:func rom:0x9FBFA0 -nok_12_UnkFunc16 = 0x80241818; // type:func rom:0x9FC008 -nok_12_UnkNpcAIMainFunc = 0x802418D8; // type:func rom:0x9FC0C8 -nok_12_UnkNpcAIMainFunc8 = 0x80241BD4; // type:func rom:0x9FC3C4 +nok_12_TackleAI_Main = 0x80240904; // type:func rom:0x9FB0F4 +nok_12_PatrolAI_MoveInit = 0x80240D44; // type:func rom:0x9FB534 +nok_12_PatrolAI_Move = 0x80240E9C; // type:func rom:0x9FB68C +nok_12_PatrolAI_LoiterInit = 0x80241144; // type:func rom:0x9FB934 +nok_12_PatrolAI_Loiter = 0x80241204; // type:func rom:0x9FB9F4 +nok_12_PatrolAI_PostLoiter = 0x802413C0; // type:func rom:0x9FBBB0 +nok_12_PatrolAI_JumpInit = 0x80241474; // type:func rom:0x9FBC64 +nok_12_PatrolAI_Jump = 0x802414E8; // type:func rom:0x9FBCD8 +nok_12_PatrolAI_ChaseInit = 0x80241560; // type:func rom:0x9FBD50 +nok_12_PatrolAI_Chase = 0x80241690; // type:func rom:0x9FBE80 +nok_12_PatrolAI_LosePlayer = 0x802417B0; // type:func rom:0x9FBFA0 +nok_12_PatrolNoAttackAI_15 = 0x80241818; // type:func rom:0x9FC008 +nok_12_PatrolNoAttackAI_Main = 0x802418D8; // type:func rom:0x9FC0C8 +nok_12_KoopaPatrolAI_Main = 0x80241BD4; // type:func rom:0x9FC3C4 func_80241EE0_9FC6D0 = 0x80241EE0; // type:func rom:0x9FC6D0 func_80241FD0_9FC7C0 = 0x80241FD0; // type:func rom:0x9FC7C0 D_802459CC_A001BC = 0x802459CC; // type:data rom:0xA001BC @@ -14818,14 +14787,14 @@ D_80245A14_A00204 = 0x80245A14; // type:data rom:0xA00204 D_80245A70_A00260 = 0x80245A70; // type:data rom:0xA00260 D_80245AD0_A002C0 = 0x80245AD0; // type:data rom:0xA002C0 D_80245AD8_A002C8 = 0x80245AD8; // type:data rom:0xA002C8 -nok_13_UnkNpcAIFunc36 = 0x80240000; // type:func rom:0xA00600 -nok_13_UnkNpcAIFunc37 = 0x80240230; // type:func rom:0xA00830 -nok_13_UnkNpcAIFunc1 = 0x80240568; // type:func rom:0xA00B68 -nok_13_UnkNpcAIFunc38 = 0x80240628; // type:func rom:0xA00C28 -nok_13_UnkNpcAIFunc15 = 0x802407CC; // type:func rom:0xA00DCC -nok_13_UnkNpcAIFunc39 = 0x802408AC; // type:func rom:0xA00EAC -nok_13_UnkDurationCheck = 0x80240BAC; // type:func rom:0xA011AC -nok_13_UnkNpcAIMainFunc2 = 0x80240BF0; // type:func rom:0xA011F0 +nok_13_HoppingAI_HopInit = 0x80240000; // type:func rom:0xA00600 +nok_13_HoppingAI_Hop = 0x80240230; // type:func rom:0xA00830 +nok_13_HoppingAI_LoiterInit = 0x80240568; // type:func rom:0xA00B68 +nok_13_HoppingAI_Loiter = 0x80240628; // type:func rom:0xA00C28 +nok_13_HoppingAI_ChaseInit = 0x802407CC; // type:func rom:0xA00DCC +nok_13_HoppingAI_Chase = 0x802408AC; // type:func rom:0xA00EAC +nok_13_HoppingAI_LosePlayerk = 0x80240BAC; // type:func rom:0xA011AC +nok_13_HoppingAI_Main = 0x80240BF0; // type:func rom:0xA011F0 func_80240E20_A01420 = 0x80240E20; // type:func rom:0xA01420 func_80241360_A01960 = 0x80241360; // type:func rom:0xA01960 func_802413CC_A019CC = 0x802413CC; // type:func rom:0xA019CC @@ -14838,24 +14807,24 @@ nok_14_set_script_owner_npc_anim = 0x802401C0; // type:func rom:0xA02A00 nok_14_UnkDistFunc = 0x8024023C; // type:func rom:0xA02A7C nok_14_UnkNpcAIFunc12 = 0x80240370; // type:func rom:0xA02BB0 nok_14_set_script_owner_npc_col_height = 0x802404D4; // type:func rom:0xA02D14 -nok_14_UnkNpcAIMainFunc5 = 0x80240554; // type:func rom:0xA02D94 -nok_14_UnkNpcAIFunc23 = 0x80240994; // type:func rom:0xA031D4 -nok_14_UnkNpcAIFunc35 = 0x80240B44; // type:func rom:0xA03384 -nok_14_UnkNpcAIFunc1_copy = 0x8024116C; // type:func rom:0xA039AC -nok_14_UnkFunc4 = 0x8024122C; // type:func rom:0xA03A6C -nok_14_UnkNpcAIFunc2 = 0x80241570; // type:func rom:0xA03DB0 -nok_14_SixFloatsFunc = 0x802415E8; // type:func rom:0xA03E28 -nok_14_UnkNpcAIFunc14 = 0x80241654; // type:func rom:0xA03E94 -nok_14_UnkNpcAIFunc3 = 0x80241788; // type:func rom:0xA03FC8 -nok_14_UnkFunc6 = 0x802417EC; // type:func rom:0xA0402C -nok_14_UnkFunc5 = 0x80241B7C; // type:func rom:0xA043BC -nok_14_UnkNpcAIMainFunc9 = 0x80241CA0; // type:func rom:0xA044E0 -func_80241E8C_A046CC = 0x80241E8C; // type:func rom:0xA046CC -func_80241FB4_A047F4 = 0x80241FB4; // type:func rom:0xA047F4 -func_80242070_A048B0 = 0x80242070; // type:func rom:0xA048B0 -nok_14_UnkDurationCheck = 0x80242188; // type:func rom:0xA049C8 -func_802421CC_A04A0C = 0x802421CC; // type:func rom:0xA04A0C -nok_14_sixFloats = 0x80243A18; // type:data rom:0xA06258 +nok_14_TackleAI_Main = 0x80240554; // type:func rom:0xA02D94 +nok_14_FlyingAI_WanderInit = 0x80240994; // type:func rom:0xA031D4 +nok_14_FlyingAI_Wander = 0x80240B44; // type:func rom:0xA03384 +nok_14_FlyingAI_LoiterInit = 0x8024116C; // type:func rom:0xA039AC +nok_14_FlyingAI_Loiter = 0x8024122C; // type:func rom:0xA03A6C +nok_14_FlyingAI_JumpInit = 0x80241570; // type:func rom:0xA03DB0 +nok_14_FlyingAI_Jump = 0x802415E8; // type:func rom:0xA03E28 +nok_14_FlyingAI_ChaseInit = 0x80241654; // type:func rom:0xA03E94 +nok_14_FlyingAI_Chase = 0x80241788; // type:func rom:0xA03FC8 +nok_14_FlyingAI_LosePlayer = 0x802417EC; // type:func rom:0xA0402C +nok_14_FlyingAI_Init = 0x80241B7C; // type:func rom:0xA043BC +nok_14_FlyingAI_Main = 0x80241CA0; // type:func rom:0xA044E0 +nok_14_ParatroopaAI_Windup = 0x80241E8C; // type:func rom:0xA046CC +nok_14_ParatroopaAI_Dive = 0x80241FB4; // type:func rom:0xA047F4 +nok_14_ParatroopaAI_Overshoot = 0x80242070; // type:func rom:0xA048B0 +nok_14_ParatroopaAI_Reset = 0x80242188; // type:func rom:0xA049C8 +nok_14_ParatroopaAI_Main = 0x802421CC; // type:func rom:0xA04A0C +nok_14_FlyingAI_JumpVels = 0x80243A18; // type:data rom:0xA06258 D_802445C0_A06E00 = 0x802445C0; // type:data rom:0xA06E00 D_80244620_A06E60 = 0x80244620; // type:data rom:0xA06E60 D_80244628_A06E68 = 0x80244628; // type:data rom:0xA06E68 @@ -14870,26 +14839,26 @@ nok_15_set_script_owner_npc_anim = 0x802402E0; // type:func rom:0xA071E0 nok_15_UnkDistFunc = 0x8024035C; // type:func rom:0xA0725C nok_15_UnkNpcAIFunc12 = 0x80240490; // type:func rom:0xA07390 nok_15_set_script_owner_npc_col_height = 0x802405F4; // type:func rom:0xA074F4 -nok_15_UnkNpcAIMainFunc5 = 0x80240674; // type:func rom:0xA07574 -nok_15_UnkNpcAIFunc23 = 0x80240AB4; // type:func rom:0xA079B4 -nok_15_UnkNpcAIFunc35 = 0x80240C64; // type:func rom:0xA07B64 -nok_15_UnkNpcAIFunc1_copy = 0x8024128C; // type:func rom:0xA0818C -nok_15_UnkFunc4 = 0x8024134C; // type:func rom:0xA0824C -nok_15_UnkNpcAIFunc2 = 0x80241690; // type:func rom:0xA08590 -nok_15_SixFloatsFunc = 0x80241708; // type:func rom:0xA08608 -nok_15_UnkNpcAIFunc14 = 0x80241774; // type:func rom:0xA08674 -nok_15_UnkNpcAIFunc3 = 0x802418A8; // type:func rom:0xA087A8 -nok_15_UnkFunc6 = 0x8024190C; // type:func rom:0xA0880C -nok_15_UnkFunc5 = 0x80241C9C; // type:func rom:0xA08B9C -nok_15_UnkNpcAIMainFunc9 = 0x80241DC0; // type:func rom:0xA08CC0 -func_80241FAC_A08EAC = 0x80241FAC; // type:func rom:0xA08EAC -func_802420D4_A08FD4 = 0x802420D4; // type:func rom:0xA08FD4 -func_80242190_A09090 = 0x80242190; // type:func rom:0xA09090 -nok_15_UnkDurationCheck = 0x802422A8; // type:func rom:0xA091A8 -func_802422EC_A091EC = 0x802422EC; // type:func rom:0xA091EC +nok_15_TackleAI_Main = 0x80240674; // type:func rom:0xA07574 +nok_15_FlyingAI_WanderInit = 0x80240AB4; // type:func rom:0xA079B4 +nok_15_FlyingAI_Wander = 0x80240C64; // type:func rom:0xA07B64 +nok_15_FlyingAI_LoiterInit = 0x8024128C; // type:func rom:0xA0818C +nok_15_FlyingAI_Loiter = 0x8024134C; // type:func rom:0xA0824C +nok_15_FlyingAI_JumpInit = 0x80241690; // type:func rom:0xA08590 +nok_15_FlyingAI_Jump = 0x80241708; // type:func rom:0xA08608 +nok_15_FlyingAI_ChaseInit = 0x80241774; // type:func rom:0xA08674 +nok_15_FlyingAI_Chase = 0x802418A8; // type:func rom:0xA087A8 +nok_15_FlyingAI_LosePlayer = 0x8024190C; // type:func rom:0xA0880C +nok_15_FlyingAI_Init = 0x80241C9C; // type:func rom:0xA08B9C +nok_15_FlyingAI_Main = 0x80241DC0; // type:func rom:0xA08CC0 +nok_15_ParatroopaAI_Windup = 0x80241FAC; // type:func rom:0xA08EAC +nok_15_ParatroopaAI_Dive = 0x802420D4; // type:func rom:0xA08FD4 +nok_15_ParatroopaAI_Overshoot = 0x80242190; // type:func rom:0xA09090 +nok_15_ParatroopaAI_Reset = 0x802422A8; // type:func rom:0xA091A8 +nok_15_ParatroopaAI_Main = 0x802422EC; // type:func rom:0xA091EC nok_15_foliage_setup_shear_mtx = 0x80242540; // type:func rom:0xA09440 nok_15_TransformFoliage = 0x802425B0; // type:func rom:0xA094B0 -nok_15_sixFloats = 0x80243D5C; // type:data rom:0xA0AC5C +nok_15_FlyingAI_JumpVels = 0x80243D5C; // type:data rom:0xA0AC5C D_80244CF0_A0BBF0 = 0x80244CF0; // type:data rom:0xA0BBF0 D_80244D50_A0BC50 = 0x80244D50; // type:data rom:0xA0BC50 D_80244D58_A0BC58 = 0x80244D58; // type:data rom:0xA0BC58 @@ -14951,27 +14920,27 @@ func_80240BFC_A16E1C = 0x80240BFC; // type:func rom:0xA16E1C func_80240EF4_A17114 = 0x80240EF4; // type:func rom:0xA17114 func_80240F68_A17188 = 0x80240F68; // type:func rom:0xA17188 func_80240FD0_A171F0 = 0x80240FD0; // type:func rom:0xA171F0 -hos_02_UnkNpcAIFunc23 = 0x80240FF0; // type:func rom:0xA17210 -hos_02_UnkNpcAIFunc35 = 0x802411A0; // type:func rom:0xA173C0 -hos_02_UnkNpcAIFunc1_copy = 0x802417C8; // type:func rom:0xA179E8 -hos_02_UnkFunc4 = 0x80241888; // type:func rom:0xA17AA8 -hos_02_UnkNpcAIFunc2 = 0x80241BCC; // type:func rom:0xA17DEC -hos_02_SixFloatsFunc = 0x80241C44; // type:func rom:0xA17E64 -hos_02_UnkNpcAIFunc14 = 0x80241CB0; // type:func rom:0xA17ED0 -hos_02_UnkNpcAIFunc3 = 0x80241DE4; // type:func rom:0xA18004 -hos_02_UnkFunc6 = 0x80241E48; // type:func rom:0xA18068 -hos_02_UnkFunc5 = 0x802421D8; // type:func rom:0xA183F8 -hos_02_UnkNpcAIMainFunc9 = 0x802422FC; // type:func rom:0xA1851C -hos_02_UnkNpcAIFunc13 = 0x802424E8; // type:func rom:0xA18708 -hos_02_UnkNpcAIFunc34 = 0x80242618; // type:func rom:0xA18838 -hos_02_UnkFunc45 = 0x80242898; // type:func rom:0xA18AB8 -hos_02_UnkNpcAIMainFunc10 = 0x802428F4; // type:func rom:0xA18B14 +hos_02_FlyingAI_WanderInit = 0x80240FF0; // type:func rom:0xA17210 +hos_02_FlyingAI_Wander = 0x802411A0; // type:func rom:0xA173C0 +hos_02_FlyingAI_LoiterInit = 0x802417C8; // type:func rom:0xA179E8 +hos_02_FlyingAI_Loiter = 0x80241888; // type:func rom:0xA17AA8 +hos_02_FlyingAI_JumpInit = 0x80241BCC; // type:func rom:0xA17DEC +hos_02_FlyingAI_Jump = 0x80241C44; // type:func rom:0xA17E64 +hos_02_FlyingAI_ChaseInit = 0x80241CB0; // type:func rom:0xA17ED0 +hos_02_FlyingAI_Chase = 0x80241DE4; // type:func rom:0xA18004 +hos_02_FlyingAI_LosePlayer = 0x80241E48; // type:func rom:0xA18068 +hos_02_FlyingAI_Init = 0x802421D8; // type:func rom:0xA183F8 +hos_02_FlyingAI_Main = 0x802422FC; // type:func rom:0xA1851C +hos_02_FlyingNoAttackAI_12 = 0x802424E8; // type:func rom:0xA18708 +hos_02_FlyingNoAttackAI_13 = 0x80242618; // type:func rom:0xA18838 +hos_02_FlyingNoAttackAI_20 = 0x80242898; // type:func rom:0xA18AB8 +hos_02_FlyingNoAttackAI_Main = 0x802428F4; // type:func rom:0xA18B14 D_802433AC_A195CC = 0x802433AC; // type:data rom:0xA195CC D_802433AE_A195CE = 0x802433AE; // type:data rom:0xA195CE D_802433B0_A195D0 = 0x802433B0; // type:data rom:0xA195D0 D_802433B2_A195D2 = 0x802433B2; // type:data rom:0xA195D2 D_802433B4_A195D4 = 0x802433B4; // type:data rom:0xA195D4 -hos_02_sixFloats = 0x80244490; // type:data rom:0xA1A6B0 +hos_02_FlyingAI_JumpVels = 0x80244490; // type:data rom:0xA1A6B0 D_80244DE0_A1B000 = 0x80244DE0; // type:data rom:0xA1B000 D_80244DE8_A1B008 = 0x80244DE8; // type:data rom:0xA1B008 D_80244DF0_A1B010 = 0x80244DF0; // type:data rom:0xA1B010 @@ -14994,17 +14963,17 @@ func_80240928_A1BA28 = 0x80240928; // type:func rom:0xA1BA28 func_80240A50_A1BB50 = 0x80240A50; // type:func rom:0xA1BB50 hos_03_foliage_setup_shear_mtx = 0x80240A70; // type:func rom:0xA1BB70 hos_03_TransformFoliage = 0x80240AE0; // type:func rom:0xA1BBE0 -hos_03_UnkNpcAIFunc23 = 0x80240CB0; // type:func rom:0xA1BDB0 -hos_03_UnkNpcAIFunc35 = 0x80240E60; // type:func rom:0xA1BF60 -hos_03_UnkNpcAIFunc1_copy = 0x80241488; // type:func rom:0xA1C588 -hos_03_UnkFunc4 = 0x80241548; // type:func rom:0xA1C648 -hos_03_UnkNpcAIFunc2 = 0x8024188C; // type:func rom:0xA1C98C -hos_03_SixFloatsFunc = 0x80241904; // type:func rom:0xA1CA04 -hos_03_UnkNpcAIFunc14 = 0x80241970; // type:func rom:0xA1CA70 -hos_03_UnkNpcAIFunc3 = 0x80241AA4; // type:func rom:0xA1CBA4 -hos_03_UnkFunc6 = 0x80241B08; // type:func rom:0xA1CC08 -hos_03_UnkFunc5 = 0x80241E98; // type:func rom:0xA1CF98 -hos_03_UnkNpcAIMainFunc9 = 0x80241FBC; // type:func rom:0xA1D0BC +hos_03_FlyingAI_WanderInit = 0x80240CB0; // type:func rom:0xA1BDB0 +hos_03_FlyingAI_Wander = 0x80240E60; // type:func rom:0xA1BF60 +hos_03_FlyingAI_LoiterInit = 0x80241488; // type:func rom:0xA1C588 +hos_03_FlyingAI_Loiter = 0x80241548; // type:func rom:0xA1C648 +hos_03_FlyingAI_JumpInit = 0x8024188C; // type:func rom:0xA1C98C +hos_03_FlyingAI_Jump = 0x80241904; // type:func rom:0xA1CA04 +hos_03_FlyingAI_ChaseInit = 0x80241970; // type:func rom:0xA1CA70 +hos_03_FlyingAI_Chase = 0x80241AA4; // type:func rom:0xA1CBA4 +hos_03_FlyingAI_LosePlayer = 0x80241B08; // type:func rom:0xA1CC08 +hos_03_FlyingAI_Init = 0x80241E98; // type:func rom:0xA1CF98 +hos_03_FlyingAI_Main = 0x80241FBC; // type:func rom:0xA1D0BC hos_03_ToadHouse_DisableStatusMenu = 0x802421A8; // type:func rom:0xA1D2A8 hos_03_ToadHouse_ShowStatusMenu = 0x802421C8; // type:func rom:0xA1D2C8 hos_03_ToadHouse_UpdateScreenOverlay = 0x802421F0; // type:func rom:0xA1D2F0 @@ -15049,7 +15018,7 @@ D_80243BCE_A1ECCE = 0x80243BCE; // type:data rom:0xA1ECCE D_80243BD0_A1ECD0 = 0x80243BD0; // type:data rom:0xA1ECD0 D_80243BD2_A1ECD2 = 0x80243BD2; // type:data rom:0xA1ECD2 D_80243BD4_A1ECD4 = 0x80243BD4; // type:data rom:0xA1ECD4 -hos_03_sixFloats = 0x802457F4; // type:data rom:0xA208F4 +hos_03_FlyingAI_JumpVels = 0x802457F4; // type:data rom:0xA208F4 hos_03_Quizmo_varStash = 0x8024801C; // type:data rom:0xA2311C hos_03_Quizmo_Answers = 0x80248080; // type:data rom:0xA23180 D_802480C0_A231C0 = 0x802480C0; // type:data rom:0xA231C0 @@ -15248,10 +15217,10 @@ dup_hos_06_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xA39964 func_80240654_A39B34 = 0x80240654; // type:func rom:0xA39B34 func_802406A8_A39B88 = 0x802406A8; // type:func rom:0xA39B88 func_802406E0_A39BC0 = 0x802406E0; // type:func rom:0xA39BC0 -hos_06_SetManyVars = 0x8024077C; // type:func rom:0xA39C5C -hos_06_UnkYawFunc = 0x8024086C; // type:func rom:0xA39D4C -func_802409F8_A39ED8 = 0x802409F8; // type:func rom:0xA39ED8 -func_80240A3C_A39F1C = 0x80240A3C; // type:func rom:0xA39F1C +hos_06_LetterDelivery_Init = 0x8024077C; // type:func rom:0xA39C5C +hos_06_LetterDelivery_CalcLetterPos = 0x8024086C; // type:func rom:0xA39D4C +hos_06_LetterDelivery_SaveNpcAnim = 0x802409F8; // type:func rom:0xA39ED8 +hos_06_LetterDelivery_RestoreNpcAnim = 0x80240A3C; // type:func rom:0xA39F1C func_80240A68_A39F48 = 0x80240A68; // type:func rom:0xA39F48 func_80240A94_A39F74 = 0x80240A94; // type:func rom:0xA39F74 func_80240AD0_A39FB0 = 0x80240AD0; // type:func rom:0xA39FB0 @@ -15321,7 +15290,7 @@ kpa_01_set_script_owner_npc_anim = 0x80240160; // type:func rom:0xA470C0 kpa_01_UnkDistFunc = 0x802401DC; // type:func rom:0xA4713C kpa_01_UnkNpcAIFunc12 = 0x80240310; // type:func rom:0xA47270 kpa_01_set_script_owner_npc_col_height = 0x80240474; // type:func rom:0xA473D4 -kpa_01_UnkNpcAIMainFunc5 = 0x802404F4; // type:func rom:0xA47454 +kpa_01_TackleAI_Main = 0x802404F4; // type:func rom:0xA47454 kpa_01_func_80240814_97BE44 = 0x80240934; // type:func rom:0xA47894 kpa_01_AwaitPlayerNearNpc = 0x8024097C; // type:func rom:0xA478DC kpa_01_func_802408B4_97BEE4 = 0x802409D4; // type:func rom:0xA47934 @@ -15331,30 +15300,30 @@ kpa_03_set_script_owner_npc_anim = 0x80240160; // type:func rom:0xA48720 kpa_03_UnkDistFunc = 0x802401DC; // type:func rom:0xA4879C kpa_03_UnkNpcAIFunc12 = 0x80240310; // type:func rom:0xA488D0 kpa_03_set_script_owner_npc_col_height = 0x80240474; // type:func rom:0xA48A34 -kpa_03_UnkNpcAIMainFunc5 = 0x802404F4; // type:func rom:0xA48AB4 +kpa_03_TackleAI_Main = 0x802404F4; // type:func rom:0xA48AB4 kpa_03_func_80240814_97BE44 = 0x80240934; // type:func rom:0xA48EF4 kpa_03_AwaitPlayerNearNpc = 0x8024097C; // type:func rom:0xA48F3C kpa_03_func_802408B4_97BEE4 = 0x802409D4; // type:func rom:0xA48F94 -kpa_03_UnkNpcAIFunc47 = 0x80240A48; // type:func rom:0xA49008 -kpa_03_UnkFunc57 = 0x80240C18; // type:func rom:0xA491D8 -kpa_03_UnkFunc58 = 0x80241128; // type:func rom:0xA496E8 -func_8024119C_A4975C = 0x8024119C; // type:func rom:0xA4975C -kpa_03_UnkFunc59 = 0x802412C8; // type:func rom:0xA49888 -func_80241368_A49928 = 0x80241368; // type:func rom:0xA49928 -func_802413CC_A4998C = 0x802413CC; // type:func rom:0xA4998C -func_8024150C_A49ACC = 0x8024150C; // type:func rom:0xA49ACC -func_802416B0_A49C70 = 0x802416B0; // type:func rom:0xA49C70 -func_802416EC_A49CAC = 0x802416EC; // type:func rom:0xA49CAC -func_802418AC_A49E6C = 0x802418AC; // type:func rom:0xA49E6C -func_80241918_A49ED8 = 0x80241918; // type:func rom:0xA49ED8 -func_80241A4C_A4A00C = 0x80241A4C; // type:func rom:0xA4A00C -func_80241AB4_A4A074 = 0x80241AB4; // type:func rom:0xA4A074 -func_80241D20_A4A2E0 = 0x80241D20; // type:func rom:0xA4A2E0 -func_80241D6C_A4A32C = 0x80241D6C; // type:func rom:0xA4A32C -kpa_03_GetEncounterEnemyIsOwner = 0x80241DC4; // type:func rom:0xA4A384 -func_80241DFC_A4A3BC = 0x80241DFC; // type:func rom:0xA4A3BC +kpa_03_MagikoopaAI_CanShootSpell = 0x80240A48; // type:func rom:0xA49008 +kpa_03_MagikoopaAI_SpellMain = 0x80240C18; // type:func rom:0xA491D8 +kpa_03_MagikoopaAI_00 = 0x80241128; // type:func rom:0xA496E8 +kpa_03_MagikoopaAI_01 = 0x8024119C; // type:func rom:0xA4975C +kpa_03_MagikoopaAI_05 = 0x802412C8; // type:func rom:0xA49888 +kpa_03_MagikoopaAI_06 = 0x80241368; // type:func rom:0xA49928 +kpa_03_MagikoopaAI_10 = 0x802413CC; // type:func rom:0xA4998C +kpa_03_MagikoopaAI_11 = 0x8024150C; // type:func rom:0xA49ACC +kpa_03_MagikoopaAI_20 = 0x802416B0; // type:func rom:0xA49C70 +kpa_03_MagikoopaAI_21 = 0x802416EC; // type:func rom:0xA49CAC +kpa_03_MagikoopaAI_22 = 0x802418AC; // type:func rom:0xA49E6C +kpa_03_MagikoopaAI_23 = 0x80241918; // type:func rom:0xA49ED8 +kpa_03_MagikoopaAI_24 = 0x80241A4C; // type:func rom:0xA4A00C +kpa_03_MagikoopaAI_Main = 0x80241AB4; // type:func rom:0xA4A074 +kpa_03_MagikoopaAI_OnPlayerWon = 0x80241D20; // type:func rom:0xA4A2E0 +kpa_03_MagikoopaAI_OnPlayerFled = 0x80241D6C; // type:func rom:0xA4A32C +kpa_03_MagikoopaAI_OnHitInit = 0x80241DC4; // type:func rom:0xA4A384 +kpa_03_MagikoopaAI_OnHit = 0x80241DFC; // type:func rom:0xA4A3BC func_80241E50_A4A410 = 0x80241E50; // type:func rom:0xA4A410 -D_802425E0_A4ABA0 = 0x802425E0; // type:data rom:0xA4ABA0 +kpa_03_MagikoopaAI_TeleportAnim = 0x802425E0; // type:data rom:0xA4ABA0 D_802425E4_A4ABA4 = 0x802425E4; // type:data rom:0xA4ABA4 D_802425E8_A4ABA8 = 0x802425E8; // type:data rom:0xA4ABA8 D_80243880_A4BE40 = 0x80243880; // type:data rom:0xA4BE40 @@ -15369,25 +15338,25 @@ kpa_04_UnkFunc11 = 0x80240000; // type:func rom:0xA4BF60 func_802400BC_A4C01C = 0x802400BC; // type:func rom:0xA4C01C kpa_08_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xA4CA20 func_8024001C_A4CA3C = 0x8024001C; // type:func rom:0xA4CA3C -kpa_08_UnkNpcAIFunc47 = 0x802400A0; // type:func rom:0xA4CAC0 -kpa_08_UnkFunc57 = 0x80240270; // type:func rom:0xA4CC90 -kpa_08_UnkFunc58 = 0x80240780; // type:func rom:0xA4D1A0 -func_802407F4_A4D214 = 0x802407F4; // type:func rom:0xA4D214 -kpa_08_UnkFunc59 = 0x80240920; // type:func rom:0xA4D340 -func_802409C0_A4D3E0 = 0x802409C0; // type:func rom:0xA4D3E0 -func_80240A24_A4D444 = 0x80240A24; // type:func rom:0xA4D444 -func_80240B64_A4D584 = 0x80240B64; // type:func rom:0xA4D584 -func_80240D08_A4D728 = 0x80240D08; // type:func rom:0xA4D728 -func_80240D44_A4D764 = 0x80240D44; // type:func rom:0xA4D764 -func_80240F04_A4D924 = 0x80240F04; // type:func rom:0xA4D924 -func_80240F70_A4D990 = 0x80240F70; // type:func rom:0xA4D990 -func_802410A4_A4DAC4 = 0x802410A4; // type:func rom:0xA4DAC4 -func_8024110C_A4DB2C = 0x8024110C; // type:func rom:0xA4DB2C -func_80241378_A4DD98 = 0x80241378; // type:func rom:0xA4DD98 -func_802413C4_A4DDE4 = 0x802413C4; // type:func rom:0xA4DDE4 -kpa_08_GetEncounterEnemyIsOwner = 0x8024141C; // type:func rom:0xA4DE3C -func_80241454_A4DE74 = 0x80241454; // type:func rom:0xA4DE74 -D_80241CF0_A4E710 = 0x80241CF0; // type:data rom:0xA4E710 +kpa_08_MagikoopaAI_CanShootSpell = 0x802400A0; // type:func rom:0xA4CAC0 +kpa_08_MagikoopaAI_SpellMain = 0x80240270; // type:func rom:0xA4CC90 +kpa_08_MagikoopaAI_00 = 0x80240780; // type:func rom:0xA4D1A0 +kpa_08_MagikoopaAI_01 = 0x802407F4; // type:func rom:0xA4D214 +kpa_08_MagikoopaAI_05 = 0x80240920; // type:func rom:0xA4D340 +kpa_08_MagikoopaAI_06 = 0x802409C0; // type:func rom:0xA4D3E0 +kpa_08_MagikoopaAI_10 = 0x80240A24; // type:func rom:0xA4D444 +kpa_08_MagikoopaAI_11 = 0x80240B64; // type:func rom:0xA4D584 +kpa_08_MagikoopaAI_20 = 0x80240D08; // type:func rom:0xA4D728 +kpa_08_MagikoopaAI_21 = 0x80240D44; // type:func rom:0xA4D764 +kpa_08_MagikoopaAI_22 = 0x80240F04; // type:func rom:0xA4D924 +kpa_08_MagikoopaAI_23 = 0x80240F70; // type:func rom:0xA4D990 +kpa_08_MagikoopaAI_24 = 0x802410A4; // type:func rom:0xA4DAC4 +kpa_08_MagikoopaAI_Main = 0x8024110C; // type:func rom:0xA4DB2C +kpa_08_MagikoopaAI_OnPlayerWon = 0x80241378; // type:func rom:0xA4DD98 +kpa_08_MagikoopaAI_OnPlayerFled = 0x802413C4; // type:func rom:0xA4DDE4 +kpa_08_MagikoopaAI_OnHitInit = 0x8024141C; // type:func rom:0xA4DE3C +kpa_08_MagikoopaAI_OnHit = 0x80241454; // type:func rom:0xA4DE74 +kpa_08_MagikoopaAI_TeleportAnim = 0x80241CF0; // type:data rom:0xA4E710 D_80241CF4_A4E714 = 0x80241CF4; // type:data rom:0xA4E714 D_80241CF8_A4E718 = 0x80241CF8; // type:data rom:0xA4E718 D_80242520_A4EF40 = 0x80242520; // type:data rom:0xA4EF40 @@ -15399,15 +15368,15 @@ D_80242560_A4EF80 = 0x80242560; // type:data rom:0xA4EF80 D_80242568_A4EF88 = 0x80242568; // type:data rom:0xA4EF88 kpa_09_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xA4F000 func_8024001C_A4F01C = 0x8024001C; // type:func rom:0xA4F01C -kpa_09_UnkFunc61 = 0x802400A0; // type:func rom:0xA4F0A0 +kpa_09_ProjectileHitbox_GetUsableProjectileID = 0x802400A0; // type:func rom:0xA4F0A0 kpa_09_UnkNpcAIFunc48 = 0x80240290; // type:func rom:0xA4F290 -kpa_09_UnkNpcAIFunc49 = 0x802403D4; // type:func rom:0xA4F3D4 -kpa_09_UnkSetDurationFunc = 0x802404D4; // type:func rom:0xA4F4D4 -kpa_09_UnkNpcAIFunc9 = 0x80240518; // type:func rom:0xA4F518 -kpa_09_UnkDurationCheckNoArgs = 0x802405B8; // type:func rom:0xA4F5B8 -kpa_09_UnkFunc54 = 0x802405FC; // type:func rom:0xA4F5FC -kpa_09_UnkFunc55 = 0x80240B38; // type:func rom:0xA4FB38 -kpa_09_UnkNpcAIMainFunc7 = 0x80240F94; // type:func rom:0xA4FF94 +kpa_09_ProjectileHitbox_30 = 0x802403D4; // type:func rom:0xA4F3D4 +kpa_09_ProjectileHitbox_31 = 0x802404D4; // type:func rom:0xA4F4D4 +kpa_09_ProjectileHitbox_32 = 0x80240518; // type:func rom:0xA4F518 +kpa_09_ProjectileHitbox_33 = 0x802405B8; // type:func rom:0xA4F5B8 +kpa_09_ProjectileAI_Main = 0x802405FC; // type:func rom:0xA4F5FC +kpa_09_ProjectileAI_Reflect = 0x80240B38; // type:func rom:0xA4FB38 +kpa_09_RangedAttackAI_Main = 0x80240F94; // type:func rom:0xA4FF94 kpa_09_GetEncounterEnemyIsOwner = 0x802412B4; // type:func rom:0xA502B4 D_802427C0_A517C0 = 0x802427C0; // type:data rom:0xA517C0 D_802427C8_A517C8 = 0x802427C8; // type:data rom:0xA517C8 @@ -15422,7 +15391,7 @@ kpa_11_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA52BD0 kpa_11_UnkDistFunc = 0x8024038C; // type:func rom:0xA52C4C kpa_11_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA52D80 kpa_11_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xA52EE4 -kpa_11_UnkNpcAIMainFunc5 = 0x802406A4; // type:func rom:0xA52F64 +kpa_11_TackleAI_Main = 0x802406A4; // type:func rom:0xA52F64 D_80242030_A548F0 = 0x80242030; // type:data rom:0xA548F0 func_80240000_A54950 = 0x80240000; // type:func rom:0xA54950 kpa_12_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA54990 @@ -15466,21 +15435,21 @@ kpa_32_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5E0C0 kpa_32_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5E1E4 kpa_33_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5F080 kpa_33_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5F1A4 -kpa_50_UnkFunc61 = 0x80240000; // type:func rom:0xA609D0 +kpa_50_ProjectileHitbox_GetUsableProjectileID = 0x80240000; // type:func rom:0xA609D0 kpa_50_UnkNpcAIFunc48 = 0x802401F0; // type:func rom:0xA60BC0 -kpa_50_UnkNpcAIFunc49 = 0x80240334; // type:func rom:0xA60D04 -kpa_50_UnkSetDurationFunc = 0x80240434; // type:func rom:0xA60E04 -kpa_50_UnkNpcAIFunc9 = 0x80240478; // type:func rom:0xA60E48 -kpa_50_UnkDurationCheckNoArgs = 0x80240518; // type:func rom:0xA60EE8 -kpa_50_UnkFunc54 = 0x8024055C; // type:func rom:0xA60F2C -kpa_50_UnkFunc55 = 0x80240A98; // type:func rom:0xA61468 -kpa_50_UnkNpcAIMainFunc7 = 0x80240EF4; // type:func rom:0xA618C4 +kpa_50_ProjectileHitbox_30 = 0x80240334; // type:func rom:0xA60D04 +kpa_50_ProjectileHitbox_31 = 0x80240434; // type:func rom:0xA60E04 +kpa_50_ProjectileHitbox_32 = 0x80240478; // type:func rom:0xA60E48 +kpa_50_ProjectileHitbox_33 = 0x80240518; // type:func rom:0xA60EE8 +kpa_50_ProjectileAI_Main = 0x8024055C; // type:func rom:0xA60F2C +kpa_50_ProjectileAI_Reflect = 0x80240A98; // type:func rom:0xA61468 +kpa_50_RangedAttackAI_Main = 0x80240EF4; // type:func rom:0xA618C4 kpa_50_GetEncounterEnemyIsOwner = 0x80241214; // type:func rom:0xA61BE4 kpa_50_set_script_owner_npc_anim = 0x8024124C; // type:func rom:0xA61C1C kpa_50_UnkDistFunc = 0x802412C8; // type:func rom:0xA61C98 kpa_50_UnkNpcAIFunc12 = 0x802413FC; // type:func rom:0xA61DCC kpa_50_set_script_owner_npc_col_height = 0x80241560; // type:func rom:0xA61F30 -kpa_50_UnkNpcAIMainFunc5 = 0x802415E0; // type:func rom:0xA61FB0 +kpa_50_TackleAI_Main = 0x802415E0; // type:func rom:0xA61FB0 D_802434A0_A63E70 = 0x802434A0; // type:data rom:0xA63E70 D_802434A8_A63E78 = 0x802434A8; // type:data rom:0xA63E78 D_802434B0_A63E80 = 0x802434B0; // type:data rom:0xA63E80 @@ -15488,30 +15457,30 @@ D_802434B8_A63E88 = 0x802434B8; // type:data rom:0xA63E88 D_802434C0_A63E90 = 0x802434C0; // type:data rom:0xA63E90 D_80243658_A64028 = 0x80243658; // type:data rom:0xA64028 func_80240000_A64090 = 0x80240000; // type:func rom:0xA64090 -kpa_51_UnkNpcAIFunc47 = 0x80240050; // type:func rom:0xA640E0 -kpa_51_UnkFunc57 = 0x80240220; // type:func rom:0xA642B0 -kpa_51_UnkFunc58 = 0x80240730; // type:func rom:0xA647C0 -func_802407A4_A64834 = 0x802407A4; // type:func rom:0xA64834 -kpa_51_UnkFunc59 = 0x802408D0; // type:func rom:0xA64960 -func_80240970_A64A00 = 0x80240970; // type:func rom:0xA64A00 -func_802409D4_A64A64 = 0x802409D4; // type:func rom:0xA64A64 -func_80240B14_A64BA4 = 0x80240B14; // type:func rom:0xA64BA4 -func_80240CB8_A64D48 = 0x80240CB8; // type:func rom:0xA64D48 -func_80240CF4_A64D84 = 0x80240CF4; // type:func rom:0xA64D84 -func_80240EB4_A64F44 = 0x80240EB4; // type:func rom:0xA64F44 -func_80240F20_A64FB0 = 0x80240F20; // type:func rom:0xA64FB0 -func_80241054_A650E4 = 0x80241054; // type:func rom:0xA650E4 -func_802410BC_A6514C = 0x802410BC; // type:func rom:0xA6514C -func_80241328_A653B8 = 0x80241328; // type:func rom:0xA653B8 -func_80241374_A65404 = 0x80241374; // type:func rom:0xA65404 -kpa_51_GetEncounterEnemyIsOwner = 0x802413CC; // type:func rom:0xA6545C -func_80241404_A65494 = 0x80241404; // type:func rom:0xA65494 +kpa_51_MagikoopaAI_CanShootSpell = 0x80240050; // type:func rom:0xA640E0 +kpa_51_MagikoopaAI_SpellMain = 0x80240220; // type:func rom:0xA642B0 +kpa_51_MagikoopaAI_00 = 0x80240730; // type:func rom:0xA647C0 +kpa_51_MagikoopaAI_01 = 0x802407A4; // type:func rom:0xA64834 +kpa_51_MagikoopaAI_05 = 0x802408D0; // type:func rom:0xA64960 +kpa_51_MagikoopaAI_06 = 0x80240970; // type:func rom:0xA64A00 +kpa_51_MagikoopaAI_10 = 0x802409D4; // type:func rom:0xA64A64 +kpa_51_MagikoopaAI_11 = 0x80240B14; // type:func rom:0xA64BA4 +kpa_51_MagikoopaAI_20 = 0x80240CB8; // type:func rom:0xA64D48 +kpa_51_MagikoopaAI_21 = 0x80240CF4; // type:func rom:0xA64D84 +kpa_51_MagikoopaAI_22 = 0x80240EB4; // type:func rom:0xA64F44 +kpa_51_MagikoopaAI_23 = 0x80240F20; // type:func rom:0xA64FB0 +kpa_51_MagikoopaAI_24 = 0x80241054; // type:func rom:0xA650E4 +kpa_51_MagikoopaAI_Main = 0x802410BC; // type:func rom:0xA6514C +kpa_51_MagikoopaAI_OnPlayerWon = 0x80241328; // type:func rom:0xA653B8 +kpa_51_MagikoopaAI_OnPlayerFled = 0x80241374; // type:func rom:0xA65404 +kpa_51_MagikoopaAI_OnHitInit = 0x802413CC; // type:func rom:0xA6545C +kpa_51_MagikoopaAI_OnHit = 0x80241404; // type:func rom:0xA65494 kpa_51_set_script_owner_npc_anim = 0x8024144C; // type:func rom:0xA654DC kpa_51_UnkDistFunc = 0x802414C8; // type:func rom:0xA65558 kpa_51_UnkNpcAIFunc12 = 0x802415FC; // type:func rom:0xA6568C kpa_51_set_script_owner_npc_col_height = 0x80241760; // type:func rom:0xA657F0 -kpa_51_UnkNpcAIMainFunc5 = 0x802417E0; // type:func rom:0xA65870 -D_80242050_A660E0 = 0x80242050; // type:data rom:0xA660E0 +kpa_51_TackleAI_Main = 0x802417E0; // type:func rom:0xA65870 +kpa_51_MagikoopaAI_TeleportAnim = 0x80242050; // type:data rom:0xA660E0 D_80242054_A660E4 = 0x80242054; // type:data rom:0xA660E4 D_80242058_A660E8 = 0x80242058; // type:data rom:0xA660E8 D_80242F20_A66FB0 = 0x80242F20; // type:data rom:0xA66FB0 @@ -15526,15 +15495,15 @@ D_80242F98_A67028 = 0x80242F98; // type:data rom:0xA67028 D_80243008_A67098 = 0x80243008; // type:data rom:0xA67098 kpa_52_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA67100 kpa_52_GetEntityPosition = 0x80240034; // type:func rom:0xA67134 -kpa_52_UnkFunc61 = 0x802400E0; // type:func rom:0xA671E0 +kpa_52_ProjectileHitbox_GetUsableProjectileID = 0x802400E0; // type:func rom:0xA671E0 kpa_52_UnkNpcAIFunc48 = 0x802402D0; // type:func rom:0xA673D0 -kpa_52_UnkNpcAIFunc49 = 0x80240414; // type:func rom:0xA67514 -kpa_52_UnkSetDurationFunc = 0x80240514; // type:func rom:0xA67614 -kpa_52_UnkNpcAIFunc9 = 0x80240558; // type:func rom:0xA67658 -kpa_52_UnkDurationCheckNoArgs = 0x802405F8; // type:func rom:0xA676F8 -kpa_52_UnkFunc54 = 0x8024063C; // type:func rom:0xA6773C -kpa_52_UnkFunc55 = 0x80240B78; // type:func rom:0xA67C78 -kpa_52_UnkNpcAIMainFunc7 = 0x80240FD4; // type:func rom:0xA680D4 +kpa_52_ProjectileHitbox_30 = 0x80240414; // type:func rom:0xA67514 +kpa_52_ProjectileHitbox_31 = 0x80240514; // type:func rom:0xA67614 +kpa_52_ProjectileHitbox_32 = 0x80240558; // type:func rom:0xA67658 +kpa_52_ProjectileHitbox_33 = 0x802405F8; // type:func rom:0xA676F8 +kpa_52_ProjectileAI_Main = 0x8024063C; // type:func rom:0xA6773C +kpa_52_ProjectileAI_Reflect = 0x80240B78; // type:func rom:0xA67C78 +kpa_52_RangedAttackAI_Main = 0x80240FD4; // type:func rom:0xA680D4 kpa_52_GetEncounterEnemyIsOwner = 0x802412F4; // type:func rom:0xA683F4 D_802439E0_A6AAE0 = 0x802439E0; // type:data rom:0xA6AAE0 D_802439E8_A6AAE8 = 0x802439E8; // type:data rom:0xA6AAE8 @@ -15556,23 +15525,23 @@ kpa_61_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA6E6F0 kpa_61_UnkDistFunc = 0x8024038C; // type:func rom:0xA6E76C kpa_61_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA6E8A0 kpa_61_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xA6EA04 -kpa_61_UnkNpcAIMainFunc5 = 0x802406A4; // type:func rom:0xA6EA84 -kpa_61_UnkNpcAIFunc47 = 0x80240AE4; // type:func rom:0xA6EEC4 -kpa_61_UnkFunc57 = 0x80240CB4; // type:func rom:0xA6F094 -func_802411C4_A6F5A4 = 0x802411C4; // type:func rom:0xA6F5A4 -func_80241200_A6F5E0 = 0x80241200; // type:func rom:0xA6F5E0 -func_8024138C_A6F76C = 0x8024138C; // type:func rom:0xA6F76C -func_8024177C_A6FB5C = 0x8024177C; // type:func rom:0xA6FB5C -func_80241870_A6FC50 = 0x80241870; // type:func rom:0xA6FC50 -func_80241AB4_A6FE94 = 0x80241AB4; // type:func rom:0xA6FE94 -func_80241AF0_A6FED0 = 0x80241AF0; // type:func rom:0xA6FED0 -func_80241CBC_A7009C = 0x80241CBC; // type:func rom:0xA7009C -func_80241D28_A70108 = 0x80241D28; // type:func rom:0xA70108 -func_80241E5C_A7023C = 0x80241E5C; // type:func rom:0xA7023C -func_80241F4C_A7032C = 0x80241F4C; // type:func rom:0xA7032C -btl_state_update_begin_player_turn_A70404 = 0x80242024; // type:func rom:0xA70404 -kpa_61_GetEncounterEnemyIsOwner = 0x802422B8; // type:func rom:0xA70698 -func_802422F0_A706D0 = 0x802422F0; // type:func rom:0xA706D0 +kpa_61_TackleAI_Main = 0x802406A4; // type:func rom:0xA6EA84 +kpa_61_MagikoopaAI_CanShootSpell = 0x80240AE4; // type:func rom:0xA6EEC4 +kpa_61_MagikoopaAI_SpellMain = 0x80240CB4; // type:func rom:0xA6F094 +kpa_61_FlyingMagikoopaAI_10 = 0x802411C4; // type:func rom:0xA6F5A4 +kpa_61_FlyingMagikoopaAI_11 = 0x80241200; // type:func rom:0xA6F5E0 +kpa_61_FlyingMagikoopaAI_15 = 0x8024138C; // type:func rom:0xA6F76C +kpa_61_FlyingMagikoopaAI_16 = 0x8024177C; // type:func rom:0xA6FB5C +kpa_61_FlyingMagikoopaAI_17 = 0x80241870; // type:func rom:0xA6FC50 +kpa_61_FlyingMagikoopaAI_20 = 0x80241AB4; // type:func rom:0xA6FE94 +kpa_61_FlyingMagikoopaAI_21 = 0x80241AF0; // type:func rom:0xA6FED0 +kpa_61_FlyingMagikoopaAI_22 = 0x80241CBC; // type:func rom:0xA7009C +kpa_61_FlyingMagikoopaAI_23 = 0x80241D28; // type:func rom:0xA70108 +kpa_61_FlyingMagikoopaAI_24 = 0x80241E5C; // type:func rom:0xA7023C +kpa_61_FlyingMagikoopaAI_50 = 0x80241F4C; // type:func rom:0xA7032C +kpa_61_FlyingMagikoopaAI_Main = 0x80242024; // type:func rom:0xA70404 +kpa_61_FlyingMagikoopaAI_OnHitInit = 0x802422B8; // type:func rom:0xA70698 +kpa_61_FlyingMagikoopaAI_OnHit = 0x802422F0; // type:func rom:0xA706D0 D_80243CD0_A720B0 = 0x80243CD0; // type:data rom:0xA720B0 D_80243D30_A72110 = 0x80243D30; // type:data rom:0xA72110 D_80243D38_A72118 = 0x80243D38; // type:data rom:0xA72118 @@ -15595,7 +15564,7 @@ kpa_70_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA74B80 kpa_70_UnkDistFunc = 0x8024038C; // type:func rom:0xA74BFC kpa_70_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA74D30 kpa_70_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xA74E94 -kpa_70_UnkNpcAIMainFunc5 = 0x802406A4; // type:func rom:0xA74F14 +kpa_70_TackleAI_Main = 0x802406A4; // type:func rom:0xA74F14 D_80243BF0_A78460 = 0x80243BF0; // type:data rom:0xA78460 func_80240000_A784C0 = 0x80240000; // type:func rom:0xA784C0 kpa_81_GetNpcCollisionHeight = 0x80240050; // type:func rom:0xA78510 @@ -15623,23 +15592,23 @@ func_80240000_A83490 = 0x80240000; // type:func rom:0xA83490 func_80240050_A834E0 = 0x80240050; // type:func rom:0xA834E0 D_802432F0_A86780 = 0x802432F0; // type:data rom:0xA86780 D_80243300_A86790 = 0x80243300; // type:data rom:0xA86790 -kpa_91_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xA86A50 -kpa_91_UnkFunc13 = 0x80240158; // type:func rom:0xA86BA8 -kpa_91_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xA86E50 -kpa_91_UnkFunc14 = 0x802404C0; // type:func rom:0xA86F10 -kpa_91_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xA870CC -kpa_91_NpcJumpFunc2 = 0x80240730; // type:func rom:0xA87180 -kpa_91_NpcJumpFunc = 0x802407A4; // type:func rom:0xA871F4 -kpa_91_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xA8726C -kpa_91_UnkFunc15 = 0x8024094C; // type:func rom:0xA8739C -kpa_91_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xA874BC -kpa_91_UnkFunc16 = 0x80240AD4; // type:func rom:0xA87524 -kpa_91_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xA875E4 +kpa_91_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xA86A50 +kpa_91_PatrolAI_Move = 0x80240158; // type:func rom:0xA86BA8 +kpa_91_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xA86E50 +kpa_91_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xA86F10 +kpa_91_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xA870CC +kpa_91_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xA87180 +kpa_91_PatrolAI_Jump = 0x802407A4; // type:func rom:0xA871F4 +kpa_91_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xA8726C +kpa_91_PatrolAI_Chase = 0x8024094C; // type:func rom:0xA8739C +kpa_91_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xA874BC +kpa_91_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xA87524 +kpa_91_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xA875E4 kpa_91_set_script_owner_npc_anim = 0x80240E90; // type:func rom:0xA878E0 kpa_91_UnkDistFunc = 0x80240F0C; // type:func rom:0xA8795C kpa_91_UnkNpcAIFunc12 = 0x80241040; // type:func rom:0xA87A90 kpa_91_set_script_owner_npc_col_height = 0x802411A4; // type:func rom:0xA87BF4 -kpa_91_UnkNpcAIMainFunc8 = 0x80241224; // type:func rom:0xA87C74 +kpa_91_KoopaPatrolAI_Main = 0x80241224; // type:func rom:0xA87C74 kpa_91_ToadHouse_DisableStatusMenu = 0x80241528; // type:func rom:0xA87F78 kpa_91_ToadHouse_ShowStatusMenu = 0x80241548; // type:func rom:0xA87F98 kpa_91_ToadHouse_UpdateScreenOverlay = 0x80241570; // type:func rom:0xA87FC0 @@ -15659,23 +15628,23 @@ D_80245A38_A8C488 = 0x80245A38; // type:data rom:0xA8C488 D_80245BD0_A8C620 = 0x80245BD0; // type:data rom:0xA8C620 kpa_95_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA8CA80 kpa_95_GetEntityPosition = 0x80240034; // type:func rom:0xA8CAB4 -kpa_95_UnkNpcAIFunc24 = 0x802400E0; // type:func rom:0xA8CB60 -kpa_95_UnkFunc13 = 0x80240238; // type:func rom:0xA8CCB8 -kpa_95_UnkNpcAIFunc1 = 0x802404E0; // type:func rom:0xA8CF60 -kpa_95_UnkFunc14 = 0x802405A0; // type:func rom:0xA8D020 -kpa_95_UnkNpcAIFunc25 = 0x8024075C; // type:func rom:0xA8D1DC -kpa_95_NpcJumpFunc2 = 0x80240810; // type:func rom:0xA8D290 -kpa_95_NpcJumpFunc = 0x80240884; // type:func rom:0xA8D304 -kpa_95_UnkNpcAIFunc13 = 0x802408FC; // type:func rom:0xA8D37C -kpa_95_UnkFunc15 = 0x80240A2C; // type:func rom:0xA8D4AC -kpa_95_UnkNpcDurationFlagFunc = 0x80240B4C; // type:func rom:0xA8D5CC -kpa_95_UnkFunc16 = 0x80240BB4; // type:func rom:0xA8D634 -kpa_95_UnkNpcAIMainFunc = 0x80240C74; // type:func rom:0xA8D6F4 +kpa_95_PatrolAI_MoveInit = 0x802400E0; // type:func rom:0xA8CB60 +kpa_95_PatrolAI_Move = 0x80240238; // type:func rom:0xA8CCB8 +kpa_95_PatrolAI_LoiterInit = 0x802404E0; // type:func rom:0xA8CF60 +kpa_95_PatrolAI_Loiter = 0x802405A0; // type:func rom:0xA8D020 +kpa_95_PatrolAI_PostLoiter = 0x8024075C; // type:func rom:0xA8D1DC +kpa_95_PatrolAI_JumpInit = 0x80240810; // type:func rom:0xA8D290 +kpa_95_PatrolAI_Jump = 0x80240884; // type:func rom:0xA8D304 +kpa_95_PatrolAI_ChaseInit = 0x802408FC; // type:func rom:0xA8D37C +kpa_95_PatrolAI_Chase = 0x80240A2C; // type:func rom:0xA8D4AC +kpa_95_PatrolAI_LosePlayer = 0x80240B4C; // type:func rom:0xA8D5CC +kpa_95_PatrolNoAttackAI_15 = 0x80240BB4; // type:func rom:0xA8D634 +kpa_95_PatrolNoAttackAI_Main = 0x80240C74; // type:func rom:0xA8D6F4 kpa_95_set_script_owner_npc_anim = 0x80240F70; // type:func rom:0xA8D9F0 kpa_95_UnkDistFunc = 0x80240FEC; // type:func rom:0xA8DA6C kpa_95_UnkNpcAIFunc12 = 0x80241120; // type:func rom:0xA8DBA0 kpa_95_set_script_owner_npc_col_height = 0x80241284; // type:func rom:0xA8DD04 -kpa_95_UnkNpcAIMainFunc8 = 0x80241304; // type:func rom:0xA8DD84 +kpa_95_KoopaPatrolAI_Main = 0x80241304; // type:func rom:0xA8DD84 kpa_95_ToadHouse_DisableStatusMenu = 0x80241608; // type:func rom:0xA8E088 kpa_95_ToadHouse_ShowStatusMenu = 0x80241628; // type:func rom:0xA8E0A8 kpa_95_ToadHouse_UpdateScreenOverlay = 0x80241650; // type:func rom:0xA8E0D0 @@ -15700,37 +15669,37 @@ D_802402D0_A93710 = 0x802402D0; // type:data rom:0xA93710 D_802402E0_A93720 = 0x802402E0; // type:data rom:0xA93720 kpa_102_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA93740 kpa_102_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA93864 -kpa_102_UnkFunc61 = 0x80240310; // type:func rom:0xA93A50 +kpa_102_ProjectileHitbox_GetUsableProjectileID = 0x80240310; // type:func rom:0xA93A50 kpa_102_UnkNpcAIFunc48 = 0x80240500; // type:func rom:0xA93C40 -kpa_102_UnkNpcAIFunc49 = 0x80240644; // type:func rom:0xA93D84 -kpa_102_UnkSetDurationFunc = 0x80240744; // type:func rom:0xA93E84 -kpa_102_UnkNpcAIFunc9 = 0x80240788; // type:func rom:0xA93EC8 -kpa_102_UnkDurationCheckNoArgs = 0x80240828; // type:func rom:0xA93F68 -kpa_102_UnkFunc54 = 0x8024086C; // type:func rom:0xA93FAC -kpa_102_UnkFunc55 = 0x80240DA8; // type:func rom:0xA944E8 -kpa_102_UnkNpcAIMainFunc7 = 0x80241204; // type:func rom:0xA94944 +kpa_102_ProjectileHitbox_30 = 0x80240644; // type:func rom:0xA93D84 +kpa_102_ProjectileHitbox_31 = 0x80240744; // type:func rom:0xA93E84 +kpa_102_ProjectileHitbox_32 = 0x80240788; // type:func rom:0xA93EC8 +kpa_102_ProjectileHitbox_33 = 0x80240828; // type:func rom:0xA93F68 +kpa_102_ProjectileAI_Main = 0x8024086C; // type:func rom:0xA93FAC +kpa_102_ProjectileAI_Reflect = 0x80240DA8; // type:func rom:0xA944E8 +kpa_102_RangedAttackAI_Main = 0x80241204; // type:func rom:0xA94944 kpa_102_GetEncounterEnemyIsOwner = 0x80241524; // type:func rom:0xA94C64 kpa_102_set_script_owner_npc_anim = 0x8024155C; // type:func rom:0xA94C9C kpa_102_UnkDistFunc = 0x802415D8; // type:func rom:0xA94D18 kpa_102_UnkNpcAIFunc12 = 0x8024170C; // type:func rom:0xA94E4C kpa_102_set_script_owner_npc_col_height = 0x80241870; // type:func rom:0xA94FB0 -kpa_102_UnkNpcAIMainFunc5 = 0x802418F0; // type:func rom:0xA95030 -kpa_102_UnkNpcAIFunc47 = 0x80241D30; // type:func rom:0xA95470 -kpa_102_UnkFunc57 = 0x80241F00; // type:func rom:0xA95640 -func_80242410_A95B50 = 0x80242410; // type:func rom:0xA95B50 -func_8024244C_A95B8C = 0x8024244C; // type:func rom:0xA95B8C -func_802425D8_A95D18 = 0x802425D8; // type:func rom:0xA95D18 -func_802429C8_A96108 = 0x802429C8; // type:func rom:0xA96108 -func_80242ABC_A961FC = 0x80242ABC; // type:func rom:0xA961FC -func_80242D00_A96440 = 0x80242D00; // type:func rom:0xA96440 -func_80242D3C_A9647C = 0x80242D3C; // type:func rom:0xA9647C -func_80242F08_A96648 = 0x80242F08; // type:func rom:0xA96648 -func_80242F74_A966B4 = 0x80242F74; // type:func rom:0xA966B4 -func_802430A8_A967E8 = 0x802430A8; // type:func rom:0xA967E8 -func_80243198_A968D8 = 0x80243198; // type:func rom:0xA968D8 -func_80243270_A969B0 = 0x80243270; // type:func rom:0xA969B0 -dup_kpa_102_GetEncounterEnemyIsOwner = 0x80243504; // type:func rom:0xA96C44 -func_8024353C_A96C7C = 0x8024353C; // type:func rom:0xA96C7C +kpa_102_TackleAI_Main = 0x802418F0; // type:func rom:0xA95030 +kpa_102_MagikoopaAI_CanShootSpell = 0x80241D30; // type:func rom:0xA95470 +kpa_102_MagikoopaAI_SpellMain = 0x80241F00; // type:func rom:0xA95640 +kpa_102_FlyingMagikoopaAI_10 = 0x80242410; // type:func rom:0xA95B50 +kpa_102_FlyingMagikoopaAI_11 = 0x8024244C; // type:func rom:0xA95B8C +kpa_102_FlyingMagikoopaAI_15 = 0x802425D8; // type:func rom:0xA95D18 +kpa_102_FlyingMagikoopaAI_16 = 0x802429C8; // type:func rom:0xA96108 +kpa_102_FlyingMagikoopaAI_17 = 0x80242ABC; // type:func rom:0xA961FC +kpa_102_FlyingMagikoopaAI_20 = 0x80242D00; // type:func rom:0xA96440 +kpa_102_FlyingMagikoopaAI_21 = 0x80242D3C; // type:func rom:0xA9647C +kpa_102_FlyingMagikoopaAI_22 = 0x80242F08; // type:func rom:0xA96648 +kpa_102_FlyingMagikoopaAI_23 = 0x80242F74; // type:func rom:0xA966B4 +kpa_102_FlyingMagikoopaAI_24 = 0x802430A8; // type:func rom:0xA967E8 +kpa_102_FlyingMagikoopaAI_50 = 0x80243198; // type:func rom:0xA968D8 +kpa_102_FlyingMagikoopaAI_Main = 0x80243270; // type:func rom:0xA969B0 +kpa_102_FlyingMagikoopaAI_OnHitInit = 0x80243504; // type:func rom:0xA96C44 +kpa_102_FlyingMagikoopaAI_OnHit = 0x8024353C; // type:func rom:0xA96C7C D_80245B20_A99260 = 0x80245B20; // type:data rom:0xA99260 D_80245B28_A99268 = 0x80245B28; // type:data rom:0xA99268 D_80245B30_A99270 = 0x80245B30; // type:data rom:0xA99270 @@ -15749,15 +15718,15 @@ D_80245D90_A994D0 = 0x80245D90; // type:data rom:0xA994D0 D_80245D98_A994D8 = 0x80245D98; // type:data rom:0xA994D8 kpa_111_UnkFunc11 = 0x80240000; // type:func rom:0xA99590 kpa_111_UnkFunc12 = 0x802400BC; // type:func rom:0xA9964C -kpa_111_UnkFunc61 = 0x80240170; // type:func rom:0xA99700 +kpa_111_ProjectileHitbox_GetUsableProjectileID = 0x80240170; // type:func rom:0xA99700 kpa_111_UnkNpcAIFunc48 = 0x80240360; // type:func rom:0xA998F0 -kpa_111_UnkNpcAIFunc49 = 0x802404A4; // type:func rom:0xA99A34 -kpa_111_UnkSetDurationFunc = 0x802405A4; // type:func rom:0xA99B34 -kpa_111_UnkNpcAIFunc9 = 0x802405E8; // type:func rom:0xA99B78 -kpa_111_UnkDurationCheckNoArgs = 0x80240688; // type:func rom:0xA99C18 -kpa_111_UnkFunc54 = 0x802406CC; // type:func rom:0xA99C5C -kpa_111_UnkFunc55 = 0x80240C08; // type:func rom:0xA9A198 -kpa_111_UnkNpcAIMainFunc7 = 0x80241064; // type:func rom:0xA9A5F4 +kpa_111_ProjectileHitbox_30 = 0x802404A4; // type:func rom:0xA99A34 +kpa_111_ProjectileHitbox_31 = 0x802405A4; // type:func rom:0xA99B34 +kpa_111_ProjectileHitbox_32 = 0x802405E8; // type:func rom:0xA99B78 +kpa_111_ProjectileHitbox_33 = 0x80240688; // type:func rom:0xA99C18 +kpa_111_ProjectileAI_Main = 0x802406CC; // type:func rom:0xA99C5C +kpa_111_ProjectileAI_Reflect = 0x80240C08; // type:func rom:0xA9A198 +kpa_111_RangedAttackAI_Main = 0x80241064; // type:func rom:0xA9A5F4 kpa_111_GetEncounterEnemyIsOwner = 0x80241384; // type:func rom:0xA9A914 D_80243240_A9C7D0 = 0x80243240; // type:data rom:0xA9C7D0 D_80243248_A9C7D8 = 0x80243248; // type:data rom:0xA9C7D8 @@ -15771,7 +15740,7 @@ kpa_113_set_script_owner_npc_anim = 0x802401B0; // type:func rom:0xA9CDE0 kpa_113_UnkDistFunc = 0x8024022C; // type:func rom:0xA9CE5C kpa_113_UnkNpcAIFunc12 = 0x80240360; // type:func rom:0xA9CF90 kpa_113_set_script_owner_npc_col_height = 0x802404C4; // type:func rom:0xA9D0F4 -kpa_113_UnkNpcAIMainFunc5 = 0x80240544; // type:func rom:0xA9D174 +kpa_113_TackleAI_Main = 0x80240544; // type:func rom:0xA9D174 kpa_113_func_80240814_97BE44 = 0x80240984; // type:func rom:0xA9D5B4 kpa_113_AwaitPlayerNearNpc = 0x802409CC; // type:func rom:0xA9D5FC kpa_113_func_802408B4_97BEE4 = 0x80240A24; // type:func rom:0xA9D654 @@ -15781,24 +15750,24 @@ D_80240390_A9ED10 = 0x80240390; // type:data rom:0xA9ED10 D_802403A0_A9ED20 = 0x802403A0; // type:data rom:0xA9ED20 kpa_115_UnkFunc11 = 0x80240000; // type:func rom:0xA9ED40 kpa_115_UnkFunc12 = 0x802400BC; // type:func rom:0xA9EDFC -kpa_115_UnkFunc61 = 0x80240170; // type:func rom:0xA9EEB0 +kpa_115_ProjectileHitbox_GetUsableProjectileID = 0x80240170; // type:func rom:0xA9EEB0 kpa_115_UnkNpcAIFunc48 = 0x80240360; // type:func rom:0xA9F0A0 -kpa_115_UnkNpcAIFunc49 = 0x802404A4; // type:func rom:0xA9F1E4 -kpa_115_UnkSetDurationFunc = 0x802405A4; // type:func rom:0xA9F2E4 -kpa_115_UnkNpcAIFunc9 = 0x802405E8; // type:func rom:0xA9F328 -kpa_115_UnkDurationCheckNoArgs = 0x80240688; // type:func rom:0xA9F3C8 -kpa_115_UnkFunc54 = 0x802406CC; // type:func rom:0xA9F40C -kpa_115_UnkFunc55 = 0x80240C08; // type:func rom:0xA9F948 -kpa_115_UnkNpcAIMainFunc7 = 0x80241064; // type:func rom:0xA9FDA4 +kpa_115_ProjectileHitbox_30 = 0x802404A4; // type:func rom:0xA9F1E4 +kpa_115_ProjectileHitbox_31 = 0x802405A4; // type:func rom:0xA9F2E4 +kpa_115_ProjectileHitbox_32 = 0x802405E8; // type:func rom:0xA9F328 +kpa_115_ProjectileHitbox_33 = 0x80240688; // type:func rom:0xA9F3C8 +kpa_115_ProjectileAI_Main = 0x802406CC; // type:func rom:0xA9F40C +kpa_115_ProjectileAI_Reflect = 0x80240C08; // type:func rom:0xA9F948 +kpa_115_RangedAttackAI_Main = 0x80241064; // type:func rom:0xA9FDA4 kpa_115_GetEncounterEnemyIsOwner = 0x80241384; // type:func rom:0xAA00C4 D_80242FE0_AA1D20 = 0x80242FE0; // type:data rom:0xAA1D20 D_80242FE8_AA1D28 = 0x80242FE8; // type:data rom:0xAA1D28 D_80242FF0_AA1D30 = 0x80242FF0; // type:data rom:0xAA1D30 D_80242FF8_AA1D38 = 0x80242FF8; // type:data rom:0xAA1D38 D_80243000_AA1D40 = 0x80243000; // type:data rom:0xAA1D40 -func_80240000_AA2D20 = 0x80240000; // type:func rom:0xAA2D20 -kpa_130_BulletBill_Think = 0x80240048; // type:func rom:0xAA2D68 -func_802404AC_AA31CC = 0x802404AC; // type:func rom:0xAA31CC +kpa_130_BillBlasterAI_GetIdleBulletNpcID = 0x80240000; // type:func rom:0xAA2D20 +kpa_130_BulletBillAI_Main = 0x80240048; // type:func rom:0xAA2D68 +kpa_130_BillBlasterAI_Main = 0x802404AC; // type:func rom:0xAA31CC D_80244750_AA7470 = 0x80244750; // type:data rom:0xAA7470 D_80244758_AA7478 = 0x80244758; // type:data rom:0xAA7478 kpa_133_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xAA7480 @@ -15833,10 +15802,10 @@ osr_01_AddPlayerHandsOffset = 0x802404D4; // type:func rom:0xAB04C4 func_802406A4_AB0694 = 0x802406A4; // type:func rom:0xAB0694 func_802406F8_AB06E8 = 0x802406F8; // type:func rom:0xAB06E8 func_80240730_AB0720 = 0x80240730; // type:func rom:0xAB0720 -osr_01_SetManyVars = 0x802407CC; // type:func rom:0xAB07BC -osr_01_UnkYawFunc = 0x802408BC; // type:func rom:0xAB08AC -func_80240A48_AB0A38 = 0x80240A48; // type:func rom:0xAB0A38 -func_80240A8C_AB0A7C = 0x80240A8C; // type:func rom:0xAB0A7C +osr_01_LetterDelivery_Init = 0x802407CC; // type:func rom:0xAB07BC +osr_01_LetterDelivery_CalcLetterPos = 0x802408BC; // type:func rom:0xAB08AC +osr_01_LetterDelivery_SaveNpcAnim = 0x80240A48; // type:func rom:0xAB0A38 +osr_01_LetterDelivery_RestoreNpcAnim = 0x80240A8C; // type:func rom:0xAB0A7C osr_01_varStash = 0x802411B8; // type:data rom:0xAB11A8 D_8024121C_AB120C = 0x8024121C; // type:data rom:0xAB120C D_80241220_AB1210 = 0x80241220; // type:data rom:0xAB1210 @@ -15859,35 +15828,35 @@ D_80241FB0_ABB260 = 0x80241FB0; // type:data rom:0xABB260 D_80241FC0_ABB270 = 0x80241FC0; // type:data rom:0xABB270 func_80240000_ABB290 = 0x80240000; // type:func rom:0xABB290 func_80240040_ABB2D0 = 0x80240040; // type:func rom:0xABB2D0 -kkj_00_UnkNpcAIFunc24 = 0x802400B0; // type:func rom:0xABB340 -kkj_00_UnkFunc13 = 0x80240208; // type:func rom:0xABB498 -kkj_00_UnkNpcAIFunc1 = 0x802404B0; // type:func rom:0xABB740 -kkj_00_UnkFunc14 = 0x80240570; // type:func rom:0xABB800 -kkj_00_UnkNpcAIFunc25 = 0x8024072C; // type:func rom:0xABB9BC -kkj_00_NpcJumpFunc2 = 0x802407E0; // type:func rom:0xABBA70 -kkj_00_NpcJumpFunc = 0x80240854; // type:func rom:0xABBAE4 -kkj_00_UnkNpcAIFunc13 = 0x802408CC; // type:func rom:0xABBB5C -kkj_00_UnkFunc15 = 0x802409FC; // type:func rom:0xABBC8C -kkj_00_UnkNpcDurationFlagFunc = 0x80240B1C; // type:func rom:0xABBDAC -kkj_00_UnkFunc16 = 0x80240B84; // type:func rom:0xABBE14 -kkj_00_UnkNpcAIMainFunc = 0x80240C44; // type:func rom:0xABBED4 +kkj_00_PatrolAI_MoveInit = 0x802400B0; // type:func rom:0xABB340 +kkj_00_PatrolAI_Move = 0x80240208; // type:func rom:0xABB498 +kkj_00_PatrolAI_LoiterInit = 0x802404B0; // type:func rom:0xABB740 +kkj_00_PatrolAI_Loiter = 0x80240570; // type:func rom:0xABB800 +kkj_00_PatrolAI_PostLoiter = 0x8024072C; // type:func rom:0xABB9BC +kkj_00_PatrolAI_JumpInit = 0x802407E0; // type:func rom:0xABBA70 +kkj_00_PatrolAI_Jump = 0x80240854; // type:func rom:0xABBAE4 +kkj_00_PatrolAI_ChaseInit = 0x802408CC; // type:func rom:0xABBB5C +kkj_00_PatrolAI_Chase = 0x802409FC; // type:func rom:0xABBC8C +kkj_00_PatrolAI_LosePlayer = 0x80240B1C; // type:func rom:0xABBDAC +kkj_00_PatrolNoAttackAI_15 = 0x80240B84; // type:func rom:0xABBE14 +kkj_00_PatrolNoAttackAI_Main = 0x80240C44; // type:func rom:0xABBED4 func_80240F40_ABC1D0 = 0x80240F40; // type:func rom:0xABC1D0 D_8024160C_ABC89C = 0x8024160C; // type:data rom:0xABC89C D_8024162C_ABC8BC = 0x8024162C; // type:data rom:0xABC8BC D_80249D30_AC4FC0 = 0x80249D30; // type:data rom:0xAC4FC0 D_80249D38_AC4FC8 = 0x80249D38; // type:data rom:0xAC4FC8 -kkj_01_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xAC5170 -kkj_01_UnkFunc13 = 0x80240158; // type:func rom:0xAC52C8 -kkj_01_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xAC5570 -kkj_01_UnkFunc14 = 0x802404C0; // type:func rom:0xAC5630 -kkj_01_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xAC57EC -kkj_01_NpcJumpFunc2 = 0x80240730; // type:func rom:0xAC58A0 -kkj_01_NpcJumpFunc = 0x802407A4; // type:func rom:0xAC5914 -kkj_01_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xAC598C -kkj_01_UnkFunc15 = 0x8024094C; // type:func rom:0xAC5ABC -kkj_01_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xAC5BDC -kkj_01_UnkFunc16 = 0x80240AD4; // type:func rom:0xAC5C44 -kkj_01_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xAC5D04 +kkj_01_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xAC5170 +kkj_01_PatrolAI_Move = 0x80240158; // type:func rom:0xAC52C8 +kkj_01_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xAC5570 +kkj_01_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xAC5630 +kkj_01_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xAC57EC +kkj_01_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xAC58A0 +kkj_01_PatrolAI_Jump = 0x802407A4; // type:func rom:0xAC5914 +kkj_01_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xAC598C +kkj_01_PatrolAI_Chase = 0x8024094C; // type:func rom:0xAC5ABC +kkj_01_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xAC5BDC +kkj_01_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xAC5C44 +kkj_01_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xAC5D04 D_80243A10_AC8B80 = 0x80243A10; // type:data rom:0xAC8B80 D_80243A18_AC8B88 = 0x80243A18; // type:data rom:0xAC8B88 kkj_03_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xAC9710 @@ -16148,7 +16117,7 @@ D_80242D00_B20460 = 0x80242D00; // type:data rom:0xB20460 jan_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB20540 jan_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB20664 func_8024030C_B2084C = 0x8024030C; // type:func rom:0xB2084C -func_80240340_B20880 = 0x80240340; // type:func rom:0xB20880 +jan_00_HeartPlant_SpawnHeart = 0x80240340; // type:func rom:0xB20880 jan_00_StashVars = 0x802403F4; // type:func rom:0xB20934 jan_00_GetItemName = 0x802404A8; // type:func rom:0xB209E8 jan_00_GetNpcCollisionHeight = 0x8024050C; // type:func rom:0xB20A4C @@ -16156,10 +16125,10 @@ jan_00_AddPlayerHandsOffset = 0x80240568; // type:func rom:0xB20AA8 func_80240738_B20C78 = 0x80240738; // type:func rom:0xB20C78 func_8024078C_B20CCC = 0x8024078C; // type:func rom:0xB20CCC func_802407C4_B20D04 = 0x802407C4; // type:func rom:0xB20D04 -jan_00_SetManyVars = 0x80240860; // type:func rom:0xB20DA0 -jan_00_UnkYawFunc = 0x80240950; // type:func rom:0xB20E90 -func_80240ADC_B2101C = 0x80240ADC; // type:func rom:0xB2101C -func_80240B20_B21060 = 0x80240B20; // type:func rom:0xB21060 +jan_00_LetterDelivery_Init = 0x80240860; // type:func rom:0xB20DA0 +jan_00_LetterDelivery_CalcLetterPos = 0x80240950; // type:func rom:0xB20E90 +jan_00_LetterDelivery_SaveNpcAnim = 0x80240ADC; // type:func rom:0xB2101C +jan_00_LetterDelivery_RestoreNpcAnim = 0x80240B20; // type:func rom:0xB21060 func_80240B4C_B2108C = 0x80240B4C; // type:func rom:0xB2108C func_80240CF8_B21238 = 0x80240CF8; // type:func rom:0xB21238 func_80240F14_B21454 = 0x80240F14; // type:func rom:0xB21454 @@ -16182,14 +16151,14 @@ D_80245958_B25E98 = 0x80245958; // type:data rom:0xB25E98 jan_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB28030 jan_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB28154 func_8024030C_B2833C = 0x8024030C; // type:func rom:0xB2833C -jan_01_UnkNpcAIFunc36 = 0x80240340; // type:func rom:0xB28370 -jan_01_UnkNpcAIFunc37 = 0x80240570; // type:func rom:0xB285A0 -jan_01_UnkNpcAIFunc1 = 0x802408A8; // type:func rom:0xB288D8 -jan_01_UnkNpcAIFunc38 = 0x80240968; // type:func rom:0xB28998 -jan_01_UnkNpcAIFunc15 = 0x80240B0C; // type:func rom:0xB28B3C -jan_01_UnkNpcAIFunc39 = 0x80240BEC; // type:func rom:0xB28C1C -jan_01_UnkDurationCheck = 0x80240EEC; // type:func rom:0xB28F1C -jan_01_UnkNpcAIMainFunc2 = 0x80240F30; // type:func rom:0xB28F60 +jan_01_HoppingAI_HopInit = 0x80240340; // type:func rom:0xB28370 +jan_01_HoppingAI_Hop = 0x80240570; // type:func rom:0xB285A0 +jan_01_HoppingAI_LoiterInit = 0x802408A8; // type:func rom:0xB288D8 +jan_01_HoppingAI_Loiter = 0x80240968; // type:func rom:0xB28998 +jan_01_HoppingAI_ChaseInit = 0x80240B0C; // type:func rom:0xB28B3C +jan_01_HoppingAI_Chase = 0x80240BEC; // type:func rom:0xB28C1C +jan_01_HoppingAI_LosePlayer = 0x80240EEC; // type:func rom:0xB28F1C +jan_01_HoppingAI_Main = 0x80240F30; // type:func rom:0xB28F60 jan_01_SetCamera0Flag1000 = 0x80241154; // type:func rom:0xB29184 jan_01_UnsetCamera0Flag1000 = 0x80241170; // type:func rom:0xB291A0 jan_01_foliage_setup_shear_mtx = 0x80241190; // type:func rom:0xB291C0 @@ -16201,18 +16170,18 @@ jan_02_UpdateTexturePanStepped = 0x80240154; // type:func rom:0xB2C5C4 func_8024033C_B2C7AC = 0x8024033C; // type:func rom:0xB2C7AC func_80240360_B2C7D0 = 0x80240360; // type:func rom:0xB2C7D0 func_802403F8_B2C868 = 0x802403F8; // type:func rom:0xB2C868 -jan_02_UnkNpcAIFunc24 = 0x80240430; // type:func rom:0xB2C8A0 -jan_02_UnkFunc13 = 0x80240588; // type:func rom:0xB2C9F8 -jan_02_UnkNpcAIFunc1 = 0x80240830; // type:func rom:0xB2CCA0 -jan_02_UnkFunc14 = 0x802408F0; // type:func rom:0xB2CD60 -jan_02_UnkNpcAIFunc25 = 0x80240AAC; // type:func rom:0xB2CF1C -jan_02_NpcJumpFunc2 = 0x80240B60; // type:func rom:0xB2CFD0 -jan_02_NpcJumpFunc = 0x80240BD4; // type:func rom:0xB2D044 -jan_02_UnkNpcAIFunc13 = 0x80240C4C; // type:func rom:0xB2D0BC -jan_02_UnkFunc15 = 0x80240D7C; // type:func rom:0xB2D1EC -jan_02_UnkNpcDurationFlagFunc = 0x80240E9C; // type:func rom:0xB2D30C -jan_02_UnkFunc16 = 0x80240F04; // type:func rom:0xB2D374 -jan_02_UnkNpcAIMainFunc = 0x80240FC4; // type:func rom:0xB2D434 +jan_02_PatrolAI_MoveInit = 0x80240430; // type:func rom:0xB2C8A0 +jan_02_PatrolAI_Move = 0x80240588; // type:func rom:0xB2C9F8 +jan_02_PatrolAI_LoiterInit = 0x80240830; // type:func rom:0xB2CCA0 +jan_02_PatrolAI_Loiter = 0x802408F0; // type:func rom:0xB2CD60 +jan_02_PatrolAI_PostLoiter = 0x80240AAC; // type:func rom:0xB2CF1C +jan_02_PatrolAI_JumpInit = 0x80240B60; // type:func rom:0xB2CFD0 +jan_02_PatrolAI_Jump = 0x80240BD4; // type:func rom:0xB2D044 +jan_02_PatrolAI_ChaseInit = 0x80240C4C; // type:func rom:0xB2D0BC +jan_02_PatrolAI_Chase = 0x80240D7C; // type:func rom:0xB2D1EC +jan_02_PatrolAI_LosePlayer = 0x80240E9C; // type:func rom:0xB2D30C +jan_02_PatrolNoAttackAI_15 = 0x80240F04; // type:func rom:0xB2D374 +jan_02_PatrolNoAttackAI_Main = 0x80240FC4; // type:func rom:0xB2D434 jan_02_GetNpcCollisionHeight = 0x802412C0; // type:func rom:0xB2D730 jan_02_AddPlayerHandsOffset = 0x8024131C; // type:func rom:0xB2D78C func_802414EC_B2D95C = 0x802414EC; // type:func rom:0xB2D95C @@ -16265,18 +16234,18 @@ jan_03_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xB34E0C jan_03_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xB34EB0 jan_03_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xB34FD4 func_802405EC_B351BC = 0x802405EC; // type:func rom:0xB351BC -jan_03_UnkNpcAIFunc24 = 0x80240620; // type:func rom:0xB351F0 -jan_03_UnkFunc13 = 0x80240778; // type:func rom:0xB35348 -jan_03_UnkNpcAIFunc1 = 0x80240A20; // type:func rom:0xB355F0 -jan_03_UnkFunc14 = 0x80240AE0; // type:func rom:0xB356B0 -jan_03_UnkNpcAIFunc25 = 0x80240C9C; // type:func rom:0xB3586C -jan_03_NpcJumpFunc2 = 0x80240D50; // type:func rom:0xB35920 -jan_03_NpcJumpFunc = 0x80240DC4; // type:func rom:0xB35994 -jan_03_UnkNpcAIFunc13 = 0x80240E3C; // type:func rom:0xB35A0C -jan_03_UnkFunc15 = 0x80240F6C; // type:func rom:0xB35B3C -jan_03_UnkNpcDurationFlagFunc = 0x8024108C; // type:func rom:0xB35C5C -jan_03_UnkFunc16 = 0x802410F4; // type:func rom:0xB35CC4 -jan_03_UnkNpcAIMainFunc = 0x802411B4; // type:func rom:0xB35D84 +jan_03_PatrolAI_MoveInit = 0x80240620; // type:func rom:0xB351F0 +jan_03_PatrolAI_Move = 0x80240778; // type:func rom:0xB35348 +jan_03_PatrolAI_LoiterInit = 0x80240A20; // type:func rom:0xB355F0 +jan_03_PatrolAI_Loiter = 0x80240AE0; // type:func rom:0xB356B0 +jan_03_PatrolAI_PostLoiter = 0x80240C9C; // type:func rom:0xB3586C +jan_03_PatrolAI_JumpInit = 0x80240D50; // type:func rom:0xB35920 +jan_03_PatrolAI_Jump = 0x80240DC4; // type:func rom:0xB35994 +jan_03_PatrolAI_ChaseInit = 0x80240E3C; // type:func rom:0xB35A0C +jan_03_PatrolAI_Chase = 0x80240F6C; // type:func rom:0xB35B3C +jan_03_PatrolAI_LosePlayer = 0x8024108C; // type:func rom:0xB35C5C +jan_03_PatrolNoAttackAI_15 = 0x802410F4; // type:func rom:0xB35CC4 +jan_03_PatrolNoAttackAI_Main = 0x802411B4; // type:func rom:0xB35D84 jan_03_ToadHouse_DisableStatusMenu = 0x802414B0; // type:func rom:0xB36080 jan_03_ToadHouse_ShowStatusMenu = 0x802414D0; // type:func rom:0xB360A0 jan_03_ToadHouse_UpdateScreenOverlay = 0x802414F8; // type:func rom:0xB360C8 @@ -16322,10 +16291,10 @@ jan_03_Quizmo_SpinPartner = 0x80242A1C; // type:func rom:0xB375EC jan_03_Quizmo_UpdatePartnerPosition = 0x80242AAC; // type:func rom:0xB3767C jan_03_Quizmo_CreateReactionEffect = 0x80242B94; // type:func rom:0xB37764 jan_03_Quizmo_CreateWorker = 0x80242C00; // type:func rom:0xB377D0 -jan_03_SetManyVars = 0x80242C30; // type:func rom:0xB37800 -jan_03_UnkYawFunc = 0x80242D20; // type:func rom:0xB378F0 -func_80242EAC_B37A7C = 0x80242EAC; // type:func rom:0xB37A7C -func_80242EF0_B37AC0 = 0x80242EF0; // type:func rom:0xB37AC0 +jan_03_LetterDelivery_Init = 0x80242C30; // type:func rom:0xB37800 +jan_03_LetterDelivery_CalcLetterPos = 0x80242D20; // type:func rom:0xB378F0 +jan_03_LetterDelivery_SaveNpcAnim = 0x80242EAC; // type:func rom:0xB37A7C +jan_03_LetterDelivery_RestoreNpcAnim = 0x80242EF0; // type:func rom:0xB37AC0 func_80242F1C_B37AEC = 0x80242F1C; // type:func rom:0xB37AEC func_80242FA0_B37B70 = 0x80242FA0; // type:func rom:0xB37B70 jan_03_foliage_setup_shear_mtx = 0x80243050; // type:func rom:0xB37C20 @@ -16368,25 +16337,25 @@ jan_05_foliage_setup_shear_mtx = 0x802404A0; // type:func rom:0xB4AF10 jan_05_TransformFoliage = 0x80240510; // type:func rom:0xB4AF80 func_802406DC_B4B14C = 0x802406DC; // type:func rom:0xB4B14C func_80240738_B4B1A8 = 0x80240738; // type:func rom:0xB4B1A8 -func_802407F0_B4B260 = 0x802407F0; // type:func rom:0xB4B260 -jan_05_UnkNpcAIFunc36 = 0x802408A4; // type:func rom:0xB4B314 -jan_05_UnkNpcAIFunc37 = 0x80240AD4; // type:func rom:0xB4B544 -jan_05_UnkNpcAIFunc1 = 0x80240E0C; // type:func rom:0xB4B87C -jan_05_UnkNpcAIFunc38 = 0x80240ECC; // type:func rom:0xB4B93C -jan_05_UnkNpcAIFunc15 = 0x80241070; // type:func rom:0xB4BAE0 -jan_05_UnkNpcAIFunc39 = 0x80241150; // type:func rom:0xB4BBC0 -jan_05_UnkDurationCheck = 0x80241450; // type:func rom:0xB4BEC0 -jan_05_UnkNpcAIMainFunc2 = 0x80241494; // type:func rom:0xB4BF04 -jan_05_UnkNpcAIFunc4 = 0x802416B8; // type:func rom:0xB4C128 -jan_05_UnkNpcAIFunc29 = 0x80241708; // type:func rom:0xB4C178 -jan_05_UnkNpcAIFunc6 = 0x802418CC; // type:func rom:0xB4C33C -jan_05_UnkNpcAIFunc7 = 0x80241938; // type:func rom:0xB4C3A8 -jan_05_UnkNpcAIFunc8 = 0x802419A8; // type:func rom:0xB4C418 -jan_05_UnkNpcAIFunc5 = 0x80241A80; // type:func rom:0xB4C4F0 -jan_05_UnkNpcAIFunc26 = 0x80241AD4; // type:func rom:0xB4C544 -jan_05_UnkFunc7 = 0x80241C88; // type:func rom:0xB4C6F8 -jan_05_UnkNpcAIFunc27 = 0x80241EE8; // type:func rom:0xB4C958 -jan_05_UnkNpcAIFunc28 = 0x8024219C; // type:func rom:0xB4CC0C +jan_05_HeartPlant_SpawnHeart = 0x802407F0; // type:func rom:0xB4B260 +jan_05_HoppingAI_HopInit = 0x802408A4; // type:func rom:0xB4B314 +jan_05_HoppingAI_Hop = 0x80240AD4; // type:func rom:0xB4B544 +jan_05_HoppingAI_LoiterInit = 0x80240E0C; // type:func rom:0xB4B87C +jan_05_HoppingAI_Loiter = 0x80240ECC; // type:func rom:0xB4B93C +jan_05_HoppingAI_ChaseInit = 0x80241070; // type:func rom:0xB4BAE0 +jan_05_HoppingAI_Chase = 0x80241150; // type:func rom:0xB4BBC0 +jan_05_HoppingAI_LosePlayer = 0x80241450; // type:func rom:0xB4BEC0 +jan_05_HoppingAI_Main = 0x80241494; // type:func rom:0xB4BF04 +jan_05_SpearGuyAI_LoiterInit = 0x802416B8; // type:func rom:0xB4C128 +jan_05_SpearGuyAI_Loiter = 0x80241708; // type:func rom:0xB4C178 +jan_05_MeleeHitbox_30 = 0x802418CC; // type:func rom:0xB4C33C +jan_05_MeleeHitbox_31 = 0x80241938; // type:func rom:0xB4C3A8 +jan_05_MeleeHitbox_32 = 0x802419A8; // type:func rom:0xB4C418 +jan_05_MeleeHitbox_33 = 0x80241A80; // type:func rom:0xB4C4F0 +jan_05_MeleeHitbox_CanSeePlayer = 0x80241AD4; // type:func rom:0xB4C544 +jan_05_MeleeHitbox_Main = 0x80241C88; // type:func rom:0xB4C6F8 +jan_05_WanderMeleeAI_Main = 0x80241EE8; // type:func rom:0xB4C958 +jan_05_SpearGuyAI_Main = 0x8024219C; // type:func rom:0xB4CC0C dup_jan_05_foliage_setup_shear_mtx = 0x80242450; // type:func rom:0xB4CEC0 dup_jan_05_TransformFoliage = 0x802424C0; // type:func rom:0xB4CF30 func_8024268C_B4D0FC = 0x8024268C; // type:func rom:0xB4D0FC @@ -16399,39 +16368,39 @@ func_80240310_B52B40 = 0x80240310; // type:func rom:0xB52B40 func_802403B0_B52BE0 = 0x802403B0; // type:func rom:0xB52BE0 jan_06_foliage_setup_shear_mtx = 0x80240500; // type:func rom:0xB52D30 jan_06_TransformFoliage = 0x80240570; // type:func rom:0xB52DA0 -jan_06_UnkNpcAIFunc36 = 0x80240740; // type:func rom:0xB52F70 -jan_06_UnkNpcAIFunc37 = 0x80240970; // type:func rom:0xB531A0 -jan_06_UnkNpcAIFunc1 = 0x80240CA8; // type:func rom:0xB534D8 -jan_06_UnkNpcAIFunc38 = 0x80240D68; // type:func rom:0xB53598 -jan_06_UnkNpcAIFunc15 = 0x80240F0C; // type:func rom:0xB5373C -jan_06_UnkNpcAIFunc39 = 0x80240FEC; // type:func rom:0xB5381C -jan_06_UnkDurationCheck = 0x802412EC; // type:func rom:0xB53B1C -jan_06_UnkNpcAIMainFunc2 = 0x80241330; // type:func rom:0xB53B60 -func_80241554_B53D84 = 0x80241554; // type:func rom:0xB53D84 -jan_06_UnkNpcAIFunc4 = 0x80241608; // type:func rom:0xB53E38 -jan_06_UnkNpcAIFunc29 = 0x80241658; // type:func rom:0xB53E88 -jan_06_UnkNpcAIFunc6 = 0x8024181C; // type:func rom:0xB5404C -jan_06_UnkNpcAIFunc7 = 0x80241888; // type:func rom:0xB540B8 -jan_06_UnkNpcAIFunc8 = 0x802418F8; // type:func rom:0xB54128 -jan_06_UnkNpcAIFunc5 = 0x802419D0; // type:func rom:0xB54200 -jan_06_UnkNpcAIFunc26 = 0x80241A24; // type:func rom:0xB54254 -jan_06_UnkFunc7 = 0x80241BD8; // type:func rom:0xB54408 -jan_06_UnkNpcAIFunc27 = 0x80241E38; // type:func rom:0xB54668 -jan_06_UnkNpcAIFunc28 = 0x802420EC; // type:func rom:0xB5491C +jan_06_HoppingAI_HopInit = 0x80240740; // type:func rom:0xB52F70 +jan_06_HoppingAI_Hop = 0x80240970; // type:func rom:0xB531A0 +jan_06_HoppingAI_LoiterInit = 0x80240CA8; // type:func rom:0xB534D8 +jan_06_HoppingAI_Loiter = 0x80240D68; // type:func rom:0xB53598 +jan_06_HoppingAI_ChaseInit = 0x80240F0C; // type:func rom:0xB5373C +jan_06_HoppingAI_Chase = 0x80240FEC; // type:func rom:0xB5381C +jan_06_HoppingAI_LosePlayer = 0x802412EC; // type:func rom:0xB53B1C +jan_06_HoppingAI_Main = 0x80241330; // type:func rom:0xB53B60 +jan_06_HeartPlant_SpawnHeart = 0x80241554; // type:func rom:0xB53D84 +jan_06_SpearGuyAI_LoiterInit = 0x80241608; // type:func rom:0xB53E38 +jan_06_SpearGuyAI_Loiter = 0x80241658; // type:func rom:0xB53E88 +jan_06_MeleeHitbox_30 = 0x8024181C; // type:func rom:0xB5404C +jan_06_MeleeHitbox_31 = 0x80241888; // type:func rom:0xB540B8 +jan_06_MeleeHitbox_32 = 0x802418F8; // type:func rom:0xB54128 +jan_06_MeleeHitbox_33 = 0x802419D0; // type:func rom:0xB54200 +jan_06_MeleeHitbox_CanSeePlayer = 0x80241A24; // type:func rom:0xB54254 +jan_06_MeleeHitbox_Main = 0x80241BD8; // type:func rom:0xB54408 +jan_06_WanderMeleeAI_Main = 0x80241E38; // type:func rom:0xB54668 +jan_06_SpearGuyAI_Main = 0x802420EC; // type:func rom:0xB5491C dup_jan_06_foliage_setup_shear_mtx = 0x802423A0; // type:func rom:0xB54BD0 dup_jan_06_TransformFoliage = 0x80242410; // type:func rom:0xB54C40 D_80246CB0_B594E0 = 0x80246CB0; // type:data rom:0xB594E0 D_80246D10_B59540 = 0x80246D10; // type:data rom:0xB59540 -jan_07_UnkNpcAIFunc4 = 0x80240000; // type:func rom:0xB59870 -jan_07_UnkNpcAIFunc29 = 0x80240050; // type:func rom:0xB598C0 -jan_07_UnkNpcAIFunc6 = 0x80240214; // type:func rom:0xB59A84 -jan_07_UnkNpcAIFunc7 = 0x80240280; // type:func rom:0xB59AF0 -jan_07_UnkNpcAIFunc8 = 0x802402F0; // type:func rom:0xB59B60 -jan_07_UnkNpcAIFunc5 = 0x802403C8; // type:func rom:0xB59C38 -jan_07_UnkNpcAIFunc26 = 0x8024041C; // type:func rom:0xB59C8C -jan_07_UnkFunc7 = 0x802405D0; // type:func rom:0xB59E40 -jan_07_UnkNpcAIFunc27 = 0x80240830; // type:func rom:0xB5A0A0 -jan_07_UnkNpcAIFunc28 = 0x80240AE4; // type:func rom:0xB5A354 +jan_07_SpearGuyAI_LoiterInit = 0x80240000; // type:func rom:0xB59870 +jan_07_SpearGuyAI_Loiter = 0x80240050; // type:func rom:0xB598C0 +jan_07_MeleeHitbox_30 = 0x80240214; // type:func rom:0xB59A84 +jan_07_MeleeHitbox_31 = 0x80240280; // type:func rom:0xB59AF0 +jan_07_MeleeHitbox_32 = 0x802402F0; // type:func rom:0xB59B60 +jan_07_MeleeHitbox_33 = 0x802403C8; // type:func rom:0xB59C38 +jan_07_MeleeHitbox_CanSeePlayer = 0x8024041C; // type:func rom:0xB59C8C +jan_07_MeleeHitbox_Main = 0x802405D0; // type:func rom:0xB59E40 +jan_07_WanderMeleeAI_Main = 0x80240830; // type:func rom:0xB5A0A0 +jan_07_SpearGuyAI_Main = 0x80240AE4; // type:func rom:0xB5A354 jan_07_foliage_setup_shear_mtx = 0x80240DA0; // type:func rom:0xB5A610 jan_07_TransformFoliage = 0x80240E10; // type:func rom:0xB5A680 dup_jan_07_foliage_setup_shear_mtx = 0x80240FE0; // type:func rom:0xB5A850 @@ -16461,17 +16430,17 @@ jan_08_SuperBlock_WhiteScreenFlash = 0x80241198; // type:func rom:0xB5F448 jan_08_SuperBlock_PartnerSparkles2 = 0x802412D8; // type:func rom:0xB5F588 jan_08_SuperBlock_PartnerSparkles4 = 0x80241320; // type:func rom:0xB5F5D0 jan_08_SuperBlock_WaitForPlayerToLand = 0x80241368; // type:func rom:0xB5F618 -func_802413A0_B5F650 = 0x802413A0; // type:func rom:0xB5F650 -jan_08_UnkNpcAIFunc4 = 0x80241454; // type:func rom:0xB5F704 -jan_08_UnkNpcAIFunc29 = 0x802414A4; // type:func rom:0xB5F754 -jan_08_UnkNpcAIFunc6 = 0x80241668; // type:func rom:0xB5F918 -jan_08_UnkNpcAIFunc7 = 0x802416D4; // type:func rom:0xB5F984 -jan_08_UnkNpcAIFunc8 = 0x80241744; // type:func rom:0xB5F9F4 -jan_08_UnkNpcAIFunc5 = 0x8024181C; // type:func rom:0xB5FACC -jan_08_UnkNpcAIFunc26 = 0x80241870; // type:func rom:0xB5FB20 -jan_08_UnkFunc7 = 0x80241A24; // type:func rom:0xB5FCD4 -jan_08_UnkNpcAIFunc27 = 0x80241C84; // type:func rom:0xB5FF34 -jan_08_UnkNpcAIFunc28 = 0x80241F38; // type:func rom:0xB601E8 +jan_08_HeartPlant_SpawnHeart = 0x802413A0; // type:func rom:0xB5F650 +jan_08_SpearGuyAI_LoiterInit = 0x80241454; // type:func rom:0xB5F704 +jan_08_SpearGuyAI_Loiter = 0x802414A4; // type:func rom:0xB5F754 +jan_08_MeleeHitbox_30 = 0x80241668; // type:func rom:0xB5F918 +jan_08_MeleeHitbox_31 = 0x802416D4; // type:func rom:0xB5F984 +jan_08_MeleeHitbox_32 = 0x80241744; // type:func rom:0xB5F9F4 +jan_08_MeleeHitbox_33 = 0x8024181C; // type:func rom:0xB5FACC +jan_08_MeleeHitbox_CanSeePlayer = 0x80241870; // type:func rom:0xB5FB20 +jan_08_MeleeHitbox_Main = 0x80241A24; // type:func rom:0xB5FCD4 +jan_08_WanderMeleeAI_Main = 0x80241C84; // type:func rom:0xB5FF34 +jan_08_SpearGuyAI_Main = 0x80241F38; // type:func rom:0xB601E8 dup_jan_08_foliage_setup_shear_mtx = 0x802421F0; // type:func rom:0xB604A0 dup_jan_08_TransformFoliage = 0x80242260; // type:func rom:0xB60510 jan_08_SuperBlock_CantUpgradeMessages = 0x80243E00; // type:data rom:0xB620B0 @@ -16492,30 +16461,30 @@ jan_09_foliage_setup_shear_mtx = 0x802405F0; // type:func rom:0xB660A0 jan_09_TransformFoliage = 0x80240660; // type:func rom:0xB66110 func_8024082C_B662DC = 0x8024082C; // type:func rom:0xB662DC func_80240888_B66338 = 0x80240888; // type:func rom:0xB66338 -jan_09_UnkNpcAIFunc4 = 0x80240940; // type:func rom:0xB663F0 -jan_09_UnkNpcAIFunc29 = 0x80240990; // type:func rom:0xB66440 -jan_09_UnkNpcAIFunc6 = 0x80240B54; // type:func rom:0xB66604 -jan_09_UnkNpcAIFunc7 = 0x80240BC0; // type:func rom:0xB66670 -jan_09_UnkNpcAIFunc8 = 0x80240C30; // type:func rom:0xB666E0 -jan_09_UnkNpcAIFunc5 = 0x80240D08; // type:func rom:0xB667B8 -jan_09_UnkNpcAIFunc26 = 0x80240D5C; // type:func rom:0xB6680C -jan_09_UnkFunc7 = 0x80240F10; // type:func rom:0xB669C0 -jan_09_UnkNpcAIFunc27 = 0x80241170; // type:func rom:0xB66C20 -jan_09_UnkNpcAIFunc28 = 0x80241424; // type:func rom:0xB66ED4 +jan_09_SpearGuyAI_LoiterInit = 0x80240940; // type:func rom:0xB663F0 +jan_09_SpearGuyAI_Loiter = 0x80240990; // type:func rom:0xB66440 +jan_09_MeleeHitbox_30 = 0x80240B54; // type:func rom:0xB66604 +jan_09_MeleeHitbox_31 = 0x80240BC0; // type:func rom:0xB66670 +jan_09_MeleeHitbox_32 = 0x80240C30; // type:func rom:0xB666E0 +jan_09_MeleeHitbox_33 = 0x80240D08; // type:func rom:0xB667B8 +jan_09_MeleeHitbox_CanSeePlayer = 0x80240D5C; // type:func rom:0xB6680C +jan_09_MeleeHitbox_Main = 0x80240F10; // type:func rom:0xB669C0 +jan_09_WanderMeleeAI_Main = 0x80241170; // type:func rom:0xB66C20 +jan_09_SpearGuyAI_Main = 0x80241424; // type:func rom:0xB66ED4 dup_jan_09_foliage_setup_shear_mtx = 0x802416E0; // type:func rom:0xB67190 dup_jan_09_TransformFoliage = 0x80241750; // type:func rom:0xB67200 D_80246590_B6C040 = 0x80246590; // type:data rom:0xB6C040 D_802465B8_B6C068 = 0x802465B8; // type:data rom:0xB6C068 jan_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB6C390 jan_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB6C4B4 -jan_10_UnkNpcAIFunc36 = 0x80240310; // type:func rom:0xB6C6A0 -jan_10_UnkNpcAIFunc37 = 0x80240540; // type:func rom:0xB6C8D0 -jan_10_UnkNpcAIFunc1 = 0x80240878; // type:func rom:0xB6CC08 -jan_10_UnkNpcAIFunc38 = 0x80240938; // type:func rom:0xB6CCC8 -jan_10_UnkNpcAIFunc15 = 0x80240ADC; // type:func rom:0xB6CE6C -jan_10_UnkNpcAIFunc39 = 0x80240BBC; // type:func rom:0xB6CF4C -jan_10_UnkDurationCheck = 0x80240EBC; // type:func rom:0xB6D24C -jan_10_UnkNpcAIMainFunc2 = 0x80240F00; // type:func rom:0xB6D290 +jan_10_HoppingAI_HopInit = 0x80240310; // type:func rom:0xB6C6A0 +jan_10_HoppingAI_Hop = 0x80240540; // type:func rom:0xB6C8D0 +jan_10_HoppingAI_LoiterInit = 0x80240878; // type:func rom:0xB6CC08 +jan_10_HoppingAI_Loiter = 0x80240938; // type:func rom:0xB6CCC8 +jan_10_HoppingAI_ChaseInit = 0x80240ADC; // type:func rom:0xB6CE6C +jan_10_HoppingAI_Chase = 0x80240BBC; // type:func rom:0xB6CF4C +jan_10_HoppingAI_LosePlayer = 0x80240EBC; // type:func rom:0xB6D24C +jan_10_HoppingAI_Main = 0x80240F00; // type:func rom:0xB6D290 func_80241130_B6D4C0 = 0x80241130; // type:func rom:0xB6D4C0 jan_10_foliage_setup_shear_mtx = 0x80241280; // type:func rom:0xB6D610 jan_10_TransformFoliage = 0x802412F0; // type:func rom:0xB6D680 @@ -16533,22 +16502,22 @@ jan_11_Pipe_GetPointAheadOfPlayer = 0x80240394; // type:func rom:0xB70BF4 jan_11_UnkPosFunc2 = 0x80240438; // type:func rom:0xB70C98 jan_11_GetFloorCollider = 0x802407B0; // type:func rom:0xB71010 func_802407DC_B7103C = 0x802407DC; // type:func rom:0xB7103C -func_80240000_B730B0 = 0x80240000; // type:func rom:0xB730B0 -func_802400F8_B731A8 = 0x802400F8; // type:func rom:0xB731A8 -func_80240170_B73220 = 0x80240170; // type:func rom:0xB73220 -func_802401CC_B7327C = 0x802401CC; // type:func rom:0xB7327C +jan_12_PullVine_WaitForPlayerGrab = 0x80240000; // type:func rom:0xB730B0 +jan_12_PullVine_UpdatePosition = 0x802400F8; // type:func rom:0xB731A8 +jan_12_PullVine_apply_shear_mtx = 0x80240170; // type:func rom:0xB73220 +jan_12_PullVine_ShearBushModel = 0x802401CC; // type:func rom:0xB7327C jan_12_foliage_setup_shear_mtx = 0x80240280; // type:func rom:0xB73330 jan_12_TransformFoliage = 0x802402F0; // type:func rom:0xB733A0 -jan_12_UnkNpcAIFunc4 = 0x802404C0; // type:func rom:0xB73570 -jan_12_UnkNpcAIFunc29 = 0x80240510; // type:func rom:0xB735C0 -jan_12_UnkNpcAIFunc6 = 0x802406D4; // type:func rom:0xB73784 -jan_12_UnkNpcAIFunc7 = 0x80240740; // type:func rom:0xB737F0 -jan_12_UnkNpcAIFunc8 = 0x802407B0; // type:func rom:0xB73860 -jan_12_UnkNpcAIFunc5 = 0x80240888; // type:func rom:0xB73938 -jan_12_UnkNpcAIFunc26 = 0x802408DC; // type:func rom:0xB7398C -jan_12_UnkFunc7 = 0x80240A90; // type:func rom:0xB73B40 -jan_12_UnkNpcAIFunc27 = 0x80240CF0; // type:func rom:0xB73DA0 -jan_12_UnkNpcAIFunc28 = 0x80240FA4; // type:func rom:0xB74054 +jan_12_SpearGuyAI_LoiterInit = 0x802404C0; // type:func rom:0xB73570 +jan_12_SpearGuyAI_Loiter = 0x80240510; // type:func rom:0xB735C0 +jan_12_MeleeHitbox_30 = 0x802406D4; // type:func rom:0xB73784 +jan_12_MeleeHitbox_31 = 0x80240740; // type:func rom:0xB737F0 +jan_12_MeleeHitbox_32 = 0x802407B0; // type:func rom:0xB73860 +jan_12_MeleeHitbox_33 = 0x80240888; // type:func rom:0xB73938 +jan_12_MeleeHitbox_CanSeePlayer = 0x802408DC; // type:func rom:0xB7398C +jan_12_MeleeHitbox_Main = 0x80240A90; // type:func rom:0xB73B40 +jan_12_WanderMeleeAI_Main = 0x80240CF0; // type:func rom:0xB73DA0 +jan_12_SpearGuyAI_Main = 0x80240FA4; // type:func rom:0xB74054 D_802433B0_B76460 = 0x802433B0; // type:data rom:0xB76460 D_802433D8_B76488 = 0x802433D8; // type:data rom:0xB76488 func_80240000_B767B0 = 0x80240000; // type:func rom:0xB767B0 @@ -16562,23 +16531,23 @@ D_80243880_B7A030 = 0x80243880; // type:data rom:0xB7A030 D_80243888_B7A038 = 0x80243888; // type:data rom:0xB7A038 D_80243890_B7A040 = 0x80243890; // type:data rom:0xB7A040 D_80243898_B7A048 = 0x80243898; // type:data rom:0xB7A048 -func_80240000_B7A050 = 0x80240000; // type:func rom:0xB7A050 -func_802400F8_B7A148 = 0x802400F8; // type:func rom:0xB7A148 -func_80240170_B7A1C0 = 0x80240170; // type:func rom:0xB7A1C0 -func_802401CC_B7A21C = 0x802401CC; // type:func rom:0xB7A21C +jan_14_PullVine_WaitForPlayerGrab = 0x80240000; // type:func rom:0xB7A050 +jan_14_PullVine_UpdatePosition = 0x802400F8; // type:func rom:0xB7A148 +jan_14_PullVine_apply_shear_mtx = 0x80240170; // type:func rom:0xB7A1C0 +jan_14_PullVine_ShearBushModel = 0x802401CC; // type:func rom:0xB7A21C jan_14_foliage_setup_shear_mtx = 0x80240280; // type:func rom:0xB7A2D0 jan_14_TransformFoliage = 0x802402F0; // type:func rom:0xB7A340 -jan_14_UnkNpcAIFunc36 = 0x802404C0; // type:func rom:0xB7A510 -jan_14_UnkNpcAIFunc37 = 0x802406F0; // type:func rom:0xB7A740 -jan_14_UnkNpcAIFunc1 = 0x80240A28; // type:func rom:0xB7AA78 -jan_14_UnkNpcAIFunc38 = 0x80240AE8; // type:func rom:0xB7AB38 -jan_14_UnkNpcAIFunc15 = 0x80240C8C; // type:func rom:0xB7ACDC -jan_14_UnkNpcAIFunc39 = 0x80240D6C; // type:func rom:0xB7ADBC -jan_14_UnkDurationCheck = 0x8024106C; // type:func rom:0xB7B0BC -jan_14_UnkNpcAIMainFunc2 = 0x802410B0; // type:func rom:0xB7B100 +jan_14_HoppingAI_HopInit = 0x802404C0; // type:func rom:0xB7A510 +jan_14_HoppingAI_Hop = 0x802406F0; // type:func rom:0xB7A740 +jan_14_HoppingAI_LoiterInit = 0x80240A28; // type:func rom:0xB7AA78 +jan_14_HoppingAI_Loiter = 0x80240AE8; // type:func rom:0xB7AB38 +jan_14_HoppingAI_ChaseInit = 0x80240C8C; // type:func rom:0xB7ACDC +jan_14_HoppingAI_Chase = 0x80240D6C; // type:func rom:0xB7ADBC +jan_14_HoppingAI_LosePlayer = 0x8024106C; // type:func rom:0xB7B0BC +jan_14_HoppingAI_Main = 0x802410B0; // type:func rom:0xB7B100 D_80243870_B7D8C0 = 0x80243870; // type:data rom:0xB7D8C0 D_80243880_B7D8D0 = 0x80243880; // type:data rom:0xB7D8D0 -func_80240000_B7D920 = 0x80240000; // type:func rom:0xB7D920 +jan_15_HeartPlant_SpawnHeart = 0x80240000; // type:func rom:0xB7D920 jan_15_foliage_setup_shear_mtx = 0x802400C0; // type:func rom:0xB7D9E0 jan_15_TransformFoliage = 0x80240130; // type:func rom:0xB7DA50 jan_16_UnkFunc27 = 0x80240000; // type:func rom:0xB80000 @@ -16587,18 +16556,18 @@ jan_16_foliage_setup_shear_mtx = 0x80240300; // type:func rom:0xB80300 jan_16_TransformFoliage = 0x80240370; // type:func rom:0xB80370 func_80240000_B837C0 = 0x80240000; // type:func rom:0xB837C0 func_80240000_B83E60 = 0x80240000; // type:func rom:0xB83E60 -jan_22_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xB84180 -jan_22_UnkFunc13 = 0x80240158; // type:func rom:0xB842D8 -jan_22_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xB84580 -jan_22_UnkFunc14 = 0x802404C0; // type:func rom:0xB84640 -jan_22_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xB847FC -jan_22_NpcJumpFunc2 = 0x80240730; // type:func rom:0xB848B0 -jan_22_NpcJumpFunc = 0x802407A4; // type:func rom:0xB84924 -jan_22_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xB8499C -jan_22_UnkFunc15 = 0x8024094C; // type:func rom:0xB84ACC -jan_22_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xB84BEC -jan_22_UnkFunc16 = 0x80240AD4; // type:func rom:0xB84C54 -jan_22_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xB84D14 +jan_22_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xB84180 +jan_22_PatrolAI_Move = 0x80240158; // type:func rom:0xB842D8 +jan_22_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xB84580 +jan_22_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xB84640 +jan_22_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xB847FC +jan_22_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xB848B0 +jan_22_PatrolAI_Jump = 0x802407A4; // type:func rom:0xB84924 +jan_22_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xB8499C +jan_22_PatrolAI_Chase = 0x8024094C; // type:func rom:0xB84ACC +jan_22_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xB84BEC +jan_22_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xB84C54 +jan_22_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xB84D14 jan_22_StashVars = 0x80240E90; // type:func rom:0xB85010 jan_22_GetItemName = 0x80240F44; // type:func rom:0xB850C4 jan_22_SetCamera0Flag1000 = 0x80240FA8; // type:func rom:0xB85128 @@ -16621,21 +16590,21 @@ D_8024BB40_B8FCC0 = 0x8024BB40; // type:data rom:0xB8FCC0 mim_01_SetForeverForestFog = 0x80240000; // type:func rom:0xB93440 func_80240070_B934B0 = 0x80240070; // type:func rom:0xB934B0 func_802403F0_B93830 = 0x802403F0; // type:func rom:0xB93830 -mim_01_UnkNpcAIFunc6 = 0x80240500; // type:func rom:0xB93940 -mim_01_UnkNpcAIFunc7 = 0x8024056C; // type:func rom:0xB939AC -mim_01_UnkNpcAIFunc8 = 0x802405DC; // type:func rom:0xB93A1C -mim_01_UnkNpcAIFunc5 = 0x802406B4; // type:func rom:0xB93AF4 -mim_01_UnkNpcAIFunc26 = 0x80240708; // type:func rom:0xB93B48 -mim_01_UnkFunc7 = 0x802408BC; // type:func rom:0xB93CFC -mim_01_UnkNpcAIFunc27 = 0x80240B1C; // type:func rom:0xB93F5C -mim_01_UnkNpcAIFunc31 = 0x80240DD0; // type:func rom:0xB94210 -mim_01_UnkNpcAIFunc32 = 0x80240E3C; // type:func rom:0xB9427C -mim_01_UnkNpcAIFunc46 = 0x80240F38; // type:func rom:0xB94378 -mim_01_UnkNpcDurationFlagFunc3 = 0x80241978; // type:func rom:0xB94DB8 -mim_01_UnkNpcAIFunc33 = 0x80241A08; // type:func rom:0xB94E48 -mim_01_UnkNpcDurationFlagFunc2 = 0x80241B08; // type:func rom:0xB94F48 -mim_01_UnkNpcAIFunc30 = 0x80241B68; // type:func rom:0xB94FA8 -func_80241C54_B95094 = 0x80241C54; // type:func rom:0xB95094 +mim_01_MeleeHitbox_30 = 0x80240500; // type:func rom:0xB93940 +mim_01_MeleeHitbox_31 = 0x8024056C; // type:func rom:0xB939AC +mim_01_MeleeHitbox_32 = 0x802405DC; // type:func rom:0xB93A1C +mim_01_MeleeHitbox_33 = 0x802406B4; // type:func rom:0xB93AF4 +mim_01_MeleeHitbox_CanSeePlayer = 0x80240708; // type:func rom:0xB93B48 +mim_01_MeleeHitbox_Main = 0x802408BC; // type:func rom:0xB93CFC +mim_01_WanderMeleeAI_Main = 0x80240B1C; // type:func rom:0xB93F5C +mim_01_PiranhaPlantAI_00 = 0x80240DD0; // type:func rom:0xB94210 +mim_01_PiranhaPlantAI_01 = 0x80240E3C; // type:func rom:0xB9427C +mim_01_PiranhaPlantAI_10 = 0x80240F38; // type:func rom:0xB94378 +mim_01_PiranhaPlantAI_11 = 0x80241978; // type:func rom:0xB94DB8 +mim_01_PiranhaPlantAI_12 = 0x80241A08; // type:func rom:0xB94E48 +mim_01_PiranhaPlantAI_13 = 0x80241B08; // type:func rom:0xB94F48 +mim_01_PiranhaPlantAI_14 = 0x80241B68; // type:func rom:0xB94FA8 +mim_01_PiranhaPlantAI_Main = 0x80241C54; // type:func rom:0xB95094 D_802445F0_B97A30 = 0x802445F0; // type:data rom:0xB97A30 D_80244788_B97BC8 = 0x80244788; // type:data rom:0xB97BC8 D_80244790_B97BD0 = 0x80244790; // type:data rom:0xB97BD0 @@ -16644,14 +16613,14 @@ D_802447A0_B97BE0 = 0x802447A0; // type:data rom:0xB97BE0 D_802447A8_B97BE8 = 0x802447A8; // type:data rom:0xB97BE8 D_802447B0_B97BF0 = 0x802447B0; // type:data rom:0xB97BF0 mim_02_SetForeverForestFog = 0x80240000; // type:func rom:0xB97C00 -mim_02_UnkNpcAIFunc36 = 0x80240070; // type:func rom:0xB97C70 -mim_02_UnkNpcAIFunc37 = 0x802402A0; // type:func rom:0xB97EA0 -mim_02_UnkNpcAIFunc1 = 0x802405D8; // type:func rom:0xB981D8 -mim_02_UnkNpcAIFunc38 = 0x80240698; // type:func rom:0xB98298 -mim_02_UnkNpcAIFunc15 = 0x8024083C; // type:func rom:0xB9843C -mim_02_UnkNpcAIFunc39 = 0x8024091C; // type:func rom:0xB9851C -mim_02_UnkDurationCheck = 0x80240C1C; // type:func rom:0xB9881C -mim_02_UnkNpcAIMainFunc2 = 0x80240C60; // type:func rom:0xB98860 +mim_02_HoppingAI_HopInit = 0x80240070; // type:func rom:0xB97C70 +mim_02_HoppingAI_Hop = 0x802402A0; // type:func rom:0xB97EA0 +mim_02_HoppingAI_LoiterInit = 0x802405D8; // type:func rom:0xB981D8 +mim_02_HoppingAI_Loiter = 0x80240698; // type:func rom:0xB98298 +mim_02_HoppingAI_ChaseInit = 0x8024083C; // type:func rom:0xB9843C +mim_02_HoppingAI_Chase = 0x8024091C; // type:func rom:0xB9851C +mim_02_HoppingAI_LosePlayer = 0x80240C1C; // type:func rom:0xB9881C +mim_02_HoppingAI_Main = 0x80240C60; // type:func rom:0xB98860 mim_02_GetNpcCollisionHeight = 0x80240E84; // type:func rom:0xB98A84 mim_02_AddPlayerHandsOffset = 0x80240EE0; // type:func rom:0xB98AE0 func_802410B0_B98CB0 = 0x802410B0; // type:func rom:0xB98CB0 @@ -16667,14 +16636,14 @@ func_80240420_B9B8A0 = 0x80240420; // type:func rom:0xB9B8A0 mim_04_SetForeverForestFog = 0x80240000; // type:func rom:0xB9D960 func_80240070_B9D9D0 = 0x80240070; // type:func rom:0xB9D9D0 func_802401DC_B9DB3C = 0x802401DC; // type:func rom:0xB9DB3C -mim_04_UnkNpcAIFunc36 = 0x80240200; // type:func rom:0xB9DB60 -mim_04_UnkNpcAIFunc37 = 0x80240430; // type:func rom:0xB9DD90 -mim_04_UnkNpcAIFunc1 = 0x80240768; // type:func rom:0xB9E0C8 -mim_04_UnkNpcAIFunc38 = 0x80240828; // type:func rom:0xB9E188 -mim_04_UnkNpcAIFunc15 = 0x802409CC; // type:func rom:0xB9E32C -mim_04_UnkNpcAIFunc39 = 0x80240AAC; // type:func rom:0xB9E40C -mim_04_UnkDurationCheck = 0x80240DAC; // type:func rom:0xB9E70C -mim_04_UnkNpcAIMainFunc2 = 0x80240DF0; // type:func rom:0xB9E750 +mim_04_HoppingAI_HopInit = 0x80240200; // type:func rom:0xB9DB60 +mim_04_HoppingAI_Hop = 0x80240430; // type:func rom:0xB9DD90 +mim_04_HoppingAI_LoiterInit = 0x80240768; // type:func rom:0xB9E0C8 +mim_04_HoppingAI_Loiter = 0x80240828; // type:func rom:0xB9E188 +mim_04_HoppingAI_ChaseInit = 0x802409CC; // type:func rom:0xB9E32C +mim_04_HoppingAI_Chase = 0x80240AAC; // type:func rom:0xB9E40C +mim_04_HoppingAI_LosePlayer = 0x80240DAC; // type:func rom:0xB9E70C +mim_04_HoppingAI_Main = 0x80240DF0; // type:func rom:0xB9E750 mim_04_StashVars = 0x80241014; // type:func rom:0xB9E974 mim_04_GetItemName = 0x802410C8; // type:func rom:0xB9EA28 D_80241530_B9EE90 = 0x80241530; // type:data rom:0xB9EE90 @@ -16684,21 +16653,21 @@ D_8024153B_B9EE9B = 0x8024153B; // type:data rom:0xB9EE9B mim_04_varStash = 0x80242614; // type:data rom:0xB9FF74 D_80242D80_BA06E0 = 0x80242D80; // type:data rom:0xBA06E0 mim_05_SetForeverForestFog = 0x80240000; // type:func rom:0xBA0730 -mim_05_UnkNpcAIFunc6 = 0x80240070; // type:func rom:0xBA07A0 -mim_05_UnkNpcAIFunc7 = 0x802400DC; // type:func rom:0xBA080C -mim_05_UnkNpcAIFunc8 = 0x8024014C; // type:func rom:0xBA087C -mim_05_UnkNpcAIFunc5 = 0x80240224; // type:func rom:0xBA0954 -mim_05_UnkNpcAIFunc26 = 0x80240278; // type:func rom:0xBA09A8 -mim_05_UnkFunc7 = 0x8024042C; // type:func rom:0xBA0B5C -mim_05_UnkNpcAIFunc27 = 0x8024068C; // type:func rom:0xBA0DBC -mim_05_UnkNpcAIFunc31 = 0x80240940; // type:func rom:0xBA1070 -mim_05_UnkNpcAIFunc32 = 0x802409AC; // type:func rom:0xBA10DC -mim_05_UnkNpcAIFunc46 = 0x80240AA8; // type:func rom:0xBA11D8 -mim_05_UnkNpcDurationFlagFunc3 = 0x802414E8; // type:func rom:0xBA1C18 -mim_05_UnkNpcAIFunc33 = 0x80241578; // type:func rom:0xBA1CA8 -mim_05_UnkNpcDurationFlagFunc2 = 0x80241678; // type:func rom:0xBA1DA8 -mim_05_UnkNpcAIFunc30 = 0x802416D8; // type:func rom:0xBA1E08 -func_802417C4_BA1EF4 = 0x802417C4; // type:func rom:0xBA1EF4 +mim_05_MeleeHitbox_30 = 0x80240070; // type:func rom:0xBA07A0 +mim_05_MeleeHitbox_31 = 0x802400DC; // type:func rom:0xBA080C +mim_05_MeleeHitbox_32 = 0x8024014C; // type:func rom:0xBA087C +mim_05_MeleeHitbox_33 = 0x80240224; // type:func rom:0xBA0954 +mim_05_MeleeHitbox_CanSeePlayer = 0x80240278; // type:func rom:0xBA09A8 +mim_05_MeleeHitbox_Main = 0x8024042C; // type:func rom:0xBA0B5C +mim_05_WanderMeleeAI_Main = 0x8024068C; // type:func rom:0xBA0DBC +mim_05_PiranhaPlantAI_00 = 0x80240940; // type:func rom:0xBA1070 +mim_05_PiranhaPlantAI_01 = 0x802409AC; // type:func rom:0xBA10DC +mim_05_PiranhaPlantAI_10 = 0x80240AA8; // type:func rom:0xBA11D8 +mim_05_PiranhaPlantAI_11 = 0x802414E8; // type:func rom:0xBA1C18 +mim_05_PiranhaPlantAI_12 = 0x80241578; // type:func rom:0xBA1CA8 +mim_05_PiranhaPlantAI_13 = 0x80241678; // type:func rom:0xBA1DA8 +mim_05_PiranhaPlantAI_14 = 0x802416D8; // type:func rom:0xBA1E08 +mim_05_PiranhaPlantAI_Main = 0x802417C4; // type:func rom:0xBA1EF4 D_80243E80_BA45B0 = 0x80243E80; // type:data rom:0xBA45B0 D_80244018_BA4748 = 0x80244018; // type:data rom:0xBA4748 D_80244020_BA4750 = 0x80244020; // type:data rom:0xBA4750 @@ -16710,29 +16679,29 @@ mim_06_SetForeverForestFog = 0x80240000; // type:func rom:0xBA4780 func_80240070_BA47F0 = 0x80240070; // type:func rom:0xBA47F0 func_802403F0_BA4B70 = 0x802403F0; // type:func rom:0xBA4B70 func_802404F8_BA4C78 = 0x802404F8; // type:func rom:0xBA4C78 -mim_06_UnkNpcAIFunc6 = 0x80240570; // type:func rom:0xBA4CF0 -mim_06_UnkNpcAIFunc7 = 0x802405DC; // type:func rom:0xBA4D5C -mim_06_UnkNpcAIFunc8 = 0x8024064C; // type:func rom:0xBA4DCC -mim_06_UnkNpcAIFunc5 = 0x80240724; // type:func rom:0xBA4EA4 -mim_06_UnkNpcAIFunc26 = 0x80240778; // type:func rom:0xBA4EF8 -mim_06_UnkFunc7 = 0x8024092C; // type:func rom:0xBA50AC -mim_06_UnkNpcAIFunc27 = 0x80240B8C; // type:func rom:0xBA530C -mim_06_UnkNpcAIFunc31 = 0x80240E40; // type:func rom:0xBA55C0 -mim_06_UnkNpcAIFunc32 = 0x80240EAC; // type:func rom:0xBA562C -mim_06_UnkNpcAIFunc46 = 0x80240FA8; // type:func rom:0xBA5728 -mim_06_UnkNpcDurationFlagFunc3 = 0x802419E8; // type:func rom:0xBA6168 -mim_06_UnkNpcAIFunc33 = 0x80241A78; // type:func rom:0xBA61F8 -mim_06_UnkNpcDurationFlagFunc2 = 0x80241B78; // type:func rom:0xBA62F8 -mim_06_UnkNpcAIFunc30 = 0x80241BD8; // type:func rom:0xBA6358 -func_80241CC4_BA6444 = 0x80241CC4; // type:func rom:0xBA6444 -mim_06_UnkNpcAIFunc36 = 0x80241F14; // type:func rom:0xBA6694 -mim_06_UnkNpcAIFunc37 = 0x80242144; // type:func rom:0xBA68C4 -mim_06_UnkNpcAIFunc1 = 0x8024247C; // type:func rom:0xBA6BFC -mim_06_UnkNpcAIFunc38 = 0x8024253C; // type:func rom:0xBA6CBC -mim_06_UnkNpcAIFunc15 = 0x802426E0; // type:func rom:0xBA6E60 -mim_06_UnkNpcAIFunc39 = 0x802427C0; // type:func rom:0xBA6F40 -mim_06_UnkDurationCheck = 0x80242AC0; // type:func rom:0xBA7240 -mim_06_UnkNpcAIMainFunc2 = 0x80242B04; // type:func rom:0xBA7284 +mim_06_MeleeHitbox_30 = 0x80240570; // type:func rom:0xBA4CF0 +mim_06_MeleeHitbox_31 = 0x802405DC; // type:func rom:0xBA4D5C +mim_06_MeleeHitbox_32 = 0x8024064C; // type:func rom:0xBA4DCC +mim_06_MeleeHitbox_33 = 0x80240724; // type:func rom:0xBA4EA4 +mim_06_MeleeHitbox_CanSeePlayer = 0x80240778; // type:func rom:0xBA4EF8 +mim_06_MeleeHitbox_Main = 0x8024092C; // type:func rom:0xBA50AC +mim_06_WanderMeleeAI_Main = 0x80240B8C; // type:func rom:0xBA530C +mim_06_PiranhaPlantAI_00 = 0x80240E40; // type:func rom:0xBA55C0 +mim_06_PiranhaPlantAI_01 = 0x80240EAC; // type:func rom:0xBA562C +mim_06_PiranhaPlantAI_10 = 0x80240FA8; // type:func rom:0xBA5728 +mim_06_PiranhaPlantAI_11 = 0x802419E8; // type:func rom:0xBA6168 +mim_06_PiranhaPlantAI_12 = 0x80241A78; // type:func rom:0xBA61F8 +mim_06_PiranhaPlantAI_13 = 0x80241B78; // type:func rom:0xBA62F8 +mim_06_PiranhaPlantAI_14 = 0x80241BD8; // type:func rom:0xBA6358 +mim_06_PiranhaPlantAI_Main = 0x80241CC4; // type:func rom:0xBA6444 +mim_06_HoppingAI_HopInit = 0x80241F14; // type:func rom:0xBA6694 +mim_06_HoppingAI_Hop = 0x80242144; // type:func rom:0xBA68C4 +mim_06_HoppingAI_LoiterInit = 0x8024247C; // type:func rom:0xBA6BFC +mim_06_HoppingAI_Loiter = 0x8024253C; // type:func rom:0xBA6CBC +mim_06_HoppingAI_ChaseInit = 0x802426E0; // type:func rom:0xBA6E60 +mim_06_HoppingAI_Chase = 0x802427C0; // type:func rom:0xBA6F40 +mim_06_HoppingAI_LosePlayer = 0x80242AC0; // type:func rom:0xBA7240 +mim_06_HoppingAI_Main = 0x80242B04; // type:func rom:0xBA7284 D_802457B0_BA9F30 = 0x802457B0; // type:data rom:0xBA9F30 D_80245948_BAA0C8 = 0x80245948; // type:data rom:0xBAA0C8 D_80245950_BAA0D0 = 0x80245950; // type:data rom:0xBAA0D0 @@ -16745,14 +16714,14 @@ dup_mim_07_SetForeverForestFog = 0x80240000; // type:func rom:0xBAA140 mim_07_SetForeverForestFog = 0x80240070; // type:func rom:0xBAA1B0 func_802400D8_BAA218 = 0x802400D8; // type:func rom:0xBAA218 func_80240244_BAA384 = 0x80240244; // type:func rom:0xBAA384 -mim_07_UnkNpcAIFunc36 = 0x80240270; // type:func rom:0xBAA3B0 -mim_07_UnkNpcAIFunc37 = 0x802404A0; // type:func rom:0xBAA5E0 -mim_07_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0xBAA918 -mim_07_UnkNpcAIFunc38 = 0x80240898; // type:func rom:0xBAA9D8 -mim_07_UnkNpcAIFunc15 = 0x80240A3C; // type:func rom:0xBAAB7C -mim_07_UnkNpcAIFunc39 = 0x80240B1C; // type:func rom:0xBAAC5C -mim_07_UnkDurationCheck = 0x80240E1C; // type:func rom:0xBAAF5C -mim_07_UnkNpcAIMainFunc2 = 0x80240E60; // type:func rom:0xBAAFA0 +mim_07_HoppingAI_HopInit = 0x80240270; // type:func rom:0xBAA3B0 +mim_07_HoppingAI_Hop = 0x802404A0; // type:func rom:0xBAA5E0 +mim_07_HoppingAI_LoiterInit = 0x802407D8; // type:func rom:0xBAA918 +mim_07_HoppingAI_Loiter = 0x80240898; // type:func rom:0xBAA9D8 +mim_07_HoppingAI_ChaseInit = 0x80240A3C; // type:func rom:0xBAAB7C +mim_07_HoppingAI_Chase = 0x80240B1C; // type:func rom:0xBAAC5C +mim_07_HoppingAI_LosePlayer = 0x80240E1C; // type:func rom:0xBAAF5C +mim_07_HoppingAI_Main = 0x80240E60; // type:func rom:0xBAAFA0 D_80241680_BAB7C0 = 0x80241680; // type:data rom:0xBAB7C0 D_80241684_BAB7C4 = 0x80241684; // type:data rom:0xBAB7C4 D_80241688_BAB7C8 = 0x80241688; // type:data rom:0xBAB7C8 @@ -16760,33 +16729,33 @@ D_8024168B_BAB7CB = 0x8024168B; // type:data rom:0xBAB7CB D_802437B0_BAD8F0 = 0x802437B0; // type:data rom:0xBAD8F0 mim_08_SetForeverForestFog = 0x80240000; // type:func rom:0xBAD940 func_80240068_BAD9A8 = 0x80240068; // type:func rom:0xBAD9A8 -mim_08_UnkNpcAIFunc23 = 0x802400A0; // type:func rom:0xBAD9E0 -mim_08_UnkNpcAIFunc35 = 0x80240250; // type:func rom:0xBADB90 -mim_08_UnkNpcAIFunc1_copy = 0x80240878; // type:func rom:0xBAE1B8 -mim_08_UnkFunc4 = 0x80240938; // type:func rom:0xBAE278 -mim_08_UnkNpcAIFunc2 = 0x80240C7C; // type:func rom:0xBAE5BC -mim_08_SixFloatsFunc = 0x80240CF4; // type:func rom:0xBAE634 -mim_08_UnkNpcAIFunc14 = 0x80240D60; // type:func rom:0xBAE6A0 -mim_08_UnkNpcAIFunc3 = 0x80240E94; // type:func rom:0xBAE7D4 -mim_08_UnkFunc6 = 0x80240EF8; // type:func rom:0xBAE838 -mim_08_UnkFunc5 = 0x80241288; // type:func rom:0xBAEBC8 -mim_08_UnkNpcAIMainFunc9 = 0x802413AC; // type:func rom:0xBAECEC -mim_08_UnkNpcAIFunc6 = 0x80241598; // type:func rom:0xBAEED8 -mim_08_UnkNpcAIFunc7 = 0x80241604; // type:func rom:0xBAEF44 -mim_08_UnkNpcAIFunc8 = 0x80241674; // type:func rom:0xBAEFB4 -mim_08_UnkNpcAIFunc5 = 0x8024174C; // type:func rom:0xBAF08C -mim_08_UnkNpcAIFunc26 = 0x802417A0; // type:func rom:0xBAF0E0 -mim_08_UnkFunc7 = 0x80241954; // type:func rom:0xBAF294 -mim_08_UnkNpcAIFunc27 = 0x80241BB4; // type:func rom:0xBAF4F4 -mim_08_UnkNpcAIFunc31 = 0x80241E68; // type:func rom:0xBAF7A8 -mim_08_UnkNpcAIFunc32 = 0x80241ED4; // type:func rom:0xBAF814 -mim_08_UnkNpcAIFunc46 = 0x80241FD0; // type:func rom:0xBAF910 -mim_08_UnkNpcDurationFlagFunc3 = 0x80242A10; // type:func rom:0xBB0350 -mim_08_UnkNpcAIFunc33 = 0x80242AA0; // type:func rom:0xBB03E0 -mim_08_UnkNpcDurationFlagFunc2 = 0x80242BA0; // type:func rom:0xBB04E0 -mim_08_UnkNpcAIFunc30 = 0x80242C00; // type:func rom:0xBB0540 -func_80242CEC_BB062C = 0x80242CEC; // type:func rom:0xBB062C -mim_08_sixFloats = 0x802443C0; // type:data rom:0xBB1D00 +mim_08_FlyingAI_WanderInit = 0x802400A0; // type:func rom:0xBAD9E0 +mim_08_FlyingAI_Wander = 0x80240250; // type:func rom:0xBADB90 +mim_08_FlyingAI_LoiterInit = 0x80240878; // type:func rom:0xBAE1B8 +mim_08_FlyingAI_Loiter = 0x80240938; // type:func rom:0xBAE278 +mim_08_FlyingAI_JumpInit = 0x80240C7C; // type:func rom:0xBAE5BC +mim_08_FlyingAI_Jump = 0x80240CF4; // type:func rom:0xBAE634 +mim_08_FlyingAI_ChaseInit = 0x80240D60; // type:func rom:0xBAE6A0 +mim_08_FlyingAI_Chase = 0x80240E94; // type:func rom:0xBAE7D4 +mim_08_FlyingAI_LosePlayer = 0x80240EF8; // type:func rom:0xBAE838 +mim_08_FlyingAI_Init = 0x80241288; // type:func rom:0xBAEBC8 +mim_08_FlyingAI_Main = 0x802413AC; // type:func rom:0xBAECEC +mim_08_MeleeHitbox_30 = 0x80241598; // type:func rom:0xBAEED8 +mim_08_MeleeHitbox_31 = 0x80241604; // type:func rom:0xBAEF44 +mim_08_MeleeHitbox_32 = 0x80241674; // type:func rom:0xBAEFB4 +mim_08_MeleeHitbox_33 = 0x8024174C; // type:func rom:0xBAF08C +mim_08_MeleeHitbox_CanSeePlayer = 0x802417A0; // type:func rom:0xBAF0E0 +mim_08_MeleeHitbox_Main = 0x80241954; // type:func rom:0xBAF294 +mim_08_WanderMeleeAI_Main = 0x80241BB4; // type:func rom:0xBAF4F4 +mim_08_PiranhaPlantAI_00 = 0x80241E68; // type:func rom:0xBAF7A8 +mim_08_PiranhaPlantAI_01 = 0x80241ED4; // type:func rom:0xBAF814 +mim_08_PiranhaPlantAI_10 = 0x80241FD0; // type:func rom:0xBAF910 +mim_08_PiranhaPlantAI_11 = 0x80242A10; // type:func rom:0xBB0350 +mim_08_PiranhaPlantAI_12 = 0x80242AA0; // type:func rom:0xBB03E0 +mim_08_PiranhaPlantAI_13 = 0x80242BA0; // type:func rom:0xBB04E0 +mim_08_PiranhaPlantAI_14 = 0x80242C00; // type:func rom:0xBB0540 +mim_08_PiranhaPlantAI_Main = 0x80242CEC; // type:func rom:0xBB062C +mim_08_FlyingAI_JumpVels = 0x802443C0; // type:data rom:0xBB1D00 D_802452A0_BB2BE0 = 0x802452A0; // type:data rom:0xBB2BE0 D_802452A8_BB2BE8 = 0x802452A8; // type:data rom:0xBB2BE8 D_802452B0_BB2BF0 = 0x802452B0; // type:data rom:0xBB2BF0 @@ -16799,14 +16768,14 @@ D_802454B0_BB2DF0 = 0x802454B0; // type:data rom:0xBB2DF0 D_802454B8_BB2DF8 = 0x802454B8; // type:data rom:0xBB2DF8 mim_09_SetForeverForestFog = 0x80240000; // type:func rom:0xBB2E00 func_80240068_BB2E68 = 0x80240068; // type:func rom:0xBB2E68 -mim_09_UnkNpcAIFunc36 = 0x802400A0; // type:func rom:0xBB2EA0 -mim_09_UnkNpcAIFunc37 = 0x802402D0; // type:func rom:0xBB30D0 -mim_09_UnkNpcAIFunc1 = 0x80240608; // type:func rom:0xBB3408 -mim_09_UnkNpcAIFunc38 = 0x802406C8; // type:func rom:0xBB34C8 -mim_09_UnkNpcAIFunc15 = 0x8024086C; // type:func rom:0xBB366C -mim_09_UnkNpcAIFunc39 = 0x8024094C; // type:func rom:0xBB374C -mim_09_UnkDurationCheck = 0x80240C4C; // type:func rom:0xBB3A4C -mim_09_UnkNpcAIMainFunc2 = 0x80240C90; // type:func rom:0xBB3A90 +mim_09_HoppingAI_HopInit = 0x802400A0; // type:func rom:0xBB2EA0 +mim_09_HoppingAI_Hop = 0x802402D0; // type:func rom:0xBB30D0 +mim_09_HoppingAI_LoiterInit = 0x80240608; // type:func rom:0xBB3408 +mim_09_HoppingAI_Loiter = 0x802406C8; // type:func rom:0xBB34C8 +mim_09_HoppingAI_ChaseInit = 0x8024086C; // type:func rom:0xBB366C +mim_09_HoppingAI_Chase = 0x8024094C; // type:func rom:0xBB374C +mim_09_HoppingAI_LosePlayer = 0x80240C4C; // type:func rom:0xBB3A4C +mim_09_HoppingAI_Main = 0x80240C90; // type:func rom:0xBB3A90 D_80242B90_BB5990 = 0x80242B90; // type:data rom:0xBB5990 func_80240000_BB59E0 = 0x80240000; // type:func rom:0xBB59E0 func_80240030_BB5A10 = 0x80240030; // type:func rom:0xBB5A10 @@ -16849,10 +16818,10 @@ obk_01_AddPlayerHandsOffset = 0x80240954; // type:func rom:0xBBDAF4 func_80240B24_BBDCC4 = 0x80240B24; // type:func rom:0xBBDCC4 func_80240B78_BBDD18 = 0x80240B78; // type:func rom:0xBBDD18 func_80240BB0_BBDD50 = 0x80240BB0; // type:func rom:0xBBDD50 -obk_01_SetManyVars = 0x80240C4C; // type:func rom:0xBBDDEC -obk_01_UnkYawFunc = 0x80240D3C; // type:func rom:0xBBDEDC -func_80240EC8_BBE068 = 0x80240EC8; // type:func rom:0xBBE068 -func_80240F0C_BBE0AC = 0x80240F0C; // type:func rom:0xBBE0AC +obk_01_LetterDelivery_Init = 0x80240C4C; // type:func rom:0xBBDDEC +obk_01_LetterDelivery_CalcLetterPos = 0x80240D3C; // type:func rom:0xBBDEDC +obk_01_LetterDelivery_SaveNpcAnim = 0x80240EC8; // type:func rom:0xBBE068 +obk_01_LetterDelivery_RestoreNpcAnim = 0x80240F0C; // type:func rom:0xBBE0AC func_80240F38_BBE0D8 = 0x80240F38; // type:func rom:0xBBE0D8 func_80241094_BBE234 = 0x80241094; // type:func rom:0xBBE234 D_80241C58_BBEDF8 = 0x80241C58; // type:data rom:0xBBEDF8 @@ -16874,10 +16843,10 @@ obk_03_AddPlayerHandsOffset = 0x802402E4; // type:func rom:0xBC4564 func_802404B4_BC4734 = 0x802404B4; // type:func rom:0xBC4734 func_80240508_BC4788 = 0x80240508; // type:func rom:0xBC4788 func_80240540_BC47C0 = 0x80240540; // type:func rom:0xBC47C0 -obk_03_SetManyVars = 0x802405DC; // type:func rom:0xBC485C -obk_03_UnkYawFunc = 0x802406CC; // type:func rom:0xBC494C -func_80240858_BC4AD8 = 0x80240858; // type:func rom:0xBC4AD8 -func_8024089C_BC4B1C = 0x8024089C; // type:func rom:0xBC4B1C +obk_03_LetterDelivery_Init = 0x802405DC; // type:func rom:0xBC485C +obk_03_LetterDelivery_CalcLetterPos = 0x802406CC; // type:func rom:0xBC494C +obk_03_LetterDelivery_SaveNpcAnim = 0x80240858; // type:func rom:0xBC4AD8 +obk_03_LetterDelivery_RestoreNpcAnim = 0x8024089C; // type:func rom:0xBC4B1C func_802408D0_BC4B50 = 0x802408D0; // type:func rom:0xBC4B50 obk_03_varStash = 0x80242ECC; // type:data rom:0xBC714C D_80242F30_BC71B0 = 0x80242F30; // type:data rom:0xBC71B0 @@ -16984,22 +16953,22 @@ func_80240248_BDA9F8 = 0x80240248; // type:func rom:0xBDA9F8 func_80240350_BDAB00 = 0x80240350; // type:func rom:0xBDAB00 func_802403F0_BDABA0 = 0x802403F0; // type:func rom:0xBDABA0 D_802429E8_BDD198 = 0x802429E8; // type:data rom:0xBDD198 -arn_02_func_80240000_BDD1B0 = 0x80240000; // type:func rom:0xBDD1B0 -arn_02_UnkNpcAIFunc18 = 0x80240160; // type:func rom:0xBDD310 -arn_02_func_802401D4_BDD384 = 0x802401D4; // type:func rom:0xBDD384 -arn_02_UnkNpcAIFunc21 = 0x80240304; // type:func rom:0xBDD4B4 -arn_02_UnkNpcAIFunc20 = 0x802403A0; // type:func rom:0xBDD550 -arn_02_UnkNpcAIFunc22 = 0x80240428; // type:func rom:0xBDD5D8 -arn_02_UnkFunc8 = 0x802404D0; // type:func rom:0xBDD680 -arn_02_UnkNpcAIFunc16 = 0x80240644; // type:func rom:0xBDD7F4 -arn_02_func_80240694_BDD844 = 0x80240694; // type:func rom:0xBDD844 -arn_02_UnkFunc10 = 0x80240834; // type:func rom:0xBDD9E4 -arn_02_func_80240984_BDDB34 = 0x80240984; // type:func rom:0xBDDB34 -arn_02_UnkFunc9 = 0x80240A30; // type:func rom:0xBDDBE0 -arn_02_UnkNpcAIFunc19 = 0x80240B68; // type:func rom:0xBDDD18 -arn_02_UnkNpcAIFunc17 = 0x80240BE4; // type:func rom:0xBDDD94 -arn_02_UnkDurationCheck = 0x80240C4C; // type:func rom:0xBDDDFC -arn_02_func_80240C90_BDDE40 = 0x80240C90; // type:func rom:0xBDDE40 +arn_02_CleftAI_CanSeePlayer = 0x80240000; // type:func rom:0xBDD1B0 +arn_02_CleftAI_HidingInit = 0x80240160; // type:func rom:0xBDD310 +arn_02_CleftAI_Hiding = 0x802401D4; // type:func rom:0xBDD384 +arn_02_CleftAI_PreAmbush = 0x80240304; // type:func rom:0xBDD4B4 +arn_02_CleftAI_Ambush = 0x802403A0; // type:func rom:0xBDD550 +arn_02_CleftAI_FindPlayerInit = 0x80240428; // type:func rom:0xBDD5D8 +arn_02_CleftAI_FindPlayer = 0x802404D0; // type:func rom:0xBDD680 +arn_02_CleftAI_20 = 0x80240644; // type:func rom:0xBDD7F4 +arn_02_CleftAI_21 = 0x80240694; // type:func rom:0xBDD844 +arn_02_CleftAI_Tackle = 0x80240834; // type:func rom:0xBDD9E4 +arn_02_CleftAI_LosePlayer = 0x80240984; // type:func rom:0xBDDB34 +arn_02_CleftAI_ReturnHome = 0x80240A30; // type:func rom:0xBDDBE0 +arn_02_CleftAI_DisguiseInit = 0x80240B68; // type:func rom:0xBDDD18 +arn_02_CleftAI_Disguise = 0x80240BE4; // type:func rom:0xBDDD94 +arn_02_CleftAI_PostDisguise = 0x80240C4C; // type:func rom:0xBDDDFC +arn_02_CleftAI_Main = 0x80240C90; // type:func rom:0xBDDE40 arn_02_entryList = 0x80240FE0; // type:data rom:0xBDE190 arn_02_config = 0x80241000; // type:data rom:0xBDE1B0 arn_02_80241040 = 0x80241040; // type:data rom:0xBDE1F0 @@ -17024,18 +16993,18 @@ D_80241AE8_BDEC98 = 0x80241AE8; // type:data rom:0xBDEC98 D_80241AF0_BDECA0 = 0x80241AF0; // type:data rom:0xBDECA0 D_80241AF8_BDECA8 = 0x80241AF8; // type:data rom:0xBDECA8 D_80241B00_BDECB0 = 0x80241B00; // type:data rom:0xBDECB0 -arn_03_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xBDED90 -arn_03_UnkFunc13 = 0x80240158; // type:func rom:0xBDEEE8 -arn_03_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBDF190 -arn_03_UnkFunc14 = 0x802404C0; // type:func rom:0xBDF250 -arn_03_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xBDF40C -arn_03_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBDF4C0 -arn_03_NpcJumpFunc = 0x802407A4; // type:func rom:0xBDF534 -arn_03_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBDF5AC -arn_03_UnkFunc15 = 0x8024094C; // type:func rom:0xBDF6DC -arn_03_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBDF7FC -arn_03_UnkFunc16 = 0x80240AD4; // type:func rom:0xBDF864 -arn_03_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xBDF924 +arn_03_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xBDED90 +arn_03_PatrolAI_Move = 0x80240158; // type:func rom:0xBDEEE8 +arn_03_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xBDF190 +arn_03_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xBDF250 +arn_03_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xBDF40C +arn_03_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xBDF4C0 +arn_03_PatrolAI_Jump = 0x802407A4; // type:func rom:0xBDF534 +arn_03_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xBDF5AC +arn_03_PatrolAI_Chase = 0x8024094C; // type:func rom:0xBDF6DC +arn_03_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xBDF7FC +arn_03_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xBDF864 +arn_03_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xBDF924 arn_03_func_80240E90_BDFC20 = 0x80240E90; // type:func rom:0xBDFC20 arn_03_func_80241068_BDFDF8 = 0x80241068; // type:func rom:0xBDFDF8 arn_03_func_8024113C_BDFECC = 0x8024113C; // type:func rom:0xBDFECC @@ -17098,45 +17067,45 @@ arn_03_padding3 = 0x802447DC; // type:data rom:0xBE356C arn_03_makeEntities = 0x802447E0; // type:data rom:0xBE3570 D_80244860_BE35F0 = 0x80244860; // type:data rom:0xBE35F0 D_80244868_BE35F8 = 0x80244868; // type:data rom:0xBE35F8 -arn_04_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xBE37B0 -arn_04_UnkFunc13 = 0x80240158; // type:func rom:0xBE3908 -arn_04_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBE3BB0 -arn_04_UnkFunc14 = 0x802404C0; // type:func rom:0xBE3C70 -arn_04_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xBE3E2C -arn_04_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBE3EE0 -arn_04_NpcJumpFunc = 0x802407A4; // type:func rom:0xBE3F54 -arn_04_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE3FCC -arn_04_UnkFunc15 = 0x8024094C; // type:func rom:0xBE40FC -arn_04_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE421C -arn_04_UnkFunc16 = 0x80240AD4; // type:func rom:0xBE4284 -arn_04_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xBE4344 -arn_04_UnkNpcAIFunc23 = 0x80240E90; // type:func rom:0xBE4640 -arn_04_UnkNpcAIFunc35 = 0x80241040; // type:func rom:0xBE47F0 -arn_04_UnkNpcAIFunc1_copy = 0x80241668; // type:func rom:0xBE4E18 -arn_04_UnkFunc4 = 0x80241728; // type:func rom:0xBE4ED8 -arn_04_UnkNpcAIFunc2 = 0x80241A6C; // type:func rom:0xBE521C -arn_04_SixFloatsFunc = 0x80241AE4; // type:func rom:0xBE5294 -arn_04_UnkNpcAIFunc14 = 0x80241B50; // type:func rom:0xBE5300 -arn_04_UnkNpcAIFunc3 = 0x80241C84; // type:func rom:0xBE5434 -arn_04_UnkFunc6 = 0x80241CE8; // type:func rom:0xBE5498 -arn_04_UnkFunc5 = 0x80242078; // type:func rom:0xBE5828 -arn_04_UnkNpcAIMainFunc9 = 0x8024219C; // type:func rom:0xBE594C -arn_04_func_80242388_BE5B38 = 0x80242388; // type:func rom:0xBE5B38 -arn_04_UnkNpcAIFunc18 = 0x802424E8; // type:func rom:0xBE5C98 -arn_04_func_8024255C_BE5D0C = 0x8024255C; // type:func rom:0xBE5D0C -arn_04_UnkNpcAIFunc21 = 0x8024268C; // type:func rom:0xBE5E3C -arn_04_UnkNpcAIFunc20 = 0x80242728; // type:func rom:0xBE5ED8 -arn_04_UnkNpcAIFunc22 = 0x802427B0; // type:func rom:0xBE5F60 -arn_04_UnkFunc8 = 0x80242858; // type:func rom:0xBE6008 -arn_04_UnkNpcAIFunc16 = 0x802429CC; // type:func rom:0xBE617C -arn_04_func_80242A1C_BE61CC = 0x80242A1C; // type:func rom:0xBE61CC -arn_04_UnkFunc10 = 0x80242BBC; // type:func rom:0xBE636C -arn_04_func_80242D0C_BE64BC = 0x80242D0C; // type:func rom:0xBE64BC -arn_04_UnkFunc9 = 0x80242DB8; // type:func rom:0xBE6568 -arn_04_UnkNpcAIFunc19 = 0x80242EF0; // type:func rom:0xBE66A0 -arn_04_UnkNpcAIFunc17 = 0x80242F6C; // type:func rom:0xBE671C -arn_04_UnkDurationCheck = 0x80242FD4; // type:func rom:0xBE6784 -arn_04_func_80243018_BE67C8 = 0x80243018; // type:func rom:0xBE67C8 +arn_04_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xBE37B0 +arn_04_PatrolAI_Move = 0x80240158; // type:func rom:0xBE3908 +arn_04_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xBE3BB0 +arn_04_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xBE3C70 +arn_04_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xBE3E2C +arn_04_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xBE3EE0 +arn_04_PatrolAI_Jump = 0x802407A4; // type:func rom:0xBE3F54 +arn_04_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xBE3FCC +arn_04_PatrolAI_Chase = 0x8024094C; // type:func rom:0xBE40FC +arn_04_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xBE421C +arn_04_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xBE4284 +arn_04_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xBE4344 +arn_04_FlyingAI_WanderInit = 0x80240E90; // type:func rom:0xBE4640 +arn_04_FlyingAI_Wander = 0x80241040; // type:func rom:0xBE47F0 +arn_04_FlyingAI_LoiterInit = 0x80241668; // type:func rom:0xBE4E18 +arn_04_FlyingAI_Loiter = 0x80241728; // type:func rom:0xBE4ED8 +arn_04_FlyingAI_JumpInit = 0x80241A6C; // type:func rom:0xBE521C +arn_04_FlyingAI_Jump = 0x80241AE4; // type:func rom:0xBE5294 +arn_04_FlyingAI_ChaseInit = 0x80241B50; // type:func rom:0xBE5300 +arn_04_FlyingAI_Chase = 0x80241C84; // type:func rom:0xBE5434 +arn_04_FlyingAI_LosePlayer = 0x80241CE8; // type:func rom:0xBE5498 +arn_04_FlyingAI_Init = 0x80242078; // type:func rom:0xBE5828 +arn_04_FlyingAI_Main = 0x8024219C; // type:func rom:0xBE594C +arn_04_CleftAI_CanSeePlayer = 0x80242388; // type:func rom:0xBE5B38 +arn_04_CleftAI_HidingInit = 0x802424E8; // type:func rom:0xBE5C98 +arn_04_CleftAI_Hiding = 0x8024255C; // type:func rom:0xBE5D0C +arn_04_CleftAI_PreAmbush = 0x8024268C; // type:func rom:0xBE5E3C +arn_04_CleftAI_Ambush = 0x80242728; // type:func rom:0xBE5ED8 +arn_04_CleftAI_FindPlayerInit = 0x802427B0; // type:func rom:0xBE5F60 +arn_04_CleftAI_FindPlayer = 0x80242858; // type:func rom:0xBE6008 +arn_04_CleftAI_20 = 0x802429CC; // type:func rom:0xBE617C +arn_04_CleftAI_21 = 0x80242A1C; // type:func rom:0xBE61CC +arn_04_CleftAI_Tackle = 0x80242BBC; // type:func rom:0xBE636C +arn_04_CleftAI_LosePlayer = 0x80242D0C; // type:func rom:0xBE64BC +arn_04_CleftAI_ReturnHome = 0x80242DB8; // type:func rom:0xBE6568 +arn_04_CleftAI_DisguiseInit = 0x80242EF0; // type:func rom:0xBE66A0 +arn_04_CleftAI_Disguise = 0x80242F6C; // type:func rom:0xBE671C +arn_04_CleftAI_PostDisguise = 0x80242FD4; // type:func rom:0xBE6784 +arn_04_CleftAI_Main = 0x80243018; // type:func rom:0xBE67C8 arn_04_entryList = 0x80243370; // type:data rom:0xBE6B20 arn_04_config = 0x80243390; // type:data rom:0xBE6B40 arn_04_802433D0 = 0x802433D0; // type:data rom:0xBE6B80 @@ -17148,7 +17117,7 @@ arn_04_padding1 = 0x80243654; // type:data rom:0xBE6E04 arn_04_npcAISettings_80243660 = 0x80243660; // type:data rom:0xBE6E10 arn_04_npcAI_80243690 = 0x80243690; // type:data rom:0xBE6E40 arn_04_npcSettings_802436B0 = 0x802436B0; // type:data rom:0xBE6E60 -arn_04_sixFloats = 0x802436DC; // type:data rom:0xBE6E8C +arn_04_FlyingAI_JumpVels = 0x802436DC; // type:data rom:0xBE6E8C arn_04_npcAISettings_802436F4 = 0x802436F4; // type:data rom:0xBE6EA4 arn_04_npcAI_80243724 = 0x80243724; // type:data rom:0xBE6ED4 arn_04_npcSettings_80243794 = 0x80243794; // type:data rom:0xBE6F44 @@ -17171,18 +17140,18 @@ D_80244330_BE7AE0 = 0x80244330; // type:data rom:0xBE7AE0 D_80244338_BE7AE8 = 0x80244338; // type:data rom:0xBE7AE8 D_80244340_BE7AF0 = 0x80244340; // type:data rom:0xBE7AF0 D_80244348_BE7AF8 = 0x80244348; // type:data rom:0xBE7AF8 -arn_05_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xBE7BE0 -arn_05_UnkFunc13 = 0x80240158; // type:func rom:0xBE7D38 -arn_05_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBE7FE0 -arn_05_UnkFunc14 = 0x802404C0; // type:func rom:0xBE80A0 -arn_05_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xBE825C -arn_05_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBE8310 -arn_05_NpcJumpFunc = 0x802407A4; // type:func rom:0xBE8384 -arn_05_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE83FC -arn_05_UnkFunc15 = 0x8024094C; // type:func rom:0xBE852C -arn_05_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE864C -arn_05_UnkFunc16 = 0x80240AD4; // type:func rom:0xBE86B4 -arn_05_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xBE8774 +arn_05_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xBE7BE0 +arn_05_PatrolAI_Move = 0x80240158; // type:func rom:0xBE7D38 +arn_05_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xBE7FE0 +arn_05_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xBE80A0 +arn_05_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xBE825C +arn_05_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xBE8310 +arn_05_PatrolAI_Jump = 0x802407A4; // type:func rom:0xBE8384 +arn_05_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xBE83FC +arn_05_PatrolAI_Chase = 0x8024094C; // type:func rom:0xBE852C +arn_05_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xBE864C +arn_05_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xBE86B4 +arn_05_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xBE8774 arn_05_func_80240E90_BE8A70 = 0x80240E90; // type:func rom:0xBE8A70 arn_05_func_80241068_BE8C48 = 0x80241068; // type:func rom:0xBE8C48 arn_05_func_8024113C_BE8D1C = 0x8024113C; // type:func rom:0xBE8D1C @@ -17242,17 +17211,17 @@ arn_07_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xBED4F8 arn_07_func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0 arn_07_SetEntityFlags100000 = 0x80240870; // type:func rom:0xBED660 arn_07_GetEntityPosition = 0x802408A4; // type:func rom:0xBED694 -arn_07_UnkNpcAIFunc23 = 0x80240950; // type:func rom:0xBED740 -arn_07_UnkNpcAIFunc35 = 0x80240B00; // type:func rom:0xBED8F0 -arn_07_UnkNpcAIFunc1_copy = 0x80241128; // type:func rom:0xBEDF18 -arn_07_UnkFunc4 = 0x802411E8; // type:func rom:0xBEDFD8 -arn_07_UnkNpcAIFunc2 = 0x8024152C; // type:func rom:0xBEE31C -arn_07_SixFloatsFunc = 0x802415A4; // type:func rom:0xBEE394 -arn_07_UnkNpcAIFunc14 = 0x80241610; // type:func rom:0xBEE400 -arn_07_UnkNpcAIFunc3 = 0x80241744; // type:func rom:0xBEE534 -arn_07_UnkFunc6 = 0x802417A8; // type:func rom:0xBEE598 -arn_07_UnkFunc5 = 0x80241B38; // type:func rom:0xBEE928 -arn_07_UnkNpcAIMainFunc9 = 0x80241C5C; // type:func rom:0xBEEA4C +arn_07_FlyingAI_WanderInit = 0x80240950; // type:func rom:0xBED740 +arn_07_FlyingAI_Wander = 0x80240B00; // type:func rom:0xBED8F0 +arn_07_FlyingAI_LoiterInit = 0x80241128; // type:func rom:0xBEDF18 +arn_07_FlyingAI_Loiter = 0x802411E8; // type:func rom:0xBEDFD8 +arn_07_FlyingAI_JumpInit = 0x8024152C; // type:func rom:0xBEE31C +arn_07_FlyingAI_Jump = 0x802415A4; // type:func rom:0xBEE394 +arn_07_FlyingAI_ChaseInit = 0x80241610; // type:func rom:0xBEE400 +arn_07_FlyingAI_Chase = 0x80241744; // type:func rom:0xBEE534 +arn_07_FlyingAI_LosePlayer = 0x802417A8; // type:func rom:0xBEE598 +arn_07_FlyingAI_Init = 0x80241B38; // type:func rom:0xBEE928 +arn_07_FlyingAI_Main = 0x80241C5C; // type:func rom:0xBEEA4C PostChapter3StatUpdate = 0x80241E48; // type:func rom:0xBEEC38 arn_07_entryList = 0x80241E90; // type:data rom:0xBEEC80 arn_07_config = 0x80241ED0; // type:data rom:0xBEECC0 @@ -17272,7 +17241,7 @@ arn_07_802437AC = 0x802437AC; // type:data rom:0xBF059C arn_07_802439B0 = 0x802439B0; // type:data rom:0xBF07A0 arn_07_80243B28 = 0x80243B28; // type:data rom:0xBF0918 arn_07_makeEntities = 0x80243B54; // type:data rom:0xBF0944 -arn_07_sixFloats = 0x80243BC0; // type:data rom:0xBF09B0 +arn_07_FlyingAI_JumpVels = 0x80243BC0; // type:data rom:0xBF09B0 arn_07_npcAISettings_80243BD8 = 0x80243BD8; // type:data rom:0xBF09C8 arn_07_npcAI_80243C08 = 0x80243C08; // type:data rom:0xBF09F8 arn_07_npcSettings_80243C78 = 0x80243C78; // type:data rom:0xBF0A68 @@ -17516,40 +17485,40 @@ D_802437BC_BFD85C = 0x802437BC; // type:data rom:0xBFD85C dgb_01_func_80240000_BFD880 = 0x80240000; // type:func rom:0xBFD880 dgb_01_SetEntityFlags100000 = 0x80240040; // type:func rom:0xBFD8C0 dgb_01_GetEntityPosition = 0x80240074; // type:func rom:0xBFD8F4 -dgb_01_UnkNpcAIFunc23 = 0x80240120; // type:func rom:0xBFD9A0 -dgb_01_UnkNpcAIFunc35 = 0x802402D0; // type:func rom:0xBFDB50 -dgb_01_UnkNpcAIFunc1 = 0x802408F8; // type:func rom:0xBFE178 -dgb_01_UnkFunc4 = 0x802409B8; // type:func rom:0xBFE238 -dgb_01_UnkNpcAIFunc2 = 0x80240CFC; // type:func rom:0xBFE57C -dgb_01_SixFloatsFunc = 0x80240D74; // type:func rom:0xBFE5F4 -dgb_01_UnkNpcAIFunc14 = 0x80240DE0; // type:func rom:0xBFE660 -dgb_01_UnkNpcAIFunc3 = 0x80240F14; // type:func rom:0xBFE794 -dgb_01_UnkFunc6 = 0x80240F78; // type:func rom:0xBFE7F8 -dgb_01_UnkFunc5 = 0x80241308; // type:func rom:0xBFEB88 -dgb_01_UnkNpcAIMainFunc9 = 0x8024142C; // type:func rom:0xBFECAC -dgb_01_func_80241618_BFEE98 = 0x80241618; // type:func rom:0xBFEE98 -dgb_01_func_80241770_BFEFF0 = 0x80241770; // type:func rom:0xBFEFF0 -dgb_01_func_80241874_BFF0F4 = 0x80241874; // type:func rom:0xBFF0F4 -dgb_01_func_80241954_BFF1D4 = 0x80241954; // type:func rom:0xBFF1D4 -dgb_01_func_80241BF0_BFF470 = 0x80241BF0; // type:func rom:0xBFF470 -dgb_01_func_80241CA8_BFF528 = 0x80241CA8; // type:func rom:0xBFF528 -dgb_01_func_80241E28_BFF6A8 = 0x80241E28; // type:func rom:0xBFF6A8 -dgb_01_func_80241E70_BFF6F0 = 0x80241E70; // type:func rom:0xBFF6F0 -dgb_01_func_80241EF0_BFF770 = 0x80241EF0; // type:func rom:0xBFF770 -dgb_01_func_80241F98_BFF818 = 0x80241F98; // type:func rom:0xBFF818 -dgb_01_func_802422B0_BFFB30 = 0x802422B0; // type:func rom:0xBFFB30 -dgb_01_UnkNpcAIFunc24 = 0x8024252C; // type:func rom:0xBFFDAC -dgb_01_UnkFunc13 = 0x80242684; // type:func rom:0xBFFF04 -dgb_01_UnkNpcAIFunc1_copy = 0x8024292C; // type:func rom:0xC001AC -dgb_01_UnkFunc14 = 0x802429EC; // type:func rom:0xC0026C -dgb_01_UnkNpcAIFunc25 = 0x80242BA8; // type:func rom:0xC00428 -dgb_01_NpcJumpFunc2 = 0x80242C5C; // type:func rom:0xC004DC -dgb_01_NpcJumpFunc = 0x80242CD0; // type:func rom:0xC00550 -dgb_01_UnkNpcAIFunc13 = 0x80242D48; // type:func rom:0xC005C8 -dgb_01_UnkFunc15 = 0x80242E78; // type:func rom:0xC006F8 -dgb_01_UnkNpcDurationFlagFunc = 0x80242F98; // type:func rom:0xC00818 -dgb_01_UnkFunc16 = 0x80243000; // type:func rom:0xC00880 -dgb_01_UnkNpcAIMainFunc = 0x802430C0; // type:func rom:0xC00940 +dgb_01_FlyingAI_WanderInit = 0x80240120; // type:func rom:0xBFD9A0 +dgb_01_FlyingAI_Wander = 0x802402D0; // type:func rom:0xBFDB50 +dgb_01_PatrolAI_LoiterInit = 0x802408F8; // type:func rom:0xBFE178 +dgb_01_FlyingAI_Loiter = 0x802409B8; // type:func rom:0xBFE238 +dgb_01_FlyingAI_JumpInit = 0x80240CFC; // type:func rom:0xBFE57C +dgb_01_FlyingAI_Jump = 0x80240D74; // type:func rom:0xBFE5F4 +dgb_01_FlyingAI_ChaseInit = 0x80240DE0; // type:func rom:0xBFE660 +dgb_01_FlyingAI_Chase = 0x80240F14; // type:func rom:0xBFE794 +dgb_01_FlyingAI_LosePlayer = 0x80240F78; // type:func rom:0xBFE7F8 +dgb_01_FlyingAI_Init = 0x80241308; // type:func rom:0xBFEB88 +dgb_01_FlyingAI_Main = 0x8024142C; // type:func rom:0xBFECAC +dgb_01_SentinelAI_ChaseInit = 0x80241618; // type:func rom:0xBFEE98 +dgb_01_SentinelAI_Chase = 0x80241770; // type:func rom:0xBFEFF0 +dgb_01_SentinelAI_DescendInit = 0x80241874; // type:func rom:0xBFF0F4 +dgb_01_SentinelAI_Descend = 0x80241954; // type:func rom:0xBFF1D4 +dgb_01_SentinelAI_LosePlayerInit = 0x80241BF0; // type:func rom:0xBFF470 +dgb_01_SentinelAI_LosePlayer = 0x80241CA8; // type:func rom:0xBFF528 +dgb_01_SentinelAI_PostLosePlayer = 0x80241E28; // type:func rom:0xBFF6A8 +dgb_01_SentinelAI_GrabPlayer = 0x80241E70; // type:func rom:0xBFF6F0 +dgb_01_SentinelAI_ReturnHomeInit = 0x80241EF0; // type:func rom:0xBFF770 +dgb_01_SentinelAI_ReturnHome = 0x80241F98; // type:func rom:0xBFF818 +dgb_01_SentinelAI_Main = 0x802422B0; // type:func rom:0xBFFB30 +dgb_01_PatrolAI_MoveInit = 0x8024252C; // type:func rom:0xBFFDAC +dgb_01_PatrolAI_Move = 0x80242684; // type:func rom:0xBFFF04 +dgb_01_FlyingAI_LoiterInit = 0x8024292C; // type:func rom:0xC001AC +dgb_01_PatrolAI_Loiter = 0x802429EC; // type:func rom:0xC0026C +dgb_01_PatrolAI_PostLoiter = 0x80242BA8; // type:func rom:0xC00428 +dgb_01_PatrolAI_JumpInit = 0x80242C5C; // type:func rom:0xC004DC +dgb_01_PatrolAI_Jump = 0x80242CD0; // type:func rom:0xC00550 +dgb_01_PatrolAI_ChaseInit = 0x80242D48; // type:func rom:0xC005C8 +dgb_01_PatrolAI_Chase = 0x80242E78; // type:func rom:0xC006F8 +dgb_01_PatrolAI_LosePlayer = 0x80242F98; // type:func rom:0xC00818 +dgb_01_PatrolNoAttackAI_15 = 0x80243000; // type:func rom:0xC00880 +dgb_01_PatrolNoAttackAI_Main = 0x802430C0; // type:func rom:0xC00940 dgb_01_UnkFunc1 = 0x802433BC; // type:func rom:0xC00C3C dgb_01_entryList = 0x802433F0; // type:data rom:0xC00C70 dgb_01_config = 0x80243460; // type:data rom:0xC00CE0 @@ -17569,7 +17538,7 @@ dgb_01_802449C4 = 0x802449C4; // type:data rom:0xC02244 dgb_01_80244AD0 = 0x80244AD0; // type:data rom:0xC02350 dgb_01_80244C38 = 0x80244C38; // type:data rom:0xC024B8 dgb_01_makeEntities = 0x80244C64; // type:data rom:0xC024E4 -dgb_01_sixFloats = 0x80244CD0; // type:data rom:0xC02550 +dgb_01_FlyingAI_JumpVels = 0x80244CD0; // type:data rom:0xC02550 dgb_01_80244CE8 = 0x80244CE8; // type:data rom:0xC02568 dgb_01_npcAISettings_80244D24 = 0x80244D24; // type:data rom:0xC025A4 dgb_01_npcAI_80244D54 = 0x80244D54; // type:data rom:0xC025D4 @@ -18237,22 +18206,22 @@ vtx_C2E800 = 0x8020D8C0; // type:data rom:0xC2E800 vtx_C2E8C0 = 0x8020D980; // type:data rom:0xC2E8C0 vtx_C2E980 = 0x8020DA40; // type:data rom:0xC2E980 vtx_C2EA60 = 0x8020DB20; // type:data rom:0xC2EA60 -dgb_02_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC2EBA0 -dgb_02_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC2EC0C -dgb_02_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC2EC7C -dgb_02_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC2ED54 -dgb_02_UnkNpcAIFunc26 = 0x80240208; // type:func rom:0xC2EDA8 -dgb_02_UnkFunc7 = 0x802403BC; // type:func rom:0xC2EF5C -dgb_02_func_8024061C_C2F1BC = 0x8024061C; // type:func rom:0xC2F1BC -dgb_02_func_802408D0_C2F470 = 0x802408D0; // type:func rom:0xC2F470 -dgb_02_func_80240958_C2F4F8 = 0x80240958; // type:func rom:0xC2F4F8 -dgb_02_func_80240C10_C2F7B0 = 0x80240C10; // type:func rom:0xC2F7B0 -dgb_02_func_80240C74_C2F814 = 0x80240C74; // type:func rom:0xC2F814 -dgb_02_func_80240D1C_C2F8BC = 0x80240D1C; // type:func rom:0xC2F8BC -dgb_02_func_80240E54_C2F9F4 = 0x80240E54; // type:func rom:0xC2F9F4 -dgb_02_func_80240F00_C2FAA0 = 0x80240F00; // type:func rom:0xC2FAA0 -dgb_02_func_80241078_C2FC18 = 0x80241078; // type:func rom:0xC2FC18 -dgb_02_func_802410D4_C2FC74 = 0x802410D4; // type:func rom:0xC2FC74 +dgb_02_MeleeHitbox_30 = 0x80240000; // type:func rom:0xC2EBA0 +dgb_02_MeleeHitbox_31 = 0x8024006C; // type:func rom:0xC2EC0C +dgb_02_MeleeHitbox_32 = 0x802400DC; // type:func rom:0xC2EC7C +dgb_02_MeleeHitbox_33 = 0x802401B4; // type:func rom:0xC2ED54 +dgb_02_MeleeHitbox_CanSeePlayer = 0x80240208; // type:func rom:0xC2EDA8 +dgb_02_MeleeHitbox_Main = 0x802403BC; // type:func rom:0xC2EF5C +dgb_02_WanderMeleeAI_Main = 0x8024061C; // type:func rom:0xC2F1BC +dgb_02_ClubbaNappingAI_Init = 0x802408D0; // type:func rom:0xC2F470 +dgb_02_ClubbaNappingAI_Sleep = 0x80240958; // type:func rom:0xC2F4F8 +dgb_02_ClubbaNappingAI_WakeUp = 0x80240C10; // type:func rom:0xC2F7B0 +dgb_02_ClubbaNappingAI_LoiterInit = 0x80240C74; // type:func rom:0xC2F814 +dgb_02_ClubbaNappingAI_Loiter = 0x80240D1C; // type:func rom:0xC2F8BC +dgb_02_ClubbaNappingAI_ReturnHomeInit = 0x80240E54; // type:func rom:0xC2F9F4 +dgb_02_ClubbaNappingAI_ReturnHome = 0x80240F00; // type:func rom:0xC2FAA0 +dgb_02_ClubbaNappingAI_FallAsleep = 0x80241078; // type:func rom:0xC2FC18 +dgb_02_ClubbaNappingAI_Main = 0x802410D4; // type:func rom:0xC2FC74 dgb_02_entryList = 0x80241430; // type:data rom:0xC2FFD0 dgb_02_config = 0x80241470; // type:data rom:0xC30010 dgb_02_802414B0 = 0x802414B0; // type:data rom:0xC30050 @@ -18281,35 +18250,35 @@ dgb_03_UnkFunc11 = 0x80240000; // type:func rom:0xC314E0 dgb_03_UnkFunc12 = 0x802400BC; // type:func rom:0xC3159C dgb_03_SetEntityFlags100000 = 0x80240170; // type:func rom:0xC31650 dgb_03_GetEntityPosition = 0x802401A4; // type:func rom:0xC31684 -dgb_03_UnkNpcAIFunc6 = 0x80240250; // type:func rom:0xC31730 -dgb_03_UnkNpcAIFunc7 = 0x802402BC; // type:func rom:0xC3179C -dgb_03_UnkNpcAIFunc8 = 0x8024032C; // type:func rom:0xC3180C -dgb_03_UnkNpcAIFunc5 = 0x80240404; // type:func rom:0xC318E4 -dgb_03_UnkNpcAIFunc26 = 0x80240458; // type:func rom:0xC31938 -dgb_03_UnkFunc7 = 0x8024060C; // type:func rom:0xC31AEC -dgb_03_func_8024086C_C31D4C = 0x8024086C; // type:func rom:0xC31D4C -dgb_03_UnkNpcAIFunc24 = 0x80240B20; // type:func rom:0xC32000 -dgb_03_UnkFunc13 = 0x80240C78; // type:func rom:0xC32158 -dgb_03_UnkNpcAIFunc1 = 0x80240F20; // type:func rom:0xC32400 -dgb_03_UnkFunc14 = 0x80240FE0; // type:func rom:0xC324C0 -dgb_03_UnkNpcAIFunc25 = 0x8024119C; // type:func rom:0xC3267C -dgb_03_NpcJumpFunc2 = 0x80241250; // type:func rom:0xC32730 -dgb_03_NpcJumpFunc = 0x802412C4; // type:func rom:0xC327A4 -dgb_03_UnkNpcAIFunc13 = 0x8024133C; // type:func rom:0xC3281C -dgb_03_UnkFunc15 = 0x8024146C; // type:func rom:0xC3294C -dgb_03_UnkNpcDurationFlagFunc = 0x8024158C; // type:func rom:0xC32A6C -dgb_03_UnkFunc16 = 0x802415F4; // type:func rom:0xC32AD4 -dgb_03_UnkNpcAIMainFunc = 0x802416B4; // type:func rom:0xC32B94 -dgb_03_func_802419B0_C32E90 = 0x802419B0; // type:func rom:0xC32E90 -dgb_03_func_80241C7C_C3315C = 0x80241C7C; // type:func rom:0xC3315C -dgb_03_func_80241D04_C331E4 = 0x80241D04; // type:func rom:0xC331E4 -dgb_03_func_80241FBC_C3349C = 0x80241FBC; // type:func rom:0xC3349C -dgb_03_func_80242020_C33500 = 0x80242020; // type:func rom:0xC33500 -dgb_03_func_802420C8_C335A8 = 0x802420C8; // type:func rom:0xC335A8 -dgb_03_func_80242200_C336E0 = 0x80242200; // type:func rom:0xC336E0 -dgb_03_func_802422AC_C3378C = 0x802422AC; // type:func rom:0xC3378C -dgb_03_func_80242424_C33904 = 0x80242424; // type:func rom:0xC33904 -dgb_03_func_80242480_C33960 = 0x80242480; // type:func rom:0xC33960 +dgb_03_MeleeHitbox_30 = 0x80240250; // type:func rom:0xC31730 +dgb_03_MeleeHitbox_31 = 0x802402BC; // type:func rom:0xC3179C +dgb_03_MeleeHitbox_32 = 0x8024032C; // type:func rom:0xC3180C +dgb_03_MeleeHitbox_33 = 0x80240404; // type:func rom:0xC318E4 +dgb_03_MeleeHitbox_CanSeePlayer = 0x80240458; // type:func rom:0xC31938 +dgb_03_MeleeHitbox_Main = 0x8024060C; // type:func rom:0xC31AEC +dgb_03_WanderMeleeAI_Main = 0x8024086C; // type:func rom:0xC31D4C +dgb_03_PatrolAI_MoveInit = 0x80240B20; // type:func rom:0xC32000 +dgb_03_PatrolAI_Move = 0x80240C78; // type:func rom:0xC32158 +dgb_03_PatrolAI_LoiterInit = 0x80240F20; // type:func rom:0xC32400 +dgb_03_PatrolAI_Loiter = 0x80240FE0; // type:func rom:0xC324C0 +dgb_03_PatrolAI_PostLoiter = 0x8024119C; // type:func rom:0xC3267C +dgb_03_PatrolAI_JumpInit = 0x80241250; // type:func rom:0xC32730 +dgb_03_PatrolAI_Jump = 0x802412C4; // type:func rom:0xC327A4 +dgb_03_PatrolAI_ChaseInit = 0x8024133C; // type:func rom:0xC3281C +dgb_03_PatrolAI_Chase = 0x8024146C; // type:func rom:0xC3294C +dgb_03_PatrolAI_LosePlayer = 0x8024158C; // type:func rom:0xC32A6C +dgb_03_PatrolNoAttackAI_15 = 0x802415F4; // type:func rom:0xC32AD4 +dgb_03_PatrolNoAttackAI_Main = 0x802416B4; // type:func rom:0xC32B94 +dgb_03_ClubbaPatrolAI_Main = 0x802419B0; // type:func rom:0xC32E90 +dgb_03_ClubbaNappingAI_Init = 0x80241C7C; // type:func rom:0xC3315C +dgb_03_ClubbaNappingAI_Sleep = 0x80241D04; // type:func rom:0xC331E4 +dgb_03_ClubbaNappingAI_WakeUp = 0x80241FBC; // type:func rom:0xC3349C +dgb_03_ClubbaNappingAI_LoiterInit = 0x80242020; // type:func rom:0xC33500 +dgb_03_ClubbaNappingAI_Loiter = 0x802420C8; // type:func rom:0xC335A8 +dgb_03_ClubbaNappingAI_ReturnHomeInit = 0x80242200; // type:func rom:0xC336E0 +dgb_03_ClubbaNappingAI_ReturnHome = 0x802422AC; // type:func rom:0xC3378C +dgb_03_ClubbaNappingAI_FallAsleep = 0x80242424; // type:func rom:0xC33904 +dgb_03_ClubbaNappingAI_Main = 0x80242480; // type:func rom:0xC33960 dgb_03_entryList = 0x802427D0; // type:data rom:0xC33CB0 dgb_03_config = 0x80242830; // type:data rom:0xC33D10 dgb_03_80242870 = 0x80242870; // type:data rom:0xC33D50 @@ -18353,28 +18322,28 @@ D_802449F0_C35ED0 = 0x802449F0; // type:data rom:0xC35ED0 D_80244B88_C36068 = 0x80244B88; // type:data rom:0xC36068 D_80244B90_C36070 = 0x80244B90; // type:data rom:0xC36070 D_80244EB8_C36398 = 0x80244EB8; // type:data rom:0xC36398 -dgb_04_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0xC36530 -dgb_04_UnkNpcAIFunc35 = 0x802401B0; // type:func rom:0xC366E0 -dgb_04_UnkNpcAIFunc1_copy = 0x802407D8; // type:func rom:0xC36D08 -dgb_04_UnkFunc4 = 0x80240898; // type:func rom:0xC36DC8 -dgb_04_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0xC3710C -dgb_04_SixFloatsFunc = 0x80240C54; // type:func rom:0xC37184 -dgb_04_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0xC371F0 -dgb_04_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0xC37324 -dgb_04_UnkFunc6 = 0x80240E58; // type:func rom:0xC37388 -dgb_04_UnkFunc5 = 0x802411E8; // type:func rom:0xC37718 -dgb_04_UnkNpcAIMainFunc9 = 0x8024130C; // type:func rom:0xC3783C -dgb_04_func_802414F8_C37A28 = 0x802414F8; // type:func rom:0xC37A28 -dgb_04_func_80241650_C37B80 = 0x80241650; // type:func rom:0xC37B80 -dgb_04_func_80241754_C37C84 = 0x80241754; // type:func rom:0xC37C84 -dgb_04_func_802417F8_C37D28 = 0x802417F8; // type:func rom:0xC37D28 -dgb_04_func_80241A94_C37FC4 = 0x80241A94; // type:func rom:0xC37FC4 -dgb_04_func_80241B4C_C3807C = 0x80241B4C; // type:func rom:0xC3807C -dgb_04_func_80241CCC_C381FC = 0x80241CCC; // type:func rom:0xC381FC -dgb_04_func_80241D14_C38244 = 0x80241D14; // type:func rom:0xC38244 -dgb_04_func_80241D94_C382C4 = 0x80241D94; // type:func rom:0xC382C4 -dgb_04_func_80241E3C_C3836C = 0x80241E3C; // type:func rom:0xC3836C -dgb_04_func_80242154_C38684 = 0x80242154; // type:func rom:0xC38684 +dgb_04_FlyingAI_WanderInit = 0x80240000; // type:func rom:0xC36530 +dgb_04_FlyingAI_Wander = 0x802401B0; // type:func rom:0xC366E0 +dgb_04_FlyingAI_LoiterInit = 0x802407D8; // type:func rom:0xC36D08 +dgb_04_FlyingAI_Loiter = 0x80240898; // type:func rom:0xC36DC8 +dgb_04_FlyingAI_JumpInit = 0x80240BDC; // type:func rom:0xC3710C +dgb_04_FlyingAI_Jump = 0x80240C54; // type:func rom:0xC37184 +dgb_04_FlyingAI_ChaseInit = 0x80240CC0; // type:func rom:0xC371F0 +dgb_04_FlyingAI_Chase = 0x80240DF4; // type:func rom:0xC37324 +dgb_04_FlyingAI_LosePlayer = 0x80240E58; // type:func rom:0xC37388 +dgb_04_FlyingAI_Init = 0x802411E8; // type:func rom:0xC37718 +dgb_04_FlyingAI_Main = 0x8024130C; // type:func rom:0xC3783C +dgb_04_SentinelAI_ChaseInit = 0x802414F8; // type:func rom:0xC37A28 +dgb_04_SentinelAI_Chase = 0x80241650; // type:func rom:0xC37B80 +dgb_04_SentinelAI_DescendInit = 0x80241754; // type:func rom:0xC37C84 +dgb_04_SentinelAI_Descend = 0x802417F8; // type:func rom:0xC37D28 +dgb_04_SentinelAI_LosePlayerInit = 0x80241A94; // type:func rom:0xC37FC4 +dgb_04_SentinelAI_LosePlayer = 0x80241B4C; // type:func rom:0xC3807C +dgb_04_SentinelAI_PostLosePlayer = 0x80241CCC; // type:func rom:0xC381FC +dgb_04_SentinelAI_GrabPlayer = 0x80241D14; // type:func rom:0xC38244 +dgb_04_SentinelAI_ReturnHomeInit = 0x80241D94; // type:func rom:0xC382C4 +dgb_04_SentinelAI_ReturnHome = 0x80241E3C; // type:func rom:0xC3836C +dgb_04_SentinelAI_Main = 0x80242154; // type:func rom:0xC38684 dgb_04_SuperBlock_SetOverride40 = 0x802423D0; // type:func rom:0xC38900 dgb_04_SuperBlock_ClearOverride40 = 0x802423EC; // type:func rom:0xC3891C dgb_04_SuperBlock_HideBlockContent = 0x8024240C; // type:func rom:0xC3893C @@ -18400,7 +18369,7 @@ dgb_04_exitSingleDoor_80243210 = 0x80243210; // type:data rom:0xC39740 dgb_04_exitDoubleDoor_802432C4 = 0x802432C4; // type:data rom:0xC397F4 dgb_04_enterSingleDoor_80243378 = 0x80243378; // type:data rom:0xC398A8 dgb_04_main = 0x8024343C; // type:data rom:0xC3996C -dgb_04_sixFloats = 0x80243560; // type:data rom:0xC39A90 +dgb_04_FlyingAI_JumpVels = 0x80243560; // type:data rom:0xC39A90 dgb_04_80243578 = 0x80243578; // type:data rom:0xC39AA8 dgb_04_npcAISettings_802435B4 = 0x802435B4; // type:data rom:0xC39AE4 dgb_04_npcAI_802435E4 = 0x802435E4; // type:data rom:0xC39B14 @@ -18424,22 +18393,22 @@ D_80244450_C3A980 = 0x80244450; // type:data rom:0xC3A980 dgb_04_dgb_00_name_hack = 0x802444D8; // type:data rom:0xC3AA08 dgb_05_func_80240000_C3AA10 = 0x80240000; // type:func rom:0xC3AA10 dgb_05_func_80240030_C3AA40 = 0x80240030; // type:func rom:0xC3AA40 -dgb_05_UnkNpcAIFunc6 = 0x80240060; // type:func rom:0xC3AA70 -dgb_05_UnkNpcAIFunc7 = 0x802400CC; // type:func rom:0xC3AADC -dgb_05_UnkNpcAIFunc8 = 0x8024013C; // type:func rom:0xC3AB4C -dgb_05_UnkNpcAIFunc5 = 0x80240214; // type:func rom:0xC3AC24 -dgb_05_UnkNpcAIFunc26 = 0x80240268; // type:func rom:0xC3AC78 -dgb_05_UnkFunc7 = 0x8024041C; // type:func rom:0xC3AE2C -dgb_05_func_8024067C_C3B08C = 0x8024067C; // type:func rom:0xC3B08C -dgb_05_func_80240704_C3B114 = 0x80240704; // type:func rom:0xC3B114 -dgb_05_func_802409BC_C3B3CC = 0x802409BC; // type:func rom:0xC3B3CC -dgb_05_func_80240A20_C3B430 = 0x80240A20; // type:func rom:0xC3B430 -dgb_05_func_80240AC8_C3B4D8 = 0x80240AC8; // type:func rom:0xC3B4D8 -dgb_05_func_80240C00_C3B610 = 0x80240C00; // type:func rom:0xC3B610 -dgb_05_func_80240CAC_C3B6BC = 0x80240CAC; // type:func rom:0xC3B6BC -dgb_05_func_80240E24_C3B834 = 0x80240E24; // type:func rom:0xC3B834 -dgb_05_func_80240E80_C3B890 = 0x80240E80; // type:func rom:0xC3B890 -dgb_05_func_802411D0_C3BBE0 = 0x802411D0; // type:func rom:0xC3BBE0 +dgb_05_MeleeHitbox_30 = 0x80240060; // type:func rom:0xC3AA70 +dgb_05_MeleeHitbox_31 = 0x802400CC; // type:func rom:0xC3AADC +dgb_05_MeleeHitbox_32 = 0x8024013C; // type:func rom:0xC3AB4C +dgb_05_MeleeHitbox_33 = 0x80240214; // type:func rom:0xC3AC24 +dgb_05_MeleeHitbox_CanSeePlayer = 0x80240268; // type:func rom:0xC3AC78 +dgb_05_MeleeHitbox_Main = 0x8024041C; // type:func rom:0xC3AE2C +dgb_05_ClubbaNappingAI_Init = 0x8024067C; // type:func rom:0xC3B08C +dgb_05_ClubbaNappingAI_Sleep = 0x80240704; // type:func rom:0xC3B114 +dgb_05_ClubbaNappingAI_WakeUp = 0x802409BC; // type:func rom:0xC3B3CC +dgb_05_ClubbaNappingAI_LoiterInit = 0x80240A20; // type:func rom:0xC3B430 +dgb_05_ClubbaNappingAI_Loiter = 0x80240AC8; // type:func rom:0xC3B4D8 +dgb_05_ClubbaNappingAI_ReturnHomeInit = 0x80240C00; // type:func rom:0xC3B610 +dgb_05_ClubbaNappingAI_ReturnHome = 0x80240CAC; // type:func rom:0xC3B6BC +dgb_05_ClubbaNappingAI_FallAsleep = 0x80240E24; // type:func rom:0xC3B834 +dgb_05_ClubbaNappingAI_Main = 0x80240E80; // type:func rom:0xC3B890 +dgb_05_WanderMeleeAI = 0x802411D0; // type:func rom:0xC3BBE0 dgb_05_entryList = 0x80241490; // type:data rom:0xC3BEA0 dgb_05_config = 0x802414A0; // type:data rom:0xC3BEB0 dgb_05_802414E0 = 0x802414E0; // type:data rom:0xC3BEF0 @@ -18481,22 +18450,22 @@ dgb_06_interact_8024086C = 0x8024086C; // type:data rom:0xC3D8EC dgb_06_init_802408FC = 0x802408FC; // type:data rom:0xC3D97C dgb_06_npcGroup_80240954 = 0x80240954; // type:data rom:0xC3D9D4 dgb_06_npcGroupList_80240B44 = 0x80240B44; // type:data rom:0xC3DBC4 -dgb_07_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC3DBF0 -dgb_07_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC3DC5C -dgb_07_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC3DCCC -dgb_07_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC3DDA4 -dgb_07_UnkNpcAIFunc26 = 0x80240208; // type:func rom:0xC3DDF8 -dgb_07_UnkFunc7 = 0x802403BC; // type:func rom:0xC3DFAC -dgb_07_func_8024061C_C3E20C = 0x8024061C; // type:func rom:0xC3E20C -dgb_07_func_802406A4_C3E294 = 0x802406A4; // type:func rom:0xC3E294 -dgb_07_func_8024095C_C3E54C = 0x8024095C; // type:func rom:0xC3E54C -dgb_07_func_802409C0_C3E5B0 = 0x802409C0; // type:func rom:0xC3E5B0 -dgb_07_func_80240A68_C3E658 = 0x80240A68; // type:func rom:0xC3E658 -dgb_07_func_80240BA0_C3E790 = 0x80240BA0; // type:func rom:0xC3E790 -dgb_07_func_80240C4C_C3E83C = 0x80240C4C; // type:func rom:0xC3E83C -dgb_07_func_80240DC4_C3E9B4 = 0x80240DC4; // type:func rom:0xC3E9B4 -dgb_07_func_80240E20_C3EA10 = 0x80240E20; // type:func rom:0xC3EA10 -dgb_07_func_80241170_C3ED60 = 0x80241170; // type:func rom:0xC3ED60 +dgb_07_MeleeHitbox_30 = 0x80240000; // type:func rom:0xC3DBF0 +dgb_07_MeleeHitbox_31 = 0x8024006C; // type:func rom:0xC3DC5C +dgb_07_MeleeHitbox_32 = 0x802400DC; // type:func rom:0xC3DCCC +dgb_07_MeleeHitbox_33 = 0x802401B4; // type:func rom:0xC3DDA4 +dgb_07_MeleeHitbox_CanSeePlayer = 0x80240208; // type:func rom:0xC3DDF8 +dgb_07_MeleeHitbox_Main = 0x802403BC; // type:func rom:0xC3DFAC +dgb_07_ClubbaNappingAI_Init = 0x8024061C; // type:func rom:0xC3E20C +dgb_07_ClubbaNappingAI_Sleep = 0x802406A4; // type:func rom:0xC3E294 +dgb_07_ClubbaNappingAI_WakeUp = 0x8024095C; // type:func rom:0xC3E54C +dgb_07_ClubbaNappingAI_LoiterInit = 0x802409C0; // type:func rom:0xC3E5B0 +dgb_07_ClubbaNappingAI_Loiter = 0x80240A68; // type:func rom:0xC3E658 +dgb_07_ClubbaNappingAI_ReturnHomeInit = 0x80240BA0; // type:func rom:0xC3E790 +dgb_07_ClubbaNappingAI_ReturnHome = 0x80240C4C; // type:func rom:0xC3E83C +dgb_07_ClubbaNappingAI_FallAsleep = 0x80240DC4; // type:func rom:0xC3E9B4 +dgb_07_ClubbaNappingAI_Main = 0x80240E20; // type:func rom:0xC3EA10 +dgb_07_WanderMeleeAI_Main = 0x80241170; // type:func rom:0xC3ED60 dgb_07_entryList = 0x80241430; // type:data rom:0xC3F020 dgb_07_config = 0x80241450; // type:data rom:0xC3F040 dgb_07_80241490 = 0x80241490; // type:data rom:0xC3F080 @@ -18516,47 +18485,47 @@ dgb_07_npcGroup_80241A7C = 0x80241A7C; // type:data rom:0xC3F66C dgb_07_npcGroupList_80241E5C = 0x80241E5C; // type:data rom:0xC3FA4C D_80241E90_C3FA80 = 0x80241E90; // type:data rom:0xC3FA80 D_80241E98_C3FA88 = 0x80241E98; // type:data rom:0xC3FA88 -dgb_08_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xC3FDB0 -dgb_08_UnkFunc13 = 0x80240158; // type:func rom:0xC3FF08 -dgb_08_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC401B0 -dgb_08_UnkFunc14 = 0x802404C0; // type:func rom:0xC40270 -dgb_08_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xC4042C -dgb_08_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC404E0 -dgb_08_NpcJumpFunc = 0x802407A4; // type:func rom:0xC40554 -dgb_08_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC405CC -dgb_08_UnkFunc15 = 0x8024094C; // type:func rom:0xC406FC -dgb_08_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xC4081C -dgb_08_UnkFunc16 = 0x80240AD4; // type:func rom:0xC40884 -dgb_08_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xC40944 -dgb_08_UnkNpcAIFunc6 = 0x80240E90; // type:func rom:0xC40C40 -dgb_08_UnkNpcAIFunc7 = 0x80240EFC; // type:func rom:0xC40CAC -dgb_08_UnkNpcAIFunc8 = 0x80240F6C; // type:func rom:0xC40D1C -dgb_08_UnkNpcAIFunc5 = 0x80241044; // type:func rom:0xC40DF4 -dgb_08_UnkNpcAIFunc26 = 0x80241098; // type:func rom:0xC40E48 -dgb_08_UnkFunc7 = 0x8024124C; // type:func rom:0xC40FFC -dgb_08_func_802414AC_C4125C = 0x802414AC; // type:func rom:0xC4125C -dgb_08_UnkNpcAIFunc23 = 0x80241760; // type:func rom:0xC41510 -dgb_08_UnkNpcAIFunc35 = 0x80241910; // type:func rom:0xC416C0 -dgb_08_UnkNpcAIFunc1_copy = 0x80241F38; // type:func rom:0xC41CE8 -dgb_08_UnkFunc4 = 0x80241FF8; // type:func rom:0xC41DA8 -dgb_08_UnkNpcAIFunc2 = 0x8024233C; // type:func rom:0xC420EC -dgb_08_SixFloatsFunc = 0x802423B4; // type:func rom:0xC42164 -dgb_08_UnkNpcAIFunc14 = 0x80242420; // type:func rom:0xC421D0 -dgb_08_UnkNpcAIFunc3 = 0x80242554; // type:func rom:0xC42304 -dgb_08_UnkFunc6 = 0x802425B8; // type:func rom:0xC42368 -dgb_08_UnkFunc5 = 0x80242948; // type:func rom:0xC426F8 -dgb_08_UnkNpcAIMainFunc9 = 0x80242A6C; // type:func rom:0xC4281C -dgb_08_func_80242C58_C42A08 = 0x80242C58; // type:func rom:0xC42A08 -dgb_08_func_80242DB0_C42B60 = 0x80242DB0; // type:func rom:0xC42B60 -dgb_08_func_80242EB4_C42C64 = 0x80242EB4; // type:func rom:0xC42C64 -dgb_08_func_80242F94_C42D44 = 0x80242F94; // type:func rom:0xC42D44 -dgb_08_func_80243230_C42FE0 = 0x80243230; // type:func rom:0xC42FE0 -dgb_08_func_802432E8_C43098 = 0x802432E8; // type:func rom:0xC43098 -dgb_08_filemenu_update_show_options_right_C43218 = 0x80243468; // type:func rom:0xC43218 -dgb_08_func_802434B0_C43260 = 0x802434B0; // type:func rom:0xC43260 -dgb_08_func_80243530_C432E0 = 0x80243530; // type:func rom:0xC432E0 -dgb_08_func_802435D8_C43388 = 0x802435D8; // type:func rom:0xC43388 -dgb_08_func_802438F0_C436A0 = 0x802438F0; // type:func rom:0xC436A0 +dgb_08_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xC3FDB0 +dgb_08_PatrolAI_Move = 0x80240158; // type:func rom:0xC3FF08 +dgb_08_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xC401B0 +dgb_08_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xC40270 +dgb_08_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xC4042C +dgb_08_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xC404E0 +dgb_08_PatrolAI_Jump = 0x802407A4; // type:func rom:0xC40554 +dgb_08_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xC405CC +dgb_08_PatrolAI_Chase = 0x8024094C; // type:func rom:0xC406FC +dgb_08_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xC4081C +dgb_08_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xC40884 +dgb_08_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xC40944 +dgb_08_MeleeHitbox_30 = 0x80240E90; // type:func rom:0xC40C40 +dgb_08_MeleeHitbox_31 = 0x80240EFC; // type:func rom:0xC40CAC +dgb_08_MeleeHitbox_32 = 0x80240F6C; // type:func rom:0xC40D1C +dgb_08_MeleeHitbox_33 = 0x80241044; // type:func rom:0xC40DF4 +dgb_08_MeleeHitbox_CanSeePlayer = 0x80241098; // type:func rom:0xC40E48 +dgb_08_MeleeHitbox_Main = 0x8024124C; // type:func rom:0xC40FFC +dgb_08_WanderMeleeAI_Main = 0x802414AC; // type:func rom:0xC4125C +dgb_08_FlyingAI_WanderInit = 0x80241760; // type:func rom:0xC41510 +dgb_08_FlyingAI_Wander = 0x80241910; // type:func rom:0xC416C0 +dgb_08_FlyingAI_LoiterInit = 0x80241F38; // type:func rom:0xC41CE8 +dgb_08_FlyingAI_Loiter = 0x80241FF8; // type:func rom:0xC41DA8 +dgb_08_FlyingAI_JumpInit = 0x8024233C; // type:func rom:0xC420EC +dgb_08_FlyingAI_Jump = 0x802423B4; // type:func rom:0xC42164 +dgb_08_FlyingAI_ChaseInit = 0x80242420; // type:func rom:0xC421D0 +dgb_08_FlyingAI_Chase = 0x80242554; // type:func rom:0xC42304 +dgb_08_FlyingAI_LosePlayer = 0x802425B8; // type:func rom:0xC42368 +dgb_08_FlyingAI_Init = 0x80242948; // type:func rom:0xC426F8 +dgb_08_FlyingAI_Main = 0x80242A6C; // type:func rom:0xC4281C +dgb_08_SentinelAI_ChaseInit = 0x80242C58; // type:func rom:0xC42A08 +dgb_08_SentinelAI_Chase = 0x80242DB0; // type:func rom:0xC42B60 +dgb_08_SentinelAI_DescendInit = 0x80242EB4; // type:func rom:0xC42C64 +dgb_08_SentinelAI_Descend = 0x80242F94; // type:func rom:0xC42D44 +dgb_08_SentinelAI_LosePlayerInit = 0x80243230; // type:func rom:0xC42FE0 +dgb_08_SentinelAI_LosePlayer = 0x802432E8; // type:func rom:0xC43098 +dgb_08_SentinelAI_PostLosePlayer = 0x80243468; // type:func rom:0xC43218 +dgb_08_SentinelAI_GrabPlayer = 0x802434B0; // type:func rom:0xC43260 +dgb_08_SentinelAI_ReturnHomeInit = 0x80243530; // type:func rom:0xC432E0 +dgb_08_SentinelAI_ReturnHome = 0x802435D8; // type:func rom:0xC43388 +dgb_08_SentinelAI_Main = 0x802438F0; // type:func rom:0xC436A0 dgb_08_UnkFunc1 = 0x80243B6C; // type:func rom:0xC4391C dgb_08_func_80243B98_C43948 = 0x80243B98; // type:func rom:0xC43948 dgb_08_func_80243C10_C439C0 = 0x80243C10; // type:func rom:0xC439C0 @@ -18581,7 +18550,7 @@ dgb_08_npcAI_802442F0 = 0x802442F0; // type:data rom:0xC440A0 dgb_08_npcSettings_80244360 = 0x80244360; // type:data rom:0xC44110 dgb_08_npcAI_8024438C = 0x8024438C; // type:data rom:0xC4413C dgb_08_npcSettings_80244434 = 0x80244434; // type:data rom:0xC441E4 -dgb_08_sixFloats = 0x80244460; // type:data rom:0xC44210 +dgb_08_FlyingAI_JumpVels = 0x80244460; // type:data rom:0xC44210 dgb_08_80244478 = 0x80244478; // type:data rom:0xC44228 dgb_08_npcAISettings_802444B4 = 0x802444B4; // type:data rom:0xC44264 dgb_08_npcAI_802444E4 = 0x802444E4; // type:data rom:0xC44294 @@ -18623,44 +18592,44 @@ D_80246D90_C46B40 = 0x80246D90; // type:data rom:0xC46B40 D_80246D98_C46B48 = 0x80246D98; // type:data rom:0xC46B48 dgb_08_dgb_00_name_hack = 0x80246E20; // type:data rom:0xC46BD0 dgb_08_dgb_01_name_hack = 0x80246E28; // type:data rom:0xC46BD8 -dgb_09_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC46BE0 -dgb_09_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC46C4C -dgb_09_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC46CBC -dgb_09_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC46D94 -dgb_09_UnkNpcAIFunc26 = 0x80240208; // type:func rom:0xC46DE8 -dgb_09_UnkFunc7 = 0x802403BC; // type:func rom:0xC46F9C -dgb_09_func_8024061C_C471FC = 0x8024061C; // type:func rom:0xC471FC -dgb_09_func_802408D0_C474B0 = 0x802408D0; // type:func rom:0xC474B0 -dgb_09_func_80240958_C47538 = 0x80240958; // type:func rom:0xC47538 -dgb_09_func_80240C10_C477F0 = 0x80240C10; // type:func rom:0xC477F0 -dgb_09_func_80240C74_C47854 = 0x80240C74; // type:func rom:0xC47854 -dgb_09_func_80240D1C_C478FC = 0x80240D1C; // type:func rom:0xC478FC -dgb_09_func_80240E54_C47A34 = 0x80240E54; // type:func rom:0xC47A34 -dgb_09_func_80240F00_C47AE0 = 0x80240F00; // type:func rom:0xC47AE0 -dgb_09_func_80241078_C47C58 = 0x80241078; // type:func rom:0xC47C58 -dgb_09_func_802410D4_C47CB4 = 0x802410D4; // type:func rom:0xC47CB4 -dgb_09_UnkNpcAIFunc23 = 0x80241424; // type:func rom:0xC48004 -dgb_09_UnkNpcAIFunc35 = 0x802415D4; // type:func rom:0xC481B4 -dgb_09_UnkNpcAIFunc1_copy = 0x80241BFC; // type:func rom:0xC487DC -dgb_09_UnkFunc4 = 0x80241CBC; // type:func rom:0xC4889C -dgb_09_UnkNpcAIFunc2 = 0x80242000; // type:func rom:0xC48BE0 -dgb_09_SixFloatsFunc = 0x80242078; // type:func rom:0xC48C58 -dgb_09_UnkNpcAIFunc14 = 0x802420E4; // type:func rom:0xC48CC4 -dgb_09_UnkNpcAIFunc3 = 0x80242218; // type:func rom:0xC48DF8 -dgb_09_UnkFunc6 = 0x8024227C; // type:func rom:0xC48E5C -dgb_09_UnkFunc5 = 0x8024260C; // type:func rom:0xC491EC -dgb_09_UnkNpcAIMainFunc9 = 0x80242730; // type:func rom:0xC49310 -dgb_09_func_8024291C_C494FC = 0x8024291C; // type:func rom:0xC494FC -dgb_09_func_80242A74_C49654 = 0x80242A74; // type:func rom:0xC49654 -dgb_09_func_80242B78_C49758 = 0x80242B78; // type:func rom:0xC49758 -dgb_09_func_80242C1C_C497FC = 0x80242C1C; // type:func rom:0xC497FC -dgb_09_func_80242EB8_C49A98 = 0x80242EB8; // type:func rom:0xC49A98 -dgb_09_func_80242F70_C49B50 = 0x80242F70; // type:func rom:0xC49B50 -dgb_09_func_802430F0_C49CD0 = 0x802430F0; // type:func rom:0xC49CD0 -dgb_09_func_80243138_C49D18 = 0x80243138; // type:func rom:0xC49D18 -dgb_09_func_802431B8_C49D98 = 0x802431B8; // type:func rom:0xC49D98 -dgb_09_func_80243260_C49E40 = 0x80243260; // type:func rom:0xC49E40 -dgb_09_func_80243578_C4A158 = 0x80243578; // type:func rom:0xC4A158 +dgb_09_MeleeHitbox_30 = 0x80240000; // type:func rom:0xC46BE0 +dgb_09_MeleeHitbox_31 = 0x8024006C; // type:func rom:0xC46C4C +dgb_09_MeleeHitbox_32 = 0x802400DC; // type:func rom:0xC46CBC +dgb_09_MeleeHitbox_33 = 0x802401B4; // type:func rom:0xC46D94 +dgb_09_MeleeHitbox_CanSeePlayer = 0x80240208; // type:func rom:0xC46DE8 +dgb_09_MeleeHitbox_Main = 0x802403BC; // type:func rom:0xC46F9C +dgb_09_WanderMeleeAI_Main = 0x8024061C; // type:func rom:0xC471FC +dgb_09_ClubbaNappingAI_Init = 0x802408D0; // type:func rom:0xC474B0 +dgb_09_ClubbaNappingAI_Sleep = 0x80240958; // type:func rom:0xC47538 +dgb_09_ClubbaNappingAI_WakeUp = 0x80240C10; // type:func rom:0xC477F0 +dgb_09_ClubbaNappingAI_LoiterInit = 0x80240C74; // type:func rom:0xC47854 +dgb_09_ClubbaNappingAI_Loiter = 0x80240D1C; // type:func rom:0xC478FC +dgb_09_ClubbaNappingAI_ReturnHomeInit = 0x80240E54; // type:func rom:0xC47A34 +dgb_09_ClubbaNappingAI_ReturnHome = 0x80240F00; // type:func rom:0xC47AE0 +dgb_09_ClubbaNappingAI_FallAsleep = 0x80241078; // type:func rom:0xC47C58 +dgb_09_ClubbaNappingAI_Main = 0x802410D4; // type:func rom:0xC47CB4 +dgb_09_FlyingAI_WanderInit = 0x80241424; // type:func rom:0xC48004 +dgb_09_FlyingAI_Wander = 0x802415D4; // type:func rom:0xC481B4 +dgb_09_FlyingAI_LoiterInit = 0x80241BFC; // type:func rom:0xC487DC +dgb_09_FlyingAI_Loiter = 0x80241CBC; // type:func rom:0xC4889C +dgb_09_FlyingAI_JumpInit = 0x80242000; // type:func rom:0xC48BE0 +dgb_09_FlyingAI_Jump = 0x80242078; // type:func rom:0xC48C58 +dgb_09_FlyingAI_ChaseInit = 0x802420E4; // type:func rom:0xC48CC4 +dgb_09_FlyingAI_Chase = 0x80242218; // type:func rom:0xC48DF8 +dgb_09_FlyingAI_LosePlayer = 0x8024227C; // type:func rom:0xC48E5C +dgb_09_FlyingAI_Init = 0x8024260C; // type:func rom:0xC491EC +dgb_09_FlyingAI_Main = 0x80242730; // type:func rom:0xC49310 +dgb_09_SentinelAI_ChaseInit = 0x8024291C; // type:func rom:0xC494FC +dgb_09_SentinelAI_Chase = 0x80242A74; // type:func rom:0xC49654 +dgb_09_SentinelAI_DescendInit = 0x80242B78; // type:func rom:0xC49758 +dgb_09_SentinelAI_Descend = 0x80242C1C; // type:func rom:0xC497FC +dgb_09_SentinelAI_LosePlayerInit = 0x80242EB8; // type:func rom:0xC49A98 +dgb_09_SentinelAI_LosePlayer = 0x80242F70; // type:func rom:0xC49B50 +dgb_09_SentinelAI_PostLosePlayer = 0x802430F0; // type:func rom:0xC49CD0 +dgb_09_SentinelAI_GrabPlayer = 0x80243138; // type:func rom:0xC49D18 +dgb_09_SentinelAI_ReturnHomeInit = 0x802431B8; // type:func rom:0xC49D98 +dgb_09_SentinelAI_ReturnHome = 0x80243260; // type:func rom:0xC49E40 +dgb_09_SentinelAI_Main = 0x80243578; // type:func rom:0xC4A158 dgb_09_entryList = 0x80243800; // type:data rom:0xC4A3E0 dgb_09_config = 0x80243840; // type:data rom:0xC4A420 dgb_09_80243880 = 0x80243880; // type:data rom:0xC4A460 @@ -18685,7 +18654,7 @@ dgb_09_npcAI_802441E8 = 0x802441E8; // type:data rom:0xC4ADC8 dgb_09_npcSettings_80244258 = 0x80244258; // type:data rom:0xC4AE38 dgb_09_npcAI_80244284 = 0x80244284; // type:data rom:0xC4AE64 dgb_09_npcSettings_8024432C = 0x8024432C; // type:data rom:0xC4AF0C -dgb_09_sixFloats = 0x80244358; // type:data rom:0xC4AF38 +dgb_09_FlyingAI_JumpVels = 0x80244358; // type:data rom:0xC4AF38 dgb_09_80244370 = 0x80244370; // type:data rom:0xC4AF50 dgb_09_npcAISettings_802443AC = 0x802443AC; // type:data rom:0xC4AF8C dgb_09_npcAI_802443DC = 0x802443DC; // type:data rom:0xC4AFBC @@ -18775,25 +18744,25 @@ dgb_14_exitDoubleDoor_802401B4 = 0x802401B4; // type:data rom:0xC4F1E4 dgb_14_enterDoubleDoor_80240268 = 0x80240268; // type:data rom:0xC4F298 dgb_14_main = 0x8024038C; // type:data rom:0xC4F3BC dgb_14_makeEntities = 0x80240480; // type:data rom:0xC4F4B0 -dgb_15_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC4F510 -dgb_15_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC4F57C -dgb_15_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC4F5EC -dgb_15_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC4F6C4 -dgb_15_UnkNpcAIFunc26 = 0x80240208; // type:func rom:0xC4F718 -dgb_15_UnkFunc7 = 0x802403BC; // type:func rom:0xC4F8CC -dgb_15_func_8024061C_C4FB2C = 0x8024061C; // type:func rom:0xC4FB2C -dgb_15_UnkNpcAIFunc24 = 0x802408D0; // type:func rom:0xC4FDE0 -dgb_15_UnkFunc13 = 0x80240A28; // type:func rom:0xC4FF38 -dgb_15_UnkNpcAIFunc1 = 0x80240CD0; // type:func rom:0xC501E0 -dgb_15_UnkFunc14 = 0x80240D90; // type:func rom:0xC502A0 -dgb_15_UnkNpcAIFunc25 = 0x80240F4C; // type:func rom:0xC5045C -dgb_15_NpcJumpFunc2 = 0x80241000; // type:func rom:0xC50510 -dgb_15_NpcJumpFunc = 0x80241074; // type:func rom:0xC50584 -dgb_15_UnkNpcAIFunc13 = 0x802410EC; // type:func rom:0xC505FC -dgb_15_UnkFunc15 = 0x8024121C; // type:func rom:0xC5072C -dgb_15_UnkNpcDurationFlagFunc = 0x8024133C; // type:func rom:0xC5084C -dgb_15_UnkFunc16 = 0x802413A4; // type:func rom:0xC508B4 -dgb_15_UnkNpcAIMainFunc = 0x80241464; // type:func rom:0xC50974 +dgb_15_MeleeHitbox_30 = 0x80240000; // type:func rom:0xC4F510 +dgb_15_MeleeHitbox_31 = 0x8024006C; // type:func rom:0xC4F57C +dgb_15_MeleeHitbox_32 = 0x802400DC; // type:func rom:0xC4F5EC +dgb_15_MeleeHitbox_33 = 0x802401B4; // type:func rom:0xC4F6C4 +dgb_15_MeleeHitbox_CanSeePlayer = 0x80240208; // type:func rom:0xC4F718 +dgb_15_MeleeHitbox_Main = 0x802403BC; // type:func rom:0xC4F8CC +dgb_15_WanderMeleeAI_Main = 0x8024061C; // type:func rom:0xC4FB2C +dgb_15_PatrolAI_MoveInit = 0x802408D0; // type:func rom:0xC4FDE0 +dgb_15_PatrolAI_Move = 0x80240A28; // type:func rom:0xC4FF38 +dgb_15_PatrolAI_LoiterInit = 0x80240CD0; // type:func rom:0xC501E0 +dgb_15_PatrolAI_Loiter = 0x80240D90; // type:func rom:0xC502A0 +dgb_15_PatrolAI_PostLoiter = 0x80240F4C; // type:func rom:0xC5045C +dgb_15_PatrolAI_JumpInit = 0x80241000; // type:func rom:0xC50510 +dgb_15_PatrolAI_Jump = 0x80241074; // type:func rom:0xC50584 +dgb_15_PatrolAI_ChaseInit = 0x802410EC; // type:func rom:0xC505FC +dgb_15_PatrolAI_Chase = 0x8024121C; // type:func rom:0xC5072C +dgb_15_PatrolAI_LosePlayer = 0x8024133C; // type:func rom:0xC5084C +dgb_15_PatrolNoAttackAI_15 = 0x802413A4; // type:func rom:0xC508B4 +dgb_15_PatrolNoAttackAI_Main = 0x80241464; // type:func rom:0xC50974 dgb_15_UnkFunc1 = 0x80241760; // type:func rom:0xC50C70 dgb_15_GetEntityPosition = 0x80241790; // type:func rom:0xC50CA0 dgb_15_SetEntityFlags100000 = 0x80241830; // type:func rom:0xC50D40 @@ -18833,22 +18802,22 @@ D_80242CF0_C52200 = 0x80242CF0; // type:data rom:0xC52200 D_80242E88_C52398 = 0x80242E88; // type:data rom:0xC52398 D_80242E90_C523A0 = 0x80242E90; // type:data rom:0xC523A0 dgb_15_dgb_14_name_hack = 0x80243028; // type:data rom:0xC52538 -dgb_16_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC52540 -dgb_16_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC525AC -dgb_16_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC5261C -dgb_16_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC526F4 -dgb_16_UnkNpcAIFunc26 = 0x80240208; // type:func rom:0xC52748 -dgb_16_UnkFunc7 = 0x802403BC; // type:func rom:0xC528FC -dgb_16_func_8024061C_C52B5C = 0x8024061C; // type:func rom:0xC52B5C -dgb_16_func_802406A4_C52BE4 = 0x802406A4; // type:func rom:0xC52BE4 -dgb_16_func_8024095C_C52E9C = 0x8024095C; // type:func rom:0xC52E9C -dgb_16_func_802409C0_C52F00 = 0x802409C0; // type:func rom:0xC52F00 -dgb_16_func_80240A68_C52FA8 = 0x80240A68; // type:func rom:0xC52FA8 -dgb_16_func_80240BA0_C530E0 = 0x80240BA0; // type:func rom:0xC530E0 -dgb_16_func_80240C4C_C5318C = 0x80240C4C; // type:func rom:0xC5318C -dgb_16_func_80240DC4_C53304 = 0x80240DC4; // type:func rom:0xC53304 -dgb_16_func_80240E20_C53360 = 0x80240E20; // type:func rom:0xC53360 -dgb_16_func_80241170_C536B0 = 0x80241170; // type:func rom:0xC536B0 +dgb_16_MeleeHitbox_30 = 0x80240000; // type:func rom:0xC52540 +dgb_16_MeleeHitbox_31 = 0x8024006C; // type:func rom:0xC525AC +dgb_16_MeleeHitbox_32 = 0x802400DC; // type:func rom:0xC5261C +dgb_16_MeleeHitbox_33 = 0x802401B4; // type:func rom:0xC526F4 +dgb_16_MeleeHitbox_CanSeePlayer = 0x80240208; // type:func rom:0xC52748 +dgb_16_MeleeHitbox_Main = 0x802403BC; // type:func rom:0xC528FC +dgb_16_ClubbaNappingAI_Init = 0x8024061C; // type:func rom:0xC52B5C +dgb_16_ClubbaNappingAI_Sleep = 0x802406A4; // type:func rom:0xC52BE4 +dgb_16_ClubbaNappingAI_WakeUp = 0x8024095C; // type:func rom:0xC52E9C +dgb_16_ClubbaNappingAI_LoiterInit = 0x802409C0; // type:func rom:0xC52F00 +dgb_16_ClubbaNappingAI_Loiter = 0x80240A68; // type:func rom:0xC52FA8 +dgb_16_ClubbaNappingAI_ReturnHomeInit = 0x80240BA0; // type:func rom:0xC530E0 +dgb_16_ClubbaNappingAI_ReturnHome = 0x80240C4C; // type:func rom:0xC5318C +dgb_16_ClubbaNappingAI_FallAsleep = 0x80240DC4; // type:func rom:0xC53304 +dgb_16_ClubbaNappingAI_Main = 0x80240E20; // type:func rom:0xC53360 +dgb_16_WanderMeleeAI_Main = 0x80241170; // type:func rom:0xC536B0 dgb_16_entryList = 0x80241430; // type:data rom:0xC53970 dgb_16_config = 0x80241440; // type:data rom:0xC53980 dgb_16_80241480 = 0x80241480; // type:data rom:0xC539C0 @@ -18883,18 +18852,18 @@ dgb_17_80240268 = 0x80240268; // type:data rom:0xC55CC8 dgb_17_enterDoubleDoor_802402B0 = 0x802402B0; // type:data rom:0xC55D10 dgb_17_main = 0x802403B8; // type:data rom:0xC55E18 dgb_17_makeEntities = 0x80240470; // type:data rom:0xC55ED0 -dgb_18_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xC55F40 -dgb_18_UnkFunc13 = 0x80240158; // type:func rom:0xC56098 -dgb_18_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC56340 -dgb_18_UnkFunc14 = 0x802404C0; // type:func rom:0xC56400 -dgb_18_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xC565BC -dgb_18_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC56670 -dgb_18_NpcJumpFunc = 0x802407A4; // type:func rom:0xC566E4 -dgb_18_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC5675C -dgb_18_UnkFunc15 = 0x8024094C; // type:func rom:0xC5688C -dgb_18_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xC569AC -dgb_18_UnkFunc16 = 0x80240AD4; // type:func rom:0xC56A14 -dgb_18_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xC56AD4 +dgb_18_PatrolAI_MoveInit = 0x80240000; // type:func rom:0xC55F40 +dgb_18_PatrolAI_Move = 0x80240158; // type:func rom:0xC56098 +dgb_18_PatrolAI_LoiterInit = 0x80240400; // type:func rom:0xC56340 +dgb_18_PatrolAI_Loiter = 0x802404C0; // type:func rom:0xC56400 +dgb_18_PatrolAI_PostLoiter = 0x8024067C; // type:func rom:0xC565BC +dgb_18_PatrolAI_JumpInit = 0x80240730; // type:func rom:0xC56670 +dgb_18_PatrolAI_Jump = 0x802407A4; // type:func rom:0xC566E4 +dgb_18_PatrolAI_ChaseInit = 0x8024081C; // type:func rom:0xC5675C +dgb_18_PatrolAI_Chase = 0x8024094C; // type:func rom:0xC5688C +dgb_18_PatrolAI_LosePlayer = 0x80240A6C; // type:func rom:0xC569AC +dgb_18_PatrolNoAttackAI_15 = 0x80240AD4; // type:func rom:0xC56A14 +dgb_18_PatrolNoAttackAI_Main = 0x80240B94; // type:func rom:0xC56AD4 dgb_18_UnkFunc1 = 0x80240E90; // type:func rom:0xC56DD0 dgb_18_func_80240EBC_C56DFC = 0x80240EBC; // type:func rom:0xC56DFC dgb_18_StashVars = 0x80240FB0; // type:func rom:0xC56EF0 @@ -18940,21 +18909,21 @@ func_80240310_C5AA50 = 0x80240310; // type:func rom:0xC5AA50 kzn_02_GetFloorCollider = 0x80240384; // type:func rom:0xC5AAC4 func_802403B0_C5AAF0 = 0x802403B0; // type:func rom:0xC5AAF0 func_802403DC_C5AB1C = 0x802403DC; // type:func rom:0xC5AB1C -kzn_02_UnkNpcAIFunc23 = 0x802404E0; // type:func rom:0xC5AC20 -kzn_02_UnkNpcAIFunc35 = 0x80240690; // type:func rom:0xC5ADD0 -kzn_02_UnkNpcAIFunc1_copy = 0x80240CB8; // type:func rom:0xC5B3F8 -kzn_02_UnkFunc4 = 0x80240D78; // type:func rom:0xC5B4B8 -kzn_02_UnkNpcAIFunc2 = 0x802410BC; // type:func rom:0xC5B7FC -kzn_02_SixFloatsFunc = 0x80241134; // type:func rom:0xC5B874 -kzn_02_UnkNpcAIFunc14 = 0x802411A0; // type:func rom:0xC5B8E0 -kzn_02_UnkNpcAIFunc3 = 0x802412D4; // type:func rom:0xC5BA14 -kzn_02_UnkFunc6 = 0x80241338; // type:func rom:0xC5BA78 -kzn_02_UnkFunc5 = 0x802416C8; // type:func rom:0xC5BE08 -kzn_02_UnkNpcAIMainFunc9 = 0x802417EC; // type:func rom:0xC5BF2C -kzn_02_UnkNpcAIFunc13 = 0x802419D8; // type:func rom:0xC5C118 -kzn_02_UnkNpcAIFunc34 = 0x80241B08; // type:func rom:0xC5C248 -kzn_02_UnkFunc45 = 0x80241D88; // type:func rom:0xC5C4C8 -kzn_02_UnkNpcAIMainFunc10 = 0x80241DE4; // type:func rom:0xC5C524 +kzn_02_FlyingAI_WanderInit = 0x802404E0; // type:func rom:0xC5AC20 +kzn_02_FlyingAI_Wander = 0x80240690; // type:func rom:0xC5ADD0 +kzn_02_FlyingAI_LoiterInit = 0x80240CB8; // type:func rom:0xC5B3F8 +kzn_02_FlyingAI_Loiter = 0x80240D78; // type:func rom:0xC5B4B8 +kzn_02_FlyingAI_JumpInit = 0x802410BC; // type:func rom:0xC5B7FC +kzn_02_FlyingAI_Jump = 0x80241134; // type:func rom:0xC5B874 +kzn_02_FlyingAI_ChaseInit = 0x802411A0; // type:func rom:0xC5B8E0 +kzn_02_FlyingAI_Chase = 0x802412D4; // type:func rom:0xC5BA14 +kzn_02_FlyingAI_LosePlayer = 0x80241338; // type:func rom:0xC5BA78 +kzn_02_FlyingAI_Init = 0x802416C8; // type:func rom:0xC5BE08 +kzn_02_FlyingAI_Main = 0x802417EC; // type:func rom:0xC5BF2C +kzn_02_FlyingNoAttackAI_12 = 0x802419D8; // type:func rom:0xC5C118 +kzn_02_FlyingNoAttackAI_13 = 0x80241B08; // type:func rom:0xC5C248 +kzn_02_FlyingNoAttackAI_20 = 0x80241D88; // type:func rom:0xC5C4C8 +kzn_02_FlyingNoAttackAI_Main = 0x80241DE4; // type:func rom:0xC5C524 kzn_02_StashVars = 0x80241FCC; // type:func rom:0xC5C70C kzn_02_GetItemName = 0x80242080; // type:func rom:0xC5C7C0 kzn_02_GetNpcCollisionHeight = 0x802420E4; // type:func rom:0xC5C824 @@ -18962,12 +18931,12 @@ kzn_02_AddPlayerHandsOffset = 0x80242140; // type:func rom:0xC5C880 func_80242310_C5CA50 = 0x80242310; // type:func rom:0xC5CA50 func_80242364_C5CAA4 = 0x80242364; // type:func rom:0xC5CAA4 func_8024239C_C5CADC = 0x8024239C; // type:func rom:0xC5CADC -kzn_02_SetManyVars = 0x80242438; // type:func rom:0xC5CB78 -kzn_02_UnkYawFunc = 0x80242528; // type:func rom:0xC5CC68 -func_802426B4_C5CDF4 = 0x802426B4; // type:func rom:0xC5CDF4 -func_802426F8_C5CE38 = 0x802426F8; // type:func rom:0xC5CE38 +kzn_02_LetterDelivery_Init = 0x80242438; // type:func rom:0xC5CB78 +kzn_02_LetterDelivery_CalcLetterPos = 0x80242528; // type:func rom:0xC5CC68 +kzn_02_LetterDelivery_SaveNpcAnim = 0x802426B4; // type:func rom:0xC5CDF4 +kzn_02_LetterDelivery_RestoreNpcAnim = 0x802426F8; // type:func rom:0xC5CE38 func_80242730_C5CE70 = 0x80242730; // type:func rom:0xC5CE70 -kzn_02_sixFloats = 0x80244900; // type:data rom:0xC5F040 +kzn_02_FlyingAI_JumpVels = 0x80244900; // type:data rom:0xC5F040 kzn_02_varStash = 0x80244A10; // type:data rom:0xC5F150 D_80244A74_C5F1B4 = 0x80244A74; // type:data rom:0xC5F1B4 D_80244A78_C5F1B8 = 0x80244A78; // type:data rom:0xC5F1B8 @@ -18982,25 +18951,25 @@ kzn_03_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xC61020 kzn_03_UnkDistFunc = 0x8024038C; // type:func rom:0xC6109C kzn_03_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xC611D0 kzn_03_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xC61334 -kzn_03_UnkNpcAIMainFunc5 = 0x802406A4; // type:func rom:0xC613B4 +kzn_03_TackleAI_Main = 0x802406A4; // type:func rom:0xC613B4 kzn_03_func_80240814_97BE44 = 0x80240AE4; // type:func rom:0xC617F4 kzn_03_AwaitPlayerNearNpc = 0x80240B2C; // type:func rom:0xC6183C kzn_03_func_802408B4_97BEE4 = 0x80240B84; // type:func rom:0xC61894 -kzn_03_UnkNpcAIFunc6 = 0x80240BF8; // type:func rom:0xC61908 -kzn_03_UnkNpcAIFunc7 = 0x80240C64; // type:func rom:0xC61974 -kzn_03_UnkNpcAIFunc8 = 0x80240CD4; // type:func rom:0xC619E4 -kzn_03_UnkNpcAIFunc5 = 0x80240DAC; // type:func rom:0xC61ABC -kzn_03_UnkNpcAIFunc26 = 0x80240E00; // type:func rom:0xC61B10 -kzn_03_UnkFunc7 = 0x80240FB4; // type:func rom:0xC61CC4 -kzn_03_UnkNpcAIFunc27 = 0x80241214; // type:func rom:0xC61F24 -kzn_03_UnkNpcAIFunc31 = 0x802414C8; // type:func rom:0xC621D8 -kzn_03_UnkNpcAIFunc32 = 0x80241534; // type:func rom:0xC62244 -kzn_03_UnkNpcAIFunc46 = 0x80241630; // type:func rom:0xC62340 -kzn_03_UnkNpcDurationFlagFunc3 = 0x80242070; // type:func rom:0xC62D80 -kzn_03_UnkNpcAIFunc33 = 0x80242100; // type:func rom:0xC62E10 -kzn_03_UnkNpcDurationFlagFunc2 = 0x80242200; // type:func rom:0xC62F10 -kzn_03_UnkNpcAIFunc30 = 0x80242260; // type:func rom:0xC62F70 -func_8024234C_C6305C = 0x8024234C; // type:func rom:0xC6305C +kzn_03_MeleeHitbox_30 = 0x80240BF8; // type:func rom:0xC61908 +kzn_03_MeleeHitbox_31 = 0x80240C64; // type:func rom:0xC61974 +kzn_03_MeleeHitbox_32 = 0x80240CD4; // type:func rom:0xC619E4 +kzn_03_MeleeHitbox_33 = 0x80240DAC; // type:func rom:0xC61ABC +kzn_03_MeleeHitbox_CanSeePlayer = 0x80240E00; // type:func rom:0xC61B10 +kzn_03_MeleeHitbox_Main = 0x80240FB4; // type:func rom:0xC61CC4 +kzn_03_WanderMeleeAI_Main = 0x80241214; // type:func rom:0xC61F24 +kzn_03_PiranhaPlantAI_00 = 0x802414C8; // type:func rom:0xC621D8 +kzn_03_PiranhaPlantAI_01 = 0x80241534; // type:func rom:0xC62244 +kzn_03_PiranhaPlantAI_10 = 0x80241630; // type:func rom:0xC62340 +kzn_03_PiranhaPlantAI_11 = 0x80242070; // type:func rom:0xC62D80 +kzn_03_PiranhaPlantAI_12 = 0x80242100; // type:func rom:0xC62E10 +kzn_03_PiranhaPlantAI_13 = 0x80242200; // type:func rom:0xC62F10 +kzn_03_PiranhaPlantAI_14 = 0x80242260; // type:func rom:0xC62F70 +kzn_03_PiranhaPlantAI_Main = 0x8024234C; // type:func rom:0xC6305C kzn_03_StashVars = 0x8024259C; // type:func rom:0xC632AC kzn_03_GetItemName = 0x80242650; // type:func rom:0xC63360 kzn_03_GetNpcCollisionHeight = 0x802426B4; // type:func rom:0xC633C4 @@ -19008,10 +18977,10 @@ kzn_03_AddPlayerHandsOffset = 0x80242710; // type:func rom:0xC63420 func_802428E0_C635F0 = 0x802428E0; // type:func rom:0xC635F0 func_80242934_C63644 = 0x80242934; // type:func rom:0xC63644 func_8024296C_C6367C = 0x8024296C; // type:func rom:0xC6367C -kzn_03_SetManyVars = 0x80242A08; // type:func rom:0xC63718 -kzn_03_UnkYawFunc = 0x80242AF8; // type:func rom:0xC63808 -func_80242C84_C63994 = 0x80242C84; // type:func rom:0xC63994 -func_80242CC8_C639D8 = 0x80242CC8; // type:func rom:0xC639D8 +kzn_03_LetterDelivery_Init = 0x80242A08; // type:func rom:0xC63718 +kzn_03_LetterDelivery_CalcLetterPos = 0x80242AF8; // type:func rom:0xC63808 +kzn_03_LetterDelivery_SaveNpcAnim = 0x80242C84; // type:func rom:0xC63994 +kzn_03_LetterDelivery_RestoreNpcAnim = 0x80242CC8; // type:func rom:0xC639D8 kzn_03_UnsetCamera0MoveFlag1 = 0x80242D00; // type:func rom:0xC63A10 kzn_03_SetCamera0MoveFlag1 = 0x80242D1C; // type:func rom:0xC63A2C func_80242D38_C63A48 = 0x80242D38; // type:func rom:0xC63A48 @@ -19077,24 +19046,24 @@ kzn_07_UpdateTexturePanSmooth = 0x8024040C; // type:func rom:0xC6E73C kzn_07_UpdateTexturePanStepped = 0x80240530; // type:func rom:0xC6E860 func_80240720_C6EA50 = 0x80240720; // type:func rom:0xC6EA50 func_802407F4_C6EB24 = 0x802407F4; // type:func rom:0xC6EB24 -kzn_07_UnkNpcAIFunc23 = 0x80240820; // type:func rom:0xC6EB50 -kzn_07_UnkNpcAIFunc35 = 0x802409D0; // type:func rom:0xC6ED00 -kzn_07_UnkNpcAIFunc1_copy = 0x80240FF8; // type:func rom:0xC6F328 -kzn_07_UnkFunc4 = 0x802410B8; // type:func rom:0xC6F3E8 -kzn_07_UnkNpcAIFunc2 = 0x802413FC; // type:func rom:0xC6F72C -kzn_07_SixFloatsFunc = 0x80241474; // type:func rom:0xC6F7A4 -kzn_07_UnkNpcAIFunc14 = 0x802414E0; // type:func rom:0xC6F810 -kzn_07_UnkNpcAIFunc3 = 0x80241614; // type:func rom:0xC6F944 -kzn_07_UnkFunc6 = 0x80241678; // type:func rom:0xC6F9A8 -kzn_07_UnkFunc5 = 0x80241A08; // type:func rom:0xC6FD38 -kzn_07_UnkNpcAIMainFunc9 = 0x80241B2C; // type:func rom:0xC6FE5C -kzn_07_UnkNpcAIFunc13 = 0x80241D18; // type:func rom:0xC70048 -kzn_07_UnkNpcAIFunc34 = 0x80241E48; // type:func rom:0xC70178 -kzn_07_UnkFunc45 = 0x802420C8; // type:func rom:0xC703F8 -kzn_07_UnkNpcAIMainFunc10 = 0x80242124; // type:func rom:0xC70454 +kzn_07_FlyingAI_WanderInit = 0x80240820; // type:func rom:0xC6EB50 +kzn_07_FlyingAI_Wander = 0x802409D0; // type:func rom:0xC6ED00 +kzn_07_FlyingAI_LoiterInit = 0x80240FF8; // type:func rom:0xC6F328 +kzn_07_FlyingAI_Loiter = 0x802410B8; // type:func rom:0xC6F3E8 +kzn_07_FlyingAI_JumpInit = 0x802413FC; // type:func rom:0xC6F72C +kzn_07_FlyingAI_Jump = 0x80241474; // type:func rom:0xC6F7A4 +kzn_07_FlyingAI_ChaseInit = 0x802414E0; // type:func rom:0xC6F810 +kzn_07_FlyingAI_Chase = 0x80241614; // type:func rom:0xC6F944 +kzn_07_FlyingAI_LosePlayer = 0x80241678; // type:func rom:0xC6F9A8 +kzn_07_FlyingAI_Init = 0x80241A08; // type:func rom:0xC6FD38 +kzn_07_FlyingAI_Main = 0x80241B2C; // type:func rom:0xC6FE5C +kzn_07_FlyingNoAttackAI_12 = 0x80241D18; // type:func rom:0xC70048 +kzn_07_FlyingNoAttackAI_13 = 0x80241E48; // type:func rom:0xC70178 +kzn_07_FlyingNoAttackAI_20 = 0x802420C8; // type:func rom:0xC703F8 +kzn_07_FlyingNoAttackAI_Main = 0x80242124; // type:func rom:0xC70454 D_802423E0_C70710 = 0x802423E0; // type:data rom:0xC70710 D_80242930_C70C60 = 0x80242930; // type:data rom:0xC70C60 -kzn_07_sixFloats = 0x80242B90; // type:data rom:0xC70EC0 +kzn_07_FlyingAI_JumpVels = 0x80242B90; // type:data rom:0xC70EC0 D_80243080_C713B0 = 0x80243080; // type:data rom:0xC713B0 D_80243090_C713C0 = 0x80243090; // type:data rom:0xC713C0 D_80243098_C713C8 = 0x80243098; // type:data rom:0xC713C8 @@ -19109,40 +19078,40 @@ kzn_08_StashVars = 0x80240790; // type:func rom:0xC71C10 kzn_08_GetItemName = 0x80240844; // type:func rom:0xC71CC4 kzn_08_SomeItemEntityFunc = 0x802408A8; // type:func rom:0xC71D28 kzn_08_CheckItemFlags40 = 0x802409F8; // type:func rom:0xC71E78 -kzn_08_UnkNpcAIFunc23 = 0x80240A50; // type:func rom:0xC71ED0 -kzn_08_UnkNpcAIFunc35 = 0x80240C00; // type:func rom:0xC72080 -kzn_08_UnkNpcAIFunc1_copy = 0x80241228; // type:func rom:0xC726A8 -kzn_08_UnkFunc4 = 0x802412E8; // type:func rom:0xC72768 -kzn_08_UnkNpcAIFunc2 = 0x8024162C; // type:func rom:0xC72AAC -kzn_08_SixFloatsFunc = 0x802416A4; // type:func rom:0xC72B24 -kzn_08_UnkNpcAIFunc14 = 0x80241710; // type:func rom:0xC72B90 -kzn_08_UnkNpcAIFunc3 = 0x80241844; // type:func rom:0xC72CC4 -kzn_08_UnkFunc6 = 0x802418A8; // type:func rom:0xC72D28 -kzn_08_UnkFunc5 = 0x80241C38; // type:func rom:0xC730B8 -kzn_08_UnkNpcAIMainFunc9 = 0x80241D5C; // type:func rom:0xC731DC -kzn_08_UnkNpcAIFunc13 = 0x80241F48; // type:func rom:0xC733C8 -kzn_08_UnkNpcAIFunc34 = 0x80242078; // type:func rom:0xC734F8 -kzn_08_UnkFunc45 = 0x802422F8; // type:func rom:0xC73778 -kzn_08_UnkNpcAIMainFunc10 = 0x80242354; // type:func rom:0xC737D4 -kzn_08_UnkNpcAIFunc6 = 0x8024253C; // type:func rom:0xC739BC -kzn_08_UnkNpcAIFunc7 = 0x802425A8; // type:func rom:0xC73A28 -kzn_08_UnkNpcAIFunc8 = 0x80242618; // type:func rom:0xC73A98 -kzn_08_UnkNpcAIFunc5 = 0x802426F0; // type:func rom:0xC73B70 -kzn_08_UnkNpcAIFunc26 = 0x80242744; // type:func rom:0xC73BC4 -kzn_08_UnkFunc7 = 0x802428F8; // type:func rom:0xC73D78 -kzn_08_UnkNpcAIFunc27 = 0x80242B58; // type:func rom:0xC73FD8 -kzn_08_UnkNpcAIFunc31 = 0x80242E0C; // type:func rom:0xC7428C -kzn_08_UnkNpcAIFunc32 = 0x80242E78; // type:func rom:0xC742F8 -kzn_08_UnkNpcAIFunc46 = 0x80242F74; // type:func rom:0xC743F4 -kzn_08_UnkNpcDurationFlagFunc3 = 0x802439B4; // type:func rom:0xC74E34 -kzn_08_UnkNpcAIFunc33 = 0x80243A44; // type:func rom:0xC74EC4 -kzn_08_UnkNpcDurationFlagFunc2 = 0x80243B44; // type:func rom:0xC74FC4 -kzn_08_UnkNpcAIFunc30 = 0x80243BA4; // type:func rom:0xC75024 -func_80243C90_C75110 = 0x80243C90; // type:func rom:0xC75110 +kzn_08_FlyingAI_WanderInit = 0x80240A50; // type:func rom:0xC71ED0 +kzn_08_FlyingAI_Wander = 0x80240C00; // type:func rom:0xC72080 +kzn_08_FlyingAI_LoiterInit = 0x80241228; // type:func rom:0xC726A8 +kzn_08_FlyingAI_Loiter = 0x802412E8; // type:func rom:0xC72768 +kzn_08_FlyingAI_JumpInit = 0x8024162C; // type:func rom:0xC72AAC +kzn_08_FlyingAI_Jump = 0x802416A4; // type:func rom:0xC72B24 +kzn_08_FlyingAI_ChaseInit = 0x80241710; // type:func rom:0xC72B90 +kzn_08_FlyingAI_Chase = 0x80241844; // type:func rom:0xC72CC4 +kzn_08_FlyingAI_LosePlayer = 0x802418A8; // type:func rom:0xC72D28 +kzn_08_FlyingAI_Init = 0x80241C38; // type:func rom:0xC730B8 +kzn_08_FlyingAI_Main = 0x80241D5C; // type:func rom:0xC731DC +kzn_08_FlyingNoAttackAI_12 = 0x80241F48; // type:func rom:0xC733C8 +kzn_08_FlyingNoAttackAI_13 = 0x80242078; // type:func rom:0xC734F8 +kzn_08_FlyingNoAttackAI_20 = 0x802422F8; // type:func rom:0xC73778 +kzn_08_FlyingNoAttackAI_Main = 0x80242354; // type:func rom:0xC737D4 +kzn_08_MeleeHitbox_30 = 0x8024253C; // type:func rom:0xC739BC +kzn_08_MeleeHitbox_31 = 0x802425A8; // type:func rom:0xC73A28 +kzn_08_MeleeHitbox_32 = 0x80242618; // type:func rom:0xC73A98 +kzn_08_MeleeHitbox_33 = 0x802426F0; // type:func rom:0xC73B70 +kzn_08_MeleeHitbox_CanSeePlayer = 0x80242744; // type:func rom:0xC73BC4 +kzn_08_MeleeHitbox_Main = 0x802428F8; // type:func rom:0xC73D78 +kzn_08_WanderMeleeAI_Main = 0x80242B58; // type:func rom:0xC73FD8 +kzn_08_PiranhaPlantAI_00 = 0x80242E0C; // type:func rom:0xC7428C +kzn_08_PiranhaPlantAI_01 = 0x80242E78; // type:func rom:0xC742F8 +kzn_08_PiranhaPlantAI_10 = 0x80242F74; // type:func rom:0xC743F4 +kzn_08_PiranhaPlantAI_11 = 0x802439B4; // type:func rom:0xC74E34 +kzn_08_PiranhaPlantAI_12 = 0x80243A44; // type:func rom:0xC74EC4 +kzn_08_PiranhaPlantAI_13 = 0x80243B44; // type:func rom:0xC74FC4 +kzn_08_PiranhaPlantAI_14 = 0x80243BA4; // type:func rom:0xC75024 +kzn_08_PiranhaPlantAI_Main = 0x80243C90; // type:func rom:0xC75110 func_80243EE0_C75360 = 0x80243EE0; // type:func rom:0xC75360 D_80244170_C755F0 = 0x80244170; // type:data rom:0xC755F0 kzn_08_varStash = 0x80244BB0; // type:data rom:0xC76030 -kzn_08_sixFloats = 0x80244DA0; // type:data rom:0xC76220 +kzn_08_FlyingAI_JumpVels = 0x80244DA0; // type:data rom:0xC76220 D_802455D0_C76A50 = 0x802455D0; // type:data rom:0xC76A50 D_802455E0_C76A60 = 0x802455E0; // type:data rom:0xC76A60 D_802455E8_C76A68 = 0x802455E8; // type:data rom:0xC76A68 @@ -19177,26 +19146,26 @@ func_80240D40_C77A20 = 0x80240D40; // type:func rom:0xC77A20 func_80240DE4_C77AC4 = 0x80240DE4; // type:func rom:0xC77AC4 func_80240E88_C77B68 = 0x80240E88; // type:func rom:0xC77B68 func_80241000_C77CE0 = 0x80241000; // type:func rom:0xC77CE0 -kzn_09_UnkNpcAIFunc6 = 0x80241020; // type:func rom:0xC77D00 -kzn_09_UnkNpcAIFunc7 = 0x8024108C; // type:func rom:0xC77D6C -kzn_09_UnkNpcAIFunc8 = 0x802410FC; // type:func rom:0xC77DDC -kzn_09_UnkNpcAIFunc5 = 0x802411D4; // type:func rom:0xC77EB4 -kzn_09_UnkNpcAIFunc26 = 0x80241228; // type:func rom:0xC77F08 -kzn_09_UnkFunc7 = 0x802413DC; // type:func rom:0xC780BC -kzn_09_UnkNpcAIFunc27 = 0x8024163C; // type:func rom:0xC7831C -kzn_09_UnkNpcAIFunc31 = 0x802418F0; // type:func rom:0xC785D0 -kzn_09_UnkNpcAIFunc32 = 0x8024195C; // type:func rom:0xC7863C -func_80241A58_C78738 = 0x80241A58; // type:func rom:0xC78738 -kzn_09_UnkNpcDurationFlagFunc3 = 0x80242498; // type:func rom:0xC79178 -kzn_09_UnkNpcAIFunc33 = 0x80242528; // type:func rom:0xC79208 -kzn_09_UnkNpcDurationFlagFunc2 = 0x80242628; // type:func rom:0xC79308 -kzn_09_UnkNpcAIFunc30 = 0x80242688; // type:func rom:0xC79368 -func_80242774_C79454 = 0x80242774; // type:func rom:0xC79454 +kzn_09_MeleeHitbox_30 = 0x80241020; // type:func rom:0xC77D00 +kzn_09_MeleeHitbox_31 = 0x8024108C; // type:func rom:0xC77D6C +kzn_09_MeleeHitbox_32 = 0x802410FC; // type:func rom:0xC77DDC +kzn_09_MeleeHitbox_33 = 0x802411D4; // type:func rom:0xC77EB4 +kzn_09_MeleeHitbox_CanSeePlayer = 0x80241228; // type:func rom:0xC77F08 +kzn_09_MeleeHitbox_Main = 0x802413DC; // type:func rom:0xC780BC +kzn_09_WanderMeleeAI_Main = 0x8024163C; // type:func rom:0xC7831C +kzn_09_PiranhaPlantAI_00 = 0x802418F0; // type:func rom:0xC785D0 +kzn_09_PiranhaPlantAI_01 = 0x8024195C; // type:func rom:0xC7863C +kzn_09_PiranhaPlantAI_10 = 0x80241A58; // type:func rom:0xC78738 +kzn_09_PiranhaPlantAI_11 = 0x80242498; // type:func rom:0xC79178 +kzn_09_PiranhaPlantAI_12 = 0x80242528; // type:func rom:0xC79208 +kzn_09_PiranhaPlantAI_13 = 0x80242628; // type:func rom:0xC79308 +kzn_09_PiranhaPlantAI_14 = 0x80242688; // type:func rom:0xC79368 +kzn_09_PiranhaPlantAI_Main = 0x80242774; // type:func rom:0xC79454 kzn_09_set_script_owner_npc_anim = 0x802429C4; // type:func rom:0xC796A4 kzn_09_UnkDistFunc = 0x80242A40; // type:func rom:0xC79720 kzn_09_UnkNpcAIFunc12 = 0x80242B74; // type:func rom:0xC79854 kzn_09_set_script_owner_npc_col_height = 0x80242CD8; // type:func rom:0xC799B8 -kzn_09_UnkNpcAIMainFunc5 = 0x80242D58; // type:func rom:0xC79A38 +kzn_09_TackleAI_Main = 0x80242D58; // type:func rom:0xC79A38 kzn_09_func_80240814_97BE44 = 0x80243198; // type:func rom:0xC79E78 kzn_09_AwaitPlayerNearNpc = 0x802431E0; // type:func rom:0xC79EC0 kzn_09_func_802408B4_97BEE4 = 0x80243238; // type:func rom:0xC79F18 @@ -19207,10 +19176,10 @@ kzn_09_AddPlayerHandsOffset = 0x80243420; // type:func rom:0xC7A100 func_802435F0_C7A2D0 = 0x802435F0; // type:func rom:0xC7A2D0 func_80243644_C7A324 = 0x80243644; // type:func rom:0xC7A324 func_8024367C_C7A35C = 0x8024367C; // type:func rom:0xC7A35C -kzn_09_SetManyVars = 0x80243718; // type:func rom:0xC7A3F8 -kzn_09_UnkYawFunc = 0x80243808; // type:func rom:0xC7A4E8 -func_80243994_C7A674 = 0x80243994; // type:func rom:0xC7A674 -func_802439D8_C7A6B8 = 0x802439D8; // type:func rom:0xC7A6B8 +kzn_09_LetterDelivery_Init = 0x80243718; // type:func rom:0xC7A3F8 +kzn_09_LetterDelivery_CalcLetterPos = 0x80243808; // type:func rom:0xC7A4E8 +kzn_09_LetterDelivery_SaveNpcAnim = 0x80243994; // type:func rom:0xC7A674 +kzn_09_LetterDelivery_RestoreNpcAnim = 0x802439D8; // type:func rom:0xC7A6B8 kzn_09_SuperBlock_CantUpgradeMessages = 0x80243D00; // type:data rom:0xC7A9E0 kzn_09_SuperBlock_PartnerIDs = 0x80243D08; // type:data rom:0xC7A9E8 kzn_09_SuperBlock_UpgradeDescMessages = 0x80243D18; // type:data rom:0xC7A9F8 @@ -19222,7 +19191,7 @@ D_80247270_C7DF50 = 0x80247270; // type:data rom:0xC7DF50 D_80247408_C7E0E8 = 0x80247408; // type:data rom:0xC7E0E8 D_80247410_C7E0F0 = 0x80247410; // type:data rom:0xC7E0F0 D_80247418_C7E0F8 = 0x80247418; // type:data rom:0xC7E0F8 -D_80247420_C7E100 = 0x80247420; // type:data rom:0xC7E100 +D_80247420_kzn_03 = 0x80247420; // type:data rom:0xC7E100 D_80247428_C7E108 = 0x80247428; // type:data rom:0xC7E108 D_80247430_C7E110 = 0x80247430; // type:data rom:0xC7E110 D_80247438_C7E118 = 0x80247438; // type:data rom:0xC7E118 @@ -19245,24 +19214,24 @@ kzn_11_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC802C4 func_80240310_C804B0 = 0x80240310; // type:func rom:0xC804B0 kzn_11_GetFloorCollider = 0x80240408; // type:func rom:0xC805A8 func_80240434_C805D4 = 0x80240434; // type:func rom:0xC805D4 -kzn_11_UnkNpcAIFunc23 = 0x80240460; // type:func rom:0xC80600 -kzn_11_UnkNpcAIFunc35 = 0x80240610; // type:func rom:0xC807B0 -kzn_11_UnkNpcAIFunc1_copy = 0x80240C38; // type:func rom:0xC80DD8 -kzn_11_UnkFunc4 = 0x80240CF8; // type:func rom:0xC80E98 -kzn_11_UnkNpcAIFunc2 = 0x8024103C; // type:func rom:0xC811DC -kzn_11_SixFloatsFunc = 0x802410B4; // type:func rom:0xC81254 -kzn_11_UnkNpcAIFunc14 = 0x80241120; // type:func rom:0xC812C0 -kzn_11_UnkNpcAIFunc3 = 0x80241254; // type:func rom:0xC813F4 -kzn_11_UnkFunc6 = 0x802412B8; // type:func rom:0xC81458 -kzn_11_UnkFunc5 = 0x80241648; // type:func rom:0xC817E8 -kzn_11_UnkNpcAIMainFunc9 = 0x8024176C; // type:func rom:0xC8190C -kzn_11_UnkNpcAIFunc13 = 0x80241958; // type:func rom:0xC81AF8 -kzn_11_UnkNpcAIFunc34 = 0x80241A88; // type:func rom:0xC81C28 -kzn_11_UnkFunc45 = 0x80241D08; // type:func rom:0xC81EA8 -kzn_11_UnkNpcAIMainFunc10 = 0x80241D64; // type:func rom:0xC81F04 +kzn_11_FlyingAI_WanderInit = 0x80240460; // type:func rom:0xC80600 +kzn_11_FlyingAI_Wander = 0x80240610; // type:func rom:0xC807B0 +kzn_11_FlyingAI_LoiterInit = 0x80240C38; // type:func rom:0xC80DD8 +kzn_11_FlyingAI_Loiter = 0x80240CF8; // type:func rom:0xC80E98 +kzn_11_FlyingAI_JumpInit = 0x8024103C; // type:func rom:0xC811DC +kzn_11_FlyingAI_Jump = 0x802410B4; // type:func rom:0xC81254 +kzn_11_FlyingAI_ChaseInit = 0x80241120; // type:func rom:0xC812C0 +kzn_11_FlyingAI_Chase = 0x80241254; // type:func rom:0xC813F4 +kzn_11_FlyingAI_LosePlayer = 0x802412B8; // type:func rom:0xC81458 +kzn_11_FlyingAI_Init = 0x80241648; // type:func rom:0xC817E8 +kzn_11_FlyingAI_Main = 0x8024176C; // type:func rom:0xC8190C +kzn_11_FlyingNoAttackAI_12 = 0x80241958; // type:func rom:0xC81AF8 +kzn_11_FlyingNoAttackAI_13 = 0x80241A88; // type:func rom:0xC81C28 +kzn_11_FlyingNoAttackAI_20 = 0x80241D08; // type:func rom:0xC81EA8 +kzn_11_FlyingNoAttackAI_Main = 0x80241D64; // type:func rom:0xC81F04 func_80241F4C_C820EC = 0x80241F4C; // type:func rom:0xC820EC func_80242540_C826E0 = 0x80242540; // type:func rom:0xC826E0 -kzn_11_sixFloats = 0x802436D0; // type:data rom:0xC83870 +kzn_11_FlyingAI_JumpVels = 0x802436D0; // type:data rom:0xC83870 D_802437B4_C83954 = 0x802437B4; // type:data rom:0xC83954 D_802437E0_C83980 = 0x802437E0; // type:data rom:0xC83980 D_80245850_C859F0 = 0x80245850; // type:data rom:0xC859F0 @@ -19271,26 +19240,26 @@ D_80245860_C85A00 = 0x80245860; // type:data rom:0xC85A00 D_802458A8_C85A48 = 0x802458A8; // type:data rom:0xC85A48 kzn_17_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC85AB0 kzn_17_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC85BD4 -kzn_17_UnkNpcAIFunc6 = 0x80240310; // type:func rom:0xC85DC0 -kzn_17_UnkNpcAIFunc7 = 0x8024037C; // type:func rom:0xC85E2C -kzn_17_UnkNpcAIFunc8 = 0x802403EC; // type:func rom:0xC85E9C -kzn_17_UnkNpcAIFunc5 = 0x802404C4; // type:func rom:0xC85F74 -kzn_17_UnkNpcAIFunc26 = 0x80240518; // type:func rom:0xC85FC8 -kzn_17_UnkFunc7 = 0x802406CC; // type:func rom:0xC8617C -kzn_17_UnkNpcAIFunc27 = 0x8024092C; // type:func rom:0xC863DC -kzn_17_UnkNpcAIFunc31 = 0x80240BE0; // type:func rom:0xC86690 -kzn_17_UnkNpcAIFunc32 = 0x80240C4C; // type:func rom:0xC866FC -func_80240D48_C867F8 = 0x80240D48; // type:func rom:0xC867F8 -kzn_17_UnkNpcDurationFlagFunc3 = 0x80241788; // type:func rom:0xC87238 -kzn_17_UnkNpcAIFunc33 = 0x80241818; // type:func rom:0xC872C8 -kzn_17_UnkNpcDurationFlagFunc2 = 0x80241918; // type:func rom:0xC873C8 -kzn_17_UnkNpcAIFunc30 = 0x80241978; // type:func rom:0xC87428 -func_80241A64_C87514 = 0x80241A64; // type:func rom:0xC87514 +kzn_17_MeleeHitbox_30 = 0x80240310; // type:func rom:0xC85DC0 +kzn_17_MeleeHitbox_31 = 0x8024037C; // type:func rom:0xC85E2C +kzn_17_MeleeHitbox_32 = 0x802403EC; // type:func rom:0xC85E9C +kzn_17_MeleeHitbox_33 = 0x802404C4; // type:func rom:0xC85F74 +kzn_17_MeleeHitbox_CanSeePlayer = 0x80240518; // type:func rom:0xC85FC8 +kzn_17_MeleeHitbox_Main = 0x802406CC; // type:func rom:0xC8617C +kzn_17_WanderMeleeAI_Main = 0x8024092C; // type:func rom:0xC863DC +kzn_17_PiranhaPlantAI_00 = 0x80240BE0; // type:func rom:0xC86690 +kzn_17_PiranhaPlantAI_01 = 0x80240C4C; // type:func rom:0xC866FC +kzn_17_PiranhaPlantAI_10 = 0x80240D48; // type:func rom:0xC867F8 +kzn_17_PiranhaPlantAI_11 = 0x80241788; // type:func rom:0xC87238 +kzn_17_PiranhaPlantAI_12 = 0x80241818; // type:func rom:0xC872C8 +kzn_17_PiranhaPlantAI_13 = 0x80241918; // type:func rom:0xC873C8 +kzn_17_PiranhaPlantAI_14 = 0x80241978; // type:func rom:0xC87428 +kzn_17_PiranhaPlantAI_Main = 0x80241A64; // type:func rom:0xC87514 kzn_17_set_script_owner_npc_anim = 0x80241CB4; // type:func rom:0xC87764 kzn_17_UnkDistFunc = 0x80241D30; // type:func rom:0xC877E0 kzn_17_UnkNpcAIFunc12 = 0x80241E64; // type:func rom:0xC87914 kzn_17_set_script_owner_npc_col_height = 0x80241FC8; // type:func rom:0xC87A78 -kzn_17_UnkNpcAIMainFunc5 = 0x80242048; // type:func rom:0xC87AF8 +kzn_17_TackleAI_Main = 0x80242048; // type:func rom:0xC87AF8 kzn_17_func_80240814_97BE44 = 0x80242488; // type:func rom:0xC87F38 kzn_17_AwaitPlayerNearNpc = 0x802424D0; // type:func rom:0xC87F80 kzn_17_func_802408B4_97BEE4 = 0x80242528; // type:func rom:0xC87FD8 @@ -19301,10 +19270,10 @@ kzn_17_AddPlayerHandsOffset = 0x80242710; // type:func rom:0xC881C0 func_802428E0_C88390 = 0x802428E0; // type:func rom:0xC88390 func_80242934_C883E4 = 0x80242934; // type:func rom:0xC883E4 func_8024296C_C8841C = 0x8024296C; // type:func rom:0xC8841C -kzn_17_SetManyVars = 0x80242A08; // type:func rom:0xC884B8 -kzn_17_UnkYawFunc = 0x80242AF8; // type:func rom:0xC885A8 -func_80242C84_C88734 = 0x80242C84; // type:func rom:0xC88734 -func_80242CC8_C88778 = 0x80242CC8; // type:func rom:0xC88778 +kzn_17_LetterDelivery_Init = 0x80242A08; // type:func rom:0xC884B8 +kzn_17_LetterDelivery_CalcLetterPos = 0x80242AF8; // type:func rom:0xC885A8 +kzn_17_LetterDelivery_SaveNpcAnim = 0x80242C84; // type:func rom:0xC88734 +kzn_17_LetterDelivery_RestoreNpcAnim = 0x80242CC8; // type:func rom:0xC88778 kzn_17_SpinyTrompHit = 0x80242D00; // type:func rom:0xC887B0 func_80242D20_C887D0 = 0x80242D20; // type:func rom:0xC887D0 kzn_17_UnkFunc46 = 0x80242D4C; // type:func rom:0xC887FC @@ -19317,12 +19286,12 @@ kzn_17_varStash = 0x80244074; // type:data rom:0xC89B24 D_802440D8_C89B88 = 0x802440D8; // type:data rom:0xC89B88 D_802440DC_C89B8C = 0x802440DC; // type:data rom:0xC89B8C D_802463A0_C8BE50 = 0x802463A0; // type:data rom:0xC8BE50 -D_80246538_C8BFE8 = 0x80246538; // type:data rom:0xC8BFE8 +D_80246538_kkj_19 = 0x80246538; // type:data rom:0xC8BFE8 D_80246540_C8BFF0 = 0x80246540; // type:data rom:0xC8BFF0 D_80246548_C8BFF8 = 0x80246548; // type:data rom:0xC8BFF8 -D_80246550_C8C000 = 0x80246550; // type:data rom:0xC8C000 +D_80246550_kkj_19 = 0x80246550; // type:data rom:0xC8C000 D_80246558_C8C008 = 0x80246558; // type:data rom:0xC8C008 -D_80246560_C8C010 = 0x80246560; // type:data rom:0xC8C010 +D_80246560_kkj_19 = 0x80246560; // type:data rom:0xC8C010 D_80246568_C8C018 = 0x80246568; // type:data rom:0xC8C018 D_802465D0_C8C080 = 0x802465D0; // type:data rom:0xC8C080 D_802465D8_C8C088 = 0x802465D8; // type:data rom:0xC8C088 @@ -19357,10 +19326,10 @@ kzn_19_AddPlayerHandsOffset = 0x802415DC; // type:func rom:0xC8F18C func_802417AC_C8F35C = 0x802417AC; // type:func rom:0xC8F35C func_80241800_C8F3B0 = 0x80241800; // type:func rom:0xC8F3B0 func_80241838_C8F3E8 = 0x80241838; // type:func rom:0xC8F3E8 -kzn_19_SetManyVars = 0x802418D4; // type:func rom:0xC8F484 -kzn_19_UnkYawFunc = 0x802419C4; // type:func rom:0xC8F574 -func_80241B50_C8F700 = 0x80241B50; // type:func rom:0xC8F700 -func_80241B94_C8F744 = 0x80241B94; // type:func rom:0xC8F744 +kzn_19_LetterDelivery_Init = 0x802418D4; // type:func rom:0xC8F484 +kzn_19_LetterDelivery_CalcLetterPos = 0x802419C4; // type:func rom:0xC8F574 +kzn_19_LetterDelivery_SaveNpcAnim = 0x80241B50; // type:func rom:0xC8F700 +kzn_19_LetterDelivery_RestoreNpcAnim = 0x80241B94; // type:func rom:0xC8F744 func_80241BC0_C8F770 = 0x80241BC0; // type:func rom:0xC8F770 D_80243AD8_C91688 = 0x80243AD8; // type:data rom:0xC91688 D_80243BB8_C91768 = 0x80243BB8; // type:data rom:0xC91768 @@ -19377,10 +19346,10 @@ kzn_20_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xC963B4 func_80240654_C96584 = 0x80240654; // type:func rom:0xC96584 func_802406A8_C965D8 = 0x802406A8; // type:func rom:0xC965D8 func_802406E0_C96610 = 0x802406E0; // type:func rom:0xC96610 -kzn_20_SetManyVars = 0x8024077C; // type:func rom:0xC966AC -kzn_20_UnkYawFunc = 0x8024086C; // type:func rom:0xC9679C -func_802409F8_C96928 = 0x802409F8; // type:func rom:0xC96928 -func_80240A3C_C9696C = 0x80240A3C; // type:func rom:0xC9696C +kzn_20_LetterDelivery_Init = 0x8024077C; // type:func rom:0xC966AC +kzn_20_LetterDelivery_CalcLetterPos = 0x8024086C; // type:func rom:0xC9679C +kzn_20_LetterDelivery_SaveNpcAnim = 0x802409F8; // type:func rom:0xC96928 +kzn_20_LetterDelivery_RestoreNpcAnim = 0x80240A3C; // type:func rom:0xC9696C func_80240A68_C96998 = 0x80240A68; // type:func rom:0xC96998 kzn_20_GetFloorCollider = 0x80240A8C; // type:func rom:0xC969BC kzn_20_varStash = 0x80241780; // type:data rom:0xC976B0 @@ -19400,18 +19369,18 @@ kzn_23_UnsetCamera0MoveFlag1 = 0x80240504; // type:func rom:0xC9C804 func_80240520_C9C820 = 0x80240520; // type:func rom:0xC9C820 D_80241C10_C9DF10 = 0x80241C10; // type:data rom:0xC9DF10 flo_00_func_80240000_C9DF20 = 0x80240000; // type:func rom:0xC9DF20 -flo_00_UnkNpcAIFunc24 = 0x80240040; // type:func rom:0xC9DF60 -flo_00_UnkFunc13 = 0x80240198; // type:func rom:0xC9E0B8 -flo_00_UnkNpcAIFunc1 = 0x80240440; // type:func rom:0xC9E360 -flo_00_UnkFunc14 = 0x80240500; // type:func rom:0xC9E420 -flo_00_UnkNpcAIFunc25 = 0x802406BC; // type:func rom:0xC9E5DC -flo_00_NpcJumpFunc2 = 0x80240770; // type:func rom:0xC9E690 -flo_00_NpcJumpFunc = 0x802407E4; // type:func rom:0xC9E704 -flo_00_UnkNpcAIFunc13 = 0x8024085C; // type:func rom:0xC9E77C -flo_00_UnkFunc15 = 0x8024098C; // type:func rom:0xC9E8AC -flo_00_UnkNpcDurationFlagFunc = 0x80240AAC; // type:func rom:0xC9E9CC -flo_00_UnkFunc16 = 0x80240B14; // type:func rom:0xC9EA34 -flo_00_UnkNpcAIMainFunc = 0x80240BD4; // type:func rom:0xC9EAF4 +flo_00_PatrolAI_MoveInit = 0x80240040; // type:func rom:0xC9DF60 +flo_00_PatrolAI_Move = 0x80240198; // type:func rom:0xC9E0B8 +flo_00_PatrolAI_LoiterInit = 0x80240440; // type:func rom:0xC9E360 +flo_00_PatrolAI_Loiter = 0x80240500; // type:func rom:0xC9E420 +flo_00_PatrolAI_PostLoiter = 0x802406BC; // type:func rom:0xC9E5DC +flo_00_PatrolAI_JumpInit = 0x80240770; // type:func rom:0xC9E690 +flo_00_PatrolAI_Jump = 0x802407E4; // type:func rom:0xC9E704 +flo_00_PatrolAI_ChaseInit = 0x8024085C; // type:func rom:0xC9E77C +flo_00_PatrolAI_Chase = 0x8024098C; // type:func rom:0xC9E8AC +flo_00_PatrolAI_LosePlayer = 0x80240AAC; // type:func rom:0xC9E9CC +flo_00_PatrolNoAttackAI_15 = 0x80240B14; // type:func rom:0xC9EA34 +flo_00_PatrolNoAttackAI_Main = 0x80240BD4; // type:func rom:0xC9EAF4 flo_00_PostChapter6StatUpdate = 0x80240ED0; // type:func rom:0xC9EDF0 flo_00_func_80240F10_C9EE30 = 0x80240F10; // type:func rom:0xC9EE30 flo_00_func_80240F80_C9EEA0 = 0x80240F80; // type:func rom:0xC9EEA0 @@ -19619,10 +19588,10 @@ flo_08_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xCAF9B8 flo_08_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xCAFA00 flo_08_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xCAFA48 flo_08_func_80240D40_CAFA80 = 0x80240D40; // type:func rom:0xCAFA80 -flo_08_func_80240D80_CAFAC0 = 0x80240D80; // type:func rom:0xCAFAC0 -flo_08_func_80241364_CB00A4 = 0x80241364; // type:func rom:0xCB00A4 -flo_08_func_802414C8_CB0208 = 0x802414C8; // type:func rom:0xCB0208 -flo_08_func_8024150C_CB024C = 0x8024150C; // type:func rom:0xCB024C +flo_08_UnkFloAI_ChaseInit = 0x80240D80; // type:func rom:0xCAFAC0 +flo_08_UnkFloAI_Chase = 0x80241364; // type:func rom:0xCB00A4 +flo_08_UnkFloAI_LosePlayer = 0x802414C8; // type:func rom:0xCB0208 +flo_08_UnkFloAI_Main = 0x8024150C; // type:func rom:0xCB024C flo_08_GetNpcCollisionHeight = 0x80241744; // type:func rom:0xCB0484 flo_08_AddPlayerHandsOffset = 0x802417A0; // type:func rom:0xCB04E0 flo_08_ItemChoice_WaitForSelection = 0x80241970; // type:func rom:0xCB06B0 @@ -19690,17 +19659,17 @@ flo_09_func_80240000_CB5000 = 0x80240000; // type:func rom:0xCB5000 flo_09_UnkFunc43 = 0x80240040; // type:func rom:0xCB5040 flo_09_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xCB50E0 flo_09_TransformFoliage = 0x80240150; // type:func rom:0xCB5150 -flo_09_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xCB5320 -flo_09_UnkNpcAIFunc35 = 0x802404D0; // type:func rom:0xCB54D0 -flo_09_UnkNpcAIFunc1_copy = 0x80240AF8; // type:func rom:0xCB5AF8 -flo_09_UnkFunc4 = 0x80240BB8; // type:func rom:0xCB5BB8 -flo_09_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xCB5EFC -flo_09_SixFloatsFunc = 0x80240F74; // type:func rom:0xCB5F74 -flo_09_UnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xCB5FE0 -flo_09_UnkNpcAIFunc3 = 0x80241114; // type:func rom:0xCB6114 -flo_09_UnkFunc6 = 0x80241178; // type:func rom:0xCB6178 -flo_09_UnkFunc5 = 0x80241508; // type:func rom:0xCB6508 -flo_09_UnkNpcAIMainFunc9 = 0x8024162C; // type:func rom:0xCB662C +flo_09_FlyingAI_WanderInit = 0x80240320; // type:func rom:0xCB5320 +flo_09_FlyingAI_Wander = 0x802404D0; // type:func rom:0xCB54D0 +flo_09_FlyingAI_LoiterInit = 0x80240AF8; // type:func rom:0xCB5AF8 +flo_09_FlyingAI_Loiter = 0x80240BB8; // type:func rom:0xCB5BB8 +flo_09_FlyingAI_JumpInit = 0x80240EFC; // type:func rom:0xCB5EFC +flo_09_FlyingAI_Jump = 0x80240F74; // type:func rom:0xCB5F74 +flo_09_FlyingAI_ChaseInit = 0x80240FE0; // type:func rom:0xCB5FE0 +flo_09_FlyingAI_Chase = 0x80241114; // type:func rom:0xCB6114 +flo_09_FlyingAI_LosePlayer = 0x80241178; // type:func rom:0xCB6178 +flo_09_FlyingAI_Init = 0x80241508; // type:func rom:0xCB6508 +flo_09_FlyingAI_Main = 0x8024162C; // type:func rom:0xCB662C flo_09_entryList = 0x80241820; // type:data rom:0xCB6820 flo_09_config = 0x80241840; // type:data rom:0xCB6840 flo_09_80241880 = 0x80241880; // type:data rom:0xCB6880 @@ -19734,7 +19703,7 @@ flo_09_802434A8 = 0x802434A8; // type:data rom:0xCB84A8 flo_09_npcAISettings_802435B0 = 0x802435B0; // type:data rom:0xCB85B0 flo_09_npcAI_802435E0 = 0x802435E0; // type:data rom:0xCB85E0 flo_09_npcSettings_80243600 = 0x80243600; // type:data rom:0xCB8600 -flo_09_sixFloats = 0x8024362C; // type:data rom:0xCB862C +flo_09_FlyingAI_JumpVels = 0x8024362C; // type:data rom:0xCB862C flo_09_npcAISettings_80243644 = 0x80243644; // type:data rom:0xCB8644 flo_09_npcAI_80243674 = 0x80243674; // type:data rom:0xCB8674 flo_09_npcSettings_802436E4 = 0x802436E4; // type:data rom:0xCB86E4 @@ -19899,27 +19868,27 @@ flo_12_npcGroup_802425D8 = 0x802425D8; // type:data rom:0xCC3408 flo_12_npcGroupList_802429B8 = 0x802429B8; // type:data rom:0xCC37E8 flo_13_func_80240000_CC3810 = 0x80240000; // type:func rom:0xCC3810 flo_13_UnkFunc41 = 0x80240040; // type:func rom:0xCC3850 -flo_13_UnkNpcAIFunc23 = 0x802401C4; // type:func rom:0xCC39D4 -flo_13_UnkNpcAIFunc35 = 0x80240374; // type:func rom:0xCC3B84 -flo_13_UnkNpcAIFunc1_copy = 0x8024099C; // type:func rom:0xCC41AC -flo_13_UnkFunc4 = 0x80240A5C; // type:func rom:0xCC426C -flo_13_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xCC45B0 -flo_13_SixFloatsFunc = 0x80240E18; // type:func rom:0xCC4628 -flo_13_UnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xCC4694 -flo_13_UnkNpcAIFunc3 = 0x80240FB8; // type:func rom:0xCC47C8 -flo_13_UnkFunc6 = 0x8024101C; // type:func rom:0xCC482C -flo_13_UnkFunc5 = 0x802413AC; // type:func rom:0xCC4BBC -flo_13_UnkNpcAIMainFunc9 = 0x802414D0; // type:func rom:0xCC4CE0 -flo_13_func_802416BC_CC4ECC = 0x802416BC; // type:func rom:0xCC4ECC -flo_13_func_80241704_CC4F14 = 0x80241704; // type:func rom:0xCC4F14 -flo_13_func_80241B68_CC5378 = 0x80241B68; // type:func rom:0xCC5378 -flo_13_func_80241DB8_CC55C8 = 0x80241DB8; // type:func rom:0xCC55C8 +flo_13_FlyingAI_WanderInit = 0x802401C4; // type:func rom:0xCC39D4 +flo_13_FlyingAI_Wander = 0x80240374; // type:func rom:0xCC3B84 +flo_13_FlyingAI_LoiterInit = 0x8024099C; // type:func rom:0xCC41AC +flo_13_FlyingAI_Loiter = 0x80240A5C; // type:func rom:0xCC426C +flo_13_FlyingAI_JumpInit = 0x80240DA0; // type:func rom:0xCC45B0 +flo_13_FlyingAI_Jump = 0x80240E18; // type:func rom:0xCC4628 +flo_13_FlyingAI_ChaseInit = 0x80240E84; // type:func rom:0xCC4694 +flo_13_FlyingAI_Chase = 0x80240FB8; // type:func rom:0xCC47C8 +flo_13_FlyingAI_LosePlayer = 0x8024101C; // type:func rom:0xCC482C +flo_13_FlyingAI_Init = 0x802413AC; // type:func rom:0xCC4BBC +flo_13_FlyingAI_Main = 0x802414D0; // type:func rom:0xCC4CE0 +flo_13_LakituAI_GetAvailableSpiny = 0x802416BC; // type:func rom:0xCC4ECC +flo_13_LakituAI_Wander = 0x80241704; // type:func rom:0xCC4F14 +flo_13_LakituAI_Loiter = 0x80241B68; // type:func rom:0xCC5378 +flo_13_LakituAI_Main = 0x80241DB8; // type:func rom:0xCC55C8 flo_13_set_script_owner_npc_anim = 0x80242298; // type:func rom:0xCC5AA8 flo_13_UnkDistFunc = 0x80242314; // type:func rom:0xCC5B24 flo_13_UnkNpcAIFunc12 = 0x80242448; // type:func rom:0xCC5C58 flo_13_set_script_owner_npc_col_height = 0x802425AC; // type:func rom:0xCC5DBC -flo_13_UnkNpcAIMainFunc5 = 0x8024262C; // type:func rom:0xCC5E3C -flo_13_UnkNpcAIMainFunc6 = 0x80242A6C; // type:func rom:0xCC627C +flo_13_TackleAI_Main = 0x8024262C; // type:func rom:0xCC5E3C +flo_13_SpinyAI_Main = 0x80242A6C; // type:func rom:0xCC627C flo_13_UnkFunc42 = 0x80243368; // type:func rom:0xCC6B78 flo_13_func_802433C0_CC6BD0 = 0x802433C0; // type:func rom:0xCC6BD0 flo_13_func_802434D4_CC6CE4 = 0x802434D4; // type:func rom:0xCC6CE4 @@ -19938,7 +19907,7 @@ flo_13_exitWalk_80243D48 = 0x80243D48; // type:data rom:0xCC7558 flo_13_80243DA4 = 0x80243DA4; // type:data rom:0xCC75B4 flo_13_main = 0x80243DEC; // type:data rom:0xCC75FC flo_13_npcSettings_80244100 = 0x80244100; // type:data rom:0xCC7910 -flo_13_sixFloats = 0x8024412C; // type:data rom:0xCC793C +flo_13_FlyingAI_JumpVels = 0x8024412C; // type:data rom:0xCC793C flo_13_npcAISettings_80244144 = 0x80244144; // type:data rom:0xCC7954 flo_13_npcAI_80244174 = 0x80244174; // type:data rom:0xCC7984 flo_13_npcSettings_802441E4 = 0x802441E4; // type:data rom:0xCC79F4 @@ -19990,17 +19959,17 @@ flo_14_func_8024042C_CCB73C = 0x8024042C; // type:func rom:0xCCB73C flo_14_func_8024046C_CCB77C = 0x8024046C; // type:func rom:0xCCB77C func_80240504_CCB814 = 0x80240504; // type:func rom:0xCCB814 flo_14_func_802407D4_CCBAE4 = 0x802407D4; // type:func rom:0xCCBAE4 -flo_14_UnkNpcAIFunc23 = 0x80240B10; // type:func rom:0xCCBE20 -flo_14_UnkNpcAIFunc35 = 0x80240CC0; // type:func rom:0xCCBFD0 -flo_14_UnkNpcAIFunc1_copy = 0x802412E8; // type:func rom:0xCCC5F8 -flo_14_UnkFunc4 = 0x802413A8; // type:func rom:0xCCC6B8 -flo_14_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xCCC9FC -flo_14_SixFloatsFunc = 0x80241764; // type:func rom:0xCCCA74 -flo_14_UnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xCCCAE0 -flo_14_UnkNpcAIFunc3 = 0x80241904; // type:func rom:0xCCCC14 -flo_14_UnkFunc6 = 0x80241968; // type:func rom:0xCCCC78 -flo_14_UnkFunc5 = 0x80241CF8; // type:func rom:0xCCD008 -flo_14_UnkNpcAIMainFunc9 = 0x80241E1C; // type:func rom:0xCCD12C +flo_14_FlyingAI_WanderInit = 0x80240B10; // type:func rom:0xCCBE20 +flo_14_FlyingAI_Wander = 0x80240CC0; // type:func rom:0xCCBFD0 +flo_14_FlyingAI_LoiterInit = 0x802412E8; // type:func rom:0xCCC5F8 +flo_14_FlyingAI_Loiter = 0x802413A8; // type:func rom:0xCCC6B8 +flo_14_FlyingAI_JumpInit = 0x802416EC; // type:func rom:0xCCC9FC +flo_14_FlyingAI_Jump = 0x80241764; // type:func rom:0xCCCA74 +flo_14_FlyingAI_ChaseInit = 0x802417D0; // type:func rom:0xCCCAE0 +flo_14_FlyingAI_Chase = 0x80241904; // type:func rom:0xCCCC14 +flo_14_FlyingAI_LosePlayer = 0x80241968; // type:func rom:0xCCCC78 +flo_14_FlyingAI_Init = 0x80241CF8; // type:func rom:0xCCD008 +flo_14_FlyingAI_Main = 0x80241E1C; // type:func rom:0xCCD12C flo_14_GetNpcCollisionHeight = 0x80242008; // type:func rom:0xCCD318 flo_14_AddPlayerHandsOffset = 0x80242064; // type:func rom:0xCCD374 flo_14_ItemChoice_WaitForSelection = 0x80242234; // type:func rom:0xCCD544 @@ -20029,7 +19998,7 @@ flo_14_D_80243B14_CCEE24 = 0x80243B14; // type:data rom:0xCCEE24 flo_14_D_80243B18_CCEE28 = 0x80243B18; // type:data rom:0xCCEE28 flo_14_80243B1C = 0x80243B1C; // type:data rom:0xCCEE2C flo_14_80243E78 = 0x80243E78; // type:data rom:0xCCF188 -flo_14_sixFloats = 0x802444C0; // type:data rom:0xCCF7D0 +flo_14_FlyingAI_JumpVels = 0x802444C0; // type:data rom:0xCCF7D0 flo_14_npcAISettings_802444D8 = 0x802444D8; // type:data rom:0xCCF7E8 flo_14_npcAI_80244508 = 0x80244508; // type:data rom:0xCCF818 flo_14_npcSettings_80244578 = 0x80244578; // type:data rom:0xCCF888 @@ -20098,21 +20067,21 @@ flo_16_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xCD2B88 flo_16_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xCD2BD0 flo_16_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xCD2C18 flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xCD2C48 -flo_16_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xCD2C80 -flo_16_UnkNpcAIFunc35 = 0x80241000; // type:func rom:0xCD2E30 -flo_16_UnkNpcAIFunc1_copy = 0x80241628; // type:func rom:0xCD3458 -flo_16_UnkFunc4 = 0x802416E8; // type:func rom:0xCD3518 -flo_16_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xCD385C -flo_16_SixFloatsFunc = 0x80241AA4; // type:func rom:0xCD38D4 -flo_16_UnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xCD3940 -flo_16_UnkNpcAIFunc3 = 0x80241C44; // type:func rom:0xCD3A74 -flo_16_UnkFunc6 = 0x80241CA8; // type:func rom:0xCD3AD8 -flo_16_UnkFunc5 = 0x80242038; // type:func rom:0xCD3E68 -flo_16_UnkNpcAIMainFunc9 = 0x8024215C; // type:func rom:0xCD3F8C -flo_16_UnkNpcAIFunc13 = 0x80242348; // type:func rom:0xCD4178 -flo_16_UnkNpcAIFunc34 = 0x80242478; // type:func rom:0xCD42A8 -flo_16_UnkFunc45 = 0x802426F8; // type:func rom:0xCD4528 -flo_16_UnkNpcAIMainFunc10 = 0x80242754; // type:func rom:0xCD4584 +flo_16_FlyingAI_WanderInit = 0x80240E50; // type:func rom:0xCD2C80 +flo_16_FlyingAI_Wander = 0x80241000; // type:func rom:0xCD2E30 +flo_16_FlyingAI_LoiterInit = 0x80241628; // type:func rom:0xCD3458 +flo_16_FlyingAI_Loiter = 0x802416E8; // type:func rom:0xCD3518 +flo_16_FlyingAI_JumpInit = 0x80241A2C; // type:func rom:0xCD385C +flo_16_FlyingAI_Jump = 0x80241AA4; // type:func rom:0xCD38D4 +flo_16_FlyingAI_ChaseInit = 0x80241B10; // type:func rom:0xCD3940 +flo_16_FlyingAI_Chase = 0x80241C44; // type:func rom:0xCD3A74 +flo_16_FlyingAI_LosePlayer = 0x80241CA8; // type:func rom:0xCD3AD8 +flo_16_FlyingAI_Init = 0x80242038; // type:func rom:0xCD3E68 +flo_16_FlyingAI_Main = 0x8024215C; // type:func rom:0xCD3F8C +flo_16_FlyingNoAttackAI_12 = 0x80242348; // type:func rom:0xCD4178 +flo_16_FlyingNoAttackAI_13 = 0x80242478; // type:func rom:0xCD42A8 +flo_16_FlyingNoAttackAI_20 = 0x802426F8; // type:func rom:0xCD4528 +flo_16_FlyingNoAttackAI_Main = 0x80242754; // type:func rom:0xCD4584 flo_16_func_80242940_CD4770 = 0x80242940; // type:func rom:0xCD4770 flo_16_entryList = 0x80242970; // type:data rom:0xCD47A0 flo_16_config = 0x80242990; // type:data rom:0xCD47C0 @@ -20135,7 +20104,7 @@ flo_16_80243D48 = 0x80243D48; // type:data rom:0xCD5B78 flo_16_80243DB0 = 0x80243DB0; // type:data rom:0xCD5BE0 flo_16_80243E80 = 0x80243E80; // type:data rom:0xCD5CB0 flo_16_makeEntities = 0x80243F44; // type:data rom:0xCD5D74 -flo_16_sixFloats = 0x80244010; // type:data rom:0xCD5E40 +flo_16_FlyingAI_JumpVels = 0x80244010; // type:data rom:0xCD5E40 flo_16_npcAISettings_80244028 = 0x80244028; // type:data rom:0xCD5E58 flo_16_npcAI_80244058 = 0x80244058; // type:data rom:0xCD5E88 flo_16_npcSettings_802440C8 = 0x802440C8; // type:data rom:0xCD5EF8 @@ -20152,27 +20121,27 @@ D_80245400_CD7230 = 0x80245400; // type:data rom:0xCD7230 D_80245448_CD7278 = 0x80245448; // type:data rom:0xCD7278 flo_17_func_80240000_CD72E0 = 0x80240000; // type:func rom:0xCD72E0 flo_17_func_80240040_CD7320 = 0x80240040; // type:func rom:0xCD7320 -flo_17_UnkNpcAIFunc23 = 0x80240070; // type:func rom:0xCD7350 -flo_17_UnkNpcAIFunc35 = 0x80240220; // type:func rom:0xCD7500 -flo_17_UnkNpcAIFunc1_copy = 0x80240848; // type:func rom:0xCD7B28 -flo_17_UnkFunc4 = 0x80240908; // type:func rom:0xCD7BE8 -flo_17_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xCD7F2C -flo_17_SixFloatsFunc = 0x80240CC4; // type:func rom:0xCD7FA4 -flo_17_UnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xCD8010 -flo_17_UnkNpcAIFunc3 = 0x80240E64; // type:func rom:0xCD8144 -flo_17_UnkFunc6 = 0x80240EC8; // type:func rom:0xCD81A8 -flo_17_UnkFunc5 = 0x80241258; // type:func rom:0xCD8538 -flo_17_UnkNpcAIMainFunc9 = 0x8024137C; // type:func rom:0xCD865C -flo_17_func_80241568_CD8848 = 0x80241568; // type:func rom:0xCD8848 -flo_17_func_802415B0_CD8890 = 0x802415B0; // type:func rom:0xCD8890 -flo_17_func_80241A14_CD8CF4 = 0x80241A14; // type:func rom:0xCD8CF4 -flo_17_func_80241C64_CD8F44 = 0x80241C64; // type:func rom:0xCD8F44 +flo_17_FlyingAI_WanderInit = 0x80240070; // type:func rom:0xCD7350 +flo_17_FlyingAI_Wander = 0x80240220; // type:func rom:0xCD7500 +flo_17_FlyingAI_LoiterInit = 0x80240848; // type:func rom:0xCD7B28 +flo_17_FlyingAI_Loiter = 0x80240908; // type:func rom:0xCD7BE8 +flo_17_FlyingAI_JumpInit = 0x80240C4C; // type:func rom:0xCD7F2C +flo_17_FlyingAI_Jump = 0x80240CC4; // type:func rom:0xCD7FA4 +flo_17_FlyingAI_ChaseInit = 0x80240D30; // type:func rom:0xCD8010 +flo_17_FlyingAI_Chase = 0x80240E64; // type:func rom:0xCD8144 +flo_17_FlyingAI_LosePlayer = 0x80240EC8; // type:func rom:0xCD81A8 +flo_17_FlyingAI_Init = 0x80241258; // type:func rom:0xCD8538 +flo_17_FlyingAI_Main = 0x8024137C; // type:func rom:0xCD865C +flo_17_LakituAI_GetAvailableSpiny = 0x80241568; // type:func rom:0xCD8848 +flo_17_LakituAI_Wander = 0x802415B0; // type:func rom:0xCD8890 +flo_17_LakituAI_Loiter = 0x80241A14; // type:func rom:0xCD8CF4 +flo_17_LakituAI_Main = 0x80241C64; // type:func rom:0xCD8F44 flo_17_set_script_owner_npc_anim = 0x80242144; // type:func rom:0xCD9424 flo_17_UnkDistFunc = 0x802421C0; // type:func rom:0xCD94A0 flo_17_UnkNpcAIFunc12 = 0x802422F4; // type:func rom:0xCD95D4 flo_17_set_script_owner_npc_col_height = 0x80242458; // type:func rom:0xCD9738 -flo_17_UnkNpcAIMainFunc5 = 0x802424D8; // type:func rom:0xCD97B8 -flo_17_UnkNpcAIMainFunc6 = 0x80242918; // type:func rom:0xCD9BF8 +flo_17_TackleAI_Main = 0x802424D8; // type:func rom:0xCD97B8 +flo_17_SpinyAI_Main = 0x80242918; // type:func rom:0xCD9BF8 flo_17_entryList = 0x80243220; // type:data rom:0xCDA500 flo_17_config = 0x80243240; // type:data rom:0xCDA520 flo_17_80243280 = 0x80243280; // type:data rom:0xCDA560 @@ -20185,7 +20154,7 @@ flo_17_main = 0x802437DC; // type:data rom:0xCDAABC flo_17_80243FD0 = 0x80243FD0; // type:data rom:0xCDB2B0 flo_17_80244284 = 0x80244284; // type:data rom:0xCDB564 flo_17_npcSettings_802443D8 = 0x802443E0; // type:data rom:0xCDB6C0 -flo_17_sixFloats = 0x8024440C; // type:data rom:0xCDB6EC +flo_17_FlyingAI_JumpVels = 0x8024440C; // type:data rom:0xCDB6EC flo_17_npcAISettings_80244424 = 0x80244424; // type:data rom:0xCDB704 flo_17_npcAI_80244454 = 0x80244454; // type:data rom:0xCDB734 flo_17_npcSettings_802444C4 = 0x802444C4; // type:data rom:0xCDB7A4 @@ -20412,7 +20381,7 @@ flo_23_set_script_owner_npc_anim = 0x80240394; // type:func rom:0xCEE5F4 flo_23_UnkDistFunc = 0x80240410; // type:func rom:0xCEE670 flo_23_UnkNpcAIFunc12 = 0x80240544; // type:func rom:0xCEE7A4 flo_23_set_script_owner_npc_col_height = 0x802406A8; // type:func rom:0xCEE908 -flo_23_UnkNpcAIMainFunc5 = 0x80240728; // type:func rom:0xCEE988 +flo_23_TackleAI_Main = 0x80240728; // type:func rom:0xCEE988 flo_23_FlowerGuard_SetItemEntityPosition = 0x80240B68; // type:func rom:0xCEEDC8 flo_23_FlowerGuard_JudgeItemTastiness = 0x80240C2C; // type:func rom:0xCEEE8C flo_23_FlowerGuard_MakeItemList = 0x80240C9C; // type:func rom:0xCEEEFC @@ -20467,21 +20436,21 @@ flo_24_80241ABC = 0x80241ABC; // type:data rom:0xCF23FC flo_24_makeEntities = 0x802421B0; // type:data rom:0xCF2AF0 flo_24_flo_10_name_hack = 0x80242280; // type:data rom:0xCF2BC0 flo_25_func_80240000_CF2BD0 = 0x80240000; // type:func rom:0xCF2BD0 -flo_25_UnkNpcAIFunc23 = 0x80240040; // type:func rom:0xCF2C10 -flo_25_UnkNpcAIFunc35 = 0x802401F0; // type:func rom:0xCF2DC0 -flo_25_UnkNpcAIFunc1_copy = 0x80240818; // type:func rom:0xCF33E8 -flo_25_UnkFunc4 = 0x802408D8; // type:func rom:0xCF34A8 -flo_25_UnkNpcAIFunc2 = 0x80240C1C; // type:func rom:0xCF37EC -flo_25_SixFloatsFunc = 0x80240C94; // type:func rom:0xCF3864 -flo_25_UnkNpcAIFunc14 = 0x80240D00; // type:func rom:0xCF38D0 -flo_25_UnkNpcAIFunc3 = 0x80240E34; // type:func rom:0xCF3A04 -flo_25_UnkFunc6 = 0x80240E98; // type:func rom:0xCF3A68 -flo_25_UnkFunc5 = 0x80241228; // type:func rom:0xCF3DF8 -flo_25_UnkNpcAIMainFunc9 = 0x8024134C; // type:func rom:0xCF3F1C -flo_25_UnkNpcAIFunc13 = 0x80241538; // type:func rom:0xCF4108 -flo_25_UnkNpcAIFunc34 = 0x80241668; // type:func rom:0xCF4238 -flo_25_UnkFunc45 = 0x802418E8; // type:func rom:0xCF44B8 -flo_25_UnkNpcAIMainFunc10 = 0x80241944; // type:func rom:0xCF4514 +flo_25_FlyingAI_WanderInit = 0x80240040; // type:func rom:0xCF2C10 +flo_25_FlyingAI_Wander = 0x802401F0; // type:func rom:0xCF2DC0 +flo_25_FlyingAI_LoiterInit = 0x80240818; // type:func rom:0xCF33E8 +flo_25_FlyingAI_Loiter = 0x802408D8; // type:func rom:0xCF34A8 +flo_25_FlyingAI_JumpInit = 0x80240C1C; // type:func rom:0xCF37EC +flo_25_FlyingAI_Jump = 0x80240C94; // type:func rom:0xCF3864 +flo_25_FlyingAI_ChaseInit = 0x80240D00; // type:func rom:0xCF38D0 +flo_25_FlyingAI_Chase = 0x80240E34; // type:func rom:0xCF3A04 +flo_25_FlyingAI_LosePlayer = 0x80240E98; // type:func rom:0xCF3A68 +flo_25_FlyingAI_Init = 0x80241228; // type:func rom:0xCF3DF8 +flo_25_FlyingAI_Main = 0x8024134C; // type:func rom:0xCF3F1C +flo_25_FlyingNoAttackAI_12 = 0x80241538; // type:func rom:0xCF4108 +flo_25_FlyingNoAttackAI_13 = 0x80241668; // type:func rom:0xCF4238 +flo_25_FlyingNoAttackAI_20 = 0x802418E8; // type:func rom:0xCF44B8 +flo_25_FlyingNoAttackAI_Main = 0x80241944; // type:func rom:0xCF4514 flo_25_GetNpcCollisionHeight = 0x80241B2C; // type:func rom:0xCF46FC flo_25_AddPlayerHandsOffset = 0x80241B88; // type:func rom:0xCF4758 flo_25_ItemChoice_WaitForSelection = 0x80241D58; // type:func rom:0xCF4928 @@ -20502,7 +20471,7 @@ flo_25_exitWalk_802426A8 = 0x802426A8; // type:data rom:0xCF5278 flo_25_80242704 = 0x80242704; // type:data rom:0xCF52D4 flo_25_main = 0x8024274C; // type:data rom:0xCF531C flo_25_npcSettings_802428F0 = 0x802428F0; // type:data rom:0xCF54C0 -flo_25_sixFloats = 0x8024291C; // type:data rom:0xCF54EC +flo_25_FlyingAI_JumpVels = 0x8024291C; // type:data rom:0xCF54EC flo_25_npcAISettings_80242934 = 0x80242934; // type:data rom:0xCF5504 flo_25_npcAI_80242964 = 0x80242964; // type:data rom:0xCF5534 flo_25_npcSettings_802429D4 = 0x802429D4; // type:data rom:0xCF55A4 @@ -20570,10 +20539,10 @@ sam_01_Quizmo_SpinPartner = 0x80241580; // type:func rom:0xCF90F0 sam_01_Quizmo_UpdatePartnerPosition = 0x80241610; // type:func rom:0xCF9180 sam_01_Quizmo_CreateReactionEffect = 0x802416F8; // type:func rom:0xCF9268 sam_01_Quizmo_CreateWorker = 0x80241764; // type:func rom:0xCF92D4 -sam_01_SetManyVars = 0x80241794; // type:func rom:0xCF9304 -sam_01_UnkYawFunc = 0x80241884; // type:func rom:0xCF93F4 -func_80241A10_CF9580 = 0x80241A10; // type:func rom:0xCF9580 -func_80241A54_CF95C4 = 0x80241A54; // type:func rom:0xCF95C4 +sam_01_LetterDelivery_Init = 0x80241794; // type:func rom:0xCF9304 +sam_01_LetterDelivery_CalcLetterPos = 0x80241884; // type:func rom:0xCF93F4 +sam_01_LetterDelivery_SaveNpcAnim = 0x80241A10; // type:func rom:0xCF9580 +sam_01_LetterDelivery_RestoreNpcAnim = 0x80241A54; // type:func rom:0xCF95C4 sam_01_GetItemEntityPosition = 0x80241A80; // type:func rom:0xCF95F0 func_80241B20_CF9690 = 0x80241B20; // type:func rom:0xCF9690 dup_sam_01_StashVars = 0x80241C90; // type:func rom:0xCF9800 @@ -20639,13 +20608,13 @@ sam_02_Quizmo_varStash = 0x80246B60; // type:data rom:0xD0C290 sam_02_Quizmo_Answers = 0x80246BC4; // type:data rom:0xD0C2F4 D_80246C04_D0C334 = 0x80246C04; // type:data rom:0xD0C334 func_80240000_D110C0 = 0x80240000; // type:func rom:0xD110C0 -sam_03_UnkNpcAIFunc6 = 0x80240050; // type:func rom:0xD11110 -sam_03_UnkNpcAIFunc7 = 0x802400BC; // type:func rom:0xD1117C -sam_03_UnkNpcAIFunc8 = 0x8024012C; // type:func rom:0xD111EC -sam_03_UnkNpcAIFunc5 = 0x80240204; // type:func rom:0xD112C4 -sam_03_UnkNpcAIFunc26 = 0x80240258; // type:func rom:0xD11318 -sam_03_UnkFunc7 = 0x8024040C; // type:func rom:0xD114CC -sam_03_UnkNpcAIFunc27 = 0x8024066C; // type:func rom:0xD1172C +sam_03_MeleeHitbox_30 = 0x80240050; // type:func rom:0xD11110 +sam_03_MeleeHitbox_31 = 0x802400BC; // type:func rom:0xD1117C +sam_03_MeleeHitbox_32 = 0x8024012C; // type:func rom:0xD111EC +sam_03_MeleeHitbox_33 = 0x80240204; // type:func rom:0xD112C4 +sam_03_MeleeHitbox_CanSeePlayer = 0x80240258; // type:func rom:0xD11318 +sam_03_MeleeHitbox_Main = 0x8024040C; // type:func rom:0xD114CC +sam_03_WanderMeleeAI_Main = 0x8024066C; // type:func rom:0xD1172C D_80242370_D13430 = 0x80242370; // type:data rom:0xD13430 sam_04_foliage_setup_shear_mtx = 0x80240000; // type:func rom:0xD135D0 sam_04_TransformFoliage = 0x80240070; // type:func rom:0xD13640 @@ -20658,21 +20627,21 @@ func_802405C8_D13B98 = 0x802405C8; // type:func rom:0xD13B98 func_80240664_D13C34 = 0x80240664; // type:func rom:0xD13C34 D_8024387C_D16E4C = 0x8024387C; // type:data rom:0xD16E4C D_80243880_D16E50 = 0x80243880; // type:data rom:0xD16E50 -sam_05_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xD187E0 -sam_05_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xD1884C -sam_05_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xD188BC -sam_05_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xD18994 -sam_05_UnkNpcAIFunc26 = 0x80240208; // type:func rom:0xD189E8 -sam_05_UnkFunc7 = 0x802403BC; // type:func rom:0xD18B9C -sam_05_UnkNpcAIFunc27 = 0x8024061C; // type:func rom:0xD18DFC -sam_05_UnkNpcAIFunc31 = 0x802408D0; // type:func rom:0xD190B0 -sam_05_UnkNpcAIFunc32 = 0x8024093C; // type:func rom:0xD1911C -sam_05_UnkNpcAIFunc46 = 0x80240A38; // type:func rom:0xD19218 -sam_05_UnkNpcDurationFlagFunc3 = 0x80241478; // type:func rom:0xD19C58 -sam_05_UnkNpcAIFunc33 = 0x80241508; // type:func rom:0xD19CE8 -sam_05_UnkNpcDurationFlagFunc2 = 0x80241608; // type:func rom:0xD19DE8 -sam_05_UnkNpcAIFunc30 = 0x80241668; // type:func rom:0xD19E48 -func_80241754_D19F34 = 0x80241754; // type:func rom:0xD19F34 +sam_05_MeleeHitbox_30 = 0x80240000; // type:func rom:0xD187E0 +sam_05_MeleeHitbox_31 = 0x8024006C; // type:func rom:0xD1884C +sam_05_MeleeHitbox_32 = 0x802400DC; // type:func rom:0xD188BC +sam_05_MeleeHitbox_33 = 0x802401B4; // type:func rom:0xD18994 +sam_05_MeleeHitbox_CanSeePlayer = 0x80240208; // type:func rom:0xD189E8 +sam_05_MeleeHitbox_Main = 0x802403BC; // type:func rom:0xD18B9C +sam_05_WanderMeleeAI_Main = 0x8024061C; // type:func rom:0xD18DFC +sam_05_PiranhaPlantAI_00 = 0x802408D0; // type:func rom:0xD190B0 +sam_05_PiranhaPlantAI_01 = 0x8024093C; // type:func rom:0xD1911C +sam_05_PiranhaPlantAI_10 = 0x80240A38; // type:func rom:0xD19218 +sam_05_PiranhaPlantAI_11 = 0x80241478; // type:func rom:0xD19C58 +sam_05_PiranhaPlantAI_12 = 0x80241508; // type:func rom:0xD19CE8 +sam_05_PiranhaPlantAI_13 = 0x80241608; // type:func rom:0xD19DE8 +sam_05_PiranhaPlantAI_14 = 0x80241668; // type:func rom:0xD19E48 +sam_05_PiranhaPlantAI_Main = 0x80241754; // type:func rom:0xD19F34 func_802419A4_D1A184 = 0x802419A4; // type:func rom:0xD1A184 func_80241D20_D1A500 = 0x80241D20; // type:func rom:0xD1A500 D_80242F90_D1B770 = 0x80242F90; // type:data rom:0xD1B770 @@ -20687,17 +20656,17 @@ sam_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xD1FE90 sam_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xD1FFB4 sam_06_foliage_setup_shear_mtx = 0x8024030C; // type:func rom:0xD2019C sam_06_TransformFoliage = 0x8024037C; // type:func rom:0xD2020C -sam_06_UnkNpcAIFunc23 = 0x80240550; // type:func rom:0xD203E0 -sam_06_UnkNpcAIFunc35 = 0x80240700; // type:func rom:0xD20590 -sam_06_UnkNpcAIFunc1_copy = 0x80240D28; // type:func rom:0xD20BB8 -sam_06_UnkFunc4 = 0x80240DE8; // type:func rom:0xD20C78 -sam_06_UnkNpcAIFunc2 = 0x8024112C; // type:func rom:0xD20FBC -sam_06_SixFloatsFunc = 0x802411A4; // type:func rom:0xD21034 -sam_06_UnkNpcAIFunc14 = 0x80241210; // type:func rom:0xD210A0 -sam_06_UnkNpcAIFunc3 = 0x80241344; // type:func rom:0xD211D4 -sam_06_UnkFunc6 = 0x802413A8; // type:func rom:0xD21238 -sam_06_UnkFunc5 = 0x80241738; // type:func rom:0xD215C8 -sam_06_UnkNpcAIMainFunc9 = 0x8024185C; // type:func rom:0xD216EC +sam_06_FlyingAI_WanderInit = 0x80240550; // type:func rom:0xD203E0 +sam_06_FlyingAI_Wander = 0x80240700; // type:func rom:0xD20590 +sam_06_FlyingAI_LoiterInit = 0x80240D28; // type:func rom:0xD20BB8 +sam_06_FlyingAI_Loiter = 0x80240DE8; // type:func rom:0xD20C78 +sam_06_FlyingAI_JumpInit = 0x8024112C; // type:func rom:0xD20FBC +sam_06_FlyingAI_Jump = 0x802411A4; // type:func rom:0xD21034 +sam_06_FlyingAI_ChaseInit = 0x80241210; // type:func rom:0xD210A0 +sam_06_FlyingAI_Chase = 0x80241344; // type:func rom:0xD211D4 +sam_06_FlyingAI_LosePlayer = 0x802413A8; // type:func rom:0xD21238 +sam_06_FlyingAI_Init = 0x80241738; // type:func rom:0xD215C8 +sam_06_FlyingAI_Main = 0x8024185C; // type:func rom:0xD216EC sam_06_StashVars = 0x80241A48; // type:func rom:0xD218D8 sam_06_GetItemName = 0x80241AFC; // type:func rom:0xD2198C sam_06_GetNpcCollisionHeight = 0x80241B60; // type:func rom:0xD219F0 @@ -20718,12 +20687,12 @@ sam_06_ToadHouse_InitScreenOverlay = 0x80242164; // type:func rom:0xD21FF4 sam_06_ToadHouse_PutPartnerAway = 0x802421E0; // type:func rom:0xD22070 sam_06_ToadHouse_GetPartnerBackOut = 0x80242214; // type:func rom:0xD220A4 sam_06_ToadHouse_Stub = 0x80242244; // type:func rom:0xD220D4 -sam_06_SetManyVars = 0x8024224C; // type:func rom:0xD220DC -sam_06_UnkYawFunc = 0x8024233C; // type:func rom:0xD221CC -func_802424C8_D22358 = 0x802424C8; // type:func rom:0xD22358 -func_8024250C_D2239C = 0x8024250C; // type:func rom:0xD2239C +sam_06_LetterDelivery_Init = 0x8024224C; // type:func rom:0xD220DC +sam_06_LetterDelivery_CalcLetterPos = 0x8024233C; // type:func rom:0xD221CC +sam_06_LetterDelivery_SaveNpcAnim = 0x802424C8; // type:func rom:0xD22358 +sam_06_LetterDelivery_RestoreNpcAnim = 0x8024250C; // type:func rom:0xD2239C func_80242538_D223C8 = 0x80242538; // type:func rom:0xD223C8 -sam_06_sixFloats = 0x802441B8; // type:data rom:0xD24048 +sam_06_FlyingAI_JumpVels = 0x802441B8; // type:data rom:0xD24048 sam_06_varStash = 0x802443D0; // type:data rom:0xD24260 D_80244434_D242C4 = 0x80244434; // type:data rom:0xD242C4 D_80244438_D242C8 = 0x80244438; // type:data rom:0xD242C8 @@ -20735,21 +20704,21 @@ sam_07_SetEntityPositionF = 0x80240448; // type:func rom:0xD2C178 sam_07_GetEntityPosition = 0x80240510; // type:func rom:0xD2C240 func_802405B0_D2C2E0 = 0x802405B0; // type:func rom:0xD2C2E0 sam_07_UnsetCamera0MoveFlag1 = 0x80240634; // type:func rom:0xD2C364 -sam_07_UnkNpcAIFunc6 = 0x80240650; // type:func rom:0xD2C380 -sam_07_UnkNpcAIFunc7 = 0x802406BC; // type:func rom:0xD2C3EC -sam_07_UnkNpcAIFunc8 = 0x8024072C; // type:func rom:0xD2C45C -sam_07_UnkNpcAIFunc5 = 0x80240804; // type:func rom:0xD2C534 -sam_07_UnkNpcAIFunc26 = 0x80240858; // type:func rom:0xD2C588 -sam_07_UnkFunc7 = 0x80240A0C; // type:func rom:0xD2C73C -sam_07_UnkNpcAIFunc27 = 0x80240C6C; // type:func rom:0xD2C99C -sam_07_UnkNpcAIFunc31 = 0x80240F20; // type:func rom:0xD2CC50 -sam_07_UnkNpcAIFunc32 = 0x80240F8C; // type:func rom:0xD2CCBC -sam_07_UnkNpcAIFunc46 = 0x80241088; // type:func rom:0xD2CDB8 -sam_07_UnkNpcDurationFlagFunc3 = 0x80241AC8; // type:func rom:0xD2D7F8 -sam_07_UnkNpcAIFunc33 = 0x80241B58; // type:func rom:0xD2D888 -sam_07_UnkNpcDurationFlagFunc2 = 0x80241C58; // type:func rom:0xD2D988 -sam_07_UnkNpcAIFunc30 = 0x80241CB8; // type:func rom:0xD2D9E8 -func_80241DA4_D2DAD4 = 0x80241DA4; // type:func rom:0xD2DAD4 +sam_07_MeleeHitbox_30 = 0x80240650; // type:func rom:0xD2C380 +sam_07_MeleeHitbox_31 = 0x802406BC; // type:func rom:0xD2C3EC +sam_07_MeleeHitbox_32 = 0x8024072C; // type:func rom:0xD2C45C +sam_07_MeleeHitbox_33 = 0x80240804; // type:func rom:0xD2C534 +sam_07_MeleeHitbox_CanSeePlayer = 0x80240858; // type:func rom:0xD2C588 +sam_07_MeleeHitbox_Main = 0x80240A0C; // type:func rom:0xD2C73C +sam_07_WanderMeleeAI_Main = 0x80240C6C; // type:func rom:0xD2C99C +sam_07_PiranhaPlantAI_00 = 0x80240F20; // type:func rom:0xD2CC50 +sam_07_PiranhaPlantAI_01 = 0x80240F8C; // type:func rom:0xD2CCBC +sam_07_PiranhaPlantAI_10 = 0x80241088; // type:func rom:0xD2CDB8 +sam_07_PiranhaPlantAI_11 = 0x80241AC8; // type:func rom:0xD2D7F8 +sam_07_PiranhaPlantAI_12 = 0x80241B58; // type:func rom:0xD2D888 +sam_07_PiranhaPlantAI_13 = 0x80241C58; // type:func rom:0xD2D988 +sam_07_PiranhaPlantAI_14 = 0x80241CB8; // type:func rom:0xD2D9E8 +sam_07_PiranhaPlantAI_Main = 0x80241DA4; // type:func rom:0xD2DAD4 D_802424C0_D2E1F0 = 0x802424C0; // type:data rom:0xD2E1F0 D_80243D80_D2FAB0 = 0x80243D80; // type:data rom:0xD2FAB0 D_80243F18_D2FC48 = 0x80243F18; // type:data rom:0xD2FC48 @@ -20776,13 +20745,13 @@ sam_08_SuperBlock_WhiteScreenFlash = 0x80240B38; // type:func rom:0xD307B8 sam_08_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xD308F8 sam_08_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xD30940 sam_08_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xD30988 -sam_08_UnkNpcAIFunc6 = 0x80240D40; // type:func rom:0xD309C0 -sam_08_UnkNpcAIFunc7 = 0x80240DAC; // type:func rom:0xD30A2C -sam_08_UnkNpcAIFunc8 = 0x80240E1C; // type:func rom:0xD30A9C -sam_08_UnkNpcAIFunc5 = 0x80240EF4; // type:func rom:0xD30B74 -sam_08_UnkNpcAIFunc26 = 0x80240F48; // type:func rom:0xD30BC8 -sam_08_UnkFunc7 = 0x802410FC; // type:func rom:0xD30D7C -sam_08_UnkNpcAIFunc27 = 0x8024135C; // type:func rom:0xD30FDC +sam_08_MeleeHitbox_30 = 0x80240D40; // type:func rom:0xD309C0 +sam_08_MeleeHitbox_31 = 0x80240DAC; // type:func rom:0xD30A2C +sam_08_MeleeHitbox_32 = 0x80240E1C; // type:func rom:0xD30A9C +sam_08_MeleeHitbox_33 = 0x80240EF4; // type:func rom:0xD30B74 +sam_08_MeleeHitbox_CanSeePlayer = 0x80240F48; // type:func rom:0xD30BC8 +sam_08_MeleeHitbox_Main = 0x802410FC; // type:func rom:0xD30D7C +sam_08_WanderMeleeAI_Main = 0x8024135C; // type:func rom:0xD30FDC func_80241610_D31290 = 0x80241610; // type:func rom:0xD31290 func_802416A4_D31324 = 0x802416A4; // type:func rom:0xD31324 func_8024174C_D313CC = 0x8024174C; // type:func rom:0xD313CC @@ -20804,13 +20773,13 @@ sam_10_SomeItemEntityFunc = 0x80240118; // type:func rom:0xD37918 sam_10_CheckItemFlags40 = 0x80240268; // type:func rom:0xD37A68 func_802402BC_D37ABC = 0x802402BC; // type:func rom:0xD37ABC func_802402F0_D37AF0 = 0x802402F0; // type:func rom:0xD37AF0 -sam_10_UnkNpcAIFunc6 = 0x802403D0; // type:func rom:0xD37BD0 -sam_10_UnkNpcAIFunc7 = 0x8024043C; // type:func rom:0xD37C3C -sam_10_UnkNpcAIFunc8 = 0x802404AC; // type:func rom:0xD37CAC -sam_10_UnkNpcAIFunc5 = 0x80240584; // type:func rom:0xD37D84 -sam_10_UnkNpcAIFunc26 = 0x802405D8; // type:func rom:0xD37DD8 -sam_10_UnkFunc7 = 0x8024078C; // type:func rom:0xD37F8C -sam_10_UnkNpcAIFunc27 = 0x802409EC; // type:func rom:0xD381EC +sam_10_MeleeHitbox_30 = 0x802403D0; // type:func rom:0xD37BD0 +sam_10_MeleeHitbox_31 = 0x8024043C; // type:func rom:0xD37C3C +sam_10_MeleeHitbox_32 = 0x802404AC; // type:func rom:0xD37CAC +sam_10_MeleeHitbox_33 = 0x80240584; // type:func rom:0xD37D84 +sam_10_MeleeHitbox_CanSeePlayer = 0x802405D8; // type:func rom:0xD37DD8 +sam_10_MeleeHitbox_Main = 0x8024078C; // type:func rom:0xD37F8C +sam_10_WanderMeleeAI_Main = 0x802409EC; // type:func rom:0xD381EC sam_10_varStash = 0x80241040; // type:data rom:0xD38840 D_80242C30_D3A430 = 0x80242C30; // type:data rom:0xD3A430 func_80240000_D3A5D0 = 0x80240000; // type:func rom:0xD3A5D0 @@ -21327,26 +21296,26 @@ pra_35_ReflectPartner = 0x80240D3C; // type:func rom:0xD8DF8C pra_35_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD8E0D4 pra_35_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD8E108 pra_35_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD8E13C -pra_35_UnkNpcAIFunc24 = 0x80240F20; // type:func rom:0xD8E170 -pra_35_UnkFunc13 = 0x80241078; // type:func rom:0xD8E2C8 -pra_35_UnkNpcAIFunc1 = 0x80241320; // type:func rom:0xD8E570 -pra_35_UnkFunc14 = 0x802413E0; // type:func rom:0xD8E630 -pra_35_UnkNpcAIFunc25 = 0x8024159C; // type:func rom:0xD8E7EC -pra_35_NpcJumpFunc2 = 0x80241650; // type:func rom:0xD8E8A0 -pra_35_NpcJumpFunc = 0x802416C4; // type:func rom:0xD8E914 -pra_35_UnkNpcAIFunc13 = 0x8024173C; // type:func rom:0xD8E98C -pra_35_UnkFunc15 = 0x8024186C; // type:func rom:0xD8EABC -pra_35_UnkNpcDurationFlagFunc = 0x8024198C; // type:func rom:0xD8EBDC -pra_35_UnkFunc16 = 0x802419F4; // type:func rom:0xD8EC44 -pra_35_UnkNpcAIMainFunc = 0x80241AB4; // type:func rom:0xD8ED04 -pra_35_UnkNpcAIFunc6 = 0x80241DB0; // type:func rom:0xD8F000 -pra_35_UnkNpcAIFunc7 = 0x80241E1C; // type:func rom:0xD8F06C -pra_35_UnkNpcAIFunc8 = 0x80241E8C; // type:func rom:0xD8F0DC -pra_35_UnkNpcAIFunc5 = 0x80241F64; // type:func rom:0xD8F1B4 -pra_35_UnkNpcAIFunc26 = 0x80241FB8; // type:func rom:0xD8F208 -pra_35_UnkFunc7 = 0x8024216C; // type:func rom:0xD8F3BC +pra_35_PatrolAI_MoveInit = 0x80240F20; // type:func rom:0xD8E170 +pra_35_PatrolAI_Move = 0x80241078; // type:func rom:0xD8E2C8 +pra_35_PatrolAI_LoiterInit = 0x80241320; // type:func rom:0xD8E570 +pra_35_PatrolAI_Loiter = 0x802413E0; // type:func rom:0xD8E630 +pra_35_PatrolAI_PostLoiter = 0x8024159C; // type:func rom:0xD8E7EC +pra_35_PatrolAI_JumpInit = 0x80241650; // type:func rom:0xD8E8A0 +pra_35_PatrolAI_Jump = 0x802416C4; // type:func rom:0xD8E914 +pra_35_PatrolAI_ChaseInit = 0x8024173C; // type:func rom:0xD8E98C +pra_35_PatrolAI_Chase = 0x8024186C; // type:func rom:0xD8EABC +pra_35_PatrolAI_LosePlayer = 0x8024198C; // type:func rom:0xD8EBDC +pra_35_PatrolNoAttackAI_15 = 0x802419F4; // type:func rom:0xD8EC44 +pra_35_PatrolNoAttackAI_Main = 0x80241AB4; // type:func rom:0xD8ED04 +pra_35_MeleeHitbox_30 = 0x80241DB0; // type:func rom:0xD8F000 +pra_35_MeleeHitbox_31 = 0x80241E1C; // type:func rom:0xD8F06C +pra_35_MeleeHitbox_32 = 0x80241E8C; // type:func rom:0xD8F0DC +pra_35_MeleeHitbox_33 = 0x80241F64; // type:func rom:0xD8F1B4 +pra_35_MeleeHitbox_CanSeePlayer = 0x80241FB8; // type:func rom:0xD8F208 +pra_35_MeleeHitbox_Main = 0x8024216C; // type:func rom:0xD8F3BC func_802423CC_D8F61C = 0x802423CC; // type:func rom:0xD8F61C -pra_35_UnkNpcAIFunc27 = 0x80242698; // type:func rom:0xD8F8E8 +pra_35_WanderMeleeAI_Main = 0x80242698; // type:func rom:0xD8F8E8 pra_35_StashVars = 0x80242950; // type:func rom:0xD8FBA0 pra_35_GetItemName = 0x80242A04; // type:func rom:0xD8FC54 pra_35_SomeItemEntityFunc = 0x80242A68; // type:func rom:0xD8FCB8 @@ -21385,13 +21354,13 @@ pra_37_ReflectPartner = 0x80240D6C; // type:func rom:0xD93CAC pra_37_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD93DF4 pra_37_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD93E28 pra_37_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD93E5C -pra_37_UnkNpcAIFunc6 = 0x80240F50; // type:func rom:0xD93E90 -pra_37_UnkNpcAIFunc7 = 0x80240FBC; // type:func rom:0xD93EFC -pra_37_UnkNpcAIFunc8 = 0x8024102C; // type:func rom:0xD93F6C -pra_37_UnkNpcAIFunc5 = 0x80241104; // type:func rom:0xD94044 -pra_37_UnkNpcAIFunc26 = 0x80241158; // type:func rom:0xD94098 -pra_37_UnkFunc7 = 0x8024130C; // type:func rom:0xD9424C -pra_37_UnkNpcAIFunc27 = 0x8024156C; // type:func rom:0xD944AC +pra_37_MeleeHitbox_30 = 0x80240F50; // type:func rom:0xD93E90 +pra_37_MeleeHitbox_31 = 0x80240FBC; // type:func rom:0xD93EFC +pra_37_MeleeHitbox_32 = 0x8024102C; // type:func rom:0xD93F6C +pra_37_MeleeHitbox_33 = 0x80241104; // type:func rom:0xD94044 +pra_37_MeleeHitbox_CanSeePlayer = 0x80241158; // type:func rom:0xD94098 +pra_37_MeleeHitbox_Main = 0x8024130C; // type:func rom:0xD9424C +pra_37_WanderMeleeAI_Main = 0x8024156C; // type:func rom:0xD944AC D_802424E0_D95420 = 0x802424E0; // type:data rom:0xD95420 D_802424F0_D95430 = 0x802424F0; // type:data rom:0xD95430 D_80242510_D95450 = 0x80242510; // type:data rom:0xD95450 @@ -21458,30 +21427,30 @@ omo_02_SetCamera0MoveFlag1 = 0x8024001C; // type:func rom:0xD9D4EC func_80240040_D9D510 = 0x80240040; // type:func rom:0xD9D510 func_802402C0_D9D790 = 0x802402C0; // type:func rom:0xD9D790 func_8024043C_D9D90C = 0x8024043C; // type:func rom:0xD9D90C -func_80240970_D9DE40 = 0x80240970; // type:func rom:0xD9DE40 -func_802409E0_D9DEB0 = 0x802409E0; // type:func rom:0xD9DEB0 -func_80240AB0_D9DF80 = 0x80240AB0; // type:func rom:0xD9DF80 -omo_02_UnkNpcDurationAnimationFunc = 0x80240B48; // type:func rom:0xD9E018 -func_80240BA8_D9E078 = 0x80240BA8; // type:func rom:0xD9E078 -omo_02_UnkNpcAIFunc43 = 0x80240EDC; // type:func rom:0xD9E3AC -omo_02_UnkNpcAIFunc44 = 0x80240F90; // type:func rom:0xD9E460 -omo_02_NpcJumpFunc3 = 0x802410B0; // type:func rom:0xD9E580 -omo_02_NpcJumpFunc = 0x80241110; // type:func rom:0xD9E5E0 -omo_02_UnkNpcAIFunc13_2 = 0x80241188; // type:func rom:0xD9E658 -omo_02_UnkNpcAIFunc11 = 0x802412B8; // type:func rom:0xD9E788 -omo_02_UnkNpcAIFunc10 = 0x802413D4; // type:func rom:0xD9E8A4 -omo_02_UnkNpcAIFunc42 = 0x8024141C; // type:func rom:0xD9E8EC -omo_02_UnkNpcAIFunc45 = 0x802414C8; // type:func rom:0xD9E998 -omo_02_UnkNpcAIMainFunc4 = 0x802416D0; // type:func rom:0xD9EBA0 -omo_02_UnkFunc61 = 0x80241948; // type:func rom:0xD9EE18 +omo_02_ShyGuyWanderAI_14 = 0x80240970; // type:func rom:0xD9DE40 +omo_02_ShyGuyWanderAI_15 = 0x802409E0; // type:func rom:0xD9DEB0 +omo_02_ShyGuyWanderAI_16 = 0x80240AB0; // type:func rom:0xD9DF80 +omo_02_ShyGuyWanderAI_17 = 0x80240B48; // type:func rom:0xD9E018 +omo_02_ShyGuyWanderAI_Main = 0x80240BA8; // type:func rom:0xD9E078 +omo_02_StationaryAI_IdleInit = 0x80240EDC; // type:func rom:0xD9E3AC +omo_02_StationaryAI_Idle = 0x80240F90; // type:func rom:0xD9E460 +omo_02_StationaryAI_AlertInit = 0x802410B0; // type:func rom:0xD9E580 +omo_02_StationaryAI_Alert = 0x80241110; // type:func rom:0xD9E5E0 +omo_02_StationaryAI_ChaseInit = 0x80241188; // type:func rom:0xD9E658 +omo_02_StationaryAI_Chase = 0x802412B8; // type:func rom:0xD9E788 +omo_02_StationaryAI_LosePlayer = 0x802413D4; // type:func rom:0xD9E8A4 +omo_02_StationaryAI_ReturnHomeInit = 0x8024141C; // type:func rom:0xD9E8EC +omo_02_StationaryAI_ReturnHome = 0x802414C8; // type:func rom:0xD9E998 +omo_02_StationaryAI_Main = 0x802416D0; // type:func rom:0xD9EBA0 +omo_02_ProjectileHitbox_GetUsableProjectileID = 0x80241948; // type:func rom:0xD9EE18 omo_02_UnkNpcAIFunc48 = 0x80241B38; // type:func rom:0xD9F008 -omo_02_UnkNpcAIFunc49 = 0x80241C7C; // type:func rom:0xD9F14C -omo_02_UnkSetDurationFunc = 0x80241D7C; // type:func rom:0xD9F24C -omo_02_UnkNpcAIFunc9 = 0x80241DC0; // type:func rom:0xD9F290 -omo_02_UnkDurationCheckNoArgs = 0x80241E60; // type:func rom:0xD9F330 -omo_02_UnkFunc54 = 0x80241EA4; // type:func rom:0xD9F374 -omo_02_UnkFunc55 = 0x802423E0; // type:func rom:0xD9F8B0 -omo_02_UnkNpcAIMainFunc7 = 0x8024283C; // type:func rom:0xD9FD0C +omo_02_ProjectileHitbox_30 = 0x80241C7C; // type:func rom:0xD9F14C +omo_02_ProjectileHitbox_31 = 0x80241D7C; // type:func rom:0xD9F24C +omo_02_ProjectileHitbox_32 = 0x80241DC0; // type:func rom:0xD9F290 +omo_02_ProjectileHitbox_33 = 0x80241E60; // type:func rom:0xD9F330 +omo_02_ProjectileAI_Main = 0x80241EA4; // type:func rom:0xD9F374 +omo_02_ProjectileAI_Reflect = 0x802423E0; // type:func rom:0xD9F8B0 +omo_02_RangedAttackAI_Main = 0x8024283C; // type:func rom:0xD9FD0C omo_02_SetNpcB5_3 = 0x80242B5C; // type:func rom:0xDA002C omo_02_GetEncounterEnemyIsOwner = 0x80242B70; // type:func rom:0xDA0040 D_802434F8_DA09C8 = 0x802434F8; // type:data rom:0xDA09C8 @@ -21515,51 +21484,51 @@ omo_04_CheckItemFlags40 = 0x80240268; // type:func rom:0xDAD668 omo_04_UnsetCamera0MoveFlag1 = 0x802402BC; // type:func rom:0xDAD6BC omo_04_SetCamera0MoveFlag1 = 0x802402D8; // type:func rom:0xDAD6D8 func_802402F4_DAD6F4 = 0x802402F4; // type:func rom:0xDAD6F4 -omo_04_UnkNpcAIFunc23 = 0x802403A0; // type:func rom:0xDAD7A0 -omo_04_UnkNpcAIFunc35 = 0x80240550; // type:func rom:0xDAD950 -omo_04_UnkNpcAIFunc1_copy = 0x80240B78; // type:func rom:0xDADF78 -omo_04_UnkFunc4 = 0x80240C38; // type:func rom:0xDAE038 -omo_04_UnkNpcAIFunc2 = 0x80240F7C; // type:func rom:0xDAE37C -omo_04_SixFloatsFunc = 0x80240FF4; // type:func rom:0xDAE3F4 -omo_04_UnkNpcAIFunc14 = 0x80241060; // type:func rom:0xDAE460 -omo_04_UnkNpcAIFunc3 = 0x80241194; // type:func rom:0xDAE594 -omo_04_UnkFunc6 = 0x802411F8; // type:func rom:0xDAE5F8 -omo_04_UnkFunc5 = 0x80241588; // type:func rom:0xDAE988 -omo_04_UnkNpcAIMainFunc9 = 0x802416AC; // type:func rom:0xDAEAAC -func_80241898_DAEC98 = 0x80241898; // type:func rom:0xDAEC98 -func_80241908_DAED08 = 0x80241908; // type:func rom:0xDAED08 -func_802419D8_DAEDD8 = 0x802419D8; // type:func rom:0xDAEDD8 -omo_04_UnkNpcDurationAnimationFunc = 0x80241A70; // type:func rom:0xDAEE70 -func_80241AD0_DAEED0 = 0x80241AD0; // type:func rom:0xDAEED0 +omo_04_FlyingAI_WanderInit = 0x802403A0; // type:func rom:0xDAD7A0 +omo_04_FlyingAI_Wander = 0x80240550; // type:func rom:0xDAD950 +omo_04_FlyingAI_LoiterInit = 0x80240B78; // type:func rom:0xDADF78 +omo_04_FlyingAI_Loiter = 0x80240C38; // type:func rom:0xDAE038 +omo_04_FlyingAI_JumpInit = 0x80240F7C; // type:func rom:0xDAE37C +omo_04_FlyingAI_Jump = 0x80240FF4; // type:func rom:0xDAE3F4 +omo_04_FlyingAI_ChaseInit = 0x80241060; // type:func rom:0xDAE460 +omo_04_FlyingAI_Chase = 0x80241194; // type:func rom:0xDAE594 +omo_04_FlyingAI_LosePlayer = 0x802411F8; // type:func rom:0xDAE5F8 +omo_04_FlyingAI_Init = 0x80241588; // type:func rom:0xDAE988 +omo_04_FlyingAI_Main = 0x802416AC; // type:func rom:0xDAEAAC +omo_04_ShyGuyWanderAI_14 = 0x80241898; // type:func rom:0xDAEC98 +omo_04_ShyGuyWanderAI_15 = 0x80241908; // type:func rom:0xDAED08 +omo_04_ShyGuyWanderAI_16 = 0x802419D8; // type:func rom:0xDAEDD8 +omo_04_ShyGuyWanderAI_17 = 0x80241A70; // type:func rom:0xDAEE70 +omo_04_ShyGuyWanderAI_Main = 0x80241AD0; // type:func rom:0xDAEED0 omo_04_SetCamera0Flag1000 = 0x80241E04; // type:func rom:0xDAF204 omo_04_UnsetCamera0Flag1000 = 0x80241E20; // type:func rom:0xDAF220 func_80241E40_DAF240 = 0x80241E40; // type:func rom:0xDAF240 omo_04_varStash = 0x80242630; // type:data rom:0xDAFA30 -omo_04_sixFloats = 0x80242EF0; // type:data rom:0xDB02F0 +omo_04_FlyingAI_JumpVels = 0x80242EF0; // type:data rom:0xDB02F0 D_80244CB0_DB20B0 = 0x80244CB0; // type:data rom:0xDB20B0 D_80244CB8_DB20B8 = 0x80244CB8; // type:data rom:0xDB20B8 D_80244CC0_DB20C0 = 0x80244CC0; // type:data rom:0xDB20C0 D_80244D08_DB2108 = 0x80244D08; // type:data rom:0xDB2108 D_80244D10_DB2110 = 0x80244D10; // type:data rom:0xDB2110 -func_80240000_DB22C0 = 0x80240000; // type:func rom:0xDB22C0 -func_80240070_DB2330 = 0x80240070; // type:func rom:0xDB2330 -func_80240140_DB2400 = 0x80240140; // type:func rom:0xDB2400 -omo_05_UnkNpcDurationAnimationFunc = 0x802401D8; // type:func rom:0xDB2498 -func_80240238_DB24F8 = 0x80240238; // type:func rom:0xDB24F8 -omo_05_UnkNpcAIFunc4 = 0x8024056C; // type:func rom:0xDB282C -func_802405BC_DB287C = 0x802405BC; // type:func rom:0xDB287C -func_80240780_DB2A40 = 0x80240780; // type:func rom:0xDB2A40 -omo_05_UnkNpcAIFunc23 = 0x80240A54; // type:func rom:0xDB2D14 -omo_05_UnkNpcAIFunc35 = 0x80240C04; // type:func rom:0xDB2EC4 -omo_05_UnkNpcAIFunc1_copy = 0x8024122C; // type:func rom:0xDB34EC -omo_05_UnkFunc4 = 0x802412EC; // type:func rom:0xDB35AC -omo_05_UnkNpcAIFunc2 = 0x80241630; // type:func rom:0xDB38F0 -omo_05_SixFloatsFunc = 0x802416A8; // type:func rom:0xDB3968 -omo_05_UnkNpcAIFunc14 = 0x80241714; // type:func rom:0xDB39D4 -omo_05_UnkNpcAIFunc3 = 0x80241848; // type:func rom:0xDB3B08 -omo_05_UnkFunc6 = 0x802418AC; // type:func rom:0xDB3B6C -omo_05_UnkFunc5 = 0x80241C3C; // type:func rom:0xDB3EFC -omo_05_UnkNpcAIMainFunc9 = 0x80241D60; // type:func rom:0xDB4020 +omo_05_ShyGuyWanderAI_14 = 0x80240000; // type:func rom:0xDB22C0 +omo_05_ShyGuyWanderAI_15 = 0x80240070; // type:func rom:0xDB2330 +omo_05_ShyGuyWanderAI_16 = 0x80240140; // type:func rom:0xDB2400 +omo_05_ShyGuyWanderAI_17 = 0x802401D8; // type:func rom:0xDB2498 +omo_05_ShyGuyWanderAI_Main = 0x80240238; // type:func rom:0xDB24F8 +omo_05_GrooveGuyAI_02 = 0x8024056C; // type:func rom:0xDB282C +omo_05_GrooveGuyAI_03 = 0x802405BC; // type:func rom:0xDB287C +omo_05_GrooveGuyAI_Main = 0x80240780; // type:func rom:0xDB2A40 +omo_05_FlyingAI_WanderInit = 0x80240A54; // type:func rom:0xDB2D14 +omo_05_FlyingAI_Wander = 0x80240C04; // type:func rom:0xDB2EC4 +omo_05_FlyingAI_LoiterInit = 0x8024122C; // type:func rom:0xDB34EC +omo_05_FlyingAI_Loiter = 0x802412EC; // type:func rom:0xDB35AC +omo_05_FlyingAI_JumpInit = 0x80241630; // type:func rom:0xDB38F0 +omo_05_FlyingAI_Jump = 0x802416A8; // type:func rom:0xDB3968 +omo_05_FlyingAI_ChaseInit = 0x80241714; // type:func rom:0xDB39D4 +omo_05_FlyingAI_Chase = 0x80241848; // type:func rom:0xDB3B08 +omo_05_FlyingAI_LosePlayer = 0x802418AC; // type:func rom:0xDB3B6C +omo_05_FlyingAI_Init = 0x80241C3C; // type:func rom:0xDB3EFC +omo_05_FlyingAI_Main = 0x80241D60; // type:func rom:0xDB4020 omo_05_GetNpcCollisionHeight = 0x80241F4C; // type:func rom:0xDB420C omo_05_AddPlayerHandsOffset = 0x80241FA8; // type:func rom:0xDB4268 func_80242178_DB4438 = 0x80242178; // type:func rom:0xDB4438 @@ -21568,7 +21537,7 @@ func_80242204_DB44C4 = 0x80242204; // type:func rom:0xDB44C4 func_802422A0_DB4560 = 0x802422A0; // type:func rom:0xDB4560 func_80242328_DB45E8 = 0x80242328; // type:func rom:0xDB45E8 func_802423C8_DB4688 = 0x802423C8; // type:func rom:0xDB4688 -omo_05_sixFloats = 0x80242F88; // type:data rom:0xDB5248 +omo_05_FlyingAI_JumpVels = 0x80242F88; // type:data rom:0xDB5248 D_80243098_DB5358 = 0x80243098; // type:data rom:0xDB5358 D_8024309C_DB535C = 0x8024309C; // type:data rom:0xDB535C D_802452B0_DB7570 = 0x802452B0; // type:data rom:0xDB7570 @@ -21594,39 +21563,39 @@ omo_06_GetItemName = 0x80240924; // type:func rom:0xDB8234 omo_06_SomeItemEntityFunc = 0x80240988; // type:func rom:0xDB8298 omo_06_CheckItemFlags40 = 0x80240AD8; // type:func rom:0xDB83E8 omo_06_varStash = 0x802456C0; // type:data rom:0xDBCFD0 -func_80240000_DBD2B0 = 0x80240000; // type:func rom:0xDBD2B0 -func_80240070_DBD320 = 0x80240070; // type:func rom:0xDBD320 -func_80240140_DBD3F0 = 0x80240140; // type:func rom:0xDBD3F0 -omo_07_UnkNpcDurationAnimationFunc = 0x802401D8; // type:func rom:0xDBD488 -func_80240238_DBD4E8 = 0x80240238; // type:func rom:0xDBD4E8 -omo_07_UnkNpcAIFunc24 = 0x8024056C; // type:func rom:0xDBD81C -omo_07_UnkFunc13 = 0x802406C4; // type:func rom:0xDBD974 -omo_07_UnkNpcAIFunc1 = 0x8024096C; // type:func rom:0xDBDC1C -omo_07_UnkFunc14 = 0x80240A2C; // type:func rom:0xDBDCDC -omo_07_UnkNpcAIFunc25 = 0x80240BE8; // type:func rom:0xDBDE98 -omo_07_NpcJumpFunc2 = 0x80240C9C; // type:func rom:0xDBDF4C -omo_07_NpcJumpFunc = 0x80240D10; // type:func rom:0xDBDFC0 -omo_07_UnkNpcAIFunc13 = 0x80240D88; // type:func rom:0xDBE038 -omo_07_UnkFunc15 = 0x80240EB8; // type:func rom:0xDBE168 -omo_07_UnkNpcDurationFlagFunc = 0x80240FD8; // type:func rom:0xDBE288 -omo_07_UnkFunc16 = 0x80241040; // type:func rom:0xDBE2F0 -omo_07_UnkNpcAIMainFunc = 0x80241100; // type:func rom:0xDBE3B0 -func_802413FC_DBE6AC = 0x802413FC; // type:func rom:0xDBE6AC -func_8024146C_DBE71C = 0x8024146C; // type:func rom:0xDBE71C -func_8024153C_DBE7EC = 0x8024153C; // type:func rom:0xDBE7EC -dup_omo_07_UnkNpcDurationAnimationFunc = 0x802415D4; // type:func rom:0xDBE884 -func_80241634_DBE8E4 = 0x80241634; // type:func rom:0xDBE8E4 -omo_07_UnkNpcAIFunc23 = 0x80241978; // type:func rom:0xDBEC28 -omo_07_UnkNpcAIFunc35 = 0x80241B28; // type:func rom:0xDBEDD8 -omo_07_UnkNpcAIFunc1_copy = 0x80242150; // type:func rom:0xDBF400 -omo_07_UnkFunc4 = 0x80242210; // type:func rom:0xDBF4C0 -omo_07_UnkNpcAIFunc2 = 0x80242554; // type:func rom:0xDBF804 -omo_07_SixFloatsFunc = 0x802425CC; // type:func rom:0xDBF87C -omo_07_UnkNpcAIFunc14 = 0x80242638; // type:func rom:0xDBF8E8 -omo_07_UnkNpcAIFunc3 = 0x8024276C; // type:func rom:0xDBFA1C -omo_07_UnkFunc6 = 0x802427D0; // type:func rom:0xDBFA80 -omo_07_UnkFunc5 = 0x80242B60; // type:func rom:0xDBFE10 -omo_07_UnkNpcAIMainFunc9 = 0x80242C84; // type:func rom:0xDBFF34 +omo_07_ShyGuyWanderAI_14 = 0x80240000; // type:func rom:0xDBD2B0 +omo_07_ShyGuyWanderAI_15 = 0x80240070; // type:func rom:0xDBD320 +omo_07_ShyGuyWanderAI_16 = 0x80240140; // type:func rom:0xDBD3F0 +omo_07_ShyGuyWanderAI_17 = 0x802401D8; // type:func rom:0xDBD488 +omo_07_ShyGuyWanderAI_Main = 0x80240238; // type:func rom:0xDBD4E8 +omo_07_PatrolAI_MoveInit = 0x8024056C; // type:func rom:0xDBD81C +omo_07_PatrolAI_Move = 0x802406C4; // type:func rom:0xDBD974 +omo_07_PatrolAI_LoiterInit = 0x8024096C; // type:func rom:0xDBDC1C +omo_07_PatrolAI_Loiter = 0x80240A2C; // type:func rom:0xDBDCDC +omo_07_PatrolAI_PostLoiter = 0x80240BE8; // type:func rom:0xDBDE98 +omo_07_PatrolAI_JumpInit = 0x80240C9C; // type:func rom:0xDBDF4C +omo_07_PatrolAI_Jump = 0x80240D10; // type:func rom:0xDBDFC0 +omo_07_PatrolAI_ChaseInit = 0x80240D88; // type:func rom:0xDBE038 +omo_07_PatrolAI_Chase = 0x80240EB8; // type:func rom:0xDBE168 +omo_07_PatrolAI_LosePlayer = 0x80240FD8; // type:func rom:0xDBE288 +omo_07_PatrolNoAttackAI_15 = 0x80241040; // type:func rom:0xDBE2F0 +omo_07_PatrolNoAttackAI_Main = 0x80241100; // type:func rom:0xDBE3B0 +omo_07_ShyGuyPatrolAI_14 = 0x802413FC; // type:func rom:0xDBE6AC +omo_07_ShyGuyPatrolAI_15 = 0x8024146C; // type:func rom:0xDBE71C +omo_07_ShyGuyPatrolAI_16 = 0x8024153C; // type:func rom:0xDBE7EC +omo_07_ShyGuyPatrolAI_17 = 0x802415D4; // type:func rom:0xDBE884 +omo_07_ShyGuyPatrolAI_Main = 0x80241634; // type:func rom:0xDBE8E4 +omo_07_FlyingAI_WanderInit = 0x80241978; // type:func rom:0xDBEC28 +omo_07_FlyingAI_Wander = 0x80241B28; // type:func rom:0xDBEDD8 +omo_07_FlyingAI_LoiterInit = 0x80242150; // type:func rom:0xDBF400 +omo_07_FlyingAI_Loiter = 0x80242210; // type:func rom:0xDBF4C0 +omo_07_FlyingAI_JumpInit = 0x80242554; // type:func rom:0xDBF804 +omo_07_FlyingAI_Jump = 0x802425CC; // type:func rom:0xDBF87C +omo_07_FlyingAI_ChaseInit = 0x80242638; // type:func rom:0xDBF8E8 +omo_07_FlyingAI_Chase = 0x8024276C; // type:func rom:0xDBFA1C +omo_07_FlyingAI_LosePlayer = 0x802427D0; // type:func rom:0xDBFA80 +omo_07_FlyingAI_Init = 0x80242B60; // type:func rom:0xDBFE10 +omo_07_FlyingAI_Main = 0x80242C84; // type:func rom:0xDBFF34 omo_07_SetCamera0Flag1000 = 0x80242E70; // type:func rom:0xDC0120 omo_07_UnsetCamera0Flag1000 = 0x80242E8C; // type:func rom:0xDC013C func_80242EA8_DC0158 = 0x80242EA8; // type:func rom:0xDC0158 @@ -21637,7 +21606,7 @@ omo_07_CheckItemFlags40 = 0x80243188; // type:func rom:0xDC0438 omo_07_UnsetCamera0MoveFlag1 = 0x802431DC; // type:func rom:0xDC048C omo_07_SetCamera0MoveFlag1 = 0x802431F8; // type:func rom:0xDC04A8 func_80243220_DC04D0 = 0x80243220; // type:func rom:0xDC04D0 -omo_07_sixFloats = 0x80243A14; // type:data rom:0xDC0CC4 +omo_07_FlyingAI_JumpVels = 0x80243A14; // type:data rom:0xDC0CC4 omo_07_varStash = 0x80245E00; // type:data rom:0xDC30B0 D_80246BD0_DC3E80 = 0x80246BD0; // type:data rom:0xDC3E80 D_80246BD8_DC3E88 = 0x80246BD8; // type:data rom:0xDC3E88 @@ -21658,12 +21627,12 @@ omo_08_UnkFloatFunc = 0x80240388; // type:func rom:0xDC4758 omo_08_IsAOrBPressed = 0x80240518; // type:func rom:0xDC48E8 omo_08_UpdateTexturePanSmooth = 0x8024055C; // type:func rom:0xDC492C omo_08_UpdateTexturePanStepped = 0x80240680; // type:func rom:0xDC4A50 -func_80240870_DC4C40 = 0x80240870; // type:func rom:0xDC4C40 -func_802408E0_DC4CB0 = 0x802408E0; // type:func rom:0xDC4CB0 -func_802409B0_DC4D80 = 0x802409B0; // type:func rom:0xDC4D80 -omo_08_UnkNpcDurationAnimationFunc = 0x80240A48; // type:func rom:0xDC4E18 -btl_restore_world_cameras_DC4E78 = 0x80240AA8; // type:func rom:0xDC4E78 -D_80248760_DCCB30 = 0x80248760; // type:data rom:0xDCCB30 +omo_08_ShyGuyWanderAI_14 = 0x80240870; // type:func rom:0xDC4C40 +omo_08_ShyGuyWanderAI_15 = 0x802408E0; // type:func rom:0xDC4CB0 +omo_08_ShyGuyWanderAI_16 = 0x802409B0; // type:func rom:0xDC4D80 +omo_08_ShyGuyWanderAI_17 = 0x80240A48; // type:func rom:0xDC4E18 +omo_08_ShyGuyWanderAI_Main = 0x80240AA8; // type:func rom:0xDC4E78 +D_80248760_jan_02 = 0x80248760; // type:data rom:0xDCCB30 D_80248768_DCCB38 = 0x80248768; // type:data rom:0xDCCB38 func_80240000_DCCCD0 = 0x80240000; // type:func rom:0xDCCCD0 func_80240054_DCCD24 = 0x80240054; // type:func rom:0xDCCD24 @@ -21675,37 +21644,37 @@ omo_09_StashVars = 0x80240720; // type:func rom:0xDCD3F0 omo_09_GetItemName = 0x802407D4; // type:func rom:0xDCD4A4 omo_09_SomeItemEntityFunc = 0x80240838; // type:func rom:0xDCD508 omo_09_CheckItemFlags40 = 0x80240988; // type:func rom:0xDCD658 -func_802409E0_DCD6B0 = 0x802409E0; // type:func rom:0xDCD6B0 -func_80240A50_DCD720 = 0x80240A50; // type:func rom:0xDCD720 -func_80240B20_DCD7F0 = 0x80240B20; // type:func rom:0xDCD7F0 -omo_09_UnkNpcDurationAnimationFunc = 0x80240BB8; // type:func rom:0xDCD888 -func_80240C18_DCD8E8 = 0x80240C18; // type:func rom:0xDCD8E8 -omo_09_UnkNpcAIFunc24 = 0x80240F4C; // type:func rom:0xDCDC1C -omo_09_UnkFunc13 = 0x802410A4; // type:func rom:0xDCDD74 -omo_09_UnkNpcAIFunc1 = 0x8024134C; // type:func rom:0xDCE01C -omo_09_UnkFunc14 = 0x8024140C; // type:func rom:0xDCE0DC -omo_09_UnkNpcAIFunc25 = 0x802415C8; // type:func rom:0xDCE298 -omo_09_NpcJumpFunc2 = 0x8024167C; // type:func rom:0xDCE34C -omo_09_NpcJumpFunc = 0x802416F0; // type:func rom:0xDCE3C0 -omo_09_UnkNpcAIFunc13 = 0x80241768; // type:func rom:0xDCE438 -omo_09_UnkFunc15 = 0x80241898; // type:func rom:0xDCE568 -omo_09_UnkNpcDurationFlagFunc = 0x802419B8; // type:func rom:0xDCE688 -omo_09_UnkFunc16 = 0x80241A20; // type:func rom:0xDCE6F0 -omo_09_UnkNpcAIMainFunc = 0x80241AE0; // type:func rom:0xDCE7B0 -func_80241DDC_DCEAAC = 0x80241DDC; // type:func rom:0xDCEAAC -func_80241E4C_DCEB1C = 0x80241E4C; // type:func rom:0xDCEB1C -func_80241F1C_DCEBEC = 0x80241F1C; // type:func rom:0xDCEBEC -dup_omo_09_UnkNpcDurationAnimationFunc = 0x80241FB4; // type:func rom:0xDCEC84 -func_80242014_DCECE4 = 0x80242014; // type:func rom:0xDCECE4 -omo_09_UnkFunc61 = 0x80242358; // type:func rom:0xDCF028 +omo_09_ShyGuyWanderAI_14 = 0x802409E0; // type:func rom:0xDCD6B0 +omo_09_ShyGuyWanderAI_15 = 0x80240A50; // type:func rom:0xDCD720 +omo_09_ShyGuyWanderAI_16 = 0x80240B20; // type:func rom:0xDCD7F0 +omo_09_ShyGuyWanderAI_17 = 0x80240BB8; // type:func rom:0xDCD888 +omo_09_ShyGuyWanderAI_Main = 0x80240C18; // type:func rom:0xDCD8E8 +omo_09_PatrolAI_MoveInit = 0x80240F4C; // type:func rom:0xDCDC1C +omo_09_PatrolAI_Move = 0x802410A4; // type:func rom:0xDCDD74 +omo_09_PatrolAI_LoiterInit = 0x8024134C; // type:func rom:0xDCE01C +omo_09_PatrolAI_Loiter = 0x8024140C; // type:func rom:0xDCE0DC +omo_09_PatrolAI_PostLoiter = 0x802415C8; // type:func rom:0xDCE298 +omo_09_PatrolAI_JumpInit = 0x8024167C; // type:func rom:0xDCE34C +omo_09_PatrolAI_Jump = 0x802416F0; // type:func rom:0xDCE3C0 +omo_09_PatrolAI_ChaseInit = 0x80241768; // type:func rom:0xDCE438 +omo_09_PatrolAI_Chase = 0x80241898; // type:func rom:0xDCE568 +omo_09_PatrolAI_LosePlayer = 0x802419B8; // type:func rom:0xDCE688 +omo_09_PatrolNoAttackAI_15 = 0x80241A20; // type:func rom:0xDCE6F0 +omo_09_PatrolNoAttackAI_Main = 0x80241AE0; // type:func rom:0xDCE7B0 +omo_09_ShyGuyPatrolAI_14 = 0x80241DDC; // type:func rom:0xDCEAAC +omo_09_ShyGuyPatrolAI_15 = 0x80241E4C; // type:func rom:0xDCEB1C +omo_09_ShyGuyPatrolAI_16 = 0x80241F1C; // type:func rom:0xDCEBEC +omo_09_ShyGuyPatrolAI_17 = 0x80241FB4; // type:func rom:0xDCEC84 +omo_09_ShyGuyPatrolAI_Main = 0x80242014; // type:func rom:0xDCECE4 +omo_09_ProjectileHitbox_GetUsableProjectileID = 0x80242358; // type:func rom:0xDCF028 omo_09_UnkNpcAIFunc48 = 0x80242548; // type:func rom:0xDCF218 -omo_09_UnkNpcAIFunc49 = 0x8024268C; // type:func rom:0xDCF35C -omo_09_UnkSetDurationFunc = 0x8024278C; // type:func rom:0xDCF45C -omo_09_UnkNpcAIFunc9 = 0x802427D0; // type:func rom:0xDCF4A0 -omo_09_UnkDurationCheckNoArgs = 0x80242870; // type:func rom:0xDCF540 -omo_09_UnkFunc54 = 0x802428B4; // type:func rom:0xDCF584 -omo_09_UnkFunc55 = 0x80242DF0; // type:func rom:0xDCFAC0 -omo_09_UnkNpcAIMainFunc7 = 0x8024324C; // type:func rom:0xDCFF1C +omo_09_ProjectileHitbox_30 = 0x8024268C; // type:func rom:0xDCF35C +omo_09_ProjectileHitbox_31 = 0x8024278C; // type:func rom:0xDCF45C +omo_09_ProjectileHitbox_32 = 0x802427D0; // type:func rom:0xDCF4A0 +omo_09_ProjectileHitbox_33 = 0x80242870; // type:func rom:0xDCF540 +omo_09_ProjectileAI_Main = 0x802428B4; // type:func rom:0xDCF584 +omo_09_ProjectileAI_Reflect = 0x80242DF0; // type:func rom:0xDCFAC0 +omo_09_RangedAttackAI_Main = 0x8024324C; // type:func rom:0xDCFF1C omo_09_SetNpcB5_3 = 0x8024356C; // type:func rom:0xDD023C omo_09_GetEncounterEnemyIsOwner = 0x80243580; // type:func rom:0xDD0250 dup_omo_09_SetNpcB5_3 = 0x802435B8; // type:func rom:0xDD0288 @@ -21774,14 +21743,14 @@ func_802403D8_DDF6E8 = 0x802403D8; // type:func rom:0xDDF6E8 func_80240420_DDF730 = 0x80240420; // type:func rom:0xDDF730 D_80243168_DE2478 = 0x80243168; // type:data rom:0xDE2478 func_80240000_DE2490 = 0x80240000; // type:func rom:0xDE2490 -func_80240280_DE2710 = 0x80240280; // type:func rom:0xDE2710 -func_802402F0_DE2780 = 0x802402F0; // type:func rom:0xDE2780 -func_802403C0_DE2850 = 0x802403C0; // type:func rom:0xDE2850 -omo_13_UnkNpcDurationAnimationFunc = 0x80240458; // type:func rom:0xDE28E8 -func_802404B8_DE2948 = 0x802404B8; // type:func rom:0xDE2948 -omo_13_UnkNpcAIFunc4 = 0x802407EC; // type:func rom:0xDE2C7C -func_8024083C_DE2CCC = 0x8024083C; // type:func rom:0xDE2CCC -func_80240A00_DE2E90 = 0x80240A00; // type:func rom:0xDE2E90 +omo_13_ShyGuyWanderAI_14 = 0x80240280; // type:func rom:0xDE2710 +omo_13_ShyGuyWanderAI_15 = 0x802402F0; // type:func rom:0xDE2780 +omo_13_ShyGuyWanderAI_16 = 0x802403C0; // type:func rom:0xDE2850 +omo_13_ShyGuyWanderAI_17 = 0x80240458; // type:func rom:0xDE28E8 +omo_13_ShyGuyWanderAI_Main = 0x802404B8; // type:func rom:0xDE2948 +omo_13_GrooveGuyAI_02 = 0x802407EC; // type:func rom:0xDE2C7C +omo_13_GrooveGuyAI_03 = 0x8024083C; // type:func rom:0xDE2CCC +omo_13_GrooveGuyAI_Main = 0x80240A00; // type:func rom:0xDE2E90 omo_13_GetNpcCollisionHeight = 0x80240CD4; // type:func rom:0xDE3164 omo_13_AddPlayerHandsOffset = 0x80240D30; // type:func rom:0xDE31C0 func_80240F00_DE3390 = 0x80240F00; // type:func rom:0xDE3390 @@ -21828,37 +21797,37 @@ omo_17_SetPlayerStatusPosYaw = 0x802401EC; // type:func rom:0xDEF08C omo_17_SetNpcPosYaw = 0x80240290; // type:func rom:0xDEF130 omo_17_UnkFloatFunc = 0x80240388; // type:func rom:0xDEF228 omo_17_IsAOrBPressed = 0x80240518; // type:func rom:0xDEF3B8 -func_80240560_DEF400 = 0x80240560; // type:func rom:0xDEF400 -func_802405D0_DEF470 = 0x802405D0; // type:func rom:0xDEF470 -func_802406A0_DEF540 = 0x802406A0; // type:func rom:0xDEF540 -omo_17_UnkNpcDurationAnimationFunc = 0x80240738; // type:func rom:0xDEF5D8 -func_80240798_DEF638 = 0x80240798; // type:func rom:0xDEF638 -omo_17_UnkNpcAIFunc4 = 0x80240ACC; // type:func rom:0xDEF96C -func_80240B1C_DEF9BC = 0x80240B1C; // type:func rom:0xDEF9BC -func_80240CE0_DEFB80 = 0x80240CE0; // type:func rom:0xDEFB80 -omo_17_UnkNpcAIFunc23 = 0x80240FB4; // type:func rom:0xDEFE54 -omo_17_UnkNpcAIFunc35 = 0x80241164; // type:func rom:0xDF0004 -omo_17_UnkNpcAIFunc1_copy = 0x8024178C; // type:func rom:0xDF062C -omo_17_UnkFunc4 = 0x8024184C; // type:func rom:0xDF06EC -omo_17_UnkNpcAIFunc2 = 0x80241B90; // type:func rom:0xDF0A30 -omo_17_SixFloatsFunc = 0x80241C08; // type:func rom:0xDF0AA8 -omo_17_UnkNpcAIFunc14 = 0x80241C74; // type:func rom:0xDF0B14 -omo_17_UnkNpcAIFunc3 = 0x80241DA8; // type:func rom:0xDF0C48 -omo_17_UnkFunc6 = 0x80241E0C; // type:func rom:0xDF0CAC -omo_17_UnkFunc5 = 0x8024219C; // type:func rom:0xDF103C -omo_17_UnkNpcAIMainFunc9 = 0x802422C0; // type:func rom:0xDF1160 -omo_17_UnkFunc61 = 0x802424AC; // type:func rom:0xDF134C +omo_17_ShyGuyWanderAI_14 = 0x80240560; // type:func rom:0xDEF400 +omo_17_ShyGuyWanderAI_15 = 0x802405D0; // type:func rom:0xDEF470 +omo_17_ShyGuyWanderAI_16 = 0x802406A0; // type:func rom:0xDEF540 +omo_17_ShyGuyWanderAI_17 = 0x80240738; // type:func rom:0xDEF5D8 +omo_17_ShyGuyWanderAI_Main = 0x80240798; // type:func rom:0xDEF638 +omo_17_GrooveGuyAI_02 = 0x80240ACC; // type:func rom:0xDEF96C +omo_17_GrooveGuyAI_03 = 0x80240B1C; // type:func rom:0xDEF9BC +omo_17_GrooveGuyAI_Main = 0x80240CE0; // type:func rom:0xDEFB80 +omo_17_FlyingAI_WanderInit = 0x80240FB4; // type:func rom:0xDEFE54 +omo_17_FlyingAI_Wander = 0x80241164; // type:func rom:0xDF0004 +omo_17_FlyingAI_LoiterInit = 0x8024178C; // type:func rom:0xDF062C +omo_17_FlyingAI_Loiter = 0x8024184C; // type:func rom:0xDF06EC +omo_17_FlyingAI_JumpInit = 0x80241B90; // type:func rom:0xDF0A30 +omo_17_FlyingAI_Jump = 0x80241C08; // type:func rom:0xDF0AA8 +omo_17_FlyingAI_ChaseInit = 0x80241C74; // type:func rom:0xDF0B14 +omo_17_FlyingAI_Chase = 0x80241DA8; // type:func rom:0xDF0C48 +omo_17_FlyingAI_LosePlayer = 0x80241E0C; // type:func rom:0xDF0CAC +omo_17_FlyingAI_Init = 0x8024219C; // type:func rom:0xDF103C +omo_17_FlyingAI_Main = 0x802422C0; // type:func rom:0xDF1160 +omo_17_ProjectileHitbox_GetUsableProjectileID = 0x802424AC; // type:func rom:0xDF134C omo_17_UnkNpcAIFunc48 = 0x8024269C; // type:func rom:0xDF153C -omo_17_UnkNpcAIFunc49 = 0x802427E0; // type:func rom:0xDF1680 -omo_17_UnkSetDurationFunc = 0x802428E0; // type:func rom:0xDF1780 -omo_17_UnkNpcAIFunc9 = 0x80242924; // type:func rom:0xDF17C4 -omo_17_UnkDurationCheckNoArgs = 0x802429C4; // type:func rom:0xDF1864 -omo_17_UnkFunc54 = 0x80242A08; // type:func rom:0xDF18A8 -omo_17_UnkFunc55 = 0x80242F44; // type:func rom:0xDF1DE4 -omo_17_UnkNpcAIMainFunc7 = 0x802433A0; // type:func rom:0xDF2240 +omo_17_ProjectileHitbox_30 = 0x802427E0; // type:func rom:0xDF1680 +omo_17_ProjectileHitbox_31 = 0x802428E0; // type:func rom:0xDF1780 +omo_17_ProjectileHitbox_32 = 0x80242924; // type:func rom:0xDF17C4 +omo_17_ProjectileHitbox_33 = 0x802429C4; // type:func rom:0xDF1864 +omo_17_ProjectileAI_Main = 0x80242A08; // type:func rom:0xDF18A8 +omo_17_ProjectileAI_Reflect = 0x80242F44; // type:func rom:0xDF1DE4 +omo_17_RangedAttackAI_Main = 0x802433A0; // type:func rom:0xDF2240 omo_17_SetNpcB5_3 = 0x802436C0; // type:func rom:0xDF2560 omo_17_GetEncounterEnemyIsOwner = 0x802436D4; // type:func rom:0xDF2574 -omo_17_sixFloats = 0x80246184; // type:data rom:0xDF5024 +omo_17_FlyingAI_JumpVels = 0x80246184; // type:data rom:0xDF5024 D_80247610_DF64B0 = 0x80247610; // type:data rom:0xDF64B0 D_80247618_DF64B8 = 0x80247618; // type:data rom:0xDF64B8 D_802477B0_DF6650 = 0x802477B0; // type:data rom:0xDF6650 @@ -21955,18 +21924,18 @@ mgm_00_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xE0E7D4 mgm_00_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xE0E890 mgm_00_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xE0E970 mgm_00_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xE0E9DC -mgm_00_UnkNpcAIFunc24 = 0x802402E0; // type:func rom:0xE0EA80 -mgm_00_UnkFunc13 = 0x80240438; // type:func rom:0xE0EBD8 -mgm_00_UnkNpcAIFunc1 = 0x802406E0; // type:func rom:0xE0EE80 -mgm_00_UnkFunc14 = 0x802407A0; // type:func rom:0xE0EF40 -mgm_00_UnkNpcAIFunc25 = 0x8024095C; // type:func rom:0xE0F0FC -mgm_00_NpcJumpFunc2 = 0x80240A10; // type:func rom:0xE0F1B0 -mgm_00_NpcJumpFunc = 0x80240A84; // type:func rom:0xE0F224 -mgm_00_UnkNpcAIFunc13 = 0x80240AFC; // type:func rom:0xE0F29C -mgm_00_UnkFunc15 = 0x80240C2C; // type:func rom:0xE0F3CC -mgm_00_UnkNpcDurationFlagFunc = 0x80240D4C; // type:func rom:0xE0F4EC -mgm_00_UnkFunc16 = 0x80240DB4; // type:func rom:0xE0F554 -mgm_00_UnkNpcAIMainFunc = 0x80240E74; // type:func rom:0xE0F614 +mgm_00_PatrolAI_MoveInit = 0x802402E0; // type:func rom:0xE0EA80 +mgm_00_PatrolAI_Move = 0x80240438; // type:func rom:0xE0EBD8 +mgm_00_FlyingAI_LoiterInit = 0x802406E0; // type:func rom:0xE0EE80 +mgm_00_PatrolAI_Loiter = 0x802407A0; // type:func rom:0xE0EF40 +mgm_00_PatrolAI_PostLoiter = 0x8024095C; // type:func rom:0xE0F0FC +mgm_00_PatrolAI_JumpInit = 0x80240A10; // type:func rom:0xE0F1B0 +mgm_00_PatrolAI_Jump = 0x80240A84; // type:func rom:0xE0F224 +mgm_00_PatrolAI_ChaseInit = 0x80240AFC; // type:func rom:0xE0F29C +mgm_00_PatrolAI_Chase = 0x80240C2C; // type:func rom:0xE0F3CC +mgm_00_PatrolAI_LosePlayer = 0x80240D4C; // type:func rom:0xE0F4EC +mgm_00_PatrolNoAttackAI_15 = 0x80240DB4; // type:func rom:0xE0F554 +mgm_00_PatrolNoAttackAI_Main = 0x80240E74; // type:func rom:0xE0F614 func_80241170_E0F910 = 0x80241170; // type:func rom:0xE0F910 mgm_00_draw_record_display = 0x802411E0; // type:func rom:0xE0F980 mgm_00_animate_and_draw_record = 0x80241540; // type:func rom:0xE0FCE0 @@ -22297,26 +22266,26 @@ D_802BCBD0_E31520 = 0x802BCBD0; // type:data rom:0xE31520 D_802BCBD8_E31528 = 0x802BCBD8; // type:data rom:0xE31528 EA0900_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEA0900 EA0900_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEA0A24 -EA0C10_UnkNpcAIFunc6 = 0x80240310; // type:func rom:0xEA0C10 -EA0C10_UnkNpcAIFunc7 = 0x8024037C; // type:func rom:0xEA0C7C -EA0C10_UnkNpcAIFunc8 = 0x802403EC; // type:func rom:0xEA0CEC -EA0C10_UnkNpcAIFunc5 = 0x802404C4; // type:func rom:0xEA0DC4 -EA0C10_UnkNpcAIFunc26 = 0x80240518; // type:func rom:0xEA0E18 -func_802406CC_EA0FCC = 0x802406CC; // type:func rom:0xEA0FCC -func_8024097C_EA127C = 0x8024097C; // type:func rom:0xEA127C -EA0C10_UnkNpcAIFunc31 = 0x80240C5C; // type:func rom:0xEA155C -EA0C10_UnkNpcAIFunc32 = 0x80240CC8; // type:func rom:0xEA15C8 +EA0C10_MeleeHitbox_30 = 0x80240310; // type:func rom:0xEA0C10 +EA0C10_MeleeHitbox_31 = 0x8024037C; // type:func rom:0xEA0C7C +EA0C10_MeleeHitbox_32 = 0x802403EC; // type:func rom:0xEA0CEC +EA0C10_MeleeHitbox_33 = 0x802404C4; // type:func rom:0xEA0DC4 +EA0C10_MeleeHitbox_CanSeePlayer = 0x80240518; // type:func rom:0xEA0E18 +EA0C10_MeleeHitbox_Main = 0x802406CC; // type:func rom:0xEA0FCC +EA0C10_WanderMeleeAI_Main = 0x8024097C; // type:func rom:0xEA127C +EA0C10_PiranhaPlantAI_00 = 0x80240C5C; // type:func rom:0xEA155C +EA0C10_PiranhaPlantAI_01 = 0x80240CC8; // type:func rom:0xEA15C8 func_80240DC4_EA16C4 = 0x80240DC4; // type:func rom:0xEA16C4 -EA0C10_UnkNpcDurationFlagFunc3 = 0x80241804; // type:func rom:0xEA2104 -EA0C10_UnkNpcAIFunc33 = 0x80241894; // type:func rom:0xEA2194 -EA0C10_UnkNpcDurationFlagFunc2 = 0x80241994; // type:func rom:0xEA2294 -EA0C10_UnkNpcAIFunc30 = 0x802419F4; // type:func rom:0xEA22F4 -func_80241AE0_EA23E0 = 0x80241AE0; // type:func rom:0xEA23E0 +EA0C10_PiranhaPlantAI_11 = 0x80241804; // type:func rom:0xEA2104 +EA0C10_PiranhaPlantAI_12 = 0x80241894; // type:func rom:0xEA2194 +EA0C10_PiranhaPlantAI_13 = 0x80241994; // type:func rom:0xEA2294 +EA0C10_PiranhaPlantAI_14 = 0x802419F4; // type:func rom:0xEA22F4 +EA0C10_PiranhaPlantAI_Main = 0x80241AE0; // type:func rom:0xEA23E0 EA0C10_set_script_owner_npc_anim = 0x80241D68; // type:func rom:0xEA2668 EA0C10_UnkDistFunc = 0x80241DE4; // type:func rom:0xEA26E4 EA0C10_UnkNpcAIFunc12 = 0x80241F18; // type:func rom:0xEA2818 EA0C10_set_script_owner_npc_col_height = 0x8024207C; // type:func rom:0xEA297C -EA0C10_DeadUnkNpcAIMainFunc5 = 0x802420FC; // type:func rom:0xEA29FC +EA0C10_TackleAI_Main = 0x802420FC; // type:func rom:0xEA29FC EA0C10_func_80240814_97BE44 = 0x80242568; // type:func rom:0xEA2E68 EA0C10_AwaitPlayerNearNpc = 0x802425B0; // type:func rom:0xEA2EB0 EA0C10_func_802408B4_97BEE4 = 0x80242608; // type:func rom:0xEA2F08 @@ -22327,12 +22296,12 @@ EA0C10_AddPlayerHandsOffset = 0x802427F0; // type:func rom:0xEA30F0 func_802429C0_EA32C0 = 0x802429C0; // type:func rom:0xEA32C0 func_80242A14_EA3314 = 0x80242A14; // type:func rom:0xEA3314 func_80242A4C_EA334C = 0x80242A4C; // type:func rom:0xEA334C -EA0C10_SetManyVars = 0x80242AE8; // type:func rom:0xEA33E8 -EA0C10_UnkYawFunc = 0x80242BD8; // type:func rom:0xEA34D8 -func_80242D64_EA3664 = 0x80242D64; // type:func rom:0xEA3664 -func_80242DA8_EA36A8 = 0x80242DA8; // type:func rom:0xEA36A8 +EA0C10_LetterDelivery_Init = 0x80242AE8; // type:func rom:0xEA33E8 +EA0C10_LetterDelivery_CalcLetterPos = 0x80242BD8; // type:func rom:0xEA34D8 +EA0C10_LetterDelivery_SaveNpcAnim = 0x80242D64; // type:func rom:0xEA3664 +EA0C10_LetterDelivery_RestoreNpcAnim = 0x80242DA8; // type:func rom:0xEA36A8 EA36E0_SpinyTrompHit = 0x80242DE0; // type:func rom:0xEA36E0 -filemenu_set_cursor_goal_pos_EA3700 = 0x80242E00; // type:func rom:0xEA3700 +EA36E0_GetActingPartner = 0x80242E00; // type:func rom:0xEA3700 EA36E0_UnkFunc46 = 0x80242E2C; // type:func rom:0xEA372C func_80242EC4_EA37C4 = 0x80242EC4; // type:func rom:0xEA37C4 EA36E0_UnkFunc48 = 0x80242F64; // type:func rom:0xEA3864 @@ -22385,10 +22354,10 @@ EA8AE0_AddPlayerHandsOffset = 0x802415DC; // type:func rom:0xEAA0BC func_802417AC_EAA28C = 0x802417AC; // type:func rom:0xEAA28C func_80241800_EAA2E0 = 0x80241800; // type:func rom:0xEAA2E0 func_80241838_EAA318 = 0x80241838; // type:func rom:0xEAA318 -EA8AE0_SetManyVars = 0x802418D4; // type:func rom:0xEAA3B4 -EA8AE0_UnkYawFunc = 0x802419C4; // type:func rom:0xEAA4A4 -func_80241B50_EAA630 = 0x80241B50; // type:func rom:0xEAA630 -func_80241B94_EAA674 = 0x80241B94; // type:func rom:0xEAA674 +EA8AE0_LetterDelivery_Init = 0x802418D4; // type:func rom:0xEAA3B4 +EA8AE0_LetterDelivery_CalcLetterPos = 0x802419C4; // type:func rom:0xEAA4A4 +EA8AE0_LetterDelivery_SaveNpcAnim = 0x80241B50; // type:func rom:0xEAA630 +EA8AE0_LetterDelivery_RestoreNpcAnim = 0x80241B94; // type:func rom:0xEAA674 func_80241BC0_EAA6A0 = 0x80241BC0; // type:func rom:0xEAA6A0 D_80243AD8_EAC5B8 = 0x80243AD8; // type:data rom:0xEAC5B8 D_80243BB8_EAC698 = 0x80243BB8; // type:data rom:0xEAC698 @@ -22405,10 +22374,10 @@ EB1170_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xEB12E4 func_80240654_EB14B4 = 0x80240654; // type:func rom:0xEB14B4 func_802406A8_EB1508 = 0x802406A8; // type:func rom:0xEB1508 func_802406E0_EB1540 = 0x802406E0; // type:func rom:0xEB1540 -EB1170_SetManyVars = 0x8024077C; // type:func rom:0xEB15DC -EB1170_UnkYawFunc = 0x8024086C; // type:func rom:0xEB16CC -func_802409F8_EB1858 = 0x802409F8; // type:func rom:0xEB1858 -func_80240A3C_EB189C = 0x80240A3C; // type:func rom:0xEB189C +EB1170_LetterDelivery_Init = 0x8024077C; // type:func rom:0xEB15DC +EB1170_LetterDelivery_CalcLetterPos = 0x8024086C; // type:func rom:0xEB16CC +EB1170_LetterDelivery_SaveNpcAnim = 0x802409F8; // type:func rom:0xEB1858 +EB1170_LetterDelivery_RestoreNpcAnim = 0x80240A3C; // type:func rom:0xEB189C func_80240A68_EB18C8 = 0x80240A68; // type:func rom:0xEB18C8 func_80240A8C_EB18EC = 0x80240A8C; // type:func rom:0xEB18EC EB1170_varStash = 0x80241780; // type:data rom:0xEB25E0 @@ -22428,17 +22397,17 @@ EB7540_UnsetCamera0MoveFlag1 = 0x80240504; // type:func rom:0xEB7734 func_80240520_EB7750 = 0x80240520; // type:func rom:0xEB7750 D_80241C10_EB8E40 = 0x80241C10; // type:data rom:0xEB8E40 func_80240000_EB8E50 = 0x80240000; // type:func rom:0xEB8E50 -EB8E90_UnkNpcAIFunc24 = 0x80240040; // type:func rom:0xEB8E90 -EB8E90_UnkFunc13 = 0x80240198; // type:func rom:0xEB8FE8 -EB8E90_UnkNpcAIFunc1 = 0x80240440; // type:func rom:0xEB9290 -EB8E90_UnkFunc14 = 0x80240500; // type:func rom:0xEB9350 -EB8E90_UnkNpcAIFunc25 = 0x802406BC; // type:func rom:0xEB950C -EB8E90_NpcJumpFunc2 = 0x80240770; // type:func rom:0xEB95C0 -EB8E90_NpcJumpFunc = 0x802407E4; // type:func rom:0xEB9634 -EB8E90_UnkNpcAIFunc13 = 0x8024085C; // type:func rom:0xEB96AC -EB8E90_UnkFunc15 = 0x8024098C; // type:func rom:0xEB97DC -EB8E90_UnkNpcDurationFlagFunc = 0x80240AAC; // type:func rom:0xEB98FC -EB8E90_UnkFunc16 = 0x80240B14; // type:func rom:0xEB9964 +EB8E90_PatrolAI_MoveInit = 0x80240040; // type:func rom:0xEB8E90 +EB8E90_PatrolAI_Move = 0x80240198; // type:func rom:0xEB8FE8 +EB8E90_FlyingAI_LoiterInit = 0x80240440; // type:func rom:0xEB9290 +EB8E90_PatrolAI_Loiter = 0x80240500; // type:func rom:0xEB9350 +EB8E90_PatrolAI_PostLoiter = 0x802406BC; // type:func rom:0xEB950C +EB8E90_PatrolAI_JumpInit = 0x80240770; // type:func rom:0xEB95C0 +EB8E90_PatrolAI_Jump = 0x802407E4; // type:func rom:0xEB9634 +EB8E90_PatrolAI_ChaseInit = 0x8024085C; // type:func rom:0xEB96AC +EB8E90_PatrolAI_Chase = 0x8024098C; // type:func rom:0xEB97DC +EB8E90_PatrolAI_LosePlayer = 0x80240AAC; // type:func rom:0xEB98FC +EB8E90_PatrolNoAttackAI_15 = 0x80240B14; // type:func rom:0xEB9964 func_80240BD4_EB9A24 = 0x80240BD4; // type:func rom:0xEB9A24 EB8E90_PostChapter6StatUpdate = 0x80240EFC; // type:func rom:0xEB9D4C func_80240F40_EB9D90 = 0x80240F40; // type:func rom:0xEB9D90 @@ -22495,10 +22464,10 @@ EC9D00_SuperBlock_PartnerSparkles2 = 0x80240C78; // type:func rom:0xECA978 EC9D00_SuperBlock_PartnerSparkles4 = 0x80240CC0; // type:func rom:0xECA9C0 EC9D00_SuperBlock_WaitForPlayerToLand = 0x80240D08; // type:func rom:0xECAA08 ECAA40_DeadUnkFunc1 = 0x80240D40; // type:func rom:0xECAA40 -func_80240D80_ECAA80 = 0x80240D80; // type:func rom:0xECAA80 -func_80241364_ECB064 = 0x80241364; // type:func rom:0xECB064 -func_802414C8_ECB1C8 = 0x802414C8; // type:func rom:0xECB1C8 -func_8024150C_ECB20C = 0x8024150C; // type:func rom:0xECB20C +ECAA80_UnkFloAI_ChaseInit = 0x80240D80; // type:func rom:0xECAA80 +ECAA80_UnkFloAI_Chase = 0x80241364; // type:func rom:0xECB064 +ECAA80_UnkFloAI_LosePlayer = 0x802414C8; // type:func rom:0xECB1C8 +ECAA80_UnkFloAI_Main = 0x8024150C; // type:func rom:0xECB20C ECAA80_GetNpcCollisionHeight = 0x80241770; // type:func rom:0xECB470 ECAA80_AddPlayerHandsOffset = 0x802417CC; // type:func rom:0xECB4CC func_8024199C_ECB69C = 0x8024199C; // type:func rom:0xECB69C @@ -22520,18 +22489,18 @@ ECFFF0_DeadUnkFunc1 = 0x80240000; // type:func rom:0xECFFF0 ED0030_UnkFunc43 = 0x80240040; // type:func rom:0xED0030 ED00D0_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xED00D0 ED00D0_TransformFoliage = 0x80240150; // type:func rom:0xED0140 -ED0310_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xED0310 -ED0310_UnkNpcAIFunc35 = 0x802404D0; // type:func rom:0xED04C0 -ED0310_UnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xED0AE8 -ED0310_UnkFunc4 = 0x80240BB8; // type:func rom:0xED0BA8 -ED0310_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xED0EEC -ED0310_SixFloatsFunc = 0x80240F74; // type:func rom:0xED0F64 -ED0310_UnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xED0FD0 -ED0310_UnkNpcAIFunc3 = 0x80241114; // type:func rom:0xED1104 -ED0310_UnkFunc6 = 0x80241178; // type:func rom:0xED1168 -ED0310_UnkFunc5 = 0x80241508; // type:func rom:0xED14F8 +ED0310_FlyingAI_WanderInit = 0x80240320; // type:func rom:0xED0310 +ED0310_FlyingAI_Wander = 0x802404D0; // type:func rom:0xED04C0 +ED0310_FlyingAI_LoiterInit = 0x80240AF8; // type:func rom:0xED0AE8 +ED0310_FlyingAI_Loiter = 0x80240BB8; // type:func rom:0xED0BA8 +ED0310_FlyingAI_JumpInit = 0x80240EFC; // type:func rom:0xED0EEC +ED0310_FlyingAI_Jump = 0x80240F74; // type:func rom:0xED0F64 +ED0310_FlyingAI_ChaseInit = 0x80240FE0; // type:func rom:0xED0FD0 +ED0310_FlyingAI_Chase = 0x80241114; // type:func rom:0xED1104 +ED0310_FlyingAI_LosePlayer = 0x80241178; // type:func rom:0xED1168 +ED0310_FlyingAI_Init = 0x80241508; // type:func rom:0xED14F8 func_8024162C_ED161C = 0x8024162C; // type:func rom:0xED161C -sixFloats = 0x8024365C; // type:data rom:0xED364C +FlyingAI_JumpVels = 0x8024365C; // type:data rom:0xED364C D_802441D0_ED41C0 = 0x802441D0; // type:data rom:0xED41C0 D_802441D8_ED41C8 = 0x802441D8; // type:data rom:0xED41C8 D_802441E0_ED41D0 = 0x802441E0; // type:data rom:0xED41D0 @@ -22572,38 +22541,39 @@ D_80241850_EDD830 = 0x80241850; // type:data rom:0xEDD830 D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834 func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0 EDEA00_UnkFunc41 = 0x80240040; // type:func rom:0xEDEA00 -EDEA00_UnkNpcAIFunc23 = 0x802401C4; // type:func rom:0xEDEB84 -EDEA00_UnkNpcAIFunc35 = 0x80240374; // type:func rom:0xEDED34 -EDEA00_UnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xEDF35C -EDEA00_UnkFunc4 = 0x80240A5C; // type:func rom:0xEDF41C -EDEA00_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xEDF760 -EDEA00_SixFloatsFunc = 0x80240E18; // type:func rom:0xEDF7D8 -EDEA00_UnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xEDF844 -EDEA00_UnkNpcAIFunc3 = 0x80240FB8; // type:func rom:0xEDF978 -EDEA00_UnkFunc6 = 0x8024101C; // type:func rom:0xEDF9DC -EDEA00_UnkFunc5 = 0x802413AC; // type:func rom:0xEDFD6C +EDEA00_FlyingAI_WanderInit = 0x802401C4; // type:func rom:0xEDEB84 +EDEA00_FlyingAI_Wander = 0x80240374; // type:func rom:0xEDED34 +EDEA00_FlyingAI_LoiterInit = 0x8024099C; // type:func rom:0xEDF35C +EDEA00_FlyingAI_Loiter = 0x80240A5C; // type:func rom:0xEDF41C +EDEA00_FlyingAI_JumpInit = 0x80240DA0; // type:func rom:0xEDF760 +EDEA00_FlyingAI_Jump = 0x80240E18; // type:func rom:0xEDF7D8 +EDEA00_FlyingAI_ChaseInit = 0x80240E84; // type:func rom:0xEDF844 +EDEA00_FlyingAI_Chase = 0x80240FB8; // type:func rom:0xEDF978 +EDEA00_FlyingAI_LosePlayer = 0x8024101C; // type:func rom:0xEDF9DC +EDEA00_FlyingAI_Init = 0x802413AC; // type:func rom:0xEDFD6C func_802414D0_EDFE90 = 0x802414D0; // type:func rom:0xEDFE90 -func_802416E8_EE00A8 = 0x802416E8; // type:func rom:0xEE00A8 -func_80241730_EE00F0 = 0x80241730; // type:func rom:0xEE00F0 -func_80241B94_EE0554 = 0x80241B94; // type:func rom:0xEE0554 -func_80241DE4_EE07A4 = 0x80241DE4; // type:func rom:0xEE07A4 +EDEA00_LakituAI_GetAvailableSpiny = 0x802416E8; // type:func rom:0xEE00A8 +EDEA00_LakituAI_Wander = 0x80241730; // type:func rom:0xEE00F0 +EDEA00_LakituAI_Loiter = 0x80241B94; // type:func rom:0xEE0554 +EDEA00_LakituAI_Main = 0x80241DE4; // type:func rom:0xEE07A4 EDEA00_set_script_owner_npc_anim = 0x802422F0; // type:func rom:0xEE0CB0 EDEA00_UnkDistFunc = 0x8024236C; // type:func rom:0xEE0D2C EDEA00_UnkNpcAIFunc12 = 0x802424A0; // type:func rom:0xEE0E60 EDEA00_set_script_owner_npc_col_height = 0x80242604; // type:func rom:0xEE0FC4 -func_80242684_EE1044 = 0x80242684; // type:func rom:0xEE1044 -func_80242AF0_EE14B0 = 0x80242AF0; // type:func rom:0xEE14B0 +EDEA00_TackleAI_Main = 0x80242684; // type:func rom:0xEE1044 +EDEA00_SpinyAI_Main = 0x80242AF0; // type:func rom:0xEE14B0 EDEA00_UnkFunc42 = 0x80243418; // type:func rom:0xEE1DD8 func_80243470_EE1E30 = 0x80243470; // type:func rom:0xEE1E30 func_80243584_EE1F44 = 0x80243584; // type:func rom:0xEE1F44 EE2040_LoadPartyImage = 0x80243680; // type:func rom:0xEE2040 -sixFloats = 0x802441DC; // type:data rom:0xEE2B9C +FlyingAI_JumpVels = 0x802441DC; // type:data rom:0xEE2B9C D_80247AF0_EE64B0 = 0x80247AF0; // type:data rom:0xEE64B0 D_80247AF8_EE64B8 = 0x80247AF8; // type:data rom:0xEE64B8 D_80247B00_EE64C0 = 0x80247B00; // type:data rom:0xEE64C0 D_80247B44_EE6504 = 0x80247B44; // type:data rom:0xEE6504 D_80247B50_EE6510 = 0x80247B50; // type:data rom:0xEE6510 D_80247BB0_EE6570 = 0x80247BB0; // type:data rom:0xEE6570 +D_80247BB8_EE6578 = 0x80247BB8; // type:data rom:0xEE6570 D_80247BE0_EE65A0 = 0x80247BE0; // type:data rom:0xEE65A0 EE65B0_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEE65B0 EE65B0_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEE66D4 @@ -22615,15 +22585,15 @@ func_8024046C_EE6A1C = 0x8024046C; // type:func rom:0xEE6A1C func_80240504_EE6AB4 = 0x80240504; // type:func rom:0xEE6AB4 func_802407D4_EE6D84 = 0x802407D4; // type:func rom:0xEE6D84 func_80240B10_EE70C0 = 0x80240B10; // type:func rom:0xEE70C0 -EE70C0_UnkNpcAIFunc35 = 0x80240CC0; // type:func rom:0xEE7270 -EE70C0_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xEE7898 -EE70C0_UnkFunc4 = 0x802413A8; // type:func rom:0xEE7958 -EE70C0_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xEE7C9C -EE70C0_SixFloatsFunc = 0x80241764; // type:func rom:0xEE7D14 -EE70C0_UnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xEE7D80 -EE70C0_UnkNpcAIFunc3 = 0x80241904; // type:func rom:0xEE7EB4 -EE70C0_UnkFunc6 = 0x80241968; // type:func rom:0xEE7F18 -EE70C0_UnkFunc5 = 0x80241CF8; // type:func rom:0xEE82A8 +EE70C0_FlyingAI_Wander = 0x80240CC0; // type:func rom:0xEE7270 +EE70C0_FlyingAI_LoiterInit = 0x802412E8; // type:func rom:0xEE7898 +EE70C0_FlyingAI_Loiter = 0x802413A8; // type:func rom:0xEE7958 +EE70C0_FlyingAI_JumpInit = 0x802416EC; // type:func rom:0xEE7C9C +EE70C0_FlyingAI_Jump = 0x80241764; // type:func rom:0xEE7D14 +EE70C0_FlyingAI_ChaseInit = 0x802417D0; // type:func rom:0xEE7D80 +EE70C0_FlyingAI_Chase = 0x80241904; // type:func rom:0xEE7EB4 +EE70C0_FlyingAI_LosePlayer = 0x80241968; // type:func rom:0xEE7F18 +EE70C0_FlyingAI_Init = 0x80241CF8; // type:func rom:0xEE82A8 func_80241E1C_EE83CC = 0x80241E1C; // type:func rom:0xEE83CC EE70C0_GetNpcCollisionHeight = 0x80242034; // type:func rom:0xEE85E4 EE70C0_AddPlayerHandsOffset = 0x80242090; // type:func rom:0xEE8640 @@ -22634,7 +22604,7 @@ func_80242390_EE8940 = 0x80242390; // type:func rom:0xEE8940 D_802431FC_EE97AC = 0x802431FC; // type:data rom:0xEE97AC D_80243B44_EEA0F4 = 0x80243B44; // type:data rom:0xEEA0F4 D_80243B48_EEA0F8 = 0x80243B48; // type:data rom:0xEEA0F8 -N(sixFloats) = 0x802444F0; // type:data rom:0xEEAAA0 +N(FlyingAI_JumpVels) = 0x802444F0; // type:data rom:0xEEAAA0 D_8024462C_EEABDC = 0x8024462C; // type:data rom:0xEEABDC D_80244630_EEABE0 = 0x80244630; // type:data rom:0xEEABE0 D_80245350_EEB900 = 0x80245350; // type:data rom:0xEEB900 @@ -22668,43 +22638,43 @@ EED1E0_SuperBlock_PartnerSparkles2 = 0x80240D58; // type:func rom:0xEEDE58 EED1E0_SuperBlock_PartnerSparkles4 = 0x80240DA0; // type:func rom:0xEEDEA0 EED1E0_SuperBlock_WaitForPlayerToLand = 0x80240DE8; // type:func rom:0xEEDEE8 EED1E0_UnkFunc44 = 0x80240E18; // type:func rom:0xEEDF18 -EEDF50_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xEEDF50 -EEDF50_UnkNpcAIFunc35 = 0x80241000; // type:func rom:0xEEE100 -EEDF50_UnkNpcAIFunc1 = 0x80241628; // type:func rom:0xEEE728 -EEDF50_UnkFunc4 = 0x802416E8; // type:func rom:0xEEE7E8 -EEDF50_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xEEEB2C -EEDF50_SixFloatsFunc = 0x80241AA4; // type:func rom:0xEEEBA4 -EEDF50_UnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xEEEC10 -EEDF50_UnkNpcAIFunc3 = 0x80241C44; // type:func rom:0xEEED44 -EEDF50_UnkFunc6 = 0x80241CA8; // type:func rom:0xEEEDA8 -EEDF50_UnkFunc5 = 0x80242038; // type:func rom:0xEEF138 +EEDF50_FlyingAI_WanderInit = 0x80240E50; // type:func rom:0xEEDF50 +EEDF50_FlyingAI_Wander = 0x80241000; // type:func rom:0xEEE100 +EEDF50_FlyingAI_LoiterInit = 0x80241628; // type:func rom:0xEEE728 +EEDF50_FlyingAI_Loiter = 0x802416E8; // type:func rom:0xEEE7E8 +EEDF50_FlyingAI_JumpInit = 0x80241A2C; // type:func rom:0xEEEB2C +EEDF50_FlyingAI_Jump = 0x80241AA4; // type:func rom:0xEEEBA4 +EEDF50_FlyingAI_ChaseInit = 0x80241B10; // type:func rom:0xEEEC10 +EEDF50_FlyingAI_Chase = 0x80241C44; // type:func rom:0xEEED44 +EEDF50_FlyingAI_LosePlayer = 0x80241CA8; // type:func rom:0xEEEDA8 +EEDF50_FlyingAI_Init = 0x80242038; // type:func rom:0xEEF138 func_8024215C_EEF25C = 0x8024215C; // type:func rom:0xEEF25C -EEDF50_UnkNpcAIFunc13 = 0x80242374; // type:func rom:0xEEF474 -EEDF50_UnkNpcAIFunc34 = 0x802424A4; // type:func rom:0xEEF5A4 -EEDF50_UnkFunc45 = 0x80242724; // type:func rom:0xEEF824 -func_80242780_EEF880 = 0x80242780; // type:func rom:0xEEF880 +EEDF50_FlyingNoAttackAI_12 = 0x80242374; // type:func rom:0xEEF474 +EEDF50_FlyingNoAttackAI_13 = 0x802424A4; // type:func rom:0xEEF5A4 +EEDF50_FlyingNoAttackAI_20 = 0x80242724; // type:func rom:0xEEF824 +EEDF50_FlyingNoAttackAI_Main = 0x80242780; // type:func rom:0xEEF880 func_802429A0_EEFAA0 = 0x802429A0; // type:func rom:0xEEFAA0 EED1E0_SuperBlock_CantUpgradeMessages = 0x80243760; // type:data rom:0xEF0860 EED1E0_SuperBlock_PartnerIDs = 0x80243768; // type:data rom:0xEF0868 EED1E0_SuperBlock_UpgradeDescMessages = 0x80243778; // type:data rom:0xEF0878 EED1E0_SuperBlock_UpgradeOrbAngles = 0x802437B8; // type:data rom:0xEF08B8 -N(sixFloats) = 0x80244070; // type:data rom:0xEF1170 +N(FlyingAI_JumpVels) = 0x80244070; // type:data rom:0xEF1170 D_80245450_EF2550 = 0x80245450; // type:data rom:0xEF2550 D_80245458_EF2558 = 0x80245458; // type:data rom:0xEF2558 D_80245460_EF2560 = 0x80245460; // type:data rom:0xEF2560 D_802454A8_EF25A8 = 0x802454A8; // type:data rom:0xEF25A8 EF2610_DeadUnkFunc1 = 0x80240000; // type:func rom:0xEF2610 func_80240040_EF2650 = 0x80240040; // type:func rom:0xEF2650 -EF2680_UnkNpcAIFunc23 = 0x80240070; // type:func rom:0xEF2680 -EF2680_UnkNpcAIFunc35 = 0x80240220; // type:func rom:0xEF2830 -EF2680_UnkNpcAIFunc1 = 0x80240848; // type:func rom:0xEF2E58 -EF2680_UnkFunc4 = 0x80240908; // type:func rom:0xEF2F18 -EF2680_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xEF325C -EF2680_SixFloatsFunc = 0x80240CC4; // type:func rom:0xEF32D4 -EF2680_UnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xEF3340 -EF2680_UnkNpcAIFunc3 = 0x80240E64; // type:func rom:0xEF3474 -EF2680_UnkFunc6 = 0x80240EC8; // type:func rom:0xEF34D8 -EF2680_UnkFunc5 = 0x80241258; // type:func rom:0xEF3868 +EF2680_FlyingAI_WanderInit = 0x80240070; // type:func rom:0xEF2680 +EF2680_FlyingAI_Wander = 0x80240220; // type:func rom:0xEF2830 +EF2680_FlyingAI_LoiterInit = 0x80240848; // type:func rom:0xEF2E58 +EF2680_FlyingAI_Loiter = 0x80240908; // type:func rom:0xEF2F18 +EF2680_FlyingAI_JumpInit = 0x80240C4C; // type:func rom:0xEF325C +EF2680_FlyingAI_Jump = 0x80240CC4; // type:func rom:0xEF32D4 +EF2680_FlyingAI_ChaseInit = 0x80240D30; // type:func rom:0xEF3340 +EF2680_FlyingAI_Chase = 0x80240E64; // type:func rom:0xEF3474 +EF2680_FlyingAI_LosePlayer = 0x80240EC8; // type:func rom:0xEF34D8 +EF2680_FlyingAI_Init = 0x80241258; // type:func rom:0xEF3868 func_8024137C_EF398C = 0x8024137C; // type:func rom:0xEF398C func_80241594_EF3BA4 = 0x80241594; // type:func rom:0xEF3BA4 func_802415DC_EF3BEC = 0x802415DC; // type:func rom:0xEF3BEC @@ -22714,9 +22684,9 @@ EF2680_set_script_owner_npc_anim = 0x8024219C; // type:func rom:0xEF47AC EF2680_UnkDistFunc = 0x80242218; // type:func rom:0xEF4828 EF2680_UnkNpcAIFunc12 = 0x8024234C; // type:func rom:0xEF495C EF2680_set_script_owner_npc_col_height = 0x802424B0; // type:func rom:0xEF4AC0 -EF2680_DeadUnkNpcAIMainFunc5 = 0x80242530; // type:func rom:0xEF4B40 -EF2680_DeadUnkNpcAIMainFunc6 = 0x8024299C; // type:func rom:0xEF4FAC -N(sixFloats) = 0x802444BC; // type:data rom:0xEF6ACC +EF2680_TackleAI_Main = 0x80242530; // type:func rom:0xEF4B40 +EF2680_SpinyAI_Main = 0x8024299C; // type:func rom:0xEF4FAC +N(FlyingAI_JumpVels) = 0x802444BC; // type:data rom:0xEF6ACC flo_14_ConsumableChoiceList = 0x802453B0; // type:data rom:0xEF79C0 D_802453B8_EF79C8 = 0x802453B8; // type:data rom:0xEF79C8 D_802453C0_EF79D0 = 0x802453C0; // type:data rom:0xEF79D0 @@ -22909,6 +22879,7 @@ D_8000031C = 0x8000031C; // type:data D_80026AC7 = 0x80026AC7; // type:data dead_atan2 = 0x8002AF70; // type:data dead_heap_free = 0x8002C01C; // type:data +dead_func_80041080 = 0x80041080; // type:data D_8004AA85 = 0x8004AA85; // type:data gcc2_compiled. = 0x80060D60; // type:data ai = 0x8006AD64; // @@ -23249,8 +23220,7 @@ wPartnerCurrentScriptID = 0x8010CFDC; // type:data D_8010CFE0 = 0x8010CFE0; // type:data D_8010CFE4 = 0x8010CFE4; // type:data D_8010CFE8 = 0x8010CFE8; // type:data -dead_gPartnerActionStatus2 = 0x80117160; // type:data -dead_gPartnerActionStatus = 0x80117163; // type:data +dead_gPartnerActionStatus = 0x80117160; // type:data dead_gPlayerStatus = 0x80117578; // type:data dead_gPlayerActionState = 0x8011762C; // type:data dead_gPlayerData = 0x80117840; // type:data @@ -23533,7 +23503,7 @@ D_802442D0 = 0x802442D0; // type:data code_eb1170_bss = 0x802442D0; // type:data kzn_20_bss = 0x802442D0; // type:data flo_17_pad_XXX = 0x802443D8; // type:data -D_80244494 = 0x80244494; // type:data +EB1170_LetterDelivery_SavedNpcAnim = 0x80244494; // type:data flo_16_pad_44F8 = 0x802444F8; // type:data flo_25_pad_4734 = 0x80244734; // type:data D_802447C0 = 0x802447C0; // type:data @@ -23619,7 +23589,7 @@ D_802465F0 = 0x802465F0; // type:data flo_18_pad_66B4 = 0x802466B4; // type:data D_802466D0 = 0x802466D0; // type:data D_80246794 = 0x80246794; // type:data -D_802467B4 = 0x802467B4; // type:data +kzn_17_LetterDelivery_SavedNpcAnim = 0x802467B4; // type:data flo_00_pad_684C = 0x8024684C; // type:data D_80246894 = 0x80246894; // type:data D_80246990 = 0x80246990; // type:data @@ -23658,7 +23628,7 @@ D_802483C4 = 0x802483C4; // type:data D_802483D0 = 0x802483D0; // type:data D_80248480 = 0x80248480; // type:data D_8024854C = 0x8024854C; // type:data -D_8024854C_kzn_19 = 0x8024854C; // type:data +kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data D_80248600 = 0x80248600; // type:data D_80248624 = 0x80248624; // type:data D_80248650 = 0x80248650; // type:data @@ -23730,7 +23700,7 @@ bigArray = 0x8024DFF0; // type:data dro_01_bigArray = 0x8024DFF0; // type:data dro_01_pad_D_8024E1B0 = 0x8024E1B0; // type:data D_8024E1B4 = 0x8024E1B4; // type:data -dro_01_D_8024E1B4 = 0x8024E1B4; // type:data +dro_01_LetterDelivery_SavedNpcAnim = 0x8024E1B4; // type:data mac_02_Quizmo_Worker = 0x8024E540; // type:data mac_02_Quizmo_AnswerResult = 0x8024E558; // type:data mac_02_Quizmo_StageEffect = 0x8024E560; // type:data @@ -23741,7 +23711,7 @@ D_8024E738 = 0x8024E738; // type:data D_8024E960 = 0x8024E960; // type:data D_8024EA10 = 0x8024EA10; // type:data D_8024EA14 = 0x8024EA14; // type:data -D_8024EA18 = 0x8024EA18; // type:data +mac_02_LetterDelivery_SavedNpcAnim = 0x8024EA18; // type:data dro_02_pad_D_8024EF80 = 0x8024EF80; // type:data gPausePanels = 0x8024EF80; // D_8024EF84 = 0x8024EF84; // type:data @@ -23820,7 +23790,7 @@ D_8024F374 = 0x8024F374; // type:data D_8024F378 = 0x8024F378; // type:data D_8024F380 = 0x8024F380; // type:data dro_02_pad_D_8024F3B4 = 0x8024F3B4; // type:data -dro_02_D_8024F3B8 = 0x8024F3B8; // type:data +dro_02_LetterDelivery_SavedNpcAnim = 0x8024F3B8; // type:data D_8024F3F8 = 0x8024F3F8; // type:data D_8024F420 = 0x8024F420; // type:data D_8024F448 = 0x8024F448; // type:data @@ -23875,7 +23845,7 @@ sam_11_Quizmo_AnswerResult = 0x80251468; // type:data sam_11_Quizmo_StageEffect = 0x80251470; // type:data sam_11_Quizmo_AudienceEffect = 0x80251474; // type:data sam_11_Quizmo_VannaTEffect = 0x80251478; // type:data -D_802515C4 = 0x802515C4; // type:data +mac_03_LetterDelivery_SavedNpcAnim = 0x802515C4; // type:data dgb_01_pad_1 = 0x80251A78; // type:data dgb_01_pad_111111 = 0x80251A78; // type:data nok_01_Quizmo_Worker = 0x80251C40; // type:data @@ -23892,7 +23862,7 @@ mac_05_Quizmo_AudienceEffect = 0x802529F4; // type:data D_802529F8 = 0x802529F8; // type:data D_80252A00 = 0x80252A00; // type:data D_80252BC8 = 0x80252BC8; // type:data -D_80252D38 = 0x80252D38; // type:data +mac_05_LetterDelivery_SavedNpcAnim = 0x80252D38; // type:data D_80253060 = 0x80253060; // type:data dgb_01_pad_2 = 0x80253158; // type:data D_80253378 = 0x80253378; // type:data @@ -23919,9 +23889,9 @@ mac_00_Quizmo_AudienceEffect = 0x80255B94; // type:data mac_00_Quizmo_VannaTEffect = 0x80255B98; // type:data D_80255BA0 = 0x80255BA0; // type:data D_80255D68 = 0x80255D68; // type:data -D_80255ED8 = 0x80255ED8; // type:data +mac_00_LetterDelivery_SavedNpcAnim = 0x80255ED8; // type:data D_80255EE0 = 0x80255EE0; // type:data -D_802560A4 = 0x802560A4; // type:data +dup_mac_00_LetterDelivery_SavedNpcAnim = 0x802560A4; // type:data D_80257118 = 0x80257118; // type:data D_80257320 = 0x80257320; // type:data D_80257B28 = 0x80257B28; // type:data @@ -23961,7 +23931,7 @@ mac_01_Quizmo_StageEffect = 0x80262A60; // type:data mac_01_Quizmo_AudienceEffect = 0x80262A64; // type:data mac_01_Quizmo_VannaTEffect = 0x80262A68; // type:data D_80262A70 = 0x80262A70; // type:data -D_80262C34 = 0x80262C34; // type:data +mac_01_LetterDelivery_SavedNpcAnim = 0x80262C34; // type:data D_80262C38 = 0x80262C38; // type:data D_80262F68 = 0x80262F68; // type:data StartRumbleWithParams = 0x80267D9C; // diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 3cf1479a64..41de79632f 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -252,17 +252,17 @@ dead_get_clamped_angle_diff = 0x8002AF18; dead_clamp_angle = 0x8002AE14; dead_add_vec2D_polar = 0x8002B28C; dead_ai_enemy_play_sound = 0x8004D800; -func_8004D9C0 = 0x8004D9C0; -func_8004DAD8 = 0x8004DAD8; -func_8004DF64 = 0x8004DF64; -func_8004E024 = 0x8004E024; -func_8004E25C = 0x8004E25C; -func_8004E2EC = 0x8004E2EC; -func_8004E39C = 0x8004E39C; -func_8004E544 = 0x8004E544; -func_8004E808 = 0x8004E808; -func_8004EB8C = 0x8004EB8C; -func_8004D1A4 = 0x8004D1A4; +dead_basic_ai_wander_init = 0x8004D9C0; +dead_basic_ai_wander = 0x8004DAD8; +dead_basic_ai_loiter_init = 0x8004DF64; +dead_basic_ai_loiter = 0x8004E024; +dead_basic_ai_found_player_jump_init = 0x8004E25C; +dead_basic_ai_found_player_jump = 0x8004E2EC; +dead_basic_ai_chase_init = 0x8004E39C; +dead_basic_ai_chase = 0x8004E544; +dead_basic_ai_lose_player = 0x8004E808; +dead_basic_ai_suspend = 0x8004EB8C; +dead_basic_ai_check_player_dist = 0x8004D1A4; dead_npc_move_heading = 0x8003E424; dead_sqrtf = 0x80067040; dead_npc_test_move_simple_with_slipping = 0x800E5304; @@ -275,6 +275,7 @@ dead_heap_malloc = 0x8002BFD4; dead_heap_free = 0x8002C01C; dead_general_heap_malloc = 0x8002BF18; dead_heap_free = 0x8002C01C; +dead_func_80041080 = 0x80041080; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; dead_sin_cos_deg = 0x8002B524; @@ -337,10 +338,10 @@ func_801266F8 = 0x801266F8; func_80126734 = 0x80126734; dead_set_screen_overlay_params_back = 0x80144194; dead_gItemTable = 0x8008D2C0; -dead_gPartnerActionStatus = 0x80117163; dead_gPlayerStatus = 0x80117578; dead_gPlayerActionState = 0x8011762C; -dead_gPartnerActionStatus2 = 0x80117160; +dead_gPartnerActionStatus = 0x80117160; +dead_80117163 = 0x80117160; dead_gPlayerData = 0x80117840; dead_gCollisionStatus = 0x80169B12; dead_gOverrideFlags = 0x800A15A8; @@ -481,7 +482,7 @@ D_802440FB = 0x802440FB; D_802440FF = 0x802440FF; D_80244104 = 0x80244104; D_802442D0 = 0x802442D0; -D_80244494 = 0x80244494; +kzn_20_LetterDelivery_SavedNpcAnim = 0x80244494; D_802447C0 = 0x802447C0; D_80244A20 = 0x80244A20; D_80244C18 = 0x80244C18; @@ -529,7 +530,26 @@ D_802465CC = 0x802465CC; D_802465F0 = 0x802465F0; D_802466D0 = 0x802466D0; D_80246794 = 0x80246794; -D_802467B4 = 0x802467B4; +EB1170_LetterDelivery_SavedNpcAnim = 0x80244494; +EA8AE0_LetterDelivery_SavedNpcAnim = 0x8024854C; +EA0C10_LetterDelivery_SavedNpcAnim = 0x80246894; +kmr_02_LetterDelivery_SavedNpcAnim = 0x8025811C; +osr_01_LetterDelivery_SavedNpcAnim = 0x80242344; +hos_06_LetterDelivery_SavedNpcAnim = 0x80246424; +nok_01_LetterDelivery_SavedNpcAnim = 0x80251E34; +nok_02_LetterDelivery_SavedNpcAnim = 0x80254B94; +jan_00_LetterDelivery_SavedNpcAnim = 0x80247CB4; +jan_03_LetterDelivery_SavedNpcAnim = 0x8024FF04; +kzn_02_LetterDelivery_SavedNpcAnim = 0x80246794; +kzn_03_LetterDelivery_SavedNpcAnim = 0x802475E4; +kzn_09_LetterDelivery_SavedNpcAnim = 0x80247664; +kzn_17_LetterDelivery_SavedNpcAnim = 0x802467B4; +sam_01_LetterDelivery_SavedNpcAnim = 0x8024DF24; +sam_06_LetterDelivery_SavedNpcAnim = 0x8024C1D8; +sbk_30_LetterDelivery_SavedNpcAnim = 0x80244D88; +sbk_34_LetterDelivery_SavedNpcAnim = 0x802429A4; +obk_01_LetterDelivery_SavedNpcAnim = 0x80245AB4; +obk_03_LetterDelivery_SavedNpcAnim = 0x80243DA4; D_80246990 = 0x80246990; D_80246BE8 = 0x80246BE8; D_80247050 = 0x80247050; @@ -558,6 +578,7 @@ jan_02_Quizmo_AnswerResult = 0x80248938; jan_02_Quizmo_StageEffect = 0x80248940; jan_02_Quizmo_AudienceEffect = 0x80248944; jan_02_Quizmo_VannaTEffect = 0x80248948; +D_80248760_jan_02 = 0x80248760; D_80248F90 = 0x80248F90; D_80249158 = 0x80249158; D_80249440 = 0x80249440; @@ -607,7 +628,7 @@ D_8024E738 = 0x8024E738; D_8024E960 = 0x8024E960; D_8024EA10 = 0x8024EA10; D_8024EA14 = 0x8024EA14; -D_8024EA18 = 0x8024EA18; +mac_02_LetterDelivery_SavedNpcAnim = 0x8024EA18; D_8024EF84 = 0x8024EF84; D_8024EF88 = 0x8024EF88; D_8024EF90 = 0x8024EF90; @@ -711,7 +732,7 @@ sam_11_Quizmo_AnswerResult = 0x80251468; sam_11_Quizmo_StageEffect = 0x80251470; sam_11_Quizmo_AudienceEffect = 0x80251474; sam_11_Quizmo_VannaTEffect = 0x80251478; -D_802515C4 = 0x802515C4; +mac_03_LetterDelivery_SavedNpcAnim = 0x802515C4; nok_01_Quizmo_Worker = 0x80251C40; nok_01_Quizmo_AnswerResult = 0x80251C58; nok_01_Quizmo_StageEffect = 0x80251C60; @@ -726,7 +747,7 @@ mac_05_Quizmo_AudienceEffect = 0x802529F4; mac_05_Quizmo_VannaTEffect = 0x802529F8; D_80252A00 = 0x80252A00; D_80252BC8 = 0x80252BC8; -D_80252D38 = 0x80252D38; +mac_05_LetterDelivery_SavedNpcAnim = 0x80252D38; D_80253060 = 0x80253060; D_80253378 = 0x80253378; D_80253384 = 0x80253384; @@ -749,9 +770,9 @@ mac_00_Quizmo_AudienceEffect = 0x80255B94; mac_00_Quizmo_VannaTEffect = 0x80255B98; D_80255BA0 = 0x80255BA0; D_80255D68 = 0x80255D68; -D_80255ED8 = 0x80255ED8; +mac_00_LetterDelivery_SavedNpcAnim = 0x80255ED8; D_80255EE0 = 0x80255EE0; -D_802560A4 = 0x802560A4; +dup_mac_00_LetterDelivery_SavedNpcAnim = 0x802560A4; D_80257118 = 0x80257118; D_80257320 = 0x80257320; D_80257F20 = 0x80257F20; @@ -785,7 +806,7 @@ mac_01_Quizmo_StageEffect = 0x80262A60; mac_01_Quizmo_AudienceEffect = 0x80262A64; mac_01_Quizmo_VannaTEffect = 0x80262A68; D_80262A70 = 0x80262A70; -D_80262C34 = 0x80262C34; +mac_01_LetterDelivery_SavedNpcAnim = 0x80262C34; D_80262C38 = 0x80262C38; D_80262F68 = 0x80262F68; heap_collisionHead = 0x80268000; @@ -1206,14 +1227,19 @@ D_802F4560 = 0x802F4560; heap_generalHead = 0x802FB800; gSpriteHeapPtr = 0x8034F800; heap_battleHead = 0x803DA800; +D_802465D0_kzn_02 = 0x802465D0; +D_80247420_kzn_03 = 0x80247420; D_80248380_kzn_19 = 0x80248380; -D_8024854C_kzn_19 = 0x8024854C; +kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; D_80247BB8_pra_19 = 0x80247BB8; D_802312E0_battle_area_omo2 = 0x802312E0; D_802312F8_battle_area_omo2 = 0x802312F8; some_80241FBC = 0x80241FBC; D_802463B8_kkj_19 = 0x802463B8; +D_80246538_kkj_19 = 0x80246538; D_80246558_kkj_19 = 0x80246558; +D_80246550_kkj_19 = 0x80246550; +D_80246560_kkj_19 = 0x80246560; D_80077A40 = 0x80077A40; // mgm_01 scripts (unsplit in E141D0.data.s) @@ -1228,3 +1254,5 @@ D_802423F0 = 0x802423F0; D_80242410 = 0x80242410; D_80242430 = 0x80242430; D_80242450 = 0x80242450; + +D_80242568_filemenu = 0x80242568;