From 3ff00576747706ef97e5b1407023ed0b37e90cb3 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 20 Mar 2022 06:12:30 -0400 Subject: [PATCH] Match-a-palooza (75% functions, 60% bytes) (#666) * aura_update * CompareFloats * UnkBufferFunc * SetPlayerStatusPosYaw * SetNpcPosYaw * IsAOrBPressed * UnkEnemyPosFunc * UnkNpcAIFunc47 * UnkFunc57 * UnkFunc58 * UnkFunc59 * delete unneded data * UnkFunc60 * UnkFunc61 * UnkNpcAIFunc48 * UnkNpcAIFunc49 * UnkNpcAIMainFunc7 * lee func * cleanup * UnkFunc62 * UnkNpcAIMainFunc8 * SixFloatsFunc * UnkNpcAIMainFunc9 part 1 * UnkNpcAIMainFunc9 part 2 * UnkNpcAIMainFunc10 * warnings --- include/common_structs.h | 7 +- include/dead.h | 3 + include/effects.h | 2 +- include/functions.h | 12 + include/model.h | 6 +- src/23680.c | 4 +- src/EC9D00.c | 2 +- src/ED0310.c | 12 +- src/EDEA00.c | 12 +- src/EE70C0.c | 13 +- src/EED1E0.c | 2 +- src/EEDF50.c | 12 +- src/EF2680.c | 12 +- src/a5dd0_len_114e0.c | 2 + src/actor_api.c | 2 +- src/battle/area_kpa3/6BBC60.c | 2 +- src/battle/area_mac/actor/lee.c | 57 +- src/battle/area_pra3/669D80.c | 6 +- src/battle/area_sam/623BA0.c | 6 +- .../area_trd_part_2/actor/blue_ninja_koopa.c | 7 +- .../area_trd_part_2/actor/green_ninja_koopa.c | 7 +- .../area_trd_part_2/actor/red_ninja_koopa.c | 7 +- .../actor/yellow_ninja_koopa.c | 7 +- src/battle/battle.h | 5 +- src/common/CompareFloats.inc.c | 14 + src/common/IsAOrBPressed.inc.c | 12 + src/common/IsSaveVar123.inc.c | 1 - src/common/SetNpcPosYaw.inc.c | 21 + src/common/SetPlayerStatusPosYaw.inc.c | 15 + src/common/UnkBufferFunc.inc.c | 10 + src/common/UnkEnemyPosFunc.inc.c | 133 ++++ src/effects/aura.c | 103 ++- src/world/area_arn/arn_02/arn_02.h | 1 - src/world/area_arn/arn_04/arn_04.h | 3 +- src/world/area_arn/arn_04/events.c | 162 ++--- src/world/area_arn/arn_07/arn_07.h | 2 +- src/world/area_arn/arn_07/events.c | 76 +-- src/world/area_dgb/dgb_01/BFD9A0.c | 81 +-- src/world/area_dgb/dgb_04/C36530.c | 224 +------ src/world/area_dgb/dgb_04/dgb_04.h | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 72 +-- src/world/area_dgb/dgb_09/C46BE0.c | 76 +-- src/world/area_flo/flo_08/CAED40.c | 143 +---- src/world/area_flo/flo_08/CAFAC0.c | 4 +- src/world/area_flo/flo_08/flo_08.h | 4 +- src/world/area_flo/flo_09/CB50E0.c | 4 +- src/world/area_flo/flo_09/CB5320.c | 70 +- src/world/area_flo/flo_09/flo_09.h | 4 +- src/world/area_flo/flo_13/CC3850.c | 74 +-- src/world/area_flo/flo_14/CCBE20.c | 76 +-- src/world/area_flo/flo_14/flo_14.h | 2 +- src/world/area_flo/flo_16/CD1F10.c | 147 +---- src/world/area_flo/flo_16/CD2C80.c | 135 +--- src/world/area_flo/flo_16/flo_16.h | 4 +- src/world/area_flo/flo_17/CD7350.c | 76 +-- src/world/area_flo/flo_21/CE6700.c | 1 - src/world/area_flo/flo_25/CF2C10.c | 139 +--- src/world/area_flo/flo_25/flo_25.h | 4 +- src/world/area_hos/hos_02/A17210.c | 9 +- src/world/area_hos/hos_03/A1BDB0.c | 6 +- src/world/area_isk/isk_10/988B60.c | 2 +- src/world/area_iwa/iwa_01/90FBD0.c | 10 +- src/world/area_iwa/iwa_10/91E6D0.c | 2 +- src/world/area_jan/jan_08/B5E910.c | 2 +- src/world/area_kmr/kmr_05/8CE070.c | 6 +- src/world/area_kmr/kmr_06/8D1510.c | 6 +- src/world/area_kmr/kmr_09/8D5E00.c | 6 +- src/world/area_kpa/kpa_03/A48720.c | 13 +- src/world/area_kpa/kpa_08/A4CAC0.c | 8 +- src/world/area_kpa/kpa_09/A4F0A0.c | 10 +- src/world/area_kpa/kpa_102/A93A50.c | 14 +- src/world/area_kpa/kpa_111/A99590.c | 10 +- src/world/area_kpa/kpa_115/A9ED40.c | 10 +- src/world/area_kpa/kpa_50/A609D0.c | 10 +- src/world/area_kpa/kpa_51/A640E0.c | 8 +- src/world/area_kpa/kpa_52/A671E0.c | 10 +- src/world/area_kpa/kpa_61/A6E6F0.c | 4 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 12 +- src/world/area_kzn/kzn_02/C5CE70.c | 2 + src/world/area_kzn/kzn_04/C68440.c | 2 +- src/world/area_kzn/kzn_07/C6EA50.c | 12 +- src/world/area_kzn/kzn_08/C71ED0.c | 11 +- src/world/area_kzn/kzn_09/C76CE0.c | 2 +- src/world/area_kzn/kzn_11/C80600.c | 11 +- src/world/area_mim/mim_08/BAD940.c | 6 +- src/world/area_nok/nok_11/9F4A40.c | 6 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 9 +- src/world/area_nok/nok_15/A06F00.c | 9 +- src/world/area_omo/omo_02/D9D510.c | 10 +- src/world/area_omo/omo_03/DA5260.c | 10 +- src/world/area_omo/omo_04/DAD400.c | 6 +- src/world/area_omo/omo_05/DB22C0.c | 6 +- src/world/area_omo/omo_06/DB7910.c | 10 +- src/world/area_omo/omo_07/DBD2B0.c | 10 +- src/world/area_omo/omo_07/DC01D0.c | 2 + src/world/area_omo/omo_08/DC43D0.c | 10 +- src/world/area_omo/omo_09/DCD6B0.c | 12 +- src/world/area_omo/omo_09/DD02E0.c | 2 + src/world/area_omo/omo_10/DD79B0.c | 10 +- src/world/area_omo/omo_11/DDCFC0.c | 2 +- src/world/area_omo/omo_16/DEBED0.c | 10 +- src/world/area_omo/omo_17/DEEEA0.c | 10 +- src/world/area_omo/omo_17/DEF400.c | 16 +- src/world/area_sam/sam_06/D203E0.c | 6 +- src/world/area_sam/sam_08/D2FC80.c | 2 +- src/world/area_sbk/sbk_56/953FC0.c | 2 +- src/world/area_tik/tik_07/879BE0.c | 2 +- src/world/area_tik/tik_07/87AC00.c | 6 +- src/world/area_tik/tik_10/8866D0.c | 2 +- src/world/area_tik/tik_12/8891C0.c | 2 +- src/world/area_tik/tik_17/892A50.c | 2 +- src/world/area_tik/tik_19/897BD0.c | 2 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 13 +- src/world/area_trd/trd_07/9B6C90.c | 9 +- src/world/common/SixFloatsFunc.inc.c | 15 + src/world/common/StarSpiritEffectFunc.inc.c | 2 +- src/world/common/UnkDurationCheckNoArgs.inc.c | 12 + src/world/common/UnkFunc57.inc.c | 112 ++++ src/world/common/UnkFunc58.inc.c | 14 + src/world/common/UnkFunc59.inc.c | 12 + src/world/common/UnkFunc60.inc.c | 142 ++++ src/world/common/UnkFunc61.inc.c | 46 ++ src/world/common/UnkFunc62.inc.c | 186 ++++++ src/world/common/UnkNpcAIFunc12.inc.c | 2 +- src/world/common/UnkNpcAIFunc47.inc.c | 40 ++ src/world/common/UnkNpcAIFunc48.inc.c | 25 + src/world/common/UnkNpcAIFunc49.inc.c | 29 + src/world/common/UnkNpcAIMainFunc10.inc.c | 62 ++ src/world/common/UnkNpcAIMainFunc5.inc.c | 2 +- src/world/common/UnkNpcAIMainFunc7.inc.c | 100 +++ src/world/common/UnkNpcAIMainFunc8.inc.c | 92 +++ src/world/common/UnkNpcAIMainFunc9.inc.c | 63 ++ tools/find_duplicates.py | 2 +- tools/ignored_funcs.txt | 3 + ver/us/asm/data/16A680.data.s | 4 +- ver/us/asm/data/ECBC10.data.s | 4 +- ver/us/asm/data/ED1840.data.s | 2 +- ver/us/asm/data/EE20E0.data.s | 2 +- ver/us/asm/data/EE8970.data.s | 2 +- ver/us/asm/data/EEFAD0.data.s | 6 +- ver/us/asm/data/EF58E0.data.s | 2 +- .../asm/data/battle/area_kpa3/6BD250.data.s | 2 +- .../asm/data/battle/area_omo2/52B9D0.data.s | 6 +- .../asm/data/battle/area_pra3/66BC90.data.s | 143 +---- ver/us/asm/data/battle/area_sam/626A30.data.s | 167 +---- .../data/world/area_arn/arn_03/BE04B0.data.s | 6 - .../data/world/area_arn/arn_03/BE05C0.data.s | 6 - .../data/world/area_arn/arn_03/BE0950.data.s | 16 - .../data/world/area_arn/arn_03/BE3570.data.s | 6 - .../data/world/area_arn/arn_04/BE6B20.data.s | 6 - .../data/world/area_arn/arn_04/BE6C30.data.s | 6 - .../data/world/area_arn/arn_04/BE6E10.data.s | 12 - .../data/world/area_arn/arn_04/BE77F0.data.s | 6 - .../data/world/area_arn/arn_05/BE8EE0.data.s | 6 - .../data/world/area_arn/arn_05/BE9290.data.s | 6 - .../data/world/area_arn/arn_05/BECBE0.data.s | 6 - .../data/world/area_arn/arn_07/BEEC80.data.s | 6 - .../data/world/area_arn/arn_07/BEEE30.data.s | 6 - .../data/world/area_arn/arn_07/BF0580.data.s | 9 - .../data/world/area_arn/arn_08/BF4A30.data.s | 6 - .../data/world/area_arn/arn_08/BF4B50.data.s | 6 - .../data/world/area_arn/arn_08/BF5210.data.s | 6 - .../data/world/area_arn/arn_08/BF5340.data.s | 6 - .../data/world/area_arn/arn_08/BF5460.data.s | 9 - .../data/world/area_arn/arn_08/BF59A0.data.s | 6 - .../data/world/area_arn/arn_08/BF5FF0.data.s | 6 - .../data/world/area_arn/arn_09/BF60A0.data.s | 6 - .../data/world/area_arn/arn_09/BF61A0.data.s | 6 - .../data/world/area_arn/arn_09/BF6400.data.s | 6 - .../data/world/area_arn/arn_09/BF6530.data.s | 6 - .../data/world/area_arn/arn_09/BF6610.data.s | 6 - .../data/world/area_arn/arn_10/BF6A00.data.s | 6 - .../data/world/area_arn/arn_10/BF6B00.data.s | 6 - .../data/world/area_arn/arn_10/BF6E30.data.s | 6 - .../data/world/area_arn/arn_10/BF75E0.data.s | 6 - .../data/world/area_arn/arn_11/BF7680.data.s | 6 - .../data/world/area_arn/arn_11/BF7770.data.s | 6 - .../data/world/area_arn/arn_11/BF7D00.data.s | 6 - .../data/world/area_arn/arn_12/BF8790.data.s | 6 - .../data/world/area_arn/arn_12/BF8890.data.s | 6 - .../data/world/area_arn/arn_12/BF8BB0.data.s | 6 - .../data/world/area_arn/arn_13/BF9410.data.s | 6 - .../data/world/area_arn/arn_13/BF9510.data.s | 6 - .../data/world/area_arn/arn_13/BF9840.data.s | 6 - .../data/world/area_dgb/dgb_02/C30650.data.s | 6 - .../data/world/area_dgb/dgb_03/C345C0.data.s | 6 - .../data/world/area_dgb/dgb_03/C34E50.data.s | 6 - .../data/world/area_dgb/dgb_04/C39A90.data.s | 21 - .../data/world/area_dgb/dgb_05/C3C2D0.data.s | 6 - .../data/world/area_dgb/dgb_07/C3F3E0.data.s | 6 - .../data/world/area_dgb/dgb_08/C43EB0.data.s | 9 - .../data/world/area_dgb/dgb_09/C4ABE0.data.s | 9 - .../data/world/area_dgb/dgb_15/C513B0.data.s | 6 - .../data/world/area_dgb/dgb_16/C53D00.data.s | 6 - .../data/world/area_flo/flo_00/C9F300.data.s | 6 - .../data/world/area_flo/flo_00/C9F5E0.data.s | 132 ---- .../data/world/area_flo/flo_00/CA3D50.data.s | 21 - .../data/world/area_flo/flo_00/CA4770.data.s | 33 - .../data/world/area_flo/flo_00/CA7050.data.s | 6 - .../data/world/area_flo/flo_03/CA78D0.data.s | 24 - .../data/world/area_flo/flo_03/CA8150.data.s | 111 ---- .../data/world/area_flo/flo_03/CAC170.data.s | 6 - .../data/world/area_flo/flo_07/CAC930.data.s | 6 - .../data/world/area_flo/flo_07/CACAC0.data.s | 15 - .../data/world/area_flo/flo_07/CAD410.data.s | 45 -- .../data/world/area_flo/flo_08/CB0C20.data.s | 48 -- .../data/world/area_flo/flo_08/CB1BF0.data.s | 75 --- .../data/world/area_flo/flo_08/CB3C80.data.s | 24 - .../data/world/area_flo/flo_08/CB46D0.data.s | 9 - .../data/world/area_flo/flo_09/CB6820.data.s | 24 - .../data/world/area_flo/flo_09/CB7010.data.s | 9 - .../data/world/area_flo/flo_09/CB7880.data.s | 102 --- .../data/world/area_flo/flo_10/CBA670.data.s | 6 - .../data/world/area_flo/flo_10/CBA830.data.s | 6 - .../data/world/area_flo/flo_10/CBA880.data.s | 12 - .../data/world/area_flo/flo_10/CBAEB0.data.s | 45 -- .../data/world/area_flo/flo_10/CBC420.data.s | 24 - .../data/world/area_flo/flo_10/CBD270.data.s | 6 - .../data/world/area_flo/flo_10/CBD290.data.s | 24 - .../data/world/area_flo/flo_11/CBDFF0.data.s | 51 -- .../data/world/area_flo/flo_11/CBF790.data.s | 63 -- .../data/world/area_flo/flo_11/CC0DC0.data.s | 6 - .../data/world/area_flo/flo_12/CC1520.data.s | 6 - .../data/world/area_flo/flo_12/CC16A0.data.s | 12 - .../data/world/area_flo/flo_12/CC1C60.data.s | 45 -- .../data/world/area_flo/flo_15/CD06C0.data.s | 6 - .../data/world/area_flo/flo_15/CD07E0.data.s | 9 - .../data/world/area_flo/flo_15/CD09C0.data.s | 27 - .../data/world/area_flo/flo_15/CD19A0.data.s | 6 - .../data/world/area_flo/flo_15/CD1A20.data.s | 6 - .../data/world/area_flo/flo_16/CD47A0.data.s | 33 - .../data/world/area_flo/flo_16/CD5530.data.s | 30 - .../data/world/area_flo/flo_16/CD5E40.data.s | 21 - .../data/world/area_flo/flo_16/CD6330.data.s | 12 - .../data/world/area_flo/flo_17/CDA500.data.s | 27 - .../data/world/area_flo/flo_17/CDB2B0.data.s | 48 -- .../data/world/area_flo/flo_17/CDC560.data.s | 6 - .../data/world/area_flo/flo_18/CDCE70.data.s | 6 - .../data/world/area_flo/flo_18/CDCF60.data.s | 15 - .../data/world/area_flo/flo_18/CDD530.data.s | 153 ----- .../data/world/area_flo/flo_18/CE2D60.data.s | 6 - .../data/world/area_flo/flo_19/CE4030.data.s | 6 - .../data/world/area_flo/flo_19/CE41B0.data.s | 6 - .../data/world/area_flo/flo_19/CE41F0.data.s | 12 - .../data/world/area_flo/flo_19/CE4740.data.s | 18 - .../data/world/area_flo/flo_19/CE5160.data.s | 18 - .../data/world/area_flo/flo_21/CE73F0.data.s | 24 - .../data/world/area_flo/flo_21/CE7EC0.data.s | 81 --- .../data/world/area_flo/flo_22/CEC4D0.data.s | 18 - .../data/world/area_flo/flo_22/CEC760.data.s | 30 - .../data/world/area_flo/flo_22/CED050.data.s | 12 - .../data/world/area_flo/flo_22/CED7E0.data.s | 27 - .../data/world/area_flo/flo_23/CEEF30.data.s | 24 - .../data/world/area_flo/flo_23/CEF540.data.s | 42 -- .../data/world/area_flo/flo_23/CF0800.data.s | 6 - .../data/world/area_flo/flo_24/CF0ED0.data.s | 24 - .../data/world/area_flo/flo_24/CF1680.data.s | 27 - .../data/world/area_flo/flo_24/CF2AF0.data.s | 6 - .../data/world/area_flo/flo_25/CF4EA0.data.s | 78 --- .../data/world/area_flo/flo_25/CF6860.data.s | 6 - .../data/world/area_flo/flo_25/CF68B0.data.s | 24 - .../data/world/area_flo/flo_25/CF7310.data.s | 9 - .../data/world/area_hos/hos_02/A1A6A0.data.s | 4 +- .../data/world/area_hos/hos_03/A1F3C0.data.s | 4 +- .../data/world/area_isk/isk_10/989910.data.s | 4 +- .../data/world/area_iwa/iwa_10/923FD0.data.s | 4 +- .../data/world/area_jan/jan_08/B620B0.data.s | 4 +- .../data/world/area_kkj/kkj_18/AF4BB0.data.s | 2 +- .../data/world/area_kmr/kmr_05/8CF880.data.s | 4 +- .../data/world/area_kmr/kmr_06/8D3340.data.s | 4 +- .../data/world/area_kmr/kmr_09/8D73C0.data.s | 4 +- .../data/world/area_kpa/kpa_03/A4A750.data.s | 2 +- .../data/world/area_kpa/kpa_08/A4E710.data.s | 2 +- .../data/world/area_kpa/kpa_09/A50B90.data.s | 2 +- .../data/world/area_kpa/kpa_102/A97690.data.s | 4 +- .../data/world/area_kpa/kpa_111/A9ACF0.data.s | 2 +- .../data/world/area_kpa/kpa_115/AA0B20.data.s | 2 +- .../data/world/area_kpa/kpa_50/A624D0.data.s | 2 +- .../data/world/area_kpa/kpa_51/A660E0.data.s | 2 +- .../data/world/area_kpa/kpa_52/A68B40.data.s | 2 +- .../data/world/area_kpa/kpa_61/A70FE0.data.s | 2 +- .../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 | 4 +- .../data/world/area_kzn/kzn_04/C69D70.data.s | 4 +- .../data/world/area_kzn/kzn_07/C70EC0.data.s | 4 +- .../data/world/area_kzn/kzn_08/C76030.data.s | 4 +- .../data/world/area_kzn/kzn_09/C7A9E0.data.s | 4 +- .../data/world/area_kzn/kzn_11/C83870.data.s | 4 +- .../data/world/area_mim/mim_08/BB1D00.data.s | 4 +- .../data/world/area_nok/nok_11/9F7180.data.s | 4 +- .../data/world/area_nok/nok_12/9FE000.data.s | 2 +- .../data/world/area_nok/nok_14/A06110.data.s | 2 +- .../data/world/area_nok/nok_15/A0AB90.data.s | 2 +- .../data/world/area_omo/omo_02/DA1CD0.data.s | 2 +- .../data/world/area_omo/omo_03/DA8190.data.s | 4 +- .../data/world/area_omo/omo_04/DAF3E0.data.s | 4 +- .../data/world/area_omo/omo_05/DB4770.data.s | 4 +- .../data/world/area_omo/omo_06/DB9060.data.s | 4 +- .../data/world/area_omo/omo_07/DC0B80.data.s | 4 +- .../data/world/area_omo/omo_08/DC8100.data.s | 4 +- .../data/world/area_omo/omo_09/DD4150.data.s | 2 +- .../data/world/area_omo/omo_10/DD8A60.data.s | 4 +- .../data/world/area_omo/omo_11/DDDD90.data.s | 4 +- .../data/world/area_omo/omo_16/DEC600.data.s | 4 +- .../data/world/area_omo/omo_17/DF2C90.data.s | 4 +- .../data/world/area_omo/omo_17/DF4EB0.data.s | 6 +- .../data/world/area_pra/pra_13/D66880.data.s | 2 +- .../data/world/area_pra/pra_19/D70A70.data.s | 2 +- .../data/world/area_sam/sam_06/D23E50.data.s | 4 +- .../data/world/area_sam/sam_08/D314C0.data.s | 4 +- .../data/world/area_sbk/sbk_56/9553F0.data.s | 4 +- .../data/world/area_tik/tik_07/87D5D0.data.s | 4 +- .../data/world/area_tik/tik_07/87E890.data.s | 4 +- .../data/world/area_tik/tik_10/8883F0.data.s | 4 +- .../data/world/area_tik/tik_12/88C810.data.s | 4 +- .../data/world/area_tik/tik_17/893E40.data.s | 4 +- .../data/world/area_tik/tik_19/899C90.data.s | 4 +- .../data/world/area_trd/trd_02/9A3AB0.data.s | 2 +- .../data/world/area_trd/trd_04/9AD960.data.s | 4 +- .../data/world/area_trd/trd_07/9B9760.data.s | 2 +- .../EC9D00/func_80240600_ECA300.s | 356 ---------- .../ED0310/func_8024162C_ED161C.s | 2 +- .../EDEA00/func_802414D0_EDFE90.s | 2 +- .../EE70C0/func_80241E1C_EE83CC.s | 2 +- .../EED1E0/func_802406E0_EED7E0.s | 356 ---------- .../EEDF50/func_8024215C_EEF25C.s | 2 +- .../EEDF50/func_80242780_EEF880.s | 2 +- .../EF2680/func_8024137C_EF398C.s | 2 +- .../area_kpa3/6BBC60/func_802180D0_6BBC60.s | 606 ----------------- .../area_mac/actor/lee/func_80218300_464790.s | 607 ------------------ .../area_mac/actor/lee/func_80219824_465CB4.s | 75 --- .../area_pra3/669D80/func_80218000_669D80.s | 576 ----------------- .../area_pra3/669D80/func_80218E88_66AC08.s | 7 + .../area_pra3/669D80/func_80219524_66B2A4.s | 116 ++++ .../area_sam/623BA0/func_80218000_623BA0.s | 576 ----------------- .../area_sam/623BA0/func_80218E88_624A28.s | 7 + .../area_sam/623BA0/func_80219524_6250C4.s | 141 ++++ .../4B15D0/func_802185B0_4B17A0.s | 390 ----------- .../4B1D90/func_80218D70_4B1F60.s | 390 ----------- .../4B2550/func_80219530_4B2720.s | 390 ----------- .../4B2D10/func_80219CF0_4B2EE0.s | 390 ----------- .../nonmatchings/effects/aura/aura_update.s | 335 ---------- .../CC3850/flo_13_func_80241DB8_CC55C8.s | 2 +- .../CD7350/flo_17_func_80241C64_CD8F44.s | 2 +- .../hos_02/A17210/func_80241C44_A17E64.s | 32 - .../hos_02/A17210/func_802422FC_A1851C.s | 147 ----- .../hos_02/A17210/func_802428F4_A18B14.s | 147 ----- .../hos_03/A1BDB0/func_80241904_A1CA04.s | 32 - .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 147 ----- .../isk_10/988B60/func_80240600_989160.s | 356 ---------- .../iwa_01/90FBD0/func_80240520_90FBD0.s | 144 ----- .../iwa_01/90FBD0/func_80240710_90FDC0.s | 88 --- .../iwa_01/90FBD0/func_80240854_90FF04.s | 71 -- .../iwa_01/90FBD0/func_80241F6C_91161C.s | 234 ------- .../iwa_10/91E6D0/func_802408F0_91EE60.s | 356 ---------- .../jan_08/B5E910/func_80240C60_B5EF10.s | 356 ---------- .../kkj_18/AF2FE0/func_802405F8_AF3298.s | 12 +- .../kkj_19/AF7C00/func_802406C4_AF8014.s | 24 +- .../kmr_05/8CE070/func_80240C54_8CECC4.s | 32 - .../kmr_05/8CE070/func_8024130C_8CF37C.s | 149 ----- .../kmr_06/8D1510/func_80240C54_8D2164.s | 32 - .../kmr_06/8D1510/func_8024130C_8D281C.s | 149 ----- .../kmr_09/8D5E00/func_80240C54_8D6A54.s | 32 - .../kmr_09/8D5E00/func_8024130C_8D710C.s | 147 ----- .../kpa_03/A48720/func_80240A48_A49008.s | 139 ---- .../kpa_03/A48720/func_80240C18_A491D8.s | 350 ---------- .../kpa_03/A48720/func_80241128_A496E8.s | 34 - .../kpa_03/A48720/func_802412C8_A49888.s | 44 -- .../kpa_03/A48720/func_802416B0_A49C70.s | 19 - .../kpa_03/A48720/func_802416EC_A49CAC.s | 2 +- .../kpa_03/A48720/func_80241918_A49ED8.s | 2 +- .../kpa_03/A48720/func_80241AB4_A4A074.s | 4 +- .../kpa_08/A4CAC0/func_802400A0_A4CAC0.s | 139 ---- .../kpa_08/A4CAC0/func_80240270_A4CC90.s | 350 ---------- .../kpa_08/A4CAC0/func_80240780_A4D1A0.s | 34 - .../kpa_08/A4CAC0/func_80240920_A4D340.s | 44 -- .../kpa_08/A4CAC0/func_80240D44_A4D764.s | 2 +- .../kpa_08/A4CAC0/func_80240F70_A4D990.s | 2 +- .../kpa_08/A4CAC0/func_8024110C_A4DB2C.s | 4 +- .../kpa_09/A4F0A0/func_802400A0_A4F0A0.s | 144 ----- .../kpa_09/A4F0A0/func_80240290_A4F290.s | 88 --- .../kpa_09/A4F0A0/func_802403D4_A4F3D4.s | 71 -- .../kpa_09/A4F0A0/func_80240F94_A4FF94.s | 234 ------- .../kpa_102/A93A50/func_80240310_A93A50.s | 144 ----- .../kpa_102/A93A50/func_80240500_A93C40.s | 88 --- .../kpa_102/A93A50/func_80240644_A93D84.s | 71 -- .../kpa_102/A93A50/func_80241204_A94944.s | 234 ------- .../kpa_102/A93A50/func_80241D30_A95470.s | 139 ---- .../kpa_102/A93A50/func_80241F00_A95640.s | 350 ---------- .../kpa_102/A93A50/func_8024244C_A95B8C.s | 2 +- .../kpa_102/A93A50/func_80242D3C_A9647C.s | 2 +- .../kpa_102/A93A50/func_80242F74_A966B4.s | 2 +- .../kpa_111/A99590/func_80240170_A99700.s | 144 ----- .../kpa_111/A99590/func_80240360_A998F0.s | 88 --- .../kpa_111/A99590/func_802404A4_A99A34.s | 71 -- .../kpa_111/A99590/func_80241064_A9A5F4.s | 234 ------- .../kpa_115/A9ED40/func_80240170_A9EEB0.s | 144 ----- .../kpa_115/A9ED40/func_80240360_A9F0A0.s | 88 --- .../kpa_115/A9ED40/func_802404A4_A9F1E4.s | 71 -- .../kpa_115/A9ED40/func_80241064_A9FDA4.s | 234 ------- .../kpa_50/A609D0/func_80240000_A609D0.s | 144 ----- .../kpa_50/A609D0/func_802401F0_A60BC0.s | 88 --- .../kpa_50/A609D0/func_80240334_A60D04.s | 71 -- .../kpa_50/A609D0/func_80240EF4_A618C4.s | 234 ------- .../kpa_51/A640E0/func_80240050_A640E0.s | 139 ---- .../kpa_51/A640E0/func_80240220_A642B0.s | 350 ---------- .../kpa_51/A640E0/func_80240730_A647C0.s | 34 - .../kpa_51/A640E0/func_802408D0_A64960.s | 44 -- .../kpa_51/A640E0/func_80240CF4_A64D84.s | 2 +- .../kpa_51/A640E0/func_80240F20_A64FB0.s | 2 +- .../kpa_51/A640E0/func_802410BC_A6514C.s | 4 +- .../kpa_52/A671E0/func_802400E0_A671E0.s | 144 ----- .../kpa_52/A671E0/func_802402D0_A673D0.s | 88 --- .../kpa_52/A671E0/func_80240414_A67514.s | 71 -- .../kpa_52/A671E0/func_80240FD4_A680D4.s | 234 ------- .../kpa_61/A6E6F0/func_80240AE4_A6EEC4.s | 139 ---- .../kpa_61/A6E6F0/func_80240CB4_A6F094.s | 350 ---------- .../kpa_61/A6E6F0/func_80241200_A6F5E0.s | 2 +- .../kpa_61/A6E6F0/func_80241AF0_A6FED0.s | 2 +- .../kpa_61/A6E6F0/func_80241D28_A70108.s | 2 +- .../kpa_91/A86A50/func_80241224_A87C74.s | 221 ------- .../kpa_95/A8CB60/func_80241304_A8DD84.s | 221 ------- .../kzn_02/C5AC20/func_80241134_C5B874.s | 32 - .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 147 ----- .../kzn_02/C5AC20/func_80241B08_C5C248.s | 179 ------ .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 146 ----- .../kzn_04/C68440/func_80240910_C68A40.s | 356 ---------- .../kzn_07/C6EA50/func_80241474_C6F7A4.s | 32 - .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 147 ----- .../kzn_07/C6EA50/func_80241E48_C70178.s | 179 ------ .../kzn_07/C6EA50/func_80242124_C70454.s | 147 ----- .../kzn_08/C71ED0/func_802416A4_C72B24.s | 32 - .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 147 ----- .../kzn_08/C71ED0/func_80242078_C734F8.s | 179 ------ .../kzn_08/C71ED0/func_80242354_C737D4.s | 146 ----- .../kzn_09/C76CE0/func_80240600_C772E0.s | 356 ---------- .../kzn_11/C80600/func_802410B4_C81254.s | 32 - .../kzn_11/C80600/func_8024176C_C8190C.s | 147 ----- .../kzn_11/C80600/func_80241A88_C81C28.s | 179 ------ .../kzn_11/C80600/func_80241D64_C81F04.s | 146 ----- .../mim_08/BAD940/func_80240CF4_BAE634.s | 32 - .../mim_08/BAD940/func_802413AC_BAECEC.s | 147 ----- .../nok_11/9F4A40/func_80241428_9F5E68.s | 32 - .../nok_11/9F4A40/func_80241AE0_9F6520.s | 147 ----- .../nok_12/9FAD60/func_80241BD4_9FC3C4.s | 223 ------- .../nok_14/A02A00/func_802415E8_A03E28.s | 32 - .../nok_14/A02A00/func_80241CA0_A044E0.s | 147 ----- .../nok_14/A02A00/func_802421CC_A04A0C.s | 4 +- .../nok_15/A06F00/func_80241708_A08608.s | 32 - .../nok_15/A06F00/func_80241DC0_A08CC0.s | 147 ----- .../nok_15/A06F00/func_802422EC_A091EC.s | 4 +- .../omo_02/D9D510/func_80241948_D9EE18.s | 144 ----- .../omo_02/D9D510/func_80241B38_D9F008.s | 88 --- .../omo_02/D9D510/func_80241C7C_D9F14C.s | 71 -- .../omo_02/D9D510/func_8024283C_D9FD0C.s | 234 ------- .../omo_03/DA5260/func_80240104_DA5344.s | 39 -- .../omo_03/DA5260/func_80240188_DA53C8.s | 37 -- .../omo_03/DA5260/func_8024020C_DA544C.s | 45 -- .../omo_03/DA5260/func_802402B0_DA54F0.s | 66 -- .../omo_03/DA5260/func_80240538_DA5778.s | 23 - .../omo_04/DAD400/func_80240FF4_DAE3F4.s | 32 - .../omo_04/DAD400/func_802416AC_DAEAAC.s | 147 ----- .../omo_05/DB22C0/func_802416A8_DB3968.s | 32 - .../omo_05/DB22C0/func_80241D60_DB4020.s | 147 ----- .../omo_06/DB7910/func_802400E4_DB79F4.s | 39 -- .../omo_06/DB7910/func_80240168_DB7A78.s | 37 -- .../omo_06/DB7910/func_802401EC_DB7AFC.s | 45 -- .../omo_06/DB7910/func_80240290_DB7BA0.s | 66 -- .../omo_06/DB7910/func_80240518_DB7E28.s | 23 - .../omo_07/DBD2B0/func_802425CC_DBF87C.s | 32 - .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 147 ----- .../omo_08/DC43D0/func_802400E4_DC44B4.s | 39 -- .../omo_08/DC43D0/func_80240168_DC4538.s | 37 -- .../omo_08/DC43D0/func_802401EC_DC45BC.s | 45 -- .../omo_08/DC43D0/func_80240290_DC4660.s | 66 -- .../omo_08/DC43D0/func_80240518_DC48E8.s | 23 - .../omo_09/DCD6B0/func_80242358_DCF028.s | 144 ----- .../omo_09/DCD6B0/func_80242548_DCF218.s | 88 --- .../omo_09/DCD6B0/func_8024268C_DCF35C.s | 71 -- .../omo_09/DCD6B0/func_8024324C_DCFF1C.s | 234 ------- .../omo_10/DD79B0/func_802400E4_DD7A94.s | 39 -- .../omo_10/DD79B0/func_80240168_DD7B18.s | 37 -- .../omo_10/DD79B0/func_802401EC_DD7B9C.s | 45 -- .../omo_10/DD79B0/func_80240290_DD7C40.s | 66 -- .../omo_10/DD79B0/func_80240518_DD7EC8.s | 23 - .../omo_11/DDCFC0/func_80240D90_DDD5C0.s | 356 ---------- .../omo_16/DEBED0/func_802400E4_DEBFB4.s | 39 -- .../omo_16/DEBED0/func_80240168_DEC038.s | 37 -- .../omo_16/DEBED0/func_802401EC_DEC0BC.s | 45 -- .../omo_16/DEBED0/func_80240290_DEC160.s | 66 -- .../omo_16/DEBED0/func_80240518_DEC3E8.s | 23 - .../omo_17/DEEEA0/func_802400E4_DEEF84.s | 39 -- .../omo_17/DEEEA0/func_80240168_DEF008.s | 37 -- .../omo_17/DEEEA0/func_802401EC_DEF08C.s | 45 -- .../omo_17/DEEEA0/func_80240290_DEF130.s | 66 -- .../omo_17/DEEEA0/func_80240518_DEF3B8.s | 24 - .../omo_17/DEF400/func_80241C08_DF0AA8.s | 32 - .../omo_17/DEF400/func_802422C0_DF1160.s | 147 ----- .../omo_17/DEF400/func_802424AC_DF134C.s | 144 ----- .../omo_17/DEF400/func_8024269C_DF153C.s | 88 --- .../omo_17/DEF400/func_802427E0_DF1680.s | 71 -- .../omo_17/DEF400/func_802433A0_DF2240.s | 234 ------- .../pra_13/D64600/func_80241274_D65854.s | 12 +- .../pra_19/D6E9D0/func_80241274_D6FC24.s | 12 +- .../sam_06/D203E0/func_802411A4_D21034.s | 32 - .../sam_06/D203E0/func_8024185C_D216EC.s | 147 ----- .../sam_08/D2FC80/func_80240600_D30280.s | 356 ---------- .../sbk_56/953FC0/func_80240680_954640.s | 356 ---------- .../tik_07/879BE0/func_802408E0_87A4C0.s | 356 ---------- .../tik_07/87AC00/func_80242044_87BC24.s | 32 - .../tik_07/87AC00/func_802426FC_87C2DC.s | 149 ----- .../tik_10/8866D0/func_80240C80_887040.s | 356 ---------- .../tik_12/8891C0/func_8024121C_889DEC.s | 356 ---------- .../tik_17/892A50/func_80240630_893050.s | 356 ---------- .../tik_19/897BD0/func_80240BF0_8981D0.s | 356 ---------- .../trd_02/9A10C0/func_80241744_9A2724.s | 223 ------- .../trd_04/9A88A0/func_80241B14_9A9F04.s | 221 ------- .../trd_04/9A88A0/func_80242A6C_9AAE5C.s | 32 - .../trd_04/9A88A0/func_80243124_9AB514.s | 147 ----- .../trd_04/9A88A0/func_80243650_9ABA40.s | 4 +- .../trd_07/9B6C90/func_80241738_9B80B8.s | 32 - .../trd_07/9B6C90/func_80241DF0_9B8770.s | 147 ----- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 4 +- ver/us/splat.yaml | 2 + ver/us/symbol_addrs.txt | 114 ++-- ver/us/undefined_syms.txt | 9 + 531 files changed, 2218 insertions(+), 29889 deletions(-) create mode 100644 src/common/CompareFloats.inc.c create mode 100644 src/common/IsAOrBPressed.inc.c create mode 100644 src/common/SetNpcPosYaw.inc.c create mode 100644 src/common/SetPlayerStatusPosYaw.inc.c create mode 100644 src/common/UnkBufferFunc.inc.c create mode 100644 src/common/UnkEnemyPosFunc.inc.c create mode 100644 src/world/common/SixFloatsFunc.inc.c create mode 100644 src/world/common/UnkDurationCheckNoArgs.inc.c create mode 100644 src/world/common/UnkFunc57.inc.c create mode 100644 src/world/common/UnkFunc58.inc.c create mode 100644 src/world/common/UnkFunc59.inc.c create mode 100644 src/world/common/UnkFunc60.inc.c create mode 100644 src/world/common/UnkFunc61.inc.c create mode 100644 src/world/common/UnkFunc62.inc.c create mode 100644 src/world/common/UnkNpcAIFunc47.inc.c create mode 100644 src/world/common/UnkNpcAIFunc48.inc.c create mode 100644 src/world/common/UnkNpcAIFunc49.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc10.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc7.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc8.inc.c create mode 100644 src/world/common/UnkNpcAIMainFunc9.inc.c delete mode 100644 ver/us/asm/data/world/area_arn/arn_03/BE04B0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_03/BE05C0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_03/BE0950.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_04/BE6B20.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_04/BE6C30.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_04/BE77F0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_05/BE8EE0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_05/BECBE0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_07/BEEC80.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_07/BF0580.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_08/BF4A30.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_08/BF4B50.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_08/BF5210.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_08/BF5340.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_08/BF5460.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_08/BF59A0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_08/BF5FF0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_09/BF60A0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_09/BF61A0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_09/BF6400.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_09/BF6530.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_09/BF6610.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_10/BF6A00.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_10/BF6B00.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_10/BF6E30.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_10/BF75E0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_11/BF7680.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_11/BF7770.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_11/BF7D00.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_12/BF8790.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_12/BF8890.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_12/BF8BB0.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_13/BF9410.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_13/BF9510.data.s delete mode 100644 ver/us/asm/data/world/area_arn/arn_13/BF9840.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_02/C30650.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_03/C345C0.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_03/C34E50.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_05/C3C2D0.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_07/C3F3E0.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_09/C4ABE0.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_15/C513B0.data.s delete mode 100644 ver/us/asm/data/world/area_dgb/dgb_16/C53D00.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_00/C9F300.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_00/CA3D50.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_00/CA4770.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_03/CA78D0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_03/CA8150.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_03/CAC170.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_07/CAC930.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_07/CACAC0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_07/CAD410.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_08/CB1BF0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_08/CB3C80.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_08/CB46D0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_09/CB6820.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_09/CB7010.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_09/CB7880.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_10/CBA670.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_10/CBA830.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_10/CBA880.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_10/CBAEB0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_10/CBC420.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_10/CBD270.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_10/CBD290.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_11/CBDFF0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_11/CBF790.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_11/CC0DC0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_12/CC1520.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_12/CC16A0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_12/CC1C60.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_15/CD07E0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_15/CD09C0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_15/CD19A0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_15/CD1A20.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_16/CD47A0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_16/CD5E40.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_16/CD6330.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_17/CDA500.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_17/CDC560.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_18/CDCE70.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_18/CDCF60.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_18/CDD530.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_18/CE2D60.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_19/CE4030.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_19/CE41B0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_19/CE41F0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_19/CE4740.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_19/CE5160.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_21/CE7EC0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_22/CEC4D0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_22/CEC760.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_22/CED050.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_22/CED7E0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_23/CEEF30.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_23/CF0800.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_24/CF0ED0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_24/CF1680.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_24/CF2AF0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_25/CF4EA0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_25/CF6860.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_25/CF68B0.data.s delete mode 100644 ver/us/asm/data/world/area_flo/flo_25/CF7310.data.s delete mode 100644 ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s delete mode 100644 ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80218300_464790.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219824_465CB4.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s delete mode 100644 ver/us/asm/nonmatchings/effects/aura/aura_update.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241128_A496E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0_A49C70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780_A4D1A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240730_A647C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188_DA53C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C_DA544C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802402B0_DA54F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538_DA5778.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168_DB7A78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC_DB7AFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240290_DB7BA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240518_DB7E28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240168_DC4538.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802401EC_DC45BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240290_DC4660.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240518_DC48E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240168_DD7B18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802401EC_DD7B9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240290_DD7C40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240518_DD7EC8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240168_DEC038.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802401EC_DEC0BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240290_DEC160.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240518_DEC3E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240168_DEF008.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802401EC_DEF08C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240290_DEF130.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s diff --git a/include/common_structs.h b/include/common_structs.h index bb7681e0cd..a40e52d87c 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -609,7 +609,7 @@ typedef struct Shadow { /* 0x07 */ char unk_07; /* 0x08 */ s16 entityModelID; /* 0x0A */ s16 vertexSegment; - /* 0x0C */ Vtx_tn** vertexArray; + /* 0x0C */ Vtx* vertexArray; /* 0x10 */ Vec3f position; /* 0x1C */ Vec3f scale; /* 0x28 */ Vec3f rotation; @@ -1789,7 +1789,10 @@ typedef struct ActorState { // TODO: Make the first field of this an ActorMoveme /* 0x00 */ Vec3f currentPos; /* 0x0C */ Vec3f goalPos; /* 0x18 */ Vec3f unk_18; - /* 0x24 */ char unk_24[24]; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ char unk_2C[0x4]; + /* 0x30 */ Vec3f unk_30; /* 0x3C */ f32 acceleration; /* 0x40 */ f32 speed; /* 0x44 */ f32 velocity; diff --git a/include/dead.h b/include/dead.h index a6fc6eab2c..dff53137cb 100644 --- a/include/dead.h +++ b/include/dead.h @@ -26,6 +26,7 @@ #define dist2D dead_dist2D #define sin_deg dead_sin_deg #define cos_deg dead_cos_deg +#define sin_cos_deg dead_sin_cos_deg #define gPlayerStatus dead_gPlayerStatus #define gPlayerActionState dead_gPlayerActionState #define is_point_within_region dead_is_point_within_region @@ -48,6 +49,7 @@ #define sfx_adjust_env_sound_pos dead_sfx_adjust_env_sound_pos #define fx_star_spirits_energy dead_fx_star_spirits_energy #define heap_malloc dead_heap_malloc +#define general_heap_malloc dead_general_heap_malloc #define update_lerp dead_update_lerp #define create_shadow_type dead_create_shadow_type #define fx_spirit_card dead_fx_spirit_card @@ -99,5 +101,6 @@ #define func_8004A124 func_8004E544 #define func_8004A3E8 func_8004E808 #define gCurrentEncounter dead_gCurrentEncounter +#define fx_motion_blur_flame dead_fx_motion_blur_flame #endif diff --git a/include/effects.h b/include/effects.h index 78e7b7be6d..2d78760807 100644 --- a/include/effects.h +++ b/include/effects.h @@ -536,7 +536,7 @@ typedef struct SleepBubbleFXData { } SleepBubbleFXData; // size = 0xCC typedef struct AuraFXData { - /* 0x00 */ s32 unk_00; + /* 0x00 */ s32 type; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 unk_10; /* 0x14 */ f32 unk_14; diff --git a/include/functions.h b/include/functions.h index 93f1de1a65..dee6da85d6 100644 --- a/include/functions.h +++ b/include/functions.h @@ -17,10 +17,15 @@ void nuBoot(void); void boot_idle(void); void boot_main(void); +void is_debug_init(void); + f32 signF(f32 val); +void func_8002D160(void); + void* heap_malloc(s32 size); void* _heap_malloc(HeapNode* head, u32 size); +void* _heap_malloc_tail(HeapNode* head, u32 size); u32 _heap_free(HeapNode* heapNodeList, void* addrToFree); void* _heap_realloc(HeapNode* heapNodeList, void* addr, u32 newSize); HeapNode* _heap_create(HeapNode* addr, u32 size); @@ -84,6 +89,8 @@ 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); + //pause void pause_init(void); void pause_handle_input(s32 buttonsPressed, s32 buttonsHeld); @@ -96,6 +103,8 @@ void filemenu_set_cursor_goal_pos(s32 windowIndex, s32 posX, s32 posY); Message* filemenu_get_menu_message(s32 idx); void filemenu_draw_message(Message*, s32 posX, s32 posY, s32 alpha, s32 color, s32 flags); +void gfx_task_background(void); + void update_enemy_shadows(void); void update_hero_shadows(void); @@ -617,7 +626,10 @@ void state_step_demo(void); void state_drawUI_demo(void); void game_mode_set_fpDrawAuxUI(s32 i, void (*fn)(void)); +void func_802B2000(void); +void func_802B203C(void); void func_802B2078(void); +void func_802B20B4(void); void initialize_curtains(void); void update_curtains(void); diff --git a/include/model.h b/include/model.h index 21edd25fea..ce46abfd71 100644 --- a/include/model.h +++ b/include/model.h @@ -161,8 +161,12 @@ void animator_update_model_transforms(ModelAnimator* animator, Mtx* rootTransfor void render_animated_model(s32 animatorID, Mtx* rootTransform); void animator_node_update_model_transform(ModelAnimator* animator, f32 (*flipMtx)[4], AnimatorNode* node, Mtx* rootTransform); +void delete_model_animator_node(AnimatorNode* node); +void delete_model_animator_nodes(ModelAnimator* animator); +void delete_model_animator(ModelAnimator* animator); +void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 vtxSegment, Vtx* vertexArray); void appendGfx_animator(ModelAnimator* animator); +ModelAnimator* set_animator_render_callback(s32 animModelID, s32 callbackArg, s32 callbackFunc); void reload_mesh_animator_tree(ModelAnimator* animator); s32 step_mesh_animator(ModelAnimator* animator); - #endif diff --git a/src/23680.c b/src/23680.c index 4335e674a7..704abda9af 100644 --- a/src/23680.c +++ b/src/23680.c @@ -220,12 +220,12 @@ s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3) { add_vec2D_polar(&f1, &f2, arg3, 270.0f - npc->renderYaw); if (dist2D(f1, f2, playerStatus->position.x, playerStatus->position.z) <= arg2) { - return 1; + return TRUE; } } } - return 0; + return FALSE; } void ai_enemy_play_sound(Npc* npc, s32 arg1, s32 arg2) { diff --git a/src/EC9D00.c b/src/EC9D00.c index ab898fac78..5160ae44ed 100644 --- a/src/EC9D00.c +++ b/src/EC9D00.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "EC9D00", func_802401CC_EC9ECC); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "EC9D00", func_80240600_ECA300); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/ED0310.c b/src/ED0310.c index b70ecafb40..442c84a6b0 100644 --- a/src/ED0310.c +++ b/src/ED0310.c @@ -5,8 +5,6 @@ #define NAMESPACE ED0310 -extern f32 D_8024365C_ED364C[]; - #include "world/common/UnkNpcAIFunc23.inc.c" #include "world/common/UnkNpcAIFunc35.inc.c" @@ -17,15 +15,7 @@ extern f32 D_8024365C_ED364C[]; #include "world/common/UnkNpcAIFunc2.inc.c" -void func_80240F74_ED0F64(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += D_8024365C_ED364C[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" diff --git a/src/EDEA00.c b/src/EDEA00.c index 39c6227714..1b1ea74c85 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -5,8 +5,6 @@ #define NAMESPACE EDEA00 -extern f32 D_802441DC_EE2B9C[]; - #include "world/common/UnkFunc41.inc.c" #include "world/common/UnkNpcAIFunc23.inc.c" @@ -19,15 +17,7 @@ extern f32 D_802441DC_EE2B9C[]; #include "world/common/UnkNpcAIFunc2.inc.c" -void func_80240E18_EDF7D8(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += D_802441DC_EE2B9C[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" diff --git a/src/EE70C0.c b/src/EE70C0.c index a4050b6a34..c4a2df0ccd 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -6,7 +6,6 @@ #define NAMESPACE EE70C0 extern const s32 D_802453E0_EEB990[]; -extern f32 D_802444F0_EEAAA0[]; INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0); //#include "world/common/UnkNpcAIFunc23.inc.c" @@ -19,15 +18,7 @@ INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0); #include "world/common/UnkNpcAIFunc2.inc.c" -void func_80241764_EE7D14(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += D_802444F0_EEAAA0[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -66,7 +57,7 @@ ApiStatus func_802422EC_EE889C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -extern EE65B0_UnkTexturePanFunc; +extern ApiStatus EE65B0_UnkTexturePanFunc; // TODO sort out this mess const s32 D_802453E0_EEB990[] = { 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, &EE65B0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000, }; diff --git a/src/EED1E0.c b/src/EED1E0.c index 00a0c77f2c..48aeb9e4c5 100644 --- a/src/EED1E0.c +++ b/src/EED1E0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "EED1E0", func_802402AC_EED3AC); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "EED1E0", func_802406E0_EED7E0); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/EEDF50.c b/src/EEDF50.c index 2d8c6f5159..730d3f6124 100644 --- a/src/EEDF50.c +++ b/src/EEDF50.c @@ -5,8 +5,6 @@ #define NAMESPACE EEDF50 -extern f32 D_80244070_EF1170[]; - #include "world/common/UnkNpcAIFunc23.inc.c" #include "world/common/UnkNpcAIFunc35.inc.c" @@ -17,15 +15,7 @@ extern f32 D_80244070_EF1170[]; #include "world/common/UnkNpcAIFunc2.inc.c" -void func_80241AA4_EEEBA4(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += D_80244070_EF1170[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" diff --git a/src/EF2680.c b/src/EF2680.c index 5f3deb821b..794b519fa7 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -15,17 +15,7 @@ #include "world/common/UnkNpcAIFunc2.inc.c" -extern f32 D_802444BC_EF6ACC[]; - -void func_80240CC4_EF32D4(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += D_802444BC_EF6ACC[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index fe80224e4e..32dcf98963 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1034,6 +1034,7 @@ s32 entity_get_collision_flags(Entity* entity); void entity_free_static_data(EntityBlueprint* data); void update_entity_shadow_position(Entity* entity); s32 entity_raycast_down(f32* x, f32* y, f32* z, f32* hitYaw, f32* hitPitch, f32* hitLength); +void func_80117D00(Model* model); void load_model_transforms(ModelNode* model, ModelNode* parent, Matrix4f mdlTxMtx, s32 treeDepth); void enable_transform_group(u16 modelID); @@ -2914,6 +2915,7 @@ ModelTransformGroup* get_transform_group(s32 index) { return (*gCurrentTransformGroups)[index]; } +void func_8011B1D8(ModelNode*); INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B1D8); void make_transform_group(u16 modelID) { diff --git a/src/actor_api.c b/src/actor_api.c index e9ee82b637..18e31a21a3 100644 --- a/src/actor_api.c +++ b/src/actor_api.c @@ -2031,7 +2031,7 @@ ApiStatus SummonEnemy(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - script->functionTemp[1] = create_actor(evt_get_variable(script, *args++)); + script->functionTempActor[1] = create_actor((struct FormationRow*)evt_get_variable(script, *args++)); script->functionTemp[2] = evt_get_variable(script, *args++); script->functionTemp[0] = 1; break; diff --git a/src/battle/area_kpa3/6BBC60.c b/src/battle/area_kpa3/6BBC60.c index d885813425..ff55f0e6ff 100644 --- a/src/battle/area_kpa3/6BBC60.c +++ b/src/battle/area_kpa3/6BBC60.c @@ -2,7 +2,7 @@ #define NAMESPACE b_area_kpa3 -INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802180D0_6BBC60); +#include "world/common/UnkFunc62.inc.c" #include "common/ActorJumpToPos.inc.c" diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area_mac/actor/lee.c index 384fa78b56..c195416207 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area_mac/actor/lee.c @@ -754,8 +754,8 @@ EvtScript N(8021F5F8) = { ApiStatus func_80218100_464590(Evt*, s32); INCLUDE_ASM(s32, "battle/area_mac/actor/lee", func_80218100_464590); -ApiStatus func_80218300_464790(Evt*, s32); -INCLUDE_ASM(s32, "battle/area_mac/actor/lee", func_80218300_464790); + +#include "world/common/UnkFunc62.inc.c" #include "common/ActorJumpToPos.inc.c" @@ -784,7 +784,7 @@ EvtScript N(8021F6E0) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 5) EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk) - EVT_CALL(func_80218300_464790, LW(10), 0) + EVT_CALL(N(UnkFunc62), LW(10), 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), 0, 0, 1, 16) EVT_SWITCH(LW(0)) EVT_CASE_OR_EQ(6) @@ -843,7 +843,7 @@ EvtScript N(8021F6E0) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk) - EVT_CALL(func_80218300_464790, LW(10), 3) + EVT_CALL(N(UnkFunc62), LW(10), 3) EVT_CASE_EQ(1) EVT_THREAD EVT_WAIT_FRAMES(4) @@ -857,7 +857,7 @@ EvtScript N(8021F6E0) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnableActorBlur, -127, 1) EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk) - EVT_CALL(func_80218300_464790, LW(10), 3) + EVT_CALL(N(UnkFunc62), LW(10), 3) EVT_CALL(EnableActorBlur, -127, 0) EVT_CASE_EQ(2) EVT_THREAD @@ -881,7 +881,7 @@ EvtScript N(8021F6E0) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnableActorBlur, -127, 1) EVT_CALL(SetJumpAnimations, ACTOR_SELF, 1, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk, NPC_ANIM_battle_goombario_default_headbonk) - EVT_CALL(func_80218300_464790, LW(10), 3) + EVT_CALL(N(UnkFunc62), LW(10), 3) EVT_CALL(EnableActorBlur, -127, 0) EVT_END_SWITCH EVT_CHILD_THREAD @@ -1968,7 +1968,7 @@ ActorPartBlueprint N(partsTable_8022348C)[] = { extern EvtScript N(init_Parakarry); -ActorBlueprint N(parakerry) = { +ActorBlueprint N(parakarry) = { .flags = ACTOR_FLAG_FLYING, .type = ACTOR_TYPE_LEE_PARAKARRY, .level = 0, @@ -2254,8 +2254,8 @@ EvtScript N(nextTurn_80224320) = { EVT_END }; -Formation N(formation_parakerry) = { - { .actor = &N(parakerry), .home = { .vec = &N(vector3D_8021E940) }} +Formation N(formation_parakarry) = { + { .actor = &N(parakarry), .home = { .vec = &N(vector3D_8021E940) }} }; s32 N(idleAnimations_80224410)[] = { @@ -3984,8 +3984,41 @@ ApiStatus func_802197B8_465C48(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80219824_465CB4(Evt* script, s32 isInitialCall); -INCLUDE_ASM(s32, "battle/area_mac/actor/lee", func_80219824_465CB4); +ApiStatus func_80219824_465CB4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 partnerID = evt_get_variable(script, *args++); + Actor* actor = get_actor(script->owner1.enemyID); + FormationRow* formation = NULL; + + switch (partnerID) { + case PARTNER_GOOMBARIO: + formation = N(formation_goombario); + break; + case PARTNER_KOOPER: + formation = N(formation_kooper); + break; + case PARTNER_BOMBETTE: + formation = N(formation_bombette); + break; + case PARTNER_PARAKARRY: + formation = N(formation_parakarry); + break; + case PARTNER_BOW: + formation = N(formation_bow); + break; + case PARTNER_WATT: + formation = N(formation_watt); + break; + case PARTNER_SUSHIE: + formation = N(formation_sushie); + break; + case PARTNER_LAKILESTER: + formation = N(formation_lakilester); + break; + } + formation->priority = actor->turnPriority + 10; + return ApiStatus_DONE2; +} EvtScript N(copyPartner) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -4029,7 +4062,7 @@ EvtScript N(copyPartner) = { EVT_CASE_EQ(3) EVT_CALL(SummonEnemy, EVT_ADDR(N(formation_bombette)), 0) EVT_CASE_EQ(4) - EVT_CALL(SummonEnemy, EVT_ADDR(N(formation_parakerry)), 0) + EVT_CALL(SummonEnemy, EVT_ADDR(N(formation_parakarry)), 0) EVT_CASE_EQ(9) EVT_CALL(SummonEnemy, EVT_ADDR(N(formation_bow)), 0) EVT_CASE_EQ(6) diff --git a/src/battle/area_pra3/669D80.c b/src/battle/area_pra3/669D80.c index 9b946d141a..f13277acec 100644 --- a/src/battle/area_pra3/669D80.c +++ b/src/battle/area_pra3/669D80.c @@ -2,7 +2,7 @@ #define NAMESPACE b_area_pra3 -INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218000_669D80); +#include "world/common/UnkFunc62.inc.c" #include "common/ActorJumpToPos.inc.c" @@ -42,7 +42,7 @@ ApiStatus func_80219304_66B084(Evt* script, s32 isInitialCall) { if (unkDuplighost->effect2 != NULL) { unkDuplighost->effect2->flags |= 0x10; } - + return ApiStatus_DONE2; } @@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802193F0_66B170); ApiStatus func_802194B8_66B238(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - + evt_set_variable(script, *args++, gPlayerData.currentPartner); evt_set_variable(script, *args++, gPlayerData.partners[gPlayerData.currentPartner].level); return ApiStatus_DONE2; diff --git a/src/battle/area_sam/623BA0.c b/src/battle/area_sam/623BA0.c index 7d5656ee9e..7ade812116 100644 --- a/src/battle/area_sam/623BA0.c +++ b/src/battle/area_sam/623BA0.c @@ -3,7 +3,7 @@ #define NAMESPACE b_area_sam -INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218000_623BA0); +#include "world/common/UnkFunc62.inc.c" #include "common/ActorJumpToPos.inc.c" @@ -49,7 +49,7 @@ ApiStatus func_80219304_624EA4(Evt* script, s32 isInitialCall) { if (unkDuplighost->effect2 != NULL) { unkDuplighost->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; } - + return ApiStatus_DONE2; } @@ -83,7 +83,7 @@ ApiStatus func_802193F0_624F90(Evt* script, s32 isInitialCall) { ApiStatus func_802194B8_625058(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - + evt_set_variable(script, *args++, gPlayerData.currentPartner); evt_set_variable(script, *args++, gPlayerData.partners[gPlayerData.currentPartner].level); return ApiStatus_DONE2; diff --git a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c index 859019e400..cc46449bc4 100644 --- a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c @@ -154,8 +154,7 @@ BSS static char pad; #include "common/UnkEnemyFunc.inc.c" -ApiStatus func_80219530_4B2720(Evt* script, s32 isInitialCall); -INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_80219530_4B2720); +#include "common/UnkEnemyPosFunc.inc.c" #include "common/GetLastActorEventType.inc.c" @@ -266,7 +265,7 @@ EvtScript N(8022B6E8) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_80219530_4B2720, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_A) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022B6D0))) @@ -305,7 +304,7 @@ EvtScript N(8022B6E8) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_80219530_4B2720, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_E) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022B6D0))) diff --git a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c index 1395c92b12..489610cda8 100644 --- a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c @@ -154,8 +154,7 @@ BSS static char pad; #include "common/UnkEnemyFunc.inc.c" -ApiStatus func_802185B0_4B17A0(Evt* script, s32 isInitialCall); -INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_802185B0_4B17A0); +#include "common/UnkEnemyPosFunc.inc.c" #include "common/GetLastActorEventType.inc.c" @@ -266,7 +265,7 @@ EvtScript N(802257A8) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_802185B0_4B17A0, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_A) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_80225790))) @@ -305,7 +304,7 @@ EvtScript N(802257A8) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_802185B0_4B17A0, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_E) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_80225790))) diff --git a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c index b1edec2ea1..b842ca6be6 100644 --- a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c @@ -154,8 +154,7 @@ BSS static char pad; #include "common/UnkEnemyFunc.inc.c" -ApiStatus func_80218D70_4B1F60(Evt* script, s32 isInitialCall); -INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80218D70_4B1F60); +#include "common/UnkEnemyPosFunc.inc.c" #include "common/GetLastActorEventType.inc.c" @@ -266,7 +265,7 @@ EvtScript N(80228748) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_80218D70_4B1F60, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_A) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_80228730))) @@ -305,7 +304,7 @@ EvtScript N(80228748) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_80218D70_4B1F60, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_E) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_80228730))) diff --git a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c index abd9f3a882..e6f694a53e 100644 --- a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c +++ b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c @@ -154,8 +154,7 @@ BSS static char pad; #include "common/UnkEnemyFunc.inc.c" -ApiStatus func_80219CF0_4B2EE0(Evt* script, s32 isInitialCall); -INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_80219CF0_4B2EE0); +#include "common/UnkEnemyPosFunc.inc.c" #include "common/GetLastActorEventType.inc.c" @@ -266,7 +265,7 @@ EvtScript N(8022E688) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_80219CF0_4B2EE0, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_A) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022E670))) @@ -305,7 +304,7 @@ EvtScript N(8022E688) = { EVT_SET(LF(0), 1) EVT_END_IF EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) - EVT_CALL(func_80219CF0_4B2EE0, LW(0), LW(1), LW(2)) + EVT_CALL(N(UnkEnemyPosFunc), LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_E) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022E670))) diff --git a/src/battle/battle.h b/src/battle/battle.h index c66d5c441c..8d9c7c4166 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -266,7 +266,9 @@ typedef struct FormationRow { /* 0x10 */ s32 var1; /* 0x14 */ s32 var2; /* 0x18 */ s32 var3; -} Formation[]; // size = 0x1C * n +} FormationRow; // size = 0x1C * n + +typedef FormationRow Formation[]; typedef struct Stage { /* 0x00 */ const char* texture; @@ -334,5 +336,6 @@ extern ActorOffsets bActorOffsets[ACTOR_TYPE_COUNT]; void func_80072BCC(s32 arg0); void load_demo_battle(u32 index); +Actor* create_actor(Formation formation); #endif diff --git a/src/common/CompareFloats.inc.c b/src/common/CompareFloats.inc.c new file mode 100644 index 0000000000..f42789cc82 --- /dev/null +++ b/src/common/CompareFloats.inc.c @@ -0,0 +1,14 @@ +#include "common.h" + +ApiStatus N(CompareFloats)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 temp_f20 = evt_get_float_variable(script, *args++); + f32 temp = evt_get_float_variable(script, *args++); + + if (temp < temp_f20) { + evt_set_variable(script, *args++, TRUE); + } else { + evt_set_variable(script, *args++, FALSE); + } + return ApiStatus_DONE2; +} diff --git a/src/common/IsAOrBPressed.inc.c b/src/common/IsAOrBPressed.inc.c new file mode 100644 index 0000000000..89a6af0822 --- /dev/null +++ b/src/common/IsAOrBPressed.inc.c @@ -0,0 +1,12 @@ +#include "common.h" + +ApiStatus N(IsAOrBPressed)(Evt* script, s32 isInitialCall) { + script->varTable[0] = FALSE; + if (gGameStatusPtr->pressedButtons & BUTTON_A) { + script->varTable[0] = TRUE; + } + if (gGameStatusPtr->pressedButtons & BUTTON_B) { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} diff --git a/src/common/IsSaveVar123.inc.c b/src/common/IsSaveVar123.inc.c index 2ff6cf6ee0..2e362df005 100644 --- a/src/common/IsSaveVar123.inc.c +++ b/src/common/IsSaveVar123.inc.c @@ -1,5 +1,4 @@ #include "common.h" -#include "npc.h" ApiStatus N(IsSaveVar123)(Evt* script, s32 isInitialCall) { script->varTable[0] = 0; diff --git a/src/common/SetNpcPosYaw.inc.c b/src/common/SetNpcPosYaw.inc.c new file mode 100644 index 0000000000..489425f1bc --- /dev/null +++ b/src/common/SetNpcPosYaw.inc.c @@ -0,0 +1,21 @@ +#include "common.h" + +ApiStatus N(SetNpcPosYaw)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + f32 x = evt_get_float_variable(script, *args++); + f32 y = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); + f32 yaw = evt_get_float_variable(script, *args++); + Npc* npc = get_npc_safe(npcID); + + npc->pos.x = x; + npc->pos.y = y; + npc->pos.z = z; + npc->yaw = yaw; + npc->colliderPos.x = npc->pos.x; + npc->colliderPos.y = npc->pos.y; + npc->colliderPos.z = npc->pos.z; + npc->flags |= NPC_FLAG_DIRTY_SHADOW; + return ApiStatus_DONE2; +} diff --git a/src/common/SetPlayerStatusPosYaw.inc.c b/src/common/SetPlayerStatusPosYaw.inc.c new file mode 100644 index 0000000000..70d3e860fa --- /dev/null +++ b/src/common/SetPlayerStatusPosYaw.inc.c @@ -0,0 +1,15 @@ +#include "common.h" + +ApiStatus N(SetPlayerStatusPosYaw)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 x = evt_get_float_variable(script, *args++); + f32 y = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); + f32 yaw = evt_get_float_variable(script, *args++); + + gPlayerStatus.position.x = x; + gPlayerStatus.position.y = y; + gPlayerStatus.position.z = z; + gPlayerStatus.targetYaw = yaw; + return ApiStatus_DONE2; +} diff --git a/src/common/UnkBufferFunc.inc.c b/src/common/UnkBufferFunc.inc.c new file mode 100644 index 0000000000..b077c11300 --- /dev/null +++ b/src/common/UnkBufferFunc.inc.c @@ -0,0 +1,10 @@ +#include "common.h" + +ApiStatus N(UnkBufferFunc)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 temp_s1 = evt_get_variable(script, *args++); + s32 temp_s0_3 = evt_get_variable(script, *args++); + + script->buffer = &script->buffer[temp_s1 + (temp_s0_3 * evt_get_variable(script, *args++))]; + return ApiStatus_DONE2; +} diff --git a/src/common/UnkEnemyPosFunc.inc.c b/src/common/UnkEnemyPosFunc.inc.c new file mode 100644 index 0000000000..a8955dfdf4 --- /dev/null +++ b/src/common/UnkEnemyPosFunc.inc.c @@ -0,0 +1,133 @@ +#include "common.h" + +ApiStatus N(UnkEnemyPosFunc)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Vec3f temp; + Vec3f homePoses[4]; + s32 temp_s1; + s32 temp_v1; + Actor* enemy; + Vec3f* iVec; + Vec3f* jVec; + s32 i, j; + + temp_s1 = get_actor(ACTOR_ENEMY4)->state.varTable[3]; + switch (temp_s1) { + case 2: + enemy = N(UnkEnemyFunc(3)); + homePoses[0].x = enemy->homePos.x; + homePoses[0].y = enemy->homePos.y; + homePoses[0].z = enemy->homePos.z; + enemy = N(UnkEnemyFunc(6)); + homePoses[1].x = enemy->homePos.x; + homePoses[1].y = enemy->homePos.y; + homePoses[1].z = enemy->homePos.z; + break; + case 3: + enemy = N(UnkEnemyFunc(3)); + homePoses[0].x = enemy->homePos.x; + homePoses[0].y = enemy->homePos.y; + homePoses[0].z = enemy->homePos.z; + enemy = N(UnkEnemyFunc(5)); + homePoses[1].x = enemy->homePos.x; + homePoses[1].y = enemy->homePos.y; + homePoses[1].z = enemy->homePos.z; + enemy = N(UnkEnemyFunc(6)); + homePoses[2].x = enemy->homePos.x; + homePoses[2].y = enemy->homePos.y; + homePoses[2].z = enemy->homePos.z; + break; + case 4: + enemy = N(UnkEnemyFunc(3)); + homePoses[0].x = enemy->homePos.x; + homePoses[0].y = enemy->homePos.y; + homePoses[0].z = enemy->homePos.z; + enemy = N(UnkEnemyFunc(4)); + homePoses[1].x = enemy->homePos.x; + homePoses[1].y = enemy->homePos.y; + homePoses[1].z = enemy->homePos.z; + enemy = N(UnkEnemyFunc(5)); + homePoses[2].x = enemy->homePos.x; + homePoses[2].y = enemy->homePos.y; + homePoses[2].z = enemy->homePos.z; + enemy = N(UnkEnemyFunc(6)); + homePoses[3].x = enemy->homePos.x; + homePoses[3].y = enemy->homePos.y; + homePoses[3].z = enemy->homePos.z; + break; + } + + for (i = 0; i < temp_s1 - 1; i++) { + for (j = i; j < temp_s1; j++) { + iVec = &homePoses[i]; + jVec = &homePoses[j]; + if (iVec->x < jVec->x) { + temp = *iVec; + *iVec = *jVec; + *jVec = temp; + } + } + } + + temp_v1 = get_actor(script->owner1.enemyID)->state.varTable[1]; + switch (temp_s1) { + case 2: + switch (temp_v1) { + case 3: + evt_set_variable(script, *args++, homePoses[0].x); + evt_set_variable(script, *args++, homePoses[0].y); + evt_set_variable(script, *args++, homePoses[0].z); + break; + case 6: + evt_set_variable(script, *args++, homePoses[1].x); + evt_set_variable(script, *args++, homePoses[1].y); + evt_set_variable(script, *args++, homePoses[1].z); + break; + } + break; + case 3: + switch (temp_v1) { + case 3: + evt_set_variable(script, *args++, homePoses[0].x); + evt_set_variable(script, *args++, homePoses[0].y); + evt_set_variable(script, *args++, homePoses[0].z); + break; + case 5: + evt_set_variable(script, *args++, homePoses[1].x); + evt_set_variable(script, *args++, homePoses[1].y); + evt_set_variable(script, *args++, homePoses[1].z); + break; + case 6: + evt_set_variable(script, *args++, homePoses[2].x); + evt_set_variable(script, *args++, homePoses[2].y); + evt_set_variable(script, *args++, homePoses[2].z); + break; + } + break; + case 4: + switch (temp_v1) { + case 3: + evt_set_variable(script, *args++, homePoses[0].x); + evt_set_variable(script, *args++, homePoses[0].y); + evt_set_variable(script, *args++, homePoses[0].z); + break; + case 4: + evt_set_variable(script, *args++, homePoses[1].x); + evt_set_variable(script, *args++, homePoses[1].y); + evt_set_variable(script, *args++, homePoses[1].z); + break; + case 5: + evt_set_variable(script, *args++, homePoses[2].x); + evt_set_variable(script, *args++, homePoses[2].y); + evt_set_variable(script, *args++, homePoses[2].z); + break; + case 6: + evt_set_variable(script, *args++, homePoses[3].x); + evt_set_variable(script, *args++, homePoses[3].y); + evt_set_variable(script, *args++, homePoses[3].z); + break; + } + break; + } + return ApiStatus_DONE2; +} diff --git a/src/effects/aura.c b/src/effects/aura.c index 526c287b8a..4ac661eb96 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -41,19 +41,21 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* effect = shim_create_effect_instance(bpPtr); effect->numParts = numParts; - + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data != NULL); part->unk_64.s = 0; + zero = part->unk_64.f; part->unk_40 = zero; part->unk_34 = zero; part->unk_58 = zero; part->unk_4C = zero; + part->unk_2C = 100; - part->unk_00 = arg0; + part->type = arg0; part->unk_30 = 0; part->unk_28 = 0; part->pos.x = arg1; @@ -70,8 +72,8 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* part->unk_6D = 155; part->unk_6E = 0; part->unk_24 = arg4; - part->unk_20 = 0.6 * arg4; - part->unk_1C = 2.0 * arg4; + part->unk_20 = arg4 * 0.6; + part->unk_1C = arg4 * 2.0; part->unk_38 = -0.9f; part->unk_44 = 0.04f; part->unk_3C = 0.04f; @@ -132,8 +134,8 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* part->unk_1C = arg4; part->unk_20 = arg4; part->unk_24 = arg4; - part->unk_38 = 0; - part->unk_50 = 0; + part->unk_38 = 0.0f; + part->unk_50 = 0.0f; part->unk_44 = 0.04f; part->unk_3C = 0.1f; part->unk_48 = 1.7f; @@ -153,7 +155,94 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* void aura_init(EffectInstance* effect) { } -INCLUDE_ASM(s32, "effects/aura", aura_update); +void aura_update(EffectInstance* effect) { + AuraFXData* data; + s32 type; + s32 unk_2C; + s32 unk_30; + + data = effect->data; + if (effect->flags & 0x10) { + effect->flags &= ~0x10; + data->unk_2C = 5; + } + + data->unk_30++; + if (data->unk_30 > 324000) { + data->unk_30 = 256; + } + + if (data->unk_2C <= 10) { + data->unk_2C--; + } + + if (data->unk_2C < 0) { + shim_remove_effect(effect); + return; + } + + type = data->type; + unk_2C = data->unk_2C; + unk_30 = data->unk_30; + + if (type < 2) { + if (unk_30 <= 10) { + data->unk_28 += (128 - data->unk_28) * 0.5; + } + } else { + if (unk_30 <= 10) { + data->unk_28 = (unk_30 * 0xFF) / 10; + } + } + + if (unk_2C < 10) { + data->unk_28 *= 0.5; + } + + if (type == 0) { + data->unk_38 += (data->unk_3C - data->unk_38) * 0.02; + data->unk_44 += (data->unk_48 - data->unk_44) * 0.02; + data->unk_1C += (data->unk_24 - data->unk_1C) * 0.04; + data->unk_20 += (data->unk_24 - data->unk_20) * 0.04; + } else { + data->unk_38 += (data->unk_3C - data->unk_38) * 0.02; + data->unk_44 += (data->unk_48 - data->unk_44) * 0.02; + data->unk_50 += (data->unk_54 - data->unk_50) * 0.02; + data->unk_5C += (data->unk_60 - data->unk_5C) * 0.02; + } + + data->unk_34 += data->unk_38; + if (data->unk_34 < 0.0f) { + data->unk_34 += 64.0f; + } else if (data->unk_34 > 64.0f) { + data->unk_34 -= 64.0f; + } + + data->unk_40 += data->unk_44; + if (data->unk_40 < 0.0f) { + data->unk_40 += 128.0f; + } else if (data->unk_40 > 128.0f) { + data->unk_40 -= 128.0f; + } + + data->unk_4C += data->unk_50; + if (data->unk_4C < 0.0f) { + data->unk_4C += 64.0f; + } else if (data->unk_4C > 64.0f) { + data->unk_4C -= 64.0f; + } + + data->unk_58 += data->unk_5C; + if (data->unk_58 < 0.0f) { + data->unk_58 += 128.0f; + } else if (data->unk_58 > 128.0f) { + data->unk_58 -= 128.0f; + } + + data->unk_10 += (data->pos.x - data->unk_10) * 0.1; + data->unk_14 += (data->pos.y - data->unk_14) * 0.1; + data->unk_18 += (data->pos.z - data->unk_18) * 0.1; +} void aura_render(EffectInstance* effect) { RenderTask renderTask; diff --git a/src/world/area_arn/arn_02/arn_02.h b/src/world/area_arn/arn_02/arn_02.h index 04bc9fef6f..7883a1345d 100644 --- a/src/world/area_arn/arn_02/arn_02.h +++ b/src/world/area_arn/arn_02/arn_02.h @@ -7,7 +7,6 @@ #define NAMESPACE arn_02 -s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3); ApiStatus N(func_80240C90_BDDE40)(Evt *script, s32 isInitialCall); extern EvtScript N(main); diff --git a/src/world/area_arn/arn_04/arn_04.h b/src/world/area_arn/arn_04/arn_04.h index 9aa3a88180..066e42eb19 100644 --- a/src/world/area_arn/arn_04/arn_04.h +++ b/src/world/area_arn/arn_04/arn_04.h @@ -7,9 +7,8 @@ #define NAMESPACE arn_04 -s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3); ApiStatus N(UnkNpcAIMainFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(func_8024219C_BE594C)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); ApiStatus N(func_80243018_BE67C8)(Evt* script, s32 isInitialCall); extern EvtScript N(main); diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index 6d7788d3a3..0109415a7d 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -63,11 +63,57 @@ NpcSettings N(npcSettings_802436B0) = { .level = 12, }; -f32 N(D_802436DC_BE6E8C)[] = { +#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/UnkNpcAIMainFunc.inc.c" + +#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" + +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; +#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" + NpcAISettings N(npcAISettings_802436F4) = { .moveSpeed = 1.8f, .moveTime = 60, @@ -86,7 +132,7 @@ EvtScript N(npcAI_80243724) = { EVT_CALL(SetSelfVar, 5, -850) EVT_CALL(SetSelfVar, 6, 60) EVT_CALL(SetSelfVar, 1, 700) - EVT_CALL(N(func_8024219C_BE594C), EVT_PTR(N(npcAISettings_802436F4))) + EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_802436F4))) EVT_RETURN EVT_END }; @@ -288,118 +334,6 @@ EvtScript N(makeEntities) = { EVT_END }; -#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/UnkNpcAIMainFunc.inc.c" - -#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" - -void N(func_80241AE4_BE5294)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} - -#include "world/common/UnkNpcAIFunc14.inc.c" - -#include "world/common/UnkNpcAIFunc3.inc.c" - -#include "world/common/UnkFunc6.inc.c" - -#include "world/common/UnkFunc5.inc.c" - -ApiStatus N(func_8024219C_BE594C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80241AE4_BE5294)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 12: - N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 13: - N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 14: - N(UnkFunc6)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - } - - return ApiStatus_BLOCK; -} - s32 N(func_80242388_BE5B38)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); diff --git a/src/world/area_arn/arn_07/arn_07.h b/src/world/area_arn/arn_07/arn_07.h index f01e8cf914..d88e80851a 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(func_80241C5C_BEEA4C)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc9)(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 4ade795a78..c513d5eea1 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(D_80243BC0_BF09B0)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -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(func_80241C5C_BEEA4C), EVT_PTR(N(npcAISettings_80243BD8))) + EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_80243BD8))) EVT_RETURN EVT_END }; @@ -1207,21 +1207,13 @@ NpcGroupList N(npcGroupList_802478E8) = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_802415A4_BEE394)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_80243BC0_BF09B0)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -1231,65 +1223,7 @@ void N(func_802415A4_BEE394)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_80241C5C_BEEA4C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_802415A4_BEE394)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 12: - N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 13: - N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - case 14: - N(UnkFunc6)(script, aiSettings, territoryPtr); - return ApiStatus_BLOCK; - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" ApiStatus PostChapter3StatUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 6c30884ba4..9e7b3e632a 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -3,6 +3,7 @@ #include "sprite/npc/world_tubba.h" #include "message_ids.h" #include "effects.h" +#include "world/partners.h" EntryList N(entryList) = { { 0.0f, 0.0f, 485.0f, 0.0f }, @@ -477,7 +478,7 @@ EvtScript N(makeEntities) = { EVT_END }; -f32 N(D_80244CD0_C02550)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -506,21 +507,13 @@ NpcAISettings N(npcAISettings_80244D24) = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80240D74_BFE5F4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_80244CD0_C02550)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -530,65 +523,7 @@ void N(func_80240D74_BFE5F4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_8024142C_BFECAC)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80240D74_BFE5F4)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" void N(func_80241618_BFEE98)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; @@ -861,7 +796,7 @@ ApiStatus N(func_802422B0_BFFB30)(Evt* script, s32 isInitialCall) { } break; case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); case 3: N(UnkFunc4)(script, aiSettings, territoryPtr); if (script->functionTemp[0] == 12) { @@ -1122,7 +1057,7 @@ const char N(dgb_00_name_hack)[] = "dgb_00"; #include "world/common/UnkFunc13.inc.c" -#include "world/common/UnkNpcAIFunc1_copy.inc.c" +#include "world/common/UnkNpcAIFunc1.inc.c" #include "world/common/UnkFunc14.inc.c" @@ -1195,7 +1130,7 @@ ApiStatus N(func_802430C0_C00940)(Evt* script, s32 isInitialCall) { N(UnkFunc13)(script, aiSettings, territoryPtr); break; case 2: - N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); case 3: N(UnkFunc14)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 950dc60294..8323cf7941 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -113,7 +113,7 @@ static s32 N(pad_3558)[] = { 0x00000000, 0x00000000, }; -f32 N(D_80243560_C39A90)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -288,7 +288,7 @@ s32 N(D_80243D48_C3A278)[8][2] = { { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF } }; -f32 N(D_80243D88_C3A2B8)[] = { +f32 N(bigFuncFloats)[] = { 140.0f, 180.0f, 220.0f }; @@ -318,7 +318,7 @@ EvtScript N(80243D94) = { EVT_CALL(N(UnkPartnerPosFunc)) EVT_END_THREAD EVT_WAIT_FRAMES(3) - EVT_CALL(N(func_802429D0_C38F00), EVT_MAP_VAR(0)) + EVT_CALL(N(UnkFunc60), EVT_MAP_VAR(0)) EVT_WAIT_FRAMES(30) EVT_RETURN EVT_END @@ -421,21 +421,13 @@ EvtScript N(makeEntities) = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80240C54_C37184)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_80243560_C39A90)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -445,64 +437,7 @@ void N(func_80240C54_C37184)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_8024130C_C3783C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80240C54_C37184)(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); - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" void N(func_802414F8_C37A28)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; @@ -766,7 +701,7 @@ ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall) { } break; case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); case 3: N(UnkFunc4)(script, aiSettings, territoryPtr); if (script->functionTemp[0] == 12) { @@ -821,7 +756,6 @@ ApiStatus N(func_8024240C_C3893C)(Evt* script, s32 isInitialCall) { #include "world/common/UnkFunc18.inc.c" #ifdef NON_EQUIVALENT - typedef struct { s32 unk_00[8]; char unk_20[0x64]; @@ -842,7 +776,6 @@ typedef struct { s16 unk_32C; } N(UnkStruct); - ApiStatus N(func_8024259C_C38ACC)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; N(UnkStruct)* ptr; @@ -931,148 +864,7 @@ INCLUDE_ASM(ApiStatus, "world/area_dgb/dgb_04/C36530", dgb_04_func_8024259C_C38A #include "world/common/UnkFunc22.inc.c" -typedef struct { - s32 unk_00; - s32 unk_04; - EffectGraphics* unk_08[3]; // TODO this is wrong - f32 unk_14[3]; - f32 unk_20[3]; - f32 unk_2C[3]; - f32 unk_38[3]; - f32 unk_44[3]; - f32 unk_50[3]; - Entity* unk_5C; - s32 unk_60; - s32 unk_64; -} N(UserData); - -ApiStatus N(func_802429D0_C38F00)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_safe(-4); - f32 sinTheta, cosTheta; - s32 i; - f32 var; - N(UserData)* userDataPtr; - N(UserData)* scriptPtr; - f32 save, save2; - - sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); - - if (isInitialCall) { - script->userData = (N(UserData)*)general_heap_malloc(0x68); - scriptPtr = (N(UserData)*)script->userData; - - scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); - - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_08[i] = fx_motion_blur_flame(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, - scriptPtr->unk_5C->position.z, 1.0f, -1); - save = 0.0f; - userDataPtr->unk_2C[i] = save; - userDataPtr->unk_20[i] = save; - userDataPtr->unk_14[i] = save; - userDataPtr->unk_50[i] = save; - userDataPtr->unk_44[i] = save; - userDataPtr->unk_38[i] = save; - } - - scriptPtr->unk_00 = 0; - scriptPtr->unk_04 = 0; - scriptPtr->unk_60 = 0; - scriptPtr->unk_64 = 0; - - userDataPtr = scriptPtr; - for (i = 0, save = 50.0f; i < 3; i++) { - var = 0; - add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); - userDataPtr->unk_38[i] = cosTheta * var; - userDataPtr->unk_50[i] = sinTheta * var; - userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); - userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); - userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); - } - } - - scriptPtr = (N(UserData)*)script->userData; - switch (scriptPtr->unk_00) { - case 0: - save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); - save2 = 0.0f; - for (i = 0; i < 3; i++) { - scriptPtr->unk_20[i] = save2; - var = save2; - add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); - scriptPtr->unk_14[i] = cosTheta * var; - scriptPtr->unk_2C[i] = sinTheta * var; - } - - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x15) { - scriptPtr->unk_00 = 1; - scriptPtr->unk_60 = 0; - } - break; - - case 1: - save = 50.0f; - save2 = 0.0f; - for (i = 0; i < 3; i++) { - scriptPtr->unk_20[i] = save2; - var = save2; - add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); - scriptPtr->unk_14[i] = cosTheta * var; - scriptPtr->unk_2C[i] = sinTheta * var; - } - - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x10) { - scriptPtr->unk_60 = 0xF; - scriptPtr->unk_00 = 2; - } - break; - - case 2: - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x1F) { - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_08[i]->flags |= 0x10; - } - return ApiStatus_DONE2; - } - } - - switch (scriptPtr->unk_04) { - case 0: - scriptPtr->unk_64++; - if (scriptPtr->unk_64 >= 0x10) { - scriptPtr->unk_04 = 1; - scriptPtr->unk_64 = 0; - } - break; - - case 1: - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); - userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); - userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); - } - - scriptPtr->unk_64++; - if (scriptPtr->unk_64 >= 0x15) { - scriptPtr->unk_04 = 2; - scriptPtr->unk_64 = 0; - } - break; - } - - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.x = userDataPtr->unk_14[i]; - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.y = userDataPtr->unk_20[i]; - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.z = userDataPtr->unk_2C[i]; - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkFunc60.inc.c" s32 N(func_80242F08_C39438)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/area_dgb/dgb_04/dgb_04.h b/src/world/area_dgb/dgb_04/dgb_04.h index fcac6ac7dc..7f21ff70d4 100644 --- a/src/world/area_dgb/dgb_04/dgb_04.h +++ b/src/world/area_dgb/dgb_04/dgb_04.h @@ -21,7 +21,7 @@ ApiStatus N(UnkFunc20)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc39)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc21)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc22)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802429D0_C38F00)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242F08_C39438)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc24)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index c56c2c0bcb..1213f95df8 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -261,7 +261,7 @@ NpcSettings N(npcSettings_80244434) = { .unk_2A = 8, }; -f32 N(D_80244460_C44210)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -1119,15 +1119,7 @@ ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_802423B4_C42164)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_80244460_C44210)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -1137,65 +1129,7 @@ void N(func_802423B4_C42164)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_80242A6C_C4281C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~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(func_802423B4_C42164)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" void N(func_80242C58_C42A08)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index c169da80f3..f732f6ffd0 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -313,7 +313,7 @@ NpcSettings N(npcSettings_8024432C) = { .unk_2A = 8, }; -f32 N(D_80244358_C4AF38)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -1005,21 +1005,13 @@ ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80242078_C48C58)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_80244358_C4AF38)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -1029,65 +1021,7 @@ void N(func_80242078_C48C58)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_80242730_C49310)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80242078_C48C58)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" void N(func_8024291C_C494FC)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; @@ -1353,7 +1287,7 @@ ApiStatus N(func_80243578_C4A158)(Evt* script, s32 isInitialCall) { } break; case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); case 3: N(UnkFunc4)(script, aiSettings, territoryPtr); if (script->functionTemp[0] == 12) { diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index 6701ede395..e90a79fe1b 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -124,148 +124,7 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_08/CAED40", flo_08_func_802401CC_CAEF #include "world/common/UnkFunc22.inc.c" -typedef struct { - s32 unk_00; - s32 unk_04; - EffectGraphics* unk_08[3]; // TODO this is wrong - f32 unk_14[3]; - f32 unk_20[3]; - f32 unk_2C[3]; - f32 unk_38[3]; - f32 unk_44[3]; - f32 unk_50[3]; - Entity* unk_5C; - s32 unk_60; - s32 unk_64; -} N(UserData); - -ApiStatus N(func_80240600_CAF340)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_safe(-4); - f32 sinTheta, cosTheta; - s32 i; - f32 var; - N(UserData)* userDataPtr; - N(UserData)* scriptPtr; - f32 save, save2; - - sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); - - if (isInitialCall) { - script->userData = (N(UserData)*)general_heap_malloc(0x68); - scriptPtr = (N(UserData)*)script->userData; - - scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); - - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_08[i] = fx_motion_blur_flame(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, - scriptPtr->unk_5C->position.z, 1.0f, -1); - save = 0.0f; - userDataPtr->unk_2C[i] = save; - userDataPtr->unk_20[i] = save; - userDataPtr->unk_14[i] = save; - userDataPtr->unk_50[i] = save; - userDataPtr->unk_44[i] = save; - userDataPtr->unk_38[i] = save; - } - - scriptPtr->unk_00 = 0; - scriptPtr->unk_04 = 0; - scriptPtr->unk_60 = 0; - scriptPtr->unk_64 = 0; - - userDataPtr = scriptPtr; - for (i = 0, save = 50.0f; i < 3; i++) { - var = 0; - add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80242008_CB0D48)[i]); - userDataPtr->unk_38[i] = cosTheta * var; - userDataPtr->unk_50[i] = sinTheta * var; - userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); - userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); - userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); - } - } - - scriptPtr = (N(UserData)*)script->userData; - switch (scriptPtr->unk_00) { - case 0: - save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); - save2 = 0.0f; - for (i = 0; i < 3; i++) { - scriptPtr->unk_20[i] = save2; - var = save2; - add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242008_CB0D48)[i]); - scriptPtr->unk_14[i] = cosTheta * var; - scriptPtr->unk_2C[i] = sinTheta * var; - } - - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x15) { - scriptPtr->unk_00 = 1; - scriptPtr->unk_60 = 0; - } - break; - - case 1: - save = 50.0f; - save2 = 0.0f; - for (i = 0; i < 3; i++) { - scriptPtr->unk_20[i] = save2; - var = save2; - add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80242008_CB0D48)[i]); - scriptPtr->unk_14[i] = cosTheta * var; - scriptPtr->unk_2C[i] = sinTheta * var; - } - - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x10) { - scriptPtr->unk_60 = 0xF; - scriptPtr->unk_00 = 2; - } - break; - - case 2: - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x1F) { - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_08[i]->flags |= 0x10; - } - return ApiStatus_DONE2; - } - } - - switch (scriptPtr->unk_04) { - case 0: - scriptPtr->unk_64++; - if (scriptPtr->unk_64 >= 0x10) { - scriptPtr->unk_04 = 1; - scriptPtr->unk_64 = 0; - } - break; - - case 1: - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); - userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); - userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); - } - - scriptPtr->unk_64++; - if (scriptPtr->unk_64 >= 0x15) { - scriptPtr->unk_04 = 2; - scriptPtr->unk_64 = 0; - } - break; - } - - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.x = userDataPtr->unk_14[i]; // TODO this is wrong - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.y = userDataPtr->unk_20[i]; // TODO this is wrong - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.z = userDataPtr->unk_2C[i]; // TODO this is wrong - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index db62713888..782f917a31 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -63,7 +63,7 @@ s32 N(D_80241FC8_CB0D08)[8][2] = { { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF } }; -f32 N(D_80242008_CB0D48)[3] = { +f32 N(bigFuncFloats)[3] = { 140.0f, 180.0f, 220.0f }; @@ -93,7 +93,7 @@ EvtScript N(80242014) = { EVT_CALL(N(UnkPartnerPosFunc)) EVT_END_THREAD EVT_WAIT_FRAMES(3) - EVT_CALL(N(func_80240600_CAF340), EVT_MAP_VAR(0)) + EVT_CALL(N(UnkFunc60), EVT_MAP_VAR(0)) EVT_WAIT_FRAMES(30) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h index d9f11c58f3..e125600be3 100644 --- a/src/world/area_flo/flo_08/flo_08.h +++ b/src/world/area_flo/flo_08/flo_08.h @@ -23,7 +23,7 @@ ApiStatus N(UnkFunc38)(Evt* script, s32 isInitialCall); ApiStatus N(func_802401CC_CAEF0C)(Evt* script, s32 isInitialCall); ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc39)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80240600_CAF340)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc40)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240D40_CAFA80)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall); @@ -42,5 +42,5 @@ extern EvtScript N(main); extern s32 N(D_80241FB0_CB0CF0)[]; extern s16 N(D_80241FB8_CB0CF8)[]; extern s32 N(D_80241FC8_CB0D08)[8][2]; -extern f32 N(D_80242008_CB0D48)[3]; +extern f32 N(bigFuncFloats)[3]; extern s32 D_802462C0_B4AA30; diff --git a/src/world/area_flo/flo_09/CB50E0.c b/src/world/area_flo/flo_09/CB50E0.c index ba2c5cef5c..12a7b04c15 100644 --- a/src/world/area_flo/flo_09/CB50E0.c +++ b/src/world/area_flo/flo_09/CB50E0.c @@ -446,7 +446,7 @@ NpcSettings N(npcSettings_80243600) = { .level = 19, }; -f32 N(D_8024362C_CB862C)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -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(func_8024162C_CB662C), EVT_PTR(N(npcAISettings_80243644))) + EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_80243644))) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index d8aa2f613c..790ad9a189 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -4,21 +4,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80240F74_CB5F74)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_8024362C_CB862C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -28,60 +20,4 @@ void N(func_80240F74_CB5F74)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_8024162C_CB662C)(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* 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 = 120.0f; - territory.unk_1C = 0; - - if (isInitialCall) { - N(UnkFunc5)(npc, enemy, script, npcAISettings); - } - npc->unk_AB = -2; - - if (enemy->unk_B0 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, npcAISettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); - case 3: - N(UnkFunc4)(script, npcAISettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, npcAISettings, territoryPtr); - case 11: - N(func_80240F74_CB5F74)(script, npcAISettings, territoryPtr); - break; - case 12: - N(UnkNpcAIFunc14)(script, npcAISettings, territoryPtr); - break; - case 13: - N(UnkNpcAIFunc3)(script, npcAISettings, territoryPtr); - break; - case 14: - N(UnkFunc6)(script, npcAISettings, territoryPtr); - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkNpcAIMainFunc9.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 8f8bd5e8d7..0f6c40c771 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(func_8024162C_CB662C)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); -extern f32 N(D_8024362C_CB862C)[]; +extern f32 N(sixFloats)[]; extern NpcGroupList N(npcGroupList_8024414C); extern EvtScript N(802425DC); extern EvtScript N(802434A8); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 775f80ba37..f8361263b8 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(D_8024412C_CC793C)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -1225,21 +1225,13 @@ NpcGroupList N(npcGroupList_80247984) = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80240E18_CC4628)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_8024412C_CC793C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -1249,65 +1241,7 @@ void N(func_80240E18_CC4628)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_802414D0_CC4CE0)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80240E18_CC4628)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" s32 N(func_802416BC_CC4ECC)(void) { s32 i; diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index e176350d26..df794ca878 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(D_802453B0_EF79C0)[91]; -f32 N(D_802444C0_CCF7D0)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -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(func_80241E1C_CCD12C), EVT_PTR(N(npcAISettings_802444D8))) + EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_802444D8))) EVT_RETURN EVT_END }; @@ -327,21 +327,13 @@ EvtScript N(80245224) = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80241764_CCCA74)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_802444C0_CCF7D0)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -351,65 +343,7 @@ void N(func_80241764_CCCA74)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_80241E1C_CCD12C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80241764_CCCA74)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/GetNpcCollisionHeight.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 65a5981155..963e4e499e 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(func_80241E1C_CCD12C)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242234_CCD544)(Evt* script, s32 isInitialCall); ApiStatus N(func_80242288_CCD598)(Evt* script, s32 isInitialCall); ApiStatus N(func_802422C0_CCD5D0)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index e46bad7fac..66852f0f6d 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -257,7 +257,7 @@ s32 N(D_80243718_CD5548)[8][2] = { { 0x001D00EC, 0x001D00ED }, { 0x001D00EE, 0x001D00EF } }; -f32 N(D_80243758_CD5588)[] = { +f32 N(bigFuncFloats)[] = { 140.0f, 180.0f, 220.0f, }; @@ -287,7 +287,7 @@ EvtScript N(80243764) = { EVT_CALL(N(UnkPartnerPosFunc)) EVT_END_THREAD EVT_WAIT_FRAMES(3) - EVT_CALL(N(func_802406E0_CD2510), EVT_MAP_VAR(0)) + EVT_CALL(N(UnkFunc60), EVT_MAP_VAR(0)) EVT_WAIT_FRAMES(30) EVT_RETURN EVT_END @@ -553,148 +553,7 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_16/CD1F10", flo_16_func_802402AC_CD20 #include "world/common/UnkFunc22.inc.c" -typedef struct { - s32 unk_00; - s32 unk_04; - EffectGraphics* unk_08[3]; // TODO this is wrong - f32 unk_14[3]; - f32 unk_20[3]; - f32 unk_2C[3]; - f32 unk_38[3]; - f32 unk_44[3]; - f32 unk_50[3]; - Entity* unk_5C; - s32 unk_60; - s32 unk_64; -} N(UserData); - -ApiStatus N(func_802406E0_CD2510)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_safe(-4); - f32 sinTheta, cosTheta; - s32 i; - f32 var; - N(UserData)* userDataPtr; - N(UserData)* scriptPtr; - f32 save, save2; - - sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); - - if (isInitialCall) { - script->userData = (N(UserData)*)general_heap_malloc(0x68); - scriptPtr = (N(UserData)*)script->userData; - - scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); - - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_08[i] = fx_motion_blur_flame(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, - scriptPtr->unk_5C->position.z, 1.0f, -1); - save = 0.0f; - userDataPtr->unk_2C[i] = save; - userDataPtr->unk_20[i] = save; - userDataPtr->unk_14[i] = save; - userDataPtr->unk_50[i] = save; - userDataPtr->unk_44[i] = save; - userDataPtr->unk_38[i] = save; - } - - scriptPtr->unk_00 = 0; - scriptPtr->unk_04 = 0; - scriptPtr->unk_60 = 0; - scriptPtr->unk_64 = 0; - - userDataPtr = scriptPtr; - for (i = 0, save = 50.0f; i < 3; i++) { - var = 0; - add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, N(D_80243758_CD5588)[i]); - userDataPtr->unk_38[i] = cosTheta * var; - userDataPtr->unk_50[i] = sinTheta * var; - userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); - userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); - userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); - } - } - - scriptPtr = (N(UserData)*)script->userData; - switch (scriptPtr->unk_00) { - case 0: - save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); - save2 = 0.0f; - for (i = 0; i < 3; i++) { - scriptPtr->unk_20[i] = save2; - var = save2; - add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243758_CD5588)[i]); - scriptPtr->unk_14[i] = cosTheta * var; - scriptPtr->unk_2C[i] = sinTheta * var; - } - - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x15) { - scriptPtr->unk_00 = 1; - scriptPtr->unk_60 = 0; - } - break; - - case 1: - save = 50.0f; - save2 = 0.0f; - for (i = 0; i < 3; i++) { - scriptPtr->unk_20[i] = save2; - var = save2; - add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, N(D_80243758_CD5588)[i]); - scriptPtr->unk_14[i] = cosTheta * var; - scriptPtr->unk_2C[i] = sinTheta * var; - } - - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x10) { - scriptPtr->unk_60 = 0xF; - scriptPtr->unk_00 = 2; - } - break; - - case 2: - scriptPtr->unk_60++; - if (scriptPtr->unk_60 >= 0x1F) { - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_08[i]->flags |= 0x10; - } - return ApiStatus_DONE2; - } - } - - switch (scriptPtr->unk_04) { - case 0: - scriptPtr->unk_64++; - if (scriptPtr->unk_64 >= 0x10) { - scriptPtr->unk_04 = 1; - scriptPtr->unk_64 = 0; - } - break; - - case 1: - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); - userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); - userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); - } - - scriptPtr->unk_64++; - if (scriptPtr->unk_64 >= 0x15) { - scriptPtr->unk_04 = 2; - scriptPtr->unk_64 = 0; - } - break; - } - - for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.x = userDataPtr->unk_14[i]; - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.y = userDataPtr->unk_20[i]; - ((EffectInstanceData*)userDataPtr->unk_08[i]->freeDelay)->rotation.z = userDataPtr->unk_2C[i]; - } - - return ApiStatus_BLOCK; -} +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 8363c92699..707c29dabf 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(D_80244010_CD5E40)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -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(func_80242754_CD4584), EVT_PTR(N(npcAISettings_80244028))) + EVT_CALL(N(UnkNpcAIMainFunc10), EVT_PTR(N(npcAISettings_80244028))) EVT_RETURN EVT_END }; @@ -357,21 +357,13 @@ EvtScript N(802451C4) = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80241AA4_CD38D4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_80244010_CD5E40)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -381,65 +373,7 @@ void N(func_80241AA4_CD38D4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_8024215C_CD3F8C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80241AA4_CD38D4)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc13.inc.c" @@ -447,61 +381,4 @@ ApiStatus N(func_8024215C_CD3F8C)(Evt* script, s32 isInitialCall) { #include "world/common/UnkFunc45.inc.c" -ApiStatus N(func_80242754_CD4584)(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 & 4) { - if (enemy->unk_B4) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80241AA4_CD38D4)(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; -} +#include "world/common/UnkNpcAIMainFunc10.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 57f699f38a..61271e8dc5 100644 --- a/src/world/area_flo/flo_16/flo_16.h +++ b/src/world/area_flo/flo_16/flo_16.h @@ -24,9 +24,9 @@ ApiStatus N(func_80240000_CD1E30)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024011C_CD1F4C)(Evt* script, s32 isInitialCall); ApiStatus N(func_802402AC_CD20DC)(Evt* script, s32 isInitialCall); ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(func_802406E0_CD2510)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc44)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80242754_CD4584)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc10)(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 6930f21dc7..9b05a559e7 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(D_8024440C_CDB6EC)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -629,21 +629,13 @@ EvtScript N(makeEntities) = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80240CC4_CD7FA4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_8024440C_CDB6EC)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -653,65 +645,7 @@ void N(func_80240CC4_CD7FA4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_8024137C_CD865C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80240CC4_CD7FA4)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" s32 N(func_80241568_CD8848)(void) { s32 i; @@ -898,7 +832,7 @@ ApiStatus N(func_80241C64_CD8F44)(Evt* script, s32 isInitialCall) { break; case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); case 3: N(func_80241A14_CD8CF4)(script, aiSettings, territoryPtr); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 7710ab614b..a04ce569af 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -1,5 +1,4 @@ #include "flo_21.h" -#include "effects.h" #include "message_ids.h" #include "sprite/npc/huff_n_puff.h" #include "sprite/npc/tuff_puff.h" diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index b212b66836..865e8be696 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -126,7 +126,7 @@ NpcSettings N(npcSettings_802428F0) = { .level = 99, }; -f32 N(D_8024291C_CF54EC)[] = { +f32 N(sixFloats)[] = { 4.5f, 3.5f, 2.6f, 2.0f, 1.5f, 20.0f, }; @@ -149,7 +149,7 @@ EvtScript N(npcAI_80242964) = { EVT_CALL(SetSelfVar, 5, 0) EVT_CALL(SetSelfVar, 6, 0) EVT_CALL(SetSelfVar, 1, 600) - EVT_CALL(N(func_80241944_CF4514), EVT_PTR(N(npcAISettings_80242934))) + EVT_CALL(N(UnkNpcAIMainFunc10), EVT_PTR(N(npcAISettings_80242934))) EVT_RETURN EVT_END }; @@ -183,7 +183,7 @@ EvtScript N(npcAI_80242A30) = { EVT_CALL(SetSelfVar, 5, -630) EVT_CALL(SetSelfVar, 6, 50) EVT_CALL(SetSelfVar, 1, 200) - EVT_CALL(N(func_8024134C_CF3F1C), EVT_PTR(N(npcAISettings_80242A00))) + EVT_CALL(N(UnkNpcAIMainFunc9), EVT_PTR(N(npcAISettings_80242A00))) EVT_RETURN EVT_END }; @@ -518,21 +518,13 @@ static s32 N(pad_3CD8)[] = { #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -void N(func_80240C94_CF3864)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_8024291C_CF54EC)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0] = 12; - } -} +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -542,132 +534,15 @@ void N(func_80240C94_CF3864)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit #include "world/common/UnkFunc5.inc.c" -ApiStatus N(func_8024134C_CF3F1C)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80240C94_CF3864)(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; -} +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc13.inc.c" - #include "world/common/UnkNpcAIFunc34.inc.c" #include "world/common/UnkFunc45.inc.c" -ApiStatus N(func_80241944_CF4514)(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 & 4) { - if (enemy->unk_B4 != 0) { - return ApiStatus_BLOCK; - } - enemy->unk_B0 &= ~4; - } - - switch (script->functionTemp[0]) { - case 0: - N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); - case 1: - N(UnkNpcAIFunc35)(script, aiSettings, territoryPtr); - break; - case 2: - N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); - case 3: - N(UnkFunc4)(script, aiSettings, territoryPtr); - break; - case 10: - N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); - case 11: - N(func_80240C94_CF3864)(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; -} +#include "world/common/UnkNpcAIMainFunc10.inc.c" #include "world/common/GetNpcCollisionHeight.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 a5878425ba..d7f10175f8 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(func_8024134C_CF3F1C)(Evt* script, s32 isInitialCall); -ApiStatus N(func_80241944_CF4514)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc9)(Evt* script, s32 isInitialCall); +ApiStatus N(UnkNpcAIMainFunc10)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241D58_CF4928)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241DAC_CF497C)(Evt* script, s32 isInitialCall); ApiStatus N(func_80241DE4_CF49B4)(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 22ab1489ea..aca84f5df5 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -4,13 +4,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44_A17E64); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -20,14 +20,13 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44_A17E64); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802422FC_A1851C); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc13.inc.c" - INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242618_A18838); //#include "world/common/UnkNpcAIFunc34.inc.c" #include "world/common/UnkFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802428F4_A18B14); +#include "world/common/UnkNpcAIMainFunc10.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 2c68e5ede8..c8a567c6ec 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -6,13 +6,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/Call800E9894.inc.c" diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index 3901a2ef3f..bf167f8005 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -27,7 +27,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802401CC_988D2C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240600_989160); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index 82a391b1bb..c1beb20d37 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -1,16 +1,16 @@ #include "iwa_01.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240520_90FBD0); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240710_90FDC0); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241CF0_9113A0); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241D70_911420); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241F6C_91161C); +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index 96339ada2b..f154e362a0 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802404BC_91EA2C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802408F0_91EE60); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index 5b5a131202..378846c156 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024082C_B5EADC); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240C60_B5EF10); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 16caf74255..c07e68a565 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -7,13 +7,13 @@ static char* N(exit_str_1) = "kmr_02"; #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54_8CECC4); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -23,4 +23,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54_8CECC4); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_8024130C_8CF37C); +#include "world/common/UnkNpcAIMainFunc9.inc.c" diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index 4af457bfee..9daa0e6393 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -7,13 +7,13 @@ static char* N(exit_str_1) = "kmr_07"; #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240C54_8D2164); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -23,4 +23,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240C54_8D2164); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_8024130C_8D281C); +#include "world/common/UnkNpcAIMainFunc9.inc.c" diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index b215ef433f..18a3d3bf91 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -7,13 +7,13 @@ static char* N(exit_str_1) = "kmr_06"; #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240C54_8D6A54); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -23,7 +23,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240C54_8D6A54); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_8024130C_8D710C); +#include "world/common/UnkNpcAIMainFunc9.inc.c" ApiStatus func_802414F8_8D72F8(Evt* script, s32 isInitialCall) { script->varTable[0] = get_enemy_safe(2); diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index 3db38a354e..78a0d34357 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -12,15 +12,15 @@ #include "world/common/AwaitPlayerNearNpc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240A48_A49008); +#include "world/common/UnkNpcAIFunc47.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240C18_A491D8); +#include "world/common/UnkFunc57.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241128_A496E8); +#include "world/common/UnkFunc58.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024119C_A4975C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802412C8_A49888); +#include "world/common/UnkFunc59.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241368_A49928); @@ -28,7 +28,10 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802413CC_A4998C); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024150C_A49ACC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802416B0_A49C70); +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); diff --git a/src/world/area_kpa/kpa_08/A4CAC0.c b/src/world/area_kpa/kpa_08/A4CAC0.c index ed1a8e393d..fedff1e866 100644 --- a/src/world/area_kpa/kpa_08/A4CAC0.c +++ b/src/world/area_kpa/kpa_08/A4CAC0.c @@ -1,14 +1,14 @@ #include "kpa_08.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802400A0_A4CAC0); +#include "world/common/UnkNpcAIFunc47.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240270_A4CC90); +#include "world/common/UnkFunc57.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240780_A4D1A0); +#include "world/common/UnkFunc58.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802407F4_A4D214); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240920_A4D340); +#include "world/common/UnkFunc59.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802409C0_A4D3E0); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index 528e6a27de..ecc891d7b5 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -1,21 +1,21 @@ #include "kpa_09.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802400A0_A4F0A0); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240290_A4F290); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240F94_A4FF94); +#include "world/common/UnkNpcAIMainFunc7.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 db2cb1d684..bdb74a40e4 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -1,22 +1,22 @@ #include "kpa_102.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240310_A93A50); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240500_A93C40); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" @@ -30,9 +30,9 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); #include "world/common/UnkNpcAIMainFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241D30_A95470); +#include "world/common/UnkNpcAIFunc47.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241F00_A95640); +#include "world/common/UnkFunc57.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242410_A95B50); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index 31ca8a8f73..11a41efadf 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -7,22 +7,22 @@ static char* N(exit_str_1) = "kpa_112"; #include "world/common/UnkFunc12.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240170_A99700); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240360_A998F0); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241064_A9A5F4); +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index 91ff337ab3..275c528cea 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -9,22 +9,22 @@ static char* N(exit_str_3) = ""; #include "world/common/UnkFunc12.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240170_A9EEB0); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240360_A9F0A0); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802404A4_A9F1E4); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80241064_A9FDA4); +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index cf64e3061b..5e1c4a8372 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -3,23 +3,23 @@ static char* N(exit_str_0) = "kpa_70"; static char* N(exit_str_1) = "kpa_81"; -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240000_A609D0); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802401F0_A60BC0); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4); +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index 2e7b36b331..e24a4fb883 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -1,14 +1,14 @@ #include "kpa_51.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240050_A640E0); +#include "world/common/UnkNpcAIFunc47.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240220_A642B0); +#include "world/common/UnkFunc57.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240730_A647C0); +#include "world/common/UnkFunc58.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802407A4_A64834); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802408D0_A64960); +#include "world/common/UnkFunc59.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240970_A64A00); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index 147863b9ce..2fe02987bc 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -1,21 +1,21 @@ #include "kpa_52.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802400E0_A671E0); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802402D0_A673D0); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240FD4_A680D4); +#include "world/common/UnkNpcAIMainFunc7.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 904680eab3..b580ce5417 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -10,9 +10,9 @@ #include "world/common/UnkNpcAIMainFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80240AE4_A6EEC4); +#include "world/common/UnkNpcAIFunc47.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80240CB4_A6F094); +#include "world/common/UnkFunc57.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802411C4_A6F5A4); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index f6c5ca1aae..cc1ab4ef21 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -35,7 +35,7 @@ static char* N(exit_str_1) = ""; #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74); +#include "world/common/UnkNpcAIMainFunc8.inc.c" #include "world/common/Call800E9894.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index bbc386441a..430fe4efcb 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -32,7 +32,7 @@ #include "world/common/set_script_owner_npc_col_height.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84); +#include "world/common/UnkNpcAIMainFunc8.inc.c" #include "world/common/Call800E9894.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index fbf3d8e8a0..9b72865e6a 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -4,13 +4,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241134_C5B874); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -20,18 +20,16 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241134_C5B874); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802417EC_C5BF2C); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241B08_C5C248); -//#include "world/common/UnkNpcAIFunc34.inc.c" +#include "world/common/UnkNpcAIFunc34.inc.c" #include "world/common/UnkFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241DE4_C5C524); +#include "world/common/UnkNpcAIMainFunc10.inc.c" -static char* N(exit_str_0) = "kzn_02"; INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C); diff --git a/src/world/area_kzn/kzn_02/C5CE70.c b/src/world/area_kzn/kzn_02/C5CE70.c index 6bc43542a6..ef632d69ed 100644 --- a/src/world/area_kzn/kzn_02/C5CE70.c +++ b/src/world/area_kzn/kzn_02/C5CE70.c @@ -1,3 +1,5 @@ #include "kzn_02.h" +static char* N(exit_str_0) = "kzn_02"; + INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5CE70", func_80242730_C5CE70); diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index f057650c77..29fd0bcd29 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802404DC_C6860C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240910_C68A40); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 6ae2714a8a..3d9f6a9c45 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -8,13 +8,13 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802407F4_C6EB24); #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241474_C6F7A4); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -24,14 +24,12 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241474_C6F7A4); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241B2C_C6FE5C); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc13.inc.c" - -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241E48_C70178); -//#include "world/common/UnkNpcAIFunc34.inc.c" +#include "world/common/UnkNpcAIFunc34.inc.c" #include "world/common/UnkFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80242124_C70454); +#include "world/common/UnkNpcAIMainFunc10.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 577ac09718..69aa2994a9 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -4,13 +4,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4_C72B24); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -20,16 +20,15 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4_C72B24); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241D5C_C731DC); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242078_C734F8); -//#include "world/common/UnkNpcAIFunc34.inc.c" +#include "world/common/UnkNpcAIFunc34.inc.c" #include "world/common/UnkFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); +#include "world/common/UnkNpcAIMainFunc10.inc.c" #include "world/common/UnkNpcAIFunc6.inc.c" diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c index 9f85ed0322..7045e2e8e5 100644 --- a/src/world/area_kzn/kzn_09/C76CE0.c +++ b/src/world/area_kzn/kzn_09/C76CE0.c @@ -25,7 +25,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802401CC_C76EAC); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240600_C772E0); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index e54e48e340..39534ab5c7 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -4,13 +4,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802410B4_C81254); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -20,16 +20,15 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802410B4_C81254); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_8024176C_C8190C); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241A88_C81C28); -//#include "world/common/UnkNpcAIFunc34.inc.c" +#include "world/common/UnkNpcAIFunc34.inc.c" #include "world/common/UnkFunc45.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D64_C81F04); +#include "world/common/UnkNpcAIMainFunc10.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241F4C_C820EC); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 2cff5f7f49..fc8df5fb53 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -11,13 +11,13 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240068_BAD9A8); #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240CF4_BAE634); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -27,7 +27,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240CF4_BAE634); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/UnkNpcAIFunc6.inc.c" diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index d67f88e097..4accda5951 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -17,13 +17,13 @@ static char* N(exit_str_1) = "nok_12"; #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241428_9F5E68); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -33,7 +33,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241428_9F5E68); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241AE0_9F6520); +#include "world/common/UnkNpcAIMainFunc9.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 bab54979a1..caa5cc98b1 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -34,6 +34,6 @@ #include "world/common/UnkNpcAIMainFunc.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241BD4_9FC3C4); +#include "world/common/UnkNpcAIMainFunc8.inc.c" static char* N(exit_str_0) = "nok_12"; diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 9958cff392..462b42eae8 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -14,13 +14,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8_A03E28); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -30,7 +30,10 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8_A03E28); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241CA0_A044E0); +#include "world/common/UnkNpcAIMainFunc9.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); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 77b568b12c..0a414d70a7 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -31,13 +31,13 @@ static char* N(exit_str_3) = ""; #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708_A08608); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -47,7 +47,10 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708_A08608); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241DC0_A08CC0); +#include "world/common/UnkNpcAIMainFunc9.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); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index f2fd64f83f..9a6a8144da 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -36,23 +36,23 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240BA8_D9E078); #include "world/common/UnkNpcAIMainFunc4.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241948_D9EE18); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241B38_D9F008); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241C7C_D9F14C); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024283C_D9FD0C); +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index 995505cd0d..66d0fcae5e 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -6,17 +6,17 @@ #include "common/SetAngleClamped.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240104_DA5344); +#include "common/CompareFloats.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240188_DA53C8); +#include "common/UnkBufferFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024020C_DA544C); +#include "common/SetPlayerStatusPosYaw.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802402B0_DA54F0); +#include "common/SetNpcPosYaw.inc.c" #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240538_DA5778); +#include "common/IsAOrBPressed.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index dfba1b01cb..d0a4838478 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -21,13 +21,13 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4); #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4_DAE3F4); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -37,7 +37,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4_DAE3F4); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802416AC_DAEAAC); +#include "world/common/UnkNpcAIMainFunc9.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241898_DAEC98); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index b0b12ebc61..e3b66e2705 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -23,13 +23,13 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240780_DB2A40); #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8_DB3968); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -39,7 +39,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8_DB3968); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241D60_DB4020); +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index 45d7245995..2abd576a5c 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -13,17 +13,17 @@ static char* N(exit_str_7) = ""; #include "common/SetAngleClamped.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_802400E4_DB79F4); +#include "common/CompareFloats.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240168_DB7A78); +#include "common/UnkBufferFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_802401EC_DB7AFC); +#include "common/SetPlayerStatusPosYaw.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240290_DB7BA0); +#include "common/SetNpcPosYaw.inc.c" #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240518_DB7E28); +#include "common/IsAOrBPressed.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 8991a2f381..7c53058d16 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -53,15 +53,13 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241634_DBE8E4); #include "world/common/UnkNpcAIFunc35.inc.c" -#define NAMESPACE dup_omo_07 -#include "world/common/UnkNpcAIFunc1.inc.c" -#define NAMESPACE omo_07 +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC_DBF87C); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -71,9 +69,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC_DBF87C); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242C84_DBFF34); - -static char* N(exit_str_2) = "omo_07"; +#include "world/common/UnkNpcAIMainFunc9.inc.c" #include "world/common/SetCamera0Flag1000.inc.c" diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index b0f70af2c5..9580a3cf97 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -1,5 +1,7 @@ #include "omo_07.h" +static char* N(exit_str_2) = "omo_07"; + INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index f01d894cf2..e6addce2c2 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -11,17 +11,17 @@ static char* N(exit_str_5) = "omo_16"; #include "common/SetAngleClamped.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_802400E4_DC44B4); +#include "common/CompareFloats.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240168_DC4538); +#include "common/UnkBufferFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_802401EC_DC45BC); +#include "common/SetPlayerStatusPosYaw.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240290_DC4660); +#include "common/SetNpcPosYaw.inc.c" #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240518_DC48E8); +#include "common/IsAOrBPressed.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 094e903f27..b76edfa394 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -46,25 +46,23 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241F1C_DCEBEC); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242014_DCECE4); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242358_DCF028); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242548_DCF218); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024324C_DCFF1C); - -static char* N(exit_str_0) = "omo_09"; +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_omo/omo_09/DD02E0.c b/src/world/area_omo/omo_09/DD02E0.c index 0c7e1979dd..599d986aca 100644 --- a/src/world/area_omo/omo_09/DD02E0.c +++ b/src/world/area_omo/omo_09/DD02E0.c @@ -1,3 +1,5 @@ #include "omo_09.h" +static char* N(exit_str_0) = "omo_09"; + INCLUDE_ASM(s32, "world/area_omo/omo_09/DD02E0", func_80243610_DD02E0); diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index 3ee3aa3a3e..8c289585d1 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -13,17 +13,17 @@ static char* N(exit_str_7) = ""; #include "common/SetAngleClamped.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_802400E4_DD7A94); +#include "common/CompareFloats.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240168_DD7B18); +#include "common/UnkBufferFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_802401EC_DD7B9C); +#include "common/SetPlayerStatusPosYaw.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240290_DD7C40); +#include "common/SetNpcPosYaw.inc.c" #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240518_DD7EC8); +#include "common/IsAOrBPressed.inc.c" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index eab67520e0..5473b70248 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_8024095C_DDD18C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240D90_DDD5C0); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c index 76345ef9bb..3ce79db2b1 100644 --- a/src/world/area_omo/omo_16/DEBED0.c +++ b/src/world/area_omo/omo_16/DEBED0.c @@ -9,16 +9,16 @@ static char* N(exit_str_3) = "omo_03"; #include "common/SetAngleClamped.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_802400E4_DEBFB4); +#include "common/CompareFloats.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240168_DEC038); +#include "common/UnkBufferFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_802401EC_DEC0BC); +#include "common/SetPlayerStatusPosYaw.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240290_DEC160); +#include "common/SetNpcPosYaw.inc.c" #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240518_DEC3E8); +#include "common/IsAOrBPressed.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024055C_DEC42C); diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c index b6e116f71d..565d45466a 100644 --- a/src/world/area_omo/omo_17/DEEEA0.c +++ b/src/world/area_omo/omo_17/DEEEA0.c @@ -13,14 +13,14 @@ static char* N(exit_str_7) = ""; #include "common/SetAngleClamped.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_802400E4_DEEF84); +#include "common/CompareFloats.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240168_DEF008); +#include "common/UnkBufferFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_802401EC_DEF08C); +#include "common/SetPlayerStatusPosYaw.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240290_DEF130); +#include "common/SetNpcPosYaw.inc.c" #include "common/UnkFloatFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240518_DEF3B8); +#include "common/IsAOrBPressed.inc.c" diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 32b6a65e0f..82ff927861 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -20,13 +20,13 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240CE0_DEFB80); #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08_DF0AA8); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -36,25 +36,25 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08_DF0AA8); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802422C0_DF1160); +#include "world/common/UnkNpcAIMainFunc9.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802424AC_DF134C); +#include "world/common/UnkFunc61.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024269C_DF153C); +#include "world/common/UnkNpcAIFunc48.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680); +#include "world/common/UnkNpcAIFunc49.inc.c" #include "world/common/UnkSetDurationFunc.inc.c" #include "world/common/UnkNpcAIFunc9.inc.c" -#include "world/common/UnkDurationCheck.inc.c" +#include "world/common/UnkDurationCheckNoArgs.inc.c" #include "world/common/UnkFunc54.inc.c" #include "world/common/UnkFunc55.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802433A0_DF2240); +#include "world/common/UnkNpcAIMainFunc7.inc.c" #include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index d103285abe..e9d4b7bad3 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -4,13 +4,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802411A4_D21034); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802411A4_D21034); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024185C_D216EC); +#include "world/common/UnkNpcAIMainFunc9.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48_D218D8); diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index 1b6d081e02..cdad7e6edd 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -25,7 +25,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802401CC_D2FE4C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240600_D30280); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index b085015f2b..6c10290b45 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -33,7 +33,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024024C_95420C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240680_954640); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 3079b16700..ceb87f4e52 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -37,7 +37,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802404AC_87A08C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802408E0_87A4C0); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index bd970de95c..de27db50e2 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -8,13 +8,13 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241390_87AF70); #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044_87BC24); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044_87BC24); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802426FC_87C2DC); +#include "world/common/UnkNpcAIMainFunc9.inc.c" diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index a1628a2716..af98ebaf50 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024084C_886C0C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C80_887040); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index ca55e7a888..b83adab635 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240DE8_8899B8); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024121C_889DEC); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index 4795030e48..1c7123a128 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802401FC_892C1C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240630_893050); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index 04de52cbfa..a98c03973d 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802407BC_897D9C); #include "world/common/UnkFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240BF0_8981D0); +#include "world/common/UnkFunc60.inc.c" #include "world/common/UnkFunc23.inc.c" diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index bca875a700..dc80f61b42 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -34,4 +34,4 @@ #include "world/common/UnkNpcAIMainFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241744_9A2724); +#include "world/common/UnkNpcAIMainFunc8.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 6163d4b972..3d1e8cd202 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -34,21 +34,19 @@ #include "world/common/UnkNpcAIMainFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241B14_9A9F04); +#include "world/common/UnkNpcAIMainFunc8.inc.c" #include "world/common/UnkNpcAIFunc23.inc.c" #include "world/common/UnkNpcAIFunc35.inc.c" -#define NAMESPACE dup_trd_04 -#include "world/common/UnkNpcAIFunc1.inc.c" -#define NAMESPACE trd_04 +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C_9AAE5C); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -58,7 +56,10 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C_9AAE5C); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243124_9AB514); +#include "world/common/UnkNpcAIMainFunc9.inc.c" + +// todo remove when below are decompiled +static const f32 padding = 0.0f; INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243310_9AB700); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 5e06469250..030459c64b 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -14,13 +14,13 @@ #include "world/common/UnkNpcAIFunc35.inc.c" -#include "world/common/UnkNpcAIFunc1.inc.c" +#include "world/common/UnkNpcAIFunc1_copy.inc.c" #include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241738_9B80B8); +#include "world/common/SixFloatsFunc.inc.c" #include "world/common/UnkNpcAIFunc14.inc.c" @@ -30,7 +30,10 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241738_9B80B8); #include "world/common/UnkFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241DF0_9B8770); +#include "world/common/UnkNpcAIMainFunc9.inc.c" + +// todo remove when below are decompiled +static const f32 padding = 0.0f; INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241FDC_9B895C); diff --git a/src/world/common/SixFloatsFunc.inc.c b/src/world/common/SixFloatsFunc.inc.c new file mode 100644 index 0000000000..eeca3064da --- /dev/null +++ b/src/world/common/SixFloatsFunc.inc.c @@ -0,0 +1,15 @@ +#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/StarSpiritEffectFunc.inc.c b/src/world/common/StarSpiritEffectFunc.inc.c index 709985803a..49ec99249b 100644 --- a/src/world/common/StarSpiritEffectFunc.inc.c +++ b/src/world/common/StarSpiritEffectFunc.inc.c @@ -20,7 +20,7 @@ ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) { if (isInitialCall) { StarSpiritEffect* ptr = heap_malloc(sizeof(StarSpiritEffect)); script->varTable[0] = (s32) ptr; - evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + evt_set_variable(NULL, EVT_MAP_VAR(1), script->varTable[0]); ptr->unk_38 = evt_get_variable(script, *args++); ptr->unk_3C = evt_get_variable(script, *args++); ptr->unk_0C = evt_get_float_variable(script, *args++); diff --git a/src/world/common/UnkDurationCheckNoArgs.inc.c b/src/world/common/UnkDurationCheckNoArgs.inc.c new file mode 100644 index 0000000000..1ba6a25564 --- /dev/null +++ b/src/world/common/UnkDurationCheckNoArgs.inc.c @@ -0,0 +1,12 @@ +#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/UnkFunc57.inc.c b/src/world/common/UnkFunc57.inc.c new file mode 100644 index 0000000000..9a6728826e --- /dev/null +++ b/src/world/common/UnkFunc57.inc.c @@ -0,0 +1,112 @@ +#include "common.h" +#include "effects.h" + +ApiStatus N(UnkFunc57)(Evt* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc sp20; + Npc* sp20Ptr = &sp20; + s32 timer = 0; + Npc* npc1 = get_npc_unsafe(enemy->npcID); + Npc* npc2 = get_npc_unsafe(get_enemy(enemy->npcID - 1)->npcID); + f32 t1; + f32 t2; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0] = 0; + npc1->duration = 0; + npc1->flags |= NPC_FLAG_200000 | NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; + enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_IGNORE_JUMP | + ENEMY_FLAGS_200000 | ENEMY_FLAGS_40; + npc1->scale.x = 0.4f; + npc1->scale.y = 0.4f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + switch (script->functionTemp[0]) { + case 0: + enemy->varTable[3] = NULL; + npc1->collisionRadius = 20; + npc1->collisionHeight = 20; + npc1->pos.x = 0.0f; + npc1->pos.z = 0.0f; + npc1->pos.y = -1000.0f; + enemy->varTable[0] = 0; + script->functionTemp[0] = 1; + /* fallthrough */ + case 1: + if (enemy->varTable[0] == 1) { + s32 duration; + + enemy->varTable[0] = 2; + sp20Ptr->pos.x = npc2->pos.x; + sp20Ptr->pos.y = npc2->pos.y; + sp20Ptr->pos.z = npc2->pos.z; + npc_move_heading(sp20Ptr, enemy->varTable[2], 270.0f - npc2->renderYaw); + npc1->pos.x = sp20Ptr->pos.x; + npc1->pos.y = npc2->pos.y + enemy->varTable[1]; + npc1->pos.z = sp20Ptr->pos.z; + enemy->unk_07 = 1; + enemy->unk_10.x = npc1->pos.x; + enemy->unk_10.y = npc1->pos.y; + enemy->unk_10.z = npc1->pos.z; + npc1->moveSpeed = 3.6f; + + t1 = fabsf(npc1->pos.x - gPlayerStatusPtr->position.x); + t2 = atan2(0.0f, npc1->pos.y, t1, (gPlayerStatusPtr->position.y + 10.0)) - 90.0; + npc1->jumpVelocity = cosine(t2) * npc1->moveSpeed; + npc1->yaw = atan2(npc1->pos.x, npc1->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + duration = dist3D(npc1->pos.x, npc1->pos.y, npc1->pos.z, + gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.y + 10.0, + gPlayerStatusPtr->position.z) / npc1->moveSpeed; + if (duration <= 0) { + duration = 1; + } + enemy->varTable[3] = (s32)fx_shape_spell(0, npc1->pos.x, npc1->pos.y + 14.0f, npc1->pos.z, + gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.y + 10.0f + 14.0f, + gPlayerStatusPtr->position.z, duration); + npc1->duration = duration; + script->functionTemp[0] = 2; + } + break; + case 2: + npc1->duration--; + if (npc1->duration <= 0) { + timer = 20; + } + if (timer == 0) { + npc_move_heading(npc1, npc1->moveSpeed, npc1->yaw); + npc1->pos.y += npc1->jumpVelocity; + break; + } + /* fallthrough */ + case 3: + npc1->jumpVelocity = 0.0f; + npc1->moveSpeed = 0.0f; + npc1->pos.y -= npc1->collisionHeight * 0.5; + enemy->varTable[0] = 3; + npc1->duration = 0; + script->functionTemp[0] = 4; + break; + case 4: + npc1->duration++; + if (npc1->duration < 7) { + npc1->pos.y -= 3.5; + npc1->collisionRadius = ((f32) npc1->duration * 7.0) + 20.0; + npc1->collisionHeight = ((f32) npc1->duration * 7.0) + 20.0; + } else if (npc1->duration == 7) { + npc1->pos.x = 0.0f; + npc1->pos.z = 0.0f; + npc1->collisionRadius = 20; + npc1->collisionHeight = 20; + npc1->pos.y = -1000.0f; + } else if (npc1->duration >= 16) { + enemy->varTable[0] = 0; + script->functionTemp[0] = 0; + } + break; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkFunc58.inc.c b/src/world/common/UnkFunc58.inc.c new file mode 100644 index 0000000000..a7b7d57c29 --- /dev/null +++ b/src/world/common/UnkFunc58.inc.c @@ -0,0 +1,14 @@ +#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 new file mode 100644 index 0000000000..6fc1f22685 --- /dev/null +++ b/src/world/common/UnkFunc59.inc.c @@ -0,0 +1,12 @@ +#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/UnkFunc60.inc.c b/src/world/common/UnkFunc60.inc.c new file mode 100644 index 0000000000..acd7460de9 --- /dev/null +++ b/src/world/common/UnkFunc60.inc.c @@ -0,0 +1,142 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +typedef struct { + s32 unk_00; + s32 unk_04; + EffectGraphics* unk_08[3]; // TODO this is wrong + f32 unk_14[3]; + f32 unk_20[3]; + f32 unk_2C[3]; + f32 unk_38[3]; + f32 unk_44[3]; + f32 unk_50[3]; + Entity* unk_5C; + s32 unk_60; + s32 unk_64; +} N(UserData); + +extern f32 N(bigFuncFloats)[]; + +ApiStatus N(UnkFunc60)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Npc* partner = get_npc_safe(NPC_PARTNER); + N(UserData)* userData; + f32 sinTheta, cosTheta; + f32 x; + f32 t1; + s32 i; + + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (N(UserData)*)general_heap_malloc(0x68); + userData = (N(UserData)*)script->userData; + + userData->unk_5C = get_entity_by_index(evt_get_variable(script, *args++)); + + for (i = 0; i < ARRAY_COUNT(userData->unk_08); i++) { + userData->unk_08[i] = (EffectGraphics*) fx_motion_blur_flame(0, userData->unk_5C->position.x, + userData->unk_5C->position.y + 12.5f, + userData->unk_5C->position.z, 1.0f, -1); + t1 = 0.0f; + userData->unk_2C[i] = t1; + userData->unk_20[i] = t1; + userData->unk_14[i] = t1; + userData->unk_50[i] = t1; + userData->unk_44[i] = t1; + userData->unk_38[i] = t1; + } + + userData->unk_00 = 0; + userData->unk_04 = 0; + userData->unk_60 = 0; + userData->unk_64 = 0; + + t1 = 50.0f; + for (i = 0; i < ARRAY_COUNT(userData->unk_38); i++) { + x = 0.0f; + add_vec2D_polar(&x, &userData->unk_44[i], t1, N(bigFuncFloats)[i]); + userData->unk_38[i] = cosTheta * x; + userData->unk_50[i] = sinTheta * x; + userData->unk_38[i] = partner->pos.x - (userData->unk_5C->position.x + userData->unk_38[i]); + userData->unk_44[i] = partner->pos.y - (userData->unk_5C->position.y + userData->unk_44[i]); + userData->unk_50[i] = partner->pos.z - (userData->unk_5C->position.z + userData->unk_50[i]); + } + } + + userData = (N(UserData)*)script->userData; + switch (userData->unk_00) { + case 0: + t1 = update_lerp(5, 0.0f, 50.0f, userData->unk_60, 20); + for (i = 0; i < ARRAY_COUNT(userData->unk_20); i++) { + x = userData->unk_20[i] = 0.0f; + add_vec2D_polar(&x, &userData->unk_20[i], t1, N(bigFuncFloats)[i]); + userData->unk_14[i] = cosTheta * x; + userData->unk_2C[i] = sinTheta * x; + } + + userData->unk_60++; + if (userData->unk_60 >= 0x15) { + userData->unk_00 = 1; + userData->unk_60 = 0; + } + break; + case 1: + t1 = 50.0f; + for (i = 0; i < ARRAY_COUNT(userData->unk_20); i++) { + x = userData->unk_20[i] = 0.0f; + add_vec2D_polar(&x, &userData->unk_20[i], t1, N(bigFuncFloats)[i]); + userData->unk_14[i] = cosTheta * x; + userData->unk_2C[i] = sinTheta * x; + } + + userData->unk_60++; + if (userData->unk_60 > 15) { + userData->unk_60 = 15; + userData->unk_00 = 2; + } + break; + case 2: + userData->unk_60++; + if (userData->unk_60 > 30) { + for (i = 0; i < ARRAY_COUNT(userData->unk_08); i++) { + userData->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + break; + } + + switch (userData->unk_04) { + case 0: + userData->unk_64++; + if (userData->unk_64 > 15) { + userData->unk_04 = 1; + userData->unk_64 = 0; + } + break; + case 1: + for (i = 0; i < ARRAY_COUNT(userData->unk_14); i++) { + userData->unk_14[i] += update_lerp(1, 0.0f, userData->unk_38[i], userData->unk_64, 20); + userData->unk_20[i] += update_lerp(1, 0.0f, userData->unk_44[i], userData->unk_64, 20); + userData->unk_2C[i] += update_lerp(1, 0.0f, userData->unk_50[i], userData->unk_64, 20); + } + + userData->unk_64++; + if (userData->unk_64 > 20) { + userData->unk_04 = 2; + userData->unk_64 = 0; + } + break; + } + + for (i = 0; i < ARRAY_COUNT(userData->unk_08); i++) { + ((EffectInstanceData*)userData->unk_08[i]->freeDelay)->rotation.x = userData->unk_14[i]; + ((EffectInstanceData*)userData->unk_08[i]->freeDelay)->rotation.y = userData->unk_20[i]; + ((EffectInstanceData*)userData->unk_08[i]->freeDelay)->rotation.z = userData->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkFunc61.inc.c b/src/world/common/UnkFunc61.inc.c new file mode 100644 index 0000000000..724d380c8b --- /dev/null +++ b/src/world/common/UnkFunc61.inc.c @@ -0,0 +1,46 @@ +#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.actionState.b[3] == 9) { + return -1; + } + if (gPartnerActionStatus.actionState.b[3] == 7) { + 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/UnkFunc62.inc.c b/src/world/common/UnkFunc62.inc.c new file mode 100644 index 0000000000..8cdd370794 --- /dev/null +++ b/src/world/common/UnkFunc62.inc.c @@ -0,0 +1,186 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkFunc62)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Actor* actor = get_actor(script->owner1.enemyID); + ActorState* state = &actor->state; + f32 stateCurrentX; + f32 stateCurrentZ; + f32 stateGoalX; + f32 stateGoalZ; + f32 oldActorY; + f32 oldActorX; + f64 currentPosX64; + f32 temp_f8_2; + f64 velocity; + f64 temp_f20_6; + f64 temp_f22_2; + f64 temp_f22_3; + f64 temp_f22_5; + f64 temp_f22_6; + f32 phi_f8; + f64 phi_f20; + f32 phi_f0; + f64 phi_f2; + f64 phi_f20_2; + f32 phi_f0_2; + f64 phi_f2_2; + + if (isInitialCall) { + actor->state.moveTime = evt_get_variable(script, *args++); + actor->state.moveArcAmplitude = evt_get_variable(script, *args++); + script->functionTemp[1] = 0; + script->functionTemp[0] = 0; + if (actor->state.moveArcAmplitude == 1) { + script->functionTemp[0] = 2; + } + } + + if (script->functionTemp[0] == 0) { + state->currentPos.x = actor->currentPos.x; + state->currentPos.y = actor->currentPos.y; + stateGoalX = state->goalPos.x; + stateGoalZ = state->goalPos.z; + stateCurrentX = state->currentPos.x; + stateCurrentZ = actor->currentPos.z; + state->currentPos.z = stateCurrentZ; + state->angle = atan2(stateCurrentX, stateCurrentZ, stateGoalX, stateGoalZ); + state->distance = dist2D(stateCurrentX, stateCurrentZ, stateGoalX, stateGoalZ); + if (state->moveTime == 0) { + state->moveTime = state->distance / state->speed; + phi_f8 = state->distance - (state->moveTime * state->speed); + } else { + state->speed = state->distance / state->moveTime; + phi_f8 = state->distance - (state->moveTime * state->speed); + } + + if (state->moveTime == 0) { + return ApiStatus_DONE2; + } + + state->unk_30.x = (state->goalPos.x - state->currentPos.x) / state->moveTime; + state->unk_30.y = (state->goalPos.y - state->currentPos.y) / state->moveTime; + state->unk_30.z = (state->goalPos.z - state->currentPos.z) / state->moveTime; + state->acceleration = PI_S / state->moveTime; + state->velocity = 0.0f; + state->speed += phi_f8 / state->moveTime; + + if (state->moveArcAmplitude < 3) { + state->unk_24 = 90.0f; + state->unk_28 = 360 / state->moveTime; + phi_f8 = state->distance; + phi_f8 -= 20.0; + phi_f8 /= 6.0; + phi_f8 += 47.0; + state->bounceDivisor = phi_f8; + if (state->moveArcAmplitude == 2) { + state->bounceDivisor *= 1.12; + } + state->unk_18.x = 0.0f; + state->unk_18.y = 0.0f; + phi_f20 = state->velocity; + temp_f22_2 = state->acceleration; + phi_f0 = sin_rad(state->unk_24 * TAU / 360.0f); + phi_f2 = 0.53; + state->velocity = phi_f20 + ((phi_f0 * phi_f2 * temp_f22_2) + temp_f22_2); + } else { + state->unk_24 = 90.0f; + state->unk_28 = 360 / state->moveTime; + phi_f8 = state->distance; + phi_f8 -= 20.0; + phi_f8 /= 6.0; + phi_f8 += 47.0; + state->bounceDivisor = phi_f8; + if (state->moveArcAmplitude == 4) { + state->bounceDivisor *= 1.25; + } + state->unk_18.x = 0.0f; + state->unk_18.y = 0.0f; + velocity = state->velocity; + temp_f22_3 = state->acceleration; + phi_f0 = sin_rad(state->unk_24 * TAU / 360.0f); + phi_f2 = 0.8; + state->velocity = velocity + ((phi_f0 * phi_f2 * temp_f22_3) + temp_f22_3); + } + set_animation(ACTOR_SELF, 1, state->animJumpRise); + sfx_play_sound(0x2081); + script->functionTemp[0] = 1; + } + + switch (script->functionTemp[0]) { + case 1: + if (state->velocity > 1.570795f) { + set_animation(ACTOR_SELF, 1, state->animJumpFall); + } + oldActorX = actor->currentPos.x; + oldActorY = actor->currentPos.y; + state->currentPos.x += state->unk_30.x; + state->currentPos.y = state->currentPos.y + state->unk_30.y; + state->currentPos.z = state->currentPos.z + state->unk_30.z; + state->unk_18.x = actor->currentPos.y; + actor->currentPos.x = state->currentPos.x; + actor->currentPos.y = state->currentPos.y + (state->bounceDivisor * sin_rad(state->velocity)); + actor->currentPos.z = state->currentPos.z; + if (state->goalPos.y > actor->currentPos.y && state->moveTime < 3) { + actor->currentPos.y = state->goalPos.y; + } + + actor->rotation.z = -atan2(oldActorX, -oldActorY, actor->currentPos.x, -actor->currentPos.y); + state->unk_18.y = actor->currentPos.y; + if (state->moveArcAmplitude < 3) { + phi_f20_2 = state->velocity; + temp_f22_5 = state->acceleration; + phi_f0_2 = sin_rad((state->unk_24 * TAU) / 360.0f); + phi_f2_2 = 0.53; + state->velocity = phi_f20_2 + ((phi_f0_2 * phi_f2_2 * temp_f22_5) + temp_f22_5); + } else { + temp_f20_6 = state->velocity; + temp_f22_6 = state->acceleration; + phi_f0_2 = sin_rad((state->unk_24 * TAU) / 360.0f); + phi_f2_2 = 0.8; + state->velocity = temp_f20_6 + ((phi_f0_2 * phi_f2_2 * temp_f22_6) + temp_f22_6); + } + + state->unk_24 += state->unk_28; + state->unk_24 = clamp_angle(state->unk_24); + state->moveTime--; + if (state->moveTime == 0) { + actor->currentPos.y = state->goalPos.y; + state->acceleration = 1.8f; + state->velocity = -(state->unk_18.x - state->unk_18.y); + set_animation(ACTOR_SELF, 1, state->animJumpLand); + return ApiStatus_DONE1; + } + break; + case 2: + state->moveTime = 1; + state->acceleration = 1.8f; + state->unk_24 = 90.0f; + state->velocity = -(state->unk_18.x - state->unk_18.y); + state->bounceDivisor = fabsf(state->unk_18.x - state->unk_18.y) / 16.5; + state->unk_28 = 360 / state->moveTime; + state->currentPos.x = actor->currentPos.x; + state->currentPos.y = actor->currentPos.y; + state->currentPos.z = actor->currentPos.z; + script->functionTemp[0] = 3; + // fallthrough + case 3: + currentPosX64 = state->currentPos.x; // required to match + state->currentPos.x = currentPosX64 + state->bounceDivisor * sin_rad((state->unk_24 * TAU) / 360.0f) / 33.0; + state->currentPos.y -= state->bounceDivisor * sin_rad((state->unk_24 * TAU) / 360.0f); + state->unk_24 += state->unk_28; + state->unk_24 = clamp_angle(state->unk_24); + actor->currentPos.x = state->currentPos.x; + actor->currentPos.y = state->currentPos.y; + actor->currentPos.z = state->currentPos.z; + + state->moveTime--; + if (state->moveTime == 0) { + return ApiStatus_DONE1; + } + break; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/UnkNpcAIFunc12.inc.c b/src/world/common/UnkNpcAIFunc12.inc.c index 89986d7c9a..e45bd2f23f 100644 --- a/src/world/common/UnkNpcAIFunc12.inc.c +++ b/src/world/common/UnkNpcAIFunc12.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -void N(UnkNpcAIFunc12)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territoryPtr) { +void N(UnkNpcAIFunc12)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 temp; diff --git a/src/world/common/UnkNpcAIFunc47.inc.c b/src/world/common/UnkNpcAIFunc47.inc.c new file mode 100644 index 0000000000..742d641c68 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc47.inc.c @@ -0,0 +1,40 @@ +#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.actionState.b[3] == 9 || gPartnerActionStatus.actionState.b[3] == 7) { + 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 new file mode 100644 index 0000000000..c6b51abcd3 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc48.inc.c @@ -0,0 +1,25 @@ +#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(2, 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 new file mode 100644 index 0000000000..a6efd71a97 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc49.inc.c @@ -0,0 +1,29 @@ +#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(2, 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/UnkNpcAIMainFunc10.inc.c b/src/world/common/UnkNpcAIMainFunc10.inc.c new file mode 100644 index 0000000000..409e588671 --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc10.inc.c @@ -0,0 +1,62 @@ +#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 & 4) { + if (enemy->unk_B4) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~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/UnkNpcAIMainFunc5.inc.c b/src/world/common/UnkNpcAIMainFunc5.inc.c index 62deb319d4..849aa9bfda 100644 --- a/src/world/common/UnkNpcAIMainFunc5.inc.c +++ b/src/world/common/UnkNpcAIMainFunc5.inc.c @@ -48,7 +48,7 @@ ApiStatus N(UnkNpcAIMainFunc5)(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0x28, &emoteTemp); + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); enemy->unk_B0 &= ~4; } else if (enemy->flags & ENEMY_FLAGS_40000000) { script->functionTemp[0] = 12; diff --git a/src/world/common/UnkNpcAIMainFunc7.inc.c b/src/world/common/UnkNpcAIMainFunc7.inc.c new file mode 100644 index 0000000000..19c77022e3 --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc7.inc.c @@ -0,0 +1,100 @@ +#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 & 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 & 4) { + script->functionTemp[0] = 99; + script->functionTemp[1] = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->functionTemp[0] = 12; + } + enemy->unk_B0 &= ~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/UnkNpcAIMainFunc8.inc.c b/src/world/common/UnkNpcAIMainFunc8.inc.c new file mode 100644 index 0000000000..16d6929e30 --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc8.inc.c @@ -0,0 +1,92 @@ +#include "common.h" +#include "npc.h" +#include "effects.h" + +ApiStatus N(UnkNpcAIMainFunc8)(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* 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; + + if (isInitialCall) { + enemy->varTable[6] = npc->collisionHeight; + enemy->unk_B0 |= 8; + } + + if (isInitialCall || (enemy->unk_B0 & 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->collisionHeight = enemy->varTable[6]; + enemy->unk_B5 = 0; + enemy->varTable[8] = 0; + + 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->unk_B0 & 4) { + s32 emoteTemp; + + script->functionTemp[0] = 99; + script->functionTemp[1] = 0; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); + enemy->unk_B0 &= ~4; + } else if (enemy->flags & ENEMY_FLAGS_40000000) { + script->functionTemp[0] = 12; + enemy->flags &= ~ENEMY_FLAGS_40000000; + } + } + + switch (script->functionTemp[0]) { + case 0: + N(UnkNpcAIFunc24)(script, settings, territoryPtr); + npc->collisionHeight = enemy->varTable[6]; + /* fallthrough */ + case 1: + N(UnkFunc13)(script, settings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, settings, territoryPtr); + /* fallthrough */ + case 3: + N(UnkFunc14)(script, settings, territoryPtr); + break; + case 4: + N(UnkNpcAIFunc25)(script, settings, territoryPtr); + break; + case 12: + N(set_script_owner_npc_anim)(script, settings, territoryPtr); + /* fallthrough */ + case 13: + N(UnkDistFunc)(script, settings, territoryPtr); + break; + case 14: + N(UnkNpcAIFunc12)(script, settings, territoryPtr); + break; + case 15: + N(set_script_owner_npc_col_height)(script, settings, territoryPtr); + 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 new file mode 100644 index 0000000000..d0909638af --- /dev/null +++ b/src/world/common/UnkNpcAIMainFunc9.inc.c @@ -0,0 +1,63 @@ +#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 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~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/tools/find_duplicates.py b/tools/find_duplicates.py index 04d8d8f02e..aafdcb81f0 100755 --- a/tools/find_duplicates.py +++ b/tools/find_duplicates.py @@ -175,7 +175,7 @@ def do_query(query): for match in matches: if i == args.num_out: break - match_str = "{:.2f} - {}".format(matches[match], match) + match_str = "{:.3f} - {}".format(matches[match], match) if match not in s_files: match_str += " (decompiled)" print(match_str) diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 1bbed95b97..75121de305 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -31,10 +31,12 @@ func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; dead_get_npc_safe = 0x8003E534; // get_npc_safe dead_heap_malloc = 0x8002BFD4; +dead_general_heap_malloc = 0x8002BF18; func_8002C01C = 0x8002C01C; dead_evt_set_variable = 0x802D5468; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; +dead_sin_cos_deg = 0x8002B524; dead_subtract_hp = 0x800F1EF8; dead_sfx_adjust_env_sound_pos = 0x8015704C; dead_evt_get_float_variable = 0x802D57FC; @@ -97,3 +99,4 @@ func_8002B45C = 0x8002B45C; func_801266F8 = 0x801266F8; func_80126734 = 0x80126734; dead_set_screen_overlay_params_back = 0x80144194; +dead_fx_motion_blur_flame = 0x80076970; diff --git a/ver/us/asm/data/16A680.data.s b/ver/us/asm/data/16A680.data.s index 3a06466a06..cc20b1f5de 100644 --- a/ver/us/asm/data/16A680.data.s +++ b/ver/us/asm/data/16A680.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80249E20 -.word 0x802423DC, func_80242434_9D9454, 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_SetCamVfov, func_80242358_DCF028, func_80242384_833B84, D_802423B0 +.word 0x802423DC, func_80242434_9D9454, 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_SetCamVfov, omo_09_UnkFunc61, func_80242384_833B84, D_802423B0 dlabel D_80249E70 .word 0x00000102, 0x02030405, 0x06000001, 0x02020306, 0x06060000, 0x01020203, 0x06060600, 0x00010202, 0x03060606, 0x00000102, 0x02030606, 0x06000000 @@ -36,7 +36,7 @@ dlabel D_8024A158 .word 0x00000000, 0x00010100, D_8024A130, filemenu_info_init, filemenu_info_handle_input, filemenu_info_update, filemenu_info_cleanup, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024A180 -.word dgb_00_init_80241F70, func_80241FBC_A1D0BC, kzn_09_UnkNpcAIFunc12 +.word dgb_00_init_80241F70, some_80241FBC, kzn_09_UnkNpcAIFunc12 dlabel D_8024A18C .word 0xFFFFFFFC diff --git a/ver/us/asm/data/ECBC10.data.s b/ver/us/asm/data/ECBC10.data.s index eae5cde725..a878bd8479 100644 --- a/ver/us/asm/data/ECBC10.data.s +++ b/ver/us/asm/data/ECBC10.data.s @@ -17,11 +17,11 @@ dlabel D_80241FE8_ECBCE8 dlabel D_80241FF8_ECBCF8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80242038_ECBD38 +dlabel EC9D00_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80242044_ECBD44 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EC9D00_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_EC9D3C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EC9D00_UnkFunc22, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_ECA300, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EC9D00_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EC9D00_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_EC9D3C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EC9D00_UnkFunc22, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EC9D00_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421A8_ECBEA8 .word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC9D00_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EC9D00_SetOverrideFlags_40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EC9D00_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EC9D00_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_EC9ECC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EC9D00_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242044_ECBD44, 0x00000043, 0x00000003, EC9D00_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, EC9D00_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, EC9D00_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EC9D00_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/ED1840.data.s b/ver/us/asm/data/ED1840.data.s index 02841c4817..bb2454ac29 100644 --- a/ver/us/asm/data/ED1840.data.s +++ b/ver/us/asm/data/ED1840.data.s @@ -92,7 +92,7 @@ dlabel D_80243610_ED3600 dlabel D_80243630_ED3620 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80243610_ED3600, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 -dlabel D_8024365C_ED364C +dlabel ED0310_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80243674_ED3664 diff --git a/ver/us/asm/data/EE20E0.data.s b/ver/us/asm/data/EE20E0.data.s index 6d5304df6e..75540ad3bf 100644 --- a/ver/us/asm/data/EE20E0.data.s +++ b/ver/us/asm/data/EE20E0.data.s @@ -41,7 +41,7 @@ dlabel D_80243E9C_EE285C dlabel D_802441B0_EE2B70 .word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 -dlabel D_802441DC_EE2B9C +dlabel EDEA00_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802441F4_EE2BB4 diff --git a/ver/us/asm/data/EE8970.data.s b/ver/us/asm/data/EE8970.data.s index 7f5e6fd0c5..0ce01c7837 100644 --- a/ver/us/asm/data/EE8970.data.s +++ b/ver/us/asm/data/EE8970.data.s @@ -65,7 +65,7 @@ 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 D_802444F0_EEAAA0 +dlabel EE70C0_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244508_EEAAB8 diff --git a/ver/us/asm/data/EEFAD0.data.s b/ver/us/asm/data/EEFAD0.data.s index b89e9f2c99..b464aaba93 100644 --- a/ver/us/asm/data/EEFAD0.data.s +++ b/ver/us/asm/data/EEFAD0.data.s @@ -41,11 +41,11 @@ dlabel D_80243768_EF0868 dlabel D_80243778_EF0878 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_802437B8_EF08B8 +dlabel EED1E0_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_802437C4_EF08C4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EED1E0_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_EED21C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EED1E0_UnkFunc22, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_EED7E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, EED1E0_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, EED1E0_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_EED21C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, EED1E0_UnkFunc22, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, EED1E0_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243928_EF0A28 .word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EED1E0_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, EED1E0_SetOverrideFlags_40, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EED1E0_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, EED1E0_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_EED3AC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, EED1E0_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802437C4_EF08C4, 0x00000043, 0x00000003, EED1E0_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, EED1E0_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, EED1E0_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, EED1E0_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -62,7 +62,7 @@ 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 D_80244070_EF1170 +dlabel EEDF50_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80244088_EF1188 diff --git a/ver/us/asm/data/EF58E0.data.s b/ver/us/asm/data/EF58E0.data.s index a22ec4c845..b5f83b90ab 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 D_802444BC_EF6ACC +dlabel EF2680_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_802444D4_EF6AE4 diff --git a/ver/us/asm/data/battle/area_kpa3/6BD250.data.s b/ver/us/asm/data/battle/area_kpa3/6BD250.data.s index 1908367039..3a8a1d19ab 100644 --- a/ver/us/asm/data/battle/area_kpa3/6BD250.data.s +++ b/ver/us/asm/data/battle/area_kpa3/6BD250.data.s @@ -126,7 +126,7 @@ dlabel D_8021DAAC_6C163C .word 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x0000000D, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C8B, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C8B, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021DB94_6C1724 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000046, 0x00000001, D_8021D9C8_6C1558, 0x00000046, 0x00000001, D_8021DAAC_6C163C, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C8A, 0x00000010, 0x00000002, 0xFE363C8A, 0x00080000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A974D, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A98E7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A88E7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090007, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000005, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000200D, 0x00000043, 0x00000003, func_802180D0_6BBC60, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000001, b_area_kpa3_ActorJumpToPos, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D540_6C10D0, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000010, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetActorHP, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_802180D0_6BBC60, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_802180D0_6BBC60, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0xF1194D80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000085, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0xF1194D80, 0xFE363C80, 0xF1194D80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_802180D0_6BBC60, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D540_6C10D0, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000046, 0x00000001, D_8021D9C8_6C1558, 0x00000046, 0x00000001, D_8021DAAC_6C163C, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C8A, 0x00000010, 0x00000002, 0xFE363C8A, 0x00080000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A974D, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A98E7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A88E7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090007, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000005, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000200D, 0x00000043, 0x00000003, b_area_kpa3_UnkFunc62, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000001, b_area_kpa3_ActorJumpToPos, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D540_6C10D0, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000010, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetActorHP, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_kpa3_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_kpa3_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0xF1194D80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000085, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0xF1194D80, 0xFE363C80, 0xF1194D80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_kpa3_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D540_6C10D0, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021E620_6C21B0 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000004, 0x00000001, 0x00000043, 0x00000002, b_area_kpa3_UnkEffect6CFunc, 0xFE363C85, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, func_802535B4, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetCamFlag80, 0x00000002, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000002, 0x00000006, 0x00000019, 0x00000010, 0x00000400, 0x00000043, 0x00000006, SetCamViewport, 0x00000002, 0x00000025, 0x0000005F, 0x0000008A, 0x00000063, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, b_area_kpa3_UnkActorSizeFunc, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, func_802CAE50, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802CABE8, 0x00000002, 0x00000000, 0xFE363C83, 0x00000064, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000282, 0x00000043, 0x00000003, SetCamFlag80, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ActorSpeak, 0x001C0092, 0xFFFFFF81, 0x00000001, 0x0009000F, 0x00090001, 0x00000043, 0x00000002, func_80218BFC_6BC78C, 0xFE363C85, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetCamEnabled, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000002, func_802535B4, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/area_omo2/52B9D0.data.s b/ver/us/asm/data/battle/area_omo2/52B9D0.data.s index 29e18471b4..b561a59403 100644 --- a/ver/us/asm/data/battle/area_omo2/52B9D0.data.s +++ b/ver/us/asm/data/battle/area_omo2/52B9D0.data.s @@ -216,13 +216,13 @@ dlabel D_8022F58C_542C2C .word 0x80231418, D_8022F548_542BE8, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_8022F5A8_542C48 -.word D_802312E0_63CE80, D_8022F548_542BE8, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word D_802312E0_battle_area_omo2, D_8022F548_542BE8, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_8022F5C4_542C64 -.word D_802312E0_63CE80, D_8022F548_542BE8, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word D_802312E0_battle_area_omo2, D_8022F548_542BE8, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_8022F5E0_542C80 -.word D_802312F8_63CE98, D_8022F548_542BE8, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word D_802312F8_battle_area_omo2, D_8022F548_542BE8, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_8022F600_542CA0 .word 0x00000001, 0x00000001, 0x0000000C, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/area_pra3/66BC90.data.s b/ver/us/asm/data/battle/area_pra3/66BC90.data.s index 57d8955e56..e6d595fb63 100644 --- a/ver/us/asm/data/battle/area_pra3/66BC90.data.s +++ b/ver/us/asm/data/battle/area_pra3/66BC90.data.s @@ -90,7 +90,7 @@ dlabel D_8021C7FC_66E57C .word 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x0000000D, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C8B, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C8B, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021C8E4_66E664 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000046, 0x00000001, D_8021C718_66E498, 0x00000046, 0x00000001, D_8021C7FC_66E57C, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C8A, 0x00000010, 0x00000002, 0xFE363C8A, 0x00080000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A974D, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A98E7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A88E7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090007, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000005, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000200D, 0x00000043, 0x00000003, func_80218000_669D80, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000001, b_area_pra3_ActorJumpToPos, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021C290_66E010, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000010, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetActorHP, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_80218000_669D80, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_80218000_669D80, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0xF1194D80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000085, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0xF1194D80, 0xFE363C80, 0xF1194D80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_80218000_669D80, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021C290_66E010, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000046, 0x00000001, D_8021C718_66E498, 0x00000046, 0x00000001, D_8021C7FC_66E57C, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C8A, 0x00000010, 0x00000002, 0xFE363C8A, 0x00080000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A974D, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A98E7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A88E7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090007, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000005, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000200D, 0x00000043, 0x00000003, b_area_pra3_UnkFunc62, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000001, b_area_pra3_ActorJumpToPos, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021C290_66E010, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000010, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetActorHP, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_pra3_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_pra3_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0xF1194D80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000085, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0xF1194D80, 0xFE363C80, 0xF1194D80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_pra3_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021C290_66E010, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021D370_66F0F0 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000004, 0x00000001, 0x00000043, 0x00000002, b_area_pra3_UnkEffect6CFunc, 0xFE363C85, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, func_802535B4, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetCamFlag80, 0x00000002, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000002, 0x00000006, 0x00000019, 0x00000010, 0x00000400, 0x00000043, 0x00000006, SetCamViewport, 0x00000002, 0x00000025, 0x0000005F, 0x0000008A, 0x00000063, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, b_area_pra3_UnkActorSizeFunc, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, func_802CAE50, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802CABE8, 0x00000002, 0x00000000, 0xFE363C83, 0x00000064, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000282, 0x00000043, 0x00000003, SetCamFlag80, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ActorSpeak, 0x001C0092, 0xFFFFFF81, 0x00000001, 0x0009000F, 0x00090001, 0x00000043, 0x00000002, func_80218B2C_66A8AC, 0xFE363C85, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetCamEnabled, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000002, func_802535B4, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -640,144 +640,3 @@ dlabel D_802327C4_684544 dlabel D_80232834_6845B4 .word D_8022B268_67CFE8, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8022B268_67CFE8, 0x00000001, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8021A050_66BDD0, 0x00000002, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80232C54_6849D4, 0x00000003, D_802324D0_684250, D_80231B0C_68388C, 0x00000000, D_80232C48_6849C8, 0x00000001, D_80232524_6842A4, D_80231B0C_68388C, 0x00000000, D_80232C3C_6849BC, 0x00000002, D_80232540_6842C0, D_80231B0C_68388C, 0x00000000, D_80232C30_6849B0, 0x00000003, D_80232578_6842F8, D_80231B0C_68388C, 0x00000000, D_80232C24_6849A4, 0x00000004, D_802325CC_68434C, D_80231B0C_68388C, 0x00000000, D_80232C04_684984, 0x00000003, D_8023263C_6843BC, D_80231B0C_68388C, 0x00000000, D_80232BE0_684960, 0x00000003, D_80232690_684410, D_80231B0C_68388C, 0x00000000, D_80232BC8_684948, 0x00000002, D_802326E4_684464, D_80231B0C_68388C, 0x00000000, D_80232BAC_68492C, 0x00000003, D_8023271C_68449C, D_80231B0C_68388C, 0x00000000, D_80232B88_684908, 0x00000003, D_80232770_6844F0, D_80231B0C_68388C, 0x00000000, D_80232B5C_6848DC, 0x00000004, D_802327C4_684544, D_80231B0C_68388C, 0x00000000, D_80232B40_6848C0, 0x00000003, D_80232834_6845B4, D_80231B0C_68388C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80232C9C_684A1C, D_80231B0C_68388C, D_80232C94_684A14, D_80231EEC_683C6C, D_80232C8C_684A0C, D_80231F6C_683CEC, D_80232C84_684A04, D_80232000_683D80, D_80232C7C_6849FC, D_802320A4_683E24, D_80232C74_6849F4, D_8023246C_6841EC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802329D0_684750 -.double 47.0 - -dlabel D_802329D8_684758 -.double 1.12 - -dlabel D_802329E0_684760 -.double 0.53 - -dlabel D_802329E8_684768 -.double 47.0 - -dlabel D_802329F0_684770 -.double 0.8 - -dlabel D_802329F8_684778 -.double 0.53 - -dlabel D_80232A00_684780 -.double 0.8 - -dlabel D_80232A08_684788 -.double 16.5 - -dlabel D_80232A10_684790 -.double 33.0 - -dlabel D_80232A18_684798 -.double 4.800000000000001 - -dlabel jtbl_80232A20_6847A0 -.word L80219578_66B2F8, L80219584_66B304, L80219590_66B310, L8021959C_66B31C, L802195D4_66B354, L802195B4_66B334, L802195C0_66B340, L802195CC_66B34C, L802195A8_66B328, 0, 0, 0 - -dlabel D_80232A50_6847D0 -.word 0x7072615F, 0x62743031, 0x5F686974, 0x00000000 - -dlabel D_80232A60_6847E0 -.word 0x7072615F, 0x62743031, 0x5F736861, 0x70650000 - -dlabel D_80232A70_6847F0 -.word 0x7072615F, 0x74657800 - -dlabel D_80232A78_6847F8 -.word 0x7072615F, 0x62743032, 0x5F686974, 0x00000000 - -dlabel D_80232A88_684808 -.word 0x7072615F, 0x62743032, 0x5F736861, 0x70650000 - -dlabel D_80232A98_684818 -.word 0x7072615F, 0x74657800 - -dlabel D_80232AA0_684820 -.word 0x7072615F, 0x62743033, 0x5F686974, 0x00000000 - -dlabel D_80232AB0_684830 -.word 0x7072615F, 0x62743033, 0x5F736861, 0x70650000 - -dlabel D_80232AC0_684840 -.word 0x7072615F, 0x74657800 - -dlabel D_80232AC8_684848 -.word 0x7072615F, 0x62743033, 0x5F686974, 0x00000000 - -dlabel D_80232AD8_684858 -.word 0x7072615F, 0x62743033, 0x5F736861, 0x70650000 - -dlabel D_80232AE8_684868 -.word 0x7072615F, 0x74657800 - -dlabel D_80232AF0_684870 -.word 0x7072615F, 0x62743033, 0x5F686974, 0x00000000 - -dlabel D_80232B00_684880 -.word 0x7072615F, 0x62743033, 0x5F736861, 0x70650000 - -dlabel D_80232B10_684890 -.word 0x7072615F, 0x74657800 - -dlabel D_80232B18_684898 -.word 0x7072615F, 0x62743034, 0x5F686974, 0x00000000 - -dlabel D_80232B28_6848A8 -.word 0x7072615F, 0x62743034, 0x5F736861, 0x70650000 - -dlabel D_80232B38_6848B8 -.word 0x7072615F, 0x74657800 - -dlabel D_80232B40_6848C0 -.word 0x837A838F, 0x83438367, 0x834B837B, 0x83937882, 0x512C836F, 0x8350836F, 0x83500000 - -dlabel D_80232B5C_6848DC -.word 0x836F8350, 0x836F8350, 0x7882512C, 0x834F838C, 0x8343834A, 0x83818362, 0x834E2C83, 0x8C836283, 0x68834A83, 0x81836283, 0x4E000000 - -dlabel D_80232B88_684908 -.word 0x836F8350, 0x836F8350, 0x2C837A83, 0x8F834383, 0x67834B83, 0x7B83932C, 0x836F8350, 0x836F8350, 0x00000000 - -dlabel D_80232BAC_68492C -.word 0x836F8350, 0x836F8350, 0x7882512C, 0x838C8362, 0x8368834A, 0x83818362, 0x834E0000 - -dlabel D_80232BC8_684948 -.word 0x836F8350, 0x836F8350, 0x2C838C83, 0x62836883, 0x4A838183, 0x62834E00 - -dlabel D_80232BE0_684960 -.word 0x836F8350, 0x836F8350, 0x2C836F83, 0x54836F83, 0x54836083, 0x85838B83, 0x8B2C836F, 0x8350836F, 0x83500000 - -dlabel D_80232C04_684984 -.word 0x836F8350, 0x836F8350, 0x7882512C, 0x836F8354, 0x836F8354, 0x83608385, 0x838B838B, 0x00000000 - -dlabel D_80232C24_6849A4 -.word 0x836F8350, 0x836F8350, 0x78340000 - -dlabel D_80232C30_6849B0 -.word 0x836F8350, 0x836F8350, 0x78330000 - -dlabel D_80232C3C_6849BC -.word 0x836F8350, 0x836F8350, 0x78320000 - -dlabel D_80232C48_6849C8 -.word 0x836F8350, 0x836F8350, 0x00000000 - -dlabel D_80232C54_6849D4 -.word 0x836F8354, 0x836F8354, 0x83608385, 0x838B838B, 0x7882512C, 0x836F8350, 0x836F8350, 0x00000000 - -dlabel D_80232C74_6849F4 -.word 0x7072615F, 0x30340000 - -dlabel D_80232C7C_6849FC -.word 0x7072615F, 0x30336300 - -dlabel D_80232C84_684A04 -.word 0x7072615F, 0x30336200 - -dlabel D_80232C8C_684A0C -.word 0x7072615F, 0x30330000 - -dlabel D_80232C94_684A14 -.word 0x7072615F, 0x30320000 - -dlabel D_80232C9C_684A1C -.word 0x7072615F, 0x30310000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/area_sam/626A30.data.s b/ver/us/asm/data/battle/area_sam/626A30.data.s index ac04dcf860..88b917b349 100644 --- a/ver/us/asm/data/battle/area_sam/626A30.data.s +++ b/ver/us/asm/data/battle/area_sam/626A30.data.s @@ -90,7 +90,7 @@ dlabel D_8021D77C_62931C .word 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x0000000D, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C8B, 0xF24AA4DB, 0x0000002C, 0x00000002, 0xFE363C8B, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021D864_629404 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000046, 0x00000001, D_8021D698_629238, 0x00000046, 0x00000001, D_8021D77C_62931C, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C8A, 0x00000010, 0x00000002, 0xFE363C8A, 0x00080000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A974D, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A98E7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A88E7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090007, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000005, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000200D, 0x00000043, 0x00000003, func_80218000_623BA0, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000001, b_area_sam_ActorJumpToPos, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D210_628DB0, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000010, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetActorHP, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_80218000_623BA0, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_80218000_623BA0, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0xF1194D80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000085, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0xF1194D80, 0xFE363C80, 0xF1194D80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, func_80218000_623BA0, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D210_628DB0, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000046, 0x00000001, D_8021D698_629238, 0x00000046, 0x00000001, D_8021D77C_62931C, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C8A, 0x00000010, 0x00000002, 0xFE363C8A, 0x00080000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A974D, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A98E7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A88E7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090007, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000043, 0x00000005, SetActorDispOffset, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000005, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000200D, 0x00000043, 0x00000003, b_area_sam_UnkFunc62, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000001, b_area_sam_ActorJumpToPos, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D210_628DB0, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000010, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetActorHP, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000018, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_sam_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_sam_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0xF1194D80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000085, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0xF1194D80, 0xFE363C80, 0xF1194D80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000006, SetJumpAnimations, 0xFFFFFF81, 0x00000001, 0x00090006, 0x00090006, 0x00090006, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000281, 0x00000043, 0x00000003, b_area_sam_UnkFunc62, 0xFE363C8A, 0x00000003, 0x00000043, 0x00000003, EnableActorBlur, 0xFFFFFF81, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7EE7, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7FB4, 0xF24A7C80, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SetPartScale, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000001, YieldTurn, 0x00000046, 0x00000001, D_8021D210_628DB0, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021E2F0_629E90 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000004, 0x00000001, 0x00000043, 0x00000002, b_area_sam_UnkEffect6CFunc, 0xFE363C85, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, func_802535B4, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetCamFlag80, 0x00000002, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000002, 0x00000006, 0x00000019, 0x00000010, 0x00000400, 0x00000043, 0x00000006, SetCamViewport, 0x00000002, 0x00000025, 0x0000005F, 0x0000008A, 0x00000063, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, b_area_sam_UnkActorSizeFunc, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, func_802CAE50, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802CABE8, 0x00000002, 0x00000000, 0xFE363C83, 0x00000064, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000282, 0x00000043, 0x00000003, SetCamFlag80, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ActorSpeak, 0x001C0092, 0xFFFFFF81, 0x00000001, 0x0009000F, 0x00090001, 0x00000043, 0x00000002, func_80218B2C_6246CC, 0xFE363C85, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetCamEnabled, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000002, func_802535B4, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -835,168 +835,3 @@ dlabel D_80231084_63CC24 dlabel D_802310F4_63CC94 .word D_80229BF8_635798, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8022ABE8_636788, 0x00000001, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80229BF8_635798, 0x00000002, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8022C510_6380B0, 0x00000003, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80231600_63D1A0, 0x00000002, D_80230850_63C3F0, D_8022F3B4_63AF54, 0x00000000, D_802315F4_63D194, 0x00000007, D_80230888_63C428, D_8022F3B4_63AF54, 0x00000000, D_802315E8_63D188, 0x00000008, D_8023094C_63C4EC, D_8022F3B4_63AF54, 0x00000000, D_802315CC_63D16C, 0x00000008, D_80230A2C_63C5CC, D_8022F3B4_63AF54, 0x00000000, D_802315A8_63D148, 0x00000008, D_80230B0C_63C6AC, D_8022F3B4_63AF54, 0x00000000, D_80231578_63D118, 0x00000009, D_80230BEC_63C78C, D_8022F3B4_63AF54, 0x00000000, D_80231564_63D104, 0x00000002, D_80230CE8_63C888, D_8022F3B4_63AF54, 0x00000000, D_80231550_63D0F0, 0x00000004, D_80230D20_63C8C0, D_8022F3B4_63AF54, 0x00000000, D_80231534_63D0D4, 0x00000008, D_80230D90_63C930, D_8022F3B4_63AF54, 0x00000000, D_8023150C_63D0AC, 0x00000008, D_80230E70_63CA10, D_8022F3B4_63AF54, 0x00000000, D_802314DC_63D07C, 0x00000009, D_80230F50_63CAF0, D_8022F3B4_63AF54, 0x00000000, D_802314C8_63D068, 0x00000002, D_8023104C_63CBEC, D_8022F3B4_63AF54, 0x00000000, D_802314A0_63D040, 0x00000004, D_80231084_63CC24, D_8022F3B4_63AF54, 0x00000000, D_80231470_63D010, 0x00000004, D_802310F4_63CC94, D_8022F3B4_63AF54, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80231634_63D1D4, D_8022F3B4_63AF54, D_8023162C_63D1CC, D_8022F7EC_63B38C, D_80231624_63D1C4, D_8022FB48_63B6E8, D_8023161C_63D1BC, D_8022FEAC_63BA4C, D_80231614_63D1B4, D_80230230_63BDD0, D_8023160C_63D1AC, D_80230644_63C1E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802312D0_63CE70 -.double 47.0 - -dlabel D_802312D8_63CE78 -.double 1.12 - -dlabel D_802312E0_63CE80 -.double 0.53 - -dlabel D_802312E8_63CE88 -.double 47.0 - -dlabel D_802312F0_63CE90 -.double 0.8 - -dlabel D_802312F8_63CE98 -.double 0.53 - -dlabel D_80231300_63CEA0 -.double 0.8 - -dlabel D_80231308_63CEA8 -.double 16.5 - -dlabel D_80231310_63CEB0 -.double 33.0 - -dlabel D_80231318_63CEB8 -.double 4.800000000000001 - -dlabel jtbl_80231320_63CEC0 -.word L80219578_625118, L80219584_625124, L80219590_625130, L8021959C_62513C, L802195D4_625174, L802195B4_625154, L802195C0_625160, L802195CC_62516C, L802195A8_625148, 0, 0, 0 - -dlabel D_80231350_63CEF0 -.word 0x796B695F, 0x62670000 - -dlabel D_80231358_63CEF8 -.word 0x73616D5F, 0x62743031, 0x5F686974, 0x00000000 - -dlabel D_80231368_63CF08 -.word 0x73616D5F, 0x62743031, 0x5F736861, 0x70650000 - -dlabel D_80231378_63CF18 -.word 0x73616D5F, 0x74657800 - -dlabel D_80231380_63CF20 -.word 0x796B695F, 0x62670000 - -dlabel D_80231388_63CF28 -.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 - -dlabel D_80231398_63CF38 -.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 - -dlabel D_802313A8_63CF48 -.word 0x73616D5F, 0x74657800 - -dlabel D_802313B0_63CF50 -.word 0x796B695F, 0x62670000 - -dlabel D_802313B8_63CF58 -.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 - -dlabel D_802313C8_63CF68 -.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 - -dlabel D_802313D8_63CF78 -.word 0x73616D5F, 0x74657800 - -dlabel D_802313E0_63CF80 -.word 0x796B695F, 0x62670000 - -dlabel D_802313E8_63CF88 -.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 - -dlabel D_802313F8_63CF98 -.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 - -dlabel D_80231408_63CFA8 -.word 0x73616D5F, 0x74657800 - -dlabel D_80231410_63CFB0 -.word 0x796B695F, 0x62670000 - -dlabel D_80231418_63CFB8 -.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 - -dlabel D_80231428_63CFC8 -.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 - -dlabel D_80231438_63CFD8 -.word 0x73616D5F, 0x74657800 - -dlabel D_80231440_63CFE0 -.word 0x73616D5F, 0x62670000 - -dlabel D_80231448_63CFE8 -.word 0x73616D5F, 0x62743033, 0x5F686974, 0x00000000 - -dlabel D_80231458_63CFF8 -.word 0x73616D5F, 0x62743033, 0x5F736861, 0x70650000 - -dlabel D_80231468_63D008 -.word 0x73616D5F, 0x74657800 - -dlabel D_80231470_63D010 -.word 0x837A838F, 0x83438367, 0x834B837B, 0x83932C83, 0x70836283, 0x4E83932C, 0x834B837B, 0x83932C83, 0x4F838C83, 0x43834A83, 0x81836283, 0x4E000000 - -dlabel D_802314A0_63D040 -.word 0x837A838F, 0x83438367, 0x834B837B, 0x83932C83, 0x70836283, 0x4E83932C, 0x834B837B, 0x83932C83, 0x70836283, 0x4E839300 - -dlabel D_802314C8_63D068 -.word 0x837A838F, 0x83438367, 0x834B837B, 0x83937882, 0x51000000 - -dlabel D_802314DC_63D07C -.word 0x83418343, 0x83588370, 0x8362834E, 0x83932C83, 0x53836283, 0x4E83932C, 0x83418343, 0x83588370, 0x8362834E, 0x83932C83, 0x53836283, 0x4E839300 - -dlabel D_8023150C_63D0AC -.word 0x83418343, 0x83588370, 0x8362834E, 0x83932C83, 0x53836283, 0x4E83932C, 0x83418343, 0x83588370, 0x8362834E, 0x83930000 - -dlabel D_80231534_63D0D4 -.word 0x83418343, 0x83588370, 0x8362834E, 0x83937882, 0x512C8353, 0x8362834E, 0x83930000 - -dlabel D_80231550_63D0F0 -.word 0x83418343, 0x83588370, 0x8362834E, 0x83937882, 0x53000000 - -dlabel D_80231564_63D104 -.word 0x83418343, 0x83588370, 0x8362834E, 0x83937882, 0x51000000 - -dlabel D_80231578_63D118 -.word 0x83538362, 0x834E8393, 0x2C834183, 0x43835883, 0x70836283, 0x4E83932C, 0x83538362, 0x834E8393, 0x2C834183, 0x43835883, 0x70836283, 0x4E839300 - -dlabel D_802315A8_63D148 -.word 0x83538362, 0x834E8393, 0x2C834183, 0x43835883, 0x70836283, 0x4E83932C, 0x83538362, 0x834E8393, 0x00000000 - -dlabel D_802315CC_63D16C -.word 0x83538362, 0x834E8393, 0x78322C83, 0x41834383, 0x58837083, 0x62834E83, 0x93000000 - -dlabel D_802315E8_63D188 -.word 0x83538362, 0x834E8393, 0x78330000 - -dlabel D_802315F4_63D194 -.word 0x83538362, 0x834E8393, 0x78320000 - -dlabel D_80231600_63D1A0 -.word 0x836F8350, 0x836F8350, 0x78320000 - -dlabel D_8023160C_63D1AC -.word 0x73616D5F, 0x30330000 - -dlabel D_80231614_63D1B4 -.word 0x73616D5F, 0x30326400 - -dlabel D_8023161C_63D1BC -.word 0x73616D5F, 0x30326300 - -dlabel D_80231624_63D1C4 -.word 0x73616D5F, 0x30326200 - -dlabel D_8023162C_63D1CC -.word 0x73616D5F, 0x30320000 - -dlabel D_80231634_63D1D4 -.word 0x73616D5F, 0x30310000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_03/BE04B0.data.s b/ver/us/asm/data/world/area_arn/arn_03/BE04B0.data.s deleted file mode 100644 index 8a886e1591..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_03/BE04B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241720_BE04B0 -.word 0xC2980000, 0x43250000, 0x43160000, 0x42B40000, 0x44100000, 0x43610000, 0x43160000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241A58, D_80241720_BE04B0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900BC, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_03/BE05C0.data.s b/ver/us/asm/data/world/area_arn/arn_03/BE05C0.data.s deleted file mode 100644 index c9ce8486bc..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_03/BE05C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241830_BE05C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244850, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244858, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241830_BE05C0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024188C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, 0x802418E8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDE, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF51, 0x000000A5, 0x000000A0, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF51, 0x000000A5, 0x000000A0, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0x00000004, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFC9, 0x000000A0, 0x00000000, 0x00000044, 0x00000001, 0x802418E8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802418E8, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000022, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF0, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244740, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244788, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F7C, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x000001C2, 0x00000024, 0x00000002, 0xFD050F81, 0x000001C2, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802447E0, 0x00000044, 0x00000001, 0x80241780, 0x00000044, 0x00000001, 0x80241930, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_03/BE0950.data.s b/ver/us/asm/data/world/area_arn/arn_03/BE0950.data.s deleted file mode 100644 index 65555eea1c..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_03/BE0950.data.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241BC0_BE0950 -.word 0x3F800000, 0x00000019, 0x0000001E, 0x42480000, 0x42480000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x42C80000, 0x42A00000, 0x00000001, 0x00000043, 0x00000002, func_8024113C_BDFECC, D_80241BC0_BE0950, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80241BF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241C68_BE09FC -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CD0_BE0A64 -.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, arn_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_80241648_BE03D8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241680_BE0410, 0xFE363C80, 0x0000004E, 0x00000006, 0x80241CD4, 0x00000010, 0x00000000, D_80244A20, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802415F4_BE0384, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0073, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0074, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0075, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0076, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0077, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0078, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000145, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C86, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000043, 0x00000002, BringPartnerOut, 0x00000009, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000004, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFAF, 0x000000B0, 0x000000AB, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFAF, 0x000000BA, 0x000000AB, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFFF8, 0x000000BA, 0x0000009F, 0x0000003C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000005, 0x000E006E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000005, 0x000E006F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000005, 0x000E0070, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000005, 0x000E0071, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000005, 0x000E0072, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C86, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000043, 0x00000001, PutPartnerAway, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000001E, 0x0000007D, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDE, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDE, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000AF, 0x000000F0, 0x00000091, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80242064, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F80, 0x00000000, 0x0000000F, 0x00000002, 0xFD050F80, 0xFD050F81, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0081, 0x00000024, 0x00000002, 0xFE363C80, 0x00000076, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, 0x80241C6C, 0x00000043, 0x00000002, AddKeyItem, 0x00000076, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xF8405F77, 0x00000001, 0x00000024, 0x00000002, 0xF8405F7C, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0080, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0079, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E007A, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E007B, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E007C, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E007D, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E007E, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F77, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02DC, 0x00000012, 0x00000046, 0x00000001, 0x80241E68, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E007F, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x000001C2, 0x00000024, 0x00000002, 0xF8405F7C, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xFD050F80, 0xFD050F81, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x8024254C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000D, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000005A, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000010E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000D, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x00000028, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000D, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x00000028, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x802429D4, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950109, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950101, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00950108, 0x00000043, 0x00000005, EndSpeech, 0x00000004, 0x00950108, 0x00950108, 0x00000005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00950101, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, 0x80242B0C, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0082, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0083, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0084, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0085, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0086, 0x00000046, 0x00000001, 0x802428CC, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00950104, 0x00950101, 0x00000005, 0x000E0087, 0x00000046, 0x00000001, 0x80242C60, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0088, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0089, 0x00000046, 0x00000001, 0x802428CC, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00950104, 0x00950101, 0x00000005, 0x000E008A, 0x00000046, 0x00000001, 0x80242C60, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E008B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80242DC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E008C, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E008D, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E008E, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E008F, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0090, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0091, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x802431C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80241C10, 0x42100000, 0x43390000, 0x430C0000, 0x00000505, 0x802424E0, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000024, 0x0000000A, 0x000000B9, 0x00000038, 0x0000000A, 0x000000B9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x000001DF, 0x000000D7, 0x000000C6, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AA, 0x00000001, 0x80241C3C, 0x43510000, 0x43390000, 0x43590000, 0x00000505, 0x802428A8, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AB, 0x00000002, 0x80241C10, 0x43BD8000, 0x433A0000, 0x433A0000, 0x00000505, 0x802431A4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x0000017B, 0x0000000A, 0x000000BA, 0x0000018F, 0x0000000A, 0x000000BA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x000001DF, 0x000000D7, 0x000000C6, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AC, 0x00000003, 0x80241C3C, 0x44080000, 0x436B0000, 0x43000000, 0x00000505, 0x80243328, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AD, 0x00000004, 0x80241C3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, 0x8024334C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80243D28, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80243D28, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80243D28, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80243D28, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x80241C3C, 0x42100000, 0x438A8000, 0x430C0000, 0x00402705, 0x80243E90, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x80241C3C, 0x43340000, 0x438E8000, 0x43360000, 0x00402705, 0x80243ECC, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x80241C3C, 0x43AE8000, 0x438F0000, 0x43180000, 0x00402705, 0x80243F08, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x80241C3C, 0x43F50000, 0x43A20000, 0x43000000, 0x00402705, 0x80243F44, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - - - -0x00000001, 0x80243378, 0x00000000, 0x00000001, 0x80243568, 0x00000000, 0x00000001, 0x80243758, 0x00000000, 0x00000001, 0x80243948, 0x00000000, 0x00000001, 0x80243B38, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243378, 0x00000000, 0x00000001, 0x80243568, 0x00000000, 0x00000001, 0x80243758, 0x00000000, 0x00000001, 0x80243948, 0x00000000, 0x00000001, 0x80243B38, 0x00000000, 0x00000004, 0x80243F80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s b/ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s deleted file mode 100644 index a5468f806d..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_03/BE3570.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802447E0_BE3570 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x0000012C, 0x000000ED, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F6F, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x000000ED, 0x0000007D, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_04/BE6B20.data.s b/ver/us/asm/data/world/area_arn/arn_04/BE6B20.data.s deleted file mode 100644 index e85702507b..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_04/BE6B20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243370_BE6B20 -.word 0xC4124000, 0x42700000, 0x43160000, 0x42B40000, 0x444D0000, 0x438E8000, 0x43160000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243580, D_80243370_BE6B20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900BF, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_04/BE6C30.data.s b/ver/us/asm/data/world/area_arn/arn_04/BE6C30.data.s deleted file mode 100644 index d7958e56f3..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_04/BE6C30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243480_BE6C30 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244120, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244128, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243480_BE6C30, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802434DC, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000022, 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, 0x80244000, 0x00000046, 0x00000001, 0x80244040, 0x00000044, 0x00000001, 0x802433D0, 0x00000024, 0x00000002, 0xFE363C80, 0x80243538, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s b/ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s deleted file mode 100644 index 607c9b3361..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_04/BE6E10.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243660_BE6E10 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x43020000, 0x00000000, 0x00000001, 0x40200000, 0x000000B4, 0x00000003, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, arn_04_UnkNpcAIMainFunc, D_80243660_BE6E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, 0x80243690, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 - -dlabel D_802436DC_BE6E8C -.word 0x3FE66666, 0x0000003C, 0x0000000F, 0x42F00000, 0x00000000, 0x00000003, 0x40800000, 0x00000005, 0x00000001, 0x43160000, 0x00000000, 0x00000001, - -dlabel D_BE6EA4 -0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFCAE, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000003C, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000002BC, 0x00000043, 0x00000002, func_8024219C_BE594C, 0x802436F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120014, 0x00000000, 0x00000000, 0x80243724, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0001, 0x3F800000, 0x0000001E, 0x0000001E, 0x42F00000, 0x00000000, 0x00000003, 0x41080000, 0x0000003C, 0x00000003, 0x42C80000, 0x42700000, 0x00000001, 0x00000043, 0x00000003, func_80243018_BE67C8, 0x802437C0, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x802437F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0000, 0x00000000, 0x80243794, 0xC3AF0000, 0x43340000, 0x43160000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFEA2, 0x000000B4, 0x00000096, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEA2, 0x000000B4, 0x00000096, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280201, 0x00280203, 0x00280204, 0x00280204, 0x00280201, 0x00280201, 0x00280206, 0x00280206, 0x00280205, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802436B0, 0x43B40000, 0x43500000, 0x42C80000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000168, 0x000000D0, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000168, 0x000000D0, 0x00000064, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00260201, 0x00260202, 0x00260203, 0x00260203, 0x00260201, 0x00260201, 0x00260205, 0x00260205, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243814, 0x43160000, 0x43310000, 0x43200000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000096, 0x000000B1, 0x000000A0, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x000000B1, 0x000000A0, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00300102, 0x00300106, 0x00300107, 0x00300107, 0x00300102, 0x00300102, 0x00300108, 0x00300108, 0x00300114, 0x00300117, 0x00300113, 0x00300115, 0x00300110, 0x00300111, 0x00300116, 0x00300100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80243814, 0x44098000, 0x43660000, 0x42FA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000226, 0x000000E6, 0x0000007D, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000226, 0x000000E6, 0x0000007D, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00300102, 0x00300106, 0x00300107, 0x00300107, 0x00300102, 0x00300102, 0x00300108, 0x00300108, 0x00300114, 0x00300117, 0x00300113, 0x00300115, 0x00300110, 0x00300111, 0x00300116, 0x00300100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243840, 0x0E090001, 0x00000001, 0x80243A30, 0x0E030001, 0x00000001, 0x80243C20, 0x0E0C0001, 0x00000001, 0x80243E10, 0x0E0E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_04/BE77F0.data.s b/ver/us/asm/data/world/area_arn/arn_04/BE77F0.data.s deleted file mode 100644 index 137a3dac02..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_04/BE77F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244040_BE77F0 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000001C2, 0x0000011D, 0x00000078, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F70, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0x000002D0, 0x0000014D, 0x0000004B, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F71, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000258, 0x00000122, 0x000000C8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F72, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000021C, 0x000000E6, 0x0000000D, 0x00000011, 0xF8405F7B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_05/BE8EE0.data.s b/ver/us/asm/data/world/area_arn/arn_05/BE8EE0.data.s deleted file mode 100644 index 156f194a5e..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_05/BE8EE0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241300_BE8EE0 -.word 0xC29A0000, 0x43070000, 0x43160000, 0x42B40000, 0x44104000, 0x43480000, 0x43160000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802415B0, D_80241300_BE8EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900BD, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDF, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245040, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245048, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241430, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024148C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, 0x802414E8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802414E8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000022, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF0, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244FA4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244FC8, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80245000, 0x00000044, 0x00000001, 0x802441FC, 0x00000044, 0x00000001, 0x80241360, 0x00000044, 0x00000001, 0x80241530, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s b/ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s deleted file mode 100644 index a172f73571..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802416B0_BE9290 -.word 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000019, 0x0000001E, 0x42480000, 0x42480000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x42C80000, 0x42A00000, 0x00000001, 0x00000043, 0x00000002, func_8024113C_BE8D1C, 0x802416DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x8024170C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0092, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0093, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0095, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0096, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0097, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0098, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0094, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0099, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009A, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009C, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009D, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009E, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009F, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00A9, 0x0000001B, 0x00000001, 0x00000027, 0x0000000A, 0x00000002, 0xF8405F76, 0x00000001, 0x0000000A, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B0, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950107, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950107, 0x00950101, 0x00000000, 0x000E00AA, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950109, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950109, 0x00950101, 0x00000000, 0x000E00AB, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0095010A, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0095010A, 0x00950101, 0x00000000, 0x000E00AC, 0x00000043, 0x00000002, ShowChoice, 0x001E001E, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950105, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AD, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950101, 0x00000024, 0x00000002, 0xF8405F76, 0x00000001, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950105, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AD, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950101, 0x00000024, 0x00000002, 0xF8405F76, 0x00000001, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B1, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B2, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718888, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B3, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B4, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B6, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B7, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B8, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B9, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B5, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241784, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241794, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241924, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241AB4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDF, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0x00000027, 0x0000001B, 0x00000001, 0x00000027, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241D88, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0x00000027, 0x0000001B, 0x00000001, 0x00000027, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241784, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241E28, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x8024172C, 0x425C0000, 0x43430000, 0x43200000, 0x00000D01, 0x80241FB8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000037, 0x0000000A, 0x000000A0, 0x0000004B, 0x0000000A, 0x000000A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000037, 0x000000C3, 0x000000A0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AE, 0x00000001, 0x80241758, 0x43200000, 0x433F0000, 0x437A0000, 0x00000D01, 0x80242008, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AF, 0x00000002, 0x80241758, 0x43C30000, 0x433E0000, 0x437F0000, 0x00000D01, 0x8024202C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B0, 0x00000003, 0x80241758, 0x43FB8000, 0x434E0000, 0x43520000, 0x00000D01, 0x8024212C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B1, 0x00000004, 0x8024172C, 0x43AF0000, 0x43390000, 0x43450000, 0x00000D01, 0x802421EC, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x0000015E, 0x0000000A, 0x000000C5, 0x0000014A, 0x0000000A, 0x000000C5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x0000015E, 0x000000B9, 0x000000C5, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B2, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x000020F6, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C83, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950104, 0x00950101, 0x00000000, 0x000E00A0, 0x00000043, 0x00000006, PlaySoundAt, 0x000020F6, 0x00000000, 0x000001C2, 0x000000C8, 0x000000A0, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7DB4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000004, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x000000C3, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001A4, 0x0000012C, 0x000000DC, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001CC, 0x000000FA, 0x000000D2, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000C1, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950106, 0x00950106, 0x00000000, 0x000E00A1, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000043, 0x00000002, arn_05_SwitchToPartner, 0x00000009, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E00A2, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x000E00A3, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_802412B0_BE8E90, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000001, func_802D2B50, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001E, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AA, 0x000000BE, 0x000000C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8480, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x000002A3, 0x000000C8, 0x000000B4, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000005, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000110, 0x000000BE, 0x000000D6, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000C3, 0x00000008, 0x00000001, 0x00000014, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000226, 0x000000C4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AA, 0x000000BE, 0x000000C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000172, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000014A, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000024, 0x00000002, 0xFD050F81, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000F0, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950106, 0x00950106, 0x00000000, 0x000E00A4, 0x00000008, 0x00000001, 0x0000000F, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000002, 0x00000005, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950104, 0x00950101, 0x00000005, 0x000E00A5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00950109, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000002, 0x00000109, 0x000000CE, 0x000000D4, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x006A001E, 0x006A001E, 0x00000005, 0x000E00A6, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000012F, 0x000000ED, 0x000000E4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00950106, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A001F, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000118, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x00000315, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0020, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000F0, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x006A0021, 0x006A0006, 0x00000005, 0x000E00A7, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0021, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000172, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000226, 0x000000C4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000037, 0x000000C3, 0x000000A0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000A0, 0x000000BF, 0x000000FA, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000015E, 0x000000B9, 0x000000C5, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x000000C1, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAC80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00950104, 0x00950101, 0x00000005, 0x000E00A8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000014A, 0x000000B8, 0x000000F0, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C82, 0x0000006E, 0x0000000F, 0x00000002, 0xFE363C80, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000046, 0x00000001, 0x80242C50, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, 0x802418F4, 0x00000043, 0x00000003, BindNpcInteract, 0x00000001, 0x80241A84, 0x00000043, 0x00000003, BindNpcInteract, 0x00000004, 0x80241F88, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000044, 0x00000001, 0x80241360, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x006A0006, 0x006A0009, 0x006A001E, 0x006A001F, 0x006A0020, 0x006A0021, 0xFFFFFFFF, 0x00000005, D_802416B0_BE9290, 0x00000000, 0xC47A0000, 0x00000000, 0x00000B01, 0x80244358, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0006, 0x006A0009, 0x006A000C, 0x006A000C, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x00000000, 0x00000000, 0x80244390, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000006, 0x80241758, 0x42100000, 0x438A8000, 0x430C0000, 0x00402705, 0x80244704, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x80241758, 0x43480000, 0x43898000, 0x43360000, 0x00402705, 0x8024473C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x80241758, 0x43BD8000, 0x43960000, 0x43400000, 0x00402705, 0x80244774, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, 0x80241758, 0x44034000, 0x438F0000, 0x43320000, 0x00402705, 0x802447AC, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802443AC, 0x00000000, 0x00000005, 0x8024223C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802443AC, 0x00000000, 0x00000005, 0x8024223C, 0x00000000, 0x00000004, 0x802447E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_05/BECBE0.data.s b/ver/us/asm/data/world/area_arn/arn_05/BECBE0.data.s deleted file mode 100644 index 8ca4ac3a2a..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_05/BECBE0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245000_BECBE0 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000011, 0x000000EE, 0x00000050, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_07/BEEC80.data.s b/ver/us/asm/data/world/area_arn/arn_07/BEEC80.data.s deleted file mode 100644 index f35c14f32e..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_07/BEEC80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241E90_BEEC80 -.word 0x00000000, 0x41A00000, 0xC3130000, 0x43340000, 0x43F28000, 0x00000000, 0x00000000, 0x43870000, 0xC3F40000, 0x00000000, 0x00000000, 0x42B40000, 0x43420000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802435A8, D_80241E90_BEEC80, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900BB, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000018, 0x00000001, 0xFFFFFFEF, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000016, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s b/ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s deleted file mode 100644 index d2b4aa4557..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_07/BEEE30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242040_BEEE30 -.word 0x0000001F, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, arn_07_StarSpiritEffectFunc2, 0x00000002, 0x00000032, 0x00000064, 0x0000001F, 0xFFFFFFFA, 0x00000091, 0x00000041, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x00000000, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, arn_07_StarSpiritEffectFunc5, 0x00000002, 0x00000091, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247914, 0x00000002, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, arn_07_StarSpiritEffectFunc2, 0x00000002, 0x00000032, 0x00000064, 0x0000001F, 0xFFFFFFFA, 0x00000091, 0x00000041, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000091, 0x00000041, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000091, 0x00000000, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, arn_07_StarSpiritEffectFunc5, 0x00000002, 0x00000091, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, arn_07_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, arn_07_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000004, GotoMapSpecial, 0x80247914, 0x00000002, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024791C, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247924, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024792C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE4, 0x00000000, 0xFFFFFEB3, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE4, 0x00000000, 0xFFFFFEB3, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001F4, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000005, 0x00000000, 0xFFFFFF6D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8480, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000014, 0xFFFFFF88, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x0000000A, 0xFFFFFFC4, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006C000A, 0x006C0001, 0x00000005, 0x000E00C7, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000004B, 0x00000000, 0x0000000A, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000096, 0x00000000, 0x00000014, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8280, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002BC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000001F4, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000041, 0x00000000, 0xFFFFFF77, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0022, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000012A, 0x00000038, 0x0000001F, 0x00000012, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0023, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x006A0006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000EC, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0x00000014, 0xFFFFFF3D, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0x00000014, 0xFFFFFF3D, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x00000000, 0x0000002D, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000A, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000A, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000C8, 0x00000000, 0x00000023, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x006A0010, 0x006A0006, 0x00000000, 0x000E00C8, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242978, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802429D4, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE8, 0x0000004E, 0x00000006, 0x802439B0, 0x00000100, 0x00004000, D_80242040_BEEE30, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802428D4, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000046, 0x00000001, 0x80242A30, 0x00000044, 0x00000001, 0x802433C8, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x802433C8, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x802433C8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x802433C8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x802433C8, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000022, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406339, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478B8, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024787C, 0x00000016, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478E8, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802478B8, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80243B54, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFF0, 0x00000044, 0x00000001, 0x80242498, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x8024346C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243790, 0x00000044, 0x00000001, 0x80241F10, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_07/BF0580.data.s b/ver/us/asm/data/world/area_arn/arn_07/BF0580.data.s deleted file mode 100644 index cb2559b915..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_07/BF0580.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243790_BF0580 -.word 0x00000044, 0x00000001, 0x802437AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000017, 0x8000004A, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000001, func_80240800_BED5F0, 0x00000043, 0x00000006, RotateModel, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000032, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000006, RotateModel, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000032, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000006, RotateModel, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x0000001F, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFE8, 0x00000043, 0x00000005, arn_07_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, arn_07_SetEntityFlags100000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802428D4, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE8, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x0000000A, 0x0000001E, 0xFFFFFF65, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80243B28, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BC0_BF09B0 -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3FE66666, 0x0000003C, 0x0000000F, 0x42F00000, 0x00000000, 0x00000003, 0x40800000, 0x00000005, 0x00000001, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFCAE, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000003C, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000002BC, 0x00000043, 0x00000002, func_80241C5C_BEEA4C, 0x80243BD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120014, 0x00000000, 0x00000000, 0x80243C08, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, 0x80243CA4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243CB4, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020F6, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7DB4, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000EC, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A0008, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x006A0012, 0x006A0008, 0x00000005, 0x000E00CA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x006A0012, 0x006A0008, 0x00000005, 0x000E00CB, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8E80, 0xF24A3A80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A0022, 0x00000008, 0x00000001, 0x0000000F, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, D_B0000010, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, D_B0000010, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000006, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, D_B0000010, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, D_B0000010, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000004, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, D_B0000010, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000005, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, D_B0000010, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A0023, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A0022, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, D_B0000010, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A0021, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000EC, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A000F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x006A0012, 0x006A0008, 0x00000000, 0x000E00CC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000005, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000045, 0x00000002, 0x80243DCC, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000320, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000050, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001C, 0x00000000, 0x00000008, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C86, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000009, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFFFC, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000101, 0x00000019, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000A, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000024, 0x00000002, 0xFE363C85, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000101, 0x00000019, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000008, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000F0, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000008, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C85, 0x0005000B, 0x0005000B, 0x00000000, 0x000E00CD, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C85, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24F2A80, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C85, 0x00050004, 0x00050001, 0x00000000, 0x000E00CE, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFE363C85, 0x0005000B, 0x0005000B, 0x00000000, 0x000E00CF, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFE363C85, 0x0005000B, 0x0005000B, 0x00000000, 0x000E00D0, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C85, 0x00050004, 0x00050001, 0x00000000, 0x000E00D1, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000AF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000AF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x0000005D, 0x000000A0, 0xFFFFFFFA, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000A0, 0x0000001F, 0x00000046, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x0000005D, 0xFE363C80, 0xFFFFFFFA, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C85, 0x00050004, 0x00050001, 0x00000000, 0x000E00D2, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000044, 0x00000001, 0x80242048, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000043, 0x00000005, MakeLerp, 0x000000F0, 0x00000000, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x0000000B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x00000043, 0x00000005, MakeLerp, 0x00000032, 0x00000050, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000064, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xFE363C82, 0xFE363C82, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000050, 0xFE363C82, 0x00000043, 0x00000003, RandInt, 0x0000000A, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0x000000F0, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000125, 0x0000003B, 0x00000015, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A794D, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000002, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001E, 0x00000001, 0x00000008, 0x00000046, 0x00000001, 0x80243E24, 0x00000044, 0x00000001, 0x80243FE8, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244C54, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80244FB8, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244CC8, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x006A0000, 0x006A0022, 0x006A0023, 0x006A0006, 0x006A0010, 0x006A0008, 0x006A000F, 0x006A0012, 0xFFFFFFFF, 0x00950000, 0xFFFFFFFF, 0x00950100, 0xFFFFFFFF, 0x00BF0001, 0xFFFFFFFF, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000D, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x0000000D, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF251E680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00140002, 0x00140001, 0x00000200, 0x000E00D3, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFF7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000D, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00140003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000139, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00140001, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000D, 0x00000001, 0x00000043, 0x00000001, PostChapter3StatUpdate, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0193, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00140002, 0x00140001, 0x00000200, 0x000E00D4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00140002, 0x00140001, 0x00000200, 0x000E00D5, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x00000044, 0x00000001, 0x80241F10, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80245210, 0x00000044, 0x00000001, 0x80245304, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x80243CF0, 0x439A8000, 0x00000000, 0x41300000, 0x00240F04, 0x80245090, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0006, 0x006A0009, 0x006A000C, 0x006A000C, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x00000000, 0x00000000, 0x802451D4, 0x00000000, 0x00000000, 0x80243CC4, 0xC1200000, 0x42480000, 0xC32A0000, 0x00240F05, 0x80245058, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F0D, 0x80245104, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x80245200, 0x00000000, 0x00000003, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F0D, 0x80245104, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x80245200, 0x00000000, 0x00000004, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F0D, 0x80245104, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x80245200, 0x00000000, 0x00000005, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F0D, 0x80245104, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x80245200, 0x00000000, 0x00000006, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F0D, 0x80245104, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x802451F8, 0x00000000, 0x00000007, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F0D, 0x80245104, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x802451F8, 0x00000000, 0x00000008, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200F05, 0x80245164, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050001, 0x00050002, 0x00050003, 0x00050003, 0x00050001, 0x00050001, 0x00050000, 0x00050000, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00050003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, 0x80243D1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00200D05, 0x8024519C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00BF0001, 0x00BF0002, 0x00BF0003, 0x00BF0003, 0x00BF0001, 0x00BF0001, 0x00BF0000, 0x00BF0000, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00000000, 0x00000000, 0x80245208, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFE6, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80243C78, 0xC3580000, 0x42700000, 0xC1200000, 0x00000C00, 0x8024706C, 0x00000000, 0x00000000, 0x0000005A, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFF28, 0x0000003C, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF28, 0x0000003C, 0xFFFFFFF6, 0x000000FA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280201, 0x00280203, 0x00280204, 0x00280204, 0x00280201, 0x00280201, 0x00280206, 0x00280206, 0x00280205, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, 0x80243C78, 0x00000000, 0x42700000, 0x43160000, 0x00000C00, 0x8024706C, 0x00000000, 0x00000000, 0x0000010E, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x0000003C, 0x00000096, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x0000003C, 0x00000096, 0x000000FA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280201, 0x00280203, 0x00280204, 0x00280204, 0x00280201, 0x00280201, 0x00280206, 0x00280206, 0x00280205, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, 0x80243C78, 0x43820000, 0x42700000, 0x41F00000, 0x00000C00, 0x8024706C, 0x00000000, 0x00000000, 0x0000005A, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000104, 0x0000003C, 0x0000001E, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000104, 0x0000003C, 0x0000001E, 0x000000FA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280201, 0x00280203, 0x00280204, 0x00280204, 0x00280201, 0x00280201, 0x00280206, 0x00280206, 0x00280205, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00280204, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000000D, 0x80243D48, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, 0x80245C9C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140000, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80245D0C, 0x0E100002, 0x00000006, 0x802460EC, 0x00000000, 0x00000001, 0x80246C8C, 0x00000000, 0x00000001, 0x80246E7C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802470BC, 0x0E060002, 0x00000001, 0x802472AC, 0x0E070002, 0x00000001, 0x8024749C, 0x0E080002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x8024768C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_08/BF4A30.data.s b/ver/us/asm/data/world/area_arn/arn_08/BF4A30.data.s deleted file mode 100644 index d5f5e4616a..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_08/BF4A30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240290_BF4A30 -.word 0xC2A00000, 0x00000000, 0x42D80000, 0x42340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC2AA0000, 0x00000000, 0x425C0000, 0x42340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802408F4, D_80240290_BF4A30, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900D3, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFEA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_08/BF4B50.data.s b/ver/us/asm/data/world/area_arn/arn_08/BF4B50.data.s deleted file mode 100644 index 13312ad60c..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_08/BF4B50.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403B0_BF4B50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, 0x80285DFC, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802418A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802403B0_BF4B50, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, 0x80240470, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, 0x80285E24, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000044, 0x00000001, 0x80240470, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFEE, 0x00000043, 0x00000004, SetPlayerPos, 0x000003E8, 0x000003E8, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000003E8, 0x000003E8, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000001, 0x00000050, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006C0006, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000032, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006C0007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006C0006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF92, 0x00000000, 0x0000006E, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006C0007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006C0006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF4C, 0x00000000, 0x000000B4, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006C0007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000001, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001C2, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFEF, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFF6, 0x00000000, 0x0000004B, 0x00000012, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000044, 0x00000001, 0x80240470, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000023, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF840633B, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x00000024, 0x00000002, 0xF8405F78, 0x00000000, 0x00000024, 0x00000002, 0xF8405F79, 0x00000000, 0x00000024, 0x00000002, 0xF8405F7A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241828, 0x00000046, 0x00000001, 0x80241850, 0x00000044, 0x00000001, 0x80240BA0, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, 0x8024118C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x8024049C, 0x00000044, 0x00000001, 0x80240B50, 0x00000044, 0x00000001, 0x80240300, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_08/BF5210.data.s b/ver/us/asm/data/world/area_arn/arn_08/BF5210.data.s deleted file mode 100644 index 9fe468e6cd..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_08/BF5210.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A70_BF5210 -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024008C_BF482C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_80240000_BF47A0, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE9, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFE9, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802418A8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24BE280, 0x00000000, 0x00000000, 0x00000000, 0xF251D280, 0xF24ABE80, 0xF24A5E80, 0x00000044, 0x00000001, D_80240A70_BF5210, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_08/BF5340.data.s b/ver/us/asm/data/world/area_arn/arn_08/BF5340.data.s deleted file mode 100644 index 2c759139e8..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_08/BF5340.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BA0_BF5340 -.word 0x00000043, 0x00000002, PlaySound, 0x8000004B, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, RotateModel, 0x00000009, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000000F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000000B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000011, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_08/BF5460.data.s b/ver/us/asm/data/world/area_arn/arn_08/BF5460.data.s deleted file mode 100644 index 1665b07804..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_08/BF5460.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CC0_BF5460 -.word 0x00000043, 0x00000001, func_802400C0_BF4860, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000000C, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000001C, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000002F, 0x00000016, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000044, 0x00000026, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000043, 0x00000030, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0x0000003B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0x0000003E, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0x0000003A, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000046, 0x00000022, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004A, 0xFFFFFFE9, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000047, 0xFFFFFFDC, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000045, 0xFFFFFFD4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000043, 0xFFFFFFCF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000001E, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_802400D4_BF4874, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802418B0, 0x00000002, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802418B0, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000023, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802400F4_BF4894, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241188_BF5928 -.word 0x00000000, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24BE280, 0x00000000, 0x00000000, 0x00000000, 0xF251D280, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000001, func_8024019C_BF493C, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, 0x802410AC, 0x00000044, 0x00000001, D_80240CC0_BF5460, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_08/BF59A0.data.s b/ver/us/asm/data/world/area_arn/arn_08/BF59A0.data.s deleted file mode 100644 index f6e0b20f71..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_08/BF59A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241200_BF59A0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, D_80241200_BF59A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241210, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000D0000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEE, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241278, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C00002, 0x00C00001, 0x00000000, 0x000E00BA, 0x00000018, 0x00000001, 0x0000002A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C00002, 0x00C00001, 0x00000000, 0x000E00BB, 0x00000018, 0x00000001, 0x0000003D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C00002, 0x00C00001, 0x00000000, 0x000E00BC, 0x00000018, 0x00000001, 0x0000005A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C00002, 0x00C00001, 0x00000000, 0x000E00BD, 0x0000001B, 0x00000001, 0x0000005A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C00002, 0x00C00001, 0x00000000, 0x000E00BE, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x802412E8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80241220, 0xC1B80000, 0x42960000, 0x41F80000, 0x00000D05, 0x80241288, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x8024124C, 0x42180000, 0x00000000, 0x42C20000, 0x00000801, 0x802413E8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00C00001, 0x00000000, 0x00000000, 0x00000000, 0x001A00B4, 0x00000001, 0x80241448, 0x00000000, 0x00000001, 0x80241638, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_08/BF5FF0.data.s b/ver/us/asm/data/world/area_arn/arn_08/BF5FF0.data.s deleted file mode 100644 index 6b650b63fd..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_08/BF5FF0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241850_BF5FF0 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE9, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_09/BF60A0.data.s b/ver/us/asm/data/world/area_arn/arn_09/BF60A0.data.s deleted file mode 100644 index 4d76594d38..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_09/BF60A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_BF60A0 -.word 0x42FA0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x43480000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802402C0, D_80240040_BF60A0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900D4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFEA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_09/BF61A0.data.s b/ver/us/asm/data/world/area_arn/arn_09/BF61A0.data.s deleted file mode 100644 index eadaea548c..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_09/BF61A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240140_BF61A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, 0x80285DFC, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240990, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240140_BF61A0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, 0x80285E24, 0x00000044, 0x00000001, 0x802401F4, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802401F4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000023, 0x00000043, 0x00000002, SetSpriteShading, 0x00080000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240974, 0x00000046, 0x00000001, 0x80240488, 0x00000044, 0x00000001, 0x80240220, 0x00000044, 0x00000001, 0x802404D0, 0x00000044, 0x00000001, 0x802400A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_09/BF6400.data.s b/ver/us/asm/data/world/area_arn/arn_09/BF6400.data.s deleted file mode 100644 index 77d612d82a..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_09/BF6400.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403A0_BF6400 -.word 0x0000000A, 0x00000002, 0xF9718881, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000000, 0x000000C8, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80240998, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403A0_BF6400, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_09/BF6530.data.s b/ver/us/asm/data/world/area_arn/arn_09/BF6530.data.s deleted file mode 100644 index 3ffaf2de6a..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_09/BF6530.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404D0_BF6530 -.word 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000043, 0x00000001, func_802D2484, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8080, 0x00000043, 0x00000005, PlayerJump, 0x00000032, 0x00000000, 0x00000000, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_09/BF6610.data.s b/ver/us/asm/data/world/area_arn/arn_09/BF6610.data.s deleted file mode 100644 index 0ea020bcf2..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_09/BF6610.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405B0_BF6610 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, D_802405B0_BF6610, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802405C0, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000000, 0x00000019, 0xFFFFFFF6, 0x00000006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002086, 0x00000000, 0x00000043, 0x00000001, func_80240000_BF6060, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000000, 0x000000C8, 0x00000000, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFEE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFED, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802405FC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x802405D0, 0x00000000, 0x41C80000, 0x00000000, 0x00000D05, 0x80240730, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80240784, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_10/BF6A00.data.s b/ver/us/asm/data/world/area_arn/arn_10/BF6A00.data.s deleted file mode 100644 index e742b1c558..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_10/BF6A00.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_BF6A00 -.word 0xC3610000, 0x00000000, 0x00000000, 0x42B40000, 0x43610000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024034C, D_80240000_BF6A00, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900D5, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFEA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_10/BF6B00.data.s b/ver/us/asm/data/world/area_arn/arn_10/BF6B00.data.s deleted file mode 100644 index ddfe67a472..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_10/BF6B00.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240100_BF6B00 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C70, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C78, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240100_BF6B00, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802401A4, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x80240248, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x80240248, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000023, 0x00000043, 0x00000002, SetSpriteShading, 0x00080001, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240BB8, 0x00000046, 0x00000001, 0x80240C28, 0x00000044, 0x00000001, 0x80240060, 0x00000044, 0x00000001, 0x80240290, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_10/BF6E30.data.s b/ver/us/asm/data/world/area_arn/arn_10/BF6E30.data.s deleted file mode 100644 index 0c58f5d59d..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_10/BF6E30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240430_BF6E30 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, D_80240430_BF6E30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240440, 0x00000000, 0x00000000, 0x000D0000, 0x3FE66666, 0x00000028, 0x0000000F, 0x43160000, 0x00000000, 0x00000002, 0x40533333, 0x00000046, 0x00000001, 0x43340000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, 0x8024047C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, 0x802404AC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000028, 0x00000002, 0xFE363C80, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000028, 0x00000002, 0xFE363C80, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFED, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405F78, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802404F8, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEC, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x0000000A, 0x00000002, 0xF8405F78, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802406F4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240450, 0x42A00000, 0x42480000, 0x00000000, 0x00000D05, 0x80240720, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802404CC, 0x00000000, 0x00000000, 0x00000000, 0x00000C00, 0x8024076C, 0x00000000, 0x00000000, 0x0000010E, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00260201, 0x00260202, 0x00260203, 0x00260203, 0x00260201, 0x00260201, 0x00260205, 0x00260205, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802407D8, 0x00000000, 0x00000001, 0x802409C8, 0x0E000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_10/BF75E0.data.s b/ver/us/asm/data/world/area_arn/arn_10/BF75E0.data.s deleted file mode 100644 index 2fd72e7adb..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_10/BF75E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BE0_BF75E0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0182, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x000000C8, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240BE0_BF75E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_11/BF7680.data.s b/ver/us/asm/data/world/area_arn/arn_11/BF7680.data.s deleted file mode 100644 index 1b561c1de3..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_11/BF7680.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_BF7680 -.word 0xC3250000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802405A8, D_80240000_BF7680, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900D8, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE9, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_11/BF7770.data.s b/ver/us/asm/data/world/area_arn/arn_11/BF7770.data.s deleted file mode 100644 index 7ad37c135c..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_11/BF7770.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400F0_BF7770 -.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A4680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000006, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006C000B, 0x006C0001, 0x00000000, 0x000E00BF, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006C000B, 0x006C0001, 0x00000000, 0x000E00C0, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006C000B, 0x006C0001, 0x00000000, 0x000E00C1, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8480, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x006C000B, 0x006C0001, 0x00000000, 0x000E00C2, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241100, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240428, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x802404CC, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFEA, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_802400F0_BF7770, 0x00000044, 0x00000001, 0x802401BC, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000023, 0x00000043, 0x00000002, SetSpriteShading, 0x00080002, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802410DC, 0x00000044, 0x00000001, 0x80240050, 0x00000044, 0x00000001, 0x802404F8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_11/BF7D00.data.s b/ver/us/asm/data/world/area_arn/arn_11/BF7D00.data.s deleted file mode 100644 index bebc68b6dc..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_11/BF7D00.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240680_BF7D00 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, D_80240680_BF7D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240690, 0x00000000, 0x00000000, 0x000D0000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000BB8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x0000000B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000064, 0x0000001E, 0x00000046, 0x00000019, 0x0000001E, 0x00000050, 0xFFFFD8F0, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x0000000A, 0x00000014, 0xFFFFFF4C, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000000, 0xFFFFD8F0, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFC8, 0x00000046, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFFA6, 0x00000028, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000001, 0x00000030, 0x00000001, 0x80240988, 0x00000005, 0x00000001, 0x00000000, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFD8F0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024081C, 0x00000005, 0x00000001, 0x00000000, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFD8F0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x802408D8, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFEA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFEA, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802406CC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802409DC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x802406A0, 0x42EE0000, 0x42700000, 0x00000000, 0x00040B05, 0x80240E70, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80240EEC, 0x0E0F0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_12/BF8790.data.s b/ver/us/asm/data/world/area_arn/arn_12/BF8790.data.s deleted file mode 100644 index f7dd860048..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_12/BF8790.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_BF8790 -.word 0xC3670000, 0x00000000, 0x40A00000, 0x42B40000, 0x43670000, 0x00000000, 0x40A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024034C, D_80240000_BF8790, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900D6, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFEA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_12/BF8890.data.s b/ver/us/asm/data/world/area_arn/arn_12/BF8890.data.s deleted file mode 100644 index d3a4c5bce2..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_12/BF8890.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240100_BF8890 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C70, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C78, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240100_BF8890, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802401A4, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x80240248, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x80240248, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000023, 0x00000043, 0x00000002, SetSpriteShading, 0x00080003, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240BBC, 0x00000046, 0x00000001, 0x80240C28, 0x00000044, 0x00000001, 0x80240290, 0x00000044, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_12/BF8BB0.data.s b/ver/us/asm/data/world/area_arn/arn_12/BF8BB0.data.s deleted file mode 100644 index 49e2586f6f..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_12/BF8BB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240420_BF8BB0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, D_80240420_BF8BB0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240430, 0x00000000, 0x00000000, 0x000D0000, 0x3FE66666, 0x00000028, 0x0000000F, 0x43160000, 0x00000000, 0x00000002, 0x40533333, 0x00000046, 0x00000001, 0x43340000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, 0x8024046C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, 0x8024049C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000028, 0x00000002, 0xFE363C80, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000028, 0x00000002, 0xFE363C80, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405F79, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802404E8, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEB, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x0000000A, 0x00000002, 0xF8405F79, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802406E4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802406E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240440, 0x42A00000, 0x42480000, 0x00000000, 0x00000D05, 0x80240710, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802404BC, 0x00000000, 0x00000000, 0x00000000, 0x00000C00, 0x8024075C, 0x00000000, 0x00000000, 0x0000010E, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00260201, 0x00260202, 0x00260203, 0x00260203, 0x00260201, 0x00260201, 0x00260205, 0x00260205, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802407DC, 0x00000000, 0x00000001, 0x802409CC, 0x0E010005, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0183, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x000000C8, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80240BE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_13/BF9410.data.s b/ver/us/asm/data/world/area_arn/arn_13/BF9410.data.s deleted file mode 100644 index dc3e60762e..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_13/BF9410.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_BF9410 -.word 0xC3670000, 0x00000000, 0x40A00000, 0x42B40000, 0x43670000, 0x00000000, 0x40A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024034C, D_80240000_BF9410, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900D7, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFEA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_13/BF9510.data.s b/ver/us/asm/data/world/area_arn/arn_13/BF9510.data.s deleted file mode 100644 index 638ef8170e..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_13/BF9510.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240100_BF9510 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C88, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240100_BF9510, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802401A4, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x80240248, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, 0x80240248, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000023, 0x00000043, 0x00000002, SetSpriteShading, 0x00080004, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240BCC, 0x00000046, 0x00000001, 0x80240C38, 0x00000044, 0x00000001, 0x80240060, 0x00000044, 0x00000001, 0x80240290, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_arn/arn_13/BF9840.data.s b/ver/us/asm/data/world/area_arn/arn_13/BF9840.data.s deleted file mode 100644 index 0837451ff6..0000000000 --- a/ver/us/asm/data/world/area_arn/arn_13/BF9840.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240430_BF9840 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, D_80240430_BF9840, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240440, 0x00000000, 0x00000000, 0x000D0000, 0x3FE66666, 0x00000028, 0x0000000F, 0x43160000, 0x00000000, 0x00000002, 0x40533333, 0x00000046, 0x00000001, 0x43340000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DoBasicAI, 0x8024047C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140017, 0x00000000, 0x00000000, 0x802404AC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000028, 0x00000002, 0xFE363C80, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006C0013, 0x00000028, 0x00000002, 0xFE363C80, 0x00000050, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8480, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020C8, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFED, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405F7A, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802404F8, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFEA, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF4, 0x0000000A, 0x00000002, 0xF8405F7A, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802406F4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802406F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240450, 0x42A00000, 0x42480000, 0x00000000, 0x00000D05, 0x80240720, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x006C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802404CC, 0x00000000, 0x00000000, 0x00000000, 0x00000C00, 0x8024076C, 0x00000000, 0x00000000, 0x0000010E, 0x8014008D, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00260201, 0x00260202, 0x00260203, 0x00260203, 0x00260201, 0x00260201, 0x00260205, 0x00260205, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00260203, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802407EC, 0x00000000, 0x00000001, 0x802409DC, 0x0E020005, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0184, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x000000C8, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80240BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_02/C30650.data.s b/ver/us/asm/data/world/area_dgb/dgb_02/C30650.data.s deleted file mode 100644 index 8c3ae280a8..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_02/C30650.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241AB0_C30650 -.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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024061C_C2F1BC, 0x80241B9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241BCC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_802410D4_C2FC74, 0x80241C68, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241C98, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_02_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80241D34, 0x00000000, 0x00000000, D_80241AB0_C30650, 0x00000000, 0x00000000, 0x000D0008, 0x0000000A, 0x80241C3C, 0xC3480000, 0x00000000, 0x43340000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF38, 0x00000000, 0x000000B4, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF38, 0x00000000, 0x000000AF, 0x000000FA, 0x0000005A, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80241B6C, 0x00000000, 0x0000000B, 0x80241DDC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80241B94, 0x00000000, 0x0000001E, 0x80241D08, 0x43BB8000, 0x00000000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000177, 0x00000000, 0x00000064, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000140, 0x00000000, 0x000000AF, 0x000000FA, 0x0000005A, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x80241DDC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80241B94, 0x00000000, 0x00000002, 0x80241E08, 0x0F020001, 0x00000002, 0x802421E8, 0x0F010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_03/C345C0.data.s b/ver/us/asm/data/world/area_dgb/dgb_03/C345C0.data.s deleted file mode 100644 index 30073b8e20..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_03/C345C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802430E0_C345C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, dgb_03_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, dgb_03_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001B, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000033, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405F94, 0x00000000, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000030, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001B, 0x00000046, 0x00000001, D_802430E0_C345C0, 0x00000003, 0x00000001, 0x0000005A, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF8405F95, 0x00000000, 0x00000024, 0x00000002, 0xF8405F94, 0x00000001, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405F94, 0x00000000, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFD0, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, D_802430E0_C345C0, 0x00000003, 0x00000001, 0x0000005A, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF8405F95, 0x00000001, 0x00000024, 0x00000002, 0xF8405F94, 0x00000001, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000033, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000033, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000033, 0x0000000A, 0x00000002, 0xF8405F94, 0x00000000, 0x00000047, 0x00000005, 0x80243470, 0x00000040, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024353C, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F95, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFD0, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000033, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_03/C34E50.data.s b/ver/us/asm/data/world/area_dgb/dgb_03/C34E50.data.s deleted file mode 100644 index 8f9a865458..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_03/C34E50.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243970_C34E50 -.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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024086C_C31D4C, 0x80243A5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80243A8C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3FC00000, 0x00000014, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_802419B0_C32E90, 0x80243B28, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80243B58, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80242480_C33960, 0x80243BF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80243C24, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_03_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80243CC0, 0x00000000, 0x00000000, D_80243970_C34E50, 0x00000000, 0x00000000, 0x000D0008, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFEB6, 0x000000D2, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80243AFC, 0x43340000, 0x00000000, 0xC2F40000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000B4, 0x00000000, 0xFFFFFF86, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000163, 0x000000FF, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243D68, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80243A54, 0x00000000, 0x00000002, 0x80243BC8, 0xC3880000, 0x00000000, 0xC3070000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000002, 0xFFFFFEF0, 0x00000000, 0xFFFFFF79, 0xFFFFFF55, 0x00000000, 0xFFFFFF79, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x0000004B, 0x00000163, 0x000000FF, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80243D68, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80243A54, 0x00000000, 0x00000004, 0x80243C94, 0xC3A30000, 0x43520000, 0x42A00000, 0x00000C00, 0x80243D94, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFEBA, 0x000000D2, 0x00000050, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000163, 0x000000FF, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80243D68, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x80243A54, 0x00000000, 0x00000002, 0x80243DE8, 0x0F010002, 0x00000002, 0x802441C8, 0x0F010002, 0x00000002, 0x802445A8, 0x0F030001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s b/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s deleted file mode 100644 index 6254f2bfe6..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243560_C39A90 -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80242154_C38684, 0x802435B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x802444D8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 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, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80243578, 0x00000000, 0x802435E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x80243AFC, 0x428C0000, 0xC35C0000, 0x433A0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0xFFFFFF24, 0x000000BA, 0x0000000F, 0x00000028, 0xFFFF8001, 0x00000001, 0x00000050, 0xFFFFFF24, 0x000000AA, 0x00000050, 0x00000096, 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, 0x00000000, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243B28, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243D30_C3A260 -.word 0x001D00F0, 0x001D00F1 - -dlabel D_80243D38_C3A268 -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel D_80243D48_C3A278 -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel D_80243D88_C3A2B8 -.word 0x430C0000, 0x43340000, 0x435C0000, - - -0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, dgb_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024240C_C3893C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, dgb_04_UnkFunc22, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802429D0_C38F00, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F96, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dgb_04_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dgb_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, dgb_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, dgb_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024259C_C38ACC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, dgb_04_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D94, 0x00000043, 0x00000003, dgb_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F96, 0x00000001, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, dgb_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000001F4, 0xFFFFFE98, 0x0000006E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F96, 0x00000043, 0x00000002, AssignScript, 0x80243EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_05/C3C2D0.data.s b/ver/us/asm/data/world/area_dgb/dgb_05/C3C2D0.data.s deleted file mode 100644 index b956d9b9d4..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_05/C3C2D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802418C0_C3C2D0 -.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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80240E80_C3B890, 0x802419AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802419DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80241A78, 0x00000000, 0x00000000, D_802418C0_C3C2D0, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x80241A4C, 0x43040000, 0xC2DC0000, 0x436E0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000084, 0xFFFFFF92, 0x000000EE, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000145, 0x00000000, 0x000000B9, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802419A4, 0x00000000, 0x00000003, 0x80241A4C, 0x43FB8000, 0xC3520000, 0x43610000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000001F7, 0xFFFFFF2E, 0x000000E1, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001F7, 0xFFFFFF2E, 0x00000122, 0x000000C8, 0x00000096, 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, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802419A4, 0x00000000, 0x00000002, 0x80241B4C, 0x0F010003, 0x00000002, 0x80241F2C, 0x0F020003, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_07/C3F3E0.data.s b/ver/us/asm/data/world/area_dgb/dgb_07/C3F3E0.data.s deleted file mode 100644 index a83cdaebba..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_07/C3F3E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417F0_C3F3E0 -.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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80240E20_C3EA10, 0x802418DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x8024190C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x802419A8, 0x00000000, 0x00000000, D_802417F0_C3F3E0, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x8024197C, 0xC3FA0000, 0x00000000, 0xC3700000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFE0C, 0x00000000, 0xFFFFFF10, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE0C, 0x00000000, 0xFFFFFF10, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x802418AC, 0x00000000, 0x00000001, 0x80241A50, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418D4, 0x00000000, 0x00000002, 0x80241A7C, 0x0F010003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s b/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s deleted file mode 100644 index 72d5d71697..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_08/C43EB0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244100_C43EB0 -.word 0x40900000, 0x00000000, 0x00000000, 0x432A0000, 0x42B40000, 0x00000001, 0x4079999A, 0x000000B4, 0x00000002, 0x432A0000, 0x42B40000, 0x00000001, 0x00000043, 0x00000002, dgb_08_UnkNpcAIMainFunc, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x80244130, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000D0000, 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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_802414AC_C4125C, 0x802442C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802442F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x8024438C, 0x00000000, 0x00000000, 0x802441D4, 0x00000000, 0x00000000, 0x000D0008 - -dlabel D_80244460_C44210 -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_802438F0_C436A0, 0x802444B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80246E20, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 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, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80244478, 0x00000000, 0x802444E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFE5, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C7, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x006A000A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFD67, 0x000000D2, 0x000000B4, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDEE, 0x000000B4, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001C8, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE0C, 0x00000050, 0x0000000A, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244D7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80243B98_C43948, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243C10_C439C0, 0x00000044, 0x00000001, 0x80244D08, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00400000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, dgb_08_UnkNpcAIMainFunc, D_80244100_C43EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dgb_08_UnkFunc1, 0x00000043, 0x00000003, GotoMap, 0x80246E28, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFE4, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFE6, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80244E58, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x00000000, 0x000000C8, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE024B, 0x00000008, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244A54, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF7E, 0x000000D2, 0x00000050, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80244D7C, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0x8024417C, 0x00000000, 0xC47A0000, 0x00000000, 0x00A40004, 0x80244E94, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x0000000A, 0xFFFFFE70, 0x000000D2, 0x00000050, 0xFFFFFF9C, 0x000000D2, 0x00000050, 0x00000064, 0x000000D2, 0x00000050, 0x00000190, 0x000000D2, 0x00000050, 0x00000334, 0x00000064, 0x00000050, 0x00000334, 0x00000064, 0x00000104, 0x00000190, 0x00000000, 0x00000104, 0x00000064, 0x00000000, 0x000000C8, 0xFFFFFF9C, 0x00000000, 0x000000AF, 0xFFFFFE3E, 0x00000000, 0x000000AF, 0xFFFF8001, 0x00000096, 0x00000000, 0x000000AF, 0x000005AA, 0x000000C8, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0007, 0x006A000A, 0x006A000D, 0x006A000D, 0x006A0019, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x006A0007, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000002, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000003, 0x80244360, 0x435C0000, 0x00000000, 0x431B0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000DC, 0x00000000, 0x0000009B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000DC, 0x00000000, 0x0000009B, 0x000000FA, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000004, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000005, 0x80244360, 0x444E4000, 0x42C80000, 0x43480000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000339, 0x00000064, 0x000000C8, 0x00000019, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000339, 0x00000064, 0x000000C8, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000003, 0x00000000, 0x80244290, 0x00000000, 0x00000006, 0x80244434, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802442B8, 0x00000000, 0x00000007, 0x802449FC, 0x42960000, 0x439B0000, 0x42AA0000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004B, 0x00000136, 0x00000055, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000004B, 0x00000000, 0x00000055, 0x000000FA, 0x00000037, 0x00000001, 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, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x802449FC, 0xC3E18000, 0x439B0000, 0x42A20000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFE3D, 0x00000136, 0x00000051, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFECA, 0x00000000, 0x000000AF, 0x000000FA, 0x00000091, 0x00000001, 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, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80243C50_C43A00, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0039000C, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002F1, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00390005, 0x00390002, 0x00000000, 0x000E00F2, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000024, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00390007, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80246310, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246210, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x80244A28, 0x43D50000, 0x00000000, 0x42180000, 0x00600D01, 0x802464C4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x001A00B6, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80246718, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80244360, 0xC37A0000, 0x00000000, 0x43070000, 0x00000401, 0x80246728, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000087, 0x000000FA, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x80244290, 0x00000000, 0x00000001, 0x80246768, 0x0F020003, 0x00000002, 0x80245290, 0x0F020003, 0x00000002, 0x80245670, 0x0F020003, 0x00000002, 0x80245A50, 0x0F030003, 0x00000001, 0x80245E30, 0x00000000, 0x00000001, 0x80246020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802450A0, 0x0F040001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80246528, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_09/C4ABE0.data.s b/ver/us/asm/data/world/area_dgb/dgb_09/C4ABE0.data.s deleted file mode 100644 index f509b661c1..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_09/C4ABE0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244000_C4ABE0 -.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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024061C_C471FC, 0x802440EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x8024411C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_802410D4_C47CB4, 0x802441B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802441E8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_09_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80244284, 0x00000000, 0x00000000, D_80244000_C4ABE0, 0x00000000, 0x00000000, 0x000D0008 - -dlabel D_80244358_C4AF38 -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x3F100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000D00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FC00000, 0x0000005A, 0x0000001E, 0x43700000, 0x00000000, 0x00000001, 0x40A9999A, 0x000000B4, 0x00000001, 0x43700000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80243578_C4A158, 0x802443AC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x000002F7, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00380008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x0000072E, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000108, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x802457A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 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, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00260020, 0x80244370, 0x00000000, 0x802443DC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x8024418C, 0xC3AF0000, 0x00000000, 0x43340000, 0x00000D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFEA2, 0x00000000, 0x000000B4, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000258, 0x000000FA, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x802440BC, 0x00000000, 0x00000001, 0x8024432C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802440E4, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000F0, 0x00000000, 0x00000058, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x80244258, 0x439B0000, 0x00000000, 0x42B00000, 0x00000D00, 0x80244D00, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000136, 0x00000000, 0x00000058, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000258, 0x000000FA, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x802440BC, 0x00000000, 0x00000003, 0x8024432C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802440E4, 0x00000000, 0x00000004, 0x802448F4, 0xC1A00000, 0x42C80000, 0x43340000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFEC, 0x00000064, 0x000000B4, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFEC, 0x00000064, 0x000000B4, 0x000000FA, 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, 0x00380001, 0x00380002, 0x00380003, 0x00380003, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380005, 0x00380001, 0x00380008, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00380001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80244920, 0x0F030001, 0x00000002, 0x80244D6C, 0x0F010001, 0x00000001, 0x8024514C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_15/C513B0.data.s b/ver/us/asm/data/world/area_dgb/dgb_15/C513B0.data.s deleted file mode 100644 index 8f116917b2..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_15/C513B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241EA0_C513B0 -.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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000002, func_8024061C_C4FB2C, 0x80241F8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241FBC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_15_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80242058, 0x00000000, 0x00000000, D_80241EA0_C513B0, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000D0000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000096, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF8405FAB, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFB82, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x000000B4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF5DE024B, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000058, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006A0009, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFCB, 0x000000B4, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000055, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x006A0006, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x006A0010, 0x006A0006, 0x00000000, 0x000E00F3, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x8024274C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000020F6, 0x00010002, 0x00000043, 0x00000006, GetDist2D, 0xFE363C8A, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000018, 0x00000001, 0x000000C8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A80E7, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7DB4, 0x00000057, 0x00000000, 0x00000018, 0x00000001, 0x0000012C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7CE7, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000057, 0x00000000, 0x0000001B, 0x00000001, 0x0000012C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7AE7, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7AB4, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000012, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40400000, 0x0000001E, 0x0000001E, 0x43160000, 0x42A00000, 0x00000001, 0x40600000, 0x000000B4, 0x00000002, 0x43200000, 0x42A00000, 0x00000001, 0x00000044, 0x00000001, 0x80242184, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x006A000C, 0x00000044, 0x00000001, 0x802424E8, 0x00000043, 0x00000002, dgb_15_UnkNpcAIMainFunc, 0x8024271C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dgb_15_UnkFunc1, 0x00000043, 0x00000003, GotoMap, 0x80243028, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFE0, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x0000000B, 0x00000002, 0xF5DE024B, 0x0000000F, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80242238, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFECA, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024274C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802427B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x8024212C, 0x00000000, 0xC47A0000, 0x00000000, 0x00A40900, 0x802427EC, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000007, 0xFFFFFE0C, 0x00000000, 0x000000C8, 0xFFFFFD44, 0x00000000, 0x000000C8, 0xFFFFFC7C, 0x00000000, 0x000000C8, 0xFFFFFC18, 0x00000000, 0x000000C8, 0xFFFFFCE0, 0x00000000, 0x000000C8, 0xFFFFFDA8, 0x00000000, 0x000000C8, 0xFFFFFE70, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFE0C, 0x00000000, 0x000000C8, 0x000003E8, 0x000000FA, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0006, 0x006A0009, 0x006A000C, 0x006A000C, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802428C0, 0x0F040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_16/C53D00.data.s b/ver/us/asm/data/world/area_dgb/dgb_16/C53D00.data.s deleted file mode 100644 index 66131a546a..0000000000 --- a/ver/us/asm/data/world/area_dgb/dgb_16/C53D00.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417C0_C53D00 -.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, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x0000000A, 0x40600000, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000002, func_80240E20_C53360, 0x802418AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802418DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, dgb_16_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0012, 0x00000000, 0x00000000, 0x80241978, 0x00000000, 0x00000000, D_802417C0_C53D00, 0x00000000, 0x00000000, 0x000D0008, 0x00000000, 0x8024194C, 0xC28C0000, 0x00000000, 0xC2C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFFBA, 0x00000000, 0xFFFFFF9C, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x8024187C, 0x00000000, 0x00000001, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000005, 0x8024194C, 0x00000000, 0x00000000, 0xC36B0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000000, 0x00000000, 0xFFFFFF15, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x0000000A, 0x8024194C, 0x428C0000, 0x00000000, 0xC2C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000046, 0x00000000, 0xFFFFFF9C, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x0000000F, 0x8024194C, 0x430C0000, 0x00000000, 0xC36B0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x0000008C, 0x00000000, 0xFFFFFF15, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000014, 0x8024194C, 0x43520000, 0x00000000, 0xC2C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x000000D2, 0x00000000, 0xFFFFFF9C, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000015, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000019, 0x8024194C, 0x438C0000, 0x00000000, 0xC36B0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0x00000118, 0x00000000, 0xFFFFFF15, 0x00000028, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000000, 0xFFFFFF51, 0x000001AE, 0x0000005C, 0x00000001, 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, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001A, 0x80241A20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390002, 0x00390003, 0x00390004, 0x00390004, 0x00390002, 0x00390002, 0x0039000C, 0x0039000C, 0x00390011, 0x00390012, 0x00390007, 0x00390008, 0x00390001, 0x00390002, 0x00390002, 0x00390002, 0x00000000, 0x00000000, 0x802418A4, 0x00000000, 0x00000002, 0x80241A4C, 0x0F030003, 0x00000002, 0x80241E2C, 0x0F000003, 0x00000002, 0x8024220C, 0x0F000003, 0x00000002, 0x802425EC, 0x0F000003, 0x00000002, 0x802429CC, 0x0F010003, 0x00000002, 0x80242DAC, 0x0F010003, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_00/C9F300.data.s b/ver/us/asm/data/world/area_flo/flo_00/C9F300.data.s deleted file mode 100644 index 041e226937..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_00/C9F300.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802413E0_C9F300 -.word 0x00000000, 0x00000000, 0xC39B0000, 0x432A0000, 0xC3A00000, 0x00000000, 0xC3A78000, 0x43070000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0xC3A00000, 0x00000000, 0x43A78000, 0x42340000, 0x43A00000, 0x00000000, 0xC3A78000, 0x43610000, 0x43E88000, 0x00000000, 0x00000000, 0x43870000, 0x43A00000, 0x00000000, 0x43A78000, 0x439D8000, 0xC1F00000, 0x00000000, 0x42F00000, 0x43870000, 0xC1F00000, 0x00000000, 0x42F00000, 0x43870000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x42200000, 0x00000000, 0xC1F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242248, D_802413E0_C9F300, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190114, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000008, 0x0000000B, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007B, 0x00000001, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000003B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000031, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s b/ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s deleted file mode 100644 index 3042f08831..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_00/C9F5E0.data.s +++ /dev/null @@ -1,132 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802416C0_C9F5E0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024196C_C9F88C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000001E, 0xFFFFFF56, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001CF, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9C, 0x00000014, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000001C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFECA, 0x0000001E, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000003B, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9C, 0x00000000, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000001C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001D0, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80249180, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B90_C9FAB0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001CF, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9C, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000001C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0xFFFFFF79, 0x0000001E, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9C, 0x00000000, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000001C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001D0, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000002, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D7C_C9FC9C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80249188, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DD8_C9FCF8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80249190, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E34_C9FD54 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80249198, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E90_C9FDB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802491A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EEC_C9FE0C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000005, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802491A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F48_C9FE68 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000006, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802491B0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FA4_C9FEC4 -.word 0x00000047, 0x00000005, D_80241D7C_C9FC9C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241DD8_C9FCF8, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E34_C9FD54, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E90_C9FDB0, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241EEC_C9FE0C, 0x00080000, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241F48_C9FE68, 0x00080000, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024205C_C9FF7C -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80241FA4_C9FEC4, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80241B90_C9FAB0, 0x00000044, 0x00000001, D_80241FA4_C9FEC4, 0x00000057, 0x00000000, 0x00000021, 0x00000002, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, D_80241FA4_C9FEC4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000007, 0x00000056, 0x00000000, 0x00000046, 0x00000001, 0x8024834C, 0x00000044, 0x00000001, D_80241FA4_C9FEC4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000046, 0x00000001, 0x80247BCC, 0x00000044, 0x00000001, D_80241FA4_C9FEC4, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x00000044, 0x00000001, D_80242998_CA08B8, 0x00000024, 0x00000002, 0xFE363C80, D_80241FA4_C9FEC4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80241FA4_C9FEC4, 0x00000016, 0x00000001, 0x0000000B, 0x00000044, 0x00000001, 0x80245EB8, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80242FCC_CA0EEC, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406340, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000037, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80246834, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80245DE4_CA3D04, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80249130, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002E, 0x00000051, 0x00000044, 0x00000001, 0x80248F48, 0x00000044, 0x00000001, 0x80248E30, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001E, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000096, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C82, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416C0_C9F5E0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000073, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE3E, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416C0_C9F5E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEB6, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000019A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416C0_C9F5E0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE5C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0x000000A0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802416C0_C9F5E0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024205C_C9FF7C, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802414D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_C9DF20, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000023, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000012C, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C82, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFFFE8000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFFFF8000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242840_CA0760 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024286C_CA078C -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8024289C_CA07BC -.word 0x00000043, 0x00000002, flo_00_UnkNpcAIMainFunc, D_8024286C_CA078C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428BC_CA07DC -.word 0x00000000, 0x002A001C, 0x00000000, 0x00000000, D_8024289C_CA07BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802428E8_CA0808 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242914_CA0834 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242998_CA08B8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000032, 0x00000000, 0xFFFFFF38, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0xFFFFFF38, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002BC, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A4E80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFE5, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100C4, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x80249360, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AF0_CA0A10 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF56, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF56, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00110000, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8080, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000320, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A634D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x00110001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000015E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x00110002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000014D, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9E80, 0xF24A2280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110003, 0x00000000, 0x00000046, 0xFFFFFF38, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABC80, 0xF24A4B4D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000020D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110004, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9E80, 0xF24A2280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000014D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110005, 0x00000000, 0x00000046, 0xFFFFFF38, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002B, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FCC_CA0EEC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000002, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110006, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000036, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000003C, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0011000D, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000002, ShowChoice, 0x001E001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SwitchMessage, 0x0011000E, 0x00000018, 0x00000001, 0x0000002E, 0x00000043, 0x00000002, SwitchMessage, 0x0011000F, 0x00000018, 0x00000001, 0x00000031, 0x00000043, 0x00000002, SwitchMessage, 0x00110010, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000002, SwitchMessage, 0x00110011, 0x00000018, 0x00000001, 0x00000037, 0x00000043, 0x00000002, SwitchMessage, 0x00110007, 0x00000018, 0x00000001, 0x0000003A, 0x00000043, 0x00000002, SwitchMessage, 0x00110012, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, SwitchMessage, 0x00110013, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000044, 0x00000001, D_8024196C_C9F88C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, CloseMessage, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110014, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000002, ShowChoice, 0x001E001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SwitchMessage, 0x00110015, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000044, 0x00000001, D_8024196C_C9F88C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, CloseMessage, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243368_CA1288 -.word 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0x00000258, 0xF24ACE80, 0xF24A4A80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0011000B, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A1680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0011000C, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243474_CA1394 -.word 0x00000043, 0x00000003, EnableGroup, 0x00000079, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000084, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000032, 0x00000046, 0xFFFFFF1A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002B, 0x00000044, 0x00000001, D_80242AF0_CA0A10, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024352C_CA144C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00110016, 0x00000018, 0x00000001, 0x0000002E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00110017, 0x00000018, 0x00000001, 0x00000031, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00110018, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00110019, 0x00000018, 0x00000001, 0x00000039, 0x00000014, 0x00000001, 0xF9718892, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990009, 0x00990008, 0x00000000, 0x0011001A, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990009, 0x00990008, 0x00000000, 0x0011001B, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990009, 0x00990008, 0x00000000, 0x0011001C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436C0_CA15E0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x0011001D, 0x00000018, 0x00000001, 0x0000002E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x0011001E, 0x00000018, 0x00000001, 0x00000031, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x0011001F, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x00110020, 0x00000018, 0x00000001, 0x00000039, 0x00000014, 0x00000001, 0xF9718893, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x00110021, 0x00000024, 0x00000002, 0xF9718893, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x00110022, 0x00000024, 0x00000002, 0xF9718893, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x00110023, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243854_CA1774 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x00110024, 0x00000018, 0x00000001, 0x0000002E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x00110025, 0x00000018, 0x00000001, 0x00000031, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x00110026, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x00110027, 0x00000018, 0x00000001, 0x00000039, 0x00000014, 0x00000001, 0xF9718894, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990209, 0x00990208, 0x00000000, 0x00110028, 0x00000024, 0x00000002, 0xF9718894, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990209, 0x00990208, 0x00000000, 0x00110029, 0x00000024, 0x00000002, 0xF9718894, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990209, 0x00990208, 0x00000000, 0x0011002A, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802439E8_CA1908 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990303, 0x00990302, 0x00000000, 0x0011002B, 0x00000018, 0x00000001, 0x0000002E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990303, 0x00990302, 0x00000000, 0x0011002C, 0x00000018, 0x00000001, 0x00000031, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990303, 0x00990302, 0x00000000, 0x0011002D, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990303, 0x00990302, 0x00000000, 0x0011002E, 0x00000018, 0x00000001, 0x00000039, 0x00000014, 0x00000001, 0xF9718895, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990309, 0x00990308, 0x00000000, 0x0011002F, 0x00000024, 0x00000002, 0xF9718895, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990309, 0x00990308, 0x00000000, 0x00110030, 0x00000024, 0x00000002, 0xF9718895, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990309, 0x00990308, 0x00000000, 0x00110031, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B7C_CA1A9C -.word 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024352C_CA144C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BB0_CA1AD0 -.word 0x00000024, 0x00000002, 0xF9718893, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802436C0_CA15E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BE4_CA1B04 -.word 0x00000024, 0x00000002, 0xF9718894, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243854_CA1774, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C18_CA1B38 -.word 0x00000024, 0x00000002, 0xF9718895, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802439E8_CA1908, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C4C_CA1B6C -.word 0x0000000A, 0x00000002, 0xF84060DD, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFFFFFFE2, 0x0000012C, 0xF24ACA80, 0xF24A5480, 0x00000024, 0x00000002, 0xF84060DD, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110035, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110038, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110039, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000023, 0x00000000, 0x00000018, 0x00000001, 0x0000002F, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110036, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110038, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110039, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000023, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110037, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110038, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110039, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000023, 0x00000000, 0x00000018, 0x00000001, 0x00000039, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110039, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x00110038, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000023, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C50002, 0x00C50001, 0x00000000, 0x0011003A, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C50003, 0x00C50003, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024414C_CA206C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243C4C_CA1B6C, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000041, 0x00000032, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244188_CA20A8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024427C_CA219C -.word 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF251E680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFF7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00170004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000139, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00170001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000006, 0x00000001, 0x00000043, 0x00000001, PostChapter6StatUpdate, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0196, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100D9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00170003, 0x00170001, 0x00000200, 0x001100DA, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000006, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003B, 0x00000046, 0x00000001, D_80243368_CA1288, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BF4_CA2B14 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244188_CA20A8, 0x00000044, 0x00000001, D_8024427C_CA219C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C98_CA2BB8 -.word 0x0000000E, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00CC0004, 0x00CC0001, 0x00000000, 0x00110032, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00CC0004, 0x00CC0001, 0x00000000, 0x00110032, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0008000B, 0x00080003, 0x00000005, 0x00110033, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00080001, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00CC0004, 0x00CC0001, 0x00000000, 0x00110034, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DD0_CA2CF0 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000003A, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244C98_CA2BB8, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000024, 0x0000001C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF38, 0x0000000F, 0xFFFFFED4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E64_CA2D84 -.word 0x00000000, D_80242840_CA0760, 0xC2900000, 0x42700000, 0xC2C80000, 0x00000A01, D_80243474_CA1394, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990002, 0x0099000E, 0x0099000E, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245054_CA2F74 -.word 0x00000001, D_802428BC_CA07DC, 0xC26C0000, 0x00000000, 0xC2200000, 0x00002801, D_80243B7C_CA1A9C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0xFFFFFFC5, 0x00000000, 0xFFFFFFD8, 0xFFFFFFB0, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFFC5, 0x00000000, 0xFFFFFFD8, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990002, 0x0099000E, 0x0099000E, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00990002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D5, 0x00000002, D_802428BC_CA07DC, 0x42860000, 0x00000000, 0x42AA0000, 0x00002801, D_80243BB0_CA1AD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000043, 0x00000000, 0x00000055, 0x00000061, 0x00000000, 0x00000055, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFFC5, 0x00000000, 0xFFFFFFD8, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990102, 0x0099010E, 0x0099010E, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00000000, 0x00000000, 0x00000000, 0x001A00D6, 0x00000003, D_802428BC_CA07DC, 0x42B40000, 0x00000000, 0x43CD0000, 0x00002801, D_80243BE4_CA1B04, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x0000005A, 0x00000000, 0x0000019A, 0x00000078, 0x00000000, 0x0000019A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFFC5, 0x00000000, 0xFFFFFFD8, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990202, 0x0099020E, 0x0099020E, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00000000, 0x00000000, 0x00000000, 0x001A00D7, 0x00000004, D_802428BC_CA07DC, 0x43480000, 0x00000000, 0x43D70000, 0x00002801, D_80243C18_CA1B38, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x000000C8, 0x00000000, 0x000001AE, 0x000000F0, 0x00000000, 0x000001AE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFFC5, 0x00000000, 0xFFFFFFD8, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990302, 0x0099030E, 0x0099030E, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00000000, 0x00000000, 0x00000000, 0x001A00D8 - -dlabel D_80245814_CA3734 -.word 0x00000005, D_802428E8_CA0808, 0xC3C80000, 0x00000000, 0x433E0000, 0x00402D01, D_8024414C_CA206C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00C50001, 0x00000000, 0x00000000, 0x00000000, 0x001A00D9 - -dlabel D_80245A04_CA3924 -.word 0x00000006, D_80242914_CA0834, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244BF4_CA2B14, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170000, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00170001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245BF4_CA3B14 -.word 0x00000007, D_80242840_CA0760, 0x43460000, 0x00000000, 0x43B58000, 0x00000D01, D_80244DD0_CA2CF0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E2 - -dlabel D_80245DE4_CA3D04 -.word 0x00000001, D_80244E64_CA2D84, 0x00000000, 0x00000004, D_80245054_CA2F74, 0x00000000, 0x00000001, D_80245814_CA3734, 0x00000000, 0x00000001, D_80245A04_CA3924, 0x00000000, 0x00000001, D_80245BF4_CA3B14, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_00/CA3D50.data.s b/ver/us/asm/data/world/area_flo/flo_00/CA3D50.data.s deleted file mode 100644 index 2f0984f36c..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_00/CA3D50.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245E30_CA3D50 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80245E5C_CA3D7C -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x43850000, 0x41A00000, 0x43A10000, 0x439B0000, 0x41F00000, 0x439C0000, 0x43AD0000, 0x42B40000, 0x43960000, 0x43C80000, 0x43480000, 0x438F8000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE70, 0x00000000, 0x000000C8, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFE84, 0x00000000, 0x000000C8, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x000000E6, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000015E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24AC080, 0xF24B0680, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00080009, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00080001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00040006, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000002, 0x00000190, 0x000000C8, 0x0000011F, 0x00000050, 0xFFFFFFFB, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x80249370, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246170_CA4090 -.word 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE70, 0x00000000, 0x000000C8, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFE84, 0x00000000, 0x000000C8, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C4, 0x00000014, 0x00000162, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802461E4_CA4104 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000A3, 0x00000014, 0x00000172, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246224_CA4144 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000010A, 0x00000014, 0x00000142, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000010E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246264_CA4184 -.word 0x00000000, D_80245E30_CA3D50, 0x43100000, 0x00000000, 0x43BB0000, 0x00000801, D_80246170_CA4090, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00080001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80245E30_CA3D50, 0x43460000, 0x00000000, 0x43B58000, 0x00000801, D_802461E4_CA4104, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00CC0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80245E5C_CA3D7C, 0x43850000, 0x00000000, 0x43A10000, 0x00000801, D_80246224_CA4144, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040001, 0x00040002, 0x00040003, 0x00040003, 0x00040001, 0x00040001, 0x00040000, 0x00040000, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80246264_CA4184, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_00/CA4770.data.s b/ver/us/asm/data/world/area_flo/flo_00/CA4770.data.s deleted file mode 100644 index 162711d083..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_00/CA4770.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246850_CA4770 -.word 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF23F8A80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24C0A80, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000064, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x0000004A, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000059, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005B, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005D, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005F, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000061, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000063, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000065, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000067, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000069, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000006B, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000006D, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000006F, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000071, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000073, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000075, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000077, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0x0000004A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000071, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000075, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0x00000000, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A4A80, 0x00000043, 0x00000006, RotateGroup, 0x0000004A, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005B, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000061, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000065, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000067, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000069, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006F, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000071, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000073, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000075, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000077, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xF24A9AFD, 0xF24B5B1D, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0xF24A5EFD, 0xF24BE71D, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x0000005D, 0xF24AAEFD, 0xF24C231D, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0xF24A52FD, 0xF24C9B1D, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xF24A5AFD, 0xF24D9F1D, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0xF24AAEFD, 0xF24DEF1D, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xF24A9B02, 0xF24E8F6B, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xF24A46FD, 0xF24EA31D, 0xF24A7F2A, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0xF24A9AFD, 0xF24F6B1D, 0xF24A432A, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xF24A4EBA, 0xF250971D, 0xF24AA4C4, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0xF24A5E7E, 0xF2519B1D, 0xF24A7E4A, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0xF24AAE7E, 0xF251D71D, 0xF24A7E4A, 0x00000043, 0x00000005, TranslateModel, 0x00000071, 0xF24A527E, 0xF2524F1D, 0xF24A7E4A, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0xF24A9A83, 0xF252DB6B, 0xF24A7E4A, 0x00000043, 0x00000005, TranslateModel, 0x00000075, 0xF24AAE7E, 0xF253A31D, 0xF24A7E4A, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0xF24A467E, 0xF254571D, 0xF24A7E4A, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF23F8A80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24F2A80, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24C0A80, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000064, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000059, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005B, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005D, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005F, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000061, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000063, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000065, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000067, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000069, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000006B, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000006D, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000006F, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000071, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000073, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000075, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x00000077, 0xFE363C81, 0xFE363C81, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xF24A5A04, 0xF24999E4, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0xF24A9604, 0xF2490DE4, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x0000005D, 0xF24A4604, 0xF248D1E4, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0xF24AA204, 0xF24859E4, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xF24A9A04, 0xF24755E4, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0xF24A4604, 0xF24705E4, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xF24A59FF, 0xF2466596, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xF24AAE04, 0xF24651E4, 0xF24A75D7, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0xF24A5A04, 0xF24589E4, 0xF24AB1D7, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xF24AA647, 0xF2445DE4, 0xF24A503D, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0xF24A9683, 0xF24359E4, 0xF24A76B7, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0xF24A4683, 0xF2431DE4, 0xF24A76B7, 0x00000043, 0x00000005, TranslateModel, 0x00000071, 0xF24AA283, 0xF242A5E4, 0xF24A76B7, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0xF24A5A7E, 0xF2421996, 0xF24A76B7, 0x00000043, 0x00000005, TranslateModel, 0x00000075, 0xF24A4683, 0xF24151E4, 0xF24A76B7, 0x00000043, 0x00000005, TranslateModel, 0x00000077, 0xF24AAE83, 0xF2409DE4, 0xF24A76B7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247488_CA53A8 -.word 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF23F8A80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24C0A80, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000064, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x0000004F, 0xFE363C81, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, TranslateGroup, 0x0000004F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A4A80, 0x00000043, 0x00000006, RotateGroup, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247588_CA54A8 -.word 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xF24AA080, 0xF24AAA80, 0xF24AB680, 0x00000043, 0x00000005, TranslateModel, 0x00000055, 0xF24A5480, 0xF24AAA80, 0xF24AB680, 0x00000043, 0x00000005, TranslateModel, 0x00000057, 0xF24A7A80, 0xF24A7A80, 0xF24ABE80, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000055, 0xFE363C81, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xF24A5480, 0xF24A4A80, 0xF24A3E80, 0x00000043, 0x00000005, TranslateModel, 0x00000055, 0xF24AA080, 0xF24A4A80, 0xF24A3E80, 0x00000043, 0x00000005, TranslateModel, 0x00000057, 0xF24A7A80, 0xF24A7A80, 0xF24A3680, 0x00000043, 0x00000005, ScaleModel, 0x00000053, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x00000055, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x00000057, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802476F4_CA5614 -.word 0x00000043, 0x00000005, ScaleModel, 0x00000051, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24BE280, 0x0000002C, 0x00000002, 0xFE363C81, 0xF2491280, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247770_CA5690 -.word 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A6E80, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xF24A7976, 0xFE363C80, 0xF24A8069, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802477EC_CA570C -.word 0x0000000A, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000024, 0x00000002, 0xF97188AC, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24ADA80, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C89, 0xFE363C8B, 0x00000008, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x0000019C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007B, 0x00000001, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000003, func_80240F10_C9EE30, 0xFE363C83, 0xFE363C84, 0x00000014, 0x00000001, 0xFE363C84, 0x00000018, 0x00000001, 0x0000005A, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x0000001B, 0x00000001, 0x0000010E, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_00_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0x00000000, 0x000002BC, 0x00000320, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80247770_CA5690, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240F80_C9EEA0, 0x00000043, 0x00000001, func_802410B4_C9EFD4, 0x0000000A, 0x00000002, 0xFE363C8F, 0x0000015E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80249378, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0xF2498E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AD280, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24C6E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF2499E80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24AD680, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24CBE80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000014, 0x00000001, 0xF9718890, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xF24A7976, 0xF24A8280, 0xF24A8069, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000078, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_00_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0x00000046, 0x00000000, 0x00000078, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80247770_CA5690, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240F80_C9EEA0, 0x00000043, 0x00000001, func_802410B4_C9EFD4, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0x0000000A, 0x00000000, 0x0000006E, 0x00000014, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x0000019D, 0x00000046, 0x00000001, 0x802414D0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247FAC_CA5ECC -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002F, 0x0000019B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_00_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0x00000000, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80247588_CA54A8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x000004B0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_00_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0xFFFFFD44, 0x00000000, 0x000004B0, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80246850_CA4770, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80247488_CA53A8, 0x00000014, 0x00000001, 0xFE363C8F, 0x00000016, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000016, 0x00000001, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000320, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000226, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000032, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x00000BB8, 0x00000043, 0x00000003, GotoMap, 0x80249378, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000C8, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFC4, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFEC, 0x00000000, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000041, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAC80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000320, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000014, 0x00000043, 0x00000008, flo_00_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0xF24A7A80, 0xF24A7E80, 0x00000064, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_802476F4_CA5614, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x0011000A, 0x00000000, 0x00000032, 0xFFFFFF38, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248598_CA64B8 -.word 0x00000059, 0x00000058, 0x0000005A, 0x00000000 - -dlabel D_802485A8_CA64C8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, func_802D2884, 0xFFFFFFAB, 0x00000055, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DB, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0x00000059, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000059, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DB, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DC, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000058, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0x00000058, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x0000001C, 0x00000000, 0x00000014, 0x00000001, 0xF9718891, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110008, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x00110009, 0x00000000, 0x0000000A, 0xFFFFFF38, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000058, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF84060DC, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFFFFFFAB, 0x00000055, 0x0000001C, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000005A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, flo_00_SyncStatusMenu, 0x00000043, 0x00000007, MakeItemEntity, 0x0000005A, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFC4, 0x0000001E, 0x00000014, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000C8, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x0000007B, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFAB, 0x00000000, 0x0000004B, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80247FAC_CA5ECC, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248D3C_CA6C5C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, IsPlayerWithin, 0xFFFFFFAB, 0x00000055, 0x00000014, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024139C_C9F2BC, 0x00000046, 0x00000001, D_802485A8_CA64C8, 0x00000043, 0x00000001, func_802413BC_C9F2DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000037, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000036, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DB, 0x00000001, 0x0000000A, 0x00000002, 0xF84060DC, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000059, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000058, 0xFFFFFFAD, 0x00000000, 0x00000057, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000013, 0x00000000, 0x0000004E, 0x00000006, D_80248D3C_CA6C5C, 0x00000010, 0x00000000, D_80248598_CA64B8, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802477EC_CA570C, 0x00000080, 0x0000002E, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000079, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000050, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000036, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD44, 0x00000044, 0x00000001, D_80246850_CA4770, 0x00000044, 0x00000001, D_80247488_CA53A8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80247588_CA54A8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_802476F4_CA5614, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x0000001B, 0x00000001, 0x00000037, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80247588_CA54A8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_802476F4_CA5614, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD44, 0x00000044, 0x00000001, D_80246850_CA4770, 0x00000044, 0x00000001, D_80247488_CA53A8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80247588_CA54A8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_802476F4_CA5614, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s b/ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s deleted file mode 100644 index cf89861bb7..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_00/CA7050.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80249130_CA7050 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000060, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x0000006E, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_03/CA78D0.data.s b/ver/us/asm/data/world/area_flo/flo_03/CA78D0.data.s deleted file mode 100644 index f1b4212d36..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_03/CA78D0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240630_CA78D0 -.word 0xC3A28000, 0x00000000, 0x00000000, 0x42B40000, 0x43A28000, 0x00000000, 0x00000000, 0x43870000, 0xC3A28000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240C2C_CA7ECC, D_80240630_CA78D0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190115 - -dlabel D_802406A0_CA7940 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001A, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000049, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000001, 0x00000043, 0x00000003, PushSong, 0x00000089, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, PopSong, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240880_CA7B20 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B2C_CA7DCC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244F30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B88_CA7E28 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244F38, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BE4_CA7E84 -.word 0x00000047, 0x00000005, D_80240B2C_CA7DCC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240B88_CA7E28, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C2C_CA7ECC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024442C, 0x00000046, 0x00000001, 0x80244EE0, 0x00000046, 0x00000001, 0x80241EF4, 0x00000044, 0x00000001, 0x80244E54, 0x00000044, 0x00000001, 0x80244ED0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240880_CA7B20, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240880_CA7B20, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, 0x80240FFC, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240BE4_CA7E84, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802406A0_CA7940, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CA72A0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_03/CA8150.data.s b/ver/us/asm/data/world/area_flo/flo_03/CA8150.data.s deleted file mode 100644 index 72f8e70d15..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_03/CA8150.data.s +++ /dev/null @@ -1,111 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240EB0_CA8150 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240EDC_CA817C -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240F08_CA81A8 -.word 0x00000000 - -dlabel D_80240F0C_CA81AC -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F6C_CA820C -.word 0xFFFFFF9C, 0x00000000, 0x000000D2, 0xFFFFFF60, 0x00000000, 0x0000011D, 0xFFFFFFDD, 0x00000000, 0x00000131 - -dlabel D_80240F90_CA8230 -.word 0xFFFFFF42, 0x00000000, 0x00000050, 0xFFFFFF7E, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000000, 0xFFFFFFC4 - -dlabel D_80240FB4_CA8254 -.word 0x0000004B, 0x00000000, 0xFFFFFFF1, 0x00000023, 0x00000000, 0xFFFFFF9C, 0x00000082, 0x00000000, 0x00000000 - -dlabel D_80240FD8_CA8278 -.word 0x00000073, 0x00000000, 0x000000B4, 0x00000055, 0x00000000, 0x00000122, 0x00000091, 0x00000000, 0x0000008C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFE5, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C70002, 0x00C70001, 0x00000000, 0x001100C8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C70003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x80244F40, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024119C_CA843C -.word 0x00000043, 0x00000001, func_80240158_CA73F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411B8_CA8458 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060D6, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024122C_CA84CC -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24ACA80, 0xF24A5480, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412BC_CA855C -.word 0x00000046, 0x00000001, 0x802407C0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0xF24A8880, 0x00000046, 0x00000001, D_8024122C_CA84CC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110050, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C70006, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110051, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x002F0112, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000010E, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000321, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x002F0116, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000002, 0xFFFFFFD3, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110052, 0x00000043, 0x00000003, SetNpcYaw, 0x00000003, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x002F0100, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000321, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x002F0110, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110053, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000010E, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x002F0114, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110054, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000010E, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0107, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0108, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0116, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110055, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF17, 0x00000000, 0xFFFFFF27, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0048000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x0000002D, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110056, 0x00000024, 0x00000002, 0xFE363C84, 0xF24BE280, 0x00000046, 0x00000001, D_8024122C_CA84CC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110057, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000004, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x00000001, D_8024119C_CA843C, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8F, 0x0000003C, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110058, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C70006, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xF24A8880, 0x00000046, 0x00000001, D_8024122C_CA84CC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70008, 0x00C70003, 0x00000000, 0x00110059, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C70004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C70001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000058, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80240F0C_CA81AC, 0x00000043, 0x00000002, AddKeyItem, 0x00000058, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005A, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002D, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005B, 0x00000018, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005C, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005D, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005E, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A9A80, 0x00000046, 0x00000001, 0x80240814, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DA4_CA9044 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802412BC_CA855C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C70006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C70001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E10_CA90B0 -.word 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802411B8_CA8458, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF84060D6, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024119C_CA843C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8F, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F64_CA9204 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF84060D7, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF84060D8, 0x00000001, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xF84060D9, 0x00000001, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF84060DA, 0x00000001, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060D7, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060D8, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060D9, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060DA, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C70006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C70001, 0x00000024, 0x00000002, 0xF8406103, 0x00000001, 0x00000046, 0x00000001, D_802406A0_CA7940, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F0101, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F0101, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242138_CA93D8 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002F0105, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024219C_CA943C -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x0000000A, 0x00000002, 0xF9718897, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF9718897, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00008048, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF9718897, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000322, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060D7, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718897, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D7, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240F6C_CA820C, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF9718897, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000321, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242618_CA98B8 -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8B, 0x00000000, 0x0000000A, 0x00000002, 0xF9718898, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF9718898, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00008048, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000003, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF9718898, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000003, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000322, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060D8, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718898, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D8, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240F90_CA8230, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF9718898, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000003, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000321, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000023, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A94_CA9D34 -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8C, 0x00000000, 0x0000000A, 0x00000002, 0xF9718899, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF9718899, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00008048, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000004, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF9718899, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000004, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000322, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060D9, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718899, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D9, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240FB4_CA8254, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF9718899, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000004, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000321, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000028, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F10_CAA1B0 -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000000, 0x0000000A, 0x00000002, 0xF971889A, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, IsPlayerWithin, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF971889A, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00008048, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000005, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF971889A, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8D, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000005, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x00000322, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060DA, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF971889A, 0x00000001, 0x0000000A, 0x00000002, 0xF84060DA, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240FD8_CA8278, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF971889A, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000005, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x00000321, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000002D, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFD050F8D, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024338C_CAA62C -.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80242138_CA93D8, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241F64_CA9204, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024219C_CA943C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060D7, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024219C_CA943C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x002F0110, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000002, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434CC_CAA76C -.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80242138_CA93D8, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241F64_CA9204, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242618_CA98B8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060D8, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242618_CA98B8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x002F0110, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000003, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024360C_CAA8AC -.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80242138_CA93D8, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241F64_CA9204, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242A94_CA9D34, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060D9, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242A94_CA9D34, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x002F0110, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000004, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024374C_CAA9EC -.word 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80242138_CA93D8, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241F64_CA9204, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242F10_CAA1B0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060DA, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242F10_CAA1B0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x002F0110, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000005, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024388C_CAAB2C -.word 0x00000000, D_80240EDC_CA817C, 0xC1F00000, 0x00000000, 0x42C80000, 0x00000D01, D_80241DA4_CA9044, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00000000, 0x00000000, 0x00000000, 0x001A00DD - -dlabel D_80243A7C_CAAD1C -.word 0x00000001, D_80240EB0_CA8150, 0xC3690000, 0x00000000, 0xC3590000, 0x00000D01, D_80241E10_CA90B0, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243C6C_CAAF0C -.word 0x00000002, D_80240EB0_CA8150, 0xC2C80000, 0x00000000, 0x43520000, 0x00000F01, D_8024338C_CAA62C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243E5C_CAB0FC -.word 0x00000003, D_80240EB0_CA8150, 0xC3020000, 0x00000000, 0x00000000, 0x00000F01, D_802434CC_CAA76C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024404C_CAB2EC -.word 0x00000004, D_80240EB0_CA8150, 0x42960000, 0x00000000, 0x41A00000, 0x00000F01, D_8024360C_CAA8AC, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024423C_CAB4DC -.word 0x00000005, D_80240EB0_CA8150, 0x428E0000, 0x00000000, 0x43480000, 0x00000F01, D_8024374C_CAA9EC, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024388C_CAAB2C, 0x00000000, 0x00000001, D_80243A7C_CAAD1C, 0x180F0002, 0x00000001, D_80243C6C_CAAF0C, 0x19020002, 0x00000001, D_80243E5C_CAB0FC, 0x19010002, 0x00000001, D_8024404C_CAB2EC, 0x19030002, 0x00000001, D_8024423C_CAB4DC, 0x19040002, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802447E0_CABA80 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_03_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_03_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DE4_CAC084 -.word 0x00000001, 0x00000017 - -dlabel D_80244DEC_CAC08C -.word 0x00000001, 0x00000016 - -dlabel D_80244DF4_CAC094 -.word 0x00000002, 0x0000009F, 0xFFFFFF00, 0x00000066, 0xFFFFFF57, 0x0000000C, 0x00000000, 0xF971889B, 0x0000009F, 0xFFFFFF64, 0x00000066, 0xFFFFFF57, 0x0000000C, 0x00000000, 0xF971889C - -dlabel D_80244E30_CAC0D0 -.word D_80244DE4_CAC084, D_80244DEC_CAC08C, D_80244DF4_CAC094, 0x00000000, 0x00000000 - -dlabel D_80244E44_CAC0E4 -.word 0xC3500000, 0x00000000, 0xC3360000, 0x00000000, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244E30_CAC0D0, 0x00000047, 0x00000005, D_802447E0_CABA80, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802447E0_CABA80, 0x00100000, D_80244E44_CAC0E4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_03/CAC170.data.s b/ver/us/asm/data/world/area_flo/flo_03/CAC170.data.s deleted file mode 100644 index cbf30f239b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_03/CAC170.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244ED0_CAC170 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF51, 0x00000000, 0x00000096, 0x00000000, 0x00000008, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_07/CAC930.data.s b/ver/us/asm/data/world/area_flo/flo_07/CAC930.data.s deleted file mode 100644 index c886e252ac..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_07/CAC930.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240740_CAC930 -.word 0x43BB8000, 0x00000000, 0x00000000, 0x43870000, 0x43A28000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CA0, D_80240740_CAC930, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190116, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000021, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000089, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_07/CACAC0.data.s b/ver/us/asm/data/world/area_flo/flo_07/CACAC0.data.s deleted file mode 100644 index 6833a9bd27..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_07/CACAC0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408D0_CACAC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_07_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_07_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024096C_CACB5C -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C18_CACE08 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242B30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C74_CACE64 -.word 0x00000047, 0x00000005, D_80240C18_CACE08, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242B0C, 0x00000046, 0x00000001, 0x802428C4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_CACB5C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_CACB5C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, D_8024096C_CACB5C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_CACB5C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024096C_CACB5C, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_CACAC0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408D0_CACAC0, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x80241C14, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240C74_CACE64, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x802424F4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802407A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, flo_07_SpawnSunEffect, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_CAC534, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_07/CAD410.data.s b/ver/us/asm/data/world/area_flo/flo_07/CAD410.data.s deleted file mode 100644 index 6ad12ace43..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_07/CAD410.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241220_CAD410 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415AC_CAD79C -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_07_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_07_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BB0_CADDA0 -.word 0x00000000 - -dlabel D_80241BB4_CADDA4 -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A4E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x001100C5, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x80242B38, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D6C_CADF5C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000001, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DBC_CADFAC -.word 0x0000000A, 0x00000002, 0xF9718886, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x00110068, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000045, 0x00000002, D_80241D6C_CADF5C, 0xFD050F80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80006, 0x00C80006, 0x00000000, 0x00110069, 0x00000049, 0x00000001, 0xFD050F80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF06, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001E, 0xFFFFFF1F, 0x00000064, 0xFFFFFFE7, 0x0000000D, 0xF84060DE, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001E, 0xFFFFFEF7, 0x00000064, 0x00000036, 0x0000000D, 0xF84060DE, 0x00000024, 0x00000002, 0xF84060F4, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000043, 0x00000002, func_802D62E4, 0x000003BC, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x0011006A, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242044_CAE234 -.word 0x00000046, 0x00000001, 0x8024086C, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110070, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110071, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000002E, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24FF280, 0xF24AC280, 0xF24A5C80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110065, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C80005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C80000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000059, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241BB4_CADDA4, 0x00000043, 0x00000002, AddKeyItem, 0x00000059, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110066, 0x0000000A, 0x00000002, 0xF84060E3, 0x00000001, 0x00000046, 0x00000001, D_80241DBC_CADFAC, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000018, 0x00000001, 0x0000002F, 0x0000000A, 0x00000002, 0xF84060E3, 0x00000001, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24FF280, 0xF24AC280, 0xF24A5C80, 0x00000046, 0x00000001, D_80241DBC_CADFAC, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110072, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110072, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x0000000A, 0x00000002, 0xF84060DE, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110072, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000030, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110073, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110074, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110075, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110076, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110077, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80240890, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242428_CAE618 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000002F, 0x0000000A, 0x00000002, 0xF84060DE, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F4, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001E, 0xFFFFFF1F, 0x00000000, 0xFFFFFFE7, 0x00000011, 0xF84060DE, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001E, 0xFFFFFEF7, 0x00000000, 0x00000036, 0x00000011, 0xF84060DE, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242044_CAE234, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xF70F2E83, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x0011006E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000019A, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x0011006F, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425F8_CAE7E8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002F, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80004, 0x00C80001, 0x00000000, 0x00110067, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000002E, 0x0000000A, 0x00000002, 0xF84060E3, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80241DBC_CADFAC, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DE, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80004, 0x00C80001, 0x00000000, 0x00110067, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E82, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E82, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80003, 0x00C80001, 0x00000000, 0x0011006B, 0x00000018, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80003, 0x00C80001, 0x00000000, 0x0011006C, 0x0000001B, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C80003, 0x00C80001, 0x00000000, 0x0011006D, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x80242B40, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242888_CAEA78 -.word 0x00000003, 0x00000013, 0x00000014, 0x00000015 - -dlabel D_80242898_CAEA88 -.word 0x00000001, 0x00000012 - -dlabel D_802428A0_CAEA90 -.word D_80242888_CAEA78, D_80242898_CAEA88, 0x00000000, 0x00000000, D_802425F8_CAE7E8 - -dlabel D_802428B4_CAEAA4 -.word 0xC39A8000, 0x00000000, 0x41F80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802428A0_CAEA90, 0x00000047, 0x00000005, D_802415AC_CAD79C, 0x00001000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802415AC_CAD79C, 0x00100000, D_802428B4_CAEAA4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024291C_CAEB0C -.word 0x00000000, D_80241220_CAD410, 0xC3820000, 0x00000000, 0x00000000, 0x00000D01, D_80242428_CAE618, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00000000, 0x00000000, 0x00000000, 0x001A00DE, 0x00000001, D_8024291C_CAEB0C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s b/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s deleted file mode 100644 index 411fffefd9..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241EE0_CB0C20 -.word 0xC4598000, 0x00000000, 0x00000000, 0x42B40000, 0x440E8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242A6C_CB17AC, D_80241EE0_CB0C20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190117 - -dlabel D_80241F40_CB0C80 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FB0_CB0CF0 -.word 0x001D00F0, 0x001D00F1 - -dlabel D_80241FB8_CB0CF8 -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel D_80241FC8_CB0D08 -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel D_80242008_CB0D48 -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80242014_CB0D54 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, flo_08_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, flo_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, flo_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_CAED7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, flo_08_UnkFunc22, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_CAF340, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242178_CB0EB8 -.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_CAFA48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_08_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_CAEE60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_CAEF0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, flo_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242014_CB0D54, 0x00000043, 0x00000003, flo_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000001, flo_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425F8_CB1338 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060FA, 0x00000043, 0x00000002, AssignScript, D_80242178_CB0EB8, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242680_CB13C0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024292C_CB166C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246120, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242988_CB16C8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246128, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429E4_CB1724 -.word 0x00000047, 0x00000005, D_8024292C_CB166C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242988_CB16C8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A2C_CB176C -.word 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242A6C_CB17AC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244EC4, 0x00000046, 0x00000001, D_802425F8_CB1338, 0x00000044, 0x00000001, 0x80245F5C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80242A2C_CB176C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000018, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242680_CB13C0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80242680_CB13C0, 0x00000044, 0x00000001, 0x80245914, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802429E4_CB1724, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80241F40_CB0C80, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240D40_CAFA80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_08/CB1BF0.data.s b/ver/us/asm/data/world/area_flo/flo_08/CB1BF0.data.s deleted file mode 100644 index 894084e66c..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_08/CB1BF0.data.s +++ /dev/null @@ -1,75 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242EB0_CB1BF0 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41F00000, 0x00000003, 0x4019999A, 0x0000000F, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001 - -dlabel D_80242EE0_CB1C20 -.word 0x00000043, 0x00000002, func_8024150C_CB024C, D_80242EB0_CB1BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F00_CB1C40 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FB4_CB1CF4 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80242EE0_CB1C20, EnemyNpcHit, D_80242F00_CB1C40, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00640000 - -dlabel D_80242FE0_CB1D20 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024300C_CB1D4C -.word 0x3F800000, 0x000001F4, 0x0000000A, 0x42480000, 0x41F00000, 0x00000003, 0x40600000, 0x00000028, 0x00000003, 0x42C80000, 0x41F00000, 0x00000001 - -dlabel D_8024303C_CB1D7C -.word 0x00000043, 0x00000002, DoBasicAI, D_8024300C_CB1D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024305C_CB1D9C -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024303C_CB1D7C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_80243088_CB1DC8 -.word 0x00000000 - -dlabel D_8024308C_CB1DCC -.word 0x00000000 - -dlabel D_80243090_CB1DD0 -.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, flo_08_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_802419C4_CB0704, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431C4_CB1F04 -.word 0x00000043, 0x00000002, func_802419FC_CB073C, 0xFE363C80, 0x0000004E, 0x00000006, D_80243090_CB1DD0, 0x00000010, 0x00000000, D_802462C0_B4AA30, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241970_CB06B0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243214_CB1F54 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D4, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00110042, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000001, func_80241BCC_CB090C, 0x00000024, 0x00000002, 0xFE363C80, D_80246430_8E0530, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802431C4_CB1F04, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00110043, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000002, func_80241B5C_CB089C, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C88, 0xFFFFFD49, 0x00000014, 0xFFFFFFE3, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002095, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60203, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000014, 0x00000001, 0xFE363C88, 0x00000016, 0x00000001, 0x000000A0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110046, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000021C, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60207, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x000001C9, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7F4D, 0x00000043, 0x00000006, RotateModel, 0x00000067, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000068, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000069, 0xFE363C88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000065, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60205, 0x00000024, 0x00000002, 0xF84060D4, 0x00000001, 0x00000016, 0x00000001, 0x0000009F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110045, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60201, 0x00000016, 0x00000001, 0x0000009E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110045, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60201, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60204, 0x00C60201, 0x00000000, 0x00110044, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60206, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002096, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C88, 0x0000007D, 0x00000014, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7880, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF23F8A80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A1680, 0x00000043, 0x00000005, func_80241A98_CB07D8, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF23FB280, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A1680, 0x00000043, 0x00000005, func_80241A98_CB07D8, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60201, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60201, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C60202, 0x00C60201, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A9280, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00110047, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60209, 0x00C60208, 0x00000000, 0x00110048, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B20_CB2860 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243214_CB1F54, 0x0000000A, 0x00000002, 0xF84060D4, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60205, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000006, RotateModel, 0x00000067, 0x00000032, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000068, 0x00000032, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000069, 0x00000032, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000063, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000064, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000065, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C48_CB2988 -.word 0x00000000, D_80242FE0_CB1D20, 0xC42DC000, 0x00000000, 0xC1F00000, 0x00402D09, D_80243B20_CB2860, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00C60201, 0x00000000, 0x00000000, 0x00000000, 0x001A00DB - -dlabel D_80243E38_CB2B78 -.word 0x00000001, D_8024305C_CB1D9C, 0x434D0000, 0x00000000, 0xC2A00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000CD, 0x00000000, 0xFFFFFFB0, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000CD, 0x00000000, 0xFFFFFFB0, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244028_CB2D68 -.word 0x00000002, D_8024305C_CB1D9C, 0x43898000, 0x00000000, 0xC2E60000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000113, 0x00000000, 0xFFFFFF8D, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000113, 0x00000000, 0xFFFFFF8D, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244218_CB2F58 -.word 0x00000003, D_8024305C_CB1D9C, 0xC3660000, 0x42700000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF1A, 0x0000003C, 0xFFFFFF92, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF1A, 0x0000003C, 0xFFFFFF92, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244408_CB3148 -.word 0x00000004, D_8024305C_CB1D9C, 0xC3A50000, 0x42700000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFEB6, 0x0000003C, 0xFFFFFF92, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEB6, 0x0000003C, 0xFFFFFF92, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802445F8_CB3338 -.word 0x00000005, D_8024305C_CB1D9C, 0xC3D70000, 0x42700000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFE52, 0x0000003C, 0xFFFFFF92, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE52, 0x0000003C, 0xFFFFFF92, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802447E8_CB3528 -.word 0x00000006, D_8024305C_CB1D9C, 0xC4048000, 0x42700000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFDEE, 0x0000003C, 0xFFFFFF92, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFDEE, 0x0000003C, 0xFFFFFF92, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802449D8_CB3718 -.word 0x00000007, D_8024305C_CB1D9C, 0xC41D8000, 0x42700000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFD8A, 0x0000003C, 0xFFFFFF92, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFD8A, 0x0000003C, 0xFFFFFF92, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244BC8_CB3908 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, GetNpcPointer, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000006, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000006, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244CD4_CB3A14 -.word 0x00000008, D_80242FB4_CB1CF4, 0x43700000, 0x00000000, 0xC2B40000, 0x00002C00, D_80244BC8_CB3908, 0x00000000, 0x00000000, 0x0000010E, 0x801400A4, 0x00180000, 0x00A30019, 0x000000A2, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0006, 0x33322666, 0x33320006, 0x33323FFF, 0x33320006, 0x33326665, 0x33320006, 0x33327FFF, 0x26660006, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00080000, 0x000000F0, 0x00000000, 0xFFFFFFA6, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000F0, 0x00000000, 0xFFFFFFA6, 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, 0x00480101, 0x00480102, 0x00480103, 0x00480103, 0x00480101, 0x00480101, 0x00480108, 0x00480108, 0x00480106, 0x00480107, 0x00480101, 0x00480101, 0x00480101, 0x00480101, 0x00480101, 0x00480101, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80243C48_CB2988, 0x00000000, 0x00000001, D_80243E38_CB2B78, 0x18140001, 0x00000001, D_80244028_CB2D68, 0x180F0001, 0x00000001, D_80244218_CB2F58, 0x180F0002, 0x00000001, D_80244408_CB3148, 0x180F0002, 0x00000001, D_802445F8_CB3338, 0x180F0002, 0x00000001, D_802447E8_CB3528, 0x180F0002, 0x00000001, D_802449D8_CB3718, 0x18120002, 0x00000001, D_80244CD4_CB3A14, 0x181C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_08/CB3C80.data.s b/ver/us/asm/data/world/area_flo/flo_08/CB3C80.data.s deleted file mode 100644 index 64a592b2ff..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_08/CB3C80.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244F40_CB3C80 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802452A0_CB3FE0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_08_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_08_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458A4_CB45E4 -.word 0x00000001, 0x0000002E - -dlabel D_802458AC_CB45EC -.word 0x00000001, 0x0000002D - -dlabel D_802458B4_CB45F4 -.word 0x00000002, 0x0000009E, 0x00000154, 0x00000066, 0xFFFFFFA7, 0x0000000C, 0x00000000, 0xF971889D, 0x0000009E, 0x000001B8, 0x00000066, 0xFFFFFFA7, 0x0000000C, 0x00000000, 0xF971889E - -dlabel D_802458F0_CB4630 -.word D_802458A4_CB45E4, D_802458AC_CB45EC, D_802458B4_CB45F4, 0x00000000, 0x00000000 - -dlabel D_80245904_CB4644 -.word 0x43C38000, 0x00000000, 0xC2CC0000, 0x00000000, 0x00000024, 0x00000002, 0xF971889D, 0x00000000, 0x00000024, 0x00000002, 0xF971889E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802458F0_CB4630, 0x00000047, 0x00000005, D_802452A0_CB3FE0, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802452A0_CB3FE0, 0x00100000, D_80245904_CB4644, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_08/CB46D0.data.s b/ver/us/asm/data/world/area_flo/flo_08/CB46D0.data.s deleted file mode 100644 index 573dba78e5..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_08/CB46D0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245990_CB46D0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245C3C_CB497C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80241E40_CB0B80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C85, 0x0000003E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C3C_CB497C, 0x00000043, 0x00000002, GetModelCenter, 0x00000036, 0x00000024, 0x00000002, 0xFE363C83, 0x00000036, 0x00000024, 0x00000002, 0xFE363C84, 0x00000037, 0x00000024, 0x00000002, 0xFE363C85, 0x00000038, 0x00000024, 0x00000002, 0xFE363C86, 0x00000039, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C3C_CB497C, 0x00000043, 0x00000002, GetModelCenter, 0x00000030, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000024, 0x00000002, 0xFE363C84, 0x00000031, 0x00000024, 0x00000002, 0xFE363C85, 0x00000032, 0x00000024, 0x00000002, 0xFE363C86, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245C3C_CB497C, 0x00000043, 0x00000002, GetModelCenter, 0x00000043, 0x00000024, 0x00000002, 0xFE363C83, 0x00000043, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000044, 0x00000024, 0x00000002, 0xFE363C86, 0x00000045, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_80245C3C_CB497C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_09/CB6820.data.s b/ver/us/asm/data/world/area_flo/flo_09/CB6820.data.s deleted file mode 100644 index bdbb98a7ec..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_09/CB6820.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241820_CB6820 -.word 0xC4020000, 0x00000000, 0x00000000, 0x42B40000, 0x44020000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241C9C_CB6C9C, D_80241820_CB6820, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190118 - -dlabel D_80241880_CB6880 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418F0_CB68F0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B9C_CB6B9C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244190, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BF8_CB6BF8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244198, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C54_CB6C54 -.word 0x00000047, 0x00000005, D_80241B9C_CB6B9C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BF8_CB6BF8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C9C_CB6C9C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 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, 0x8024414C, 0x00000044, 0x00000001, 0x802425DC, 0x00000044, 0x00000001, 0x802434A8, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802418F0_CB68F0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802418F0_CB68F0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802418F0_CB68F0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802418F0_CB68F0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_802418F0_CB68F0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_802418F0_CB68F0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241C54_CB6C54, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80241880_CB6880, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CB5000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_09/CB7010.data.s b/ver/us/asm/data/world/area_flo/flo_09/CB7010.data.s deleted file mode 100644 index a697e3a16b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_09/CB7010.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242010_CB7010 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422BC_CB72BC -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_CB5040, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000045, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000024, 0x00000002, 0xFE363C84, 0x00000046, 0x00000024, 0x00000002, 0xFE363C85, 0x00000047, 0x00000024, 0x00000002, 0xFE363C86, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422BC_CB72BC, 0x00000043, 0x00000002, GetModelCenter, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802422BC_CB72BC, 0x00000043, 0x00000002, GetModelCenter, 0x00000053, 0x00000024, 0x00000002, 0xFE363C83, 0x00000053, 0x00000024, 0x00000002, 0xFE363C84, 0x00000054, 0x00000024, 0x00000002, 0xFE363C85, 0x00000055, 0x00000024, 0x00000002, 0xFE363C86, 0x00000056, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422BC_CB72BC, 0x00000043, 0x00000002, GetModelCenter, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000059, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422BC_CB72BC, 0x00000043, 0x00000002, GetModelCenter, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000061, 0x00000024, 0x00000002, 0xFE363C84, 0x00000062, 0x00000024, 0x00000002, 0xFE363C85, 0x00000063, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422BC_CB72BC, 0x00000043, 0x00000002, GetModelCenter, 0x00000067, 0x00000024, 0x00000002, 0xFE363C83, 0x00000067, 0x00000024, 0x00000002, 0xFE363C84, 0x00000068, 0x00000024, 0x00000002, 0xFE363C85, 0x00000069, 0x00000024, 0x00000002, 0xFE363C86, 0x0000006A, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802422BC_CB72BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_09/CB7880.data.s b/ver/us/asm/data/world/area_flo/flo_09/CB7880.data.s deleted file mode 100644 index dafbe6b40e..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_09/CB7880.data.s +++ /dev/null @@ -1,102 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242880_CB7880 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BE0_CB7BE0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_09_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_09_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431E4_CB81E4 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243264_CB8264 -.word 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000141, 0xFFFFFF06, 0x00000064, 0x00000000, 0x0000000D, 0xF84060E6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_802431E4_CB81E4, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024330C_CB830C -.word 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243354_CB8354 -.word 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E84, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000044, 0x00000001, D_802431E4_CB81E4, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243400_CB8400 -.word 0x00000002, 0x0000000F, 0x00000010 - -dlabel D_8024340C_CB840C -.word 0x00000001, 0x0000000E - -dlabel D_80243414_CB8414 -.word D_80243400_CB8400, D_8024340C_CB840C, 0x00000000, 0x00000000, D_80243264_CB8264 - -dlabel D_80243428_CB8428 -.word 0xC3480000, 0x00000000, 0x3F800000, 0x00000000 - -dlabel D_80243438_CB8438 -.word 0x00000002, 0x00000013, 0x00000014 - -dlabel D_80243444_CB8444 -.word 0x00000001, 0x00000012 - -dlabel D_8024344C_CB844C -.word D_80243438_CB8438, D_80243444_CB8444, 0x00000000, 0x00000000, D_8024330C_CB830C - -dlabel D_80243460_CB8460 -.word 0x00000000, 0x00000000, 0x3F800000, 0x00000000 - -dlabel D_80243470_CB8470 -.word 0x00000002, 0x00000017, 0x00000018 - -dlabel D_8024347C_CB847C -.word 0x00000001, 0x00000016 - -dlabel D_80243484_CB8484 -.word D_80243470_CB8470, D_8024347C_CB847C, 0x00000000, 0x00000000, D_80243354_CB8354 - -dlabel D_80243498_CB8498 -.word 0x43480000, 0x00000000, 0x3F800000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243414_CB8414, 0x00000047, 0x00000005, D_80242BE0_CB7BE0, 0x00001000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242BE0_CB7BE0, 0x00100000, D_80243428_CB8428, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024344C_CB844C, 0x00000047, 0x00000005, D_80242BE0_CB7BE0, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242BE0_CB7BE0, 0x00100000, D_80243460_CB8460, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243484_CB8484, 0x00000047, 0x00000005, D_80242BE0_CB7BE0, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242BE0_CB7BE0, 0x00100000, D_80243498_CB8498, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435B0_CB85B0 -.word 0x3F800000, 0x000001F4, 0x0000000A, 0x42480000, 0x41F00000, 0x00000003, 0x40600000, 0x00000028, 0x00000003, 0x42C80000, 0x41F00000, 0x00000001 - -dlabel D_802435E0_CB85E0 -.word 0x00000043, 0x00000002, DoBasicAI, D_802435B0_CB85B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243600_CB8600 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_802435E0_CB85E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_8024362C_CB862C -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_80243644_CB8644 -.word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 - -dlabel D_80243674_CB8674 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_8024162C_CB662C, D_80243644_CB8644, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436E4_CB86E4 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80243674_CB8674, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_80243710_CB8710 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024373C_CB873C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000032, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80243674_CB8674, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438C8_CB88C8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024373C_CB873C, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243954_CB8954 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024373C_CB873C, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802438C8_CB88C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024398C_CB898C -.word 0x00000000, D_80243600_CB8600, 0xC3AF0000, 0x00000000, 0x42200000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFEA2, 0x00000000, 0x00000028, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEA2, 0x00000000, 0x00000028, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243B7C_CB8B7C -.word 0x00000001, D_80243600_CB8600, 0x43820000, 0x00000000, 0x42960000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000104, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000104, 0x00000000, 0x0000004B, 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, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243D6C_CB8D6C -.word 0x00000002, D_802436E4_CB86E4, 0xC2480000, 0x425C0000, 0x42B40000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFFCE, 0x00000037, 0x0000005A, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x0000005A, 0x000000FA, 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, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243F5C_CB8F5C -.word 0x00000003, D_80243710_CB8710, 0x00000000, 0xC47A0000, 0x00000000, 0x00002D04, D_80243954_CB8954, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFFCE, 0x00000037, 0x0000005A, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x0000005A, 0x000000FA, 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, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024398C_CB898C, 0x18100005, 0x00000001, D_80243B7C_CB8B7C, 0x18150005, 0x00000001, D_80243D6C_CB8D6C, 0x18170002, 0x00000001, D_80243F5C_CB8F5C, 0x18170002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_10/CBA670.data.s b/ver/us/asm/data/world/area_flo/flo_10/CBA670.data.s deleted file mode 100644 index 08b728fcb4..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_10/CBA670.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241470_CBA670 -.word 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC2C80000, 0xC1200000, 0xC32C0000, 0x43070000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802419B4, D_80241470_CBA670, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, func_80240000_CB9200, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000002, PlaySound, 0x80000022, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000089, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_10/CBA830.data.s b/ver/us/asm/data/world/area_flo/flo_10/CBA830.data.s deleted file mode 100644 index 22450bbcf0..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_10/CBA830.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241630_CBA830 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000007, MakeItemEntity, 0x00000057, 0x00000000, 0xFFFFFFC4, 0x00000006, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_10/CBA880.data.s b/ver/us/asm/data/world/area_flo/flo_10/CBA880.data.s deleted file mode 100644 index 56477f854a..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_10/CBA880.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241680_CBA880 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024192C_CBAB2C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244AB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241988_CBAB88 -.word 0x00000047, 0x00000005, D_8024192C_CBAB2C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244054, 0x00000046, 0x00000001, D_80241630_CBA830, 0x00000044, 0x00000001, 0x80244A50, 0x00000044, 0x00000001, 0x802435F8, 0x00000044, 0x00000001, 0x80242AE8, 0x00000044, 0x00000001, 0x80244074, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241680_CBA880, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241680_CBA880, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80241680_CBA880, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x8024324C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802427EC, 0x00000044, 0x00000001, D_80241988_CBAB88, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241988_CBAB88, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x802414E0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240040_CB9240, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_10/CBAEB0.data.s b/ver/us/asm/data/world/area_flo/flo_10/CBAEB0.data.s deleted file mode 100644 index e77ccb3571..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_10/CBAEB0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241CB0_CBAEB0 -.word 0x00000000 - -dlabel D_80241CB4_CBAEB4 -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D14_CBAF14 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DB0_CBAFB0 -.word 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x000000AA, 0x00000181, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E40_CBB040 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000005A, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24FAE80, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24C0A80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7D50, 0x00000043, 0x00000005, ScaleGroup, 0x00000038, 0xFE363C82, 0xFE363C83, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F20_CBB120 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000035, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241D14_CBAF14, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242030_CBB230 -.word 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, EnableModel, 0x00000035, 0x00000001, 0x00000044, 0x00000001, D_80241F20_CBB120, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024206C_CBB26C -.word 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x00000037, 0x0000006C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFF6, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000043, 0x00000005, TranslateGroup, 0x0000003C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242188_CBB388 -.word 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x0000005A, 0x0000003C, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A7F4D, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A7F4D, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x0000010E, 0x00000118, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024230C_CBB50C -.word 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A2280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423E4_CBB5E4 -.word 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_80241DB0_CBAFB0, 0x00000044, 0x00000001, D_80241E40_CBB040, 0x00000044, 0x00000001, D_80242030_CBB230, 0x00000044, 0x00000001, D_8024206C_CBB26C, 0x00000044, 0x00000001, D_80242188_CBB388, 0x00000044, 0x00000001, D_8024230C_CBB50C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024244C_CBB64C -.word 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x0000004B, 0x00000096, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424DC_CBB6DC -.word 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x0000000F, 0x00000096, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24FAE80, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24C0A80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7D50, 0x00000043, 0x00000005, ScaleGroup, 0x00000038, 0xFE363C82, 0xFE363C83, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425BC_CBB7BC -.word 0x00000044, 0x00000001, D_8024244C_CBB64C, 0x00000044, 0x00000001, D_802424DC_CBB6DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000258, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, EnableGroup, 0x00000038, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000038, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x00000038, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000003C, 0x00000001, 0x00000046, 0x00000001, D_802423E4_CBB5E4, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x80000024, 0x00000008, 0x00000001, 0x00000168, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7B4D, 0x00000043, 0x00000005, PlayerJump1, 0xFFFFFF9C, 0xFFFFFFF6, 0xFFFFFF54, 0x0000004B, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000046, 0x00000001, D_802425BC_CBB7BC, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, GotoMap, 0x80244AB8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF9C, 0xFFFFFFF6, 0xFFFFFF54, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000096, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF7F, 0x00000009, 0xFFFFFF4F, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000003, EnableGroup, 0x00000034, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFC7, 0xFFFFFFEC, 0xFFFFFF97, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0x000001C2, 0xF24ADE80, 0xF24A6280, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010030, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, 0x802415C4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C90002, 0x00C90001, 0x00000005, 0x00110082, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C90003, 0x00C90007, 0x00000000, 0x00110083, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C90006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C90001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241CB4_CBAEB4, 0x00000043, 0x00000002, AddKeyItem, 0x0000005A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C90003, 0x00C90007, 0x00000000, 0x00110084, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00C90002, 0x00C90001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C90001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000046, 0x00000001, 0x802415E8, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000003, EnableGroup, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000003D, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000003C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000036, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000030, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000037, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241D14_CBAF14, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000050, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241D14_CBAF14, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC18, 0x00000024, 0x00000002, 0xFE363C82, 0x000007D0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241D14_CBAF14, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241D14_CBAF14, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFA24, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241D14_CBAF14, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC18, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241D14_CBAF14, 0x00000057, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000044, 0x00000001, D_80241F20_CBB120, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_10/CBC420.data.s b/ver/us/asm/data/world/area_flo/flo_10/CBC420.data.s deleted file mode 100644 index 3281d8d1bf..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_10/CBC420.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243220_CBC420 -.word 0x00000000, 0x002D0041, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000003C, 0x00000000, 0x00000037, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C90002, 0x00C90001, 0x00000000, 0x001100C6, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x80244AC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243394_CBC594 -.word 0x00000057, 0x00000000 - -dlabel D_8024339C_CBC59C -.word 0x0000000A, 0x00000002, 0xF84060E0, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000000, 0x00000000, 0x00000013, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00C90004, 0x00C90008, 0x00000000, 0x00110081, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFEF, 0xFFFFFFEF, 0x00000014, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000064, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A7E80, 0x00000000, 0x000001C2, 0xF24ADE80, 0xF24A6280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060006, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0x00000057, 0x00000000, 0xFFFFFFC4, 0x00000006, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000046, 0x00000001, 0x802425E4, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000000, 0x00000000, 0x00000013, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004E, 0x00000006, D_8024339C_CBC59C, 0x00000080, 0x0000000F, D_80243394_CBC594, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243628_CBC828 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C86, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000001, 0xFE363C83, 0x00000021, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000056, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C85, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437C8_CBC9C8 -.word 0x00000046, 0x00000001, 0x802415C4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000044, 0x00000001, D_80243628_CBC828, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000145, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000005, 0x00110078, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C90009, 0x00C90005, 0x00000005, 0x00000018, 0x00000001, 0x00000030, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000000, 0x00000044, 0x00000001, D_80243628_CBC828, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000145, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD680, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000005, 0x00110079, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C90001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90001, 0x00C90001, 0x00000000, 0x0011007A, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C90005, 0x00C90001, 0x00000000, 0x00000043, 0x00000002, GetPlayerTargetYaw, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000005, 0x0011007B, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x0011007C, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00C90003, 0x00C90007, 0x00000000, 0x0011007D, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000000, 0x0011007E, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF84060DF, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00400000, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000005, 0x0011007F, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000031, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x00110080, 0x00000024, 0x00000002, 0xF84060E0, 0x00000001, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000000, 0x00110085, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000000, 0x00000018, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90003, 0x00C90007, 0x00000000, 0x00110086, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x00110087, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000046, 0x00000001, 0x802415E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D78_CBCF78 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802437C8_CBC9C8, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000030, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C90008, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00400000, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000030, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x0000001B, 0x00000001, 0x00000031, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFBD, 0xFFFFFFEC, 0xFFFFFF97, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E64_CBD064 -.word 0x00000000, D_80243220_CBC420, 0x42A00000, 0xC2700000, 0x00000000, 0x00000D01, D_80243D78_CBCF78, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00000000, 0x00000000, 0x00000000, 0x001A00DF, 0x00000001, D_80243E64_CBD064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_10/CBD270.data.s b/ver/us/asm/data/world/area_flo/flo_10/CBD270.data.s deleted file mode 100644 index 6854f85163..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_10/CBD270.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244070_CBD270 -.word 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_10/CBD290.data.s b/ver/us/asm/data/world/area_flo/flo_10/CBD290.data.s deleted file mode 100644 index 3a36d01fc5..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_10/CBD290.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244090_CBD290 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802443F0_CBD5F0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802449F4_CBDBF4 -.word 0x00000003, 0x00000021, 0x00000022, 0x00000023 - -dlabel D_80244A04_CBDC04 -.word 0x00000001, 0x00000020 - -dlabel D_80244A0C_CBDC0C -.word 0x00000001, 0x000000A2, 0x00000050, 0x00000064, 0xFFFFFF10, 0x0000000F, 0xF84060E7, 0x00000000 - -dlabel D_80244A2C_CBDC2C -.word D_802449F4_CBDBF4, D_80244A04_CBDC04, D_80244A0C_CBDC0C, 0x00000000, 0x00000000 - -dlabel D_80244A40_CBDC40 -.word 0x43090000, 0x00000000, 0xC38D8000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244A2C_CBDC2C, 0x00000047, 0x00000005, D_802443F0_CBD5F0, 0x00001000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802443F0_CBD5F0, 0x00100000, D_80244A40_CBDC40, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_11/CBDFF0.data.s b/ver/us/asm/data/world/area_flo/flo_11/CBDFF0.data.s deleted file mode 100644 index 6f984f79ff..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_11/CBDFF0.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240320_CBDFF0 -.word 0x43EB0000, 0x00000000, 0xC1700000, 0x43870000, 0xC3EB0000, 0x00000000, 0xC1700000, 0x42B40000, 0x43B40000, 0x42480000, 0xC36D0000, 0x43870000, 0x42EC0000, 0x42480000, 0xC3D20000, 0x43870000, 0x00000000, 0x42480000, 0x00000000, 0x43870000, 0xC2F00000, 0x42480000, 0x43B28000, 0x42B40000, 0xC3B40000, 0x42480000, 0xC3700000, 0x42B40000, 0xC3B40000, 0x420C0000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802418A8_CBF578, D_80240320_CBDFF0, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011B - -dlabel D_802403E0_CBE0B0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406FC_CBE3CC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, flo_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, flo_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, flo_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, flo_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E40_CBEB10 -.word 0x00000043, 0x00000001, func_80240034_CBDD04, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F1C_CBEBEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F1C_CBEBEC -.word 0x00000043, 0x00000001, flo_11_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, flo_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, flo_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, flo_11_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, flo_11_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, flo_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, flo_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024142C_CBF0FC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243140, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241488_CBF158 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243148, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414E4_CBF1B4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GotoMap, 0x80243150, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241520_CBF1F0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GotoMap, 0x80243150, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024155C_CBF22C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GotoMap, 0x80243150, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241598_CBF268 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GotoMap, 0x80243150, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415D4_CBF2A4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GotoMap, 0x80243150, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241610_CBF2E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GotoMap, 0x80243150, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024164C_CBF31C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000046, 0x00000001, D_80240E40_CBEB10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241698_CBF368 -.word 0x00000047, 0x00000005, D_80241488_CBF158, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024142C_CBF0FC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C82, D_802414E4_CBF1B4, 0x00000047, 0x00000005, D_8024164C_CBF31C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000024, 0x00000002, 0xFE363C82, D_80241520_CBF1F0, 0x00000047, 0x00000005, D_8024164C_CBF31C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000024, 0x00000002, 0xFE363C82, D_8024155C_CBF22C, 0x00000047, 0x00000005, D_8024164C_CBF31C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x00000024, 0x00000002, 0xFE363C82, D_80241598_CBF268, 0x00000047, 0x00000005, D_8024164C_CBF31C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C82, D_802415D4_CBF2A4, 0x00000047, 0x00000005, D_8024164C_CBF31C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, D_80241610_CBF2E0, 0x00000047, 0x00000005, D_8024164C_CBF31C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418A8_CBF578 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80044238, 0x00000005, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802430D4, 0x00000046, 0x00000001, 0x802430F0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80241698_CBF368, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80242240, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80241698_CBF368, 0x00000044, 0x00000001, D_802406FC_CBE3CC, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802403E0_CBE0B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_802402E0_CBDFB0, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000009, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000009, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000009, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_11/CBF790.data.s b/ver/us/asm/data/world/area_flo/flo_11/CBF790.data.s deleted file mode 100644 index 13cd2279fc..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_11/CBF790.data.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241AC0_CBF790 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00140000 - -dlabel D_80241AEC_CBF7BC -.word 0x43E60000, 0x43480000, 0xC3700000, 0x43B40000, 0x43160000, 0xC30C0000, 0x43820000, 0x42C80000, 0xC3700000, 0x43B40000, 0x42C80000, 0xC3DC0000, 0x43E60000, 0x42C80000, 0xC3700000, 0x43B40000, 0x42C80000, 0xC30C0000, 0x43820000, 0x42C80000, 0xC3700000, 0x43B40000, 0x42C80000, 0xC3DC0000 - -dlabel D_80241B4C_CBF81C -.word 0xC2C80000, 0x43480000, 0xC2480000, 0x00000000, 0x43160000, 0xC3160000, 0x42C80000, 0x42C80000, 0xC2480000, 0x00000000, 0x42C80000, 0x42480000, 0xC2C80000, 0x42C80000, 0xC2480000, 0x00000000, 0x42C80000, 0xC3160000, 0x42C80000, 0x42C80000, 0xC2480000, 0x00000000, 0x42C80000, 0x42480000 - -dlabel D_80241BAC_CBF87C -.word 0x43B40000, 0x42C80000, 0xC3DC0000, 0x43AF0000, 0x42F00000, 0xC35C0000, 0x43960000, 0x42F00000, 0xC3240000, 0x43200000, 0x42DC0000, 0xC3340000 - -dlabel D_80241BDC_CBF8AC -.word 0x00000000, 0x42C80000, 0x42480000, 0x43480000, 0x42DC0000, 0x41E80000, 0x43670000, 0x42DC0000, 0xC1900000, 0x42E60000, 0x42C80000, 0xC3160000 - -dlabel D_80241C0C_CBF8DC -.word 0x438E8000, 0x42F00000, 0xC2D80000, 0x43B90000, 0x42C80000, 0xC3020000, 0x43E30000, 0x42700000, 0xC1A00000 - -dlabel D_80241C30_CBF900 -.word 0x43838000, 0x42DC0000, 0xC2840000, 0x43B40000, 0x42B40000, 0x42480000, 0x43E30000, 0x42480000, 0x41A00000 - -dlabel D_80241C54_CBF924 -.word 0x43C80000, 0x41F00000, 0xC2200000, 0x43960000, 0x42A00000, 0xC2200000, 0x43160000, 0x43480000, 0xC2200000, 0x42C80000, 0x43AF0000, 0xC2200000 - -dlabel D_80241C84_CBF954 -.word 0x43C80000, 0x41F00000, 0x42200000, 0x43960000, 0x42A00000, 0x42200000, 0x43160000, 0x43480000, 0x42200000, 0x42C80000, 0x43AF0000, 0x42200000 - -dlabel D_80241CB4_CBF984 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000295, 0x00000008, 0x00000001, 0xFE363C80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CF4_CBF9C4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000045, 0x00000002, D_80241CB4_CBF984, 0xFD050F8B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x000000A0, D_80241AEC_CBF7BC, 0x00000008, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x000000A0, D_80241B4C_CBF81C, 0x00000008, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E4C_CBFB1C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80241BAC_CBF87C, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000002D, D_80241BDC_CBF8AC, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFD050F8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F80_CBFC50 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000045, 0x00000002, D_80241CB4_CBF984, 0xFD050F8B, 0x00000056, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000023, D_80241C0C_CBF8DC, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000023, D_80241C30_CBF900, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420C8_CBFD98 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000028, D_80241C54_CBF924, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000028, D_80241C84_CBF954, 0x00000004, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000049, 0x00000001, 0xFD050F8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002D, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001CC, 0x000000C8, 0xFFFFFF10, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF9C, 0x000000C8, 0xFFFFFFCE, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000001B8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000044, 0x00000001, D_80241CF4_CBF9C4, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA9, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB280, 0xF24A4E80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000096, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_80241E4C_CBFB1C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00490016, 0x00490001, 0x00000000, 0x00110088, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00490016, 0x00490001, 0x00000000, 0x00110089, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00490016, 0x00490001, 0x00000000, 0x0011008A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00490016, 0x00490001, 0x00000000, 0x0011008B, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB280, 0xF24A4E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_80241F80_CBFC50, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242810_CC04E0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0x000003E8, 0xF24AB280, 0xF24A4E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428B8_CC0588 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000190, 0x00000014, 0xFFFFFFD8, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000190, 0x00000014, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFC4, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000384, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADA80, 0xF24A6A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF248FE80, 0xF24A7A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24A7A80, 0xF249B280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_802420C8_CBFD98, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000024, 0x00000002, 0xF84060E1, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AC4_CC0794 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B58_CC0828 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E1, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002D, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242810_CC04E0, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802428B8_CC0588, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000015E, 0x00000078, 0xFFFFFF24, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C38_CC0908 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E1, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002D, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000001, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242AC4_CC0794, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000C8, 0x0000006E, 0x0000001D, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CF4_CC09C4 -.word 0x00000000, D_80241AC0_CBF790, 0x440A4000, 0x42700000, 0x42500000, 0x00040D01, D_80242B58_CC0828, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241AC0_CBF790, 0x440A4000, 0x42700000, 0x42500000, 0x00040D01, D_80242C38_CC0908, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80242CF4_CC09C4, 0x18070009, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_11/CC0DC0.data.s b/ver/us/asm/data/world/area_flo/flo_11/CC0DC0.data.s deleted file mode 100644 index 0f15032356..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_11/CC0DC0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802430F0_CC0DC0 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFF24, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_12/CC1520.data.s b/ver/us/asm/data/world/area_flo/flo_12/CC1520.data.s deleted file mode 100644 index b9bade332b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_12/CC1520.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802406F0_CC1520 -.word 0x438C0000, 0x00000000, 0x00000000, 0x43870000, 0x438C0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240BA4, D_802406F0_CC1520, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000089, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_12/CC16A0.data.s b/ver/us/asm/data/world/area_flo/flo_12/CC16A0.data.s deleted file mode 100644 index 943a4fef9b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_12/CC16A0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240870_CC16A0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B1C_CC194C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802429D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B78_CC19A8 -.word 0x00000047, 0x00000005, D_80240B1C_CC194C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718896, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802429B8, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF92, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_CC16A0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C81, 0x00000082, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_CC16A0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF1F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240870_CC16A0, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802419F4, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240B78_CC19A8, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240750, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CC0E30, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_12/CC1C60.data.s b/ver/us/asm/data/world/area_flo/flo_12/CC1C60.data.s deleted file mode 100644 index 7e36c6bcf0..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_12/CC1C60.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E30_CC1C60 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240E5C_CC1C8C -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_12_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_12_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_12_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417EC_CC261C -.word 0x00000000 - -dlabel D_802417F0_CC2620 -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241850_CC2680 -.word 0x00000000 - -dlabel D_80241854_CC2684 -.word 0x00000000 - -dlabel D_80241858_CC2688 -.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, flo_12_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_80240614_CC1444, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024199C_CC27CC -.word 0x00000043, 0x00000002, func_8024064C_CC147C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_CC2688, 0x00000010, 0x00000000, D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_CC13F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419EC_CC281C -.word 0x0000001E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CA0004, 0x00CA0002, 0x00000005, 0x001100C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GotoMap, 0x802429D8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B6C_CC299C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFFB, 0x00000014, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BE4_CC2A14 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFFB, 0x00000014, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C8C_CC2ABC -.word 0x00000046, 0x00000001, 0x8024080C, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002F, 0x00000014, 0x00000001, 0xF84060E2, 0x00000016, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80241B6C_CC299C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8A80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000145, 0xF24AC680, 0xF24A5480, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0003, 0x00CA0001, 0x00000005, 0x0011008C, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00CA0003, 0x00CA0001, 0x00000005, 0x0011008D, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00CA0003, 0x00CA0001, 0x00000005, 0x0011008E, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00CA0005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00CA0002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000057, 0xFFFFFFDF, 0x0000000E, 0x00000013, 0x00000001, 0x00000564, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xF84060DF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0004, 0x00000005, 0x0011008F, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0004, 0x00000005, 0x0011008F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110091, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110092, 0x00000024, 0x00000002, 0xF84060E3, 0x00000001, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF84060E2, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xF84060E3, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000001, 0x00000044, 0x00000001, D_80241BE4_CC2A14, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0004, 0x00000005, 0x00110090, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110091, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110092, 0x00000024, 0x00000002, 0xF84060E3, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0004, 0x00000005, 0x00110090, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110093, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000018, 0x00000001, 0x00000030, 0x00000043, 0x00000003, FindKeyItem, 0x0000001E, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000044, 0x00000001, D_80241BE4_CC2A14, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8A80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000145, 0xF24AC680, 0xF24A5480, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110094, 0x00000024, 0x00000002, 0xFE363C80, D_802419EC_CC281C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_8024199C_CC27CC, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110093, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110095, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001E, 0xFFFFFFDF, 0x0000000E, 0x00000013, 0x00000001, 0x00000564, 0x00000024, 0x00000002, 0xFE363C80, 0x00000057, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802417F0_CC2620, 0x00000043, 0x00000002, AddKeyItem, 0x00000057, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110096, 0x00000024, 0x00000002, 0xF9718896, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000030, 0x00000023, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x00000014, 0x00000001, 0xF9718896, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110097, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110096, 0x00000023, 0x00000000, 0x00000018, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110098, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00CA0004, 0x00CA0002, 0x00000005, 0x00110099, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000046, 0x00000001, 0x80240830, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423D0_CC3200 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241C8C_CC2ABC, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000023, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000010, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002F, 0x0000000A, 0x00000002, 0xF84060E2, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00CA0002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000057, 0xFFFFFFDF, 0x0000000E, 0x00000013, 0x00000001, 0x00000564, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000030, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00CA0002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000057, 0xFFFFFFDF, 0x0000000E, 0x00000013, 0x00000001, 0x00000564, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00CA0002, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001E, 0xFFFFFFDF, 0x0000000E, 0x00000013, 0x00000001, 0x00000564, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425D8_CC3408 -.word 0x00000000, D_80240E30_CC1C60, 0xC28C0000, 0x00000000, 0x41A00000, 0x00400D01, D_802423D0_CC3200, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E0, 0x00000001, D_80240E5C_CC1C8C, 0xC28C0000, 0x00000000, 0x41A00000, 0x00000201, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00CA0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802425D8_CC3408, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s b/ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s deleted file mode 100644 index 2c1b1051ef..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_15/CD06C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802453B0_CD06C0 -.word 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, D_802453B0_CD06C0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011F, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_15/CD07E0.data.s b/ver/us/asm/data/world/area_flo/flo_15/CD07E0.data.s deleted file mode 100644 index 65cc038517..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_15/CD07E0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240120_CD07E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024017C_CD083C -.word 0x00000047, 0x00000005, D_80240120_CD07E0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_8024017C_CD083C, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_15/CD09C0.data.s b/ver/us/asm/data/world/area_flo/flo_15/CD09C0.data.s deleted file mode 100644 index 9cce6a3c89..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_15/CD09C0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240300_CD09C0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024032C_CD09EC -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, GotoMap, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024079C_CD0E5C -.word 0x00000043, 0x00000003, func_802CDE68, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024094C_CD100C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, D_8024032C_CD09EC, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B28_CD11E8 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CD0_CD1390 -.word 0x00000043, 0x00000004, SetNpcCollisionSize, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240B28_CD11E8, 0x00000044, 0x00000001, D_8024032C_CD09EC, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240B28_CD11E8, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, D_8024094C_CD100C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DB4_CD1474 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_8024079C_CD0E5C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EE0_CD15A0 -.word 0x0000000A, D_80240300_CD09C0, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, D_80240CD0_CD1390, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, D_80240300_CD09C0, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, D_80240DB4_CD1474, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, D_80240EE0_CD15A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_15/CD19A0.data.s b/ver/us/asm/data/world/area_flo/flo_15/CD19A0.data.s deleted file mode 100644 index 8ed0149c1e..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_15/CD19A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412E0_CD19A0 -.word 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802412E0_CD19A0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_15/CD1A20.data.s b/ver/us/asm/data/world/area_flo/flo_15/CD1A20.data.s deleted file mode 100644 index 283f02bbb9..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_15/CD1A20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241360_CD1A20 -.word 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_80241360_CD1A20, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000258, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000010, 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, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, TranslateGroup, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_16/CD47A0.data.s b/ver/us/asm/data/world/area_flo/flo_16/CD47A0.data.s deleted file mode 100644 index cbf93a364e..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_16/CD47A0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242970_CD47A0 -.word 0xC4340000, 0x00000000, 0x00000000, 0x42B40000, 0x44318000, 0x42C80000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242B70_CD49A0, D_80242970_CD47A0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190120 - -dlabel D_802429D0_CD4800 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A40_CD4870 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802453E0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A9C_CD48CC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802453E8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AF8_CD4928 -.word 0x00000047, 0x00000005, D_80242A40_CD4870, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242A9C_CD48CC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B40_CD4970 -.word 0x0000000A, 0xC39B0000, 0x00000000, 0x00000000, 0x0000000B, 0x43988000, 0x42C80000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242B70_CD49A0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 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, 0x802444D4, 0x00000046, 0x00000001, 0x80243F44, 0x00000044, 0x00000001, D_8024346C_CD529C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80242B40_CD4970, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000011, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000012, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000014, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000018, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000013, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x802451C4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242AF8_CD4928, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_802429D0_CD4800, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CD1E30, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EA0_CD4CD0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024314C_CD4F7C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_CD1E70, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024346C_CD529C -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000014, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD1C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000044, 0x00000001, D_80242EA0_CD4CD0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x000002D5, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000044, 0x00000001, D_80242EA0_CD4CD0, 0x00000043, 0x00000002, GetModelCenter, 0x00000041, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000043, 0x00000024, 0x00000002, 0xFE363C86, 0x00000044, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_8024314C_CD4F7C, 0x00000043, 0x00000002, GetModelCenter, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000047, 0x00000024, 0x00000002, 0xFE363C84, 0x00000048, 0x00000024, 0x00000002, 0xFE363C85, 0x00000049, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004A, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_8024314C_CD4F7C, 0x00000043, 0x00000002, GetModelCenter, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000050, 0x00000024, 0x00000002, 0xFE363C85, 0x00000051, 0x00000024, 0x00000002, 0xFE363C86, 0x00000052, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_8024314C_CD4F7C, 0x00000043, 0x00000002, GetModelCenter, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000055, 0x00000024, 0x00000002, 0xFE363C84, 0x00000056, 0x00000024, 0x00000002, 0xFE363C85, 0x00000057, 0x00000024, 0x00000002, 0xFE363C86, 0x00000058, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_8024314C_CD4F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s b/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s deleted file mode 100644 index 8183aada1b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243700_CD5530 -.word 0x001D00F0, 0x001D00F1 - -dlabel D_80243708_CD5538 -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel D_80243718_CD5548 -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel D_80243758_CD5588 -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80243764_CD5594 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, flo_16_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, flo_16_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, flo_16_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_CD1F4C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, flo_16_UnkFunc22, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_CD2510, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438C8_CD56F8 -.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_16_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_16_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_16_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_CD2030, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_CD20DC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, flo_16_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243764_CD5594, 0x00000043, 0x00000003, flo_16_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000001, flo_16_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D48_CD5B78 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243DB0_CD5BE0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000045, 0x00000002, D_80243D48_CD5B78, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0x000001C2, 0x000000B4, 0xFFFFFF88, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E80_CD5CB0 -.word 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, func_80240E18_CD2C48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, D_80243E80_CD5CB0, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060FB, 0x00000043, 0x00000002, AssignScript, D_802438C8_CD56F8, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243DB0_CD5BE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_16/CD5E40.data.s b/ver/us/asm/data/world/area_flo/flo_16/CD5E40.data.s deleted file mode 100644 index 9b575b4224..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_16/CD5E40.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244010_CD5E40 -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_80244028_CD5E58 -.word 0x3F800000, 0x0000002D, 0x0000003C, 0x42C80000, 0x00000000, 0x00000003, 0x40666666, 0x0000000A, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_80244058_CD5E88 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80242754_CD4584, D_80244028_CD5E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802440C8_CD5EF8 -.word 0x00000000, 0x0018001C, 0x00000000, 0x00000000, D_80244058_CD5E88, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_802440F4_CD5F24 -.word 0x00000000, D_802440C8_CD5EF8, 0x43DC0000, 0x43110000, 0x41700000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0082, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000001B8, 0x00000091, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001E5, 0x00000091, 0x00000037, 0x000000E1, 0x0000005F, 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, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802442E4_CD6114 -.word 0x00000001, D_802440C8_CD5EF8, 0x44160000, 0x43110000, 0x41700000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0082, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000258, 0x00000091, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001E5, 0x00000091, 0x00000037, 0x000000E1, 0x0000005F, 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, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802440F4_CD5F24, 0x18240006, 0x00000001, D_802442E4_CD6114, 0x18200006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_16/CD6330.data.s b/ver/us/asm/data/world/area_flo/flo_16/CD6330.data.s deleted file mode 100644 index c71100c190..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_16/CD6330.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244500_CD6330 -.word 0x00000043, 0x00000001, func_80242940_CD4770, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A9, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000000B4, 0x00000024, 0x00000002, 0xF97188A9, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000032, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xF97188A9, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000204D, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7DB4, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000061, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000061, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C87, 0xFE363C88, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000061, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000061, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802448FC_CD672C -.word 0x00000043, 0x00000001, func_80242940_CD4770, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF97188AA, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000000B4, 0x00000024, 0x00000002, 0xF97188AA, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000032, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xF97188AA, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000204D, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7DB4, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000076, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000081, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000076, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000029, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C87, 0xFE363C88, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000076, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000081, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000076, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DC8_CD6BF8 -.word 0x00000043, 0x00000001, func_80242940_CD4770, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF97188AB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000000B4, 0x00000024, 0x00000002, 0xF97188AB, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xF97188AB, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000204D, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7DB4, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000088, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007D, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C87, 0xFE363C88, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007A, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007D, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000088, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007D, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF97188A9, 0x00000000, 0x00000024, 0x00000002, 0xF97188AA, 0x00000000, 0x00000024, 0x00000002, 0xF97188AB, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x0000005E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x0000005E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000065, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000065, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000006C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000006C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000073, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x00000073, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000026, 0x0000007A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x0000007A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x00000081, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002A, 0x00000081, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002C, 0x00000088, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002D, 0x00000088, 0x00000047, 0x00000005, D_80244500_CD6330, 0x00000080, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802448FC_CD672C, 0x00000080, 0x0000001D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244500_CD6330, 0x00000080, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802448FC_CD672C, 0x00000080, 0x00000023, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244DC8_CD6BF8, 0x00000080, 0x00000026, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802448FC_CD672C, 0x00000080, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244DC8_CD6BF8, 0x00000080, 0x0000002C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_17/CDA500.data.s b/ver/us/asm/data/world/area_flo/flo_17/CDA500.data.s deleted file mode 100644 index 585035a592..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_17/CDA500.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243220_CDA500 -.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802437DC_CDAABC, D_80243220_CDA500, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190121 - -dlabel D_80243280_CDA560 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802432F0_CDA5D0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024359C_CDA87C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802452F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435F8_CDA8D8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802452F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243654_CDA934 -.word 0x00000047, 0x00000005, D_8024359C_CDA87C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802435F8_CDA8D8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024369C_CDA97C -.word 0x0000000F, 0xC4048000, 0x00000000, 0xC2DC0000, 0x00000011, 0xC4070000, 0x00000000, 0xC2480000, 0x00000010, 0xC4048000, 0x00000000, 0x42A00000, 0x00000014, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000013, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000012, 0xC3870000, 0x00000000, 0x420C0000, 0x00000017, 0xC3020000, 0x00000000, 0xC2480000, 0x00000016, 0xC3020000, 0x00000000, 0xC2480000, 0x00000015, 0xC30C0000, 0x00000000, 0x42960000, 0x0000001B, 0x42F00000, 0x00000000, 0xC2480000, 0x0000001A, 0x42F00000, 0x00000000, 0xC2480000, 0x00000018, 0x43020000, 0x00000000, 0x42700000, 0x00000019, 0x42F00000, 0x00000000, 0x42F00000, 0x0000001F, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001E, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001D, 0x43870000, 0x00000000, 0xC2480000, 0x0000001C, 0x438C0000, 0x00000000, 0x42480000, 0x00000021, 0x44034000, 0x00000000, 0xC28C0000, 0x00000020, 0x44034000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802437DC_CDAABC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 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, 0x80245228, 0x00000046, 0x00000001, 0x80245280, 0x00000044, 0x00000001, 0x80244284, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000F, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000014, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000019, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001B, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001C, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000020, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFDF6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF8A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802432F0_CDA5D0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD28, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE10, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802432F0_CDA5D0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF8B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802432F0_CDA5D0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF84, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802432F0_CDA5D0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C0, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000135, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802432F0_CDA5D0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001E8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C82, 0x000002DD, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802432F0_CDA5D0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_8024369C_CDA97C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000020, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000021, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000024, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000025, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000028, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000030, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000034, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000036, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000038, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000039, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000040, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000022, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000023, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000026, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000027, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000032, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000037, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80243654_CDA934, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80243280_CDA560, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CD72E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s b/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s deleted file mode 100644 index 85a5357445..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_17/CDB2B0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243FD0_CDB2B0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, flo_17_D_80240040_CD7320, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C85, 0x00000043, 0x00000006, PlaySoundAt, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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_80243FD0_CDB2B0, 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_80243FD0_CDB2B0, 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_80243FD0_CDB2B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024440C_CDB6EC -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_80244424_CDB704 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42700000, 0x42480000, 0x00000003, 0x40600000, 0x0000003C, 0x0000000A, 0x42A00000, 0x428C0000, 0x00000001 - -dlabel D_80244454_CDB734 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000190, 0x00000043, 0x00000002, func_80241C64_CD8F44, D_80244424_CDB704, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802444C4_CDB7A4 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_80244454_CDB734, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00140000 - -dlabel D_802444F0_CDB7D0 -.word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 - -dlabel D_80244520_CDB800 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, flo_17_UnkNpcAIMainFunc6, D_802444F0_CDB7D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244590_CDB870 -.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000064, 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_8024465C_CDB93C -.word 0x00000000, 0x00150016, 0x00000000, 0x00000000, D_80244520_CDB800, EnemyNpcHit, 0x00000000, D_80244590_CDB870, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_80244688_CDB968 -.word 0x00000000, D_802444C4_CDB7A4, 0xC3390000, 0x42B40000, 0x41200000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFF47, 0x0000005A, 0x0000000A, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF47, 0x0000005A, 0x00000000, 0x00000055, 0x00000078, 0x00000001, 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, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244878_CDBB58 -.word 0x00000001, D_802444C4_CDB7A4, 0x43480000, 0x42B40000, 0xC1C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000000C8, 0x0000005A, 0xFFFFFFE7, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x0000005A, 0x00000000, 0x00000055, 0x00000078, 0x00000001, 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, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244A68_CDBD48 -.word 0x00000032, D_8024465C_CDB93C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244C58_CDBF38 -.word 0x00000033, D_8024465C_CDB93C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244E48_CDC128 -.word 0x00000034, D_8024465C_CDB93C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245038_CDC318 -.word 0x00000035, D_8024465C_CDB93C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80244688_CDB968, 0x18090003, 0x00000001, D_80244878_CDBB58, 0x180A0003, 0x00000001, D_80244A68_CDBD48, 0x180C0003, 0x00000001, D_80244C58_CDBF38, 0x180C0003, 0x00000001, D_80244E48_CDC128, 0x180C0003, 0x00000001, D_80245038_CDC318, 0x180C0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_17/CDC560.data.s b/ver/us/asm/data/world/area_flo/flo_17/CDC560.data.s deleted file mode 100644 index 2614ac5478..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_17/CDC560.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245280_CDC560 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000294, 0x0000003C, 0xFFFFFF8D, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060EE, 0x00000043, 0x00000007, MakeItemEntity, 0x0000003E, 0xFFFFFF0B, 0x00000000, 0x00000069, 0x00000011, 0xF84060ED, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_18/CDCE70.data.s b/ver/us/asm/data/world/area_flo/flo_18/CDCE70.data.s deleted file mode 100644 index d2d6288cbf..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_18/CDCE70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802407D0_CDCE70 -.word 0xC3A00000, 0x00000000, 0x00000000, 0x42B40000, 0x42100000, 0x00000000, 0x42200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240A24, D_802407D0_CDCE70, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190122, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000033, 0x00000000, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000014, 0x80000025, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_18/CDCF60.data.s b/ver/us/asm/data/world/area_flo/flo_18/CDCF60.data.s deleted file mode 100644 index 5d396c7ff5..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_18/CDCF60.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408C0_CDCF60 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_18_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_18_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024095C_CDCFFC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247040, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409B8_CDD058 -.word 0x00000047, 0x00000005, D_8024095C_CDCFFC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409E4_CDD084 -.word 0x0000000B, 0xC3480000, 0x00000000, 0x42F00000, 0x0000000C, 0x00000000, 0x00000000, 0x42F00000, 0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024669C, 0x00000044, 0x00000001, 0x80247024, 0x00000044, 0x00000001, 0x802436BC, 0x00000044, 0x00000001, 0x802456D4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_802409E4_CDD084, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_CDCF60, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802408C0_CDCF60, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802409B8_CDD058, 0x00000044, 0x00000001, EnterWalk, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x80244058, 0x00000044, 0x00000001, D_802409B8_CDD058, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240830, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_CDC9AC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_18/CDD530.data.s b/ver/us/asm/data/world/area_flo/flo_18/CDD530.data.s deleted file mode 100644 index 708a98da29..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_18/CDD530.data.s +++ /dev/null @@ -1,153 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E90_CDD530 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_CDC9E0, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_CDC9E0, 0x00000008, 0x00000001, 0x00000004, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_CDC9E0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_CDC9E0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241094_CDD734 -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000009F, 0x00000005, 0x00000001, 0xFE363C8E, 0x0000002C, 0x00000002, 0xFE363C83, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7E8B, 0x0000002C, 0x00000002, 0xFE363C87, 0xF24A7A8B, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000043, 0x00000008, flo_18_UnkFloatFunc, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x0000000F, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000043, 0x00000008, flo_18_UnkFloatFunc, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x00000014, 0x00000000, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24AA280, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8F, 0xFE363C88, 0xFE363C89, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C8F, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241284_CDD924 -.word 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C8A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A0280, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24D9A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C85, 0x00000000, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7BB0, 0x00000026, 0x00000002, 0xFE363C87, 0xF24A7BB0, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C8E, 0x00000027, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000044, 0x00000001, D_80241094_CDD734, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8E, 0x00000010, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413F0_CDDA90 -.word 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, RandInt, 0x00000050, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x0000000A, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_18_UnkFloatFunc, 0xFE363C8F, 0xFE363C8E, 0xF24A7E80, 0xF24A7EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000008, flo_18_UnkFloatFunc, 0xFE363C8F, 0xFE363C8D, 0xF24A7EE0, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8E, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8D, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, ScaleModel, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7EB0, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000020, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000013, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000015, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000016, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000017, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000018, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000019, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000025, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, ScaleModel, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241ED4_CDE574 -.word 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000001F, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000020, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242174_CDE814 -.word 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A6680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFFD3, 0x00000024, 0x00000002, 0xFE363C85, 0x00000005, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000013, 0x00000032, 0x0000001C, 0x0000001B, 0x00000043, 0x00000005, TranslateModel, 0x00000014, 0x00000032, 0x0000001C, 0x0000001B, 0x00000043, 0x00000005, TranslateModel, 0x00000013, 0x00000000, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000014, 0x00000000, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000013, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000013, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000014, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000013, 0xFFFFFFCE, 0xFFFFFFE4, 0xFFFFFFE5, 0x00000043, 0x00000005, TranslateModel, 0x00000014, 0xFFFFFFCE, 0xFFFFFFE4, 0xFFFFFFE5, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242474_CDEB14 -.word 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000026, 0x00000002, 0xFE363C82, 0x00000050, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7880, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0xFFFFFFC9, 0x00000005, 0x00000010, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000015, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0x00000037, 0xFFFFFFFB, 0xFFFFFFF0, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242620_CDECC0 -.word 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000016, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000026, 0x00000002, 0xFE363C82, 0x00000050, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7880, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000018, 0x0000003C, 0x00000000, 0x00000010, 0x00000043, 0x00000006, RotateModel, 0x00000018, 0xFE363C82, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000018, 0xFFFFFFC4, 0x00000000, 0xFFFFFFF0, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0x00000000, 0x00000000, 0x0000001B, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000000, 0x00000000, 0x0000001B, 0x00000043, 0x00000006, RotateModel, 0x00000016, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000017, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0x00000000, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000000, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, TranslateModel, 0x00000019, 0x00000000, 0x00000000, 0xFFFFFFD7, 0x00000043, 0x00000005, TranslateModel, 0x0000001A, 0x00000000, 0x00000000, 0xFFFFFFD7, 0x00000043, 0x00000006, RotateModel, 0x00000019, 0xFE363C82, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000001A, 0xFE363C82, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000019, 0x00000000, 0x00000000, 0x00000029, 0x00000043, 0x00000005, TranslateModel, 0x0000001A, 0x00000000, 0x00000000, 0x00000029, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242910_CDEFB0 -.word 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A1680, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0x0000007C, 0x00000011, 0x00000003, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C82, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFFFFFF84, 0xFFFFFFEF, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B18_CDF1B8 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A8680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000014, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000E, 0x00000002, 0xFE363C81, 0xFFFFFFD8, 0x00000026, 0x00000002, 0xFE363C81, 0xFFFFFFD8, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000000E, 0x00000002, 0xFE363C84, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C85, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000029, 0xFFFFFFDE, 0x00000032, 0x0000000A, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFFFFFFDE, 0x00000032, 0x0000000A, 0x00000043, 0x00000005, TranslateModel, 0x00000029, 0x00000000, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000021, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000029, 0x00000022, 0xFFFFFFCE, 0xFFFFFFF6, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000022, 0xFFFFFFCE, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DC8_CDF468 -.word 0x00000000, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000003C, 0x0000000A, 0x0000001B, 0x0000001E, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000001E, 0x00000000, 0x0000001B, 0x00000055, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B - -dlabel D_80242E28_CDF4C8 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF2E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001E5, 0x00000046, 0x00000001, D_802413F0_CDDA90, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000024, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000044, 0x00000001, D_80241ED4_CDE574, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000044, 0x00000001, D_80242174_CDE814, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027C, 0x00000002, 0x00000044, 0x00000001, D_80242474_CDEB14, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000044, 0x00000001, D_80242620_CDECC0, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000046, 0x00000001, D_802413F0_CDDA90, 0x00000046, 0x00000001, D_802413F0_CDDA90, 0x00000046, 0x00000001, D_802413F0_CDDA90, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetModelCenter, 0x0000001B, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C82, 0x00000064, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000078, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0x0000000A, 0xFE363C82, 0x00000064, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000006, 0x00000030, 0x00000001, D_80242DC8_CDF468, 0x00000005, 0x00000001, 0x00000008, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x00000006, PlaySoundAt, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A8280, 0x00000005, 0x00000001, 0x00000002, 0x00000030, 0x00000001, D_80242DC8_CDF468, 0x00000005, 0x00000001, 0x00000008, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001A0, 0x00000000, 0x00000046, 0x00000028, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000046, 0x00000028, 0x0000000A, 0xF24A8680, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000043, 0x00000006, PlaySoundAt, 0x000001A0, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0xF24A8A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A8280, 0x00000046, 0x00000001, D_80242910_CDEFB0, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000014, 0x00000491, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_80242B18_CDF1B8, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000003, GotoMap, 0x80247048, 0x00000001, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024367C_CDFD1C -.word 0x40A00000, 0x00000000, 0xC1200000, 0x00000000 - -dlabel D_8024368C_CDFD2C -.word 0xC0A00000, 0x00000000, 0xC1A00000, 0x00000000 - -dlabel D_8024369C_CDFD3C -.word 0x42480000, 0x00000000, 0xC1200000, 0x00000000 - -dlabel D_802436AC_CDFD4C -.word 0x42D20000, 0x00000000, 0xC1200000, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000003, EnableModel, 0x00000031, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000017, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000018, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000021, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240E90_CDD530, 0x00000043, 0x00000003, EnableModel, 0x00000031, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027C, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000017, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000018, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001A, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000043, 0x00000003, EnableModel, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000021, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00100000, D_8024367C_CDFD1C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00100000, D_8024368C_CDFD2C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00100000, D_8024369C_CDFD3C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00100000, D_802436AC_CDFD4C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000047, 0x00000005, D_80242E28_CDF4C8, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0x00002710, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, CloneModel, 0x00000031, 0xFE363C81, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80241284_CDD924, 0x00000043, 0x00000003, EnableTexPanning, 0x00000024, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000025, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000026, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000027, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000028, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C8E, 0xF24A7E80, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x0000002E, 0x00000002, 0xFE363C8E, 0xF24A7E50, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8F, 0xFE363C8E, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000438, 0x00000026, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000009, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000029, 0x00000002, 0xFE363C80, 0x00004000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000004, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000002, 0x00000029, 0x00000002, 0xFE363C81, 0x00004000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000005, 0x0000002B, 0x00000002, 0xFE363C82, 0x00000002, 0x00000029, 0x00000002, 0xFE363C82, 0x00004000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000006, 0x0000002B, 0x00000002, 0xFE363C83, 0x00000002, 0x00000029, 0x00000002, 0xFE363C83, 0x00004000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x0000002B, 0x00000002, 0xFE363C84, 0x00000002, 0x00000029, 0x00000002, 0xFE363C84, 0x00008000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C85, 0x00000008, 0x0000002B, 0x00000002, 0xFE363C85, 0x00000002, 0x00000029, 0x00000002, 0xFE363C85, 0x00004000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000D, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000E, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000F, 0x00000000, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000B, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000A, 0x00000000, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000009, 0x00000000, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243F10_CE05B0 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00140000 - -dlabel D_80243F3C_CE05DC -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80243F68_CE0608 -.word 0xC25C0000, 0x41700000, 0x420C0000, 0xC31B0000, 0x420C0000, 0x420C0000, 0xC37F0000, 0x42960000, 0x420C0000, 0xC3B18000, 0x431B0000, 0x420C0000, 0xC3E38000, 0x439D8000, 0x420C0000 - -dlabel D_80243FA4_CE0644 -.word 0xC1A00000, 0x41700000, 0x41F00000, 0xC2F00000, 0x420C0000, 0x41F00000, 0xC35C0000, 0x42960000, 0x41F00000, 0xC3A00000, 0x431B0000, 0x41F00000, 0xC3D20000, 0x439D8000, 0x41F00000 - -dlabel D_80243FE0_CE0680 -.word 0x42820000, 0x41700000, 0x41F00000, 0xC20C0000, 0x420C0000, 0x41F00000, 0xC3070000, 0x42960000, 0x41F00000, 0xC36B0000, 0x431B0000, 0x41F00000, 0xC3A78000, 0x439D8000, 0x41F00000 - -dlabel D_8024401C_CE06BC -.word 0x42F00000, 0x41700000, 0x41F00000, 0x41A00000, 0x420C0000, 0x41F00000, 0xC2A00000, 0x42960000, 0x41F00000, 0xC3340000, 0x431B0000, 0x41F00000, 0xC38C0000, 0x439D8000, 0x41F00000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x0000001E, 0x00000000, 0x00000032, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000041, 0x00000000, 0x00000032, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5880, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000002, BringPartnerOut, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C9, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000001, PutPartnerAway, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244270_CE0910 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x0000019E, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000100, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80243F68_CE0608, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000019F, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80243FA4_CE0644, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000046, D_80243FE0_CE0680, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000019F, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000050, D_8024401C_CE06BC, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802445D4_CE0C74 -.word 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, IsPlayerWithin, 0x00000028, 0x00000000, 0x000000C8, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFFB, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFC3, 0x00000058, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244774_CE0E14 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000041, 0xFE363C81, 0x00000050, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0x000001C2, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00570209, 0x00570201, 0x00000000, 0x001100BB, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_80244270_CE0910, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5880, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000002, BringPartnerOut, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C1, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, PutPartnerAway, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFF06, 0x00000000, 0x00000032, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000002, BringPartnerOut, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C2, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000001, PutPartnerAway, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B3C_CE11DC -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C84_CE1324 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFFC9, 0x0000000F, 0x00000023, 0x00000043, 0x00000003, GetNpcYaw, 0x00000003, 0xFE363C80, 0x00000043, 0x00000003, SetNpcYaw, 0x00000004, 0x0000005A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x0000001E, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFEC, 0x0000000F, 0x0000001E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000041, 0x0000000F, 0x0000001E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000002, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000078, 0x0000000F, 0x0000001E, 0x00000044, 0x00000001, D_80244774_CE0E14, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E2C_CE14CC -.word 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244ED0_CE1570 -.word 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00560202, 0x00560201, 0x00000010, 0x001100B9, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245004_CE16A4 -.word 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00560202, 0x00560201, 0x00000010, 0x001100BA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_802445D4_CE0C74, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245108_CE17A8 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24ABE80, 0xF24A6280, 0x00000046, 0x00000001, D_80244E2C_CE14CC, 0x00000014, 0x00000001, 0xF70F2E87, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80244ED0_CE1570, 0x00000027, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80245004_CE16A4, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245228_CE18C8 -.word 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000046, 0x00000001, D_80245108_CE17A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000046, 0x00000001, D_80245108_CE17A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802452D0_CE1970 -.word 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000046, 0x00000001, D_80245108_CE17A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245324_CE19C4 -.word 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000003, 0x00000046, 0x00000001, D_80245108_CE17A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245378_CE1A18 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80244E2C_CE14CC, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000000, 0x00000046, 0x00000001, D_80244ED0_CE1570, 0x00000027, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80245004_CE16A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454D4_CE1B74 -.word 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, D_80245378_CE1A18, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245544_CE1BE4 -.word 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, D_80245378_CE1A18, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802455B4_CE1C54 -.word 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, D_80245378_CE1A18, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245624_CE1CC4 -.word 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, D_80245378_CE1A18, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245694_CE1D34 -.word 0x40A00000, 0x00000000, 0xC1200000, 0x00000000 - -dlabel D_802456A4_CE1D44 -.word 0xC0A00000, 0x00000000, 0xC1A00000, 0x00000000 - -dlabel D_802456B4_CE1D54 -.word 0x42480000, 0x00000000, 0xC1200000, 0x00000000 - -dlabel D_802456C4_CE1D64 -.word 0x42D20000, 0x00000000, 0xC1200000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000047, 0x00000005, D_80245228_CE18C8, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245228_CE18C8, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802454D4_CE1B74, 0x00100000, D_802456A4_CE1D44, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245544_CE1BE4, 0x00100000, D_80245694_CE1D34, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802452D0_CE1970, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802455B4_CE1C54, 0x00100000, D_802456B4_CE1D54, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245324_CE19C4, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245624_CE1CC4, 0x00100000, D_802456C4_CE1D64, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802457D4_CE1E74 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B6, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B7, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BD, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5680, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B8, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BE, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_802445D4_CE0C74, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000002, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0x00000003, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245AA8_CE2148 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244B3C_CE11DC, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802457D4_CE1E74, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80244C84_CE1324, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245B30_CE21D0 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80244C84_CE1324, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245B90_CE2230 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802457D4_CE1E74, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80244C84_CE1324, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245C04_CE22A4 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802457D4_CE1E74, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80244C84_CE1324, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245C78_CE2318 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802457D4_CE1E74, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80244C84_CE1324, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245CEC_CE238C -.word 0x00000000, D_80243F10_CE05B0, 0x00000000, 0x41700000, 0x42700000, 0x00440D05, D_80245B90_CE2230, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000001, D_80243F10_CE05B0, 0x42820000, 0x41700000, 0x42700000, 0x00440D05, D_80245C04_CE22A4, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000002, D_80243F10_CE05B0, 0x43070000, 0x41700000, 0x420C0000, 0x00440D05, D_80245C78_CE2318, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000003, D_80243F3C_CE05DC, 0xC2700000, 0x00000000, 0x42480000, 0x00440D05, D_80245AA8_CE2148, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560204, 0x00560204, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000004, D_80243F3C_CE05DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00440D05, D_80245B30_CE21D0, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570204, 0x00570204, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000005, D_80245CEC_CE238C, 0x180B0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_18/CE2D60.data.s b/ver/us/asm/data/world/area_flo/flo_18/CE2D60.data.s deleted file mode 100644 index 9d5112de82..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_18/CE2D60.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802466C0_CE2D60 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_18_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_18_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_18_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_19/CE4030.data.s b/ver/us/asm/data/world/area_flo/flo_19/CE4030.data.s deleted file mode 100644 index 70169f892b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_19/CE4030.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240940_CE4030 -.word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x43E60000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240C24, D_80240940_CE4030, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190123, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000032, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000007, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000B, 0x00000002, 0xF97188AC, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x00000BB8, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000032, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_19/CE41B0.data.s b/ver/us/asm/data/world/area_flo/flo_19/CE41B0.data.s deleted file mode 100644 index cac006638d..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_19/CE41B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AC0_CE41B0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000010C, 0xFFFFFF38, 0x000000A0, 0xFFFFFF2B, 0x00000011, 0xF84060EF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_19/CE41F0.data.s b/ver/us/asm/data/world/area_flo/flo_19/CE41F0.data.s deleted file mode 100644 index a1a8a6b88c..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_19/CE41F0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B00_CE41F0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_19_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_19_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B9C_CE428C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243000, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BF8_CE42E8 -.word 0x00000047, 0x00000005, D_80240B9C_CE428C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000027, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406341, 0x00000001, 0x00000046, 0x00000001, D_80240AC0_CE41B0, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000C, 0x00000056, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000044, 0x00000001, 0x80242FD0, 0x00000044, 0x00000001, 0x80241780, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000005, 0x00000007, 0x00000043, 0x00000003, EnableTexPanning, 0x00000011, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000012, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF88, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240B00_CE41F0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240B00_CE41F0, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80240BF8_CE42E8, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240BF8_CE42E8, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x80242A2C, 0x00000044, 0x00000001, D_80240BF8_CE42E8, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x80241CC4, 0x00000044, 0x00000001, D_80240BF8_CE42E8, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x802409C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_CE39FC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_19/CE4740.data.s b/ver/us/asm/data/world/area_flo/flo_19/CE4740.data.s deleted file mode 100644 index 8290b4b8f8..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_19/CE4740.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241050_CE4740 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF2471CC0, 0x00000026, 0x00000002, 0xFE363C81, 0xF24C7CE0, 0x00000026, 0x00000002, 0xFE363C82, 0xF2475A80, 0x0000002C, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000043, 0x00000005, TranslateGroup, 0x0000001C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF2493B10, 0x00000043, 0x00000008, func_80240340_CE3A30, 0xFE363C8F, 0xFE363C81, 0xF24A8E80, 0xF24C9D90, 0x0000012C, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF2475A80, 0x0000002C, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x00000043, 0x00000005, TranslateGroup, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF244C970, 0x00000043, 0x00000008, func_80240340_CE3A30, 0xFE363C8F, 0xFE363C81, 0xF24A8E80, 0xF24C2590, 0x0000012C, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24AA280, 0x0000002C, 0x00000002, 0xFE363C81, 0xFD050F8E, 0x00000043, 0x00000005, TranslateGroup, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24F1970, 0x00000043, 0x00000008, func_80240340_CE3A30, 0xFE363C8F, 0xFE363C81, 0xF24B7E80, 0xF24BD670, 0x000000C8, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF2493A80, 0x0000002C, 0x00000002, 0xFE363C81, 0xFD050F8F, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, func_80240340_CE3A30, 0xFE363C8F, 0xFE363C82, 0xF24A7E60, 0xF24A7EA0, 0x0000000F, 0x00000000, 0x00000000, 0x00000043, 0x00000008, func_80240340_CE3A30, 0xFE363C8F, 0xFE363C83, 0xF24A7EA0, 0xF24A7E60, 0x0000000F, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A6C, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7AA9, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000043, 0x00000005, ScaleGroup, 0x0000001C, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A6C, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7AA9, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000043, 0x00000005, ScaleGroup, 0x00000020, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8E, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8E, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A6C, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7AA9, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000043, 0x00000005, ScaleGroup, 0x00000024, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8F, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A6C, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7AA9, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000043, 0x00000005, ScaleGroup, 0x00000028, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000008, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000009, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000007, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x000004B0, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C8C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C8D, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A50, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7A20, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7A20, 0x0000002E, 0x00000002, 0xFE363C83, 0xF24A7A20, 0x0000002C, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x0000002C, 0x00000002, 0xFD050F8D, 0xFE363C81, 0x0000002C, 0x00000002, 0xFD050F8E, 0xFE363C82, 0x0000002C, 0x00000002, 0xFD050F8F, 0xFE363C83, 0x0000002E, 0x00000002, 0xFD050F8C, 0xF24A7DE0, 0x0000002E, 0x00000002, 0xFD050F8D, 0xF24A7DE0, 0x0000002E, 0x00000002, 0xFD050F8E, 0xF24A7DE0, 0x0000002E, 0x00000002, 0xFD050F8F, 0xF24A7DE0, 0x0000002C, 0x00000002, 0xFE363C8A, 0xFD050F8C, 0x0000002C, 0x00000002, 0xFE363C8B, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C8C, 0xFD050F8E, 0x0000002C, 0x00000002, 0xFE363C8D, 0xFD050F8F, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241650_CE4D40 -.word 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8C, 0xF24A7480, 0x00000008, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFD050F8C, 0xF24A7480, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024169C_CE4D8C -.word 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8D, 0xF24A7480, 0x00000008, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFD050F8D, 0xF24A7480, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416E8_CE4DD8 -.word 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8E, 0xF24A7480, 0x00000008, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFD050F8E, 0xF24A7480, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241734_CE4E24 -.word 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8F, 0xF24A7480, 0x00000008, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFD050F8F, 0xF24A7480, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000008, 0x0000001C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000009, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000007, 0x00000024, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000A, 0x00000028, 0x00000043, 0x00000004, SetModelFlags, 0x0000001C, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetModelFlags, 0x00000020, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetModelFlags, 0x00000024, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetModelFlags, 0x00000028, 0x00000100, 0x00000001, 0x00000044, 0x00000001, D_80241050_CE4740, 0x00000047, 0x00000005, D_80241650_CE4D40, 0x00000080, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024169C_CE4D8C, 0x00000080, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802416E8_CE4DD8, 0x00000080, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241734_CE4E24, 0x00000080, 0x0000000A, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000008, func_80240340_CE3A30, 0xFE363C8F, 0xFE363C80, 0xF24A7E60, 0xF24A7EA0, 0x0000000F, 0x00000000, 0x00000000, 0x00000043, 0x00000008, func_80240340_CE3A30, 0xFE363C8F, 0xFE363C81, 0xF24A7EA0, 0xF24A7E60, 0x0000000F, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000046, 0xFE363C81, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x0000003C, 0xFE363C81, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000044, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000042, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x0000003A, 0xFE363C81, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x0000003E, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000048, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_19/CE5160.data.s b/ver/us/asm/data/world/area_flo/flo_19/CE5160.data.s deleted file mode 100644 index 00266c77f3..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_19/CE5160.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A70_CE5160 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240784_CE3E74, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000043, 0x00000001, func_80240784_CE3E74, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B10_CE5200 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240784_CE3E74, 0x00000028, 0x00000002, 0xFE363C80, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_80240784_CE3E74, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BB0_CE52A0 -.word 0x00000043, 0x00000005, TranslateGroup, 0x0000004F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A4A80, 0x00000043, 0x00000006, RotateGroup, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000005C, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C58_CE5348 -.word 0x00000043, 0x00000005, TranslateGroup, 0x00000054, 0x00000000, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A4A80, 0x00000043, 0x00000006, RotateGroup, 0x00000054, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24AA680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000000D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000018, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000030, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000039, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000004A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xF24B2E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AEA80, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24A8E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF24B6A80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24AEA80, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24AA280, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000014, 0x00000001, 0xF9718890, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xF24A7FC1, 0xF24A8680, 0xF24A783C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000C, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xF97188AD, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000008, 0x00000001, 0x000000C8, 0x00000046, 0x00000001, D_80241A70_CE5160, 0x00000024, 0x00000002, 0xF97188AD, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000018, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000030, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000039, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000004A, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80241B10_CE5200, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF97188AD, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000158, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_19_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0xFFFFFF2E, 0x00000000, 0x00000158, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A6E80, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xF24A7FC1, 0xFE363C80, 0xF24A783C, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000C, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240540_CE3C30, 0x00000043, 0x00000001, func_80240660_CE3D50, 0x00000003, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188AD, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, ClearPartnerMoveHistory, 0xFFFFFFFC, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000064, 0x00000000, 0x0000003C, 0x00000014, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x0000019C, 0x00000046, 0x00000001, 0x802409C0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423F8_CE5AE8 -.word 0x0000000A, 0x00000002, 0xF97188AC, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000024, 0x00000002, 0xF97188AC, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C89, 0xF24B2E80, 0x00000024, 0x00000002, 0xFE363C8A, 0xF24AEA80, 0x00000024, 0x00000002, 0xFE363C8B, 0xF24A8E80, 0x00000024, 0x00000002, 0xFE363C8C, 0xF24B6A80, 0x00000024, 0x00000002, 0xFE363C8D, 0xF24AEA80, 0x00000024, 0x00000002, 0xFE363C8E, 0xF24AA280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C89, 0xFE363C8B, 0x00000008, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x0000019D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007B, 0x00000001, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000003, func_802404D0_CE3BC0, 0xFE363C83, 0xFE363C84, 0x00000014, 0x00000001, 0xFE363C84, 0x00000018, 0x00000001, 0x0000005A, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x0000001B, 0x00000001, 0x0000010E, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xF24A7FC1, 0xF24A8680, 0xF24A783C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000C, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xF97188AD, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000024, 0x00000002, 0xF97188AD, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80241A70_CE5160, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000000D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000018, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000030, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000039, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000004A, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A9680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xF97188AD, 0x00000000, 0x00000046, 0x00000001, D_80241B10_CE5200, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000158, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_19_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0x00000000, 0xFFFFFF2E, 0x00000158, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A6E80, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xF24A7FC1, 0xFE363C80, 0xF24A783C, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000C, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A6E80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000001, func_80240540_CE3C30, 0x00000043, 0x00000001, func_80240660_CE3D50, 0x0000000A, 0x00000002, 0xFE363C8F, 0x0000012C, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188AD, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80243008, 0x00000008, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000000D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000018, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000030, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000039, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000004A, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000320, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A2A80, 0xF24A9C80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000064, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C8F, 0x00000024, 0x00000002, 0xF97188A8, 0x00000000, 0x00000005, 0x00000001, 0x00000190, 0x0000000A, 0x00000002, 0xF97188A8, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8B, 0x00000190, 0x00000043, 0x00000003, EnableGroup, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000018, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000030, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000039, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000004A, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B2E80, 0xF24A6E80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000096, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableGroup, 0x00000055, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x0000000F, PlayEffect, 0x0000000A, 0x00000000, 0x00000016, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000000A, 0x00000000, 0x00000016, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF97188A8, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, flo_19_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0xFFFFFEA2, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C8F, 0x0000002E, 0x00000002, 0xFD050F8B, 0xF24A80E7, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80241BB0_CE52A0, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000044, 0x00000001, D_80241C58_CE5348, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000037, 0x00000043, 0x00000003, GotoMap, 0x80243008, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802423F8_CE5AE8, 0x00000080, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s b/ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s deleted file mode 100644 index f40488cd3b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_21/CE73F0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CF0_CE73F0 -.word 0xC4480000, 0xC2380000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024137C_CE7A7C, D_80240CF0_CE73F0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190124 - -dlabel D_80240D40_CE7440 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000032, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_21_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_21_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E3C_CE753C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000037, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000016, 0x00000001, 0x00000038, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000028A, 0x00000096, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0xF24A6480, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0xF24A6480, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, flo_21_StarSpiritEffectFunc2, 0x00000005, 0x000000B4, 0x0000028A, 0x000000AA, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000096, 0x00000078, 0x00000056, 0x00000000, 0x00000043, 0x00000001, flo_21_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, flo_21_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x0000028A, 0x000000CD, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, flo_21_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000028A, 0x00000078, 0x00000000, 0x00000043, 0x00000002, flo_21_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, flo_21_StarSpiritEffectFunc5, 0x00000005, 0x0000028A, 0x00000096, 0x00000000, 0x00000078, 0x00000056, 0x00000000, 0x00000043, 0x00000001, flo_21_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, flo_21_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245B24, 0x00000005, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412F4_CE79F4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245B2C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241350_CE7A50 -.word 0x00000047, 0x00000005, D_802412F4_CE79F4, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024137C_CE7A7C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000027, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245AEC, 0x00000044, 0x00000001, 0x80241B98, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000044, 0x00000001, D_80241600_CE7D00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000005, 0x00000007, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000007, 0x00000007, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241350_CE7A50, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80240D40_CE7440, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240B00_CE7200, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240E3C_CE753C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7EE7, 0xF24A7EE7, 0xF24A7EE7, 0xF24A7EE7, 0xF24A7EE7, 0xF24A7EE7, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0xF24A7E1A, 0xF24A7E1A, 0xF24A7E1A, 0xF24A7E1A, 0xF24A7E1A, 0xF24A7E1A, 0x0000002C, 0x00000002, 0xFD050F80, 0xF24A7480, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F81, 0xF24A7480, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F82, 0xF24A7480, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F83, 0xF24A7480, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F84, 0xF24A7480, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241600_CE7D00 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000008, flo_21_UnkFloatFunc, 0xFE363C8F, 0xFE363C80, 0xF24A7E60, 0xF24A7EA0, 0x0000000F, 0x00000000, 0x00000000, 0x00000043, 0x00000008, flo_21_UnkFloatFunc, 0xFE363C8F, 0xFE363C81, 0xF24A7EA0, 0xF24A7E60, 0x0000000F, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000058, 0xFE363C81, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x0000005A, 0xFE363C81, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x0000005C, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x0000005E, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000060, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000062, 0xFE363C81, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000064, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0x00000066, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_21/CE7EC0.data.s b/ver/us/asm/data/world/area_flo/flo_21/CE7EC0.data.s deleted file mode 100644 index d3cc54f88f..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_21/CE7EC0.data.s +++ /dev/null @@ -1,81 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417C0_CE7EC0 -.word 0x00000000, 0x0018001C, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_802417EC_CE7EEC -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024189C_CE7F9C -.word 0x44160000, 0x42D00000, 0x00000000, 0x440FC000, 0x434C0000, 0x00000000, 0x44098000, 0x42D00000, 0x00000000 - -dlabel D_802418C0_CE7FC0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000020B6, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241920_CE8020 -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003C0, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000025, 0x00000003, 0x0000028A, 0x00000068, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x0000028A, 0x00000032, 0x00000000, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000028A, 0x00000032, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000028A, 0x00000032, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000028A, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000028A, 0x00000096, 0x00000005, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x0000028A, 0x00000096, 0x00000000, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0x0000028A, 0x00000096, 0x00000000, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_8024189C_CE7F9C, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x0000028A, 0x00000000, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000045, 0x00000002, D_802418C0_CE7FC0, 0xFE363C89, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0x00000258, 0x00000014, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x0000000F, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x0000000D, 0x00000002, 0xFE363C83, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C82, 0xFE363C84, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C82, 0xFE363C84, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100CA, 0x00000276, 0x00000078, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100CB, 0x00000276, 0x00000078, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100CC, 0x00000276, 0x00000078, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100CD, 0x00000276, 0x00000078, 0x00000000, 0x00000013, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000028, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C83, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C83, 0x00000007, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000046, 0x00000001, D_80241920_CE8020, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242290_CE8990 -.word 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E4D, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7EE7, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000001, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7A90, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24A7A8B, 0x00000008, 0x00000001, 0xFE363C82, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000001, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000001, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7A90, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7A8B, 0x00000008, 0x00000001, 0xFE363C82, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024249C_CE8B9C -.word 0x0000027B, 0x000000A5, 0x000001C2, 0x00000078, 0x00000280, 0x000000AA, 0x00000208, 0x0000010E, 0x0000028A, 0x000000AF, 0x0000028A, 0x00000113, 0x00000294, 0x000000AA, 0x000002DA, 0x00000113, 0x00000299, 0x000000A5, 0x00000352, 0x00000078, 0x00000276, 0x00000096, 0x000001C2, 0x0000009B, 0x0000027D, 0x00000096, 0x00000258, 0x00000113, 0x0000028A, 0x00000096, 0x00000352, 0x0000009B, 0x00000297, 0x00000096, 0x000002EE, 0x0000010E, 0x0000029E, 0x00000096, 0x00000352, 0x000000C3, 0x0000027B, 0x00000087, 0x000001C2, 0x000000C3, 0x00000280, 0x00000082, 0x000001C2, 0x000000EB, 0x0000028A, 0x0000007D, 0x000001C2, 0x0000010E, 0x00000294, 0x00000082, 0x00000352, 0x0000010E, 0x00000299, 0x00000087, 0x00000352, 0x000000EB - -dlabel D_8024258C_CE8C8C -.word 0x0000000A, 0x0000000E, 0x00000007, 0x0000000E, 0x00000005, 0x00000006, 0x00000005, 0x0000000C, 0x00000006, 0x0000000C, 0x00000005, 0x00000005, 0x00000005, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004 - -dlabel D_802425D4_CE8CD4 -.word 0x00000008, 0x0000000A, 0x0000000A, 0x00000008 - -dlabel D_802425E4_CE8CE4 -.word 0x0000000A, 0x00000005, 0x00000007, 0x00000005, 0x0000000E, 0x00000006, 0x0000000E, 0x00000005, 0x00000006, 0x00000005, 0x0000000C, 0x00000005, 0x0000000C, 0x00000005, 0x00000005, 0x00000005, 0x0000000A, 0x00000004 - -dlabel D_8024262C_CE8D2C -.word 0x0000000A, 0x00000006, 0x00000006, 0x0000000A - -dlabel D_8024263C_CE8D3C -.word 0x00000026, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C81, 0x00000001, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0xFE363C81, 0x0000002D, 0x00000002, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000000A, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000009, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000009, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000002, 0x00000009, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242918_CE9018 -.word 0x00000026, 0x00000002, 0xFD050F8B, 0xF24A7E80, 0x00000026, 0x00000002, 0xFD050F8C, 0xF24A7E80, 0x00000058, 0x00000000, 0x00000030, 0x00000001, D_8024258C_CE8C8C, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B6, 0x00000000, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_802425D4_CE8CD4, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B6, 0x00000000, 0x00000032, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000004, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000030, 0x00000001, D_802425E4_CE8CE4, 0x00000005, 0x00000001, 0x00000006, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_8024262C_CE8D2C, 0x00000005, 0x00000001, 0x00000002, 0x00000032, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000004, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFD050F8B, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000001, 0xFD050F8B, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000002, 0xFD050F8B, 0xFD050F8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D34_CE9434 -.word 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000168, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFE98, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000030, 0x00000001, D_8024249C_CE8B9C, 0x00000024, 0x00000002, 0xFE363C88, 0x00000003, 0x00000005, 0x00000001, 0x0000000E, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000008, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C88, 0xFE363C81, 0xFE363C82, 0xFFFFFFE2, 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C85, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C88, 0x000003D5, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0xFFFFFFF1, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C88, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C88, 0xFE363C81, 0xFE363C82, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C88, 0x000003D6, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0xFFFFFFF1, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C88, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243010_CE9710 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x007C0004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x007C0005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x007C0006, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000008, SpeakToPlayer, 0x00000000, 0x007C0030, 0x007C0005, 0x00000100, 0xFFFFFFE2, 0x0000001E, 0x001100CE, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFDD, 0x00000027, 0x00000002, 0xFE363C84, 0x00000023, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000007, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C84, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFF9, 0x00000008, 0x00000001, 0x0000000E, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A8080, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000003A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000041, 0x0000000C, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024263C_CE8D3C, 0x00000046, 0x00000001, D_80242918_CE9018, 0x00000046, 0x00000001, D_80242D34_CE9434, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243428_CE9B28 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000043, 0x00000002, StartBossBattle, 0x0000000E, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434D8_CE9BD8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C83, 0x00000046, 0x00000001, D_80243010_CE9710, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000044, 0x00000001, D_80240E3C_CE753C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435D4_CE9CD4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435E4_CE9CE4 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00400000, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243428_CE9B28, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802434D8_CE9BD8, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007C0002, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243684_CE9D84 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00400000, 0x00000001, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802435D4_CE9CD4, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007C0001, 0x00000044, 0x00000001, D_80242290_CE8990, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024371C_CE9E1C -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000038, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00400000, 0x00000001, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802435D4_CE9CD4, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007C0019, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437A8_CE9EA8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007D000B, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437E0_CE9EE0 -.word 0x007C0000, 0x007C0001, 0x007C0002, 0x007C0004, 0x007C0005, 0x007C0031, 0x007C0019, 0x007C002D, 0xFFFFFFFF - -dlabel D_80243804_CE9F04 -.word 0x00000000, D_802417EC_CE7EEC, 0x44228000, 0xC47A0000, 0x00000000, 0x00040D01, D_802435E4_CE9CE4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x00000000, 0x00000000, D_802437E0_CE9EE0, 0x00000000, 0x00000001, D_802417EC_CE7EEC, 0x44228000, 0x42C80000, 0x00000000, 0x00040F01, D_80243684_CE9D84, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x00000000, 0x00000000, D_802437E0_CE9EE0, 0x00000000, 0x00000002, D_802417EC_CE7EEC, 0x44228000, 0xC47A0000, 0x00000000, 0x00040F01, D_8024371C_CE9E1C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x007C0001, 0x00000000, 0x00000000, D_802437E0_CE9EE0, 0x00000000 - -dlabel D_80243DD4_CEA4D4 -.word 0x007D000B, 0xFFFFFFFF - -dlabel D_80243DDC_CEA4DC -.word 0x00000003, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000004, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000005, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000006, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000007, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000008, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000009, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x0000000A, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x0000000B, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x0000000C, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x0000000D, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x0000000E, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x0000000F, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000010, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000011, D_802417C0_CE7EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_802437A8_CE9EA8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000000, 0x00000000, D_80243DD4_CEA4D4, 0x00000000, 0x00000003, D_80243804_CE9F04, 0x19000008, 0x0000000F, D_80243DDC_CEA4DC, 0x181F0008, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_22/CEC4D0.data.s b/ver/us/asm/data/world/area_flo/flo_22/CEC4D0.data.s deleted file mode 100644 index eeeafd682f..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_22/CEC4D0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240290_CEC4D0 -.word 0xC3660000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403D8_CEC618, D_80240290_CEC4D0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190125 - -dlabel D_802402E0_CEC520 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240350_CEC590 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242010, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403AC_CEC5EC -.word 0x00000047, 0x00000005, D_80240350_CEC590, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403D8_CEC618 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240DE4, 0x00000044, 0x00000001, 0x80241F6C, 0x00000044, 0x00000001, 0x80241528, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802403AC_CEC5EC, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80240E24, 0x00000046, 0x00000001, D_802402E0_CEC520, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CEC240, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_22/CEC760.data.s b/ver/us/asm/data/world/area_flo/flo_22/CEC760.data.s deleted file mode 100644 index fb98bd6f51..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_22/CEC760.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240520_CEC760 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024054C_CEC78C -.word 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002E, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405E4_CEC824 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x004B0001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000001E, 0x0000003C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000001E, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240740_CEC980 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024054C_CEC78C, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802405E4_CEC824, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240778_CEC9B8 -.word 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8B, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002E, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240810_CECA50 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00480001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000001E, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00480001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000001E, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409CC_CECC0C -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240778_CEC9B8, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80240810_CECA50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A04_CECC44 -.word 0x00000000, D_80240520_CEC760, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F04, D_80240740_CEC980, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240BF4_CECE34 -.word 0x00000001, D_80240520_CEC760, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F04, D_802409CC_CECC0C, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240A04_CECC44, 0x18170003, 0x00000001, D_80240BF4_CECE34, 0x180F0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_22/CED050.data.s b/ver/us/asm/data/world/area_flo/flo_22/CED050.data.s deleted file mode 100644 index d6b05c3989..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_22/CED050.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E10_CED050 -.word 0x0000009F, 0x0000009E, 0x000000A0, 0x000000A1, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001100DB, 0x0000012C, 0x00000078, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E84_CED0C4 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0x00000005, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C88, 0xFE363C82, 0xFE363C86, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0x00000023, 0x00000014, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetItemPos, 0xFE363C87, 0xFE363C80, 0xFE363C86, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x00000302, 0x00000000, 0x00000023, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241028_CED268 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C88, 0x0000001A, 0x00000001, 0xFFFFFFFF, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015C, 0x000000A0, 0x00000028, 0x00000016, 0x00000001, 0x0000009E, 0x00000046, 0x00000001, D_80240E84_CED0C4, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x0000000A, 0x00000002, 0xF84060F3, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100DD, 0x00000023, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF84060F3, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000138, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0xF84060F0, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000010, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000023, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFCB, 0x00000000, 0x00000000, 0x00000019, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFB7, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFAD, 0x00000000, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000035, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetItemPos, 0xFE363C87, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000010, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100DE, 0x00000023, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_80240E84_CED0C4, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000005, ShowMessageAtWorldPos, 0x001100DC, 0x00000023, 0x00000023, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x004B0001, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000001E, 0x0000003C, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x004B0004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0048000E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004E, 0x00000006, D_80241028_CED268, 0x00000100, 0x00000009, D_80240E10_CED050, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF84060F3, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000138, 0xFFFFFFAD, 0x00000000, 0x00000000, 0x00000000, 0xF84060F0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_22/CED7E0.data.s b/ver/us/asm/data/world/area_flo/flo_22/CED7E0.data.s deleted file mode 100644 index ba412f1668..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_22/CED7E0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802415A0_CED7E0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241900_CEDB40 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_22_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_22_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F04_CEE144 -.word 0x00000003, 0x00000015, 0x00000016, 0x00000017 - -dlabel D_80241F14_CEE154 -.word 0x00000000, D_80241F04_CEE144, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241F28_CEE168 -.word 0x42BA0000, 0x00000000, 0xC2B20000, 0x00000000 - -dlabel D_80241F38_CEE178 -.word 0x00000003, 0x00000019, 0x0000001A, 0x0000001B - -dlabel D_80241F48_CEE188 -.word 0x00000000, D_80241F38_CEE178, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241F5C_CEE19C -.word 0x43160000, 0x00000000, 0x43070000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241F14_CEE154, 0x00000047, 0x00000005, D_80241900_CEDB40, 0x00001000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241900_CEDB40, 0x00100000, D_80241F28_CEE168, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241F48_CEE188, 0x00000047, 0x00000005, D_80241900_CEDB40, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241900_CEDB40, 0x00100000, D_80241F5C_CEE19C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_23/CEEF30.data.s b/ver/us/asm/data/world/area_flo/flo_23/CEEF30.data.s deleted file mode 100644 index fd79551b4b..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_23/CEEF30.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CD0_CEEF30 -.word 0x43EB0000, 0x00000000, 0x00000000, 0x43870000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024114C_CEF3AC, D_80240CD0_CEEF30, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190126 - -dlabel D_80240D30_CEEF90 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DA0_CEF000 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024104C_CEF2AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242670, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410A8_CEF308 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242678, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241104_CEF364 -.word 0x00000047, 0x00000005, D_802410A8_CEF308, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024104C_CEF2AC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024114C_CEF3AC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242568, 0x00000046, 0x00000001, 0x802425A0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEDE, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0x000001E0, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240DA0_CEF000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241104_CEF364, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80240D30_CEEF90, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CEE260, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s b/ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s deleted file mode 100644 index b59f00c302..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_23/CEF540.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412E0_CEF540 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024130C_CEF56C -.word 0x00000000 - -dlabel D_80241310_CEF570 -.word 0x00000000 - -dlabel D_80241314_CEF574 -.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, flo_23_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_802402C0_CEE520, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241448_CEF6A8 -.word 0x00000043, 0x00000002, func_802402F8_CEE558, 0xFE363C80, 0x0000004E, 0x00000006, D_80241314_CEF574, 0x00000010, 0x00000000, jan_02_foliage_setup_shear_mtx, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024026C_CEE4CC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241498_CEF6F8 -.word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 - -dlabel D_802414C8_CEF728 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, flo_23_UnkNpcAIMainFunc5, D_80241498_CEF6F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241538_CEF798 -.word 0x00000000, 0x00150016, 0x00000000, 0x00000000, D_802414C8_CEF728, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_80241564_CEF7C4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D5, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60002, 0x00C60001, 0x00000000, 0x00110049, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000001, func_80240C9C_CEEEFC, 0x00000024, 0x00000002, 0xFE363C80, D_80242850_8D3D60, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_80241448_CEF6A8, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60002, 0x00C60001, 0x00000000, 0x0011004A, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000002, func_80240C2C_CEEE8C, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C88, 0x00000181, 0x00000014, 0xFFFFFFDE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002095, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000014, 0x00000001, 0xFE363C88, 0x00000016, 0x00000001, 0x0000009E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60004, 0x00C60001, 0x00000000, 0x0011004D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000021C, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C60009, 0x00C60008, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60007, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001C9, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7F4D, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFE363C88, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C88, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003D, 0xFE363C88, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000037, 0xFE363C89, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000038, 0xFE363C89, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000039, 0xFE363C89, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60005, 0x00000024, 0x00000002, 0xF84060D5, 0x00000001, 0x00000016, 0x00000001, 0x0000009F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60004, 0x00C60001, 0x00000000, 0x0011004C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60001, 0x00000016, 0x00000001, 0x000000A0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60004, 0x00C60001, 0x00000000, 0x0011004C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60001, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60004, 0x00C60001, 0x00000000, 0x0011004B, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002096, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C88, 0x00000177, 0x00000014, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7880, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF2506A80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A0280, 0x00000043, 0x00000005, func_80240B68_CEEDC8, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF2509280, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A0280, 0x00000043, 0x00000005, func_80240B68_CEEDC8, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60001, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60001, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C60002, 0x00C60001, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A9280, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60009, 0x00C60008, 0x00000000, 0x0011004E, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60009, 0x00C60008, 0x00000000, 0x0011004F, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E70_CF00D0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241564_CEF7C4, 0x0000000A, 0x00000002, 0xF84060D5, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60005, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000003D, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000037, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000038, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000039, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F98_CF01F8 -.word 0x00000002, D_802412E0_CEF540, 0x43C08000, 0x00000000, 0xC20C0000, 0x00402D09, D_80241E70_CF00D0, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00C60001, 0x00000000, 0x00000000, 0x00000000, 0x001A00DC - -dlabel D_80242188_CF03E8 -.word 0x00000000, D_80241538_CEF798, 0x42A00000, 0x00000000, 0x00000000, 0x00002800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000050, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000050, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242378_CF05D8 -.word 0x00000001, D_80241538_CEF798, 0xC3A00000, 0x00000000, 0x00000000, 0x00002800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFEC0, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEC0, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242188_CF03E8, 0x180C0003, 0x00000001, D_80242378_CF05D8, 0x180D0003, 0x00000001, D_80241F98_CF01F8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_23/CF0800.data.s b/ver/us/asm/data/world/area_flo/flo_23/CF0800.data.s deleted file mode 100644 index 96d925020d..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_23/CF0800.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802425A0_CF0800 -.word 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000064, 0x0000003C, 0x00000005, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000064, 0x00000091, 0x00000000, 0x00000000, 0x00000083, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406101, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000019, 0x0000003C, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406100, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x0000005A, 0x0000003C, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_24/CF0ED0.data.s b/ver/us/asm/data/world/area_flo/flo_24/CF0ED0.data.s deleted file mode 100644 index 4b211762cd..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_24/CF0ED0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240590_CF0ED0 -.word 0xC3E38000, 0x00000000, 0x00000000, 0x42B40000, 0x43E38000, 0x00000000, 0x00000000, 0x43870000, 0x43E38000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240A3C_CF137C, D_80240590_CF0ED0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190127 - -dlabel D_80240600_CF0F40 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000002, PlaySound, 0x80000022, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240690_CF0FD0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024093C_CF127C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242270, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240998_CF12D8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242278, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409F4_CF1334 -.word 0x00000047, 0x00000005, D_8024093C_CF127C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240998_CF12D8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A3C_CF137C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x802421B0, 0x00000043, 0x00000002, MakeTransformGroup, 0x0000005D, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000064, 0x00000044, 0x00000001, 0x80241728, 0x00000044, 0x00000001, 0x80241ABC, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001D, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001B, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001C, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001C, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240690_CF0FD0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C82, 0x000001E0, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80240690_CF0FD0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, 0x8024183C, 0x00000044, 0x00000001, D_802409F4_CF1334, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802409F4_CF1334, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240600_CF0F40, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CF0940, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_24/CF1680.data.s b/ver/us/asm/data/world/area_flo/flo_24/CF1680.data.s deleted file mode 100644 index e2ec95bf36..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_24/CF1680.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D40_CF1680 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_24_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_24_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410A0_CF19E0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_24_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_24_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_24_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_24_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416A4_CF1FE4 -.word 0x00000006, 0x00000014, 0x00000012, 0x00000015, 0x00000016, 0x00000017, 0x00000013 - -dlabel D_802416C0_CF2000 -.word 0x00000001, 0x00000011 - -dlabel D_802416C8_CF2008 -.word 0x00000002, 0x000000A1, 0xFFFFFFDA, 0x00000057, 0xFFFFFF64, 0x0000000C, 0x00000000, 0xF971889F, 0x000000A1, 0x00000027, 0x00000041, 0xFFFFFF30, 0x0000000C, 0x00000000, 0xF97188A0 - -dlabel D_80241704_CF2044 -.word D_802416A4_CF1FE4, D_802416C0_CF2000, D_802416C8_CF2008, 0x00000000, 0x00000000 - -dlabel D_80241718_CF2058 -.word 0x3F800000, 0x00000000, 0xC3400000, 0x00000000, 0x00000024, 0x00000002, 0xF971889F, 0x00000000, 0x00000024, 0x00000002, 0xF97188A0, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241704_CF2044, 0x00000047, 0x00000005, D_802410A0_CF19E0, 0x00001000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802410A0_CF19E0, 0x00100000, D_80241718_CF2058, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417A0_CF20E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, flo_24_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_24_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000064, 0x00000000, 0x0000002D, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000AA, 0x00000000, 0x000000A0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000AA, 0xFFFFFFA6, 0x000000A0, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000320, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF24D9A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24F2A80, 0xF2482280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000050, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x0000005A, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000065, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000067, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000002D, 0x00000064, 0x00000096, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000003, GotoMap, 0x80242280, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000003, EnableGroup, 0x0000005E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000041, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000003, EnableGroup, 0x00000069, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000059, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000061, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000062, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000005B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000065, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000067, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000063, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802417A0_CF20E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802417A0_CF20E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802417A0_CF20E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802417A0_CF20E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF63C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802417A0_CF20E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF63C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802417A0_CF20E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_24/CF2AF0.data.s b/ver/us/asm/data/world/area_flo/flo_24/CF2AF0.data.s deleted file mode 100644 index 42e998b7f6..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_24/CF2AF0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802421B0_CF2AF0 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFEBB, 0x0000003C, 0xFFFFFF74, 0x00000000, 0x0000009A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060F1, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000145, 0x0000003C, 0xFFFFFF74, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060F2, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000014F, 0x00000000, 0xFFFFFF60, 0x00000000, 0x00000008, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060FE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_25/CF4EA0.data.s b/ver/us/asm/data/world/area_flo/flo_25/CF4EA0.data.s deleted file mode 100644 index b00f52fe2c..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_25/CF4EA0.data.s +++ /dev/null @@ -1,78 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802422D0_CF4EA0 -.word 0x441B0000, 0x00000000, 0x00000000, 0x43870000, 0xC41B0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024274C_CF531C, D_802422D0_CF4EA0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190128 - -dlabel D_80242330_CF4F00 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423A0_CF4F70 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024264C_CF521C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244ED0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426A8_CF5278 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244ED8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242704_CF52D4 -.word 0x00000047, 0x00000005, D_802426A8_CF5278, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024264C_CF521C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024274C_CF531C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80243C5C_CF682C, 0x00000046, 0x00000001, 0x80243C90, 0x00000044, 0x00000001, 0x80244D0C, 0x00000044, 0x00000001, 0x802446BC, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0x00000280, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, D_802423A0_CF4F70, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242704_CF52D4, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80242330_CF4F00, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240000_CF2BD0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428F0_CF54C0 -.word 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024291C_CF54EC -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_80242934_CF5504 -.word 0x3F800000, 0x0000002D, 0x0000003C, 0x42C80000, 0x00000000, 0x00000003, 0x40666666, 0x0000000A, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_80242964_CF5534 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80241944_CF4514, D_80242934_CF5504, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429D4_CF55A4 -.word 0x00000000, 0x0018001C, 0x00000000, 0x00000000, D_80242964_CF5534, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_80242A00_CF55D0 -.word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 - -dlabel D_80242A30_CF5600 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_8024134C_CF3F1C, D_80242A00_CF55D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AA0_CF5670 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80242A30_CF5600, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_80242ACC_CF569C -.word 0x00000000 - -dlabel D_80242AD0_CF56A0 -.word 0x00000000 - -dlabel D_80242AD4_CF56A4 -.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, flo_25_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_80241DAC_CF497C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C08_CF57D8 -.word 0x00000043, 0x00000002, func_80241DE4_CF49B4, 0xFE363C80, 0x0000004E, 0x00000006, D_80242AD4_CF56A4, 0x00000010, 0x00000000, D_80244FA0_8F0DC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D58_CF4928, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C58_CF5828 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D3, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC480, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60102, 0x00C60101, 0x00000000, 0x0011003B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000001, func_80241FB4_CF4B84, 0x00000024, 0x00000002, 0xFE363C80, D_80245110_9F9B50, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80242C08_CF57D8, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001A, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60102, 0x00C60101, 0x00000000, 0x0011003C, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000002, func_80241F44_CF4B14, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C88, 0x000001F9, 0x00000014, 0xFFFFFFE8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002095, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60103, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000014, 0x00000001, 0xFE363C88, 0x00000016, 0x00000001, 0x0000009F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60104, 0x00C60101, 0x00000000, 0x0011003F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000021C, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C60109, 0x00C60108, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60107, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000E, 0x000001C9, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7F4D, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C88, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0xFE363C88, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C88, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C89, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C89, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C89, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60105, 0x00000024, 0x00000002, 0xF84060D3, 0x00000001, 0x00000016, 0x00000001, 0x000000A0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60104, 0x00C60101, 0x00000000, 0x0011003E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60101, 0x00000016, 0x00000001, 0x0000009E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60104, 0x00C60101, 0x00000000, 0x0011003E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60101, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60104, 0x00C60101, 0x00000000, 0x0011003D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60106, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002096, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C88, 0xFFFFFF83, 0x00000014, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7880, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF2524A80, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A2A80, 0x00000043, 0x00000005, func_80241E80_CF4A50, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000007, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A79B4, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF2527280, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24AB680, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A2A80, 0x00000043, 0x00000005, func_80241E80_CF4A50, 0xFE363C87, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60101, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60101, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00C60102, 0x00C60101, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A9280, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000039, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60109, 0x00C60108, 0x00000000, 0x00110040, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C60109, 0x00C60108, 0x00000000, 0x00110041, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243564_CF6134 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242C58_CF5828, 0x0000000A, 0x00000002, 0xF84060D3, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C60105, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000057, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024368C_CF625C -.word 0x00000000, D_802428F0_CF54C0, 0x43FC8000, 0x00000000, 0xC1C80000, 0x00402D09, D_80243564_CF6134, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00C60101, 0x00000000, 0x00000000, 0x00000000, 0x001A00DA - -dlabel D_8024387C_CF644C -.word 0x00000001, D_802429D4_CF55A4, 0xC3480000, 0x42340000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0082, 0x000A0000, 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, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFF38, 0x0000002D, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF38, 0x0000002D, 0x00000000, 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, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243A6C_CF663C -.word 0x00000002, D_80242AA0_CF5670, 0x43160000, 0x425C0000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x00000096, 0x00000032, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000096, 0x00000032, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243C5C_CF682C -.word 0x00000001, D_8024387C_CF644C, 0x18220006, 0x00000001, D_80243A6C_CF663C, 0x181A0002, 0x00000001, D_8024368C_CF625C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_25/CF6860.data.s b/ver/us/asm/data/world/area_flo/flo_25/CF6860.data.s deleted file mode 100644 index 7b7e035f87..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_25/CF6860.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243C90_CF6860 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFE7A, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060FF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_25/CF68B0.data.s b/ver/us/asm/data/world/area_flo/flo_25/CF68B0.data.s deleted file mode 100644 index 673858c39a..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_25/CF68B0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243CE0_CF68B0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_25_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_25_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244040_CF6C10 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_25_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, flo_25_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_25_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, flo_25_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244644_CF7214 -.word 0x00000003, 0x00000016, 0x00000017, 0x00000018 - -dlabel D_80244654_CF7224 -.word 0x00000001, 0x00000015 - -dlabel D_8024465C_CF722C -.word 0x00000002, 0x000000A0, 0xFFFFFE50, 0x00000054, 0xFFFFFFD4, 0x0000000C, 0x00000000, 0xF97188A1, 0x000000A0, 0xFFFFFEA6, 0x00000048, 0xFFFFFF8E, 0x0000000C, 0x00000000, 0xF97188A2 - -dlabel D_80244698_CF7268 -.word D_80244644_CF7214, D_80244654_CF7224, D_8024465C_CF722C, 0x00000000, 0x00000000 - -dlabel D_802446AC_CF727C -.word 0xC3C20000, 0x00000000, 0xC2B80000, 0x00000000, 0x00000024, 0x00000002, 0xF97188A1, 0x00000000, 0x00000024, 0x00000002, 0xF97188A2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244698_CF7268, 0x00000047, 0x00000005, D_80244040_CF6C10, 0x00001000, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244040_CF6C10, 0x00100000, D_802446AC_CF727C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_25/CF7310.data.s b/ver/us/asm/data/world/area_flo/flo_25/CF7310.data.s deleted file mode 100644 index 18da255495..0000000000 --- a/ver/us/asm/data/world/area_flo/flo_25/CF7310.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244740_CF7310 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802449EC_CF75BC -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80242230_CF4E00, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000039, 0x00000024, 0x00000002, 0xFE363C83, 0x00000039, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C86, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802449EC_CF75BC, 0x00000043, 0x00000002, GetModelCenter, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000040, 0x00000024, 0x00000002, 0xFE363C85, 0x00000041, 0x00000024, 0x00000002, 0xFE363C86, 0x00000042, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802449EC_CF75BC, 0x00000043, 0x00000002, GetModelCenter, 0x00000045, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000024, 0x00000002, 0xFE363C84, 0x00000046, 0x00000024, 0x00000002, 0xFE363C85, 0x00000047, 0x00000024, 0x00000002, 0xFE363C86, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, D_802449EC_CF75BC, 0x00000043, 0x00000002, GetModelCenter, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_802449EC_CF75BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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 c11acec7fd..a689d32483 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 D_80244490_A1A6B0 +dlabel hos_02_sixFloats .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, func_802428F4_A18B14, 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_UnkNpcAIMainFunc10, 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 bce39b751c..bcac7ad099 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 D_802457F4_A208F4 +dlabel hos_03_sixFloats .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, func_80241FBC_A1D0BC, 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_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 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_isk/isk_10/989910.data.s b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s index a2b7326ba7..1a1163f892 100644 --- a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s +++ b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s @@ -29,11 +29,11 @@ dlabel D_80241108_989C68 dlabel D_80241118_989C78 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80241158_989CB8 +dlabel isk_10_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241164_989CC4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_988B9C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_UnkFunc22, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_989160, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_988B9C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_UnkFunc22, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, isk_10_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802412C8_989E28 .word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, isk_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, isk_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, isk_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s index 61cb8bddbc..2050437832 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s @@ -11,11 +11,11 @@ dlabel D_80245A68_923FD8 dlabel D_80245A78_923FE8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80245AB8_924028 +dlabel iwa_10_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80245AC4_924034 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, iwa_10_UnkFunc21, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024032C_91E89C, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, iwa_10_UnkFunc22, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408F0_91EE60, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, iwa_10_UnkFunc21, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024032C_91E89C, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, iwa_10_UnkFunc22, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, iwa_10_UnkFunc60, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245C28_924198 .word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, iwa_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s index 84a63eb5de..49cf6b1200 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s @@ -11,11 +11,11 @@ dlabel D_80243E08_B620B8 dlabel D_80243E18_B620C8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80243E58_B62108 +dlabel jan_08_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243E64_B62114 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_UnkFunc21, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024069C_B5E94C, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_UnkFunc22, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C60_B5EF10, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_UnkFunc21, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024069C_B5E94C, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_UnkFunc22, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_UnkFunc60, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FC8_B62278 .word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_UnkFunc20, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, jan_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, jan_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s index c1a169319b..883e74719c 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, D_80244CB0_87E890, 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_sixFloats, 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_A1B098, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 12ed49499d..0182d7e5db 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 @@ -20,14 +20,14 @@ dlabel D_80241AE0_8CFB50 dlabel D_80241B00_8CFB70 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80241AE0_8CFB50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 -dlabel D_80241B2C_8CFB9C +dlabel kmr_05_sixFloats .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, func_8024130C_8CF37C, 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_UnkNpcAIMainFunc9, 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 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 670fb82f94..9f97770987 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 @@ -20,14 +20,14 @@ dlabel D_80242070_8D3580 dlabel D_80242090_8D35A0 .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80242070_8D3580, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_802420BC_8D35CC +dlabel kmr_06_sixFloats .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, func_8024130C_8D281C, 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_UnkNpcAIMainFunc9, 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_09/8D73C0.data.s b/ver/us/asm/data/world/area_kmr/kmr_09/8D73C0.data.s index 32a7a8e276..cb5ec6e64a 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 @@ -20,14 +20,14 @@ dlabel D_80241820_8D7620 dlabel D_80241840_8D7640 .word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_80241820_8D7620, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00050000 -dlabel D_8024186C_8D766C +dlabel kmr_09_sixFloats .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, func_8024130C_8D710C, 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_UnkNpcAIMainFunc9, 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_kpa/kpa_03/A4A750.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s index 72cf2def9f..28adc56830 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 @@ -69,7 +69,7 @@ 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, func_80240C18_A491D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_03_UnkFunc57, 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 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 34c16dd2cc..f1b33fb007 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 @@ -36,7 +36,7 @@ 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, func_80240270_A4CC90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_08_UnkFunc57, 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 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 52a282ee5c..e2fcedd046 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, func_80240F94_A4FF94, 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_UnkNpcAIMainFunc7, 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 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 4d2d0ff221..e918217508 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, func_80241204_A94944, 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_UnkNpcAIMainFunc7, 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 @@ -63,7 +63,7 @@ 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, func_80241F00_A95640, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_102_UnkFunc57, 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 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 6bafcfefe4..2d9c2f5e23 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, func_80241064_A9A5F4, 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_UnkNpcAIMainFunc7, 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 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 ef1916ad45..c40f4c527c 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, func_80241064_A9FDA4, 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_UnkNpcAIMainFunc7, 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 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 8581d7aaaf..065ae94b1a 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, func_80240EF4_A618C4, 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_UnkNpcAIMainFunc7, 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 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 81f8f1c7a4..38b085540f 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 @@ -36,7 +36,7 @@ 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, func_80240220_A642B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_51_UnkFunc57, 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 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 79b0960099..eda2ae16dd 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, func_80240FD4_A680D4, 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_UnkNpcAIMainFunc7, 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 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 52681526be..98fac4bcbc 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 @@ -33,7 +33,7 @@ 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, func_80240CB4_A6F094, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, kpa_61_UnkFunc57, 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 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 8873aef3bd..346322414b 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, func_80241224_A87C74, 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_UnkNpcAIMainFunc8, 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 aa8f4cce38..1bf2d9ead9 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, func_80241304_A8DD84, 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_UnkNpcAIMainFunc8, 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 58bd110fb3..6552380fb3 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 D_80244900_C5F040 +dlabel kzn_02_sixFloats .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, func_80241DE4_C5C524, 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_UnkNpcAIMainFunc10, 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 diff --git a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s index 0a47410a8e..bf5b1e742a 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s @@ -11,11 +11,11 @@ dlabel D_80241C48_C69D78 dlabel D_80241C58_C69D88 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80241C98_C69DC8 +dlabel kzn_04_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241CA4_C69DD4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024034C_C6847C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_UnkFunc22, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240910_C68A40, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024034C_C6847C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_UnkFunc22, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_04_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E08_C69F38 .word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_04_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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 cc24d44ea2..061c9313cb 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 D_80242B90_C70EC0 +dlabel kzn_07_sixFloats .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, func_80242124_C70454, 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_UnkNpcAIMainFunc10, 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 38fe42dfe7..71bc168291 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 D_80244DA0_C76220 +dlabel kzn_08_sixFloats .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, func_80242354_C737D4, 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_UnkNpcAIMainFunc10, 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 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s index 51cf6044ad..dce94b0532 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s @@ -11,11 +11,11 @@ dlabel D_80243D08_C7A9E8 dlabel D_80243D18_C7A9F8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80243D58_C7AA38 +dlabel kzn_09_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243D64_C7AA44 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_C76D1C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_UnkFunc22, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_C772E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_C76D1C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_UnkFunc22, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_09_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EC8_C7ABA8 .word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_09_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 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 7c89a8e247..6cc7eeede8 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 D_802436D0_C83870 +dlabel kzn_11_sixFloats .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, func_80241D64_C81F04, 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_UnkNpcAIMainFunc10, 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_mim/mim_08/BB1D00.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s index d4dc879c86..257d58b1c8 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 D_802443C0_BB1D00 +dlabel mim_08_sixFloats .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, func_802413AC_BAECEC, 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_UnkNpcAIMainFunc9, 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 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 e694498bcd..9febf83714 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 @@ -17,14 +17,14 @@ dlabel D_802427EC_9F722C dlabel D_8024285C_9F729C .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802427EC_9F722C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_80242888_9F72C8 +dlabel nok_11_sixFloats .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, func_80241AE0_9F6520, 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_UnkNpcAIMainFunc9, 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 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 6fa5d5239a..e85beb46e7 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 @@ -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, func_80241BD4_9FC3C4, 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_UnkNpcAIMainFunc8, 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 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 4f19b46444..c65a7aa060 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 @@ -20,7 +20,7 @@ dlabel D_802439CC_A0620C dlabel D_802439EC_A0622C .word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_802439CC_A0620C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_80243A18_A06258 +dlabel nok_14_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80243A30_A06270 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 17ea7403b9..9dbd092875 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 @@ -11,7 +11,7 @@ dlabel D_80243CC0_A0ABC0 dlabel D_80243D30_A0AC30 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243CC0_A0ABC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_80243D5C_A0AC5C +dlabel nok_15_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80243D74_A0AC74 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 a6942c6a96..ec71c9ae91 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 @@ -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, func_8024283C_D9FD0C, 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_UnkNpcAIMainFunc7, 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 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s index 519e13e008..5e953e0afa 100644 --- a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s +++ b/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242F50_DA8190 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240188_DA53C8, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_03_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_03_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_03_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, func_80240104_DA5344, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240188_DA53C8, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, func_80240104_DA5344, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240188_DA53C8, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, func_8024020C_DA544C, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, func_802402B0_DA54F0, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, func_802402B0_DA54F0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000008A, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000008A, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000008A, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x0000008C, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008A, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000008C, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000088, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_03_UnkBufferFunc, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_03_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_03_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_03_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_03_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_03_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_03_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_03_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_03_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_03_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_03_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_03_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000008A, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000008A, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000008A, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x0000008C, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008A, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000008C, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000088, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244118_DA9358 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -33,7 +33,7 @@ dlabel D_80245238_DAA478 .word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248198, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248190, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248188, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248198, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248188, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248198, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248190, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802481A0, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802454DC_DAA71C -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240538_DA5778, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80245178_DAA3B8, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80245238_DAA478, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_03_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80245178_DAA3B8, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80245238_DAA478, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024556C_DAA7AC .word 0x00000043, 0x00000003, SetTexPanner, 0x0000008E, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008E, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x00000099, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000093, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000093, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000099, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 7e2f7a7c75..1bc6eecadb 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 D_80242EF0_DB02F0 +dlabel omo_04_sixFloats .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, func_802416AC_DAEAAC, 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_UnkNpcAIMainFunc9, 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 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 e8c7452015..5b1f068656 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 @@ -35,14 +35,14 @@ dlabel D_80242F3C_DB51FC dlabel D_80242F5C_DB521C .word 0x00000000, 0x00180016, 0x00000000, 0x00000000, D_80242F3C_DB51FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000F0001 -dlabel D_80242F88_DB5248 +dlabel omo_05_sixFloats .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, func_80241D60_DB4020, 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_UnkNpcAIMainFunc9, 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_06/DB9060.data.s b/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s index 2875886094..e5e85ac0c2 100644 --- a/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s +++ b/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241750_DB9060 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DB7A78, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_06_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_06_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_06_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, func_802400E4_DB79F4, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DB7A78, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, func_802400E4_DB79F4, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DB7A78, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, func_802401EC_DB7AFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DB7BA0, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DB7BA0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000006B, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000071, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000006B, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000071, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006D, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_06_UnkBufferFunc, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_06_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_06_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_06_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_06_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_06_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_06_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_06_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_06_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_06_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_06_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000006B, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000071, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000068, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000006B, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000071, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000006B, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006D, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242918_DBA228 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -27,7 +27,7 @@ dlabel D_80243318_DBAC28 .word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245980, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245978, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245970, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245980, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245970, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245980, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245978, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80245988, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802435BC_DBAECC -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240518_DB7E28, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80243258_DBAB68, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80243318_DBAC28, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_06_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80243258_DBAB68, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80243318_DBAC28, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024364C_DBAF5C .word 0x00000043, 0x00000003, SetTexPanner, 0x00000073, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000073, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000073, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000078, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000078, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000007E, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x00000073, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 6bcccf7369..4798a17374 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 @@ -20,14 +20,14 @@ dlabel D_8024399C_DC0C4C 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 D_80243A14_DC0CC4 +dlabel omo_07_sixFloats .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, func_80242C84_DBFF34, 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_UnkNpcAIMainFunc9, 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/DC8100.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s index e382e4415e..dd670650d8 100644 --- a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243D30_DC8100 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DC4538, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_08_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_08_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_08_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, func_802400E4_DC44B4, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_08_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DC4538, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, func_802400E4_DC44B4, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DC4538, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, func_802401EC_DC45BC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DC4660, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DC4660, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000087, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008E, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000087, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000089, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_08_UnkBufferFunc, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_08_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_08_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_08_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_08_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_08_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_08_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_08_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_08_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_06_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_08_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_08_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_08_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000087, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000008E, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000084, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000087, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000008B, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x0000008D, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000008D, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000084, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000087, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000089, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244EF8_DC92C8 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -27,7 +27,7 @@ dlabel D_802458F8_DC9CC8 .word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248748, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248740, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248738, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248748, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248738, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248748, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248740, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80248750, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245B9C_DC9F6C -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240518_DC48E8, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80245838_DC9C08, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802458F8_DC9CC8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_08_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80245838_DC9C08, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802458F8_DC9CC8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245C2C_DC9FFC .word 0x00000043, 0x00000003, SetTexPanner, 0x0000008F, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008F, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000094, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000094, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 8043fc8327..f12ecfa57d 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 @@ -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, func_8024324C_DCFF1C, 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_UnkNpcAIMainFunc7, 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 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s b/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s index a10fbca285..4b1fbce951 100644 --- a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s +++ b/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802410B0_DD8A60 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DD7B18, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_10_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_10_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_10_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, func_802400E4_DD7A94, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DD7B18, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, func_802400E4_DD7A94, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DD7B18, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, func_802401EC_DD7B9C, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DD7C40, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DD7C40, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000080, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000081, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000080, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007C, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_10_UnkBufferFunc, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_10_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_10_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_10_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_10_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_10_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_10_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_10_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_10_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_10_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_10_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_10_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000080, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000081, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000080, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000077, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000007A, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000007C, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242278_DD9C28 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -27,7 +27,7 @@ dlabel D_80242C78_DDA628 .word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E60, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E58, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E50, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E60, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E50, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E60, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E58, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244E68, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F1C_DDA8CC -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240518_DD7EC8, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80242BB8_DDA568, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80242C78_DDA628, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_10_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80242BB8_DDA568, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80242C78_DDA628, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242FAC_DDA95C .word 0x00000043, 0x00000003, SetTexPanner, 0x00000082, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000082, 0x00000001, 0x00000024, 0x00000002, 0xFD050F89, 0x00008000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFD050F89, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C85, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000010E, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008D, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000087, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000087, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000008D, 0x00000001, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000168, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xF9718882, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C82, 0x0000003C, 0x00000008, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x0000000C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x000001F9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000006, RotateModel, 0x00000082, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FA, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x00004000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFD050F89, 0x0000C000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0xFE363C86, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s index c88b1df2f6..1d5581bfe3 100644 --- a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s +++ b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s @@ -53,11 +53,11 @@ dlabel D_80241E48_DDE678 dlabel D_80241E58_DDE688 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80241E98_DDE6C8 +dlabel omo_11_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241EA4_DDE6D4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802407CC_DDCFFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_UnkFunc22, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240D90_DDD5C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802407CC_DDCFFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_UnkFunc22, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, omo_11_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242008_DDE838 .word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, omo_11_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, omo_11_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s b/ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s index 562eef4aee..33d65392cb 100644 --- a/ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s +++ b/ver/us/asm/data/world/area_omo/omo_16/DEC600.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80240730_DEC600 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DEC038, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_16_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_16_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_16_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, func_802400E4_DEBFB4, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DEC038, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, func_802400E4_DEBFB4, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DEC038, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, func_802401EC_DEC0BC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DEC160, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DEC160, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000060, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000063, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000006A, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000006A, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000060, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000063, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x00000067, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000069, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000067, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000069, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000065, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_16_UnkBufferFunc, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_16_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_16_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_16_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_16_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_16_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_16_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_16_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_16_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_16_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_16_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_16_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000060, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000063, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000006A, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x0000006A, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000060, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000063, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x00000067, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000069, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000067, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000069, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x00000063, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000065, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242238_DEE108 .word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000003, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802422F8_DEE1C8 -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240518_DEC3E8, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80242238_DEE108, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802422F8_DEE1C8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FB8, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242FC8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_16_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_80242238_DEE108, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802422F8_DEE1C8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024262C_DEE4FC .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000008C, 0x00000014, 0x00000001, 0xF5DE0257, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000B, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000D, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000A, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000008C, 0x00000014, 0x00000001, 0xF5DE0257, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000B, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000C, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF70F2E86, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F000D, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_17/DF2C90.data.s b/ver/us/asm/data/world/area_omo/omo_17/DF2C90.data.s index c33bcce308..c01b8a6c69 100644 --- a/ver/us/asm/data/world/area_omo/omo_17/DF2C90.data.s +++ b/ver/us/asm/data/world/area_omo/omo_17/DF2C90.data.s @@ -3,13 +3,13 @@ .section .data dlabel D_80243DF0_DF2C90 -.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DEF008, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_17_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_17_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_17_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, func_802400E4_DEEF84, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DEF008, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, func_802400E4_DEEF84, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, func_80240168_DEF008, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, func_802401EC_DEF08C, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DEF130, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, func_80240290_DEF130, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000018, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000018, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000001B, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000022, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000022, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000022, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000018, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000001B, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000018, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000001F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000021, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000001F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000021, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000018, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000001D, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000014, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD482, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD483, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD487, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD488, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD490, 0xF24A7A80, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFD050F81, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24B1A80, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD486, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24B1A80, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8B, 0xF4ACD48B, 0x00000026, 0x00000002, 0xFD050F8C, 0xF4ACD48C, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000026, 0x00000002, 0xF4ACD491, 0xF24A7A80, 0x00000003, 0x00000001, 0x0000000B, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xF4ACD491, 0xFE363C84, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000004, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x0000000C, 0x0000002D, 0x00000002, 0xF4ACD491, 0xF24B1A80, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48D, 0xF24A7A80, 0x00000024, 0x00000002, 0xF4ACD492, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_17_UnkBufferFunc, 0x00000003, 0x00000000, 0x00000000, 0x00000032, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD487, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD488, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD489, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F82, 0x00000016, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xF4ACD48A, 0xF24AA280, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000008, omo_17_UnkFloatFunc, 0xF4ACD492, 0xF4ACD48A, 0xF24A7A80, 0xF24AA280, 0x00000064, 0x00000001, 0xF24A7A80, 0x00000027, 0x00000002, 0xF4ACD492, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x00000043, 0x00000008, omo_17_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24AA280, 0xF24A8280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD48D, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD491, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000008, omo_17_UnkFloatFunc, 0xFE363C80, 0xF4ACD48A, 0xF24A7E80, 0xF24AA280, 0xFE363C81, 0x00000000, 0xF24A7A80, 0x00000023, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000004, omo_17_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD482, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD483, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_17_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD484, 0x00000032, 0x00000002, 0xF4ACD482, 0xF4ACD483, 0x00000027, 0x00000002, 0xF4ACD484, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD482, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, GetDist2D, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000004, omo_17_CompareFloats, 0xFE363C80, 0xF4ACD48A, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF4ACD48A, 0xFE363C80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD48A, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD487, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD488, 0x00000030, 0x00000001, 0xFD050F81, 0x00000043, 0x00000004, omo_17_UnkBufferFunc, 0x00000003, 0x00000002, 0xF4ACD489, 0x00000032, 0x00000002, 0xF4ACD487, 0xF4ACD488, 0x00000027, 0x00000002, 0xF4ACD489, 0x00000001, 0x0000000A, 0x00000002, 0xF4ACD487, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F80, 0x00000064, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD487, 0xF4ACD488, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xFE363C81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD480, 0xF4ACD481, 0xF4ACD485, 0xF4ACD486, 0x00000026, 0x00000002, 0xF4ACD485, 0xF4ACD480, 0x00000026, 0x00000002, 0xF4ACD486, 0xF4ACD481, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD485, 0xF4ACD486, 0xF24BBA80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C80, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xF4ACD480, 0xF4ACD485, 0x00000026, 0x00000002, 0xF4ACD481, 0xF4ACD486, 0x00000043, 0x00000005, AddVectorPolar, 0xF4ACD480, 0xF4ACD481, 0xF24BBA80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD480, 0x00000026, 0x00000002, 0xFE363C81, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C80, 0xF4ACD485, 0x0000002C, 0x00000002, 0xFE363C81, 0xF4ACD486, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x00000043, 0x00000006, omo_17_SetAngleClamped, 0xFE363C82, 0xF4ACD485, 0xF4ACD486, 0xF4ACD480, 0xF4ACD481, 0x00000026, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F8C, 0xFE363C81, 0x00000026, 0x00000002, 0xFD050F8D, 0xFE363C82, 0x00000043, 0x00000006, GetDist2D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xF4ACD48B, 0xF4ACD48C, 0x0000002C, 0x00000002, 0xF4ACD48D, 0xFE363C83, 0x00000026, 0x00000002, 0xF4ACD48E, 0xF4ACD48D, 0x0000002E, 0x00000002, 0xF4ACD48E, 0xF24A803B, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002D, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000C, 0x00000002, 0xF4ACD48F, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24A5280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FF, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000084, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8680, 0x0000002C, 0x00000002, 0xF4ACD48F, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD48F, 0x0000000A, 0x00000026, 0x00000002, 0xF4ACD48F, 0xF24AA280, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FE, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000005, omo_17_SetPlayerStatusPosYaw, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24AB680, 0xFE363C82, 0x00000043, 0x00000006, omo_17_SetNpcPosYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000006, omo_17_SetNpcPosYaw, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000018, 0xF24BB6E7, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xF249EE1A, 0xF24A0AC8, 0xF24A0462, 0x00000043, 0x00000006, RotateGroup, 0x00000018, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000001B, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0xF24B1C80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xF249DC80, 0xF24A2A80, 0xF24A78E7, 0x00000043, 0x00000005, TranslateGroup, 0x00000022, 0xFD050F8B, 0xF24AA280, 0xFD050F8C, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000022, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8D, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24D4A80, 0x0000002D, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000043, 0x00000006, RotateGroup, 0x00000022, 0xFE363C81, 0xF24A7A80, 0xF24A7680, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000018, 0xF24B2E80, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x0000001B, 0xF249C680, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0x00000018, 0xF2493E1A, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xF24B06E7, 0xF24AEA39, 0xF24AF09F, 0x00000043, 0x00000005, TranslateGroup, 0x0000001F, 0xF249D880, 0xF24ACA80, 0xF24A7C1A, 0x00000043, 0x00000005, TranslateGroup, 0x00000021, 0xF24B1880, 0xF24ACA80, 0xF24A7C1A, 0x0000000C, 0x00000002, 0xFD050F8D, 0x000000B4, 0x00000043, 0x00000006, RotateGroup, 0x0000001F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000043, 0x00000006, RotateGroup, 0x00000021, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7680, 0x00000012, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000001F, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000043, 0x00000006, RotateGroup, 0x00000021, 0xF4ACD48E, 0xF24A7A80, 0xF24A7A80, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000018, 0xF24A7A80, 0xF4ACD48F, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48F, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7680, 0x00000043, 0x00000005, TranslateGroup, 0x0000001B, 0xF24A7A80, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C80, 0xF4ACD48A, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xF4ACD490, 0xFE363C80, 0x0000000D, 0x00000002, 0xF4ACD490, 0x00000168, 0x0000002D, 0x00000002, 0xF4ACD490, 0xF2501A80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000001D, 0xF4ACD490, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000026, 0x00000002, 0xF4ACD48B, 0xFD050F8B, 0x00000026, 0x00000002, 0xF4ACD48C, 0xFD050F8C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C81, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C81, 0x00000000, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7D4D, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0x00000032, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C83, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24D4A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24AB680, 0xFE363C83, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0x00000032, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24BE280, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C82, 0xF24C0A80, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C84, 0xFE363C85, 0xF24ACA80, 0xFE363C86, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C84, 0x00000032, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000005, 0x000F0009, 0x00000043, 0x00000002, PlaySound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000021, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x00000083, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000020, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F8D, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000B4, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xF24BE280, 0x00000013, 0x00000000, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24C0A80, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C89, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x008C0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24B6A80, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C81, 0xF24ACA80, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802458F8_DF4798 .word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F0, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E0, 0x00000003, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802459B8_DF4858 -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E8, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E8, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240518_DEF3B8, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_802458F8_DF4798, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802459B8_DF4858, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F0, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E8, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E0, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F0, 0x00000002, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475E8, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802475F8, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, omo_17_IsAOrBPressed, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, D_802458F8_DF4798, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802459B8_DF4858, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245CEC_DF4B8C .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000258, 0x00000024, 0x00000002, 0xFE363C80, 0x00000258, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xF24B4280, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 c7c53de86e..1eb8a18d4b 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 @@ -20,14 +20,14 @@ dlabel D_80246108_DF4FA8 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 -dlabel D_80246184_DF5024 +dlabel omo_17_sixFloats .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, func_802422C0_DF1160, 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_UnkNpcAIMainFunc9, 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,7 +36,7 @@ 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, func_802433A0_DF2240, 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_UnkNpcAIMainFunc7, 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 diff --git a/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s b/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s index 70fe519c93..e2656f983f 100644 --- a/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s +++ b/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s @@ -15,7 +15,7 @@ dlabel D_802422D4_D668B4 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_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_802411A0_D65780, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D657B8, 0xFE363C80, 0x0000004E, 0x00000006, D_802422D4_D668B4, 0x00000010, 0x00000000, D_80243720, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242468_D66A48 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D65780, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D65854, 0xFE363C80, 0x0000004E, 0x00000006, D_80242468_D66A48, 0x00000010, 0x00000000, D_802438E8_A4BEA8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D65780, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D65854, 0xFE363C80, 0x0000004E, 0x00000006, D_80242468_D66A48, 0x00000010, 0x00000000, pra_13_802438E8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802425EC_D66BCC .word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s b/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s index b2fc786c0c..9d520849d2 100644 --- a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s +++ b/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s @@ -27,7 +27,7 @@ dlabel D_802421A4_D70B54 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_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_802411A0_D6FB50, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D6FB88, 0xFE363C80, 0x0000004E, 0x00000006, D_802421A4_D70B54, 0x00000010, 0x00000000, D_802479F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242338_D70CE8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D6FB50, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D6FC24, 0xFE363C80, 0x0000004E, 0x00000006, D_80242338_D70CE8, 0x00000010, 0x00000000, D_80247BB8_DA5088, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D6FB50, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D6FC24, 0xFE363C80, 0x0000004E, 0x00000006, D_80242338_D70CE8, 0x00000010, 0x00000000, D_80247BB8_pra_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802424BC_D70E6C .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 96adec21fc..a4dacae9f4 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 @@ -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 D_802441B8_D24048 +dlabel sam_06_sixFloats .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, func_8024185C_D216EC, 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_UnkNpcAIMainFunc9, 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 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s index ade4405603..0fbab221ce 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s @@ -20,11 +20,11 @@ dlabel D_80241AE8_D31768 dlabel D_80241AF8_D31778 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80241B38_D317B8 +dlabel sam_08_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241B44_D317C4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sam_08_UnkFunc21, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_D2FCBC, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sam_08_UnkFunc22, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_D30280, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sam_08_UnkFunc21, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_D2FCBC, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sam_08_UnkFunc22, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sam_08_UnkFunc60, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CA8_D31928 .word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sam_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s index 9a4006a778..f0bf992877 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s @@ -11,11 +11,11 @@ dlabel D_80241438_9553F8 dlabel D_80241448_955408 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80241488_955448 +dlabel sbk_56_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241494_955454 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802400BC_95407C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_UnkFunc22, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240680_954640, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802400BC_95407C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_UnkFunc22, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415F8_9555B8 .word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sbk_56_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s index 104db0f33e..261a9a3b23 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s @@ -11,11 +11,11 @@ dlabel D_802439F8_87D5D8 dlabel D_80243A08_87D5E8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80243A48_87D628 +dlabel tik_07_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243A54_87D634 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024031C_879EFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_UnkFunc22, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408E0_87A4C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024031C_879EFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_UnkFunc22, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243BB8_87D798 .word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_07_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_07_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 324d39d55c..c1c53c1ab0 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 D_80244CB0_87E890 +dlabel tik_07_sixFloats .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, func_802426FC_87C2DC, 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_UnkNpcAIMainFunc9, 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_10/8883F0.data.s b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s index 665edd3079..296f17b044 100644 --- a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s @@ -11,11 +11,11 @@ dlabel D_80242038_8883F8 dlabel D_80242048_888408 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80242088_888448 +dlabel tik_10_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80242094_888454 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406BC_886A7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_UnkFunc22, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C80_887040, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406BC_886A7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_UnkFunc22, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421F8_8885B8 .word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 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 57ff9c0015..120e3cc956 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 @@ -14,11 +14,11 @@ dlabel D_80243CB4_88C884 dlabel D_80243CC4_88C894 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80243D04_88C8D4 +dlabel tik_12_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80243D10_88C8E0 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C58_889828, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_UnkFunc22, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024121C_889DEC, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C58_889828, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_UnkFunc22, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_12_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243E74_88CA44 .word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_12_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_12_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_12_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s index 9347761272..0ee1ebb987 100644 --- a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s +++ b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s @@ -11,11 +11,11 @@ dlabel D_80241428_893E48 dlabel D_80241438_893E58 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80241478_893E98 +dlabel tik_17_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80241484_893EA4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024006C_892A8C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_UnkFunc22, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240630_893050, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024006C_892A8C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_UnkFunc22, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415E8_894008 .word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_17_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_17_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s index ca95ef1e98..bd8b5f0d4d 100644 --- a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s +++ b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s @@ -11,11 +11,11 @@ dlabel D_802426B8_899C98 dlabel D_802426C8_899CA8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF -dlabel D_80242708_899CE8 +dlabel tik_19_bigFuncFloats .word 0x430C0000, 0x43340000, 0x435C0000 dlabel D_80242714_899CF4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024062C_897C0C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_UnkFunc22, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240BF0_8981D0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024062C_897C0C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_UnkFunc22, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_UnkFunc60, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242878_899E58 .word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_19_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_19_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 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 94984afb28..e14f5e9def 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 @@ -21,7 +21,7 @@ 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, func_80241744_9A2724, 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_UnkNpcAIMainFunc8, 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_04/9AD960.data.s b/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s index 393e8c9a23..6261ebe4e5 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 @@ -15,12 +15,12 @@ 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, func_80241B14_9A9F04, 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_UnkNpcAIMainFunc8, 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 D_802456F4_9ADAE4 +dlabel trd_04_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_8024570C_9ADAFC 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 4a2a4871fe..6b1908fd5c 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 @@ -11,7 +11,7 @@ dlabel D_80242E10_9B9790 dlabel D_80242E80_9B9800 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242E10_9B9790, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 -dlabel D_80242EAC_9B982C +dlabel trd_07_sixFloats .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 dlabel D_80242EC4_9B9844 diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s deleted file mode 100644 index b122710941..0000000000 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_ECA300 -/* ECA300 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* ECA304 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* ECA308 80240608 0080B02D */ daddu $s6, $a0, $zero -/* ECA30C 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* ECA310 80240610 00A0802D */ daddu $s0, $a1, $zero -/* ECA314 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* ECA318 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* ECA31C 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* ECA320 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* ECA324 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* ECA328 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* ECA32C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* ECA330 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* ECA334 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* ECA338 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* ECA33C 8024063C 0C00F94D */ jal dead_get_npc_safe -/* ECA340 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* ECA344 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* ECA348 80240648 3C048008 */ lui $a0, %hi(dead_gCurrentCameraID) -/* ECA34C 8024064C 8C84C760 */ lw $a0, %lo(dead_gCurrentCameraID)($a0) -/* ECA350 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* ECA354 80240654 00041880 */ sll $v1, $a0, 2 -/* ECA358 80240658 00641821 */ addu $v1, $v1, $a0 -/* ECA35C 8024065C 00031880 */ sll $v1, $v1, 2 -/* ECA360 80240660 00641823 */ subu $v1, $v1, $a0 -/* ECA364 80240664 000320C0 */ sll $a0, $v1, 3 -/* ECA368 80240668 00641821 */ addu $v1, $v1, $a0 -/* ECA36C 8024066C 000318C0 */ sll $v1, $v1, 3 -/* ECA370 80240670 3C01800C */ lui $at, %hi(D_800B8DEC) -/* ECA374 80240674 00230821 */ addu $at, $at, $v1 -/* ECA378 80240678 C42C8DEC */ lwc1 $f12, %lo(D_800B8DEC)($at) -/* ECA37C 8024067C 0C00AD49 */ jal func_8002B524 -/* ECA380 80240680 0040A82D */ daddu $s5, $v0, $zero -/* ECA384 80240684 1200005D */ beqz $s0, .L802407FC -/* ECA388 80240688 00000000 */ nop -/* ECA38C 8024068C 0C00AFC6 */ jal func_8002BF18 -/* ECA390 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* ECA394 80240694 0040902D */ daddu $s2, $v0, $zero -/* ECA398 80240698 02C0202D */ daddu $a0, $s6, $zero -/* ECA39C 8024069C 0000882D */ daddu $s1, $zero, $zero -/* ECA3A0 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* ECA3A4 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* ECA3A8 802406A8 8E650000 */ lw $a1, ($s3) -/* ECA3AC 802406AC 3C014148 */ lui $at, 0x4148 -/* ECA3B0 802406B0 4481C000 */ mtc1 $at, $f24 -/* ECA3B4 802406B4 3C013F80 */ lui $at, 0x3f80 -/* ECA3B8 802406B8 4481B000 */ mtc1 $at, $f22 -/* ECA3BC 802406BC 4480A000 */ mtc1 $zero, $f20 -/* ECA3C0 802406C0 0C0B53A3 */ jal dead_evt_get_variable -/* ECA3C4 802406C4 0240802D */ daddu $s0, $s2, $zero -/* ECA3C8 802406C8 0C0462EC */ jal dead_get_entity_by_index -/* ECA3CC 802406CC 0040202D */ daddu $a0, $v0, $zero -/* ECA3D0 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* ECA3D4 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* ECA3D8 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* ECA3DC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* ECA3E0 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* ECA3E4 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* ECA3E8 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* ECA3EC 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* ECA3F0 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* ECA3F4 802406F4 44060000 */ mfc1 $a2, $f0 -/* ECA3F8 802406F8 0C01DA5C */ jal func_80076970 -/* ECA3FC 802406FC 26310001 */ addiu $s1, $s1, 1 -/* ECA400 80240700 AE020008 */ sw $v0, 8($s0) -/* ECA404 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* ECA408 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* ECA40C 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* ECA410 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* ECA414 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* ECA418 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* ECA41C 8024071C 2A220003 */ slti $v0, $s1, 3 -/* ECA420 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* ECA424 80240724 26100004 */ addiu $s0, $s0, 4 -/* ECA428 80240728 0000882D */ daddu $s1, $zero, $zero -/* ECA42C 8024072C 0240802D */ daddu $s0, $s2, $zero -/* ECA430 80240730 3C148024 */ lui $s4, %hi(D_80242038_ECBD38) -/* ECA434 80240734 26942038 */ addiu $s4, $s4, %lo(D_80242038_ECBD38) -/* ECA438 80240738 3C014248 */ lui $at, 0x4248 -/* ECA43C 8024073C 4481A000 */ mtc1 $at, $f20 -/* ECA440 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* ECA444 80240744 AE400000 */ sw $zero, ($s2) -/* ECA448 80240748 AE400004 */ sw $zero, 4($s2) -/* ECA44C 8024074C AE400060 */ sw $zero, 0x60($s2) -/* ECA450 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* ECA454 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* ECA458 80240758 4406A000 */ mfc1 $a2, $f20 -/* ECA45C 8024075C 8E870000 */ lw $a3, ($s4) -/* ECA460 80240760 02532821 */ addu $a1, $s2, $s3 -/* ECA464 80240764 0C00ACA3 */ jal dead_add_vec2D_polar -/* ECA468 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* ECA46C 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* ECA470 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* ECA474 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* ECA478 80240778 00000000 */ nop -/* ECA47C 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* ECA480 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* ECA484 80240784 00000000 */ nop -/* ECA488 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* ECA48C 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* ECA490 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* ECA494 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* ECA498 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* ECA49C 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* ECA4A0 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* ECA4A4 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* ECA4A8 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* ECA4AC 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* ECA4B0 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* ECA4B4 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* ECA4B8 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* ECA4BC 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* ECA4C0 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* ECA4C4 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* ECA4C8 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* ECA4CC 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* ECA4D0 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* ECA4D4 802407D4 26940004 */ addiu $s4, $s4, 4 -/* ECA4D8 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* ECA4DC 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* ECA4E0 802407E0 26730004 */ addiu $s3, $s3, 4 -/* ECA4E4 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* ECA4E8 802407E8 26310001 */ addiu $s1, $s1, 1 -/* ECA4EC 802407EC 2A220003 */ slti $v0, $s1, 3 -/* ECA4F0 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* ECA4F4 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* ECA4F8 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* ECA4FC 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* ECA500 80240800 8E430000 */ lw $v1, ($s2) -/* ECA504 80240804 24020001 */ addiu $v0, $zero, 1 -/* ECA508 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* ECA50C 8024080C 28620002 */ slti $v0, $v1, 2 -/* ECA510 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* ECA514 80240814 24020002 */ addiu $v0, $zero, 2 -/* ECA518 80240818 10600007 */ beqz $v1, .L80240838 -/* ECA51C 8024081C 24040005 */ addiu $a0, $zero, 5 -/* ECA520 80240820 08090274 */ j .L802409D0 -/* ECA524 80240824 00000000 */ nop -.L80240828: -/* ECA528 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* ECA52C 8024082C 00000000 */ nop -/* ECA530 80240830 08090274 */ j .L802409D0 -/* ECA534 80240834 00000000 */ nop -.L80240838: -/* ECA538 80240838 0000882D */ daddu $s1, $zero, $zero -/* ECA53C 8024083C 3C148024 */ lui $s4, %hi(D_80242038_ECBD38) -/* ECA540 80240840 26942038 */ addiu $s4, $s4, %lo(D_80242038_ECBD38) -/* ECA544 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* ECA548 80240848 3C064248 */ lui $a2, 0x4248 -/* ECA54C 8024084C 44800000 */ mtc1 $zero, $f0 -/* ECA550 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* ECA554 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* ECA558 80240858 44050000 */ mfc1 $a1, $f0 -/* ECA55C 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* ECA560 80240860 4485B000 */ mtc1 $a1, $f22 -/* ECA564 80240864 0C00ADA9 */ jal dead_update_lerp -/* ECA568 80240868 0240802D */ daddu $s0, $s2, $zero -/* ECA56C 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* ECA570 80240870 4406A000 */ mfc1 $a2, $f20 -/* ECA574 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* ECA578 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* ECA57C 8024087C 8E870000 */ lw $a3, ($s4) -/* ECA580 80240880 02532821 */ addu $a1, $s2, $s3 -/* ECA584 80240884 0C00ACA3 */ jal dead_add_vec2D_polar -/* ECA588 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* ECA58C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* ECA590 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* ECA594 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* ECA598 80240898 00000000 */ nop -/* ECA59C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* ECA5A0 802408A0 26940004 */ addiu $s4, $s4, 4 -/* ECA5A4 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* ECA5A8 802408A8 00000000 */ nop -/* ECA5AC 802408AC 26730004 */ addiu $s3, $s3, 4 -/* ECA5B0 802408B0 26310001 */ addiu $s1, $s1, 1 -/* ECA5B4 802408B4 2A220003 */ slti $v0, $s1, 3 -/* ECA5B8 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* ECA5BC 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* ECA5C0 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* ECA5C4 802408C4 26100004 */ addiu $s0, $s0, 4 -/* ECA5C8 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* ECA5CC 802408CC 24420001 */ addiu $v0, $v0, 1 -/* ECA5D0 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* ECA5D4 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* ECA5D8 802408D8 1440003D */ bnez $v0, .L802409D0 -/* ECA5DC 802408DC 24020001 */ addiu $v0, $zero, 1 -/* ECA5E0 802408E0 AE420000 */ sw $v0, ($s2) -/* ECA5E4 802408E4 08090274 */ j .L802409D0 -/* ECA5E8 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* ECA5EC 802408EC 0000882D */ daddu $s1, $zero, $zero -/* ECA5F0 802408F0 3C148024 */ lui $s4, %hi(D_80242038_ECBD38) -/* ECA5F4 802408F4 26942038 */ addiu $s4, $s4, %lo(D_80242038_ECBD38) -/* ECA5F8 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* ECA5FC 802408FC 0240802D */ daddu $s0, $s2, $zero -/* ECA600 80240900 3C014248 */ lui $at, 0x4248 -/* ECA604 80240904 4481A000 */ mtc1 $at, $f20 -/* ECA608 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* ECA60C 8024090C 4406A000 */ mfc1 $a2, $f20 -/* ECA610 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* ECA614 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* ECA618 80240918 8E870000 */ lw $a3, ($s4) -/* ECA61C 8024091C 02532821 */ addu $a1, $s2, $s3 -/* ECA620 80240920 0C00ACA3 */ jal dead_add_vec2D_polar -/* ECA624 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* ECA628 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* ECA62C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* ECA630 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* ECA634 80240934 00000000 */ nop -/* ECA638 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* ECA63C 8024093C 26940004 */ addiu $s4, $s4, 4 -/* ECA640 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* ECA644 80240944 00000000 */ nop -/* ECA648 80240948 26730004 */ addiu $s3, $s3, 4 -/* ECA64C 8024094C 26310001 */ addiu $s1, $s1, 1 -/* ECA650 80240950 2A220003 */ slti $v0, $s1, 3 -/* ECA654 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* ECA658 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* ECA65C 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* ECA660 80240960 26100004 */ addiu $s0, $s0, 4 -/* ECA664 80240964 8E420060 */ lw $v0, 0x60($s2) -/* ECA668 80240968 24420001 */ addiu $v0, $v0, 1 -/* ECA66C 8024096C AE420060 */ sw $v0, 0x60($s2) -/* ECA670 80240970 28420010 */ slti $v0, $v0, 0x10 -/* ECA674 80240974 14400016 */ bnez $v0, .L802409D0 -/* ECA678 80240978 2402000F */ addiu $v0, $zero, 0xf -/* ECA67C 8024097C AE420060 */ sw $v0, 0x60($s2) -/* ECA680 80240980 24020002 */ addiu $v0, $zero, 2 -/* ECA684 80240984 08090274 */ j .L802409D0 -/* ECA688 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* ECA68C 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* ECA690 80240990 24420001 */ addiu $v0, $v0, 1 -/* ECA694 80240994 AE420060 */ sw $v0, 0x60($s2) -/* ECA698 80240998 2842001F */ slti $v0, $v0, 0x1f -/* ECA69C 8024099C 1440000C */ bnez $v0, .L802409D0 -/* ECA6A0 802409A0 0000882D */ daddu $s1, $zero, $zero -/* ECA6A4 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* ECA6A8 802409A8 8CA20008 */ lw $v0, 8($a1) -/* ECA6AC 802409AC 8C430000 */ lw $v1, ($v0) -/* ECA6B0 802409B0 26310001 */ addiu $s1, $s1, 1 -/* ECA6B4 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* ECA6B8 802409B8 AC430000 */ sw $v1, ($v0) -/* ECA6BC 802409BC 2A220003 */ slti $v0, $s1, 3 -/* ECA6C0 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* ECA6C4 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* ECA6C8 802409C8 080902C1 */ j .L80240B04 -/* ECA6CC 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* ECA6D0 802409D0 8E430004 */ lw $v1, 4($s2) -/* ECA6D4 802409D4 10600005 */ beqz $v1, .L802409EC -/* ECA6D8 802409D8 24020001 */ addiu $v0, $zero, 1 -/* ECA6DC 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* ECA6E0 802409E0 0000882D */ daddu $s1, $zero, $zero -/* ECA6E4 802409E4 080902B0 */ j .L80240AC0 -/* ECA6E8 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* ECA6EC 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* ECA6F0 802409F0 24420001 */ addiu $v0, $v0, 1 -/* ECA6F4 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* ECA6F8 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* ECA6FC 802409FC 1440002F */ bnez $v0, .L80240ABC -/* ECA700 80240A00 0000882D */ daddu $s1, $zero, $zero -/* ECA704 80240A04 080902AC */ j .L80240AB0 -/* ECA708 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* ECA70C 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* ECA710 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* ECA714 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* ECA718 80240A18 4405A000 */ mfc1 $a1, $f20 -/* ECA71C 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* ECA720 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* ECA724 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* ECA728 80240A28 0C00ADA9 */ jal dead_update_lerp -/* ECA72C 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* ECA730 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* ECA734 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* ECA738 80240A38 4405A000 */ mfc1 $a1, $f20 -/* ECA73C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* ECA740 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* ECA744 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* ECA748 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* ECA74C 80240A4C 0C00ADA9 */ jal dead_update_lerp -/* ECA750 80240A50 24040001 */ addiu $a0, $zero, 1 -/* ECA754 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* ECA758 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* ECA75C 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* ECA760 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* ECA764 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* ECA768 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* ECA76C 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* ECA770 80240A70 0C00ADA9 */ jal dead_update_lerp -/* ECA774 80240A74 24040001 */ addiu $a0, $zero, 1 -/* ECA778 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* ECA77C 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* ECA780 80240A80 26310001 */ addiu $s1, $s1, 1 -/* ECA784 80240A84 2A220003 */ slti $v0, $s1, 3 -/* ECA788 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* ECA78C 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* ECA790 80240A90 26100004 */ addiu $s0, $s0, 4 -/* ECA794 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* ECA798 80240A98 24420001 */ addiu $v0, $v0, 1 -/* ECA79C 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* ECA7A0 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* ECA7A4 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* ECA7A8 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* ECA7AC 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* ECA7B0 80240AB0 AE420004 */ sw $v0, 4($s2) -/* ECA7B4 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* ECA7B8 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* ECA7BC 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* ECA7C0 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* ECA7C4 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* ECA7C8 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* ECA7CC 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* ECA7D0 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* ECA7D4 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* ECA7D8 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* ECA7DC 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* ECA7E0 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* ECA7E4 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* ECA7E8 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* ECA7EC 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* ECA7F0 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* ECA7F4 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* ECA7F8 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* ECA7FC 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* ECA800 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* ECA804 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* ECA808 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* ECA80C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* ECA810 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* ECA814 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* ECA818 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* ECA81C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* ECA820 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* ECA824 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* ECA828 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* ECA82C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* ECA830 80240B30 03E00008 */ jr $ra -/* ECA834 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s index 4219aa0dcf..c4706e08f3 100644 --- a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s +++ b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s @@ -121,7 +121,7 @@ glabel func_8024162C_ED161C .L802417C4_ED17B4: /* ED17B4 802417C4 02A0202D */ daddu $a0, $s5, $zero /* ED17B8 802417C8 0200282D */ daddu $a1, $s0, $zero -/* ED17BC 802417CC 0C0903DD */ jal func_80240F74_ED0F64 +/* ED17BC 802417CC 0C0903DD */ jal ED0310_SixFloatsFunc /* ED17C0 802417D0 0260302D */ daddu $a2, $s3, $zero /* ED17C4 802417D4 08090608 */ j .L80241820 /* ED17C8 802417D8 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s index 89c4c75af8..49da701cd9 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s @@ -124,7 +124,7 @@ glabel func_802414D0_EDFE90 .L80241668_EE0028: /* EE0028 80241668 02A0202D */ daddu $a0, $s5, $zero /* EE002C 8024166C 0200282D */ daddu $a1, $s0, $zero -/* EE0030 80241670 0C090386 */ jal func_80240E18_EDF7D8 +/* EE0030 80241670 0C090386 */ jal EDEA00_SixFloatsFunc /* EE0034 80241674 0260302D */ daddu $a2, $s3, $zero /* EE0038 80241678 080905B1 */ j .L802416C4 /* EE003C 8024167C 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s index 79595b94c6..c58798a7f6 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s @@ -121,7 +121,7 @@ dlabel L80241FA4_EE8554 dlabel L80241FB4_EE8564 /* EE8564 80241FB4 02A0202D */ daddu $a0, $s5, $zero /* EE8568 80241FB8 0200282D */ daddu $a1, $s0, $zero -/* EE856C 80241FBC 0C0905D9 */ jal func_80241764_EE7D14 +/* EE856C 80241FBC 0C0905D9 */ jal EE70C0_SixFloatsFunc /* EE8570 80241FC0 0260302D */ daddu $a2, $s3, $zero /* EE8574 80241FC4 08090804 */ j .L80242010 /* EE8578 80241FC8 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s deleted file mode 100644 index 5b8b5d8178..0000000000 --- a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_EED7E0 -/* EED7E0 802406E0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* EED7E4 802406E4 AFB60040 */ sw $s6, 0x40($sp) -/* EED7E8 802406E8 0080B02D */ daddu $s6, $a0, $zero -/* EED7EC 802406EC AFB00028 */ sw $s0, 0x28($sp) -/* EED7F0 802406F0 00A0802D */ daddu $s0, $a1, $zero -/* EED7F4 802406F4 AFBF0044 */ sw $ra, 0x44($sp) -/* EED7F8 802406F8 AFB5003C */ sw $s5, 0x3c($sp) -/* EED7FC 802406FC AFB40038 */ sw $s4, 0x38($sp) -/* EED800 80240700 AFB30034 */ sw $s3, 0x34($sp) -/* EED804 80240704 AFB20030 */ sw $s2, 0x30($sp) -/* EED808 80240708 AFB1002C */ sw $s1, 0x2c($sp) -/* EED80C 8024070C F7B80058 */ sdc1 $f24, 0x58($sp) -/* EED810 80240710 F7B60050 */ sdc1 $f22, 0x50($sp) -/* EED814 80240714 F7B40048 */ sdc1 $f20, 0x48($sp) -/* EED818 80240718 8ED3000C */ lw $s3, 0xc($s6) -/* EED81C 8024071C 0C00F94D */ jal dead_get_npc_safe -/* EED820 80240720 2404FFFC */ addiu $a0, $zero, -4 -/* EED824 80240724 27A50018 */ addiu $a1, $sp, 0x18 -/* EED828 80240728 3C048008 */ lui $a0, %hi(dead_gCurrentCameraID) -/* EED82C 8024072C 8C84C760 */ lw $a0, %lo(dead_gCurrentCameraID)($a0) -/* EED830 80240730 27A6001C */ addiu $a2, $sp, 0x1c -/* EED834 80240734 00041880 */ sll $v1, $a0, 2 -/* EED838 80240738 00641821 */ addu $v1, $v1, $a0 -/* EED83C 8024073C 00031880 */ sll $v1, $v1, 2 -/* EED840 80240740 00641823 */ subu $v1, $v1, $a0 -/* EED844 80240744 000320C0 */ sll $a0, $v1, 3 -/* EED848 80240748 00641821 */ addu $v1, $v1, $a0 -/* EED84C 8024074C 000318C0 */ sll $v1, $v1, 3 -/* EED850 80240750 3C01800C */ lui $at, %hi(D_800B8DEC) -/* EED854 80240754 00230821 */ addu $at, $at, $v1 -/* EED858 80240758 C42C8DEC */ lwc1 $f12, %lo(D_800B8DEC)($at) -/* EED85C 8024075C 0C00AD49 */ jal func_8002B524 -/* EED860 80240760 0040A82D */ daddu $s5, $v0, $zero -/* EED864 80240764 1200005D */ beqz $s0, .L802408DC -/* EED868 80240768 00000000 */ nop -/* EED86C 8024076C 0C00AFC6 */ jal func_8002BF18 -/* EED870 80240770 24040068 */ addiu $a0, $zero, 0x68 -/* EED874 80240774 0040902D */ daddu $s2, $v0, $zero -/* EED878 80240778 02C0202D */ daddu $a0, $s6, $zero -/* EED87C 8024077C 0000882D */ daddu $s1, $zero, $zero -/* EED880 80240780 2414FFFF */ addiu $s4, $zero, -1 -/* EED884 80240784 AED20060 */ sw $s2, 0x60($s6) -/* EED888 80240788 8E650000 */ lw $a1, ($s3) -/* EED88C 8024078C 3C014148 */ lui $at, 0x4148 -/* EED890 80240790 4481C000 */ mtc1 $at, $f24 -/* EED894 80240794 3C013F80 */ lui $at, 0x3f80 -/* EED898 80240798 4481B000 */ mtc1 $at, $f22 -/* EED89C 8024079C 4480A000 */ mtc1 $zero, $f20 -/* EED8A0 802407A0 0C0B53A3 */ jal dead_evt_get_variable -/* EED8A4 802407A4 0240802D */ daddu $s0, $s2, $zero -/* EED8A8 802407A8 0C0462EC */ jal dead_get_entity_by_index -/* EED8AC 802407AC 0040202D */ daddu $a0, $v0, $zero -/* EED8B0 802407B0 AE42005C */ sw $v0, 0x5c($s2) -.L802407B4: -/* EED8B4 802407B4 8E42005C */ lw $v0, 0x5c($s2) -/* EED8B8 802407B8 C440004C */ lwc1 $f0, 0x4c($v0) -/* EED8BC 802407BC 0000202D */ daddu $a0, $zero, $zero -/* EED8C0 802407C0 E7B60010 */ swc1 $f22, 0x10($sp) -/* EED8C4 802407C4 AFB40014 */ sw $s4, 0x14($sp) -/* EED8C8 802407C8 46180000 */ add.s $f0, $f0, $f24 -/* EED8CC 802407CC 8C450048 */ lw $a1, 0x48($v0) -/* EED8D0 802407D0 8C470050 */ lw $a3, 0x50($v0) -/* EED8D4 802407D4 44060000 */ mfc1 $a2, $f0 -/* EED8D8 802407D8 0C01DA5C */ jal func_80076970 -/* EED8DC 802407DC 26310001 */ addiu $s1, $s1, 1 -/* EED8E0 802407E0 AE020008 */ sw $v0, 8($s0) -/* EED8E4 802407E4 E614002C */ swc1 $f20, 0x2c($s0) -/* EED8E8 802407E8 E6140020 */ swc1 $f20, 0x20($s0) -/* EED8EC 802407EC E6140014 */ swc1 $f20, 0x14($s0) -/* EED8F0 802407F0 E6140050 */ swc1 $f20, 0x50($s0) -/* EED8F4 802407F4 E6140044 */ swc1 $f20, 0x44($s0) -/* EED8F8 802407F8 E6140038 */ swc1 $f20, 0x38($s0) -/* EED8FC 802407FC 2A220003 */ slti $v0, $s1, 3 -/* EED900 80240800 1440FFEC */ bnez $v0, .L802407B4 -/* EED904 80240804 26100004 */ addiu $s0, $s0, 4 -/* EED908 80240808 0000882D */ daddu $s1, $zero, $zero -/* EED90C 8024080C 0240802D */ daddu $s0, $s2, $zero -/* EED910 80240810 3C148024 */ lui $s4, %hi(D_802437B8_EF08B8) -/* EED914 80240814 269437B8 */ addiu $s4, $s4, %lo(D_802437B8_EF08B8) -/* EED918 80240818 3C014248 */ lui $at, 0x4248 -/* EED91C 8024081C 4481A000 */ mtc1 $at, $f20 -/* EED920 80240820 24130044 */ addiu $s3, $zero, 0x44 -/* EED924 80240824 AE400000 */ sw $zero, ($s2) -/* EED928 80240828 AE400004 */ sw $zero, 4($s2) -/* EED92C 8024082C AE400060 */ sw $zero, 0x60($s2) -/* EED930 80240830 AE400064 */ sw $zero, 0x64($s2) -.L80240834: -/* EED934 80240834 27A40020 */ addiu $a0, $sp, 0x20 -/* EED938 80240838 4406A000 */ mfc1 $a2, $f20 -/* EED93C 8024083C 8E870000 */ lw $a3, ($s4) -/* EED940 80240840 02532821 */ addu $a1, $s2, $s3 -/* EED944 80240844 0C00ACA3 */ jal dead_add_vec2D_polar -/* EED948 80240848 AFA00020 */ sw $zero, 0x20($sp) -/* EED94C 8024084C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* EED950 80240850 C7A40020 */ lwc1 $f4, 0x20($sp) -/* EED954 80240854 46041082 */ mul.s $f2, $f2, $f4 -/* EED958 80240858 00000000 */ nop -/* EED95C 8024085C C7A00018 */ lwc1 $f0, 0x18($sp) -/* EED960 80240860 46040002 */ mul.s $f0, $f0, $f4 -/* EED964 80240864 00000000 */ nop -/* EED968 80240868 E6020038 */ swc1 $f2, 0x38($s0) -/* EED96C 8024086C E6000050 */ swc1 $f0, 0x50($s0) -/* EED970 80240870 8E42005C */ lw $v0, 0x5c($s2) -/* EED974 80240874 C6000038 */ lwc1 $f0, 0x38($s0) -/* EED978 80240878 C4420048 */ lwc1 $f2, 0x48($v0) -/* EED97C 8024087C 46001080 */ add.s $f2, $f2, $f0 -/* EED980 80240880 C6A00038 */ lwc1 $f0, 0x38($s5) -/* EED984 80240884 46020001 */ sub.s $f0, $f0, $f2 -/* EED988 80240888 E6000038 */ swc1 $f0, 0x38($s0) -/* EED98C 8024088C 8E42005C */ lw $v0, 0x5c($s2) -/* EED990 80240890 C6000044 */ lwc1 $f0, 0x44($s0) -/* EED994 80240894 C442004C */ lwc1 $f2, 0x4c($v0) -/* EED998 80240898 46001080 */ add.s $f2, $f2, $f0 -/* EED99C 8024089C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* EED9A0 802408A0 46020001 */ sub.s $f0, $f0, $f2 -/* EED9A4 802408A4 E6000044 */ swc1 $f0, 0x44($s0) -/* EED9A8 802408A8 8E42005C */ lw $v0, 0x5c($s2) -/* EED9AC 802408AC C6000050 */ lwc1 $f0, 0x50($s0) -/* EED9B0 802408B0 C4420050 */ lwc1 $f2, 0x50($v0) -/* EED9B4 802408B4 26940004 */ addiu $s4, $s4, 4 -/* EED9B8 802408B8 46001080 */ add.s $f2, $f2, $f0 -/* EED9BC 802408BC C6A00040 */ lwc1 $f0, 0x40($s5) -/* EED9C0 802408C0 26730004 */ addiu $s3, $s3, 4 -/* EED9C4 802408C4 46020001 */ sub.s $f0, $f0, $f2 -/* EED9C8 802408C8 26310001 */ addiu $s1, $s1, 1 -/* EED9CC 802408CC 2A220003 */ slti $v0, $s1, 3 -/* EED9D0 802408D0 E6000050 */ swc1 $f0, 0x50($s0) -/* EED9D4 802408D4 1440FFD7 */ bnez $v0, .L80240834 -/* EED9D8 802408D8 26100004 */ addiu $s0, $s0, 4 -.L802408DC: -/* EED9DC 802408DC 8ED20060 */ lw $s2, 0x60($s6) -/* EED9E0 802408E0 8E430000 */ lw $v1, ($s2) -/* EED9E4 802408E4 24020001 */ addiu $v0, $zero, 1 -/* EED9E8 802408E8 10620038 */ beq $v1, $v0, .L802409CC -/* EED9EC 802408EC 28620002 */ slti $v0, $v1, 2 -/* EED9F0 802408F0 50400005 */ beql $v0, $zero, .L80240908 -/* EED9F4 802408F4 24020002 */ addiu $v0, $zero, 2 -/* EED9F8 802408F8 10600007 */ beqz $v1, .L80240918 -/* EED9FC 802408FC 24040005 */ addiu $a0, $zero, 5 -/* EEDA00 80240900 080902AC */ j .L80240AB0 -/* EEDA04 80240904 00000000 */ nop -.L80240908: -/* EEDA08 80240908 10620058 */ beq $v1, $v0, .L80240A6C -/* EEDA0C 8024090C 00000000 */ nop -/* EEDA10 80240910 080902AC */ j .L80240AB0 -/* EEDA14 80240914 00000000 */ nop -.L80240918: -/* EEDA18 80240918 0000882D */ daddu $s1, $zero, $zero -/* EEDA1C 8024091C 3C148024 */ lui $s4, %hi(D_802437B8_EF08B8) -/* EEDA20 80240920 269437B8 */ addiu $s4, $s4, %lo(D_802437B8_EF08B8) -/* EEDA24 80240924 24130020 */ addiu $s3, $zero, 0x20 -/* EEDA28 80240928 3C064248 */ lui $a2, 0x4248 -/* EEDA2C 8024092C 44800000 */ mtc1 $zero, $f0 -/* EEDA30 80240930 24020014 */ addiu $v0, $zero, 0x14 -/* EEDA34 80240934 AFA20010 */ sw $v0, 0x10($sp) -/* EEDA38 80240938 44050000 */ mfc1 $a1, $f0 -/* EEDA3C 8024093C 8E470060 */ lw $a3, 0x60($s2) -/* EEDA40 80240940 4485B000 */ mtc1 $a1, $f22 -/* EEDA44 80240944 0C00ADA9 */ jal dead_update_lerp -/* EEDA48 80240948 0240802D */ daddu $s0, $s2, $zero -/* EEDA4C 8024094C 46000506 */ mov.s $f20, $f0 -.L80240950: -/* EEDA50 80240950 4406A000 */ mfc1 $a2, $f20 -/* EEDA54 80240954 27A40020 */ addiu $a0, $sp, 0x20 -/* EEDA58 80240958 E6160020 */ swc1 $f22, 0x20($s0) -/* EEDA5C 8024095C 8E870000 */ lw $a3, ($s4) -/* EEDA60 80240960 02532821 */ addu $a1, $s2, $s3 -/* EEDA64 80240964 0C00ACA3 */ jal dead_add_vec2D_polar -/* EEDA68 80240968 E7B60020 */ swc1 $f22, 0x20($sp) -/* EEDA6C 8024096C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* EEDA70 80240970 C7A00020 */ lwc1 $f0, 0x20($sp) -/* EEDA74 80240974 46002102 */ mul.s $f4, $f4, $f0 -/* EEDA78 80240978 00000000 */ nop -/* EEDA7C 8024097C C7A20018 */ lwc1 $f2, 0x18($sp) -/* EEDA80 80240980 26940004 */ addiu $s4, $s4, 4 -/* EEDA84 80240984 46001082 */ mul.s $f2, $f2, $f0 -/* EEDA88 80240988 00000000 */ nop -/* EEDA8C 8024098C 26730004 */ addiu $s3, $s3, 4 -/* EEDA90 80240990 26310001 */ addiu $s1, $s1, 1 -/* EEDA94 80240994 2A220003 */ slti $v0, $s1, 3 -/* EEDA98 80240998 E6040014 */ swc1 $f4, 0x14($s0) -/* EEDA9C 8024099C E602002C */ swc1 $f2, 0x2c($s0) -/* EEDAA0 802409A0 1440FFEB */ bnez $v0, .L80240950 -/* EEDAA4 802409A4 26100004 */ addiu $s0, $s0, 4 -/* EEDAA8 802409A8 8E420060 */ lw $v0, 0x60($s2) -/* EEDAAC 802409AC 24420001 */ addiu $v0, $v0, 1 -/* EEDAB0 802409B0 AE420060 */ sw $v0, 0x60($s2) -/* EEDAB4 802409B4 28420015 */ slti $v0, $v0, 0x15 -/* EEDAB8 802409B8 1440003D */ bnez $v0, .L80240AB0 -/* EEDABC 802409BC 24020001 */ addiu $v0, $zero, 1 -/* EEDAC0 802409C0 AE420000 */ sw $v0, ($s2) -/* EEDAC4 802409C4 080902AC */ j .L80240AB0 -/* EEDAC8 802409C8 AE400060 */ sw $zero, 0x60($s2) -.L802409CC: -/* EEDACC 802409CC 0000882D */ daddu $s1, $zero, $zero -/* EEDAD0 802409D0 3C148024 */ lui $s4, %hi(D_802437B8_EF08B8) -/* EEDAD4 802409D4 269437B8 */ addiu $s4, $s4, %lo(D_802437B8_EF08B8) -/* EEDAD8 802409D8 24130020 */ addiu $s3, $zero, 0x20 -/* EEDADC 802409DC 0240802D */ daddu $s0, $s2, $zero -/* EEDAE0 802409E0 3C014248 */ lui $at, 0x4248 -/* EEDAE4 802409E4 4481A000 */ mtc1 $at, $f20 -/* EEDAE8 802409E8 4480B000 */ mtc1 $zero, $f22 -.L802409EC: -/* EEDAEC 802409EC 4406A000 */ mfc1 $a2, $f20 -/* EEDAF0 802409F0 27A40020 */ addiu $a0, $sp, 0x20 -/* EEDAF4 802409F4 E6160020 */ swc1 $f22, 0x20($s0) -/* EEDAF8 802409F8 8E870000 */ lw $a3, ($s4) -/* EEDAFC 802409FC 02532821 */ addu $a1, $s2, $s3 -/* EEDB00 80240A00 0C00ACA3 */ jal dead_add_vec2D_polar -/* EEDB04 80240A04 E7B60020 */ swc1 $f22, 0x20($sp) -/* EEDB08 80240A08 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* EEDB0C 80240A0C C7A00020 */ lwc1 $f0, 0x20($sp) -/* EEDB10 80240A10 46002102 */ mul.s $f4, $f4, $f0 -/* EEDB14 80240A14 00000000 */ nop -/* EEDB18 80240A18 C7A20018 */ lwc1 $f2, 0x18($sp) -/* EEDB1C 80240A1C 26940004 */ addiu $s4, $s4, 4 -/* EEDB20 80240A20 46001082 */ mul.s $f2, $f2, $f0 -/* EEDB24 80240A24 00000000 */ nop -/* EEDB28 80240A28 26730004 */ addiu $s3, $s3, 4 -/* EEDB2C 80240A2C 26310001 */ addiu $s1, $s1, 1 -/* EEDB30 80240A30 2A220003 */ slti $v0, $s1, 3 -/* EEDB34 80240A34 E6040014 */ swc1 $f4, 0x14($s0) -/* EEDB38 80240A38 E602002C */ swc1 $f2, 0x2c($s0) -/* EEDB3C 80240A3C 1440FFEB */ bnez $v0, .L802409EC -/* EEDB40 80240A40 26100004 */ addiu $s0, $s0, 4 -/* EEDB44 80240A44 8E420060 */ lw $v0, 0x60($s2) -/* EEDB48 80240A48 24420001 */ addiu $v0, $v0, 1 -/* EEDB4C 80240A4C AE420060 */ sw $v0, 0x60($s2) -/* EEDB50 80240A50 28420010 */ slti $v0, $v0, 0x10 -/* EEDB54 80240A54 14400016 */ bnez $v0, .L80240AB0 -/* EEDB58 80240A58 2402000F */ addiu $v0, $zero, 0xf -/* EEDB5C 80240A5C AE420060 */ sw $v0, 0x60($s2) -/* EEDB60 80240A60 24020002 */ addiu $v0, $zero, 2 -/* EEDB64 80240A64 080902AC */ j .L80240AB0 -/* EEDB68 80240A68 AE420000 */ sw $v0, ($s2) -.L80240A6C: -/* EEDB6C 80240A6C 8E420060 */ lw $v0, 0x60($s2) -/* EEDB70 80240A70 24420001 */ addiu $v0, $v0, 1 -/* EEDB74 80240A74 AE420060 */ sw $v0, 0x60($s2) -/* EEDB78 80240A78 2842001F */ slti $v0, $v0, 0x1f -/* EEDB7C 80240A7C 1440000C */ bnez $v0, .L80240AB0 -/* EEDB80 80240A80 0000882D */ daddu $s1, $zero, $zero -/* EEDB84 80240A84 0240282D */ daddu $a1, $s2, $zero -.L80240A88: -/* EEDB88 80240A88 8CA20008 */ lw $v0, 8($a1) -/* EEDB8C 80240A8C 8C430000 */ lw $v1, ($v0) -/* EEDB90 80240A90 26310001 */ addiu $s1, $s1, 1 -/* EEDB94 80240A94 34630010 */ ori $v1, $v1, 0x10 -/* EEDB98 80240A98 AC430000 */ sw $v1, ($v0) -/* EEDB9C 80240A9C 2A220003 */ slti $v0, $s1, 3 -/* EEDBA0 80240AA0 1440FFF9 */ bnez $v0, .L80240A88 -/* EEDBA4 80240AA4 24A50004 */ addiu $a1, $a1, 4 -/* EEDBA8 80240AA8 080902F9 */ j .L80240BE4 -/* EEDBAC 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* EEDBB0 80240AB0 8E430004 */ lw $v1, 4($s2) -/* EEDBB4 80240AB4 10600005 */ beqz $v1, .L80240ACC -/* EEDBB8 80240AB8 24020001 */ addiu $v0, $zero, 1 -/* EEDBBC 80240ABC 1062000B */ beq $v1, $v0, .L80240AEC -/* EEDBC0 80240AC0 0000882D */ daddu $s1, $zero, $zero -/* EEDBC4 80240AC4 080902E8 */ j .L80240BA0 -/* EEDBC8 80240AC8 0240282D */ daddu $a1, $s2, $zero -.L80240ACC: -/* EEDBCC 80240ACC 8E420064 */ lw $v0, 0x64($s2) -/* EEDBD0 80240AD0 24420001 */ addiu $v0, $v0, 1 -/* EEDBD4 80240AD4 AE420064 */ sw $v0, 0x64($s2) -/* EEDBD8 80240AD8 28420010 */ slti $v0, $v0, 0x10 -/* EEDBDC 80240ADC 1440002F */ bnez $v0, .L80240B9C -/* EEDBE0 80240AE0 0000882D */ daddu $s1, $zero, $zero -/* EEDBE4 80240AE4 080902E4 */ j .L80240B90 -/* EEDBE8 80240AE8 24020001 */ addiu $v0, $zero, 1 -.L80240AEC: -/* EEDBEC 80240AEC 4480A000 */ mtc1 $zero, $f20 -/* EEDBF0 80240AF0 24130014 */ addiu $s3, $zero, 0x14 -/* EEDBF4 80240AF4 0240802D */ daddu $s0, $s2, $zero -.L80240AF8: -/* EEDBF8 80240AF8 4405A000 */ mfc1 $a1, $f20 -/* EEDBFC 80240AFC AFB30010 */ sw $s3, 0x10($sp) -/* EEDC00 80240B00 8E060038 */ lw $a2, 0x38($s0) -/* EEDC04 80240B04 8E470064 */ lw $a3, 0x64($s2) -/* EEDC08 80240B08 0C00ADA9 */ jal dead_update_lerp -/* EEDC0C 80240B0C 24040001 */ addiu $a0, $zero, 1 -/* EEDC10 80240B10 C6020014 */ lwc1 $f2, 0x14($s0) -/* EEDC14 80240B14 46001080 */ add.s $f2, $f2, $f0 -/* EEDC18 80240B18 4405A000 */ mfc1 $a1, $f20 -/* EEDC1C 80240B1C E6020014 */ swc1 $f2, 0x14($s0) -/* EEDC20 80240B20 AFB30010 */ sw $s3, 0x10($sp) -/* EEDC24 80240B24 8E060044 */ lw $a2, 0x44($s0) -/* EEDC28 80240B28 8E470064 */ lw $a3, 0x64($s2) -/* EEDC2C 80240B2C 0C00ADA9 */ jal dead_update_lerp -/* EEDC30 80240B30 24040001 */ addiu $a0, $zero, 1 -/* EEDC34 80240B34 C6020020 */ lwc1 $f2, 0x20($s0) -/* EEDC38 80240B38 46001080 */ add.s $f2, $f2, $f0 -/* EEDC3C 80240B3C 4405A000 */ mfc1 $a1, $f20 -/* EEDC40 80240B40 E6020020 */ swc1 $f2, 0x20($s0) -/* EEDC44 80240B44 AFB30010 */ sw $s3, 0x10($sp) -/* EEDC48 80240B48 8E060050 */ lw $a2, 0x50($s0) -/* EEDC4C 80240B4C 8E470064 */ lw $a3, 0x64($s2) -/* EEDC50 80240B50 0C00ADA9 */ jal dead_update_lerp -/* EEDC54 80240B54 24040001 */ addiu $a0, $zero, 1 -/* EEDC58 80240B58 C602002C */ lwc1 $f2, 0x2c($s0) -/* EEDC5C 80240B5C 46001080 */ add.s $f2, $f2, $f0 -/* EEDC60 80240B60 26310001 */ addiu $s1, $s1, 1 -/* EEDC64 80240B64 2A220003 */ slti $v0, $s1, 3 -/* EEDC68 80240B68 E602002C */ swc1 $f2, 0x2c($s0) -/* EEDC6C 80240B6C 1440FFE2 */ bnez $v0, .L80240AF8 -/* EEDC70 80240B70 26100004 */ addiu $s0, $s0, 4 -/* EEDC74 80240B74 8E420064 */ lw $v0, 0x64($s2) -/* EEDC78 80240B78 24420001 */ addiu $v0, $v0, 1 -/* EEDC7C 80240B7C AE420064 */ sw $v0, 0x64($s2) -/* EEDC80 80240B80 28420015 */ slti $v0, $v0, 0x15 -/* EEDC84 80240B84 14400005 */ bnez $v0, .L80240B9C -/* EEDC88 80240B88 0000882D */ daddu $s1, $zero, $zero -/* EEDC8C 80240B8C 24020002 */ addiu $v0, $zero, 2 -.L80240B90: -/* EEDC90 80240B90 AE420004 */ sw $v0, 4($s2) -/* EEDC94 80240B94 AE400064 */ sw $zero, 0x64($s2) -/* EEDC98 80240B98 0000882D */ daddu $s1, $zero, $zero -.L80240B9C: -/* EEDC9C 80240B9C 0240282D */ daddu $a1, $s2, $zero -.L80240BA0: -/* EEDCA0 80240BA0 8CA20008 */ lw $v0, 8($a1) -/* EEDCA4 80240BA4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* EEDCA8 80240BA8 8C42000C */ lw $v0, 0xc($v0) -/* EEDCAC 80240BAC E4400010 */ swc1 $f0, 0x10($v0) -/* EEDCB0 80240BB0 8CA20008 */ lw $v0, 8($a1) -/* EEDCB4 80240BB4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* EEDCB8 80240BB8 8C42000C */ lw $v0, 0xc($v0) -/* EEDCBC 80240BBC 26310001 */ addiu $s1, $s1, 1 -/* EEDCC0 80240BC0 E4400014 */ swc1 $f0, 0x14($v0) -/* EEDCC4 80240BC4 8CA20008 */ lw $v0, 8($a1) -/* EEDCC8 80240BC8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* EEDCCC 80240BCC 8C42000C */ lw $v0, 0xc($v0) -/* EEDCD0 80240BD0 E4400018 */ swc1 $f0, 0x18($v0) -/* EEDCD4 80240BD4 2A220003 */ slti $v0, $s1, 3 -/* EEDCD8 80240BD8 1440FFF1 */ bnez $v0, .L80240BA0 -/* EEDCDC 80240BDC 24A50004 */ addiu $a1, $a1, 4 -/* EEDCE0 80240BE0 0000102D */ daddu $v0, $zero, $zero -.L80240BE4: -/* EEDCE4 80240BE4 8FBF0044 */ lw $ra, 0x44($sp) -/* EEDCE8 80240BE8 8FB60040 */ lw $s6, 0x40($sp) -/* EEDCEC 80240BEC 8FB5003C */ lw $s5, 0x3c($sp) -/* EEDCF0 80240BF0 8FB40038 */ lw $s4, 0x38($sp) -/* EEDCF4 80240BF4 8FB30034 */ lw $s3, 0x34($sp) -/* EEDCF8 80240BF8 8FB20030 */ lw $s2, 0x30($sp) -/* EEDCFC 80240BFC 8FB1002C */ lw $s1, 0x2c($sp) -/* EEDD00 80240C00 8FB00028 */ lw $s0, 0x28($sp) -/* EEDD04 80240C04 D7B80058 */ ldc1 $f24, 0x58($sp) -/* EEDD08 80240C08 D7B60050 */ ldc1 $f22, 0x50($sp) -/* EEDD0C 80240C0C D7B40048 */ ldc1 $f20, 0x48($sp) -/* EEDD10 80240C10 03E00008 */ jr $ra -/* EEDD14 80240C14 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s index de645ed8e1..082cfb556c 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s @@ -121,7 +121,7 @@ glabel func_8024215C_EEF25C .L802422F4_EEF3F4: /* EEF3F4 802422F4 02A0202D */ daddu $a0, $s5, $zero /* EEF3F8 802422F8 0200282D */ daddu $a1, $s0, $zero -/* EEF3FC 802422FC 0C0906A9 */ jal func_80241AA4_EEEBA4 +/* EEF3FC 802422FC 0C0906A9 */ jal EEDF50_SixFloatsFunc /* EEF400 80242300 0260302D */ daddu $a2, $s3, $zero /* EEF404 80242304 080908D4 */ j .L80242350 /* EEF408 80242308 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s index 82a237cf89..cc910bb3a4 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s @@ -122,7 +122,7 @@ glabel func_80242780_EEF880 .L8024291C_EEFA1C: /* EEFA1C 8024291C 0280202D */ daddu $a0, $s4, $zero /* EEFA20 80242920 0200282D */ daddu $a1, $s0, $zero -/* EEFA24 80242924 0C0906A9 */ jal func_80241AA4_EEEBA4 +/* 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 diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s index efd5e30b09..6ed655e690 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s +++ b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s @@ -121,7 +121,7 @@ glabel func_8024137C_EF398C .L80241514_EF3B24: /* EF3B24 80241514 02A0202D */ daddu $a0, $s5, $zero /* EF3B28 80241518 0200282D */ daddu $a1, $s0, $zero -/* EF3B2C 8024151C 0C090331 */ jal func_80240CC4_EF32D4 +/* EF3B2C 8024151C 0C090331 */ jal EF2680_SixFloatsFunc /* EF3B30 80241520 0260302D */ daddu $a2, $s3, $zero /* EF3B34 80241524 0809055C */ j .L80241570 /* EF3B38 80241528 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s deleted file mode 100644 index 56156ef241..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s +++ /dev/null @@ -1,606 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata -dlabel D_80228400_6CBF90 -.double 47.0 - -dlabel D_80228408_6CBF98 -.double 1.12 - -dlabel D_80228410_6CBFA0 -.double 0.53 - -dlabel D_80228418_6CBFA8 -.double 47.0 - -dlabel D_80228420_6CBFB0 -.double 0.8 - -dlabel D_80228428_6CBFB8 -.double 0.53 - -dlabel D_80228430_6CBFC0 -.double 0.8 - -dlabel D_80228438_6CBFC8 -.double 16.5 - -dlabel D_80228440_6CBFD0 -.double 33.0 - -.section .text - -glabel func_802180D0_6BBC60 -/* 6BBC60 802180D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 6BBC64 802180D4 AFB40020 */ sw $s4, 0x20($sp) -/* 6BBC68 802180D8 0080A02D */ daddu $s4, $a0, $zero -/* 6BBC6C 802180DC AFB00010 */ sw $s0, 0x10($sp) -/* 6BBC70 802180E0 AFBF0024 */ sw $ra, 0x24($sp) -/* 6BBC74 802180E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 6BBC78 802180E8 AFB20018 */ sw $s2, 0x18($sp) -/* 6BBC7C 802180EC AFB10014 */ sw $s1, 0x14($sp) -/* 6BBC80 802180F0 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 6BBC84 802180F4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 6BBC88 802180F8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 6BBC8C 802180FC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 6BBC90 80218100 8E840148 */ lw $a0, 0x148($s4) -/* 6BBC94 80218104 8E92000C */ lw $s2, 0xc($s4) -/* 6BBC98 80218108 0C09A75B */ jal get_actor -/* 6BBC9C 8021810C 00A0802D */ daddu $s0, $a1, $zero -/* 6BBCA0 80218110 0040982D */ daddu $s3, $v0, $zero -/* 6BBCA4 80218114 12000011 */ beqz $s0, .L8021815C -/* 6BBCA8 80218118 2671000C */ addiu $s1, $s3, 0xc -/* 6BBCAC 8021811C 8E450000 */ lw $a1, ($s2) -/* 6BBCB0 80218120 26520004 */ addiu $s2, $s2, 4 -/* 6BBCB4 80218124 0C0B1EAF */ jal evt_get_variable -/* 6BBCB8 80218128 0280202D */ daddu $a0, $s4, $zero -/* 6BBCBC 8021812C A6620070 */ sh $v0, 0x70($s3) -/* 6BBCC0 80218130 8E450000 */ lw $a1, ($s2) -/* 6BBCC4 80218134 0C0B1EAF */ jal evt_get_variable -/* 6BBCC8 80218138 0280202D */ daddu $a0, $s4, $zero -/* 6BBCCC 8021813C A6620072 */ sh $v0, 0x72($s3) -/* 6BBCD0 80218140 AE800074 */ sw $zero, 0x74($s4) -/* 6BBCD4 80218144 AE800070 */ sw $zero, 0x70($s4) -/* 6BBCD8 80218148 86630072 */ lh $v1, 0x72($s3) -/* 6BBCDC 8021814C 24020001 */ addiu $v0, $zero, 1 -/* 6BBCE0 80218150 14620002 */ bne $v1, $v0, .L8021815C -/* 6BBCE4 80218154 24020002 */ addiu $v0, $zero, 2 -/* 6BBCE8 80218158 AE820070 */ sw $v0, 0x70($s4) -.L8021815C: -/* 6BBCEC 8021815C 8E820070 */ lw $v0, 0x70($s4) -/* 6BBCF0 80218160 144000F7 */ bnez $v0, .L80218540 -/* 6BBCF4 80218164 00000000 */ nop -/* 6BBCF8 80218168 C6600144 */ lwc1 $f0, 0x144($s3) -/* 6BBCFC 8021816C C638000C */ lwc1 $f24, 0xc($s1) -/* 6BBD00 80218170 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 6BBD04 80218174 E6200000 */ swc1 $f0, ($s1) -/* 6BBD08 80218178 C6600148 */ lwc1 $f0, 0x148($s3) -/* 6BBD0C 8021817C 4406C000 */ mfc1 $a2, $f24 -/* 6BBD10 80218180 4407D000 */ mfc1 $a3, $f26 -/* 6BBD14 80218184 C6360000 */ lwc1 $f22, ($s1) -/* 6BBD18 80218188 E6200004 */ swc1 $f0, 4($s1) -/* 6BBD1C 8021818C C674014C */ lwc1 $f20, 0x14c($s3) -/* 6BBD20 80218190 4600B306 */ mov.s $f12, $f22 -/* 6BBD24 80218194 4600A386 */ mov.s $f14, $f20 -/* 6BBD28 80218198 0C00A720 */ jal atan2 -/* 6BBD2C 8021819C E6340008 */ swc1 $f20, 8($s1) -/* 6BBD30 802181A0 4600B306 */ mov.s $f12, $f22 -/* 6BBD34 802181A4 4406C000 */ mfc1 $a2, $f24 -/* 6BBD38 802181A8 4407D000 */ mfc1 $a3, $f26 -/* 6BBD3C 802181AC 4600A386 */ mov.s $f14, $f20 -/* 6BBD40 802181B0 0C00A7B5 */ jal dist2D -/* 6BBD44 802181B4 E6200048 */ swc1 $f0, 0x48($s1) -/* 6BBD48 802181B8 86220064 */ lh $v0, 0x64($s1) -/* 6BBD4C 802181BC 46000106 */ mov.s $f4, $f0 -/* 6BBD50 802181C0 14400012 */ bnez $v0, .L8021820C -/* 6BBD54 802181C4 E624004C */ swc1 $f4, 0x4c($s1) -/* 6BBD58 802181C8 C6200040 */ lwc1 $f0, 0x40($s1) -/* 6BBD5C 802181CC C6220040 */ lwc1 $f2, 0x40($s1) -/* 6BBD60 802181D0 46002003 */ div.s $f0, $f4, $f0 -/* 6BBD64 802181D4 4600028D */ trunc.w.s $f10, $f0 -/* 6BBD68 802181D8 44035000 */ mfc1 $v1, $f10 -/* 6BBD6C 802181DC 00000000 */ nop -/* 6BBD70 802181E0 00031400 */ sll $v0, $v1, 0x10 -/* 6BBD74 802181E4 00021403 */ sra $v0, $v0, 0x10 -/* 6BBD78 802181E8 44820000 */ mtc1 $v0, $f0 -/* 6BBD7C 802181EC 00000000 */ nop -/* 6BBD80 802181F0 46800020 */ cvt.s.w $f0, $f0 -/* 6BBD84 802181F4 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBD88 802181F8 00000000 */ nop -/* 6BBD8C 802181FC 46002086 */ mov.s $f2, $f4 -/* 6BBD90 80218200 A6230064 */ sh $v1, 0x64($s1) -/* 6BBD94 80218204 08086090 */ j .L80218240 -/* 6BBD98 80218208 46001201 */ sub.s $f8, $f2, $f0 -.L8021820C: -/* 6BBD9C 8021820C 44821000 */ mtc1 $v0, $f2 -/* 6BBDA0 80218210 00000000 */ nop -/* 6BBDA4 80218214 468010A0 */ cvt.s.w $f2, $f2 -/* 6BBDA8 80218218 86220064 */ lh $v0, 0x64($s1) -/* 6BBDAC 8021821C 46022083 */ div.s $f2, $f4, $f2 -/* 6BBDB0 80218220 44820000 */ mtc1 $v0, $f0 -/* 6BBDB4 80218224 00000000 */ nop -/* 6BBDB8 80218228 46800020 */ cvt.s.w $f0, $f0 -/* 6BBDBC 8021822C 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBDC0 80218230 00000000 */ nop -/* 6BBDC4 80218234 C624004C */ lwc1 $f4, 0x4c($s1) -/* 6BBDC8 80218238 E6220040 */ swc1 $f2, 0x40($s1) -/* 6BBDCC 8021823C 46002201 */ sub.s $f8, $f4, $f0 -.L80218240: -/* 6BBDD0 80218240 86230064 */ lh $v1, 0x64($s1) -/* 6BBDD4 80218244 106001BA */ beqz $v1, .L80218930 -/* 6BBDD8 80218248 24020002 */ addiu $v0, $zero, 2 -/* 6BBDDC 8021824C 86220064 */ lh $v0, 0x64($s1) -/* 6BBDE0 80218250 C622000C */ lwc1 $f2, 0xc($s1) -/* 6BBDE4 80218254 3C014049 */ lui $at, 0x4049 -/* 6BBDE8 80218258 34210FD0 */ ori $at, $at, 0xfd0 -/* 6BBDEC 8021825C 44810000 */ mtc1 $at, $f0 -/* 6BBDF0 80218260 C6240000 */ lwc1 $f4, ($s1) -/* 6BBDF4 80218264 44823000 */ mtc1 $v0, $f6 -/* 6BBDF8 80218268 00000000 */ nop -/* 6BBDFC 8021826C 468031A0 */ cvt.s.w $f6, $f6 -/* 6BBE00 80218270 46060003 */ div.s $f0, $f0, $f6 -/* 6BBE04 80218274 46041081 */ sub.s $f2, $f2, $f4 -/* 6BBE08 80218278 E620003C */ swc1 $f0, 0x3c($s1) -/* 6BBE0C 8021827C 44830000 */ mtc1 $v1, $f0 -/* 6BBE10 80218280 00000000 */ nop -/* 6BBE14 80218284 46800020 */ cvt.s.w $f0, $f0 -/* 6BBE18 80218288 46001083 */ div.s $f2, $f2, $f0 -/* 6BBE1C 8021828C C6200010 */ lwc1 $f0, 0x10($s1) -/* 6BBE20 80218290 E6220030 */ swc1 $f2, 0x30($s1) -/* 6BBE24 80218294 C6220004 */ lwc1 $f2, 4($s1) -/* 6BBE28 80218298 AE200044 */ sw $zero, 0x44($s1) -/* 6BBE2C 8021829C 46020001 */ sub.s $f0, $f0, $f2 -/* 6BBE30 802182A0 C6240014 */ lwc1 $f4, 0x14($s1) -/* 6BBE34 802182A4 46003086 */ mov.s $f2, $f6 -/* 6BBE38 802182A8 46020003 */ div.s $f0, $f0, $f2 -/* 6BBE3C 802182AC E6200034 */ swc1 $f0, 0x34($s1) -/* 6BBE40 802182B0 46003006 */ mov.s $f0, $f6 -/* 6BBE44 802182B4 46004003 */ div.s $f0, $f8, $f0 -/* 6BBE48 802182B8 C6220008 */ lwc1 $f2, 8($s1) -/* 6BBE4C 802182BC 86220066 */ lh $v0, 0x66($s1) -/* 6BBE50 802182C0 46022101 */ sub.s $f4, $f4, $f2 -/* 6BBE54 802182C4 C6220040 */ lwc1 $f2, 0x40($s1) -/* 6BBE58 802182C8 28420003 */ slti $v0, $v0, 3 -/* 6BBE5C 802182CC 46001080 */ add.s $f2, $f2, $f0 -/* 6BBE60 802182D0 46062103 */ div.s $f4, $f4, $f6 -/* 6BBE64 802182D4 E6240038 */ swc1 $f4, 0x38($s1) -/* 6BBE68 802182D8 10400045 */ beqz $v0, .L802183F0 -/* 6BBE6C 802182DC E6220040 */ swc1 $f2, 0x40($s1) -/* 6BBE70 802182E0 86220064 */ lh $v0, 0x64($s1) -/* 6BBE74 802182E4 24030168 */ addiu $v1, $zero, 0x168 -/* 6BBE78 802182E8 14400002 */ bnez $v0, .L802182F4 -/* 6BBE7C 802182EC 0062001A */ div $zero, $v1, $v0 -/* 6BBE80 802182F0 0007000D */ break 7 -.L802182F4: -/* 6BBE84 802182F4 2401FFFF */ addiu $at, $zero, -1 -/* 6BBE88 802182F8 14410004 */ bne $v0, $at, .L8021830C -/* 6BBE8C 802182FC 3C018000 */ lui $at, 0x8000 -/* 6BBE90 80218300 14610002 */ bne $v1, $at, .L8021830C -/* 6BBE94 80218304 00000000 */ nop -/* 6BBE98 80218308 0006000D */ break 6 -.L8021830C: -/* 6BBE9C 8021830C 00001812 */ mflo $v1 -/* 6BBEA0 80218310 C628004C */ lwc1 $f8, 0x4c($s1) -/* 6BBEA4 80218314 3C014034 */ lui $at, 0x4034 -/* 6BBEA8 80218318 44811800 */ mtc1 $at, $f3 -/* 6BBEAC 8021831C 44801000 */ mtc1 $zero, $f2 -/* 6BBEB0 80218320 46004021 */ cvt.d.s $f0, $f8 -/* 6BBEB4 80218324 46220001 */ sub.d $f0, $f0, $f2 -/* 6BBEB8 80218328 3C014018 */ lui $at, 0x4018 -/* 6BBEBC 8021832C 44811800 */ mtc1 $at, $f3 -/* 6BBEC0 80218330 44801000 */ mtc1 $zero, $f2 -/* 6BBEC4 80218334 46200220 */ cvt.s.d $f8, $f0 -/* 6BBEC8 80218338 46004021 */ cvt.d.s $f0, $f8 -/* 6BBECC 8021833C 46220003 */ div.d $f0, $f0, $f2 -/* 6BBED0 80218340 46200220 */ cvt.s.d $f8, $f0 -/* 6BBED4 80218344 3C018023 */ lui $at, %hi(D_80228400_6CBF90) -/* 6BBED8 80218348 D4228400 */ ldc1 $f2, %lo(D_80228400_6CBF90)($at) -/* 6BBEDC 8021834C 46004021 */ cvt.d.s $f0, $f8 -/* 6BBEE0 80218350 46220000 */ add.d $f0, $f0, $f2 -/* 6BBEE4 80218354 3C0142B4 */ lui $at, 0x42b4 -/* 6BBEE8 80218358 44811000 */ mtc1 $at, $f2 -/* 6BBEEC 8021835C 46200220 */ cvt.s.d $f8, $f0 -/* 6BBEF0 80218360 44830000 */ mtc1 $v1, $f0 -/* 6BBEF4 80218364 00000000 */ nop -/* 6BBEF8 80218368 46800020 */ cvt.s.w $f0, $f0 -/* 6BBEFC 8021836C 86230066 */ lh $v1, 0x66($s1) -/* 6BBF00 80218370 24020002 */ addiu $v0, $zero, 2 -/* 6BBF04 80218374 E6220024 */ swc1 $f2, 0x24($s1) -/* 6BBF08 80218378 E6280050 */ swc1 $f8, 0x50($s1) -/* 6BBF0C 8021837C 14620008 */ bne $v1, $v0, .L802183A0 -/* 6BBF10 80218380 E6200028 */ swc1 $f0, 0x28($s1) -/* 6BBF14 80218384 3C018023 */ lui $at, %hi(D_80228408_6CBF98) -/* 6BBF18 80218388 D4228408 */ ldc1 $f2, %lo(D_80228408_6CBF98)($at) -/* 6BBF1C 8021838C 46004021 */ cvt.d.s $f0, $f8 -/* 6BBF20 80218390 46220002 */ mul.d $f0, $f0, $f2 -/* 6BBF24 80218394 00000000 */ nop -/* 6BBF28 80218398 46200020 */ cvt.s.d $f0, $f0 -/* 6BBF2C 8021839C E6200050 */ swc1 $f0, 0x50($s1) -.L802183A0: -/* 6BBF30 802183A0 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BBF34 802183A4 3C0140C9 */ lui $at, 0x40c9 -/* 6BBF38 802183A8 34210FD0 */ ori $at, $at, 0xfd0 -/* 6BBF3C 802183AC 44810000 */ mtc1 $at, $f0 -/* 6BBF40 802183B0 C6340044 */ lwc1 $f20, 0x44($s1) -/* 6BBF44 802183B4 C636003C */ lwc1 $f22, 0x3c($s1) -/* 6BBF48 802183B8 AE200018 */ sw $zero, 0x18($s1) -/* 6BBF4C 802183BC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BBF50 802183C0 00000000 */ nop -/* 6BBF54 802183C4 AE20001C */ sw $zero, 0x1c($s1) -/* 6BBF58 802183C8 4600A521 */ cvt.d.s $f20, $f20 -/* 6BBF5C 802183CC 3C0143B4 */ lui $at, 0x43b4 -/* 6BBF60 802183D0 44810000 */ mtc1 $at, $f0 -/* 6BBF64 802183D4 4600B5A1 */ cvt.d.s $f22, $f22 -/* 6BBF68 802183D8 0C00A85B */ jal sin_rad -/* 6BBF6C 802183DC 46006303 */ div.s $f12, $f12, $f0 -/* 6BBF70 802183E0 3C018023 */ lui $at, %hi(D_80228410_6CBFA0) -/* 6BBF74 802183E4 D4228410 */ ldc1 $f2, %lo(D_80228410_6CBFA0)($at) -/* 6BBF78 802183E8 08086140 */ j .L80218500 -/* 6BBF7C 802183EC 46000021 */ cvt.d.s $f0, $f0 -.L802183F0: -/* 6BBF80 802183F0 86220064 */ lh $v0, 0x64($s1) -/* 6BBF84 802183F4 24030168 */ addiu $v1, $zero, 0x168 -/* 6BBF88 802183F8 14400002 */ bnez $v0, .L80218404 -/* 6BBF8C 802183FC 0062001A */ div $zero, $v1, $v0 -/* 6BBF90 80218400 0007000D */ break 7 -.L80218404: -/* 6BBF94 80218404 2401FFFF */ addiu $at, $zero, -1 -/* 6BBF98 80218408 14410004 */ bne $v0, $at, .L8021841C -/* 6BBF9C 8021840C 3C018000 */ lui $at, 0x8000 -/* 6BBFA0 80218410 14610002 */ bne $v1, $at, .L8021841C -/* 6BBFA4 80218414 00000000 */ nop -/* 6BBFA8 80218418 0006000D */ break 6 -.L8021841C: -/* 6BBFAC 8021841C 00001812 */ mflo $v1 -/* 6BBFB0 80218420 C628004C */ lwc1 $f8, 0x4c($s1) -/* 6BBFB4 80218424 3C014034 */ lui $at, 0x4034 -/* 6BBFB8 80218428 44811800 */ mtc1 $at, $f3 -/* 6BBFBC 8021842C 44801000 */ mtc1 $zero, $f2 -/* 6BBFC0 80218430 46004021 */ cvt.d.s $f0, $f8 -/* 6BBFC4 80218434 46220001 */ sub.d $f0, $f0, $f2 -/* 6BBFC8 80218438 3C014018 */ lui $at, 0x4018 -/* 6BBFCC 8021843C 44811800 */ mtc1 $at, $f3 -/* 6BBFD0 80218440 44801000 */ mtc1 $zero, $f2 -/* 6BBFD4 80218444 46200220 */ cvt.s.d $f8, $f0 -/* 6BBFD8 80218448 46004021 */ cvt.d.s $f0, $f8 -/* 6BBFDC 8021844C 46220003 */ div.d $f0, $f0, $f2 -/* 6BBFE0 80218450 46200220 */ cvt.s.d $f8, $f0 -/* 6BBFE4 80218454 3C018023 */ lui $at, %hi(D_80228418_6CBFA8) -/* 6BBFE8 80218458 D4228418 */ ldc1 $f2, %lo(D_80228418_6CBFA8)($at) -/* 6BBFEC 8021845C 46004021 */ cvt.d.s $f0, $f8 -/* 6BBFF0 80218460 46220000 */ add.d $f0, $f0, $f2 -/* 6BBFF4 80218464 3C0142B4 */ lui $at, 0x42b4 -/* 6BBFF8 80218468 44811000 */ mtc1 $at, $f2 -/* 6BBFFC 8021846C 46200220 */ cvt.s.d $f8, $f0 -/* 6BC000 80218470 44830000 */ mtc1 $v1, $f0 -/* 6BC004 80218474 00000000 */ nop -/* 6BC008 80218478 46800020 */ cvt.s.w $f0, $f0 -/* 6BC00C 8021847C 86230066 */ lh $v1, 0x66($s1) -/* 6BC010 80218480 24020004 */ addiu $v0, $zero, 4 -/* 6BC014 80218484 E6220024 */ swc1 $f2, 0x24($s1) -/* 6BC018 80218488 E6280050 */ swc1 $f8, 0x50($s1) -/* 6BC01C 8021848C 14620009 */ bne $v1, $v0, .L802184B4 -/* 6BC020 80218490 E6200028 */ swc1 $f0, 0x28($s1) -/* 6BC024 80218494 3C013FF4 */ lui $at, 0x3ff4 -/* 6BC028 80218498 44811800 */ mtc1 $at, $f3 -/* 6BC02C 8021849C 44801000 */ mtc1 $zero, $f2 -/* 6BC030 802184A0 46004021 */ cvt.d.s $f0, $f8 -/* 6BC034 802184A4 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC038 802184A8 00000000 */ nop -/* 6BC03C 802184AC 46200020 */ cvt.s.d $f0, $f0 -/* 6BC040 802184B0 E6200050 */ swc1 $f0, 0x50($s1) -.L802184B4: -/* 6BC044 802184B4 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BC048 802184B8 3C0140C9 */ lui $at, 0x40c9 -/* 6BC04C 802184BC 34210FD0 */ ori $at, $at, 0xfd0 -/* 6BC050 802184C0 44810000 */ mtc1 $at, $f0 -/* 6BC054 802184C4 C6340044 */ lwc1 $f20, 0x44($s1) -/* 6BC058 802184C8 C636003C */ lwc1 $f22, 0x3c($s1) -/* 6BC05C 802184CC AE200018 */ sw $zero, 0x18($s1) -/* 6BC060 802184D0 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC064 802184D4 00000000 */ nop -/* 6BC068 802184D8 AE20001C */ sw $zero, 0x1c($s1) -/* 6BC06C 802184DC 4600A521 */ cvt.d.s $f20, $f20 -/* 6BC070 802184E0 3C0143B4 */ lui $at, 0x43b4 -/* 6BC074 802184E4 44810000 */ mtc1 $at, $f0 -/* 6BC078 802184E8 4600B5A1 */ cvt.d.s $f22, $f22 -/* 6BC07C 802184EC 0C00A85B */ jal sin_rad -/* 6BC080 802184F0 46006303 */ div.s $f12, $f12, $f0 -/* 6BC084 802184F4 3C018023 */ lui $at, %hi(D_80228420_6CBFB0) -/* 6BC088 802184F8 D4228420 */ ldc1 $f2, %lo(D_80228420_6CBFB0)($at) -/* 6BC08C 802184FC 46000021 */ cvt.d.s $f0, $f0 -.L80218500: -/* 6BC090 80218500 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC094 80218504 00000000 */ nop -/* 6BC098 80218508 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC09C 8021850C 00000000 */ nop -/* 6BC0A0 80218510 46360000 */ add.d $f0, $f0, $f22 -/* 6BC0A4 80218514 4620A500 */ add.d $f20, $f20, $f0 -/* 6BC0A8 80218518 4620A520 */ cvt.s.d $f20, $f20 -/* 6BC0AC 8021851C E6340044 */ swc1 $f20, 0x44($s1) -/* 6BC0B0 80218520 2404FF81 */ addiu $a0, $zero, -0x7f -/* 6BC0B4 80218524 8E260058 */ lw $a2, 0x58($s1) -/* 6BC0B8 80218528 0C098F3F */ jal set_animation -/* 6BC0BC 8021852C 24050001 */ addiu $a1, $zero, 1 -/* 6BC0C0 80218530 0C05272D */ jal sfx_play_sound -/* 6BC0C4 80218534 24042081 */ addiu $a0, $zero, 0x2081 -/* 6BC0C8 80218538 24020001 */ addiu $v0, $zero, 1 -/* 6BC0CC 8021853C AE820070 */ sw $v0, 0x70($s4) -.L80218540: -/* 6BC0D0 80218540 8E830070 */ lw $v1, 0x70($s4) -/* 6BC0D4 80218544 24020002 */ addiu $v0, $zero, 2 -/* 6BC0D8 80218548 10620095 */ beq $v1, $v0, .L802187A0 -/* 6BC0DC 8021854C 24020001 */ addiu $v0, $zero, 1 -/* 6BC0E0 80218550 28620003 */ slti $v0, $v1, 3 -/* 6BC0E4 80218554 10400005 */ beqz $v0, .L8021856C -/* 6BC0E8 80218558 24020001 */ addiu $v0, $zero, 1 -/* 6BC0EC 8021855C 10620008 */ beq $v1, $v0, .L80218580 -/* 6BC0F0 80218560 0000102D */ daddu $v0, $zero, $zero -/* 6BC0F4 80218564 0808624C */ j .L80218930 -/* 6BC0F8 80218568 00000000 */ nop -.L8021856C: -/* 6BC0FC 8021856C 24020003 */ addiu $v0, $zero, 3 -/* 6BC100 80218570 106200BA */ beq $v1, $v0, .L8021885C -/* 6BC104 80218574 0000102D */ daddu $v0, $zero, $zero -/* 6BC108 80218578 0808624C */ j .L80218930 -/* 6BC10C 8021857C 00000000 */ nop -.L80218580: -/* 6BC110 80218580 C6220044 */ lwc1 $f2, 0x44($s1) -/* 6BC114 80218584 3C013FC9 */ lui $at, 0x3fc9 -/* 6BC118 80218588 34210FD0 */ ori $at, $at, 0xfd0 -/* 6BC11C 8021858C 44810000 */ mtc1 $at, $f0 -/* 6BC120 80218590 00000000 */ nop -/* 6BC124 80218594 4602003C */ c.lt.s $f0, $f2 -/* 6BC128 80218598 00000000 */ nop -/* 6BC12C 8021859C 45000004 */ bc1f .L802185B0 -/* 6BC130 802185A0 2404FF81 */ addiu $a0, $zero, -0x7f -/* 6BC134 802185A4 8E26005C */ lw $a2, 0x5c($s1) -/* 6BC138 802185A8 0C098F3F */ jal set_animation -/* 6BC13C 802185AC 24050001 */ addiu $a1, $zero, 1 -.L802185B0: -/* 6BC140 802185B0 C6260000 */ lwc1 $f6, ($s1) -/* 6BC144 802185B4 C6200030 */ lwc1 $f0, 0x30($s1) -/* 6BC148 802185B8 C6240004 */ lwc1 $f4, 4($s1) -/* 6BC14C 802185BC C6760144 */ lwc1 $f22, 0x144($s3) -/* 6BC150 802185C0 46003180 */ add.s $f6, $f6, $f0 -/* 6BC154 802185C4 C6200034 */ lwc1 $f0, 0x34($s1) -/* 6BC158 802185C8 C6220038 */ lwc1 $f2, 0x38($s1) -/* 6BC15C 802185CC 46002100 */ add.s $f4, $f4, $f0 -/* 6BC160 802185D0 C6200008 */ lwc1 $f0, 8($s1) -/* 6BC164 802185D4 C6740148 */ lwc1 $f20, 0x148($s3) -/* 6BC168 802185D8 46020000 */ add.s $f0, $f0, $f2 -/* 6BC16C 802185DC E6260000 */ swc1 $f6, ($s1) -/* 6BC170 802185E0 E6240004 */ swc1 $f4, 4($s1) -/* 6BC174 802185E4 E6200008 */ swc1 $f0, 8($s1) -/* 6BC178 802185E8 C6600148 */ lwc1 $f0, 0x148($s3) -/* 6BC17C 802185EC 46003086 */ mov.s $f2, $f6 -/* 6BC180 802185F0 E6200018 */ swc1 $f0, 0x18($s1) -/* 6BC184 802185F4 E6620144 */ swc1 $f2, 0x144($s3) -/* 6BC188 802185F8 0C00A85B */ jal sin_rad -/* 6BC18C 802185FC C62C0044 */ lwc1 $f12, 0x44($s1) -/* 6BC190 80218600 C6220050 */ lwc1 $f2, 0x50($s1) -/* 6BC194 80218604 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC198 80218608 00000000 */ nop -/* 6BC19C 8021860C C6200004 */ lwc1 $f0, 4($s1) -/* 6BC1A0 80218610 46020000 */ add.s $f0, $f0, $f2 -/* 6BC1A4 80218614 E6600148 */ swc1 $f0, 0x148($s3) -/* 6BC1A8 80218618 C6200008 */ lwc1 $f0, 8($s1) -/* 6BC1AC 8021861C E660014C */ swc1 $f0, 0x14c($s3) -/* 6BC1B0 80218620 C6220010 */ lwc1 $f2, 0x10($s1) -/* 6BC1B4 80218624 C6600148 */ lwc1 $f0, 0x148($s3) -/* 6BC1B8 80218628 4602003C */ c.lt.s $f0, $f2 -/* 6BC1BC 8021862C 00000000 */ nop -/* 6BC1C0 80218630 45000007 */ bc1f .L80218650 -/* 6BC1C4 80218634 4600B306 */ mov.s $f12, $f22 -/* 6BC1C8 80218638 86220064 */ lh $v0, 0x64($s1) -/* 6BC1CC 8021863C 28420003 */ slti $v0, $v0, 3 -/* 6BC1D0 80218640 54400002 */ bnel $v0, $zero, .L8021864C -/* 6BC1D4 80218644 E6620148 */ swc1 $f2, 0x148($s3) -/* 6BC1D8 80218648 4600B306 */ mov.s $f12, $f22 -.L8021864C: -/* 6BC1DC 8021864C C6600148 */ lwc1 $f0, 0x148($s3) -.L80218650: -/* 6BC1E0 80218650 8E660144 */ lw $a2, 0x144($s3) -/* 6BC1E4 80218654 46000007 */ neg.s $f0, $f0 -/* 6BC1E8 80218658 44070000 */ mfc1 $a3, $f0 -/* 6BC1EC 8021865C 0C00A720 */ jal atan2 -/* 6BC1F0 80218660 4600A387 */ neg.s $f14, $f20 -/* 6BC1F4 80218664 46000007 */ neg.s $f0, $f0 -/* 6BC1F8 80218668 E6600164 */ swc1 $f0, 0x164($s3) -/* 6BC1FC 8021866C 86220066 */ lh $v0, 0x66($s1) -/* 6BC200 80218670 C6600148 */ lwc1 $f0, 0x148($s3) -/* 6BC204 80218674 28420003 */ slti $v0, $v0, 3 -/* 6BC208 80218678 10400013 */ beqz $v0, .L802186C8 -/* 6BC20C 8021867C E620001C */ swc1 $f0, 0x1c($s1) -/* 6BC210 80218680 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BC214 80218684 3C0140C9 */ lui $at, 0x40c9 -/* 6BC218 80218688 34210FD0 */ ori $at, $at, 0xfd0 -/* 6BC21C 8021868C 44810000 */ mtc1 $at, $f0 -/* 6BC220 80218690 C6340044 */ lwc1 $f20, 0x44($s1) -/* 6BC224 80218694 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC228 80218698 00000000 */ nop -/* 6BC22C 8021869C C636003C */ lwc1 $f22, 0x3c($s1) -/* 6BC230 802186A0 4600A521 */ cvt.d.s $f20, $f20 -/* 6BC234 802186A4 3C0143B4 */ lui $at, 0x43b4 -/* 6BC238 802186A8 44810000 */ mtc1 $at, $f0 -/* 6BC23C 802186AC 4600B5A1 */ cvt.d.s $f22, $f22 -/* 6BC240 802186B0 0C00A85B */ jal sin_rad -/* 6BC244 802186B4 46006303 */ div.s $f12, $f12, $f0 -/* 6BC248 802186B8 3C018023 */ lui $at, %hi(D_80228428_6CBFB8) -/* 6BC24C 802186BC D4228428 */ ldc1 $f2, %lo(D_80228428_6CBFB8)($at) -/* 6BC250 802186C0 080861C3 */ j .L8021870C -/* 6BC254 802186C4 46000021 */ cvt.d.s $f0, $f0 -.L802186C8: -/* 6BC258 802186C8 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BC25C 802186CC 3C0140C9 */ lui $at, 0x40c9 -/* 6BC260 802186D0 34210FD0 */ ori $at, $at, 0xfd0 -/* 6BC264 802186D4 44810000 */ mtc1 $at, $f0 -/* 6BC268 802186D8 C6340044 */ lwc1 $f20, 0x44($s1) -/* 6BC26C 802186DC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC270 802186E0 00000000 */ nop -/* 6BC274 802186E4 C636003C */ lwc1 $f22, 0x3c($s1) -/* 6BC278 802186E8 4600A521 */ cvt.d.s $f20, $f20 -/* 6BC27C 802186EC 3C0143B4 */ lui $at, 0x43b4 -/* 6BC280 802186F0 44810000 */ mtc1 $at, $f0 -/* 6BC284 802186F4 4600B5A1 */ cvt.d.s $f22, $f22 -/* 6BC288 802186F8 0C00A85B */ jal sin_rad -/* 6BC28C 802186FC 46006303 */ div.s $f12, $f12, $f0 -/* 6BC290 80218700 3C018023 */ lui $at, %hi(D_80228430_6CBFC0) -/* 6BC294 80218704 D4228430 */ ldc1 $f2, %lo(D_80228430_6CBFC0)($at) -/* 6BC298 80218708 46000021 */ cvt.d.s $f0, $f0 -.L8021870C: -/* 6BC29C 8021870C 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC2A0 80218710 00000000 */ nop -/* 6BC2A4 80218714 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC2A8 80218718 00000000 */ nop -/* 6BC2AC 8021871C 46360000 */ add.d $f0, $f0, $f22 -/* 6BC2B0 80218720 4620A500 */ add.d $f20, $f20, $f0 -/* 6BC2B4 80218724 4620A520 */ cvt.s.d $f20, $f20 -/* 6BC2B8 80218728 E6340044 */ swc1 $f20, 0x44($s1) -/* 6BC2BC 8021872C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BC2C0 80218730 C6200028 */ lwc1 $f0, 0x28($s1) -/* 6BC2C4 80218734 46006300 */ add.s $f12, $f12, $f0 -/* 6BC2C8 80218738 0C00A6C9 */ jal clamp_angle -/* 6BC2CC 8021873C E62C0024 */ swc1 $f12, 0x24($s1) -/* 6BC2D0 80218740 96220064 */ lhu $v0, 0x64($s1) -/* 6BC2D4 80218744 E6200024 */ swc1 $f0, 0x24($s1) -/* 6BC2D8 80218748 2442FFFF */ addiu $v0, $v0, -1 -/* 6BC2DC 8021874C A6220064 */ sh $v0, 0x64($s1) -/* 6BC2E0 80218750 00021400 */ sll $v0, $v0, 0x10 -/* 6BC2E4 80218754 14400076 */ bnez $v0, .L80218930 -/* 6BC2E8 80218758 0000102D */ daddu $v0, $zero, $zero -/* 6BC2EC 8021875C C6200010 */ lwc1 $f0, 0x10($s1) -/* 6BC2F0 80218760 2404FF81 */ addiu $a0, $zero, -0x7f -/* 6BC2F4 80218764 E6600148 */ swc1 $f0, 0x148($s3) -/* 6BC2F8 80218768 C6200018 */ lwc1 $f0, 0x18($s1) -/* 6BC2FC 8021876C C622001C */ lwc1 $f2, 0x1c($s1) -/* 6BC300 80218770 8E260060 */ lw $a2, 0x60($s1) -/* 6BC304 80218774 46020001 */ sub.s $f0, $f0, $f2 -/* 6BC308 80218778 3C013FE6 */ lui $at, 0x3fe6 -/* 6BC30C 8021877C 34216666 */ ori $at, $at, 0x6666 -/* 6BC310 80218780 44811000 */ mtc1 $at, $f2 -/* 6BC314 80218784 24050001 */ addiu $a1, $zero, 1 -/* 6BC318 80218788 E622003C */ swc1 $f2, 0x3c($s1) -/* 6BC31C 8021878C 46000007 */ neg.s $f0, $f0 -/* 6BC320 80218790 0C098F3F */ jal set_animation -/* 6BC324 80218794 E6200044 */ swc1 $f0, 0x44($s1) -/* 6BC328 80218798 0808624C */ j .L80218930 -/* 6BC32C 8021879C 24020001 */ addiu $v0, $zero, 1 -.L802187A0: -/* 6BC330 802187A0 A6220064 */ sh $v0, 0x64($s1) -/* 6BC334 802187A4 86220064 */ lh $v0, 0x64($s1) -/* 6BC338 802187A8 24030168 */ addiu $v1, $zero, 0x168 -/* 6BC33C 802187AC 14400002 */ bnez $v0, .L802187B8 -/* 6BC340 802187B0 0062001A */ div $zero, $v1, $v0 -/* 6BC344 802187B4 0007000D */ break 7 -.L802187B8: -/* 6BC348 802187B8 2401FFFF */ addiu $at, $zero, -1 -/* 6BC34C 802187BC 14410004 */ bne $v0, $at, .L802187D0 -/* 6BC350 802187C0 3C018000 */ lui $at, 0x8000 -/* 6BC354 802187C4 14610002 */ bne $v1, $at, .L802187D0 -/* 6BC358 802187C8 00000000 */ nop -/* 6BC35C 802187CC 0006000D */ break 6 -.L802187D0: -/* 6BC360 802187D0 00001812 */ mflo $v1 -/* 6BC364 802187D4 C6220018 */ lwc1 $f2, 0x18($s1) -/* 6BC368 802187D8 C620001C */ lwc1 $f0, 0x1c($s1) -/* 6BC36C 802187DC 3C013FE6 */ lui $at, 0x3fe6 -/* 6BC370 802187E0 34216666 */ ori $at, $at, 0x6666 -/* 6BC374 802187E4 44814000 */ mtc1 $at, $f8 -/* 6BC378 802187E8 C624001C */ lwc1 $f4, 0x1c($s1) -/* 6BC37C 802187EC 46001081 */ sub.s $f2, $f2, $f0 -/* 6BC380 802187F0 C6200018 */ lwc1 $f0, 0x18($s1) -/* 6BC384 802187F4 3C0142B4 */ lui $at, 0x42b4 -/* 6BC388 802187F8 44813000 */ mtc1 $at, $f6 -/* 6BC38C 802187FC 46040001 */ sub.s $f0, $f0, $f4 -/* 6BC390 80218800 E628003C */ swc1 $f8, 0x3c($s1) -/* 6BC394 80218804 E6260024 */ swc1 $f6, 0x24($s1) -/* 6BC398 80218808 46001087 */ neg.s $f2, $f2 -/* 6BC39C 8021880C E6220044 */ swc1 $f2, 0x44($s1) -/* 6BC3A0 80218810 3C018023 */ lui $at, %hi(D_80228438_6CBFC8) -/* 6BC3A4 80218814 D4228438 */ ldc1 $f2, %lo(D_80228438_6CBFC8)($at) -/* 6BC3A8 80218818 46000005 */ abs.s $f0, $f0 -/* 6BC3AC 8021881C 46000021 */ cvt.d.s $f0, $f0 -/* 6BC3B0 80218820 46220003 */ div.d $f0, $f0, $f2 -/* 6BC3B4 80218824 46200020 */ cvt.s.d $f0, $f0 -/* 6BC3B8 80218828 E6200050 */ swc1 $f0, 0x50($s1) -/* 6BC3BC 8021882C 44830000 */ mtc1 $v1, $f0 -/* 6BC3C0 80218830 00000000 */ nop -/* 6BC3C4 80218834 46800020 */ cvt.s.w $f0, $f0 -/* 6BC3C8 80218838 E6200028 */ swc1 $f0, 0x28($s1) -/* 6BC3CC 8021883C C6600144 */ lwc1 $f0, 0x144($s3) -/* 6BC3D0 80218840 E6200000 */ swc1 $f0, ($s1) -/* 6BC3D4 80218844 C6600148 */ lwc1 $f0, 0x148($s3) -/* 6BC3D8 80218848 E6200004 */ swc1 $f0, 4($s1) -/* 6BC3DC 8021884C C660014C */ lwc1 $f0, 0x14c($s3) -/* 6BC3E0 80218850 24020003 */ addiu $v0, $zero, 3 -/* 6BC3E4 80218854 E6200008 */ swc1 $f0, 8($s1) -/* 6BC3E8 80218858 AE820070 */ sw $v0, 0x70($s4) -.L8021885C: -/* 6BC3EC 8021885C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BC3F0 80218860 3C0140C9 */ lui $at, 0x40c9 -/* 6BC3F4 80218864 34210FD0 */ ori $at, $at, 0xfd0 -/* 6BC3F8 80218868 4481B000 */ mtc1 $at, $f22 -/* 6BC3FC 8021886C 00000000 */ nop -/* 6BC400 80218870 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC404 80218874 00000000 */ nop -/* 6BC408 80218878 C6340000 */ lwc1 $f20, ($s1) -/* 6BC40C 8021887C 3C0143B4 */ lui $at, 0x43b4 -/* 6BC410 80218880 4481C000 */ mtc1 $at, $f24 -/* 6BC414 80218884 4600A521 */ cvt.d.s $f20, $f20 -/* 6BC418 80218888 0C00A85B */ jal sin_rad -/* 6BC41C 8021888C 46186303 */ div.s $f12, $f12, $f24 -/* 6BC420 80218890 C6220050 */ lwc1 $f2, 0x50($s1) -/* 6BC424 80218894 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC428 80218898 00000000 */ nop -/* 6BC42C 8021889C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BC430 802188A0 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC434 802188A4 00000000 */ nop -/* 6BC438 802188A8 3C018023 */ lui $at, %hi(D_80228440_6CBFD0) -/* 6BC43C 802188AC D4208440 */ ldc1 $f0, %lo(D_80228440_6CBFD0)($at) -/* 6BC440 802188B0 460010A1 */ cvt.d.s $f2, $f2 -/* 6BC444 802188B4 46201083 */ div.d $f2, $f2, $f0 -/* 6BC448 802188B8 4622A500 */ add.d $f20, $f20, $f2 -/* 6BC44C 802188BC 46186303 */ div.s $f12, $f12, $f24 -/* 6BC450 802188C0 4620A520 */ cvt.s.d $f20, $f20 -/* 6BC454 802188C4 0C00A85B */ jal sin_rad -/* 6BC458 802188C8 E6340000 */ swc1 $f20, ($s1) -/* 6BC45C 802188CC C6220050 */ lwc1 $f2, 0x50($s1) -/* 6BC460 802188D0 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC464 802188D4 00000000 */ nop -/* 6BC468 802188D8 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6BC46C 802188DC C6200028 */ lwc1 $f0, 0x28($s1) -/* 6BC470 802188E0 46006300 */ add.s $f12, $f12, $f0 -/* 6BC474 802188E4 C6200004 */ lwc1 $f0, 4($s1) -/* 6BC478 802188E8 46020001 */ sub.s $f0, $f0, $f2 -/* 6BC47C 802188EC E62C0024 */ swc1 $f12, 0x24($s1) -/* 6BC480 802188F0 0C00A6C9 */ jal clamp_angle -/* 6BC484 802188F4 E6200004 */ swc1 $f0, 4($s1) -/* 6BC488 802188F8 C6220000 */ lwc1 $f2, ($s1) -/* 6BC48C 802188FC E6200024 */ swc1 $f0, 0x24($s1) -/* 6BC490 80218900 E6620144 */ swc1 $f2, 0x144($s3) -/* 6BC494 80218904 C6200004 */ lwc1 $f0, 4($s1) -/* 6BC498 80218908 E6600148 */ swc1 $f0, 0x148($s3) -/* 6BC49C 8021890C C6200008 */ lwc1 $f0, 8($s1) -/* 6BC4A0 80218910 E660014C */ swc1 $f0, 0x14c($s3) -/* 6BC4A4 80218914 96230064 */ lhu $v1, 0x64($s1) -/* 6BC4A8 80218918 2463FFFF */ addiu $v1, $v1, -1 -/* 6BC4AC 8021891C A6230064 */ sh $v1, 0x64($s1) -/* 6BC4B0 80218920 00031C00 */ sll $v1, $v1, 0x10 -/* 6BC4B4 80218924 10600002 */ beqz $v1, .L80218930 -/* 6BC4B8 80218928 24020001 */ addiu $v0, $zero, 1 -/* 6BC4BC 8021892C 0000102D */ daddu $v0, $zero, $zero -.L80218930: -/* 6BC4C0 80218930 8FBF0024 */ lw $ra, 0x24($sp) -/* 6BC4C4 80218934 8FB40020 */ lw $s4, 0x20($sp) -/* 6BC4C8 80218938 8FB3001C */ lw $s3, 0x1c($sp) -/* 6BC4CC 8021893C 8FB20018 */ lw $s2, 0x18($sp) -/* 6BC4D0 80218940 8FB10014 */ lw $s1, 0x14($sp) -/* 6BC4D4 80218944 8FB00010 */ lw $s0, 0x10($sp) -/* 6BC4D8 80218948 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 6BC4DC 8021894C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 6BC4E0 80218950 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 6BC4E4 80218954 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 6BC4E8 80218958 03E00008 */ jr $ra -/* 6BC4EC 8021895C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80218300_464790.s b/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80218300_464790.s deleted file mode 100644 index 7ad6e74536..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80218300_464790.s +++ /dev/null @@ -1,607 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80232AF0_47EF80 -.double 47.0 - -dlabel D_80232AF8_47EF88 -.double 1.12 - -dlabel D_80232B00_47EF90 -.double 0.53 - -dlabel D_80232B08_47EF98 -.double 47.0 - -dlabel D_80232B10_47EFA0 -.double 0.8 - -dlabel D_80232B18_47EFA8 -.double 0.53 - -dlabel D_80232B20_47EFB0 -.double 0.8 - -dlabel D_80232B28_47EFB8 -.double 16.5 - -dlabel D_80232B30_47EFC0 -.double 33.0 - -.section .text - -glabel func_80218300_464790 -/* 464790 80218300 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 464794 80218304 AFB40020 */ sw $s4, 0x20($sp) -/* 464798 80218308 0080A02D */ daddu $s4, $a0, $zero -/* 46479C 8021830C AFB00010 */ sw $s0, 0x10($sp) -/* 4647A0 80218310 AFBF0024 */ sw $ra, 0x24($sp) -/* 4647A4 80218314 AFB3001C */ sw $s3, 0x1c($sp) -/* 4647A8 80218318 AFB20018 */ sw $s2, 0x18($sp) -/* 4647AC 8021831C AFB10014 */ sw $s1, 0x14($sp) -/* 4647B0 80218320 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 4647B4 80218324 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 4647B8 80218328 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 4647BC 8021832C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 4647C0 80218330 8E840148 */ lw $a0, 0x148($s4) -/* 4647C4 80218334 8E92000C */ lw $s2, 0xc($s4) -/* 4647C8 80218338 0C09A75B */ jal get_actor -/* 4647CC 8021833C 00A0802D */ daddu $s0, $a1, $zero -/* 4647D0 80218340 0040982D */ daddu $s3, $v0, $zero -/* 4647D4 80218344 12000011 */ beqz $s0, .L8021838C -/* 4647D8 80218348 2671000C */ addiu $s1, $s3, 0xc -/* 4647DC 8021834C 8E450000 */ lw $a1, ($s2) -/* 4647E0 80218350 26520004 */ addiu $s2, $s2, 4 -/* 4647E4 80218354 0C0B1EAF */ jal evt_get_variable -/* 4647E8 80218358 0280202D */ daddu $a0, $s4, $zero -/* 4647EC 8021835C A6620070 */ sh $v0, 0x70($s3) -/* 4647F0 80218360 8E450000 */ lw $a1, ($s2) -/* 4647F4 80218364 0C0B1EAF */ jal evt_get_variable -/* 4647F8 80218368 0280202D */ daddu $a0, $s4, $zero -/* 4647FC 8021836C A6620072 */ sh $v0, 0x72($s3) -/* 464800 80218370 AE800074 */ sw $zero, 0x74($s4) -/* 464804 80218374 AE800070 */ sw $zero, 0x70($s4) -/* 464808 80218378 86630072 */ lh $v1, 0x72($s3) -/* 46480C 8021837C 24020001 */ addiu $v0, $zero, 1 -/* 464810 80218380 14620002 */ bne $v1, $v0, .L8021838C -/* 464814 80218384 24020002 */ addiu $v0, $zero, 2 -/* 464818 80218388 AE820070 */ sw $v0, 0x70($s4) -.L8021838C: -/* 46481C 8021838C 8E820070 */ lw $v0, 0x70($s4) -/* 464820 80218390 144000F7 */ bnez $v0, .L80218770 -/* 464824 80218394 00000000 */ nop -/* 464828 80218398 C6600144 */ lwc1 $f0, 0x144($s3) -/* 46482C 8021839C C638000C */ lwc1 $f24, 0xc($s1) -/* 464830 802183A0 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 464834 802183A4 E6200000 */ swc1 $f0, ($s1) -/* 464838 802183A8 C6600148 */ lwc1 $f0, 0x148($s3) -/* 46483C 802183AC 4406C000 */ mfc1 $a2, $f24 -/* 464840 802183B0 4407D000 */ mfc1 $a3, $f26 -/* 464844 802183B4 C6360000 */ lwc1 $f22, ($s1) -/* 464848 802183B8 E6200004 */ swc1 $f0, 4($s1) -/* 46484C 802183BC C674014C */ lwc1 $f20, 0x14c($s3) -/* 464850 802183C0 4600B306 */ mov.s $f12, $f22 -/* 464854 802183C4 4600A386 */ mov.s $f14, $f20 -/* 464858 802183C8 0C00A720 */ jal atan2 -/* 46485C 802183CC E6340008 */ swc1 $f20, 8($s1) -/* 464860 802183D0 4600B306 */ mov.s $f12, $f22 -/* 464864 802183D4 4406C000 */ mfc1 $a2, $f24 -/* 464868 802183D8 4407D000 */ mfc1 $a3, $f26 -/* 46486C 802183DC 4600A386 */ mov.s $f14, $f20 -/* 464870 802183E0 0C00A7B5 */ jal dist2D -/* 464874 802183E4 E6200048 */ swc1 $f0, 0x48($s1) -/* 464878 802183E8 86220064 */ lh $v0, 0x64($s1) -/* 46487C 802183EC 46000106 */ mov.s $f4, $f0 -/* 464880 802183F0 14400012 */ bnez $v0, .L8021843C -/* 464884 802183F4 E624004C */ swc1 $f4, 0x4c($s1) -/* 464888 802183F8 C6200040 */ lwc1 $f0, 0x40($s1) -/* 46488C 802183FC C6220040 */ lwc1 $f2, 0x40($s1) -/* 464890 80218400 46002003 */ div.s $f0, $f4, $f0 -/* 464894 80218404 4600028D */ trunc.w.s $f10, $f0 -/* 464898 80218408 44035000 */ mfc1 $v1, $f10 -/* 46489C 8021840C 00000000 */ nop -/* 4648A0 80218410 00031400 */ sll $v0, $v1, 0x10 -/* 4648A4 80218414 00021403 */ sra $v0, $v0, 0x10 -/* 4648A8 80218418 44820000 */ mtc1 $v0, $f0 -/* 4648AC 8021841C 00000000 */ nop -/* 4648B0 80218420 46800020 */ cvt.s.w $f0, $f0 -/* 4648B4 80218424 46020002 */ mul.s $f0, $f0, $f2 -/* 4648B8 80218428 00000000 */ nop -/* 4648BC 8021842C 46002086 */ mov.s $f2, $f4 -/* 4648C0 80218430 A6230064 */ sh $v1, 0x64($s1) -/* 4648C4 80218434 0808611C */ j .L80218470 -/* 4648C8 80218438 46001201 */ sub.s $f8, $f2, $f0 -.L8021843C: -/* 4648CC 8021843C 44821000 */ mtc1 $v0, $f2 -/* 4648D0 80218440 00000000 */ nop -/* 4648D4 80218444 468010A0 */ cvt.s.w $f2, $f2 -/* 4648D8 80218448 86220064 */ lh $v0, 0x64($s1) -/* 4648DC 8021844C 46022083 */ div.s $f2, $f4, $f2 -/* 4648E0 80218450 44820000 */ mtc1 $v0, $f0 -/* 4648E4 80218454 00000000 */ nop -/* 4648E8 80218458 46800020 */ cvt.s.w $f0, $f0 -/* 4648EC 8021845C 46020002 */ mul.s $f0, $f0, $f2 -/* 4648F0 80218460 00000000 */ nop -/* 4648F4 80218464 C624004C */ lwc1 $f4, 0x4c($s1) -/* 4648F8 80218468 E6220040 */ swc1 $f2, 0x40($s1) -/* 4648FC 8021846C 46002201 */ sub.s $f8, $f4, $f0 -.L80218470: -/* 464900 80218470 86230064 */ lh $v1, 0x64($s1) -/* 464904 80218474 106001BA */ beqz $v1, .L80218B60 -/* 464908 80218478 24020002 */ addiu $v0, $zero, 2 -/* 46490C 8021847C 86220064 */ lh $v0, 0x64($s1) -/* 464910 80218480 C622000C */ lwc1 $f2, 0xc($s1) -/* 464914 80218484 3C014049 */ lui $at, 0x4049 -/* 464918 80218488 34210FD0 */ ori $at, $at, 0xfd0 -/* 46491C 8021848C 44810000 */ mtc1 $at, $f0 -/* 464920 80218490 C6240000 */ lwc1 $f4, ($s1) -/* 464924 80218494 44823000 */ mtc1 $v0, $f6 -/* 464928 80218498 00000000 */ nop -/* 46492C 8021849C 468031A0 */ cvt.s.w $f6, $f6 -/* 464930 802184A0 46060003 */ div.s $f0, $f0, $f6 -/* 464934 802184A4 46041081 */ sub.s $f2, $f2, $f4 -/* 464938 802184A8 E620003C */ swc1 $f0, 0x3c($s1) -/* 46493C 802184AC 44830000 */ mtc1 $v1, $f0 -/* 464940 802184B0 00000000 */ nop -/* 464944 802184B4 46800020 */ cvt.s.w $f0, $f0 -/* 464948 802184B8 46001083 */ div.s $f2, $f2, $f0 -/* 46494C 802184BC C6200010 */ lwc1 $f0, 0x10($s1) -/* 464950 802184C0 E6220030 */ swc1 $f2, 0x30($s1) -/* 464954 802184C4 C6220004 */ lwc1 $f2, 4($s1) -/* 464958 802184C8 AE200044 */ sw $zero, 0x44($s1) -/* 46495C 802184CC 46020001 */ sub.s $f0, $f0, $f2 -/* 464960 802184D0 C6240014 */ lwc1 $f4, 0x14($s1) -/* 464964 802184D4 46003086 */ mov.s $f2, $f6 -/* 464968 802184D8 46020003 */ div.s $f0, $f0, $f2 -/* 46496C 802184DC E6200034 */ swc1 $f0, 0x34($s1) -/* 464970 802184E0 46003006 */ mov.s $f0, $f6 -/* 464974 802184E4 46004003 */ div.s $f0, $f8, $f0 -/* 464978 802184E8 C6220008 */ lwc1 $f2, 8($s1) -/* 46497C 802184EC 86220066 */ lh $v0, 0x66($s1) -/* 464980 802184F0 46022101 */ sub.s $f4, $f4, $f2 -/* 464984 802184F4 C6220040 */ lwc1 $f2, 0x40($s1) -/* 464988 802184F8 28420003 */ slti $v0, $v0, 3 -/* 46498C 802184FC 46001080 */ add.s $f2, $f2, $f0 -/* 464990 80218500 46062103 */ div.s $f4, $f4, $f6 -/* 464994 80218504 E6240038 */ swc1 $f4, 0x38($s1) -/* 464998 80218508 10400045 */ beqz $v0, .L80218620 -/* 46499C 8021850C E6220040 */ swc1 $f2, 0x40($s1) -/* 4649A0 80218510 86220064 */ lh $v0, 0x64($s1) -/* 4649A4 80218514 24030168 */ addiu $v1, $zero, 0x168 -/* 4649A8 80218518 14400002 */ bnez $v0, .L80218524 -/* 4649AC 8021851C 0062001A */ div $zero, $v1, $v0 -/* 4649B0 80218520 0007000D */ break 7 -.L80218524: -/* 4649B4 80218524 2401FFFF */ addiu $at, $zero, -1 -/* 4649B8 80218528 14410004 */ bne $v0, $at, .L8021853C -/* 4649BC 8021852C 3C018000 */ lui $at, 0x8000 -/* 4649C0 80218530 14610002 */ bne $v1, $at, .L8021853C -/* 4649C4 80218534 00000000 */ nop -/* 4649C8 80218538 0006000D */ break 6 -.L8021853C: -/* 4649CC 8021853C 00001812 */ mflo $v1 -/* 4649D0 80218540 C628004C */ lwc1 $f8, 0x4c($s1) -/* 4649D4 80218544 3C014034 */ lui $at, 0x4034 -/* 4649D8 80218548 44811800 */ mtc1 $at, $f3 -/* 4649DC 8021854C 44801000 */ mtc1 $zero, $f2 -/* 4649E0 80218550 46004021 */ cvt.d.s $f0, $f8 -/* 4649E4 80218554 46220001 */ sub.d $f0, $f0, $f2 -/* 4649E8 80218558 3C014018 */ lui $at, 0x4018 -/* 4649EC 8021855C 44811800 */ mtc1 $at, $f3 -/* 4649F0 80218560 44801000 */ mtc1 $zero, $f2 -/* 4649F4 80218564 46200220 */ cvt.s.d $f8, $f0 -/* 4649F8 80218568 46004021 */ cvt.d.s $f0, $f8 -/* 4649FC 8021856C 46220003 */ div.d $f0, $f0, $f2 -/* 464A00 80218570 46200220 */ cvt.s.d $f8, $f0 -/* 464A04 80218574 3C018023 */ lui $at, %hi(D_80232AF0_47EF80) -/* 464A08 80218578 D4222AF0 */ ldc1 $f2, %lo(D_80232AF0_47EF80)($at) -/* 464A0C 8021857C 46004021 */ cvt.d.s $f0, $f8 -/* 464A10 80218580 46220000 */ add.d $f0, $f0, $f2 -/* 464A14 80218584 3C0142B4 */ lui $at, 0x42b4 -/* 464A18 80218588 44811000 */ mtc1 $at, $f2 -/* 464A1C 8021858C 46200220 */ cvt.s.d $f8, $f0 -/* 464A20 80218590 44830000 */ mtc1 $v1, $f0 -/* 464A24 80218594 00000000 */ nop -/* 464A28 80218598 46800020 */ cvt.s.w $f0, $f0 -/* 464A2C 8021859C 86230066 */ lh $v1, 0x66($s1) -/* 464A30 802185A0 24020002 */ addiu $v0, $zero, 2 -/* 464A34 802185A4 E6220024 */ swc1 $f2, 0x24($s1) -/* 464A38 802185A8 E6280050 */ swc1 $f8, 0x50($s1) -/* 464A3C 802185AC 14620008 */ bne $v1, $v0, .L802185D0 -/* 464A40 802185B0 E6200028 */ swc1 $f0, 0x28($s1) -/* 464A44 802185B4 3C018023 */ lui $at, %hi(D_80232AF8_47EF88) -/* 464A48 802185B8 D4222AF8 */ ldc1 $f2, %lo(D_80232AF8_47EF88)($at) -/* 464A4C 802185BC 46004021 */ cvt.d.s $f0, $f8 -/* 464A50 802185C0 46220002 */ mul.d $f0, $f0, $f2 -/* 464A54 802185C4 00000000 */ nop -/* 464A58 802185C8 46200020 */ cvt.s.d $f0, $f0 -/* 464A5C 802185CC E6200050 */ swc1 $f0, 0x50($s1) -.L802185D0: -/* 464A60 802185D0 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464A64 802185D4 3C0140C9 */ lui $at, 0x40c9 -/* 464A68 802185D8 34210FD0 */ ori $at, $at, 0xfd0 -/* 464A6C 802185DC 44810000 */ mtc1 $at, $f0 -/* 464A70 802185E0 C6340044 */ lwc1 $f20, 0x44($s1) -/* 464A74 802185E4 C636003C */ lwc1 $f22, 0x3c($s1) -/* 464A78 802185E8 AE200018 */ sw $zero, 0x18($s1) -/* 464A7C 802185EC 46006302 */ mul.s $f12, $f12, $f0 -/* 464A80 802185F0 00000000 */ nop -/* 464A84 802185F4 AE20001C */ sw $zero, 0x1c($s1) -/* 464A88 802185F8 4600A521 */ cvt.d.s $f20, $f20 -/* 464A8C 802185FC 3C0143B4 */ lui $at, 0x43b4 -/* 464A90 80218600 44810000 */ mtc1 $at, $f0 -/* 464A94 80218604 4600B5A1 */ cvt.d.s $f22, $f22 -/* 464A98 80218608 0C00A85B */ jal sin_rad -/* 464A9C 8021860C 46006303 */ div.s $f12, $f12, $f0 -/* 464AA0 80218610 3C018023 */ lui $at, %hi(D_80232B00_47EF90) -/* 464AA4 80218614 D4222B00 */ ldc1 $f2, %lo(D_80232B00_47EF90)($at) -/* 464AA8 80218618 080861CC */ j .L80218730 -/* 464AAC 8021861C 46000021 */ cvt.d.s $f0, $f0 -.L80218620: -/* 464AB0 80218620 86220064 */ lh $v0, 0x64($s1) -/* 464AB4 80218624 24030168 */ addiu $v1, $zero, 0x168 -/* 464AB8 80218628 14400002 */ bnez $v0, .L80218634 -/* 464ABC 8021862C 0062001A */ div $zero, $v1, $v0 -/* 464AC0 80218630 0007000D */ break 7 -.L80218634: -/* 464AC4 80218634 2401FFFF */ addiu $at, $zero, -1 -/* 464AC8 80218638 14410004 */ bne $v0, $at, .L8021864C -/* 464ACC 8021863C 3C018000 */ lui $at, 0x8000 -/* 464AD0 80218640 14610002 */ bne $v1, $at, .L8021864C -/* 464AD4 80218644 00000000 */ nop -/* 464AD8 80218648 0006000D */ break 6 -.L8021864C: -/* 464ADC 8021864C 00001812 */ mflo $v1 -/* 464AE0 80218650 C628004C */ lwc1 $f8, 0x4c($s1) -/* 464AE4 80218654 3C014034 */ lui $at, 0x4034 -/* 464AE8 80218658 44811800 */ mtc1 $at, $f3 -/* 464AEC 8021865C 44801000 */ mtc1 $zero, $f2 -/* 464AF0 80218660 46004021 */ cvt.d.s $f0, $f8 -/* 464AF4 80218664 46220001 */ sub.d $f0, $f0, $f2 -/* 464AF8 80218668 3C014018 */ lui $at, 0x4018 -/* 464AFC 8021866C 44811800 */ mtc1 $at, $f3 -/* 464B00 80218670 44801000 */ mtc1 $zero, $f2 -/* 464B04 80218674 46200220 */ cvt.s.d $f8, $f0 -/* 464B08 80218678 46004021 */ cvt.d.s $f0, $f8 -/* 464B0C 8021867C 46220003 */ div.d $f0, $f0, $f2 -/* 464B10 80218680 46200220 */ cvt.s.d $f8, $f0 -/* 464B14 80218684 3C018023 */ lui $at, %hi(D_80232B08_47EF98) -/* 464B18 80218688 D4222B08 */ ldc1 $f2, %lo(D_80232B08_47EF98)($at) -/* 464B1C 8021868C 46004021 */ cvt.d.s $f0, $f8 -/* 464B20 80218690 46220000 */ add.d $f0, $f0, $f2 -/* 464B24 80218694 3C0142B4 */ lui $at, 0x42b4 -/* 464B28 80218698 44811000 */ mtc1 $at, $f2 -/* 464B2C 8021869C 46200220 */ cvt.s.d $f8, $f0 -/* 464B30 802186A0 44830000 */ mtc1 $v1, $f0 -/* 464B34 802186A4 00000000 */ nop -/* 464B38 802186A8 46800020 */ cvt.s.w $f0, $f0 -/* 464B3C 802186AC 86230066 */ lh $v1, 0x66($s1) -/* 464B40 802186B0 24020004 */ addiu $v0, $zero, 4 -/* 464B44 802186B4 E6220024 */ swc1 $f2, 0x24($s1) -/* 464B48 802186B8 E6280050 */ swc1 $f8, 0x50($s1) -/* 464B4C 802186BC 14620009 */ bne $v1, $v0, .L802186E4 -/* 464B50 802186C0 E6200028 */ swc1 $f0, 0x28($s1) -/* 464B54 802186C4 3C013FF4 */ lui $at, 0x3ff4 -/* 464B58 802186C8 44811800 */ mtc1 $at, $f3 -/* 464B5C 802186CC 44801000 */ mtc1 $zero, $f2 -/* 464B60 802186D0 46004021 */ cvt.d.s $f0, $f8 -/* 464B64 802186D4 46220002 */ mul.d $f0, $f0, $f2 -/* 464B68 802186D8 00000000 */ nop -/* 464B6C 802186DC 46200020 */ cvt.s.d $f0, $f0 -/* 464B70 802186E0 E6200050 */ swc1 $f0, 0x50($s1) -.L802186E4: -/* 464B74 802186E4 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464B78 802186E8 3C0140C9 */ lui $at, 0x40c9 -/* 464B7C 802186EC 34210FD0 */ ori $at, $at, 0xfd0 -/* 464B80 802186F0 44810000 */ mtc1 $at, $f0 -/* 464B84 802186F4 C6340044 */ lwc1 $f20, 0x44($s1) -/* 464B88 802186F8 C636003C */ lwc1 $f22, 0x3c($s1) -/* 464B8C 802186FC AE200018 */ sw $zero, 0x18($s1) -/* 464B90 80218700 46006302 */ mul.s $f12, $f12, $f0 -/* 464B94 80218704 00000000 */ nop -/* 464B98 80218708 AE20001C */ sw $zero, 0x1c($s1) -/* 464B9C 8021870C 4600A521 */ cvt.d.s $f20, $f20 -/* 464BA0 80218710 3C0143B4 */ lui $at, 0x43b4 -/* 464BA4 80218714 44810000 */ mtc1 $at, $f0 -/* 464BA8 80218718 4600B5A1 */ cvt.d.s $f22, $f22 -/* 464BAC 8021871C 0C00A85B */ jal sin_rad -/* 464BB0 80218720 46006303 */ div.s $f12, $f12, $f0 -/* 464BB4 80218724 3C018023 */ lui $at, %hi(D_80232B10_47EFA0) -/* 464BB8 80218728 D4222B10 */ ldc1 $f2, %lo(D_80232B10_47EFA0)($at) -/* 464BBC 8021872C 46000021 */ cvt.d.s $f0, $f0 -.L80218730: -/* 464BC0 80218730 46220002 */ mul.d $f0, $f0, $f2 -/* 464BC4 80218734 00000000 */ nop -/* 464BC8 80218738 46360002 */ mul.d $f0, $f0, $f22 -/* 464BCC 8021873C 00000000 */ nop -/* 464BD0 80218740 46360000 */ add.d $f0, $f0, $f22 -/* 464BD4 80218744 4620A500 */ add.d $f20, $f20, $f0 -/* 464BD8 80218748 4620A520 */ cvt.s.d $f20, $f20 -/* 464BDC 8021874C E6340044 */ swc1 $f20, 0x44($s1) -/* 464BE0 80218750 2404FF81 */ addiu $a0, $zero, -0x7f -/* 464BE4 80218754 8E260058 */ lw $a2, 0x58($s1) -/* 464BE8 80218758 0C098F3F */ jal set_animation -/* 464BEC 8021875C 24050001 */ addiu $a1, $zero, 1 -/* 464BF0 80218760 0C05272D */ jal sfx_play_sound -/* 464BF4 80218764 24042081 */ addiu $a0, $zero, 0x2081 -/* 464BF8 80218768 24020001 */ addiu $v0, $zero, 1 -/* 464BFC 8021876C AE820070 */ sw $v0, 0x70($s4) -.L80218770: -/* 464C00 80218770 8E830070 */ lw $v1, 0x70($s4) -/* 464C04 80218774 24020002 */ addiu $v0, $zero, 2 -/* 464C08 80218778 10620095 */ beq $v1, $v0, .L802189D0 -/* 464C0C 8021877C 24020001 */ addiu $v0, $zero, 1 -/* 464C10 80218780 28620003 */ slti $v0, $v1, 3 -/* 464C14 80218784 10400005 */ beqz $v0, .L8021879C -/* 464C18 80218788 24020001 */ addiu $v0, $zero, 1 -/* 464C1C 8021878C 10620008 */ beq $v1, $v0, .L802187B0 -/* 464C20 80218790 0000102D */ daddu $v0, $zero, $zero -/* 464C24 80218794 080862D8 */ j .L80218B60 -/* 464C28 80218798 00000000 */ nop -.L8021879C: -/* 464C2C 8021879C 24020003 */ addiu $v0, $zero, 3 -/* 464C30 802187A0 106200BA */ beq $v1, $v0, .L80218A8C -/* 464C34 802187A4 0000102D */ daddu $v0, $zero, $zero -/* 464C38 802187A8 080862D8 */ j .L80218B60 -/* 464C3C 802187AC 00000000 */ nop -.L802187B0: -/* 464C40 802187B0 C6220044 */ lwc1 $f2, 0x44($s1) -/* 464C44 802187B4 3C013FC9 */ lui $at, 0x3fc9 -/* 464C48 802187B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 464C4C 802187BC 44810000 */ mtc1 $at, $f0 -/* 464C50 802187C0 00000000 */ nop -/* 464C54 802187C4 4602003C */ c.lt.s $f0, $f2 -/* 464C58 802187C8 00000000 */ nop -/* 464C5C 802187CC 45000004 */ bc1f .L802187E0 -/* 464C60 802187D0 2404FF81 */ addiu $a0, $zero, -0x7f -/* 464C64 802187D4 8E26005C */ lw $a2, 0x5c($s1) -/* 464C68 802187D8 0C098F3F */ jal set_animation -/* 464C6C 802187DC 24050001 */ addiu $a1, $zero, 1 -.L802187E0: -/* 464C70 802187E0 C6260000 */ lwc1 $f6, ($s1) -/* 464C74 802187E4 C6200030 */ lwc1 $f0, 0x30($s1) -/* 464C78 802187E8 C6240004 */ lwc1 $f4, 4($s1) -/* 464C7C 802187EC C6760144 */ lwc1 $f22, 0x144($s3) -/* 464C80 802187F0 46003180 */ add.s $f6, $f6, $f0 -/* 464C84 802187F4 C6200034 */ lwc1 $f0, 0x34($s1) -/* 464C88 802187F8 C6220038 */ lwc1 $f2, 0x38($s1) -/* 464C8C 802187FC 46002100 */ add.s $f4, $f4, $f0 -/* 464C90 80218800 C6200008 */ lwc1 $f0, 8($s1) -/* 464C94 80218804 C6740148 */ lwc1 $f20, 0x148($s3) -/* 464C98 80218808 46020000 */ add.s $f0, $f0, $f2 -/* 464C9C 8021880C E6260000 */ swc1 $f6, ($s1) -/* 464CA0 80218810 E6240004 */ swc1 $f4, 4($s1) -/* 464CA4 80218814 E6200008 */ swc1 $f0, 8($s1) -/* 464CA8 80218818 C6600148 */ lwc1 $f0, 0x148($s3) -/* 464CAC 8021881C 46003086 */ mov.s $f2, $f6 -/* 464CB0 80218820 E6200018 */ swc1 $f0, 0x18($s1) -/* 464CB4 80218824 E6620144 */ swc1 $f2, 0x144($s3) -/* 464CB8 80218828 0C00A85B */ jal sin_rad -/* 464CBC 8021882C C62C0044 */ lwc1 $f12, 0x44($s1) -/* 464CC0 80218830 C6220050 */ lwc1 $f2, 0x50($s1) -/* 464CC4 80218834 46001082 */ mul.s $f2, $f2, $f0 -/* 464CC8 80218838 00000000 */ nop -/* 464CCC 8021883C C6200004 */ lwc1 $f0, 4($s1) -/* 464CD0 80218840 46020000 */ add.s $f0, $f0, $f2 -/* 464CD4 80218844 E6600148 */ swc1 $f0, 0x148($s3) -/* 464CD8 80218848 C6200008 */ lwc1 $f0, 8($s1) -/* 464CDC 8021884C E660014C */ swc1 $f0, 0x14c($s3) -/* 464CE0 80218850 C6220010 */ lwc1 $f2, 0x10($s1) -/* 464CE4 80218854 C6600148 */ lwc1 $f0, 0x148($s3) -/* 464CE8 80218858 4602003C */ c.lt.s $f0, $f2 -/* 464CEC 8021885C 00000000 */ nop -/* 464CF0 80218860 45000007 */ bc1f .L80218880 -/* 464CF4 80218864 4600B306 */ mov.s $f12, $f22 -/* 464CF8 80218868 86220064 */ lh $v0, 0x64($s1) -/* 464CFC 8021886C 28420003 */ slti $v0, $v0, 3 -/* 464D00 80218870 54400002 */ bnel $v0, $zero, .L8021887C -/* 464D04 80218874 E6620148 */ swc1 $f2, 0x148($s3) -/* 464D08 80218878 4600B306 */ mov.s $f12, $f22 -.L8021887C: -/* 464D0C 8021887C C6600148 */ lwc1 $f0, 0x148($s3) -.L80218880: -/* 464D10 80218880 8E660144 */ lw $a2, 0x144($s3) -/* 464D14 80218884 46000007 */ neg.s $f0, $f0 -/* 464D18 80218888 44070000 */ mfc1 $a3, $f0 -/* 464D1C 8021888C 0C00A720 */ jal atan2 -/* 464D20 80218890 4600A387 */ neg.s $f14, $f20 -/* 464D24 80218894 46000007 */ neg.s $f0, $f0 -/* 464D28 80218898 E6600164 */ swc1 $f0, 0x164($s3) -/* 464D2C 8021889C 86220066 */ lh $v0, 0x66($s1) -/* 464D30 802188A0 C6600148 */ lwc1 $f0, 0x148($s3) -/* 464D34 802188A4 28420003 */ slti $v0, $v0, 3 -/* 464D38 802188A8 10400013 */ beqz $v0, .L802188F8 -/* 464D3C 802188AC E620001C */ swc1 $f0, 0x1c($s1) -/* 464D40 802188B0 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464D44 802188B4 3C0140C9 */ lui $at, 0x40c9 -/* 464D48 802188B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 464D4C 802188BC 44810000 */ mtc1 $at, $f0 -/* 464D50 802188C0 C6340044 */ lwc1 $f20, 0x44($s1) -/* 464D54 802188C4 46006302 */ mul.s $f12, $f12, $f0 -/* 464D58 802188C8 00000000 */ nop -/* 464D5C 802188CC C636003C */ lwc1 $f22, 0x3c($s1) -/* 464D60 802188D0 4600A521 */ cvt.d.s $f20, $f20 -/* 464D64 802188D4 3C0143B4 */ lui $at, 0x43b4 -/* 464D68 802188D8 44810000 */ mtc1 $at, $f0 -/* 464D6C 802188DC 4600B5A1 */ cvt.d.s $f22, $f22 -/* 464D70 802188E0 0C00A85B */ jal sin_rad -/* 464D74 802188E4 46006303 */ div.s $f12, $f12, $f0 -/* 464D78 802188E8 3C018023 */ lui $at, %hi(D_80232B18_47EFA8) -/* 464D7C 802188EC D4222B18 */ ldc1 $f2, %lo(D_80232B18_47EFA8)($at) -/* 464D80 802188F0 0808624F */ j .L8021893C -/* 464D84 802188F4 46000021 */ cvt.d.s $f0, $f0 -.L802188F8: -/* 464D88 802188F8 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464D8C 802188FC 3C0140C9 */ lui $at, 0x40c9 -/* 464D90 80218900 34210FD0 */ ori $at, $at, 0xfd0 -/* 464D94 80218904 44810000 */ mtc1 $at, $f0 -/* 464D98 80218908 C6340044 */ lwc1 $f20, 0x44($s1) -/* 464D9C 8021890C 46006302 */ mul.s $f12, $f12, $f0 -/* 464DA0 80218910 00000000 */ nop -/* 464DA4 80218914 C636003C */ lwc1 $f22, 0x3c($s1) -/* 464DA8 80218918 4600A521 */ cvt.d.s $f20, $f20 -/* 464DAC 8021891C 3C0143B4 */ lui $at, 0x43b4 -/* 464DB0 80218920 44810000 */ mtc1 $at, $f0 -/* 464DB4 80218924 4600B5A1 */ cvt.d.s $f22, $f22 -/* 464DB8 80218928 0C00A85B */ jal sin_rad -/* 464DBC 8021892C 46006303 */ div.s $f12, $f12, $f0 -/* 464DC0 80218930 3C018023 */ lui $at, %hi(D_80232B20_47EFB0) -/* 464DC4 80218934 D4222B20 */ ldc1 $f2, %lo(D_80232B20_47EFB0)($at) -/* 464DC8 80218938 46000021 */ cvt.d.s $f0, $f0 -.L8021893C: -/* 464DCC 8021893C 46220002 */ mul.d $f0, $f0, $f2 -/* 464DD0 80218940 00000000 */ nop -/* 464DD4 80218944 46360002 */ mul.d $f0, $f0, $f22 -/* 464DD8 80218948 00000000 */ nop -/* 464DDC 8021894C 46360000 */ add.d $f0, $f0, $f22 -/* 464DE0 80218950 4620A500 */ add.d $f20, $f20, $f0 -/* 464DE4 80218954 4620A520 */ cvt.s.d $f20, $f20 -/* 464DE8 80218958 E6340044 */ swc1 $f20, 0x44($s1) -/* 464DEC 8021895C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464DF0 80218960 C6200028 */ lwc1 $f0, 0x28($s1) -/* 464DF4 80218964 46006300 */ add.s $f12, $f12, $f0 -/* 464DF8 80218968 0C00A6C9 */ jal clamp_angle -/* 464DFC 8021896C E62C0024 */ swc1 $f12, 0x24($s1) -/* 464E00 80218970 96220064 */ lhu $v0, 0x64($s1) -/* 464E04 80218974 E6200024 */ swc1 $f0, 0x24($s1) -/* 464E08 80218978 2442FFFF */ addiu $v0, $v0, -1 -/* 464E0C 8021897C A6220064 */ sh $v0, 0x64($s1) -/* 464E10 80218980 00021400 */ sll $v0, $v0, 0x10 -/* 464E14 80218984 14400076 */ bnez $v0, .L80218B60 -/* 464E18 80218988 0000102D */ daddu $v0, $zero, $zero -/* 464E1C 8021898C C6200010 */ lwc1 $f0, 0x10($s1) -/* 464E20 80218990 2404FF81 */ addiu $a0, $zero, -0x7f -/* 464E24 80218994 E6600148 */ swc1 $f0, 0x148($s3) -/* 464E28 80218998 C6200018 */ lwc1 $f0, 0x18($s1) -/* 464E2C 8021899C C622001C */ lwc1 $f2, 0x1c($s1) -/* 464E30 802189A0 8E260060 */ lw $a2, 0x60($s1) -/* 464E34 802189A4 46020001 */ sub.s $f0, $f0, $f2 -/* 464E38 802189A8 3C013FE6 */ lui $at, 0x3fe6 -/* 464E3C 802189AC 34216666 */ ori $at, $at, 0x6666 -/* 464E40 802189B0 44811000 */ mtc1 $at, $f2 -/* 464E44 802189B4 24050001 */ addiu $a1, $zero, 1 -/* 464E48 802189B8 E622003C */ swc1 $f2, 0x3c($s1) -/* 464E4C 802189BC 46000007 */ neg.s $f0, $f0 -/* 464E50 802189C0 0C098F3F */ jal set_animation -/* 464E54 802189C4 E6200044 */ swc1 $f0, 0x44($s1) -/* 464E58 802189C8 080862D8 */ j .L80218B60 -/* 464E5C 802189CC 24020001 */ addiu $v0, $zero, 1 -.L802189D0: -/* 464E60 802189D0 A6220064 */ sh $v0, 0x64($s1) -/* 464E64 802189D4 86220064 */ lh $v0, 0x64($s1) -/* 464E68 802189D8 24030168 */ addiu $v1, $zero, 0x168 -/* 464E6C 802189DC 14400002 */ bnez $v0, .L802189E8 -/* 464E70 802189E0 0062001A */ div $zero, $v1, $v0 -/* 464E74 802189E4 0007000D */ break 7 -.L802189E8: -/* 464E78 802189E8 2401FFFF */ addiu $at, $zero, -1 -/* 464E7C 802189EC 14410004 */ bne $v0, $at, .L80218A00 -/* 464E80 802189F0 3C018000 */ lui $at, 0x8000 -/* 464E84 802189F4 14610002 */ bne $v1, $at, .L80218A00 -/* 464E88 802189F8 00000000 */ nop -/* 464E8C 802189FC 0006000D */ break 6 -.L80218A00: -/* 464E90 80218A00 00001812 */ mflo $v1 -/* 464E94 80218A04 C6220018 */ lwc1 $f2, 0x18($s1) -/* 464E98 80218A08 C620001C */ lwc1 $f0, 0x1c($s1) -/* 464E9C 80218A0C 3C013FE6 */ lui $at, 0x3fe6 -/* 464EA0 80218A10 34216666 */ ori $at, $at, 0x6666 -/* 464EA4 80218A14 44814000 */ mtc1 $at, $f8 -/* 464EA8 80218A18 C624001C */ lwc1 $f4, 0x1c($s1) -/* 464EAC 80218A1C 46001081 */ sub.s $f2, $f2, $f0 -/* 464EB0 80218A20 C6200018 */ lwc1 $f0, 0x18($s1) -/* 464EB4 80218A24 3C0142B4 */ lui $at, 0x42b4 -/* 464EB8 80218A28 44813000 */ mtc1 $at, $f6 -/* 464EBC 80218A2C 46040001 */ sub.s $f0, $f0, $f4 -/* 464EC0 80218A30 E628003C */ swc1 $f8, 0x3c($s1) -/* 464EC4 80218A34 E6260024 */ swc1 $f6, 0x24($s1) -/* 464EC8 80218A38 46001087 */ neg.s $f2, $f2 -/* 464ECC 80218A3C E6220044 */ swc1 $f2, 0x44($s1) -/* 464ED0 80218A40 3C018023 */ lui $at, %hi(D_80232B28_47EFB8) -/* 464ED4 80218A44 D4222B28 */ ldc1 $f2, %lo(D_80232B28_47EFB8)($at) -/* 464ED8 80218A48 46000005 */ abs.s $f0, $f0 -/* 464EDC 80218A4C 46000021 */ cvt.d.s $f0, $f0 -/* 464EE0 80218A50 46220003 */ div.d $f0, $f0, $f2 -/* 464EE4 80218A54 46200020 */ cvt.s.d $f0, $f0 -/* 464EE8 80218A58 E6200050 */ swc1 $f0, 0x50($s1) -/* 464EEC 80218A5C 44830000 */ mtc1 $v1, $f0 -/* 464EF0 80218A60 00000000 */ nop -/* 464EF4 80218A64 46800020 */ cvt.s.w $f0, $f0 -/* 464EF8 80218A68 E6200028 */ swc1 $f0, 0x28($s1) -/* 464EFC 80218A6C C6600144 */ lwc1 $f0, 0x144($s3) -/* 464F00 80218A70 E6200000 */ swc1 $f0, ($s1) -/* 464F04 80218A74 C6600148 */ lwc1 $f0, 0x148($s3) -/* 464F08 80218A78 E6200004 */ swc1 $f0, 4($s1) -/* 464F0C 80218A7C C660014C */ lwc1 $f0, 0x14c($s3) -/* 464F10 80218A80 24020003 */ addiu $v0, $zero, 3 -/* 464F14 80218A84 E6200008 */ swc1 $f0, 8($s1) -/* 464F18 80218A88 AE820070 */ sw $v0, 0x70($s4) -.L80218A8C: -/* 464F1C 80218A8C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464F20 80218A90 3C0140C9 */ lui $at, 0x40c9 -/* 464F24 80218A94 34210FD0 */ ori $at, $at, 0xfd0 -/* 464F28 80218A98 4481B000 */ mtc1 $at, $f22 -/* 464F2C 80218A9C 00000000 */ nop -/* 464F30 80218AA0 46166302 */ mul.s $f12, $f12, $f22 -/* 464F34 80218AA4 00000000 */ nop -/* 464F38 80218AA8 C6340000 */ lwc1 $f20, ($s1) -/* 464F3C 80218AAC 3C0143B4 */ lui $at, 0x43b4 -/* 464F40 80218AB0 4481C000 */ mtc1 $at, $f24 -/* 464F44 80218AB4 4600A521 */ cvt.d.s $f20, $f20 -/* 464F48 80218AB8 0C00A85B */ jal sin_rad -/* 464F4C 80218ABC 46186303 */ div.s $f12, $f12, $f24 -/* 464F50 80218AC0 C6220050 */ lwc1 $f2, 0x50($s1) -/* 464F54 80218AC4 46001082 */ mul.s $f2, $f2, $f0 -/* 464F58 80218AC8 00000000 */ nop -/* 464F5C 80218ACC C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464F60 80218AD0 46166302 */ mul.s $f12, $f12, $f22 -/* 464F64 80218AD4 00000000 */ nop -/* 464F68 80218AD8 3C018023 */ lui $at, %hi(D_80232B30_47EFC0) -/* 464F6C 80218ADC D4202B30 */ ldc1 $f0, %lo(D_80232B30_47EFC0)($at) -/* 464F70 80218AE0 460010A1 */ cvt.d.s $f2, $f2 -/* 464F74 80218AE4 46201083 */ div.d $f2, $f2, $f0 -/* 464F78 80218AE8 4622A500 */ add.d $f20, $f20, $f2 -/* 464F7C 80218AEC 46186303 */ div.s $f12, $f12, $f24 -/* 464F80 80218AF0 4620A520 */ cvt.s.d $f20, $f20 -/* 464F84 80218AF4 0C00A85B */ jal sin_rad -/* 464F88 80218AF8 E6340000 */ swc1 $f20, ($s1) -/* 464F8C 80218AFC C6220050 */ lwc1 $f2, 0x50($s1) -/* 464F90 80218B00 46001082 */ mul.s $f2, $f2, $f0 -/* 464F94 80218B04 00000000 */ nop -/* 464F98 80218B08 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 464F9C 80218B0C C6200028 */ lwc1 $f0, 0x28($s1) -/* 464FA0 80218B10 46006300 */ add.s $f12, $f12, $f0 -/* 464FA4 80218B14 C6200004 */ lwc1 $f0, 4($s1) -/* 464FA8 80218B18 46020001 */ sub.s $f0, $f0, $f2 -/* 464FAC 80218B1C E62C0024 */ swc1 $f12, 0x24($s1) -/* 464FB0 80218B20 0C00A6C9 */ jal clamp_angle -/* 464FB4 80218B24 E6200004 */ swc1 $f0, 4($s1) -/* 464FB8 80218B28 C6220000 */ lwc1 $f2, ($s1) -/* 464FBC 80218B2C E6200024 */ swc1 $f0, 0x24($s1) -/* 464FC0 80218B30 E6620144 */ swc1 $f2, 0x144($s3) -/* 464FC4 80218B34 C6200004 */ lwc1 $f0, 4($s1) -/* 464FC8 80218B38 E6600148 */ swc1 $f0, 0x148($s3) -/* 464FCC 80218B3C C6200008 */ lwc1 $f0, 8($s1) -/* 464FD0 80218B40 E660014C */ swc1 $f0, 0x14c($s3) -/* 464FD4 80218B44 96230064 */ lhu $v1, 0x64($s1) -/* 464FD8 80218B48 2463FFFF */ addiu $v1, $v1, -1 -/* 464FDC 80218B4C A6230064 */ sh $v1, 0x64($s1) -/* 464FE0 80218B50 00031C00 */ sll $v1, $v1, 0x10 -/* 464FE4 80218B54 10600002 */ beqz $v1, .L80218B60 -/* 464FE8 80218B58 24020001 */ addiu $v0, $zero, 1 -/* 464FEC 80218B5C 0000102D */ daddu $v0, $zero, $zero -.L80218B60: -/* 464FF0 80218B60 8FBF0024 */ lw $ra, 0x24($sp) -/* 464FF4 80218B64 8FB40020 */ lw $s4, 0x20($sp) -/* 464FF8 80218B68 8FB3001C */ lw $s3, 0x1c($sp) -/* 464FFC 80218B6C 8FB20018 */ lw $s2, 0x18($sp) -/* 465000 80218B70 8FB10014 */ lw $s1, 0x14($sp) -/* 465004 80218B74 8FB00010 */ lw $s0, 0x10($sp) -/* 465008 80218B78 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 46500C 80218B7C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 465010 80218B80 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 465014 80218B84 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 465018 80218B88 03E00008 */ jr $ra -/* 46501C 80218B8C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219824_465CB4.s b/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219824_465CB4.s deleted file mode 100644 index efe9f478a2..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219824_465CB4.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80232B40_47EFD0 -.word L80219878_465D08, L80219884_465D14, L80219890_465D20, L8021989C_465D2C, L802198D4_465D64, L802198B4_465D44, L802198C0_465D50, L802198CC_465D5C, L802198A8_465D38, 0, 0, 0 - -.section .text - -glabel func_80219824_465CB4 -/* 465CB4 80219824 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 465CB8 80219828 AFB00010 */ sw $s0, 0x10($sp) -/* 465CBC 8021982C 0080802D */ daddu $s0, $a0, $zero -/* 465CC0 80219830 AFBF0014 */ sw $ra, 0x14($sp) -/* 465CC4 80219834 8E02000C */ lw $v0, 0xc($s0) -/* 465CC8 80219838 0C0B1EAF */ jal evt_get_variable -/* 465CCC 8021983C 8C450000 */ lw $a1, ($v0) -/* 465CD0 80219840 8E040148 */ lw $a0, 0x148($s0) -/* 465CD4 80219844 0C09A75B */ jal get_actor -/* 465CD8 80219848 0040802D */ daddu $s0, $v0, $zero -/* 465CDC 8021984C 0040182D */ daddu $v1, $v0, $zero -/* 465CE0 80219850 2610FFFF */ addiu $s0, $s0, -1 -/* 465CE4 80219854 2E020009 */ sltiu $v0, $s0, 9 -/* 465CE8 80219858 1040001E */ beqz $v0, L802198D4_465D64 -/* 465CEC 8021985C 0000202D */ daddu $a0, $zero, $zero -/* 465CF0 80219860 00101080 */ sll $v0, $s0, 2 -/* 465CF4 80219864 3C018023 */ lui $at, %hi(jtbl_80232B40_47EFD0) -/* 465CF8 80219868 00220821 */ addu $at, $at, $v0 -/* 465CFC 8021986C 8C222B40 */ lw $v0, %lo(jtbl_80232B40_47EFD0)($at) -/* 465D00 80219870 00400008 */ jr $v0 -/* 465D04 80219874 00000000 */ nop -dlabel L80219878_465D08 -/* 465D08 80219878 3C048022 */ lui $a0, %hi(b_area_mac_lee_formation_goombario) -/* 465D0C 8021987C 08086635 */ j L802198D4_465D64 -/* 465D10 80219880 24840524 */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_goombario) -dlabel L80219884_465D14 -/* 465D14 80219884 3C048022 */ lui $a0, %hi(b_area_mac_lee_formation_kooper) -/* 465D18 80219888 08086635 */ j L802198D4_465D64 -/* 465D1C 8021988C 24842274 */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_kooper) -dlabel L80219890_465D20 -/* 465D20 80219890 3C048022 */ lui $a0, %hi(b_area_mac_lee_formation_bombette) -/* 465D24 80219894 08086635 */ j L802198D4_465D64 -/* 465D28 80219898 2484336C */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_bombette) -dlabel L8021989C_465D2C -/* 465D2C 8021989C 3C048022 */ lui $a0, %hi(b_area_mac_lee_formation_parakerry) -/* 465D30 802198A0 08086635 */ j L802198D4_465D64 -/* 465D34 802198A4 248443F4 */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_parakerry) -dlabel L802198A8_465D38 -/* 465D38 802198A8 3C048022 */ lui $a0, %hi(b_area_mac_lee_formation_bow) -/* 465D3C 802198AC 08086635 */ j L802198D4_465D64 -/* 465D40 802198B0 24845958 */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_bow) -dlabel L802198B4_465D44 -/* 465D44 802198B4 3C048022 */ lui $a0, %hi(b_area_mac_lee_formation_watt) -/* 465D48 802198B8 08086635 */ j L802198D4_465D64 -/* 465D4C 802198BC 24846960 */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_watt) -dlabel L802198C0_465D50 -/* 465D50 802198C0 3C048023 */ lui $a0, %hi(b_area_mac_lee_formation_sushie) -/* 465D54 802198C4 08086635 */ j L802198D4_465D64 -/* 465D58 802198C8 248483F0 */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_sushie) -dlabel L802198CC_465D5C -/* 465D5C 802198CC 3C048023 */ lui $a0, %hi(b_area_mac_lee_formation_lakilester) -/* 465D60 802198D0 2484972C */ addiu $a0, $a0, %lo(b_area_mac_lee_formation_lakilester) -dlabel L802198D4_465D64 -/* 465D64 802198D4 806301F1 */ lb $v1, 0x1f1($v1) -/* 465D68 802198D8 2463000A */ addiu $v1, $v1, 0xa -/* 465D6C 802198DC AC830008 */ sw $v1, 8($a0) -/* 465D70 802198E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 465D74 802198E4 8FB00010 */ lw $s0, 0x10($sp) -/* 465D78 802198E8 24020002 */ addiu $v0, $zero, 2 -/* 465D7C 802198EC 03E00008 */ jr $ra -/* 465D80 802198F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 465D84 802198F4 00000000 */ nop -/* 465D88 802198F8 00000000 */ nop -/* 465D8C 802198FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s deleted file mode 100644 index a743b17bdc..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218000_669D80.s +++ /dev/null @@ -1,576 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_669D80 -/* 669D80 80218000 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 669D84 80218004 AFB40020 */ sw $s4, 0x20($sp) -/* 669D88 80218008 0080A02D */ daddu $s4, $a0, $zero -/* 669D8C 8021800C AFB00010 */ sw $s0, 0x10($sp) -/* 669D90 80218010 AFBF0024 */ sw $ra, 0x24($sp) -/* 669D94 80218014 AFB3001C */ sw $s3, 0x1c($sp) -/* 669D98 80218018 AFB20018 */ sw $s2, 0x18($sp) -/* 669D9C 8021801C AFB10014 */ sw $s1, 0x14($sp) -/* 669DA0 80218020 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 669DA4 80218024 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 669DA8 80218028 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 669DAC 8021802C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 669DB0 80218030 8E840148 */ lw $a0, 0x148($s4) -/* 669DB4 80218034 8E92000C */ lw $s2, 0xc($s4) -/* 669DB8 80218038 0C09A75B */ jal get_actor -/* 669DBC 8021803C 00A0802D */ daddu $s0, $a1, $zero -/* 669DC0 80218040 0040982D */ daddu $s3, $v0, $zero -/* 669DC4 80218044 12000011 */ beqz $s0, .L8021808C -/* 669DC8 80218048 2671000C */ addiu $s1, $s3, 0xc -/* 669DCC 8021804C 8E450000 */ lw $a1, ($s2) -/* 669DD0 80218050 26520004 */ addiu $s2, $s2, 4 -/* 669DD4 80218054 0C0B1EAF */ jal evt_get_variable -/* 669DD8 80218058 0280202D */ daddu $a0, $s4, $zero -/* 669DDC 8021805C A6620070 */ sh $v0, 0x70($s3) -/* 669DE0 80218060 8E450000 */ lw $a1, ($s2) -/* 669DE4 80218064 0C0B1EAF */ jal evt_get_variable -/* 669DE8 80218068 0280202D */ daddu $a0, $s4, $zero -/* 669DEC 8021806C A6620072 */ sh $v0, 0x72($s3) -/* 669DF0 80218070 AE800074 */ sw $zero, 0x74($s4) -/* 669DF4 80218074 AE800070 */ sw $zero, 0x70($s4) -/* 669DF8 80218078 86630072 */ lh $v1, 0x72($s3) -/* 669DFC 8021807C 24020001 */ addiu $v0, $zero, 1 -/* 669E00 80218080 14620002 */ bne $v1, $v0, .L8021808C -/* 669E04 80218084 24020002 */ addiu $v0, $zero, 2 -/* 669E08 80218088 AE820070 */ sw $v0, 0x70($s4) -.L8021808C: -/* 669E0C 8021808C 8E820070 */ lw $v0, 0x70($s4) -/* 669E10 80218090 144000F7 */ bnez $v0, .L80218470 -/* 669E14 80218094 00000000 */ nop -/* 669E18 80218098 C6600144 */ lwc1 $f0, 0x144($s3) -/* 669E1C 8021809C C638000C */ lwc1 $f24, 0xc($s1) -/* 669E20 802180A0 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 669E24 802180A4 E6200000 */ swc1 $f0, ($s1) -/* 669E28 802180A8 C6600148 */ lwc1 $f0, 0x148($s3) -/* 669E2C 802180AC 4406C000 */ mfc1 $a2, $f24 -/* 669E30 802180B0 4407D000 */ mfc1 $a3, $f26 -/* 669E34 802180B4 C6360000 */ lwc1 $f22, ($s1) -/* 669E38 802180B8 E6200004 */ swc1 $f0, 4($s1) -/* 669E3C 802180BC C674014C */ lwc1 $f20, 0x14c($s3) -/* 669E40 802180C0 4600B306 */ mov.s $f12, $f22 -/* 669E44 802180C4 4600A386 */ mov.s $f14, $f20 -/* 669E48 802180C8 0C00A720 */ jal atan2 -/* 669E4C 802180CC E6340008 */ swc1 $f20, 8($s1) -/* 669E50 802180D0 4600B306 */ mov.s $f12, $f22 -/* 669E54 802180D4 4406C000 */ mfc1 $a2, $f24 -/* 669E58 802180D8 4407D000 */ mfc1 $a3, $f26 -/* 669E5C 802180DC 4600A386 */ mov.s $f14, $f20 -/* 669E60 802180E0 0C00A7B5 */ jal dist2D -/* 669E64 802180E4 E6200048 */ swc1 $f0, 0x48($s1) -/* 669E68 802180E8 86220064 */ lh $v0, 0x64($s1) -/* 669E6C 802180EC 46000106 */ mov.s $f4, $f0 -/* 669E70 802180F0 14400012 */ bnez $v0, .L8021813C -/* 669E74 802180F4 E624004C */ swc1 $f4, 0x4c($s1) -/* 669E78 802180F8 C6200040 */ lwc1 $f0, 0x40($s1) -/* 669E7C 802180FC C6220040 */ lwc1 $f2, 0x40($s1) -/* 669E80 80218100 46002003 */ div.s $f0, $f4, $f0 -/* 669E84 80218104 4600028D */ trunc.w.s $f10, $f0 -/* 669E88 80218108 44035000 */ mfc1 $v1, $f10 -/* 669E8C 8021810C 00000000 */ nop -/* 669E90 80218110 00031400 */ sll $v0, $v1, 0x10 -/* 669E94 80218114 00021403 */ sra $v0, $v0, 0x10 -/* 669E98 80218118 44820000 */ mtc1 $v0, $f0 -/* 669E9C 8021811C 00000000 */ nop -/* 669EA0 80218120 46800020 */ cvt.s.w $f0, $f0 -/* 669EA4 80218124 46020002 */ mul.s $f0, $f0, $f2 -/* 669EA8 80218128 00000000 */ nop -/* 669EAC 8021812C 46002086 */ mov.s $f2, $f4 -/* 669EB0 80218130 A6230064 */ sh $v1, 0x64($s1) -/* 669EB4 80218134 0808605C */ j .L80218170 -/* 669EB8 80218138 46001201 */ sub.s $f8, $f2, $f0 -.L8021813C: -/* 669EBC 8021813C 44821000 */ mtc1 $v0, $f2 -/* 669EC0 80218140 00000000 */ nop -/* 669EC4 80218144 468010A0 */ cvt.s.w $f2, $f2 -/* 669EC8 80218148 86220064 */ lh $v0, 0x64($s1) -/* 669ECC 8021814C 46022083 */ div.s $f2, $f4, $f2 -/* 669ED0 80218150 44820000 */ mtc1 $v0, $f0 -/* 669ED4 80218154 00000000 */ nop -/* 669ED8 80218158 46800020 */ cvt.s.w $f0, $f0 -/* 669EDC 8021815C 46020002 */ mul.s $f0, $f0, $f2 -/* 669EE0 80218160 00000000 */ nop -/* 669EE4 80218164 C624004C */ lwc1 $f4, 0x4c($s1) -/* 669EE8 80218168 E6220040 */ swc1 $f2, 0x40($s1) -/* 669EEC 8021816C 46002201 */ sub.s $f8, $f4, $f0 -.L80218170: -/* 669EF0 80218170 86230064 */ lh $v1, 0x64($s1) -/* 669EF4 80218174 106001BA */ beqz $v1, .L80218860 -/* 669EF8 80218178 24020002 */ addiu $v0, $zero, 2 -/* 669EFC 8021817C 86220064 */ lh $v0, 0x64($s1) -/* 669F00 80218180 C622000C */ lwc1 $f2, 0xc($s1) -/* 669F04 80218184 3C014049 */ lui $at, 0x4049 -/* 669F08 80218188 34210FD0 */ ori $at, $at, 0xfd0 -/* 669F0C 8021818C 44810000 */ mtc1 $at, $f0 -/* 669F10 80218190 C6240000 */ lwc1 $f4, ($s1) -/* 669F14 80218194 44823000 */ mtc1 $v0, $f6 -/* 669F18 80218198 00000000 */ nop -/* 669F1C 8021819C 468031A0 */ cvt.s.w $f6, $f6 -/* 669F20 802181A0 46060003 */ div.s $f0, $f0, $f6 -/* 669F24 802181A4 46041081 */ sub.s $f2, $f2, $f4 -/* 669F28 802181A8 E620003C */ swc1 $f0, 0x3c($s1) -/* 669F2C 802181AC 44830000 */ mtc1 $v1, $f0 -/* 669F30 802181B0 00000000 */ nop -/* 669F34 802181B4 46800020 */ cvt.s.w $f0, $f0 -/* 669F38 802181B8 46001083 */ div.s $f2, $f2, $f0 -/* 669F3C 802181BC C6200010 */ lwc1 $f0, 0x10($s1) -/* 669F40 802181C0 E6220030 */ swc1 $f2, 0x30($s1) -/* 669F44 802181C4 C6220004 */ lwc1 $f2, 4($s1) -/* 669F48 802181C8 AE200044 */ sw $zero, 0x44($s1) -/* 669F4C 802181CC 46020001 */ sub.s $f0, $f0, $f2 -/* 669F50 802181D0 C6240014 */ lwc1 $f4, 0x14($s1) -/* 669F54 802181D4 46003086 */ mov.s $f2, $f6 -/* 669F58 802181D8 46020003 */ div.s $f0, $f0, $f2 -/* 669F5C 802181DC E6200034 */ swc1 $f0, 0x34($s1) -/* 669F60 802181E0 46003006 */ mov.s $f0, $f6 -/* 669F64 802181E4 46004003 */ div.s $f0, $f8, $f0 -/* 669F68 802181E8 C6220008 */ lwc1 $f2, 8($s1) -/* 669F6C 802181EC 86220066 */ lh $v0, 0x66($s1) -/* 669F70 802181F0 46022101 */ sub.s $f4, $f4, $f2 -/* 669F74 802181F4 C6220040 */ lwc1 $f2, 0x40($s1) -/* 669F78 802181F8 28420003 */ slti $v0, $v0, 3 -/* 669F7C 802181FC 46001080 */ add.s $f2, $f2, $f0 -/* 669F80 80218200 46062103 */ div.s $f4, $f4, $f6 -/* 669F84 80218204 E6240038 */ swc1 $f4, 0x38($s1) -/* 669F88 80218208 10400045 */ beqz $v0, .L80218320 -/* 669F8C 8021820C E6220040 */ swc1 $f2, 0x40($s1) -/* 669F90 80218210 86220064 */ lh $v0, 0x64($s1) -/* 669F94 80218214 24030168 */ addiu $v1, $zero, 0x168 -/* 669F98 80218218 14400002 */ bnez $v0, .L80218224 -/* 669F9C 8021821C 0062001A */ div $zero, $v1, $v0 -/* 669FA0 80218220 0007000D */ break 7 -.L80218224: -/* 669FA4 80218224 2401FFFF */ addiu $at, $zero, -1 -/* 669FA8 80218228 14410004 */ bne $v0, $at, .L8021823C -/* 669FAC 8021822C 3C018000 */ lui $at, 0x8000 -/* 669FB0 80218230 14610002 */ bne $v1, $at, .L8021823C -/* 669FB4 80218234 00000000 */ nop -/* 669FB8 80218238 0006000D */ break 6 -.L8021823C: -/* 669FBC 8021823C 00001812 */ mflo $v1 -/* 669FC0 80218240 C628004C */ lwc1 $f8, 0x4c($s1) -/* 669FC4 80218244 3C014034 */ lui $at, 0x4034 -/* 669FC8 80218248 44811800 */ mtc1 $at, $f3 -/* 669FCC 8021824C 44801000 */ mtc1 $zero, $f2 -/* 669FD0 80218250 46004021 */ cvt.d.s $f0, $f8 -/* 669FD4 80218254 46220001 */ sub.d $f0, $f0, $f2 -/* 669FD8 80218258 3C014018 */ lui $at, 0x4018 -/* 669FDC 8021825C 44811800 */ mtc1 $at, $f3 -/* 669FE0 80218260 44801000 */ mtc1 $zero, $f2 -/* 669FE4 80218264 46200220 */ cvt.s.d $f8, $f0 -/* 669FE8 80218268 46004021 */ cvt.d.s $f0, $f8 -/* 669FEC 8021826C 46220003 */ div.d $f0, $f0, $f2 -/* 669FF0 80218270 46200220 */ cvt.s.d $f8, $f0 -/* 669FF4 80218274 3C018023 */ lui $at, %hi(D_802329D0_684750) -/* 669FF8 80218278 D42229D0 */ ldc1 $f2, %lo(D_802329D0_684750)($at) -/* 669FFC 8021827C 46004021 */ cvt.d.s $f0, $f8 -/* 66A000 80218280 46220000 */ add.d $f0, $f0, $f2 -/* 66A004 80218284 3C0142B4 */ lui $at, 0x42b4 -/* 66A008 80218288 44811000 */ mtc1 $at, $f2 -/* 66A00C 8021828C 46200220 */ cvt.s.d $f8, $f0 -/* 66A010 80218290 44830000 */ mtc1 $v1, $f0 -/* 66A014 80218294 00000000 */ nop -/* 66A018 80218298 46800020 */ cvt.s.w $f0, $f0 -/* 66A01C 8021829C 86230066 */ lh $v1, 0x66($s1) -/* 66A020 802182A0 24020002 */ addiu $v0, $zero, 2 -/* 66A024 802182A4 E6220024 */ swc1 $f2, 0x24($s1) -/* 66A028 802182A8 E6280050 */ swc1 $f8, 0x50($s1) -/* 66A02C 802182AC 14620008 */ bne $v1, $v0, .L802182D0 -/* 66A030 802182B0 E6200028 */ swc1 $f0, 0x28($s1) -/* 66A034 802182B4 3C018023 */ lui $at, %hi(D_802329D8_684758) -/* 66A038 802182B8 D42229D8 */ ldc1 $f2, %lo(D_802329D8_684758)($at) -/* 66A03C 802182BC 46004021 */ cvt.d.s $f0, $f8 -/* 66A040 802182C0 46220002 */ mul.d $f0, $f0, $f2 -/* 66A044 802182C4 00000000 */ nop -/* 66A048 802182C8 46200020 */ cvt.s.d $f0, $f0 -/* 66A04C 802182CC E6200050 */ swc1 $f0, 0x50($s1) -.L802182D0: -/* 66A050 802182D0 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A054 802182D4 3C0140C9 */ lui $at, 0x40c9 -/* 66A058 802182D8 34210FD0 */ ori $at, $at, 0xfd0 -/* 66A05C 802182DC 44810000 */ mtc1 $at, $f0 -/* 66A060 802182E0 C6340044 */ lwc1 $f20, 0x44($s1) -/* 66A064 802182E4 C636003C */ lwc1 $f22, 0x3c($s1) -/* 66A068 802182E8 AE200018 */ sw $zero, 0x18($s1) -/* 66A06C 802182EC 46006302 */ mul.s $f12, $f12, $f0 -/* 66A070 802182F0 00000000 */ nop -/* 66A074 802182F4 AE20001C */ sw $zero, 0x1c($s1) -/* 66A078 802182F8 4600A521 */ cvt.d.s $f20, $f20 -/* 66A07C 802182FC 3C0143B4 */ lui $at, 0x43b4 -/* 66A080 80218300 44810000 */ mtc1 $at, $f0 -/* 66A084 80218304 4600B5A1 */ cvt.d.s $f22, $f22 -/* 66A088 80218308 0C00A85B */ jal sin_rad -/* 66A08C 8021830C 46006303 */ div.s $f12, $f12, $f0 -/* 66A090 80218310 3C018023 */ lui $at, %hi(D_802329E0_684760) -/* 66A094 80218314 D42229E0 */ ldc1 $f2, %lo(D_802329E0_684760)($at) -/* 66A098 80218318 0808610C */ j .L80218430 -/* 66A09C 8021831C 46000021 */ cvt.d.s $f0, $f0 -.L80218320: -/* 66A0A0 80218320 86220064 */ lh $v0, 0x64($s1) -/* 66A0A4 80218324 24030168 */ addiu $v1, $zero, 0x168 -/* 66A0A8 80218328 14400002 */ bnez $v0, .L80218334 -/* 66A0AC 8021832C 0062001A */ div $zero, $v1, $v0 -/* 66A0B0 80218330 0007000D */ break 7 -.L80218334: -/* 66A0B4 80218334 2401FFFF */ addiu $at, $zero, -1 -/* 66A0B8 80218338 14410004 */ bne $v0, $at, .L8021834C -/* 66A0BC 8021833C 3C018000 */ lui $at, 0x8000 -/* 66A0C0 80218340 14610002 */ bne $v1, $at, .L8021834C -/* 66A0C4 80218344 00000000 */ nop -/* 66A0C8 80218348 0006000D */ break 6 -.L8021834C: -/* 66A0CC 8021834C 00001812 */ mflo $v1 -/* 66A0D0 80218350 C628004C */ lwc1 $f8, 0x4c($s1) -/* 66A0D4 80218354 3C014034 */ lui $at, 0x4034 -/* 66A0D8 80218358 44811800 */ mtc1 $at, $f3 -/* 66A0DC 8021835C 44801000 */ mtc1 $zero, $f2 -/* 66A0E0 80218360 46004021 */ cvt.d.s $f0, $f8 -/* 66A0E4 80218364 46220001 */ sub.d $f0, $f0, $f2 -/* 66A0E8 80218368 3C014018 */ lui $at, 0x4018 -/* 66A0EC 8021836C 44811800 */ mtc1 $at, $f3 -/* 66A0F0 80218370 44801000 */ mtc1 $zero, $f2 -/* 66A0F4 80218374 46200220 */ cvt.s.d $f8, $f0 -/* 66A0F8 80218378 46004021 */ cvt.d.s $f0, $f8 -/* 66A0FC 8021837C 46220003 */ div.d $f0, $f0, $f2 -/* 66A100 80218380 46200220 */ cvt.s.d $f8, $f0 -/* 66A104 80218384 3C018023 */ lui $at, %hi(D_802329E8_684768) -/* 66A108 80218388 D42229E8 */ ldc1 $f2, %lo(D_802329E8_684768)($at) -/* 66A10C 8021838C 46004021 */ cvt.d.s $f0, $f8 -/* 66A110 80218390 46220000 */ add.d $f0, $f0, $f2 -/* 66A114 80218394 3C0142B4 */ lui $at, 0x42b4 -/* 66A118 80218398 44811000 */ mtc1 $at, $f2 -/* 66A11C 8021839C 46200220 */ cvt.s.d $f8, $f0 -/* 66A120 802183A0 44830000 */ mtc1 $v1, $f0 -/* 66A124 802183A4 00000000 */ nop -/* 66A128 802183A8 46800020 */ cvt.s.w $f0, $f0 -/* 66A12C 802183AC 86230066 */ lh $v1, 0x66($s1) -/* 66A130 802183B0 24020004 */ addiu $v0, $zero, 4 -/* 66A134 802183B4 E6220024 */ swc1 $f2, 0x24($s1) -/* 66A138 802183B8 E6280050 */ swc1 $f8, 0x50($s1) -/* 66A13C 802183BC 14620009 */ bne $v1, $v0, .L802183E4 -/* 66A140 802183C0 E6200028 */ swc1 $f0, 0x28($s1) -/* 66A144 802183C4 3C013FF4 */ lui $at, 0x3ff4 -/* 66A148 802183C8 44811800 */ mtc1 $at, $f3 -/* 66A14C 802183CC 44801000 */ mtc1 $zero, $f2 -/* 66A150 802183D0 46004021 */ cvt.d.s $f0, $f8 -/* 66A154 802183D4 46220002 */ mul.d $f0, $f0, $f2 -/* 66A158 802183D8 00000000 */ nop -/* 66A15C 802183DC 46200020 */ cvt.s.d $f0, $f0 -/* 66A160 802183E0 E6200050 */ swc1 $f0, 0x50($s1) -.L802183E4: -/* 66A164 802183E4 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A168 802183E8 3C0140C9 */ lui $at, 0x40c9 -/* 66A16C 802183EC 34210FD0 */ ori $at, $at, 0xfd0 -/* 66A170 802183F0 44810000 */ mtc1 $at, $f0 -/* 66A174 802183F4 C6340044 */ lwc1 $f20, 0x44($s1) -/* 66A178 802183F8 C636003C */ lwc1 $f22, 0x3c($s1) -/* 66A17C 802183FC AE200018 */ sw $zero, 0x18($s1) -/* 66A180 80218400 46006302 */ mul.s $f12, $f12, $f0 -/* 66A184 80218404 00000000 */ nop -/* 66A188 80218408 AE20001C */ sw $zero, 0x1c($s1) -/* 66A18C 8021840C 4600A521 */ cvt.d.s $f20, $f20 -/* 66A190 80218410 3C0143B4 */ lui $at, 0x43b4 -/* 66A194 80218414 44810000 */ mtc1 $at, $f0 -/* 66A198 80218418 4600B5A1 */ cvt.d.s $f22, $f22 -/* 66A19C 8021841C 0C00A85B */ jal sin_rad -/* 66A1A0 80218420 46006303 */ div.s $f12, $f12, $f0 -/* 66A1A4 80218424 3C018023 */ lui $at, %hi(D_802329F0_684770) -/* 66A1A8 80218428 D42229F0 */ ldc1 $f2, %lo(D_802329F0_684770)($at) -/* 66A1AC 8021842C 46000021 */ cvt.d.s $f0, $f0 -.L80218430: -/* 66A1B0 80218430 46220002 */ mul.d $f0, $f0, $f2 -/* 66A1B4 80218434 00000000 */ nop -/* 66A1B8 80218438 46360002 */ mul.d $f0, $f0, $f22 -/* 66A1BC 8021843C 00000000 */ nop -/* 66A1C0 80218440 46360000 */ add.d $f0, $f0, $f22 -/* 66A1C4 80218444 4620A500 */ add.d $f20, $f20, $f0 -/* 66A1C8 80218448 4620A520 */ cvt.s.d $f20, $f20 -/* 66A1CC 8021844C E6340044 */ swc1 $f20, 0x44($s1) -/* 66A1D0 80218450 2404FF81 */ addiu $a0, $zero, -0x7f -/* 66A1D4 80218454 8E260058 */ lw $a2, 0x58($s1) -/* 66A1D8 80218458 0C098F3F */ jal set_animation -/* 66A1DC 8021845C 24050001 */ addiu $a1, $zero, 1 -/* 66A1E0 80218460 0C05272D */ jal sfx_play_sound -/* 66A1E4 80218464 24042081 */ addiu $a0, $zero, 0x2081 -/* 66A1E8 80218468 24020001 */ addiu $v0, $zero, 1 -/* 66A1EC 8021846C AE820070 */ sw $v0, 0x70($s4) -.L80218470: -/* 66A1F0 80218470 8E830070 */ lw $v1, 0x70($s4) -/* 66A1F4 80218474 24020002 */ addiu $v0, $zero, 2 -/* 66A1F8 80218478 10620095 */ beq $v1, $v0, .L802186D0 -/* 66A1FC 8021847C 24020001 */ addiu $v0, $zero, 1 -/* 66A200 80218480 28620003 */ slti $v0, $v1, 3 -/* 66A204 80218484 10400005 */ beqz $v0, .L8021849C -/* 66A208 80218488 24020001 */ addiu $v0, $zero, 1 -/* 66A20C 8021848C 10620008 */ beq $v1, $v0, .L802184B0 -/* 66A210 80218490 0000102D */ daddu $v0, $zero, $zero -/* 66A214 80218494 08086218 */ j .L80218860 -/* 66A218 80218498 00000000 */ nop -.L8021849C: -/* 66A21C 8021849C 24020003 */ addiu $v0, $zero, 3 -/* 66A220 802184A0 106200BA */ beq $v1, $v0, .L8021878C -/* 66A224 802184A4 0000102D */ daddu $v0, $zero, $zero -/* 66A228 802184A8 08086218 */ j .L80218860 -/* 66A22C 802184AC 00000000 */ nop -.L802184B0: -/* 66A230 802184B0 C6220044 */ lwc1 $f2, 0x44($s1) -/* 66A234 802184B4 3C013FC9 */ lui $at, 0x3fc9 -/* 66A238 802184B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 66A23C 802184BC 44810000 */ mtc1 $at, $f0 -/* 66A240 802184C0 00000000 */ nop -/* 66A244 802184C4 4602003C */ c.lt.s $f0, $f2 -/* 66A248 802184C8 00000000 */ nop -/* 66A24C 802184CC 45000004 */ bc1f .L802184E0 -/* 66A250 802184D0 2404FF81 */ addiu $a0, $zero, -0x7f -/* 66A254 802184D4 8E26005C */ lw $a2, 0x5c($s1) -/* 66A258 802184D8 0C098F3F */ jal set_animation -/* 66A25C 802184DC 24050001 */ addiu $a1, $zero, 1 -.L802184E0: -/* 66A260 802184E0 C6260000 */ lwc1 $f6, ($s1) -/* 66A264 802184E4 C6200030 */ lwc1 $f0, 0x30($s1) -/* 66A268 802184E8 C6240004 */ lwc1 $f4, 4($s1) -/* 66A26C 802184EC C6760144 */ lwc1 $f22, 0x144($s3) -/* 66A270 802184F0 46003180 */ add.s $f6, $f6, $f0 -/* 66A274 802184F4 C6200034 */ lwc1 $f0, 0x34($s1) -/* 66A278 802184F8 C6220038 */ lwc1 $f2, 0x38($s1) -/* 66A27C 802184FC 46002100 */ add.s $f4, $f4, $f0 -/* 66A280 80218500 C6200008 */ lwc1 $f0, 8($s1) -/* 66A284 80218504 C6740148 */ lwc1 $f20, 0x148($s3) -/* 66A288 80218508 46020000 */ add.s $f0, $f0, $f2 -/* 66A28C 8021850C E6260000 */ swc1 $f6, ($s1) -/* 66A290 80218510 E6240004 */ swc1 $f4, 4($s1) -/* 66A294 80218514 E6200008 */ swc1 $f0, 8($s1) -/* 66A298 80218518 C6600148 */ lwc1 $f0, 0x148($s3) -/* 66A29C 8021851C 46003086 */ mov.s $f2, $f6 -/* 66A2A0 80218520 E6200018 */ swc1 $f0, 0x18($s1) -/* 66A2A4 80218524 E6620144 */ swc1 $f2, 0x144($s3) -/* 66A2A8 80218528 0C00A85B */ jal sin_rad -/* 66A2AC 8021852C C62C0044 */ lwc1 $f12, 0x44($s1) -/* 66A2B0 80218530 C6220050 */ lwc1 $f2, 0x50($s1) -/* 66A2B4 80218534 46001082 */ mul.s $f2, $f2, $f0 -/* 66A2B8 80218538 00000000 */ nop -/* 66A2BC 8021853C C6200004 */ lwc1 $f0, 4($s1) -/* 66A2C0 80218540 46020000 */ add.s $f0, $f0, $f2 -/* 66A2C4 80218544 E6600148 */ swc1 $f0, 0x148($s3) -/* 66A2C8 80218548 C6200008 */ lwc1 $f0, 8($s1) -/* 66A2CC 8021854C E660014C */ swc1 $f0, 0x14c($s3) -/* 66A2D0 80218550 C6220010 */ lwc1 $f2, 0x10($s1) -/* 66A2D4 80218554 C6600148 */ lwc1 $f0, 0x148($s3) -/* 66A2D8 80218558 4602003C */ c.lt.s $f0, $f2 -/* 66A2DC 8021855C 00000000 */ nop -/* 66A2E0 80218560 45000007 */ bc1f .L80218580 -/* 66A2E4 80218564 4600B306 */ mov.s $f12, $f22 -/* 66A2E8 80218568 86220064 */ lh $v0, 0x64($s1) -/* 66A2EC 8021856C 28420003 */ slti $v0, $v0, 3 -/* 66A2F0 80218570 54400002 */ bnel $v0, $zero, .L8021857C -/* 66A2F4 80218574 E6620148 */ swc1 $f2, 0x148($s3) -/* 66A2F8 80218578 4600B306 */ mov.s $f12, $f22 -.L8021857C: -/* 66A2FC 8021857C C6600148 */ lwc1 $f0, 0x148($s3) -.L80218580: -/* 66A300 80218580 8E660144 */ lw $a2, 0x144($s3) -/* 66A304 80218584 46000007 */ neg.s $f0, $f0 -/* 66A308 80218588 44070000 */ mfc1 $a3, $f0 -/* 66A30C 8021858C 0C00A720 */ jal atan2 -/* 66A310 80218590 4600A387 */ neg.s $f14, $f20 -/* 66A314 80218594 46000007 */ neg.s $f0, $f0 -/* 66A318 80218598 E6600164 */ swc1 $f0, 0x164($s3) -/* 66A31C 8021859C 86220066 */ lh $v0, 0x66($s1) -/* 66A320 802185A0 C6600148 */ lwc1 $f0, 0x148($s3) -/* 66A324 802185A4 28420003 */ slti $v0, $v0, 3 -/* 66A328 802185A8 10400013 */ beqz $v0, .L802185F8 -/* 66A32C 802185AC E620001C */ swc1 $f0, 0x1c($s1) -/* 66A330 802185B0 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A334 802185B4 3C0140C9 */ lui $at, 0x40c9 -/* 66A338 802185B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 66A33C 802185BC 44810000 */ mtc1 $at, $f0 -/* 66A340 802185C0 C6340044 */ lwc1 $f20, 0x44($s1) -/* 66A344 802185C4 46006302 */ mul.s $f12, $f12, $f0 -/* 66A348 802185C8 00000000 */ nop -/* 66A34C 802185CC C636003C */ lwc1 $f22, 0x3c($s1) -/* 66A350 802185D0 4600A521 */ cvt.d.s $f20, $f20 -/* 66A354 802185D4 3C0143B4 */ lui $at, 0x43b4 -/* 66A358 802185D8 44810000 */ mtc1 $at, $f0 -/* 66A35C 802185DC 4600B5A1 */ cvt.d.s $f22, $f22 -/* 66A360 802185E0 0C00A85B */ jal sin_rad -/* 66A364 802185E4 46006303 */ div.s $f12, $f12, $f0 -/* 66A368 802185E8 3C018023 */ lui $at, %hi(D_802329F8_684778) -/* 66A36C 802185EC D42229F8 */ ldc1 $f2, %lo(D_802329F8_684778)($at) -/* 66A370 802185F0 0808618F */ j .L8021863C -/* 66A374 802185F4 46000021 */ cvt.d.s $f0, $f0 -.L802185F8: -/* 66A378 802185F8 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A37C 802185FC 3C0140C9 */ lui $at, 0x40c9 -/* 66A380 80218600 34210FD0 */ ori $at, $at, 0xfd0 -/* 66A384 80218604 44810000 */ mtc1 $at, $f0 -/* 66A388 80218608 C6340044 */ lwc1 $f20, 0x44($s1) -/* 66A38C 8021860C 46006302 */ mul.s $f12, $f12, $f0 -/* 66A390 80218610 00000000 */ nop -/* 66A394 80218614 C636003C */ lwc1 $f22, 0x3c($s1) -/* 66A398 80218618 4600A521 */ cvt.d.s $f20, $f20 -/* 66A39C 8021861C 3C0143B4 */ lui $at, 0x43b4 -/* 66A3A0 80218620 44810000 */ mtc1 $at, $f0 -/* 66A3A4 80218624 4600B5A1 */ cvt.d.s $f22, $f22 -/* 66A3A8 80218628 0C00A85B */ jal sin_rad -/* 66A3AC 8021862C 46006303 */ div.s $f12, $f12, $f0 -/* 66A3B0 80218630 3C018023 */ lui $at, %hi(D_80232A00_684780) -/* 66A3B4 80218634 D4222A00 */ ldc1 $f2, %lo(D_80232A00_684780)($at) -/* 66A3B8 80218638 46000021 */ cvt.d.s $f0, $f0 -.L8021863C: -/* 66A3BC 8021863C 46220002 */ mul.d $f0, $f0, $f2 -/* 66A3C0 80218640 00000000 */ nop -/* 66A3C4 80218644 46360002 */ mul.d $f0, $f0, $f22 -/* 66A3C8 80218648 00000000 */ nop -/* 66A3CC 8021864C 46360000 */ add.d $f0, $f0, $f22 -/* 66A3D0 80218650 4620A500 */ add.d $f20, $f20, $f0 -/* 66A3D4 80218654 4620A520 */ cvt.s.d $f20, $f20 -/* 66A3D8 80218658 E6340044 */ swc1 $f20, 0x44($s1) -/* 66A3DC 8021865C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A3E0 80218660 C6200028 */ lwc1 $f0, 0x28($s1) -/* 66A3E4 80218664 46006300 */ add.s $f12, $f12, $f0 -/* 66A3E8 80218668 0C00A6C9 */ jal clamp_angle -/* 66A3EC 8021866C E62C0024 */ swc1 $f12, 0x24($s1) -/* 66A3F0 80218670 96220064 */ lhu $v0, 0x64($s1) -/* 66A3F4 80218674 E6200024 */ swc1 $f0, 0x24($s1) -/* 66A3F8 80218678 2442FFFF */ addiu $v0, $v0, -1 -/* 66A3FC 8021867C A6220064 */ sh $v0, 0x64($s1) -/* 66A400 80218680 00021400 */ sll $v0, $v0, 0x10 -/* 66A404 80218684 14400076 */ bnez $v0, .L80218860 -/* 66A408 80218688 0000102D */ daddu $v0, $zero, $zero -/* 66A40C 8021868C C6200010 */ lwc1 $f0, 0x10($s1) -/* 66A410 80218690 2404FF81 */ addiu $a0, $zero, -0x7f -/* 66A414 80218694 E6600148 */ swc1 $f0, 0x148($s3) -/* 66A418 80218698 C6200018 */ lwc1 $f0, 0x18($s1) -/* 66A41C 8021869C C622001C */ lwc1 $f2, 0x1c($s1) -/* 66A420 802186A0 8E260060 */ lw $a2, 0x60($s1) -/* 66A424 802186A4 46020001 */ sub.s $f0, $f0, $f2 -/* 66A428 802186A8 3C013FE6 */ lui $at, 0x3fe6 -/* 66A42C 802186AC 34216666 */ ori $at, $at, 0x6666 -/* 66A430 802186B0 44811000 */ mtc1 $at, $f2 -/* 66A434 802186B4 24050001 */ addiu $a1, $zero, 1 -/* 66A438 802186B8 E622003C */ swc1 $f2, 0x3c($s1) -/* 66A43C 802186BC 46000007 */ neg.s $f0, $f0 -/* 66A440 802186C0 0C098F3F */ jal set_animation -/* 66A444 802186C4 E6200044 */ swc1 $f0, 0x44($s1) -/* 66A448 802186C8 08086218 */ j .L80218860 -/* 66A44C 802186CC 24020001 */ addiu $v0, $zero, 1 -.L802186D0: -/* 66A450 802186D0 A6220064 */ sh $v0, 0x64($s1) -/* 66A454 802186D4 86220064 */ lh $v0, 0x64($s1) -/* 66A458 802186D8 24030168 */ addiu $v1, $zero, 0x168 -/* 66A45C 802186DC 14400002 */ bnez $v0, .L802186E8 -/* 66A460 802186E0 0062001A */ div $zero, $v1, $v0 -/* 66A464 802186E4 0007000D */ break 7 -.L802186E8: -/* 66A468 802186E8 2401FFFF */ addiu $at, $zero, -1 -/* 66A46C 802186EC 14410004 */ bne $v0, $at, .L80218700 -/* 66A470 802186F0 3C018000 */ lui $at, 0x8000 -/* 66A474 802186F4 14610002 */ bne $v1, $at, .L80218700 -/* 66A478 802186F8 00000000 */ nop -/* 66A47C 802186FC 0006000D */ break 6 -.L80218700: -/* 66A480 80218700 00001812 */ mflo $v1 -/* 66A484 80218704 C6220018 */ lwc1 $f2, 0x18($s1) -/* 66A488 80218708 C620001C */ lwc1 $f0, 0x1c($s1) -/* 66A48C 8021870C 3C013FE6 */ lui $at, 0x3fe6 -/* 66A490 80218710 34216666 */ ori $at, $at, 0x6666 -/* 66A494 80218714 44814000 */ mtc1 $at, $f8 -/* 66A498 80218718 C624001C */ lwc1 $f4, 0x1c($s1) -/* 66A49C 8021871C 46001081 */ sub.s $f2, $f2, $f0 -/* 66A4A0 80218720 C6200018 */ lwc1 $f0, 0x18($s1) -/* 66A4A4 80218724 3C0142B4 */ lui $at, 0x42b4 -/* 66A4A8 80218728 44813000 */ mtc1 $at, $f6 -/* 66A4AC 8021872C 46040001 */ sub.s $f0, $f0, $f4 -/* 66A4B0 80218730 E628003C */ swc1 $f8, 0x3c($s1) -/* 66A4B4 80218734 E6260024 */ swc1 $f6, 0x24($s1) -/* 66A4B8 80218738 46001087 */ neg.s $f2, $f2 -/* 66A4BC 8021873C E6220044 */ swc1 $f2, 0x44($s1) -/* 66A4C0 80218740 3C018023 */ lui $at, %hi(D_80232A08_684788) -/* 66A4C4 80218744 D4222A08 */ ldc1 $f2, %lo(D_80232A08_684788)($at) -/* 66A4C8 80218748 46000005 */ abs.s $f0, $f0 -/* 66A4CC 8021874C 46000021 */ cvt.d.s $f0, $f0 -/* 66A4D0 80218750 46220003 */ div.d $f0, $f0, $f2 -/* 66A4D4 80218754 46200020 */ cvt.s.d $f0, $f0 -/* 66A4D8 80218758 E6200050 */ swc1 $f0, 0x50($s1) -/* 66A4DC 8021875C 44830000 */ mtc1 $v1, $f0 -/* 66A4E0 80218760 00000000 */ nop -/* 66A4E4 80218764 46800020 */ cvt.s.w $f0, $f0 -/* 66A4E8 80218768 E6200028 */ swc1 $f0, 0x28($s1) -/* 66A4EC 8021876C C6600144 */ lwc1 $f0, 0x144($s3) -/* 66A4F0 80218770 E6200000 */ swc1 $f0, ($s1) -/* 66A4F4 80218774 C6600148 */ lwc1 $f0, 0x148($s3) -/* 66A4F8 80218778 E6200004 */ swc1 $f0, 4($s1) -/* 66A4FC 8021877C C660014C */ lwc1 $f0, 0x14c($s3) -/* 66A500 80218780 24020003 */ addiu $v0, $zero, 3 -/* 66A504 80218784 E6200008 */ swc1 $f0, 8($s1) -/* 66A508 80218788 AE820070 */ sw $v0, 0x70($s4) -.L8021878C: -/* 66A50C 8021878C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A510 80218790 3C0140C9 */ lui $at, 0x40c9 -/* 66A514 80218794 34210FD0 */ ori $at, $at, 0xfd0 -/* 66A518 80218798 4481B000 */ mtc1 $at, $f22 -/* 66A51C 8021879C 00000000 */ nop -/* 66A520 802187A0 46166302 */ mul.s $f12, $f12, $f22 -/* 66A524 802187A4 00000000 */ nop -/* 66A528 802187A8 C6340000 */ lwc1 $f20, ($s1) -/* 66A52C 802187AC 3C0143B4 */ lui $at, 0x43b4 -/* 66A530 802187B0 4481C000 */ mtc1 $at, $f24 -/* 66A534 802187B4 4600A521 */ cvt.d.s $f20, $f20 -/* 66A538 802187B8 0C00A85B */ jal sin_rad -/* 66A53C 802187BC 46186303 */ div.s $f12, $f12, $f24 -/* 66A540 802187C0 C6220050 */ lwc1 $f2, 0x50($s1) -/* 66A544 802187C4 46001082 */ mul.s $f2, $f2, $f0 -/* 66A548 802187C8 00000000 */ nop -/* 66A54C 802187CC C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A550 802187D0 46166302 */ mul.s $f12, $f12, $f22 -/* 66A554 802187D4 00000000 */ nop -/* 66A558 802187D8 3C018023 */ lui $at, %hi(D_80232A10_684790) -/* 66A55C 802187DC D4202A10 */ ldc1 $f0, %lo(D_80232A10_684790)($at) -/* 66A560 802187E0 460010A1 */ cvt.d.s $f2, $f2 -/* 66A564 802187E4 46201083 */ div.d $f2, $f2, $f0 -/* 66A568 802187E8 4622A500 */ add.d $f20, $f20, $f2 -/* 66A56C 802187EC 46186303 */ div.s $f12, $f12, $f24 -/* 66A570 802187F0 4620A520 */ cvt.s.d $f20, $f20 -/* 66A574 802187F4 0C00A85B */ jal sin_rad -/* 66A578 802187F8 E6340000 */ swc1 $f20, ($s1) -/* 66A57C 802187FC C6220050 */ lwc1 $f2, 0x50($s1) -/* 66A580 80218800 46001082 */ mul.s $f2, $f2, $f0 -/* 66A584 80218804 00000000 */ nop -/* 66A588 80218808 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 66A58C 8021880C C6200028 */ lwc1 $f0, 0x28($s1) -/* 66A590 80218810 46006300 */ add.s $f12, $f12, $f0 -/* 66A594 80218814 C6200004 */ lwc1 $f0, 4($s1) -/* 66A598 80218818 46020001 */ sub.s $f0, $f0, $f2 -/* 66A59C 8021881C E62C0024 */ swc1 $f12, 0x24($s1) -/* 66A5A0 80218820 0C00A6C9 */ jal clamp_angle -/* 66A5A4 80218824 E6200004 */ swc1 $f0, 4($s1) -/* 66A5A8 80218828 C6220000 */ lwc1 $f2, ($s1) -/* 66A5AC 8021882C E6200024 */ swc1 $f0, 0x24($s1) -/* 66A5B0 80218830 E6620144 */ swc1 $f2, 0x144($s3) -/* 66A5B4 80218834 C6200004 */ lwc1 $f0, 4($s1) -/* 66A5B8 80218838 E6600148 */ swc1 $f0, 0x148($s3) -/* 66A5BC 8021883C C6200008 */ lwc1 $f0, 8($s1) -/* 66A5C0 80218840 E660014C */ swc1 $f0, 0x14c($s3) -/* 66A5C4 80218844 96230064 */ lhu $v1, 0x64($s1) -/* 66A5C8 80218848 2463FFFF */ addiu $v1, $v1, -1 -/* 66A5CC 8021884C A6230064 */ sh $v1, 0x64($s1) -/* 66A5D0 80218850 00031C00 */ sll $v1, $v1, 0x10 -/* 66A5D4 80218854 10600002 */ beqz $v1, .L80218860 -/* 66A5D8 80218858 24020001 */ addiu $v0, $zero, 1 -/* 66A5DC 8021885C 0000102D */ daddu $v0, $zero, $zero -.L80218860: -/* 66A5E0 80218860 8FBF0024 */ lw $ra, 0x24($sp) -/* 66A5E4 80218864 8FB40020 */ lw $s4, 0x20($sp) -/* 66A5E8 80218868 8FB3001C */ lw $s3, 0x1c($sp) -/* 66A5EC 8021886C 8FB20018 */ lw $s2, 0x18($sp) -/* 66A5F0 80218870 8FB10014 */ lw $s1, 0x14($sp) -/* 66A5F4 80218874 8FB00010 */ lw $s0, 0x10($sp) -/* 66A5F8 80218878 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 66A5FC 8021887C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 66A600 80218880 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 66A604 80218884 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 66A608 80218888 03E00008 */ jr $ra -/* 66A60C 8021888C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s index 2cb920bce7..41ea3ebd69 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s +++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80232A18_684798 +.double 4.800000000000001 + +.section .text + glabel func_80218E88_66AC08 /* 66AC08 80218E88 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 66AC0C 80218E8C AFBF002C */ sw $ra, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s index 2469f2592e..8cd952f98f 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s +++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219524_66B2A4.s @@ -1,6 +1,122 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + + +dlabel jtbl_80232A20_6847A0 +.word L80219578_66B2F8, L80219584_66B304, L80219590_66B310, L8021959C_66B31C, L802195D4_66B354, L802195B4_66B334, L802195C0_66B340, L802195CC_66B34C, L802195A8_66B328, 0, 0, 0 + +dlabel D_80232A50_6847D0 +.word 0x7072615F, 0x62743031, 0x5F686974, 0x00000000 + +dlabel D_80232A60_6847E0 +.word 0x7072615F, 0x62743031, 0x5F736861, 0x70650000 + +dlabel D_80232A70_6847F0 +.word 0x7072615F, 0x74657800 + +dlabel D_80232A78_6847F8 +.word 0x7072615F, 0x62743032, 0x5F686974, 0x00000000 + +dlabel D_80232A88_684808 +.word 0x7072615F, 0x62743032, 0x5F736861, 0x70650000 + +dlabel D_80232A98_684818 +.word 0x7072615F, 0x74657800 + +dlabel D_80232AA0_684820 +.word 0x7072615F, 0x62743033, 0x5F686974, 0x00000000 + +dlabel D_80232AB0_684830 +.word 0x7072615F, 0x62743033, 0x5F736861, 0x70650000 + +dlabel D_80232AC0_684840 +.word 0x7072615F, 0x74657800 + +dlabel D_80232AC8_684848 +.word 0x7072615F, 0x62743033, 0x5F686974, 0x00000000 + +dlabel D_80232AD8_684858 +.word 0x7072615F, 0x62743033, 0x5F736861, 0x70650000 + +dlabel D_80232AE8_684868 +.word 0x7072615F, 0x74657800 + +dlabel D_80232AF0_684870 +.word 0x7072615F, 0x62743033, 0x5F686974, 0x00000000 + +dlabel D_80232B00_684880 +.word 0x7072615F, 0x62743033, 0x5F736861, 0x70650000 + +dlabel D_80232B10_684890 +.word 0x7072615F, 0x74657800 + +dlabel D_80232B18_684898 +.word 0x7072615F, 0x62743034, 0x5F686974, 0x00000000 + +dlabel D_80232B28_6848A8 +.word 0x7072615F, 0x62743034, 0x5F736861, 0x70650000 + +dlabel D_80232B38_6848B8 +.word 0x7072615F, 0x74657800 + +dlabel D_80232B40_6848C0 +.word 0x837A838F, 0x83438367, 0x834B837B, 0x83937882, 0x512C836F, 0x8350836F, 0x83500000 + +dlabel D_80232B5C_6848DC +.word 0x836F8350, 0x836F8350, 0x7882512C, 0x834F838C, 0x8343834A, 0x83818362, 0x834E2C83, 0x8C836283, 0x68834A83, 0x81836283, 0x4E000000 + +dlabel D_80232B88_684908 +.word 0x836F8350, 0x836F8350, 0x2C837A83, 0x8F834383, 0x67834B83, 0x7B83932C, 0x836F8350, 0x836F8350, 0x00000000 + +dlabel D_80232BAC_68492C +.word 0x836F8350, 0x836F8350, 0x7882512C, 0x838C8362, 0x8368834A, 0x83818362, 0x834E0000 + +dlabel D_80232BC8_684948 +.word 0x836F8350, 0x836F8350, 0x2C838C83, 0x62836883, 0x4A838183, 0x62834E00 + +dlabel D_80232BE0_684960 +.word 0x836F8350, 0x836F8350, 0x2C836F83, 0x54836F83, 0x54836083, 0x85838B83, 0x8B2C836F, 0x8350836F, 0x83500000 + +dlabel D_80232C04_684984 +.word 0x836F8350, 0x836F8350, 0x7882512C, 0x836F8354, 0x836F8354, 0x83608385, 0x838B838B, 0x00000000 + +dlabel D_80232C24_6849A4 +.word 0x836F8350, 0x836F8350, 0x78340000 + +dlabel D_80232C30_6849B0 +.word 0x836F8350, 0x836F8350, 0x78330000 + +dlabel D_80232C3C_6849BC +.word 0x836F8350, 0x836F8350, 0x78320000 + +dlabel D_80232C48_6849C8 +.word 0x836F8350, 0x836F8350, 0x00000000 + +dlabel D_80232C54_6849D4 +.word 0x836F8354, 0x836F8354, 0x83608385, 0x838B838B, 0x7882512C, 0x836F8350, 0x836F8350, 0x00000000 + +dlabel D_80232C74_6849F4 +.word 0x7072615F, 0x30340000 + +dlabel D_80232C7C_6849FC +.word 0x7072615F, 0x30336300 + +dlabel D_80232C84_684A04 +.word 0x7072615F, 0x30336200 + +dlabel D_80232C8C_684A0C +.word 0x7072615F, 0x30330000 + +dlabel D_80232C94_684A14 +.word 0x7072615F, 0x30320000 + +dlabel D_80232C9C_684A1C +.word 0x7072615F, 0x30310000, 0x00000000, 0x00000000, 0x00000000 + +.section .text + glabel func_80219524_66B2A4 /* 66B2A4 80219524 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 66B2A8 80219528 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s deleted file mode 100644 index 25e1c85fe5..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218000_623BA0.s +++ /dev/null @@ -1,576 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_623BA0 -/* 623BA0 80218000 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 623BA4 80218004 AFB40020 */ sw $s4, 0x20($sp) -/* 623BA8 80218008 0080A02D */ daddu $s4, $a0, $zero -/* 623BAC 8021800C AFB00010 */ sw $s0, 0x10($sp) -/* 623BB0 80218010 AFBF0024 */ sw $ra, 0x24($sp) -/* 623BB4 80218014 AFB3001C */ sw $s3, 0x1c($sp) -/* 623BB8 80218018 AFB20018 */ sw $s2, 0x18($sp) -/* 623BBC 8021801C AFB10014 */ sw $s1, 0x14($sp) -/* 623BC0 80218020 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 623BC4 80218024 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 623BC8 80218028 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 623BCC 8021802C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 623BD0 80218030 8E840148 */ lw $a0, 0x148($s4) -/* 623BD4 80218034 8E92000C */ lw $s2, 0xc($s4) -/* 623BD8 80218038 0C09A75B */ jal get_actor -/* 623BDC 8021803C 00A0802D */ daddu $s0, $a1, $zero -/* 623BE0 80218040 0040982D */ daddu $s3, $v0, $zero -/* 623BE4 80218044 12000011 */ beqz $s0, .L8021808C -/* 623BE8 80218048 2671000C */ addiu $s1, $s3, 0xc -/* 623BEC 8021804C 8E450000 */ lw $a1, ($s2) -/* 623BF0 80218050 26520004 */ addiu $s2, $s2, 4 -/* 623BF4 80218054 0C0B1EAF */ jal evt_get_variable -/* 623BF8 80218058 0280202D */ daddu $a0, $s4, $zero -/* 623BFC 8021805C A6620070 */ sh $v0, 0x70($s3) -/* 623C00 80218060 8E450000 */ lw $a1, ($s2) -/* 623C04 80218064 0C0B1EAF */ jal evt_get_variable -/* 623C08 80218068 0280202D */ daddu $a0, $s4, $zero -/* 623C0C 8021806C A6620072 */ sh $v0, 0x72($s3) -/* 623C10 80218070 AE800074 */ sw $zero, 0x74($s4) -/* 623C14 80218074 AE800070 */ sw $zero, 0x70($s4) -/* 623C18 80218078 86630072 */ lh $v1, 0x72($s3) -/* 623C1C 8021807C 24020001 */ addiu $v0, $zero, 1 -/* 623C20 80218080 14620002 */ bne $v1, $v0, .L8021808C -/* 623C24 80218084 24020002 */ addiu $v0, $zero, 2 -/* 623C28 80218088 AE820070 */ sw $v0, 0x70($s4) -.L8021808C: -/* 623C2C 8021808C 8E820070 */ lw $v0, 0x70($s4) -/* 623C30 80218090 144000F7 */ bnez $v0, .L80218470 -/* 623C34 80218094 00000000 */ nop -/* 623C38 80218098 C6600144 */ lwc1 $f0, 0x144($s3) -/* 623C3C 8021809C C638000C */ lwc1 $f24, 0xc($s1) -/* 623C40 802180A0 C63A0014 */ lwc1 $f26, 0x14($s1) -/* 623C44 802180A4 E6200000 */ swc1 $f0, ($s1) -/* 623C48 802180A8 C6600148 */ lwc1 $f0, 0x148($s3) -/* 623C4C 802180AC 4406C000 */ mfc1 $a2, $f24 -/* 623C50 802180B0 4407D000 */ mfc1 $a3, $f26 -/* 623C54 802180B4 C6360000 */ lwc1 $f22, ($s1) -/* 623C58 802180B8 E6200004 */ swc1 $f0, 4($s1) -/* 623C5C 802180BC C674014C */ lwc1 $f20, 0x14c($s3) -/* 623C60 802180C0 4600B306 */ mov.s $f12, $f22 -/* 623C64 802180C4 4600A386 */ mov.s $f14, $f20 -/* 623C68 802180C8 0C00A720 */ jal atan2 -/* 623C6C 802180CC E6340008 */ swc1 $f20, 8($s1) -/* 623C70 802180D0 4600B306 */ mov.s $f12, $f22 -/* 623C74 802180D4 4406C000 */ mfc1 $a2, $f24 -/* 623C78 802180D8 4407D000 */ mfc1 $a3, $f26 -/* 623C7C 802180DC 4600A386 */ mov.s $f14, $f20 -/* 623C80 802180E0 0C00A7B5 */ jal dist2D -/* 623C84 802180E4 E6200048 */ swc1 $f0, 0x48($s1) -/* 623C88 802180E8 86220064 */ lh $v0, 0x64($s1) -/* 623C8C 802180EC 46000106 */ mov.s $f4, $f0 -/* 623C90 802180F0 14400012 */ bnez $v0, .L8021813C -/* 623C94 802180F4 E624004C */ swc1 $f4, 0x4c($s1) -/* 623C98 802180F8 C6200040 */ lwc1 $f0, 0x40($s1) -/* 623C9C 802180FC C6220040 */ lwc1 $f2, 0x40($s1) -/* 623CA0 80218100 46002003 */ div.s $f0, $f4, $f0 -/* 623CA4 80218104 4600028D */ trunc.w.s $f10, $f0 -/* 623CA8 80218108 44035000 */ mfc1 $v1, $f10 -/* 623CAC 8021810C 00000000 */ nop -/* 623CB0 80218110 00031400 */ sll $v0, $v1, 0x10 -/* 623CB4 80218114 00021403 */ sra $v0, $v0, 0x10 -/* 623CB8 80218118 44820000 */ mtc1 $v0, $f0 -/* 623CBC 8021811C 00000000 */ nop -/* 623CC0 80218120 46800020 */ cvt.s.w $f0, $f0 -/* 623CC4 80218124 46020002 */ mul.s $f0, $f0, $f2 -/* 623CC8 80218128 00000000 */ nop -/* 623CCC 8021812C 46002086 */ mov.s $f2, $f4 -/* 623CD0 80218130 A6230064 */ sh $v1, 0x64($s1) -/* 623CD4 80218134 0808605C */ j .L80218170 -/* 623CD8 80218138 46001201 */ sub.s $f8, $f2, $f0 -.L8021813C: -/* 623CDC 8021813C 44821000 */ mtc1 $v0, $f2 -/* 623CE0 80218140 00000000 */ nop -/* 623CE4 80218144 468010A0 */ cvt.s.w $f2, $f2 -/* 623CE8 80218148 86220064 */ lh $v0, 0x64($s1) -/* 623CEC 8021814C 46022083 */ div.s $f2, $f4, $f2 -/* 623CF0 80218150 44820000 */ mtc1 $v0, $f0 -/* 623CF4 80218154 00000000 */ nop -/* 623CF8 80218158 46800020 */ cvt.s.w $f0, $f0 -/* 623CFC 8021815C 46020002 */ mul.s $f0, $f0, $f2 -/* 623D00 80218160 00000000 */ nop -/* 623D04 80218164 C624004C */ lwc1 $f4, 0x4c($s1) -/* 623D08 80218168 E6220040 */ swc1 $f2, 0x40($s1) -/* 623D0C 8021816C 46002201 */ sub.s $f8, $f4, $f0 -.L80218170: -/* 623D10 80218170 86230064 */ lh $v1, 0x64($s1) -/* 623D14 80218174 106001BA */ beqz $v1, .L80218860 -/* 623D18 80218178 24020002 */ addiu $v0, $zero, 2 -/* 623D1C 8021817C 86220064 */ lh $v0, 0x64($s1) -/* 623D20 80218180 C622000C */ lwc1 $f2, 0xc($s1) -/* 623D24 80218184 3C014049 */ lui $at, 0x4049 -/* 623D28 80218188 34210FD0 */ ori $at, $at, 0xfd0 -/* 623D2C 8021818C 44810000 */ mtc1 $at, $f0 -/* 623D30 80218190 C6240000 */ lwc1 $f4, ($s1) -/* 623D34 80218194 44823000 */ mtc1 $v0, $f6 -/* 623D38 80218198 00000000 */ nop -/* 623D3C 8021819C 468031A0 */ cvt.s.w $f6, $f6 -/* 623D40 802181A0 46060003 */ div.s $f0, $f0, $f6 -/* 623D44 802181A4 46041081 */ sub.s $f2, $f2, $f4 -/* 623D48 802181A8 E620003C */ swc1 $f0, 0x3c($s1) -/* 623D4C 802181AC 44830000 */ mtc1 $v1, $f0 -/* 623D50 802181B0 00000000 */ nop -/* 623D54 802181B4 46800020 */ cvt.s.w $f0, $f0 -/* 623D58 802181B8 46001083 */ div.s $f2, $f2, $f0 -/* 623D5C 802181BC C6200010 */ lwc1 $f0, 0x10($s1) -/* 623D60 802181C0 E6220030 */ swc1 $f2, 0x30($s1) -/* 623D64 802181C4 C6220004 */ lwc1 $f2, 4($s1) -/* 623D68 802181C8 AE200044 */ sw $zero, 0x44($s1) -/* 623D6C 802181CC 46020001 */ sub.s $f0, $f0, $f2 -/* 623D70 802181D0 C6240014 */ lwc1 $f4, 0x14($s1) -/* 623D74 802181D4 46003086 */ mov.s $f2, $f6 -/* 623D78 802181D8 46020003 */ div.s $f0, $f0, $f2 -/* 623D7C 802181DC E6200034 */ swc1 $f0, 0x34($s1) -/* 623D80 802181E0 46003006 */ mov.s $f0, $f6 -/* 623D84 802181E4 46004003 */ div.s $f0, $f8, $f0 -/* 623D88 802181E8 C6220008 */ lwc1 $f2, 8($s1) -/* 623D8C 802181EC 86220066 */ lh $v0, 0x66($s1) -/* 623D90 802181F0 46022101 */ sub.s $f4, $f4, $f2 -/* 623D94 802181F4 C6220040 */ lwc1 $f2, 0x40($s1) -/* 623D98 802181F8 28420003 */ slti $v0, $v0, 3 -/* 623D9C 802181FC 46001080 */ add.s $f2, $f2, $f0 -/* 623DA0 80218200 46062103 */ div.s $f4, $f4, $f6 -/* 623DA4 80218204 E6240038 */ swc1 $f4, 0x38($s1) -/* 623DA8 80218208 10400045 */ beqz $v0, .L80218320 -/* 623DAC 8021820C E6220040 */ swc1 $f2, 0x40($s1) -/* 623DB0 80218210 86220064 */ lh $v0, 0x64($s1) -/* 623DB4 80218214 24030168 */ addiu $v1, $zero, 0x168 -/* 623DB8 80218218 14400002 */ bnez $v0, .L80218224 -/* 623DBC 8021821C 0062001A */ div $zero, $v1, $v0 -/* 623DC0 80218220 0007000D */ break 7 -.L80218224: -/* 623DC4 80218224 2401FFFF */ addiu $at, $zero, -1 -/* 623DC8 80218228 14410004 */ bne $v0, $at, .L8021823C -/* 623DCC 8021822C 3C018000 */ lui $at, 0x8000 -/* 623DD0 80218230 14610002 */ bne $v1, $at, .L8021823C -/* 623DD4 80218234 00000000 */ nop -/* 623DD8 80218238 0006000D */ break 6 -.L8021823C: -/* 623DDC 8021823C 00001812 */ mflo $v1 -/* 623DE0 80218240 C628004C */ lwc1 $f8, 0x4c($s1) -/* 623DE4 80218244 3C014034 */ lui $at, 0x4034 -/* 623DE8 80218248 44811800 */ mtc1 $at, $f3 -/* 623DEC 8021824C 44801000 */ mtc1 $zero, $f2 -/* 623DF0 80218250 46004021 */ cvt.d.s $f0, $f8 -/* 623DF4 80218254 46220001 */ sub.d $f0, $f0, $f2 -/* 623DF8 80218258 3C014018 */ lui $at, 0x4018 -/* 623DFC 8021825C 44811800 */ mtc1 $at, $f3 -/* 623E00 80218260 44801000 */ mtc1 $zero, $f2 -/* 623E04 80218264 46200220 */ cvt.s.d $f8, $f0 -/* 623E08 80218268 46004021 */ cvt.d.s $f0, $f8 -/* 623E0C 8021826C 46220003 */ div.d $f0, $f0, $f2 -/* 623E10 80218270 46200220 */ cvt.s.d $f8, $f0 -/* 623E14 80218274 3C018023 */ lui $at, %hi(D_802312D0_63CE70) -/* 623E18 80218278 D42212D0 */ ldc1 $f2, %lo(D_802312D0_63CE70)($at) -/* 623E1C 8021827C 46004021 */ cvt.d.s $f0, $f8 -/* 623E20 80218280 46220000 */ add.d $f0, $f0, $f2 -/* 623E24 80218284 3C0142B4 */ lui $at, 0x42b4 -/* 623E28 80218288 44811000 */ mtc1 $at, $f2 -/* 623E2C 8021828C 46200220 */ cvt.s.d $f8, $f0 -/* 623E30 80218290 44830000 */ mtc1 $v1, $f0 -/* 623E34 80218294 00000000 */ nop -/* 623E38 80218298 46800020 */ cvt.s.w $f0, $f0 -/* 623E3C 8021829C 86230066 */ lh $v1, 0x66($s1) -/* 623E40 802182A0 24020002 */ addiu $v0, $zero, 2 -/* 623E44 802182A4 E6220024 */ swc1 $f2, 0x24($s1) -/* 623E48 802182A8 E6280050 */ swc1 $f8, 0x50($s1) -/* 623E4C 802182AC 14620008 */ bne $v1, $v0, .L802182D0 -/* 623E50 802182B0 E6200028 */ swc1 $f0, 0x28($s1) -/* 623E54 802182B4 3C018023 */ lui $at, %hi(D_802312D8_63CE78) -/* 623E58 802182B8 D42212D8 */ ldc1 $f2, %lo(D_802312D8_63CE78)($at) -/* 623E5C 802182BC 46004021 */ cvt.d.s $f0, $f8 -/* 623E60 802182C0 46220002 */ mul.d $f0, $f0, $f2 -/* 623E64 802182C4 00000000 */ nop -/* 623E68 802182C8 46200020 */ cvt.s.d $f0, $f0 -/* 623E6C 802182CC E6200050 */ swc1 $f0, 0x50($s1) -.L802182D0: -/* 623E70 802182D0 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 623E74 802182D4 3C0140C9 */ lui $at, 0x40c9 -/* 623E78 802182D8 34210FD0 */ ori $at, $at, 0xfd0 -/* 623E7C 802182DC 44810000 */ mtc1 $at, $f0 -/* 623E80 802182E0 C6340044 */ lwc1 $f20, 0x44($s1) -/* 623E84 802182E4 C636003C */ lwc1 $f22, 0x3c($s1) -/* 623E88 802182E8 AE200018 */ sw $zero, 0x18($s1) -/* 623E8C 802182EC 46006302 */ mul.s $f12, $f12, $f0 -/* 623E90 802182F0 00000000 */ nop -/* 623E94 802182F4 AE20001C */ sw $zero, 0x1c($s1) -/* 623E98 802182F8 4600A521 */ cvt.d.s $f20, $f20 -/* 623E9C 802182FC 3C0143B4 */ lui $at, 0x43b4 -/* 623EA0 80218300 44810000 */ mtc1 $at, $f0 -/* 623EA4 80218304 4600B5A1 */ cvt.d.s $f22, $f22 -/* 623EA8 80218308 0C00A85B */ jal sin_rad -/* 623EAC 8021830C 46006303 */ div.s $f12, $f12, $f0 -/* 623EB0 80218310 3C018023 */ lui $at, %hi(D_802312E0_63CE80) -/* 623EB4 80218314 D42212E0 */ ldc1 $f2, %lo(D_802312E0_63CE80)($at) -/* 623EB8 80218318 0808610C */ j .L80218430 -/* 623EBC 8021831C 46000021 */ cvt.d.s $f0, $f0 -.L80218320: -/* 623EC0 80218320 86220064 */ lh $v0, 0x64($s1) -/* 623EC4 80218324 24030168 */ addiu $v1, $zero, 0x168 -/* 623EC8 80218328 14400002 */ bnez $v0, .L80218334 -/* 623ECC 8021832C 0062001A */ div $zero, $v1, $v0 -/* 623ED0 80218330 0007000D */ break 7 -.L80218334: -/* 623ED4 80218334 2401FFFF */ addiu $at, $zero, -1 -/* 623ED8 80218338 14410004 */ bne $v0, $at, .L8021834C -/* 623EDC 8021833C 3C018000 */ lui $at, 0x8000 -/* 623EE0 80218340 14610002 */ bne $v1, $at, .L8021834C -/* 623EE4 80218344 00000000 */ nop -/* 623EE8 80218348 0006000D */ break 6 -.L8021834C: -/* 623EEC 8021834C 00001812 */ mflo $v1 -/* 623EF0 80218350 C628004C */ lwc1 $f8, 0x4c($s1) -/* 623EF4 80218354 3C014034 */ lui $at, 0x4034 -/* 623EF8 80218358 44811800 */ mtc1 $at, $f3 -/* 623EFC 8021835C 44801000 */ mtc1 $zero, $f2 -/* 623F00 80218360 46004021 */ cvt.d.s $f0, $f8 -/* 623F04 80218364 46220001 */ sub.d $f0, $f0, $f2 -/* 623F08 80218368 3C014018 */ lui $at, 0x4018 -/* 623F0C 8021836C 44811800 */ mtc1 $at, $f3 -/* 623F10 80218370 44801000 */ mtc1 $zero, $f2 -/* 623F14 80218374 46200220 */ cvt.s.d $f8, $f0 -/* 623F18 80218378 46004021 */ cvt.d.s $f0, $f8 -/* 623F1C 8021837C 46220003 */ div.d $f0, $f0, $f2 -/* 623F20 80218380 46200220 */ cvt.s.d $f8, $f0 -/* 623F24 80218384 3C018023 */ lui $at, %hi(D_802312E8_63CE88) -/* 623F28 80218388 D42212E8 */ ldc1 $f2, %lo(D_802312E8_63CE88)($at) -/* 623F2C 8021838C 46004021 */ cvt.d.s $f0, $f8 -/* 623F30 80218390 46220000 */ add.d $f0, $f0, $f2 -/* 623F34 80218394 3C0142B4 */ lui $at, 0x42b4 -/* 623F38 80218398 44811000 */ mtc1 $at, $f2 -/* 623F3C 8021839C 46200220 */ cvt.s.d $f8, $f0 -/* 623F40 802183A0 44830000 */ mtc1 $v1, $f0 -/* 623F44 802183A4 00000000 */ nop -/* 623F48 802183A8 46800020 */ cvt.s.w $f0, $f0 -/* 623F4C 802183AC 86230066 */ lh $v1, 0x66($s1) -/* 623F50 802183B0 24020004 */ addiu $v0, $zero, 4 -/* 623F54 802183B4 E6220024 */ swc1 $f2, 0x24($s1) -/* 623F58 802183B8 E6280050 */ swc1 $f8, 0x50($s1) -/* 623F5C 802183BC 14620009 */ bne $v1, $v0, .L802183E4 -/* 623F60 802183C0 E6200028 */ swc1 $f0, 0x28($s1) -/* 623F64 802183C4 3C013FF4 */ lui $at, 0x3ff4 -/* 623F68 802183C8 44811800 */ mtc1 $at, $f3 -/* 623F6C 802183CC 44801000 */ mtc1 $zero, $f2 -/* 623F70 802183D0 46004021 */ cvt.d.s $f0, $f8 -/* 623F74 802183D4 46220002 */ mul.d $f0, $f0, $f2 -/* 623F78 802183D8 00000000 */ nop -/* 623F7C 802183DC 46200020 */ cvt.s.d $f0, $f0 -/* 623F80 802183E0 E6200050 */ swc1 $f0, 0x50($s1) -.L802183E4: -/* 623F84 802183E4 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 623F88 802183E8 3C0140C9 */ lui $at, 0x40c9 -/* 623F8C 802183EC 34210FD0 */ ori $at, $at, 0xfd0 -/* 623F90 802183F0 44810000 */ mtc1 $at, $f0 -/* 623F94 802183F4 C6340044 */ lwc1 $f20, 0x44($s1) -/* 623F98 802183F8 C636003C */ lwc1 $f22, 0x3c($s1) -/* 623F9C 802183FC AE200018 */ sw $zero, 0x18($s1) -/* 623FA0 80218400 46006302 */ mul.s $f12, $f12, $f0 -/* 623FA4 80218404 00000000 */ nop -/* 623FA8 80218408 AE20001C */ sw $zero, 0x1c($s1) -/* 623FAC 8021840C 4600A521 */ cvt.d.s $f20, $f20 -/* 623FB0 80218410 3C0143B4 */ lui $at, 0x43b4 -/* 623FB4 80218414 44810000 */ mtc1 $at, $f0 -/* 623FB8 80218418 4600B5A1 */ cvt.d.s $f22, $f22 -/* 623FBC 8021841C 0C00A85B */ jal sin_rad -/* 623FC0 80218420 46006303 */ div.s $f12, $f12, $f0 -/* 623FC4 80218424 3C018023 */ lui $at, %hi(D_802312F0_63CE90) -/* 623FC8 80218428 D42212F0 */ ldc1 $f2, %lo(D_802312F0_63CE90)($at) -/* 623FCC 8021842C 46000021 */ cvt.d.s $f0, $f0 -.L80218430: -/* 623FD0 80218430 46220002 */ mul.d $f0, $f0, $f2 -/* 623FD4 80218434 00000000 */ nop -/* 623FD8 80218438 46360002 */ mul.d $f0, $f0, $f22 -/* 623FDC 8021843C 00000000 */ nop -/* 623FE0 80218440 46360000 */ add.d $f0, $f0, $f22 -/* 623FE4 80218444 4620A500 */ add.d $f20, $f20, $f0 -/* 623FE8 80218448 4620A520 */ cvt.s.d $f20, $f20 -/* 623FEC 8021844C E6340044 */ swc1 $f20, 0x44($s1) -/* 623FF0 80218450 2404FF81 */ addiu $a0, $zero, -0x7f -/* 623FF4 80218454 8E260058 */ lw $a2, 0x58($s1) -/* 623FF8 80218458 0C098F3F */ jal set_animation -/* 623FFC 8021845C 24050001 */ addiu $a1, $zero, 1 -/* 624000 80218460 0C05272D */ jal sfx_play_sound -/* 624004 80218464 24042081 */ addiu $a0, $zero, 0x2081 -/* 624008 80218468 24020001 */ addiu $v0, $zero, 1 -/* 62400C 8021846C AE820070 */ sw $v0, 0x70($s4) -.L80218470: -/* 624010 80218470 8E830070 */ lw $v1, 0x70($s4) -/* 624014 80218474 24020002 */ addiu $v0, $zero, 2 -/* 624018 80218478 10620095 */ beq $v1, $v0, .L802186D0 -/* 62401C 8021847C 24020001 */ addiu $v0, $zero, 1 -/* 624020 80218480 28620003 */ slti $v0, $v1, 3 -/* 624024 80218484 10400005 */ beqz $v0, .L8021849C -/* 624028 80218488 24020001 */ addiu $v0, $zero, 1 -/* 62402C 8021848C 10620008 */ beq $v1, $v0, .L802184B0 -/* 624030 80218490 0000102D */ daddu $v0, $zero, $zero -/* 624034 80218494 08086218 */ j .L80218860 -/* 624038 80218498 00000000 */ nop -.L8021849C: -/* 62403C 8021849C 24020003 */ addiu $v0, $zero, 3 -/* 624040 802184A0 106200BA */ beq $v1, $v0, .L8021878C -/* 624044 802184A4 0000102D */ daddu $v0, $zero, $zero -/* 624048 802184A8 08086218 */ j .L80218860 -/* 62404C 802184AC 00000000 */ nop -.L802184B0: -/* 624050 802184B0 C6220044 */ lwc1 $f2, 0x44($s1) -/* 624054 802184B4 3C013FC9 */ lui $at, 0x3fc9 -/* 624058 802184B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 62405C 802184BC 44810000 */ mtc1 $at, $f0 -/* 624060 802184C0 00000000 */ nop -/* 624064 802184C4 4602003C */ c.lt.s $f0, $f2 -/* 624068 802184C8 00000000 */ nop -/* 62406C 802184CC 45000004 */ bc1f .L802184E0 -/* 624070 802184D0 2404FF81 */ addiu $a0, $zero, -0x7f -/* 624074 802184D4 8E26005C */ lw $a2, 0x5c($s1) -/* 624078 802184D8 0C098F3F */ jal set_animation -/* 62407C 802184DC 24050001 */ addiu $a1, $zero, 1 -.L802184E0: -/* 624080 802184E0 C6260000 */ lwc1 $f6, ($s1) -/* 624084 802184E4 C6200030 */ lwc1 $f0, 0x30($s1) -/* 624088 802184E8 C6240004 */ lwc1 $f4, 4($s1) -/* 62408C 802184EC C6760144 */ lwc1 $f22, 0x144($s3) -/* 624090 802184F0 46003180 */ add.s $f6, $f6, $f0 -/* 624094 802184F4 C6200034 */ lwc1 $f0, 0x34($s1) -/* 624098 802184F8 C6220038 */ lwc1 $f2, 0x38($s1) -/* 62409C 802184FC 46002100 */ add.s $f4, $f4, $f0 -/* 6240A0 80218500 C6200008 */ lwc1 $f0, 8($s1) -/* 6240A4 80218504 C6740148 */ lwc1 $f20, 0x148($s3) -/* 6240A8 80218508 46020000 */ add.s $f0, $f0, $f2 -/* 6240AC 8021850C E6260000 */ swc1 $f6, ($s1) -/* 6240B0 80218510 E6240004 */ swc1 $f4, 4($s1) -/* 6240B4 80218514 E6200008 */ swc1 $f0, 8($s1) -/* 6240B8 80218518 C6600148 */ lwc1 $f0, 0x148($s3) -/* 6240BC 8021851C 46003086 */ mov.s $f2, $f6 -/* 6240C0 80218520 E6200018 */ swc1 $f0, 0x18($s1) -/* 6240C4 80218524 E6620144 */ swc1 $f2, 0x144($s3) -/* 6240C8 80218528 0C00A85B */ jal sin_rad -/* 6240CC 8021852C C62C0044 */ lwc1 $f12, 0x44($s1) -/* 6240D0 80218530 C6220050 */ lwc1 $f2, 0x50($s1) -/* 6240D4 80218534 46001082 */ mul.s $f2, $f2, $f0 -/* 6240D8 80218538 00000000 */ nop -/* 6240DC 8021853C C6200004 */ lwc1 $f0, 4($s1) -/* 6240E0 80218540 46020000 */ add.s $f0, $f0, $f2 -/* 6240E4 80218544 E6600148 */ swc1 $f0, 0x148($s3) -/* 6240E8 80218548 C6200008 */ lwc1 $f0, 8($s1) -/* 6240EC 8021854C E660014C */ swc1 $f0, 0x14c($s3) -/* 6240F0 80218550 C6220010 */ lwc1 $f2, 0x10($s1) -/* 6240F4 80218554 C6600148 */ lwc1 $f0, 0x148($s3) -/* 6240F8 80218558 4602003C */ c.lt.s $f0, $f2 -/* 6240FC 8021855C 00000000 */ nop -/* 624100 80218560 45000007 */ bc1f .L80218580 -/* 624104 80218564 4600B306 */ mov.s $f12, $f22 -/* 624108 80218568 86220064 */ lh $v0, 0x64($s1) -/* 62410C 8021856C 28420003 */ slti $v0, $v0, 3 -/* 624110 80218570 54400002 */ bnel $v0, $zero, .L8021857C -/* 624114 80218574 E6620148 */ swc1 $f2, 0x148($s3) -/* 624118 80218578 4600B306 */ mov.s $f12, $f22 -.L8021857C: -/* 62411C 8021857C C6600148 */ lwc1 $f0, 0x148($s3) -.L80218580: -/* 624120 80218580 8E660144 */ lw $a2, 0x144($s3) -/* 624124 80218584 46000007 */ neg.s $f0, $f0 -/* 624128 80218588 44070000 */ mfc1 $a3, $f0 -/* 62412C 8021858C 0C00A720 */ jal atan2 -/* 624130 80218590 4600A387 */ neg.s $f14, $f20 -/* 624134 80218594 46000007 */ neg.s $f0, $f0 -/* 624138 80218598 E6600164 */ swc1 $f0, 0x164($s3) -/* 62413C 8021859C 86220066 */ lh $v0, 0x66($s1) -/* 624140 802185A0 C6600148 */ lwc1 $f0, 0x148($s3) -/* 624144 802185A4 28420003 */ slti $v0, $v0, 3 -/* 624148 802185A8 10400013 */ beqz $v0, .L802185F8 -/* 62414C 802185AC E620001C */ swc1 $f0, 0x1c($s1) -/* 624150 802185B0 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 624154 802185B4 3C0140C9 */ lui $at, 0x40c9 -/* 624158 802185B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 62415C 802185BC 44810000 */ mtc1 $at, $f0 -/* 624160 802185C0 C6340044 */ lwc1 $f20, 0x44($s1) -/* 624164 802185C4 46006302 */ mul.s $f12, $f12, $f0 -/* 624168 802185C8 00000000 */ nop -/* 62416C 802185CC C636003C */ lwc1 $f22, 0x3c($s1) -/* 624170 802185D0 4600A521 */ cvt.d.s $f20, $f20 -/* 624174 802185D4 3C0143B4 */ lui $at, 0x43b4 -/* 624178 802185D8 44810000 */ mtc1 $at, $f0 -/* 62417C 802185DC 4600B5A1 */ cvt.d.s $f22, $f22 -/* 624180 802185E0 0C00A85B */ jal sin_rad -/* 624184 802185E4 46006303 */ div.s $f12, $f12, $f0 -/* 624188 802185E8 3C018023 */ lui $at, %hi(D_802312F8_63CE98) -/* 62418C 802185EC D42212F8 */ ldc1 $f2, %lo(D_802312F8_63CE98)($at) -/* 624190 802185F0 0808618F */ j .L8021863C -/* 624194 802185F4 46000021 */ cvt.d.s $f0, $f0 -.L802185F8: -/* 624198 802185F8 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 62419C 802185FC 3C0140C9 */ lui $at, 0x40c9 -/* 6241A0 80218600 34210FD0 */ ori $at, $at, 0xfd0 -/* 6241A4 80218604 44810000 */ mtc1 $at, $f0 -/* 6241A8 80218608 C6340044 */ lwc1 $f20, 0x44($s1) -/* 6241AC 8021860C 46006302 */ mul.s $f12, $f12, $f0 -/* 6241B0 80218610 00000000 */ nop -/* 6241B4 80218614 C636003C */ lwc1 $f22, 0x3c($s1) -/* 6241B8 80218618 4600A521 */ cvt.d.s $f20, $f20 -/* 6241BC 8021861C 3C0143B4 */ lui $at, 0x43b4 -/* 6241C0 80218620 44810000 */ mtc1 $at, $f0 -/* 6241C4 80218624 4600B5A1 */ cvt.d.s $f22, $f22 -/* 6241C8 80218628 0C00A85B */ jal sin_rad -/* 6241CC 8021862C 46006303 */ div.s $f12, $f12, $f0 -/* 6241D0 80218630 3C018023 */ lui $at, %hi(D_80231300_63CEA0) -/* 6241D4 80218634 D4221300 */ ldc1 $f2, %lo(D_80231300_63CEA0)($at) -/* 6241D8 80218638 46000021 */ cvt.d.s $f0, $f0 -.L8021863C: -/* 6241DC 8021863C 46220002 */ mul.d $f0, $f0, $f2 -/* 6241E0 80218640 00000000 */ nop -/* 6241E4 80218644 46360002 */ mul.d $f0, $f0, $f22 -/* 6241E8 80218648 00000000 */ nop -/* 6241EC 8021864C 46360000 */ add.d $f0, $f0, $f22 -/* 6241F0 80218650 4620A500 */ add.d $f20, $f20, $f0 -/* 6241F4 80218654 4620A520 */ cvt.s.d $f20, $f20 -/* 6241F8 80218658 E6340044 */ swc1 $f20, 0x44($s1) -/* 6241FC 8021865C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 624200 80218660 C6200028 */ lwc1 $f0, 0x28($s1) -/* 624204 80218664 46006300 */ add.s $f12, $f12, $f0 -/* 624208 80218668 0C00A6C9 */ jal clamp_angle -/* 62420C 8021866C E62C0024 */ swc1 $f12, 0x24($s1) -/* 624210 80218670 96220064 */ lhu $v0, 0x64($s1) -/* 624214 80218674 E6200024 */ swc1 $f0, 0x24($s1) -/* 624218 80218678 2442FFFF */ addiu $v0, $v0, -1 -/* 62421C 8021867C A6220064 */ sh $v0, 0x64($s1) -/* 624220 80218680 00021400 */ sll $v0, $v0, 0x10 -/* 624224 80218684 14400076 */ bnez $v0, .L80218860 -/* 624228 80218688 0000102D */ daddu $v0, $zero, $zero -/* 62422C 8021868C C6200010 */ lwc1 $f0, 0x10($s1) -/* 624230 80218690 2404FF81 */ addiu $a0, $zero, -0x7f -/* 624234 80218694 E6600148 */ swc1 $f0, 0x148($s3) -/* 624238 80218698 C6200018 */ lwc1 $f0, 0x18($s1) -/* 62423C 8021869C C622001C */ lwc1 $f2, 0x1c($s1) -/* 624240 802186A0 8E260060 */ lw $a2, 0x60($s1) -/* 624244 802186A4 46020001 */ sub.s $f0, $f0, $f2 -/* 624248 802186A8 3C013FE6 */ lui $at, 0x3fe6 -/* 62424C 802186AC 34216666 */ ori $at, $at, 0x6666 -/* 624250 802186B0 44811000 */ mtc1 $at, $f2 -/* 624254 802186B4 24050001 */ addiu $a1, $zero, 1 -/* 624258 802186B8 E622003C */ swc1 $f2, 0x3c($s1) -/* 62425C 802186BC 46000007 */ neg.s $f0, $f0 -/* 624260 802186C0 0C098F3F */ jal set_animation -/* 624264 802186C4 E6200044 */ swc1 $f0, 0x44($s1) -/* 624268 802186C8 08086218 */ j .L80218860 -/* 62426C 802186CC 24020001 */ addiu $v0, $zero, 1 -.L802186D0: -/* 624270 802186D0 A6220064 */ sh $v0, 0x64($s1) -/* 624274 802186D4 86220064 */ lh $v0, 0x64($s1) -/* 624278 802186D8 24030168 */ addiu $v1, $zero, 0x168 -/* 62427C 802186DC 14400002 */ bnez $v0, .L802186E8 -/* 624280 802186E0 0062001A */ div $zero, $v1, $v0 -/* 624284 802186E4 0007000D */ break 7 -.L802186E8: -/* 624288 802186E8 2401FFFF */ addiu $at, $zero, -1 -/* 62428C 802186EC 14410004 */ bne $v0, $at, .L80218700 -/* 624290 802186F0 3C018000 */ lui $at, 0x8000 -/* 624294 802186F4 14610002 */ bne $v1, $at, .L80218700 -/* 624298 802186F8 00000000 */ nop -/* 62429C 802186FC 0006000D */ break 6 -.L80218700: -/* 6242A0 80218700 00001812 */ mflo $v1 -/* 6242A4 80218704 C6220018 */ lwc1 $f2, 0x18($s1) -/* 6242A8 80218708 C620001C */ lwc1 $f0, 0x1c($s1) -/* 6242AC 8021870C 3C013FE6 */ lui $at, 0x3fe6 -/* 6242B0 80218710 34216666 */ ori $at, $at, 0x6666 -/* 6242B4 80218714 44814000 */ mtc1 $at, $f8 -/* 6242B8 80218718 C624001C */ lwc1 $f4, 0x1c($s1) -/* 6242BC 8021871C 46001081 */ sub.s $f2, $f2, $f0 -/* 6242C0 80218720 C6200018 */ lwc1 $f0, 0x18($s1) -/* 6242C4 80218724 3C0142B4 */ lui $at, 0x42b4 -/* 6242C8 80218728 44813000 */ mtc1 $at, $f6 -/* 6242CC 8021872C 46040001 */ sub.s $f0, $f0, $f4 -/* 6242D0 80218730 E628003C */ swc1 $f8, 0x3c($s1) -/* 6242D4 80218734 E6260024 */ swc1 $f6, 0x24($s1) -/* 6242D8 80218738 46001087 */ neg.s $f2, $f2 -/* 6242DC 8021873C E6220044 */ swc1 $f2, 0x44($s1) -/* 6242E0 80218740 3C018023 */ lui $at, %hi(D_80231308_63CEA8) -/* 6242E4 80218744 D4221308 */ ldc1 $f2, %lo(D_80231308_63CEA8)($at) -/* 6242E8 80218748 46000005 */ abs.s $f0, $f0 -/* 6242EC 8021874C 46000021 */ cvt.d.s $f0, $f0 -/* 6242F0 80218750 46220003 */ div.d $f0, $f0, $f2 -/* 6242F4 80218754 46200020 */ cvt.s.d $f0, $f0 -/* 6242F8 80218758 E6200050 */ swc1 $f0, 0x50($s1) -/* 6242FC 8021875C 44830000 */ mtc1 $v1, $f0 -/* 624300 80218760 00000000 */ nop -/* 624304 80218764 46800020 */ cvt.s.w $f0, $f0 -/* 624308 80218768 E6200028 */ swc1 $f0, 0x28($s1) -/* 62430C 8021876C C6600144 */ lwc1 $f0, 0x144($s3) -/* 624310 80218770 E6200000 */ swc1 $f0, ($s1) -/* 624314 80218774 C6600148 */ lwc1 $f0, 0x148($s3) -/* 624318 80218778 E6200004 */ swc1 $f0, 4($s1) -/* 62431C 8021877C C660014C */ lwc1 $f0, 0x14c($s3) -/* 624320 80218780 24020003 */ addiu $v0, $zero, 3 -/* 624324 80218784 E6200008 */ swc1 $f0, 8($s1) -/* 624328 80218788 AE820070 */ sw $v0, 0x70($s4) -.L8021878C: -/* 62432C 8021878C C62C0024 */ lwc1 $f12, 0x24($s1) -/* 624330 80218790 3C0140C9 */ lui $at, 0x40c9 -/* 624334 80218794 34210FD0 */ ori $at, $at, 0xfd0 -/* 624338 80218798 4481B000 */ mtc1 $at, $f22 -/* 62433C 8021879C 00000000 */ nop -/* 624340 802187A0 46166302 */ mul.s $f12, $f12, $f22 -/* 624344 802187A4 00000000 */ nop -/* 624348 802187A8 C6340000 */ lwc1 $f20, ($s1) -/* 62434C 802187AC 3C0143B4 */ lui $at, 0x43b4 -/* 624350 802187B0 4481C000 */ mtc1 $at, $f24 -/* 624354 802187B4 4600A521 */ cvt.d.s $f20, $f20 -/* 624358 802187B8 0C00A85B */ jal sin_rad -/* 62435C 802187BC 46186303 */ div.s $f12, $f12, $f24 -/* 624360 802187C0 C6220050 */ lwc1 $f2, 0x50($s1) -/* 624364 802187C4 46001082 */ mul.s $f2, $f2, $f0 -/* 624368 802187C8 00000000 */ nop -/* 62436C 802187CC C62C0024 */ lwc1 $f12, 0x24($s1) -/* 624370 802187D0 46166302 */ mul.s $f12, $f12, $f22 -/* 624374 802187D4 00000000 */ nop -/* 624378 802187D8 3C018023 */ lui $at, %hi(D_80231310_63CEB0) -/* 62437C 802187DC D4201310 */ ldc1 $f0, %lo(D_80231310_63CEB0)($at) -/* 624380 802187E0 460010A1 */ cvt.d.s $f2, $f2 -/* 624384 802187E4 46201083 */ div.d $f2, $f2, $f0 -/* 624388 802187E8 4622A500 */ add.d $f20, $f20, $f2 -/* 62438C 802187EC 46186303 */ div.s $f12, $f12, $f24 -/* 624390 802187F0 4620A520 */ cvt.s.d $f20, $f20 -/* 624394 802187F4 0C00A85B */ jal sin_rad -/* 624398 802187F8 E6340000 */ swc1 $f20, ($s1) -/* 62439C 802187FC C6220050 */ lwc1 $f2, 0x50($s1) -/* 6243A0 80218800 46001082 */ mul.s $f2, $f2, $f0 -/* 6243A4 80218804 00000000 */ nop -/* 6243A8 80218808 C62C0024 */ lwc1 $f12, 0x24($s1) -/* 6243AC 8021880C C6200028 */ lwc1 $f0, 0x28($s1) -/* 6243B0 80218810 46006300 */ add.s $f12, $f12, $f0 -/* 6243B4 80218814 C6200004 */ lwc1 $f0, 4($s1) -/* 6243B8 80218818 46020001 */ sub.s $f0, $f0, $f2 -/* 6243BC 8021881C E62C0024 */ swc1 $f12, 0x24($s1) -/* 6243C0 80218820 0C00A6C9 */ jal clamp_angle -/* 6243C4 80218824 E6200004 */ swc1 $f0, 4($s1) -/* 6243C8 80218828 C6220000 */ lwc1 $f2, ($s1) -/* 6243CC 8021882C E6200024 */ swc1 $f0, 0x24($s1) -/* 6243D0 80218830 E6620144 */ swc1 $f2, 0x144($s3) -/* 6243D4 80218834 C6200004 */ lwc1 $f0, 4($s1) -/* 6243D8 80218838 E6600148 */ swc1 $f0, 0x148($s3) -/* 6243DC 8021883C C6200008 */ lwc1 $f0, 8($s1) -/* 6243E0 80218840 E660014C */ swc1 $f0, 0x14c($s3) -/* 6243E4 80218844 96230064 */ lhu $v1, 0x64($s1) -/* 6243E8 80218848 2463FFFF */ addiu $v1, $v1, -1 -/* 6243EC 8021884C A6230064 */ sh $v1, 0x64($s1) -/* 6243F0 80218850 00031C00 */ sll $v1, $v1, 0x10 -/* 6243F4 80218854 10600002 */ beqz $v1, .L80218860 -/* 6243F8 80218858 24020001 */ addiu $v0, $zero, 1 -/* 6243FC 8021885C 0000102D */ daddu $v0, $zero, $zero -.L80218860: -/* 624400 80218860 8FBF0024 */ lw $ra, 0x24($sp) -/* 624404 80218864 8FB40020 */ lw $s4, 0x20($sp) -/* 624408 80218868 8FB3001C */ lw $s3, 0x1c($sp) -/* 62440C 8021886C 8FB20018 */ lw $s2, 0x18($sp) -/* 624410 80218870 8FB10014 */ lw $s1, 0x14($sp) -/* 624414 80218874 8FB00010 */ lw $s0, 0x10($sp) -/* 624418 80218878 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 62441C 8021887C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 624420 80218880 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 624424 80218884 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 624428 80218888 03E00008 */ jr $ra -/* 62442C 8021888C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s index d06c17a386..cdf8fb285f 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s +++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80231318_63CEB8 +.double 4.800000000000001 + +.section .text + glabel func_80218E88_624A28 /* 624A28 80218E88 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 624A2C 80218E8C AFBF002C */ sw $ra, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s index 6ab29d1785..32dd7a2278 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s +++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219524_6250C4.s @@ -1,6 +1,147 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel jtbl_80231320_63CEC0 +.word L80219578_625118, L80219584_625124, L80219590_625130, L8021959C_62513C, L802195D4_625174, L802195B4_625154, L802195C0_625160, L802195CC_62516C, L802195A8_625148, 0, 0, 0 + + + +dlabel D_80231350_63CEF0 +.word 0x796B695F, 0x62670000 + +dlabel D_80231358_63CEF8 +.word 0x73616D5F, 0x62743031, 0x5F686974, 0x00000000 + +dlabel D_80231368_63CF08 +.word 0x73616D5F, 0x62743031, 0x5F736861, 0x70650000 + +dlabel D_80231378_63CF18 +.word 0x73616D5F, 0x74657800 + +dlabel D_80231380_63CF20 +.word 0x796B695F, 0x62670000 + +dlabel D_80231388_63CF28 +.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 + +dlabel D_80231398_63CF38 +.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 + +dlabel D_802313A8_63CF48 +.word 0x73616D5F, 0x74657800 + +dlabel D_802313B0_63CF50 +.word 0x796B695F, 0x62670000 + +dlabel D_802313B8_63CF58 +.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 + +dlabel D_802313C8_63CF68 +.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 + +dlabel D_802313D8_63CF78 +.word 0x73616D5F, 0x74657800 + +dlabel D_802313E0_63CF80 +.word 0x796B695F, 0x62670000 + +dlabel D_802313E8_63CF88 +.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 + +dlabel D_802313F8_63CF98 +.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 + +dlabel D_80231408_63CFA8 +.word 0x73616D5F, 0x74657800 + +dlabel D_80231410_63CFB0 +.word 0x796B695F, 0x62670000 + +dlabel D_80231418_63CFB8 +.word 0x73616D5F, 0x62743032, 0x5F686974, 0x00000000 + +dlabel D_80231428_63CFC8 +.word 0x73616D5F, 0x62743032, 0x5F736861, 0x70650000 + +dlabel D_80231438_63CFD8 +.word 0x73616D5F, 0x74657800 + +dlabel D_80231440_63CFE0 +.word 0x73616D5F, 0x62670000 + +dlabel D_80231448_63CFE8 +.word 0x73616D5F, 0x62743033, 0x5F686974, 0x00000000 + +dlabel D_80231458_63CFF8 +.word 0x73616D5F, 0x62743033, 0x5F736861, 0x70650000 + +dlabel D_80231468_63D008 +.word 0x73616D5F, 0x74657800 + +dlabel D_80231470_63D010 +.word 0x837A838F, 0x83438367, 0x834B837B, 0x83932C83, 0x70836283, 0x4E83932C, 0x834B837B, 0x83932C83, 0x4F838C83, 0x43834A83, 0x81836283, 0x4E000000 + +dlabel D_802314A0_63D040 +.word 0x837A838F, 0x83438367, 0x834B837B, 0x83932C83, 0x70836283, 0x4E83932C, 0x834B837B, 0x83932C83, 0x70836283, 0x4E839300 + +dlabel D_802314C8_63D068 +.word 0x837A838F, 0x83438367, 0x834B837B, 0x83937882, 0x51000000 + +dlabel D_802314DC_63D07C +.word 0x83418343, 0x83588370, 0x8362834E, 0x83932C83, 0x53836283, 0x4E83932C, 0x83418343, 0x83588370, 0x8362834E, 0x83932C83, 0x53836283, 0x4E839300 + +dlabel D_8023150C_63D0AC +.word 0x83418343, 0x83588370, 0x8362834E, 0x83932C83, 0x53836283, 0x4E83932C, 0x83418343, 0x83588370, 0x8362834E, 0x83930000 + +dlabel D_80231534_63D0D4 +.word 0x83418343, 0x83588370, 0x8362834E, 0x83937882, 0x512C8353, 0x8362834E, 0x83930000 + +dlabel D_80231550_63D0F0 +.word 0x83418343, 0x83588370, 0x8362834E, 0x83937882, 0x53000000 + +dlabel D_80231564_63D104 +.word 0x83418343, 0x83588370, 0x8362834E, 0x83937882, 0x51000000 + +dlabel D_80231578_63D118 +.word 0x83538362, 0x834E8393, 0x2C834183, 0x43835883, 0x70836283, 0x4E83932C, 0x83538362, 0x834E8393, 0x2C834183, 0x43835883, 0x70836283, 0x4E839300 + +dlabel D_802315A8_63D148 +.word 0x83538362, 0x834E8393, 0x2C834183, 0x43835883, 0x70836283, 0x4E83932C, 0x83538362, 0x834E8393, 0x00000000 + +dlabel D_802315CC_63D16C +.word 0x83538362, 0x834E8393, 0x78322C83, 0x41834383, 0x58837083, 0x62834E83, 0x93000000 + +dlabel D_802315E8_63D188 +.word 0x83538362, 0x834E8393, 0x78330000 + +dlabel D_802315F4_63D194 +.word 0x83538362, 0x834E8393, 0x78320000 + +dlabel D_80231600_63D1A0 +.word 0x836F8350, 0x836F8350, 0x78320000 + +dlabel D_8023160C_63D1AC +.word 0x73616D5F, 0x30330000 + +dlabel D_80231614_63D1B4 +.word 0x73616D5F, 0x30326400 + +dlabel D_8023161C_63D1BC +.word 0x73616D5F, 0x30326300 + +dlabel D_80231624_63D1C4 +.word 0x73616D5F, 0x30326200 + +dlabel D_8023162C_63D1CC +.word 0x73616D5F, 0x30320000 + +dlabel D_80231634_63D1D4 +.word 0x73616D5F, 0x30310000, 0x00000000 + +.section .text + glabel func_80219524_6250C4 /* 6250C4 80219524 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 6250C8 80219528 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s b/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s deleted file mode 100644 index cc267f2862..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s +++ /dev/null @@ -1,390 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802185B0_4B17A0 -/* 4B17A0 802185B0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 4B17A4 802185B4 AFB20058 */ sw $s2, 0x58($sp) -/* 4B17A8 802185B8 0080902D */ daddu $s2, $a0, $zero -/* 4B17AC 802185BC AFBF005C */ sw $ra, 0x5c($sp) -/* 4B17B0 802185C0 AFB10054 */ sw $s1, 0x54($sp) -/* 4B17B4 802185C4 AFB00050 */ sw $s0, 0x50($sp) -/* 4B17B8 802185C8 8E50000C */ lw $s0, 0xc($s2) -/* 4B17BC 802185CC 0C09A75B */ jal get_actor -/* 4B17C0 802185D0 24040204 */ addiu $a0, $zero, 0x204 -/* 4B17C4 802185D4 8C510094 */ lw $s1, 0x94($v0) -/* 4B17C8 802185D8 24020003 */ addiu $v0, $zero, 3 -/* 4B17CC 802185DC 1222001D */ beq $s1, $v0, .L80218654 -/* 4B17D0 802185E0 2A220004 */ slti $v0, $s1, 4 -/* 4B17D4 802185E4 10400005 */ beqz $v0, .L802185FC -/* 4B17D8 802185E8 24020002 */ addiu $v0, $zero, 2 -/* 4B17DC 802185EC 12220008 */ beq $s1, $v0, .L80218610 -/* 4B17E0 802185F0 0000202D */ daddu $a0, $zero, $zero -/* 4B17E4 802185F4 080861D0 */ j .L80218740 -/* 4B17E8 802185F8 2622FFFF */ addiu $v0, $s1, -1 -.L802185FC: -/* 4B17EC 802185FC 24020004 */ addiu $v0, $zero, 4 -/* 4B17F0 80218600 1222002D */ beq $s1, $v0, .L802186B8 -/* 4B17F4 80218604 0000202D */ daddu $a0, $zero, $zero -/* 4B17F8 80218608 080861D0 */ j .L80218740 -/* 4B17FC 8021860C 2622FFFF */ addiu $v0, $s1, -1 -.L80218610: -/* 4B1800 80218610 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B1804 80218614 24040003 */ addiu $a0, $zero, 3 -/* 4B1808 80218618 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B180C 8021861C E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B1810 80218620 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B1814 80218624 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B1818 80218628 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B181C 8021862C 24040006 */ addiu $a0, $zero, 6 -/* 4B1820 80218630 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B1824 80218634 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B1828 80218638 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B182C 8021863C E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B1830 80218640 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B1834 80218644 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B1838 80218648 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B183C 8021864C 080861CE */ j .L80218738 -/* 4B1840 80218650 E7A00034 */ swc1 $f0, 0x34($sp) -.L80218654: -/* 4B1844 80218654 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B1848 80218658 24040003 */ addiu $a0, $zero, 3 -/* 4B184C 8021865C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B1850 80218660 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B1854 80218664 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B1858 80218668 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B185C 8021866C C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B1860 80218670 24040005 */ addiu $a0, $zero, 5 -/* 4B1864 80218674 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B1868 80218678 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B186C 8021867C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B1870 80218680 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B1874 80218684 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B1878 80218688 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B187C 8021868C C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B1880 80218690 24040006 */ addiu $a0, $zero, 6 -/* 4B1884 80218694 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B1888 80218698 E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B188C 8021869C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B1890 802186A0 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B1894 802186A4 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B1898 802186A8 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B189C 802186AC C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B18A0 802186B0 080861CE */ j .L80218738 -/* 4B18A4 802186B4 E7A00040 */ swc1 $f0, 0x40($sp) -.L802186B8: -/* 4B18A8 802186B8 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B18AC 802186BC 24040003 */ addiu $a0, $zero, 3 -/* 4B18B0 802186C0 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B18B4 802186C4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B18B8 802186C8 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B18BC 802186CC E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B18C0 802186D0 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B18C4 802186D4 24040004 */ addiu $a0, $zero, 4 -/* 4B18C8 802186D8 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B18CC 802186DC E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B18D0 802186E0 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B18D4 802186E4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B18D8 802186E8 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B18DC 802186EC E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B18E0 802186F0 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B18E4 802186F4 24040005 */ addiu $a0, $zero, 5 -/* 4B18E8 802186F8 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B18EC 802186FC E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B18F0 80218700 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B18F4 80218704 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B18F8 80218708 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B18FC 8021870C E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B1900 80218710 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B1904 80218714 24040006 */ addiu $a0, $zero, 6 -/* 4B1908 80218718 0C086144 */ jal b_area_trd_part_2_green_ninja_koopa_UnkEnemyFunc -/* 4B190C 8021871C E7A00040 */ swc1 $f0, 0x40($sp) -/* 4B1910 80218720 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B1914 80218724 E7A00044 */ swc1 $f0, 0x44($sp) -/* 4B1918 80218728 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B191C 8021872C E7A00048 */ swc1 $f0, 0x48($sp) -/* 4B1920 80218730 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B1924 80218734 E7A0004C */ swc1 $f0, 0x4c($sp) -.L80218738: -/* 4B1928 80218738 0000202D */ daddu $a0, $zero, $zero -/* 4B192C 8021873C 2622FFFF */ addiu $v0, $s1, -1 -.L80218740: -/* 4B1930 80218740 1840002A */ blez $v0, .L802187EC -/* 4B1934 80218744 0040482D */ daddu $t1, $v0, $zero -/* 4B1938 80218748 27A80020 */ addiu $t0, $sp, 0x20 -/* 4B193C 8021874C 0100382D */ daddu $a3, $t0, $zero -.L80218750: -/* 4B1940 80218750 0091102A */ slt $v0, $a0, $s1 -/* 4B1944 80218754 10400021 */ beqz $v0, .L802187DC -/* 4B1948 80218758 0080302D */ daddu $a2, $a0, $zero -/* 4B194C 8021875C 00E0282D */ daddu $a1, $a3, $zero -/* 4B1950 80218760 00041040 */ sll $v0, $a0, 1 -/* 4B1954 80218764 00441021 */ addu $v0, $v0, $a0 -/* 4B1958 80218768 00021080 */ sll $v0, $v0, 2 -/* 4B195C 8021876C 00481821 */ addu $v1, $v0, $t0 -.L80218770: -/* 4B1960 80218770 C4A20000 */ lwc1 $f2, ($a1) -/* 4B1964 80218774 C4600000 */ lwc1 $f0, ($v1) -/* 4B1968 80218778 4600103C */ c.lt.s $f2, $f0 -/* 4B196C 8021877C 00000000 */ nop -/* 4B1970 80218780 45000013 */ bc1f .L802187D0 -/* 4B1974 80218784 24C60001 */ addiu $a2, $a2, 1 -/* 4B1978 80218788 8CAA0000 */ lw $t2, ($a1) -/* 4B197C 8021878C 8CAB0004 */ lw $t3, 4($a1) -/* 4B1980 80218790 8CAC0008 */ lw $t4, 8($a1) -/* 4B1984 80218794 AFAA0010 */ sw $t2, 0x10($sp) -/* 4B1988 80218798 AFAB0014 */ sw $t3, 0x14($sp) -/* 4B198C 8021879C AFAC0018 */ sw $t4, 0x18($sp) -/* 4B1990 802187A0 8C6A0000 */ lw $t2, ($v1) -/* 4B1994 802187A4 8C6B0004 */ lw $t3, 4($v1) -/* 4B1998 802187A8 8C6C0008 */ lw $t4, 8($v1) -/* 4B199C 802187AC ACAA0000 */ sw $t2, ($a1) -/* 4B19A0 802187B0 ACAB0004 */ sw $t3, 4($a1) -/* 4B19A4 802187B4 ACAC0008 */ sw $t4, 8($a1) -/* 4B19A8 802187B8 8FAA0010 */ lw $t2, 0x10($sp) -/* 4B19AC 802187BC 8FAB0014 */ lw $t3, 0x14($sp) -/* 4B19B0 802187C0 8FAC0018 */ lw $t4, 0x18($sp) -/* 4B19B4 802187C4 AC6A0000 */ sw $t2, ($v1) -/* 4B19B8 802187C8 AC6B0004 */ sw $t3, 4($v1) -/* 4B19BC 802187CC AC6C0008 */ sw $t4, 8($v1) -.L802187D0: -/* 4B19C0 802187D0 00D1102A */ slt $v0, $a2, $s1 -/* 4B19C4 802187D4 1440FFE6 */ bnez $v0, .L80218770 -/* 4B19C8 802187D8 2463000C */ addiu $v1, $v1, 0xc -.L802187DC: -/* 4B19CC 802187DC 24840001 */ addiu $a0, $a0, 1 -/* 4B19D0 802187E0 0089102A */ slt $v0, $a0, $t1 -/* 4B19D4 802187E4 1440FFDA */ bnez $v0, .L80218750 -/* 4B19D8 802187E8 24E7000C */ addiu $a3, $a3, 0xc -.L802187EC: -/* 4B19DC 802187EC 8E440148 */ lw $a0, 0x148($s2) -/* 4B19E0 802187F0 0C09A75B */ jal get_actor -/* 4B19E4 802187F4 00000000 */ nop -/* 4B19E8 802187F8 24040003 */ addiu $a0, $zero, 3 -/* 4B19EC 802187FC 8C43008C */ lw $v1, 0x8c($v0) -/* 4B19F0 80218800 12240034 */ beq $s1, $a0, .L802188D4 -/* 4B19F4 80218804 2A220004 */ slti $v0, $s1, 4 -/* 4B19F8 80218808 10400005 */ beqz $v0, .L80218820 -/* 4B19FC 8021880C 24020002 */ addiu $v0, $zero, 2 -/* 4B1A00 80218810 12220008 */ beq $s1, $v0, .L80218834 -/* 4B1A04 80218814 00000000 */ nop -/* 4B1A08 80218818 080862CB */ j .L80218B2C -/* 4B1A0C 8021881C 00000000 */ nop -.L80218820: -/* 4B1A10 80218820 24020004 */ addiu $v0, $zero, 4 -/* 4B1A14 80218824 1222006B */ beq $s1, $v0, .L802189D4 -/* 4B1A18 80218828 00000000 */ nop -/* 4B1A1C 8021882C 080862CB */ j .L80218B2C -/* 4B1A20 80218830 00000000 */ nop -.L80218834: -/* 4B1A24 80218834 10640005 */ beq $v1, $a0, .L8021884C -/* 4B1A28 80218838 24020006 */ addiu $v0, $zero, 6 -/* 4B1A2C 8021883C 10620014 */ beq $v1, $v0, .L80218890 -/* 4B1A30 80218840 00000000 */ nop -/* 4B1A34 80218844 080862CB */ j .L80218B2C -/* 4B1A38 80218848 00000000 */ nop -.L8021884C: -/* 4B1A3C 8021884C 8E050000 */ lw $a1, ($s0) -/* 4B1A40 80218850 26100004 */ addiu $s0, $s0, 4 -/* 4B1A44 80218854 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B1A48 80218858 4600010D */ trunc.w.s $f4, $f0 -/* 4B1A4C 8021885C 44062000 */ mfc1 $a2, $f4 -/* 4B1A50 80218860 0C0B2026 */ jal evt_set_variable -/* 4B1A54 80218864 0240202D */ daddu $a0, $s2, $zero -/* 4B1A58 80218868 8E050000 */ lw $a1, ($s0) -/* 4B1A5C 8021886C 26100004 */ addiu $s0, $s0, 4 -/* 4B1A60 80218870 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B1A64 80218874 4600010D */ trunc.w.s $f4, $f0 -/* 4B1A68 80218878 44062000 */ mfc1 $a2, $f4 -/* 4B1A6C 8021887C 0C0B2026 */ jal evt_set_variable -/* 4B1A70 80218880 0240202D */ daddu $a0, $s2, $zero -/* 4B1A74 80218884 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B1A78 80218888 080862C6 */ j .L80218B18 -/* 4B1A7C 8021888C 0240202D */ daddu $a0, $s2, $zero -.L80218890: -/* 4B1A80 80218890 8E050000 */ lw $a1, ($s0) -/* 4B1A84 80218894 26100004 */ addiu $s0, $s0, 4 -/* 4B1A88 80218898 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B1A8C 8021889C 4600010D */ trunc.w.s $f4, $f0 -/* 4B1A90 802188A0 44062000 */ mfc1 $a2, $f4 -/* 4B1A94 802188A4 0C0B2026 */ jal evt_set_variable -/* 4B1A98 802188A8 0240202D */ daddu $a0, $s2, $zero -/* 4B1A9C 802188AC 8E050000 */ lw $a1, ($s0) -/* 4B1AA0 802188B0 26100004 */ addiu $s0, $s0, 4 -/* 4B1AA4 802188B4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B1AA8 802188B8 4600010D */ trunc.w.s $f4, $f0 -/* 4B1AAC 802188BC 44062000 */ mfc1 $a2, $f4 -/* 4B1AB0 802188C0 0C0B2026 */ jal evt_set_variable -/* 4B1AB4 802188C4 0240202D */ daddu $a0, $s2, $zero -/* 4B1AB8 802188C8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B1ABC 802188CC 080862C6 */ j .L80218B18 -/* 4B1AC0 802188D0 0240202D */ daddu $a0, $s2, $zero -.L802188D4: -/* 4B1AC4 802188D4 24020005 */ addiu $v0, $zero, 5 -/* 4B1AC8 802188D8 1062001C */ beq $v1, $v0, .L8021894C -/* 4B1ACC 802188DC 28620006 */ slti $v0, $v1, 6 -/* 4B1AD0 802188E0 10400005 */ beqz $v0, .L802188F8 -/* 4B1AD4 802188E4 24020006 */ addiu $v0, $zero, 6 -/* 4B1AD8 802188E8 10640007 */ beq $v1, $a0, .L80218908 -/* 4B1ADC 802188EC 00000000 */ nop -/* 4B1AE0 802188F0 080862CB */ j .L80218B2C -/* 4B1AE4 802188F4 00000000 */ nop -.L802188F8: -/* 4B1AE8 802188F8 10620025 */ beq $v1, $v0, .L80218990 -/* 4B1AEC 802188FC 00000000 */ nop -/* 4B1AF0 80218900 080862CB */ j .L80218B2C -/* 4B1AF4 80218904 00000000 */ nop -.L80218908: -/* 4B1AF8 80218908 8E050000 */ lw $a1, ($s0) -/* 4B1AFC 8021890C 26100004 */ addiu $s0, $s0, 4 -/* 4B1B00 80218910 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B1B04 80218914 4600010D */ trunc.w.s $f4, $f0 -/* 4B1B08 80218918 44062000 */ mfc1 $a2, $f4 -/* 4B1B0C 8021891C 0C0B2026 */ jal evt_set_variable -/* 4B1B10 80218920 0240202D */ daddu $a0, $s2, $zero -/* 4B1B14 80218924 8E050000 */ lw $a1, ($s0) -/* 4B1B18 80218928 26100004 */ addiu $s0, $s0, 4 -/* 4B1B1C 8021892C C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B1B20 80218930 4600010D */ trunc.w.s $f4, $f0 -/* 4B1B24 80218934 44062000 */ mfc1 $a2, $f4 -/* 4B1B28 80218938 0C0B2026 */ jal evt_set_variable -/* 4B1B2C 8021893C 0240202D */ daddu $a0, $s2, $zero -/* 4B1B30 80218940 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B1B34 80218944 080862C6 */ j .L80218B18 -/* 4B1B38 80218948 0240202D */ daddu $a0, $s2, $zero -.L8021894C: -/* 4B1B3C 8021894C 8E050000 */ lw $a1, ($s0) -/* 4B1B40 80218950 26100004 */ addiu $s0, $s0, 4 -/* 4B1B44 80218954 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B1B48 80218958 4600010D */ trunc.w.s $f4, $f0 -/* 4B1B4C 8021895C 44062000 */ mfc1 $a2, $f4 -/* 4B1B50 80218960 0C0B2026 */ jal evt_set_variable -/* 4B1B54 80218964 0240202D */ daddu $a0, $s2, $zero -/* 4B1B58 80218968 8E050000 */ lw $a1, ($s0) -/* 4B1B5C 8021896C 26100004 */ addiu $s0, $s0, 4 -/* 4B1B60 80218970 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B1B64 80218974 4600010D */ trunc.w.s $f4, $f0 -/* 4B1B68 80218978 44062000 */ mfc1 $a2, $f4 -/* 4B1B6C 8021897C 0C0B2026 */ jal evt_set_variable -/* 4B1B70 80218980 0240202D */ daddu $a0, $s2, $zero -/* 4B1B74 80218984 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B1B78 80218988 080862C6 */ j .L80218B18 -/* 4B1B7C 8021898C 0240202D */ daddu $a0, $s2, $zero -.L80218990: -/* 4B1B80 80218990 8E050000 */ lw $a1, ($s0) -/* 4B1B84 80218994 26100004 */ addiu $s0, $s0, 4 -/* 4B1B88 80218998 C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B1B8C 8021899C 4600010D */ trunc.w.s $f4, $f0 -/* 4B1B90 802189A0 44062000 */ mfc1 $a2, $f4 -/* 4B1B94 802189A4 0C0B2026 */ jal evt_set_variable -/* 4B1B98 802189A8 0240202D */ daddu $a0, $s2, $zero -/* 4B1B9C 802189AC 8E050000 */ lw $a1, ($s0) -/* 4B1BA0 802189B0 26100004 */ addiu $s0, $s0, 4 -/* 4B1BA4 802189B4 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B1BA8 802189B8 4600010D */ trunc.w.s $f4, $f0 -/* 4B1BAC 802189BC 44062000 */ mfc1 $a2, $f4 -/* 4B1BB0 802189C0 0C0B2026 */ jal evt_set_variable -/* 4B1BB4 802189C4 0240202D */ daddu $a0, $s2, $zero -/* 4B1BB8 802189C8 C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B1BBC 802189CC 080862C6 */ j .L80218B18 -/* 4B1BC0 802189D0 0240202D */ daddu $a0, $s2, $zero -.L802189D4: -/* 4B1BC4 802189D4 1071001E */ beq $v1, $s1, .L80218A50 -/* 4B1BC8 802189D8 28620005 */ slti $v0, $v1, 5 -/* 4B1BCC 802189DC 10400005 */ beqz $v0, .L802189F4 -/* 4B1BD0 802189E0 24020005 */ addiu $v0, $zero, 5 -/* 4B1BD4 802189E4 10640009 */ beq $v1, $a0, .L80218A0C -/* 4B1BD8 802189E8 00000000 */ nop -/* 4B1BDC 802189EC 080862CB */ j .L80218B2C -/* 4B1BE0 802189F0 00000000 */ nop -.L802189F4: -/* 4B1BE4 802189F4 10620027 */ beq $v1, $v0, .L80218A94 -/* 4B1BE8 802189F8 24020006 */ addiu $v0, $zero, 6 -/* 4B1BEC 802189FC 10620036 */ beq $v1, $v0, .L80218AD8 -/* 4B1BF0 80218A00 00000000 */ nop -/* 4B1BF4 80218A04 080862CB */ j .L80218B2C -/* 4B1BF8 80218A08 00000000 */ nop -.L80218A0C: -/* 4B1BFC 80218A0C 8E050000 */ lw $a1, ($s0) -/* 4B1C00 80218A10 26100004 */ addiu $s0, $s0, 4 -/* 4B1C04 80218A14 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B1C08 80218A18 4600010D */ trunc.w.s $f4, $f0 -/* 4B1C0C 80218A1C 44062000 */ mfc1 $a2, $f4 -/* 4B1C10 80218A20 0C0B2026 */ jal evt_set_variable -/* 4B1C14 80218A24 0240202D */ daddu $a0, $s2, $zero -/* 4B1C18 80218A28 8E050000 */ lw $a1, ($s0) -/* 4B1C1C 80218A2C 26100004 */ addiu $s0, $s0, 4 -/* 4B1C20 80218A30 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B1C24 80218A34 4600010D */ trunc.w.s $f4, $f0 -/* 4B1C28 80218A38 44062000 */ mfc1 $a2, $f4 -/* 4B1C2C 80218A3C 0C0B2026 */ jal evt_set_variable -/* 4B1C30 80218A40 0240202D */ daddu $a0, $s2, $zero -/* 4B1C34 80218A44 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B1C38 80218A48 080862C6 */ j .L80218B18 -/* 4B1C3C 80218A4C 0240202D */ daddu $a0, $s2, $zero -.L80218A50: -/* 4B1C40 80218A50 8E050000 */ lw $a1, ($s0) -/* 4B1C44 80218A54 26100004 */ addiu $s0, $s0, 4 -/* 4B1C48 80218A58 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B1C4C 80218A5C 4600010D */ trunc.w.s $f4, $f0 -/* 4B1C50 80218A60 44062000 */ mfc1 $a2, $f4 -/* 4B1C54 80218A64 0C0B2026 */ jal evt_set_variable -/* 4B1C58 80218A68 0240202D */ daddu $a0, $s2, $zero -/* 4B1C5C 80218A6C 8E050000 */ lw $a1, ($s0) -/* 4B1C60 80218A70 26100004 */ addiu $s0, $s0, 4 -/* 4B1C64 80218A74 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B1C68 80218A78 4600010D */ trunc.w.s $f4, $f0 -/* 4B1C6C 80218A7C 44062000 */ mfc1 $a2, $f4 -/* 4B1C70 80218A80 0C0B2026 */ jal evt_set_variable -/* 4B1C74 80218A84 0240202D */ daddu $a0, $s2, $zero -/* 4B1C78 80218A88 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B1C7C 80218A8C 080862C6 */ j .L80218B18 -/* 4B1C80 80218A90 0240202D */ daddu $a0, $s2, $zero -.L80218A94: -/* 4B1C84 80218A94 8E050000 */ lw $a1, ($s0) -/* 4B1C88 80218A98 26100004 */ addiu $s0, $s0, 4 -/* 4B1C8C 80218A9C C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B1C90 80218AA0 4600010D */ trunc.w.s $f4, $f0 -/* 4B1C94 80218AA4 44062000 */ mfc1 $a2, $f4 -/* 4B1C98 80218AA8 0C0B2026 */ jal evt_set_variable -/* 4B1C9C 80218AAC 0240202D */ daddu $a0, $s2, $zero -/* 4B1CA0 80218AB0 8E050000 */ lw $a1, ($s0) -/* 4B1CA4 80218AB4 26100004 */ addiu $s0, $s0, 4 -/* 4B1CA8 80218AB8 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B1CAC 80218ABC 4600010D */ trunc.w.s $f4, $f0 -/* 4B1CB0 80218AC0 44062000 */ mfc1 $a2, $f4 -/* 4B1CB4 80218AC4 0C0B2026 */ jal evt_set_variable -/* 4B1CB8 80218AC8 0240202D */ daddu $a0, $s2, $zero -/* 4B1CBC 80218ACC C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B1CC0 80218AD0 080862C6 */ j .L80218B18 -/* 4B1CC4 80218AD4 0240202D */ daddu $a0, $s2, $zero -.L80218AD8: -/* 4B1CC8 80218AD8 8E050000 */ lw $a1, ($s0) -/* 4B1CCC 80218ADC 26100004 */ addiu $s0, $s0, 4 -/* 4B1CD0 80218AE0 C7A00044 */ lwc1 $f0, 0x44($sp) -/* 4B1CD4 80218AE4 4600010D */ trunc.w.s $f4, $f0 -/* 4B1CD8 80218AE8 44062000 */ mfc1 $a2, $f4 -/* 4B1CDC 80218AEC 0C0B2026 */ jal evt_set_variable -/* 4B1CE0 80218AF0 0240202D */ daddu $a0, $s2, $zero -/* 4B1CE4 80218AF4 8E050000 */ lw $a1, ($s0) -/* 4B1CE8 80218AF8 26100004 */ addiu $s0, $s0, 4 -/* 4B1CEC 80218AFC C7A00048 */ lwc1 $f0, 0x48($sp) -/* 4B1CF0 80218B00 4600010D */ trunc.w.s $f4, $f0 -/* 4B1CF4 80218B04 44062000 */ mfc1 $a2, $f4 -/* 4B1CF8 80218B08 0C0B2026 */ jal evt_set_variable -/* 4B1CFC 80218B0C 0240202D */ daddu $a0, $s2, $zero -/* 4B1D00 80218B10 0240202D */ daddu $a0, $s2, $zero -/* 4B1D04 80218B14 C7A0004C */ lwc1 $f0, 0x4c($sp) -.L80218B18: -/* 4B1D08 80218B18 8E050000 */ lw $a1, ($s0) -/* 4B1D0C 80218B1C 4600010D */ trunc.w.s $f4, $f0 -/* 4B1D10 80218B20 44062000 */ mfc1 $a2, $f4 -/* 4B1D14 80218B24 0C0B2026 */ jal evt_set_variable -/* 4B1D18 80218B28 00000000 */ nop -.L80218B2C: -/* 4B1D1C 80218B2C 8FBF005C */ lw $ra, 0x5c($sp) -/* 4B1D20 80218B30 8FB20058 */ lw $s2, 0x58($sp) -/* 4B1D24 80218B34 8FB10054 */ lw $s1, 0x54($sp) -/* 4B1D28 80218B38 8FB00050 */ lw $s0, 0x50($sp) -/* 4B1D2C 80218B3C 24020002 */ addiu $v0, $zero, 2 -/* 4B1D30 80218B40 03E00008 */ jr $ra -/* 4B1D34 80218B44 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s b/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s deleted file mode 100644 index cd402b59b6..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s +++ /dev/null @@ -1,390 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218D70_4B1F60 -/* 4B1F60 80218D70 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 4B1F64 80218D74 AFB20058 */ sw $s2, 0x58($sp) -/* 4B1F68 80218D78 0080902D */ daddu $s2, $a0, $zero -/* 4B1F6C 80218D7C AFBF005C */ sw $ra, 0x5c($sp) -/* 4B1F70 80218D80 AFB10054 */ sw $s1, 0x54($sp) -/* 4B1F74 80218D84 AFB00050 */ sw $s0, 0x50($sp) -/* 4B1F78 80218D88 8E50000C */ lw $s0, 0xc($s2) -/* 4B1F7C 80218D8C 0C09A75B */ jal get_actor -/* 4B1F80 80218D90 24040204 */ addiu $a0, $zero, 0x204 -/* 4B1F84 80218D94 8C510094 */ lw $s1, 0x94($v0) -/* 4B1F88 80218D98 24020003 */ addiu $v0, $zero, 3 -/* 4B1F8C 80218D9C 1222001D */ beq $s1, $v0, .L80218E14 -/* 4B1F90 80218DA0 2A220004 */ slti $v0, $s1, 4 -/* 4B1F94 80218DA4 10400005 */ beqz $v0, .L80218DBC -/* 4B1F98 80218DA8 24020002 */ addiu $v0, $zero, 2 -/* 4B1F9C 80218DAC 12220008 */ beq $s1, $v0, .L80218DD0 -/* 4B1FA0 80218DB0 0000202D */ daddu $a0, $zero, $zero -/* 4B1FA4 80218DB4 080863C0 */ j .L80218F00 -/* 4B1FA8 80218DB8 2622FFFF */ addiu $v0, $s1, -1 -.L80218DBC: -/* 4B1FAC 80218DBC 24020004 */ addiu $v0, $zero, 4 -/* 4B1FB0 80218DC0 1222002D */ beq $s1, $v0, .L80218E78 -/* 4B1FB4 80218DC4 0000202D */ daddu $a0, $zero, $zero -/* 4B1FB8 80218DC8 080863C0 */ j .L80218F00 -/* 4B1FBC 80218DCC 2622FFFF */ addiu $v0, $s1, -1 -.L80218DD0: -/* 4B1FC0 80218DD0 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B1FC4 80218DD4 24040003 */ addiu $a0, $zero, 3 -/* 4B1FC8 80218DD8 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B1FCC 80218DDC E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B1FD0 80218DE0 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B1FD4 80218DE4 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B1FD8 80218DE8 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B1FDC 80218DEC 24040006 */ addiu $a0, $zero, 6 -/* 4B1FE0 80218DF0 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B1FE4 80218DF4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B1FE8 80218DF8 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B1FEC 80218DFC E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B1FF0 80218E00 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B1FF4 80218E04 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B1FF8 80218E08 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B1FFC 80218E0C 080863BE */ j .L80218EF8 -/* 4B2000 80218E10 E7A00034 */ swc1 $f0, 0x34($sp) -.L80218E14: -/* 4B2004 80218E14 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B2008 80218E18 24040003 */ addiu $a0, $zero, 3 -/* 4B200C 80218E1C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2010 80218E20 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B2014 80218E24 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2018 80218E28 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B201C 80218E2C C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2020 80218E30 24040005 */ addiu $a0, $zero, 5 -/* 4B2024 80218E34 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B2028 80218E38 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B202C 80218E3C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2030 80218E40 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B2034 80218E44 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2038 80218E48 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B203C 80218E4C C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2040 80218E50 24040006 */ addiu $a0, $zero, 6 -/* 4B2044 80218E54 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B2048 80218E58 E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B204C 80218E5C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2050 80218E60 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B2054 80218E64 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2058 80218E68 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B205C 80218E6C C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2060 80218E70 080863BE */ j .L80218EF8 -/* 4B2064 80218E74 E7A00040 */ swc1 $f0, 0x40($sp) -.L80218E78: -/* 4B2068 80218E78 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B206C 80218E7C 24040003 */ addiu $a0, $zero, 3 -/* 4B2070 80218E80 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2074 80218E84 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B2078 80218E88 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B207C 80218E8C E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B2080 80218E90 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2084 80218E94 24040004 */ addiu $a0, $zero, 4 -/* 4B2088 80218E98 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B208C 80218E9C E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B2090 80218EA0 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2094 80218EA4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B2098 80218EA8 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B209C 80218EAC E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B20A0 80218EB0 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B20A4 80218EB4 24040005 */ addiu $a0, $zero, 5 -/* 4B20A8 80218EB8 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B20AC 80218EBC E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B20B0 80218EC0 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B20B4 80218EC4 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B20B8 80218EC8 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B20BC 80218ECC E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B20C0 80218ED0 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B20C4 80218ED4 24040006 */ addiu $a0, $zero, 6 -/* 4B20C8 80218ED8 0C086334 */ jal b_area_trd_part_2_red_ninja_koopa_UnkEnemyFunc -/* 4B20CC 80218EDC E7A00040 */ swc1 $f0, 0x40($sp) -/* 4B20D0 80218EE0 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B20D4 80218EE4 E7A00044 */ swc1 $f0, 0x44($sp) -/* 4B20D8 80218EE8 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B20DC 80218EEC E7A00048 */ swc1 $f0, 0x48($sp) -/* 4B20E0 80218EF0 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B20E4 80218EF4 E7A0004C */ swc1 $f0, 0x4c($sp) -.L80218EF8: -/* 4B20E8 80218EF8 0000202D */ daddu $a0, $zero, $zero -/* 4B20EC 80218EFC 2622FFFF */ addiu $v0, $s1, -1 -.L80218F00: -/* 4B20F0 80218F00 1840002A */ blez $v0, .L80218FAC -/* 4B20F4 80218F04 0040482D */ daddu $t1, $v0, $zero -/* 4B20F8 80218F08 27A80020 */ addiu $t0, $sp, 0x20 -/* 4B20FC 80218F0C 0100382D */ daddu $a3, $t0, $zero -.L80218F10: -/* 4B2100 80218F10 0091102A */ slt $v0, $a0, $s1 -/* 4B2104 80218F14 10400021 */ beqz $v0, .L80218F9C -/* 4B2108 80218F18 0080302D */ daddu $a2, $a0, $zero -/* 4B210C 80218F1C 00E0282D */ daddu $a1, $a3, $zero -/* 4B2110 80218F20 00041040 */ sll $v0, $a0, 1 -/* 4B2114 80218F24 00441021 */ addu $v0, $v0, $a0 -/* 4B2118 80218F28 00021080 */ sll $v0, $v0, 2 -/* 4B211C 80218F2C 00481821 */ addu $v1, $v0, $t0 -.L80218F30: -/* 4B2120 80218F30 C4A20000 */ lwc1 $f2, ($a1) -/* 4B2124 80218F34 C4600000 */ lwc1 $f0, ($v1) -/* 4B2128 80218F38 4600103C */ c.lt.s $f2, $f0 -/* 4B212C 80218F3C 00000000 */ nop -/* 4B2130 80218F40 45000013 */ bc1f .L80218F90 -/* 4B2134 80218F44 24C60001 */ addiu $a2, $a2, 1 -/* 4B2138 80218F48 8CAA0000 */ lw $t2, ($a1) -/* 4B213C 80218F4C 8CAB0004 */ lw $t3, 4($a1) -/* 4B2140 80218F50 8CAC0008 */ lw $t4, 8($a1) -/* 4B2144 80218F54 AFAA0010 */ sw $t2, 0x10($sp) -/* 4B2148 80218F58 AFAB0014 */ sw $t3, 0x14($sp) -/* 4B214C 80218F5C AFAC0018 */ sw $t4, 0x18($sp) -/* 4B2150 80218F60 8C6A0000 */ lw $t2, ($v1) -/* 4B2154 80218F64 8C6B0004 */ lw $t3, 4($v1) -/* 4B2158 80218F68 8C6C0008 */ lw $t4, 8($v1) -/* 4B215C 80218F6C ACAA0000 */ sw $t2, ($a1) -/* 4B2160 80218F70 ACAB0004 */ sw $t3, 4($a1) -/* 4B2164 80218F74 ACAC0008 */ sw $t4, 8($a1) -/* 4B2168 80218F78 8FAA0010 */ lw $t2, 0x10($sp) -/* 4B216C 80218F7C 8FAB0014 */ lw $t3, 0x14($sp) -/* 4B2170 80218F80 8FAC0018 */ lw $t4, 0x18($sp) -/* 4B2174 80218F84 AC6A0000 */ sw $t2, ($v1) -/* 4B2178 80218F88 AC6B0004 */ sw $t3, 4($v1) -/* 4B217C 80218F8C AC6C0008 */ sw $t4, 8($v1) -.L80218F90: -/* 4B2180 80218F90 00D1102A */ slt $v0, $a2, $s1 -/* 4B2184 80218F94 1440FFE6 */ bnez $v0, .L80218F30 -/* 4B2188 80218F98 2463000C */ addiu $v1, $v1, 0xc -.L80218F9C: -/* 4B218C 80218F9C 24840001 */ addiu $a0, $a0, 1 -/* 4B2190 80218FA0 0089102A */ slt $v0, $a0, $t1 -/* 4B2194 80218FA4 1440FFDA */ bnez $v0, .L80218F10 -/* 4B2198 80218FA8 24E7000C */ addiu $a3, $a3, 0xc -.L80218FAC: -/* 4B219C 80218FAC 8E440148 */ lw $a0, 0x148($s2) -/* 4B21A0 80218FB0 0C09A75B */ jal get_actor -/* 4B21A4 80218FB4 00000000 */ nop -/* 4B21A8 80218FB8 24040003 */ addiu $a0, $zero, 3 -/* 4B21AC 80218FBC 8C43008C */ lw $v1, 0x8c($v0) -/* 4B21B0 80218FC0 12240034 */ beq $s1, $a0, .L80219094 -/* 4B21B4 80218FC4 2A220004 */ slti $v0, $s1, 4 -/* 4B21B8 80218FC8 10400005 */ beqz $v0, .L80218FE0 -/* 4B21BC 80218FCC 24020002 */ addiu $v0, $zero, 2 -/* 4B21C0 80218FD0 12220008 */ beq $s1, $v0, .L80218FF4 -/* 4B21C4 80218FD4 00000000 */ nop -/* 4B21C8 80218FD8 080864BB */ j .L802192EC -/* 4B21CC 80218FDC 00000000 */ nop -.L80218FE0: -/* 4B21D0 80218FE0 24020004 */ addiu $v0, $zero, 4 -/* 4B21D4 80218FE4 1222006B */ beq $s1, $v0, .L80219194 -/* 4B21D8 80218FE8 00000000 */ nop -/* 4B21DC 80218FEC 080864BB */ j .L802192EC -/* 4B21E0 80218FF0 00000000 */ nop -.L80218FF4: -/* 4B21E4 80218FF4 10640005 */ beq $v1, $a0, .L8021900C -/* 4B21E8 80218FF8 24020006 */ addiu $v0, $zero, 6 -/* 4B21EC 80218FFC 10620014 */ beq $v1, $v0, .L80219050 -/* 4B21F0 80219000 00000000 */ nop -/* 4B21F4 80219004 080864BB */ j .L802192EC -/* 4B21F8 80219008 00000000 */ nop -.L8021900C: -/* 4B21FC 8021900C 8E050000 */ lw $a1, ($s0) -/* 4B2200 80219010 26100004 */ addiu $s0, $s0, 4 -/* 4B2204 80219014 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B2208 80219018 4600010D */ trunc.w.s $f4, $f0 -/* 4B220C 8021901C 44062000 */ mfc1 $a2, $f4 -/* 4B2210 80219020 0C0B2026 */ jal evt_set_variable -/* 4B2214 80219024 0240202D */ daddu $a0, $s2, $zero -/* 4B2218 80219028 8E050000 */ lw $a1, ($s0) -/* 4B221C 8021902C 26100004 */ addiu $s0, $s0, 4 -/* 4B2220 80219030 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B2224 80219034 4600010D */ trunc.w.s $f4, $f0 -/* 4B2228 80219038 44062000 */ mfc1 $a2, $f4 -/* 4B222C 8021903C 0C0B2026 */ jal evt_set_variable -/* 4B2230 80219040 0240202D */ daddu $a0, $s2, $zero -/* 4B2234 80219044 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B2238 80219048 080864B6 */ j .L802192D8 -/* 4B223C 8021904C 0240202D */ daddu $a0, $s2, $zero -.L80219050: -/* 4B2240 80219050 8E050000 */ lw $a1, ($s0) -/* 4B2244 80219054 26100004 */ addiu $s0, $s0, 4 -/* 4B2248 80219058 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B224C 8021905C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2250 80219060 44062000 */ mfc1 $a2, $f4 -/* 4B2254 80219064 0C0B2026 */ jal evt_set_variable -/* 4B2258 80219068 0240202D */ daddu $a0, $s2, $zero -/* 4B225C 8021906C 8E050000 */ lw $a1, ($s0) -/* 4B2260 80219070 26100004 */ addiu $s0, $s0, 4 -/* 4B2264 80219074 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B2268 80219078 4600010D */ trunc.w.s $f4, $f0 -/* 4B226C 8021907C 44062000 */ mfc1 $a2, $f4 -/* 4B2270 80219080 0C0B2026 */ jal evt_set_variable -/* 4B2274 80219084 0240202D */ daddu $a0, $s2, $zero -/* 4B2278 80219088 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B227C 8021908C 080864B6 */ j .L802192D8 -/* 4B2280 80219090 0240202D */ daddu $a0, $s2, $zero -.L80219094: -/* 4B2284 80219094 24020005 */ addiu $v0, $zero, 5 -/* 4B2288 80219098 1062001C */ beq $v1, $v0, .L8021910C -/* 4B228C 8021909C 28620006 */ slti $v0, $v1, 6 -/* 4B2290 802190A0 10400005 */ beqz $v0, .L802190B8 -/* 4B2294 802190A4 24020006 */ addiu $v0, $zero, 6 -/* 4B2298 802190A8 10640007 */ beq $v1, $a0, .L802190C8 -/* 4B229C 802190AC 00000000 */ nop -/* 4B22A0 802190B0 080864BB */ j .L802192EC -/* 4B22A4 802190B4 00000000 */ nop -.L802190B8: -/* 4B22A8 802190B8 10620025 */ beq $v1, $v0, .L80219150 -/* 4B22AC 802190BC 00000000 */ nop -/* 4B22B0 802190C0 080864BB */ j .L802192EC -/* 4B22B4 802190C4 00000000 */ nop -.L802190C8: -/* 4B22B8 802190C8 8E050000 */ lw $a1, ($s0) -/* 4B22BC 802190CC 26100004 */ addiu $s0, $s0, 4 -/* 4B22C0 802190D0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B22C4 802190D4 4600010D */ trunc.w.s $f4, $f0 -/* 4B22C8 802190D8 44062000 */ mfc1 $a2, $f4 -/* 4B22CC 802190DC 0C0B2026 */ jal evt_set_variable -/* 4B22D0 802190E0 0240202D */ daddu $a0, $s2, $zero -/* 4B22D4 802190E4 8E050000 */ lw $a1, ($s0) -/* 4B22D8 802190E8 26100004 */ addiu $s0, $s0, 4 -/* 4B22DC 802190EC C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B22E0 802190F0 4600010D */ trunc.w.s $f4, $f0 -/* 4B22E4 802190F4 44062000 */ mfc1 $a2, $f4 -/* 4B22E8 802190F8 0C0B2026 */ jal evt_set_variable -/* 4B22EC 802190FC 0240202D */ daddu $a0, $s2, $zero -/* 4B22F0 80219100 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B22F4 80219104 080864B6 */ j .L802192D8 -/* 4B22F8 80219108 0240202D */ daddu $a0, $s2, $zero -.L8021910C: -/* 4B22FC 8021910C 8E050000 */ lw $a1, ($s0) -/* 4B2300 80219110 26100004 */ addiu $s0, $s0, 4 -/* 4B2304 80219114 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B2308 80219118 4600010D */ trunc.w.s $f4, $f0 -/* 4B230C 8021911C 44062000 */ mfc1 $a2, $f4 -/* 4B2310 80219120 0C0B2026 */ jal evt_set_variable -/* 4B2314 80219124 0240202D */ daddu $a0, $s2, $zero -/* 4B2318 80219128 8E050000 */ lw $a1, ($s0) -/* 4B231C 8021912C 26100004 */ addiu $s0, $s0, 4 -/* 4B2320 80219130 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B2324 80219134 4600010D */ trunc.w.s $f4, $f0 -/* 4B2328 80219138 44062000 */ mfc1 $a2, $f4 -/* 4B232C 8021913C 0C0B2026 */ jal evt_set_variable -/* 4B2330 80219140 0240202D */ daddu $a0, $s2, $zero -/* 4B2334 80219144 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B2338 80219148 080864B6 */ j .L802192D8 -/* 4B233C 8021914C 0240202D */ daddu $a0, $s2, $zero -.L80219150: -/* 4B2340 80219150 8E050000 */ lw $a1, ($s0) -/* 4B2344 80219154 26100004 */ addiu $s0, $s0, 4 -/* 4B2348 80219158 C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B234C 8021915C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2350 80219160 44062000 */ mfc1 $a2, $f4 -/* 4B2354 80219164 0C0B2026 */ jal evt_set_variable -/* 4B2358 80219168 0240202D */ daddu $a0, $s2, $zero -/* 4B235C 8021916C 8E050000 */ lw $a1, ($s0) -/* 4B2360 80219170 26100004 */ addiu $s0, $s0, 4 -/* 4B2364 80219174 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B2368 80219178 4600010D */ trunc.w.s $f4, $f0 -/* 4B236C 8021917C 44062000 */ mfc1 $a2, $f4 -/* 4B2370 80219180 0C0B2026 */ jal evt_set_variable -/* 4B2374 80219184 0240202D */ daddu $a0, $s2, $zero -/* 4B2378 80219188 C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B237C 8021918C 080864B6 */ j .L802192D8 -/* 4B2380 80219190 0240202D */ daddu $a0, $s2, $zero -.L80219194: -/* 4B2384 80219194 1071001E */ beq $v1, $s1, .L80219210 -/* 4B2388 80219198 28620005 */ slti $v0, $v1, 5 -/* 4B238C 8021919C 10400005 */ beqz $v0, .L802191B4 -/* 4B2390 802191A0 24020005 */ addiu $v0, $zero, 5 -/* 4B2394 802191A4 10640009 */ beq $v1, $a0, .L802191CC -/* 4B2398 802191A8 00000000 */ nop -/* 4B239C 802191AC 080864BB */ j .L802192EC -/* 4B23A0 802191B0 00000000 */ nop -.L802191B4: -/* 4B23A4 802191B4 10620027 */ beq $v1, $v0, .L80219254 -/* 4B23A8 802191B8 24020006 */ addiu $v0, $zero, 6 -/* 4B23AC 802191BC 10620036 */ beq $v1, $v0, .L80219298 -/* 4B23B0 802191C0 00000000 */ nop -/* 4B23B4 802191C4 080864BB */ j .L802192EC -/* 4B23B8 802191C8 00000000 */ nop -.L802191CC: -/* 4B23BC 802191CC 8E050000 */ lw $a1, ($s0) -/* 4B23C0 802191D0 26100004 */ addiu $s0, $s0, 4 -/* 4B23C4 802191D4 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B23C8 802191D8 4600010D */ trunc.w.s $f4, $f0 -/* 4B23CC 802191DC 44062000 */ mfc1 $a2, $f4 -/* 4B23D0 802191E0 0C0B2026 */ jal evt_set_variable -/* 4B23D4 802191E4 0240202D */ daddu $a0, $s2, $zero -/* 4B23D8 802191E8 8E050000 */ lw $a1, ($s0) -/* 4B23DC 802191EC 26100004 */ addiu $s0, $s0, 4 -/* 4B23E0 802191F0 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B23E4 802191F4 4600010D */ trunc.w.s $f4, $f0 -/* 4B23E8 802191F8 44062000 */ mfc1 $a2, $f4 -/* 4B23EC 802191FC 0C0B2026 */ jal evt_set_variable -/* 4B23F0 80219200 0240202D */ daddu $a0, $s2, $zero -/* 4B23F4 80219204 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B23F8 80219208 080864B6 */ j .L802192D8 -/* 4B23FC 8021920C 0240202D */ daddu $a0, $s2, $zero -.L80219210: -/* 4B2400 80219210 8E050000 */ lw $a1, ($s0) -/* 4B2404 80219214 26100004 */ addiu $s0, $s0, 4 -/* 4B2408 80219218 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B240C 8021921C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2410 80219220 44062000 */ mfc1 $a2, $f4 -/* 4B2414 80219224 0C0B2026 */ jal evt_set_variable -/* 4B2418 80219228 0240202D */ daddu $a0, $s2, $zero -/* 4B241C 8021922C 8E050000 */ lw $a1, ($s0) -/* 4B2420 80219230 26100004 */ addiu $s0, $s0, 4 -/* 4B2424 80219234 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B2428 80219238 4600010D */ trunc.w.s $f4, $f0 -/* 4B242C 8021923C 44062000 */ mfc1 $a2, $f4 -/* 4B2430 80219240 0C0B2026 */ jal evt_set_variable -/* 4B2434 80219244 0240202D */ daddu $a0, $s2, $zero -/* 4B2438 80219248 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B243C 8021924C 080864B6 */ j .L802192D8 -/* 4B2440 80219250 0240202D */ daddu $a0, $s2, $zero -.L80219254: -/* 4B2444 80219254 8E050000 */ lw $a1, ($s0) -/* 4B2448 80219258 26100004 */ addiu $s0, $s0, 4 -/* 4B244C 8021925C C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B2450 80219260 4600010D */ trunc.w.s $f4, $f0 -/* 4B2454 80219264 44062000 */ mfc1 $a2, $f4 -/* 4B2458 80219268 0C0B2026 */ jal evt_set_variable -/* 4B245C 8021926C 0240202D */ daddu $a0, $s2, $zero -/* 4B2460 80219270 8E050000 */ lw $a1, ($s0) -/* 4B2464 80219274 26100004 */ addiu $s0, $s0, 4 -/* 4B2468 80219278 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B246C 8021927C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2470 80219280 44062000 */ mfc1 $a2, $f4 -/* 4B2474 80219284 0C0B2026 */ jal evt_set_variable -/* 4B2478 80219288 0240202D */ daddu $a0, $s2, $zero -/* 4B247C 8021928C C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B2480 80219290 080864B6 */ j .L802192D8 -/* 4B2484 80219294 0240202D */ daddu $a0, $s2, $zero -.L80219298: -/* 4B2488 80219298 8E050000 */ lw $a1, ($s0) -/* 4B248C 8021929C 26100004 */ addiu $s0, $s0, 4 -/* 4B2490 802192A0 C7A00044 */ lwc1 $f0, 0x44($sp) -/* 4B2494 802192A4 4600010D */ trunc.w.s $f4, $f0 -/* 4B2498 802192A8 44062000 */ mfc1 $a2, $f4 -/* 4B249C 802192AC 0C0B2026 */ jal evt_set_variable -/* 4B24A0 802192B0 0240202D */ daddu $a0, $s2, $zero -/* 4B24A4 802192B4 8E050000 */ lw $a1, ($s0) -/* 4B24A8 802192B8 26100004 */ addiu $s0, $s0, 4 -/* 4B24AC 802192BC C7A00048 */ lwc1 $f0, 0x48($sp) -/* 4B24B0 802192C0 4600010D */ trunc.w.s $f4, $f0 -/* 4B24B4 802192C4 44062000 */ mfc1 $a2, $f4 -/* 4B24B8 802192C8 0C0B2026 */ jal evt_set_variable -/* 4B24BC 802192CC 0240202D */ daddu $a0, $s2, $zero -/* 4B24C0 802192D0 0240202D */ daddu $a0, $s2, $zero -/* 4B24C4 802192D4 C7A0004C */ lwc1 $f0, 0x4c($sp) -.L802192D8: -/* 4B24C8 802192D8 8E050000 */ lw $a1, ($s0) -/* 4B24CC 802192DC 4600010D */ trunc.w.s $f4, $f0 -/* 4B24D0 802192E0 44062000 */ mfc1 $a2, $f4 -/* 4B24D4 802192E4 0C0B2026 */ jal evt_set_variable -/* 4B24D8 802192E8 00000000 */ nop -.L802192EC: -/* 4B24DC 802192EC 8FBF005C */ lw $ra, 0x5c($sp) -/* 4B24E0 802192F0 8FB20058 */ lw $s2, 0x58($sp) -/* 4B24E4 802192F4 8FB10054 */ lw $s1, 0x54($sp) -/* 4B24E8 802192F8 8FB00050 */ lw $s0, 0x50($sp) -/* 4B24EC 802192FC 24020002 */ addiu $v0, $zero, 2 -/* 4B24F0 80219300 03E00008 */ jr $ra -/* 4B24F4 80219304 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s b/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s deleted file mode 100644 index 08eb85188f..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s +++ /dev/null @@ -1,390 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219530_4B2720 -/* 4B2720 80219530 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 4B2724 80219534 AFB20058 */ sw $s2, 0x58($sp) -/* 4B2728 80219538 0080902D */ daddu $s2, $a0, $zero -/* 4B272C 8021953C AFBF005C */ sw $ra, 0x5c($sp) -/* 4B2730 80219540 AFB10054 */ sw $s1, 0x54($sp) -/* 4B2734 80219544 AFB00050 */ sw $s0, 0x50($sp) -/* 4B2738 80219548 8E50000C */ lw $s0, 0xc($s2) -/* 4B273C 8021954C 0C09A75B */ jal get_actor -/* 4B2740 80219550 24040204 */ addiu $a0, $zero, 0x204 -/* 4B2744 80219554 8C510094 */ lw $s1, 0x94($v0) -/* 4B2748 80219558 24020003 */ addiu $v0, $zero, 3 -/* 4B274C 8021955C 1222001D */ beq $s1, $v0, .L802195D4 -/* 4B2750 80219560 2A220004 */ slti $v0, $s1, 4 -/* 4B2754 80219564 10400005 */ beqz $v0, .L8021957C -/* 4B2758 80219568 24020002 */ addiu $v0, $zero, 2 -/* 4B275C 8021956C 12220008 */ beq $s1, $v0, .L80219590 -/* 4B2760 80219570 0000202D */ daddu $a0, $zero, $zero -/* 4B2764 80219574 080865B0 */ j .L802196C0 -/* 4B2768 80219578 2622FFFF */ addiu $v0, $s1, -1 -.L8021957C: -/* 4B276C 8021957C 24020004 */ addiu $v0, $zero, 4 -/* 4B2770 80219580 1222002D */ beq $s1, $v0, .L80219638 -/* 4B2774 80219584 0000202D */ daddu $a0, $zero, $zero -/* 4B2778 80219588 080865B0 */ j .L802196C0 -/* 4B277C 8021958C 2622FFFF */ addiu $v0, $s1, -1 -.L80219590: -/* 4B2780 80219590 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B2784 80219594 24040003 */ addiu $a0, $zero, 3 -/* 4B2788 80219598 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B278C 8021959C E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B2790 802195A0 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2794 802195A4 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B2798 802195A8 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B279C 802195AC 24040006 */ addiu $a0, $zero, 6 -/* 4B27A0 802195B0 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B27A4 802195B4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B27A8 802195B8 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B27AC 802195BC E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B27B0 802195C0 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B27B4 802195C4 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B27B8 802195C8 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B27BC 802195CC 080865AE */ j .L802196B8 -/* 4B27C0 802195D0 E7A00034 */ swc1 $f0, 0x34($sp) -.L802195D4: -/* 4B27C4 802195D4 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B27C8 802195D8 24040003 */ addiu $a0, $zero, 3 -/* 4B27CC 802195DC C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B27D0 802195E0 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B27D4 802195E4 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B27D8 802195E8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B27DC 802195EC C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B27E0 802195F0 24040005 */ addiu $a0, $zero, 5 -/* 4B27E4 802195F4 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B27E8 802195F8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B27EC 802195FC C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B27F0 80219600 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B27F4 80219604 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B27F8 80219608 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B27FC 8021960C C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2800 80219610 24040006 */ addiu $a0, $zero, 6 -/* 4B2804 80219614 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B2808 80219618 E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B280C 8021961C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2810 80219620 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B2814 80219624 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2818 80219628 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B281C 8021962C C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2820 80219630 080865AE */ j .L802196B8 -/* 4B2824 80219634 E7A00040 */ swc1 $f0, 0x40($sp) -.L80219638: -/* 4B2828 80219638 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B282C 8021963C 24040003 */ addiu $a0, $zero, 3 -/* 4B2830 80219640 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2834 80219644 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B2838 80219648 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B283C 8021964C E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B2840 80219650 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2844 80219654 24040004 */ addiu $a0, $zero, 4 -/* 4B2848 80219658 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B284C 8021965C E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B2850 80219660 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2854 80219664 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B2858 80219668 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B285C 8021966C E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B2860 80219670 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2864 80219674 24040005 */ addiu $a0, $zero, 5 -/* 4B2868 80219678 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B286C 8021967C E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B2870 80219680 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2874 80219684 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B2878 80219688 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B287C 8021968C E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B2880 80219690 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2884 80219694 24040006 */ addiu $a0, $zero, 6 -/* 4B2888 80219698 0C086524 */ jal b_area_trd_part_2_blue_ninja_koopa_UnkEnemyFunc -/* 4B288C 8021969C E7A00040 */ swc1 $f0, 0x40($sp) -/* 4B2890 802196A0 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2894 802196A4 E7A00044 */ swc1 $f0, 0x44($sp) -/* 4B2898 802196A8 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B289C 802196AC E7A00048 */ swc1 $f0, 0x48($sp) -/* 4B28A0 802196B0 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B28A4 802196B4 E7A0004C */ swc1 $f0, 0x4c($sp) -.L802196B8: -/* 4B28A8 802196B8 0000202D */ daddu $a0, $zero, $zero -/* 4B28AC 802196BC 2622FFFF */ addiu $v0, $s1, -1 -.L802196C0: -/* 4B28B0 802196C0 1840002A */ blez $v0, .L8021976C -/* 4B28B4 802196C4 0040482D */ daddu $t1, $v0, $zero -/* 4B28B8 802196C8 27A80020 */ addiu $t0, $sp, 0x20 -/* 4B28BC 802196CC 0100382D */ daddu $a3, $t0, $zero -.L802196D0: -/* 4B28C0 802196D0 0091102A */ slt $v0, $a0, $s1 -/* 4B28C4 802196D4 10400021 */ beqz $v0, .L8021975C -/* 4B28C8 802196D8 0080302D */ daddu $a2, $a0, $zero -/* 4B28CC 802196DC 00E0282D */ daddu $a1, $a3, $zero -/* 4B28D0 802196E0 00041040 */ sll $v0, $a0, 1 -/* 4B28D4 802196E4 00441021 */ addu $v0, $v0, $a0 -/* 4B28D8 802196E8 00021080 */ sll $v0, $v0, 2 -/* 4B28DC 802196EC 00481821 */ addu $v1, $v0, $t0 -.L802196F0: -/* 4B28E0 802196F0 C4A20000 */ lwc1 $f2, ($a1) -/* 4B28E4 802196F4 C4600000 */ lwc1 $f0, ($v1) -/* 4B28E8 802196F8 4600103C */ c.lt.s $f2, $f0 -/* 4B28EC 802196FC 00000000 */ nop -/* 4B28F0 80219700 45000013 */ bc1f .L80219750 -/* 4B28F4 80219704 24C60001 */ addiu $a2, $a2, 1 -/* 4B28F8 80219708 8CAA0000 */ lw $t2, ($a1) -/* 4B28FC 8021970C 8CAB0004 */ lw $t3, 4($a1) -/* 4B2900 80219710 8CAC0008 */ lw $t4, 8($a1) -/* 4B2904 80219714 AFAA0010 */ sw $t2, 0x10($sp) -/* 4B2908 80219718 AFAB0014 */ sw $t3, 0x14($sp) -/* 4B290C 8021971C AFAC0018 */ sw $t4, 0x18($sp) -/* 4B2910 80219720 8C6A0000 */ lw $t2, ($v1) -/* 4B2914 80219724 8C6B0004 */ lw $t3, 4($v1) -/* 4B2918 80219728 8C6C0008 */ lw $t4, 8($v1) -/* 4B291C 8021972C ACAA0000 */ sw $t2, ($a1) -/* 4B2920 80219730 ACAB0004 */ sw $t3, 4($a1) -/* 4B2924 80219734 ACAC0008 */ sw $t4, 8($a1) -/* 4B2928 80219738 8FAA0010 */ lw $t2, 0x10($sp) -/* 4B292C 8021973C 8FAB0014 */ lw $t3, 0x14($sp) -/* 4B2930 80219740 8FAC0018 */ lw $t4, 0x18($sp) -/* 4B2934 80219744 AC6A0000 */ sw $t2, ($v1) -/* 4B2938 80219748 AC6B0004 */ sw $t3, 4($v1) -/* 4B293C 8021974C AC6C0008 */ sw $t4, 8($v1) -.L80219750: -/* 4B2940 80219750 00D1102A */ slt $v0, $a2, $s1 -/* 4B2944 80219754 1440FFE6 */ bnez $v0, .L802196F0 -/* 4B2948 80219758 2463000C */ addiu $v1, $v1, 0xc -.L8021975C: -/* 4B294C 8021975C 24840001 */ addiu $a0, $a0, 1 -/* 4B2950 80219760 0089102A */ slt $v0, $a0, $t1 -/* 4B2954 80219764 1440FFDA */ bnez $v0, .L802196D0 -/* 4B2958 80219768 24E7000C */ addiu $a3, $a3, 0xc -.L8021976C: -/* 4B295C 8021976C 8E440148 */ lw $a0, 0x148($s2) -/* 4B2960 80219770 0C09A75B */ jal get_actor -/* 4B2964 80219774 00000000 */ nop -/* 4B2968 80219778 24040003 */ addiu $a0, $zero, 3 -/* 4B296C 8021977C 8C43008C */ lw $v1, 0x8c($v0) -/* 4B2970 80219780 12240034 */ beq $s1, $a0, .L80219854 -/* 4B2974 80219784 2A220004 */ slti $v0, $s1, 4 -/* 4B2978 80219788 10400005 */ beqz $v0, .L802197A0 -/* 4B297C 8021978C 24020002 */ addiu $v0, $zero, 2 -/* 4B2980 80219790 12220008 */ beq $s1, $v0, .L802197B4 -/* 4B2984 80219794 00000000 */ nop -/* 4B2988 80219798 080866AB */ j .L80219AAC -/* 4B298C 8021979C 00000000 */ nop -.L802197A0: -/* 4B2990 802197A0 24020004 */ addiu $v0, $zero, 4 -/* 4B2994 802197A4 1222006B */ beq $s1, $v0, .L80219954 -/* 4B2998 802197A8 00000000 */ nop -/* 4B299C 802197AC 080866AB */ j .L80219AAC -/* 4B29A0 802197B0 00000000 */ nop -.L802197B4: -/* 4B29A4 802197B4 10640005 */ beq $v1, $a0, .L802197CC -/* 4B29A8 802197B8 24020006 */ addiu $v0, $zero, 6 -/* 4B29AC 802197BC 10620014 */ beq $v1, $v0, .L80219810 -/* 4B29B0 802197C0 00000000 */ nop -/* 4B29B4 802197C4 080866AB */ j .L80219AAC -/* 4B29B8 802197C8 00000000 */ nop -.L802197CC: -/* 4B29BC 802197CC 8E050000 */ lw $a1, ($s0) -/* 4B29C0 802197D0 26100004 */ addiu $s0, $s0, 4 -/* 4B29C4 802197D4 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B29C8 802197D8 4600010D */ trunc.w.s $f4, $f0 -/* 4B29CC 802197DC 44062000 */ mfc1 $a2, $f4 -/* 4B29D0 802197E0 0C0B2026 */ jal evt_set_variable -/* 4B29D4 802197E4 0240202D */ daddu $a0, $s2, $zero -/* 4B29D8 802197E8 8E050000 */ lw $a1, ($s0) -/* 4B29DC 802197EC 26100004 */ addiu $s0, $s0, 4 -/* 4B29E0 802197F0 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B29E4 802197F4 4600010D */ trunc.w.s $f4, $f0 -/* 4B29E8 802197F8 44062000 */ mfc1 $a2, $f4 -/* 4B29EC 802197FC 0C0B2026 */ jal evt_set_variable -/* 4B29F0 80219800 0240202D */ daddu $a0, $s2, $zero -/* 4B29F4 80219804 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B29F8 80219808 080866A6 */ j .L80219A98 -/* 4B29FC 8021980C 0240202D */ daddu $a0, $s2, $zero -.L80219810: -/* 4B2A00 80219810 8E050000 */ lw $a1, ($s0) -/* 4B2A04 80219814 26100004 */ addiu $s0, $s0, 4 -/* 4B2A08 80219818 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B2A0C 8021981C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2A10 80219820 44062000 */ mfc1 $a2, $f4 -/* 4B2A14 80219824 0C0B2026 */ jal evt_set_variable -/* 4B2A18 80219828 0240202D */ daddu $a0, $s2, $zero -/* 4B2A1C 8021982C 8E050000 */ lw $a1, ($s0) -/* 4B2A20 80219830 26100004 */ addiu $s0, $s0, 4 -/* 4B2A24 80219834 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B2A28 80219838 4600010D */ trunc.w.s $f4, $f0 -/* 4B2A2C 8021983C 44062000 */ mfc1 $a2, $f4 -/* 4B2A30 80219840 0C0B2026 */ jal evt_set_variable -/* 4B2A34 80219844 0240202D */ daddu $a0, $s2, $zero -/* 4B2A38 80219848 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B2A3C 8021984C 080866A6 */ j .L80219A98 -/* 4B2A40 80219850 0240202D */ daddu $a0, $s2, $zero -.L80219854: -/* 4B2A44 80219854 24020005 */ addiu $v0, $zero, 5 -/* 4B2A48 80219858 1062001C */ beq $v1, $v0, .L802198CC -/* 4B2A4C 8021985C 28620006 */ slti $v0, $v1, 6 -/* 4B2A50 80219860 10400005 */ beqz $v0, .L80219878 -/* 4B2A54 80219864 24020006 */ addiu $v0, $zero, 6 -/* 4B2A58 80219868 10640007 */ beq $v1, $a0, .L80219888 -/* 4B2A5C 8021986C 00000000 */ nop -/* 4B2A60 80219870 080866AB */ j .L80219AAC -/* 4B2A64 80219874 00000000 */ nop -.L80219878: -/* 4B2A68 80219878 10620025 */ beq $v1, $v0, .L80219910 -/* 4B2A6C 8021987C 00000000 */ nop -/* 4B2A70 80219880 080866AB */ j .L80219AAC -/* 4B2A74 80219884 00000000 */ nop -.L80219888: -/* 4B2A78 80219888 8E050000 */ lw $a1, ($s0) -/* 4B2A7C 8021988C 26100004 */ addiu $s0, $s0, 4 -/* 4B2A80 80219890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B2A84 80219894 4600010D */ trunc.w.s $f4, $f0 -/* 4B2A88 80219898 44062000 */ mfc1 $a2, $f4 -/* 4B2A8C 8021989C 0C0B2026 */ jal evt_set_variable -/* 4B2A90 802198A0 0240202D */ daddu $a0, $s2, $zero -/* 4B2A94 802198A4 8E050000 */ lw $a1, ($s0) -/* 4B2A98 802198A8 26100004 */ addiu $s0, $s0, 4 -/* 4B2A9C 802198AC C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B2AA0 802198B0 4600010D */ trunc.w.s $f4, $f0 -/* 4B2AA4 802198B4 44062000 */ mfc1 $a2, $f4 -/* 4B2AA8 802198B8 0C0B2026 */ jal evt_set_variable -/* 4B2AAC 802198BC 0240202D */ daddu $a0, $s2, $zero -/* 4B2AB0 802198C0 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B2AB4 802198C4 080866A6 */ j .L80219A98 -/* 4B2AB8 802198C8 0240202D */ daddu $a0, $s2, $zero -.L802198CC: -/* 4B2ABC 802198CC 8E050000 */ lw $a1, ($s0) -/* 4B2AC0 802198D0 26100004 */ addiu $s0, $s0, 4 -/* 4B2AC4 802198D4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B2AC8 802198D8 4600010D */ trunc.w.s $f4, $f0 -/* 4B2ACC 802198DC 44062000 */ mfc1 $a2, $f4 -/* 4B2AD0 802198E0 0C0B2026 */ jal evt_set_variable -/* 4B2AD4 802198E4 0240202D */ daddu $a0, $s2, $zero -/* 4B2AD8 802198E8 8E050000 */ lw $a1, ($s0) -/* 4B2ADC 802198EC 26100004 */ addiu $s0, $s0, 4 -/* 4B2AE0 802198F0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B2AE4 802198F4 4600010D */ trunc.w.s $f4, $f0 -/* 4B2AE8 802198F8 44062000 */ mfc1 $a2, $f4 -/* 4B2AEC 802198FC 0C0B2026 */ jal evt_set_variable -/* 4B2AF0 80219900 0240202D */ daddu $a0, $s2, $zero -/* 4B2AF4 80219904 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B2AF8 80219908 080866A6 */ j .L80219A98 -/* 4B2AFC 8021990C 0240202D */ daddu $a0, $s2, $zero -.L80219910: -/* 4B2B00 80219910 8E050000 */ lw $a1, ($s0) -/* 4B2B04 80219914 26100004 */ addiu $s0, $s0, 4 -/* 4B2B08 80219918 C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B2B0C 8021991C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2B10 80219920 44062000 */ mfc1 $a2, $f4 -/* 4B2B14 80219924 0C0B2026 */ jal evt_set_variable -/* 4B2B18 80219928 0240202D */ daddu $a0, $s2, $zero -/* 4B2B1C 8021992C 8E050000 */ lw $a1, ($s0) -/* 4B2B20 80219930 26100004 */ addiu $s0, $s0, 4 -/* 4B2B24 80219934 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B2B28 80219938 4600010D */ trunc.w.s $f4, $f0 -/* 4B2B2C 8021993C 44062000 */ mfc1 $a2, $f4 -/* 4B2B30 80219940 0C0B2026 */ jal evt_set_variable -/* 4B2B34 80219944 0240202D */ daddu $a0, $s2, $zero -/* 4B2B38 80219948 C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B2B3C 8021994C 080866A6 */ j .L80219A98 -/* 4B2B40 80219950 0240202D */ daddu $a0, $s2, $zero -.L80219954: -/* 4B2B44 80219954 1071001E */ beq $v1, $s1, .L802199D0 -/* 4B2B48 80219958 28620005 */ slti $v0, $v1, 5 -/* 4B2B4C 8021995C 10400005 */ beqz $v0, .L80219974 -/* 4B2B50 80219960 24020005 */ addiu $v0, $zero, 5 -/* 4B2B54 80219964 10640009 */ beq $v1, $a0, .L8021998C -/* 4B2B58 80219968 00000000 */ nop -/* 4B2B5C 8021996C 080866AB */ j .L80219AAC -/* 4B2B60 80219970 00000000 */ nop -.L80219974: -/* 4B2B64 80219974 10620027 */ beq $v1, $v0, .L80219A14 -/* 4B2B68 80219978 24020006 */ addiu $v0, $zero, 6 -/* 4B2B6C 8021997C 10620036 */ beq $v1, $v0, .L80219A58 -/* 4B2B70 80219980 00000000 */ nop -/* 4B2B74 80219984 080866AB */ j .L80219AAC -/* 4B2B78 80219988 00000000 */ nop -.L8021998C: -/* 4B2B7C 8021998C 8E050000 */ lw $a1, ($s0) -/* 4B2B80 80219990 26100004 */ addiu $s0, $s0, 4 -/* 4B2B84 80219994 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B2B88 80219998 4600010D */ trunc.w.s $f4, $f0 -/* 4B2B8C 8021999C 44062000 */ mfc1 $a2, $f4 -/* 4B2B90 802199A0 0C0B2026 */ jal evt_set_variable -/* 4B2B94 802199A4 0240202D */ daddu $a0, $s2, $zero -/* 4B2B98 802199A8 8E050000 */ lw $a1, ($s0) -/* 4B2B9C 802199AC 26100004 */ addiu $s0, $s0, 4 -/* 4B2BA0 802199B0 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B2BA4 802199B4 4600010D */ trunc.w.s $f4, $f0 -/* 4B2BA8 802199B8 44062000 */ mfc1 $a2, $f4 -/* 4B2BAC 802199BC 0C0B2026 */ jal evt_set_variable -/* 4B2BB0 802199C0 0240202D */ daddu $a0, $s2, $zero -/* 4B2BB4 802199C4 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B2BB8 802199C8 080866A6 */ j .L80219A98 -/* 4B2BBC 802199CC 0240202D */ daddu $a0, $s2, $zero -.L802199D0: -/* 4B2BC0 802199D0 8E050000 */ lw $a1, ($s0) -/* 4B2BC4 802199D4 26100004 */ addiu $s0, $s0, 4 -/* 4B2BC8 802199D8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B2BCC 802199DC 4600010D */ trunc.w.s $f4, $f0 -/* 4B2BD0 802199E0 44062000 */ mfc1 $a2, $f4 -/* 4B2BD4 802199E4 0C0B2026 */ jal evt_set_variable -/* 4B2BD8 802199E8 0240202D */ daddu $a0, $s2, $zero -/* 4B2BDC 802199EC 8E050000 */ lw $a1, ($s0) -/* 4B2BE0 802199F0 26100004 */ addiu $s0, $s0, 4 -/* 4B2BE4 802199F4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B2BE8 802199F8 4600010D */ trunc.w.s $f4, $f0 -/* 4B2BEC 802199FC 44062000 */ mfc1 $a2, $f4 -/* 4B2BF0 80219A00 0C0B2026 */ jal evt_set_variable -/* 4B2BF4 80219A04 0240202D */ daddu $a0, $s2, $zero -/* 4B2BF8 80219A08 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B2BFC 80219A0C 080866A6 */ j .L80219A98 -/* 4B2C00 80219A10 0240202D */ daddu $a0, $s2, $zero -.L80219A14: -/* 4B2C04 80219A14 8E050000 */ lw $a1, ($s0) -/* 4B2C08 80219A18 26100004 */ addiu $s0, $s0, 4 -/* 4B2C0C 80219A1C C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B2C10 80219A20 4600010D */ trunc.w.s $f4, $f0 -/* 4B2C14 80219A24 44062000 */ mfc1 $a2, $f4 -/* 4B2C18 80219A28 0C0B2026 */ jal evt_set_variable -/* 4B2C1C 80219A2C 0240202D */ daddu $a0, $s2, $zero -/* 4B2C20 80219A30 8E050000 */ lw $a1, ($s0) -/* 4B2C24 80219A34 26100004 */ addiu $s0, $s0, 4 -/* 4B2C28 80219A38 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B2C2C 80219A3C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2C30 80219A40 44062000 */ mfc1 $a2, $f4 -/* 4B2C34 80219A44 0C0B2026 */ jal evt_set_variable -/* 4B2C38 80219A48 0240202D */ daddu $a0, $s2, $zero -/* 4B2C3C 80219A4C C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B2C40 80219A50 080866A6 */ j .L80219A98 -/* 4B2C44 80219A54 0240202D */ daddu $a0, $s2, $zero -.L80219A58: -/* 4B2C48 80219A58 8E050000 */ lw $a1, ($s0) -/* 4B2C4C 80219A5C 26100004 */ addiu $s0, $s0, 4 -/* 4B2C50 80219A60 C7A00044 */ lwc1 $f0, 0x44($sp) -/* 4B2C54 80219A64 4600010D */ trunc.w.s $f4, $f0 -/* 4B2C58 80219A68 44062000 */ mfc1 $a2, $f4 -/* 4B2C5C 80219A6C 0C0B2026 */ jal evt_set_variable -/* 4B2C60 80219A70 0240202D */ daddu $a0, $s2, $zero -/* 4B2C64 80219A74 8E050000 */ lw $a1, ($s0) -/* 4B2C68 80219A78 26100004 */ addiu $s0, $s0, 4 -/* 4B2C6C 80219A7C C7A00048 */ lwc1 $f0, 0x48($sp) -/* 4B2C70 80219A80 4600010D */ trunc.w.s $f4, $f0 -/* 4B2C74 80219A84 44062000 */ mfc1 $a2, $f4 -/* 4B2C78 80219A88 0C0B2026 */ jal evt_set_variable -/* 4B2C7C 80219A8C 0240202D */ daddu $a0, $s2, $zero -/* 4B2C80 80219A90 0240202D */ daddu $a0, $s2, $zero -/* 4B2C84 80219A94 C7A0004C */ lwc1 $f0, 0x4c($sp) -.L80219A98: -/* 4B2C88 80219A98 8E050000 */ lw $a1, ($s0) -/* 4B2C8C 80219A9C 4600010D */ trunc.w.s $f4, $f0 -/* 4B2C90 80219AA0 44062000 */ mfc1 $a2, $f4 -/* 4B2C94 80219AA4 0C0B2026 */ jal evt_set_variable -/* 4B2C98 80219AA8 00000000 */ nop -.L80219AAC: -/* 4B2C9C 80219AAC 8FBF005C */ lw $ra, 0x5c($sp) -/* 4B2CA0 80219AB0 8FB20058 */ lw $s2, 0x58($sp) -/* 4B2CA4 80219AB4 8FB10054 */ lw $s1, 0x54($sp) -/* 4B2CA8 80219AB8 8FB00050 */ lw $s0, 0x50($sp) -/* 4B2CAC 80219ABC 24020002 */ addiu $v0, $zero, 2 -/* 4B2CB0 80219AC0 03E00008 */ jr $ra -/* 4B2CB4 80219AC4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s b/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s deleted file mode 100644 index 2c5cfcf38b..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s +++ /dev/null @@ -1,390 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80219CF0_4B2EE0 -/* 4B2EE0 80219CF0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 4B2EE4 80219CF4 AFB20058 */ sw $s2, 0x58($sp) -/* 4B2EE8 80219CF8 0080902D */ daddu $s2, $a0, $zero -/* 4B2EEC 80219CFC AFBF005C */ sw $ra, 0x5c($sp) -/* 4B2EF0 80219D00 AFB10054 */ sw $s1, 0x54($sp) -/* 4B2EF4 80219D04 AFB00050 */ sw $s0, 0x50($sp) -/* 4B2EF8 80219D08 8E50000C */ lw $s0, 0xc($s2) -/* 4B2EFC 80219D0C 0C09A75B */ jal get_actor -/* 4B2F00 80219D10 24040204 */ addiu $a0, $zero, 0x204 -/* 4B2F04 80219D14 8C510094 */ lw $s1, 0x94($v0) -/* 4B2F08 80219D18 24020003 */ addiu $v0, $zero, 3 -/* 4B2F0C 80219D1C 1222001D */ beq $s1, $v0, .L80219D94 -/* 4B2F10 80219D20 2A220004 */ slti $v0, $s1, 4 -/* 4B2F14 80219D24 10400005 */ beqz $v0, .L80219D3C -/* 4B2F18 80219D28 24020002 */ addiu $v0, $zero, 2 -/* 4B2F1C 80219D2C 12220008 */ beq $s1, $v0, .L80219D50 -/* 4B2F20 80219D30 0000202D */ daddu $a0, $zero, $zero -/* 4B2F24 80219D34 080867A0 */ j .L80219E80 -/* 4B2F28 80219D38 2622FFFF */ addiu $v0, $s1, -1 -.L80219D3C: -/* 4B2F2C 80219D3C 24020004 */ addiu $v0, $zero, 4 -/* 4B2F30 80219D40 1222002D */ beq $s1, $v0, .L80219DF8 -/* 4B2F34 80219D44 0000202D */ daddu $a0, $zero, $zero -/* 4B2F38 80219D48 080867A0 */ j .L80219E80 -/* 4B2F3C 80219D4C 2622FFFF */ addiu $v0, $s1, -1 -.L80219D50: -/* 4B2F40 80219D50 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B2F44 80219D54 24040003 */ addiu $a0, $zero, 3 -/* 4B2F48 80219D58 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2F4C 80219D5C E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B2F50 80219D60 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2F54 80219D64 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B2F58 80219D68 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2F5C 80219D6C 24040006 */ addiu $a0, $zero, 6 -/* 4B2F60 80219D70 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B2F64 80219D74 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B2F68 80219D78 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2F6C 80219D7C E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B2F70 80219D80 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2F74 80219D84 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B2F78 80219D88 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2F7C 80219D8C 0808679E */ j .L80219E78 -/* 4B2F80 80219D90 E7A00034 */ swc1 $f0, 0x34($sp) -.L80219D94: -/* 4B2F84 80219D94 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B2F88 80219D98 24040003 */ addiu $a0, $zero, 3 -/* 4B2F8C 80219D9C C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2F90 80219DA0 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B2F94 80219DA4 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2F98 80219DA8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B2F9C 80219DAC C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2FA0 80219DB0 24040005 */ addiu $a0, $zero, 5 -/* 4B2FA4 80219DB4 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B2FA8 80219DB8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B2FAC 80219DBC C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2FB0 80219DC0 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B2FB4 80219DC4 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2FB8 80219DC8 E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B2FBC 80219DCC C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2FC0 80219DD0 24040006 */ addiu $a0, $zero, 6 -/* 4B2FC4 80219DD4 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B2FC8 80219DD8 E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B2FCC 80219DDC C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2FD0 80219DE0 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B2FD4 80219DE4 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2FD8 80219DE8 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B2FDC 80219DEC C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B2FE0 80219DF0 0808679E */ j .L80219E78 -/* 4B2FE4 80219DF4 E7A00040 */ swc1 $f0, 0x40($sp) -.L80219DF8: -/* 4B2FE8 80219DF8 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B2FEC 80219DFC 24040003 */ addiu $a0, $zero, 3 -/* 4B2FF0 80219E00 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B2FF4 80219E04 E7A00020 */ swc1 $f0, 0x20($sp) -/* 4B2FF8 80219E08 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B2FFC 80219E0C E7A00024 */ swc1 $f0, 0x24($sp) -/* 4B3000 80219E10 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B3004 80219E14 24040004 */ addiu $a0, $zero, 4 -/* 4B3008 80219E18 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B300C 80219E1C E7A00028 */ swc1 $f0, 0x28($sp) -/* 4B3010 80219E20 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B3014 80219E24 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 4B3018 80219E28 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B301C 80219E2C E7A00030 */ swc1 $f0, 0x30($sp) -/* 4B3020 80219E30 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B3024 80219E34 24040005 */ addiu $a0, $zero, 5 -/* 4B3028 80219E38 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B302C 80219E3C E7A00034 */ swc1 $f0, 0x34($sp) -/* 4B3030 80219E40 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B3034 80219E44 E7A00038 */ swc1 $f0, 0x38($sp) -/* 4B3038 80219E48 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B303C 80219E4C E7A0003C */ swc1 $f0, 0x3c($sp) -/* 4B3040 80219E50 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B3044 80219E54 24040006 */ addiu $a0, $zero, 6 -/* 4B3048 80219E58 0C086714 */ jal b_area_trd_part_2_yellow_ninja_koopa_UnkEnemyFunc -/* 4B304C 80219E5C E7A00040 */ swc1 $f0, 0x40($sp) -/* 4B3050 80219E60 C4400138 */ lwc1 $f0, 0x138($v0) -/* 4B3054 80219E64 E7A00044 */ swc1 $f0, 0x44($sp) -/* 4B3058 80219E68 C440013C */ lwc1 $f0, 0x13c($v0) -/* 4B305C 80219E6C E7A00048 */ swc1 $f0, 0x48($sp) -/* 4B3060 80219E70 C4400140 */ lwc1 $f0, 0x140($v0) -/* 4B3064 80219E74 E7A0004C */ swc1 $f0, 0x4c($sp) -.L80219E78: -/* 4B3068 80219E78 0000202D */ daddu $a0, $zero, $zero -/* 4B306C 80219E7C 2622FFFF */ addiu $v0, $s1, -1 -.L80219E80: -/* 4B3070 80219E80 1840002A */ blez $v0, .L80219F2C -/* 4B3074 80219E84 0040482D */ daddu $t1, $v0, $zero -/* 4B3078 80219E88 27A80020 */ addiu $t0, $sp, 0x20 -/* 4B307C 80219E8C 0100382D */ daddu $a3, $t0, $zero -.L80219E90: -/* 4B3080 80219E90 0091102A */ slt $v0, $a0, $s1 -/* 4B3084 80219E94 10400021 */ beqz $v0, .L80219F1C -/* 4B3088 80219E98 0080302D */ daddu $a2, $a0, $zero -/* 4B308C 80219E9C 00E0282D */ daddu $a1, $a3, $zero -/* 4B3090 80219EA0 00041040 */ sll $v0, $a0, 1 -/* 4B3094 80219EA4 00441021 */ addu $v0, $v0, $a0 -/* 4B3098 80219EA8 00021080 */ sll $v0, $v0, 2 -/* 4B309C 80219EAC 00481821 */ addu $v1, $v0, $t0 -.L80219EB0: -/* 4B30A0 80219EB0 C4A20000 */ lwc1 $f2, ($a1) -/* 4B30A4 80219EB4 C4600000 */ lwc1 $f0, ($v1) -/* 4B30A8 80219EB8 4600103C */ c.lt.s $f2, $f0 -/* 4B30AC 80219EBC 00000000 */ nop -/* 4B30B0 80219EC0 45000013 */ bc1f .L80219F10 -/* 4B30B4 80219EC4 24C60001 */ addiu $a2, $a2, 1 -/* 4B30B8 80219EC8 8CAA0000 */ lw $t2, ($a1) -/* 4B30BC 80219ECC 8CAB0004 */ lw $t3, 4($a1) -/* 4B30C0 80219ED0 8CAC0008 */ lw $t4, 8($a1) -/* 4B30C4 80219ED4 AFAA0010 */ sw $t2, 0x10($sp) -/* 4B30C8 80219ED8 AFAB0014 */ sw $t3, 0x14($sp) -/* 4B30CC 80219EDC AFAC0018 */ sw $t4, 0x18($sp) -/* 4B30D0 80219EE0 8C6A0000 */ lw $t2, ($v1) -/* 4B30D4 80219EE4 8C6B0004 */ lw $t3, 4($v1) -/* 4B30D8 80219EE8 8C6C0008 */ lw $t4, 8($v1) -/* 4B30DC 80219EEC ACAA0000 */ sw $t2, ($a1) -/* 4B30E0 80219EF0 ACAB0004 */ sw $t3, 4($a1) -/* 4B30E4 80219EF4 ACAC0008 */ sw $t4, 8($a1) -/* 4B30E8 80219EF8 8FAA0010 */ lw $t2, 0x10($sp) -/* 4B30EC 80219EFC 8FAB0014 */ lw $t3, 0x14($sp) -/* 4B30F0 80219F00 8FAC0018 */ lw $t4, 0x18($sp) -/* 4B30F4 80219F04 AC6A0000 */ sw $t2, ($v1) -/* 4B30F8 80219F08 AC6B0004 */ sw $t3, 4($v1) -/* 4B30FC 80219F0C AC6C0008 */ sw $t4, 8($v1) -.L80219F10: -/* 4B3100 80219F10 00D1102A */ slt $v0, $a2, $s1 -/* 4B3104 80219F14 1440FFE6 */ bnez $v0, .L80219EB0 -/* 4B3108 80219F18 2463000C */ addiu $v1, $v1, 0xc -.L80219F1C: -/* 4B310C 80219F1C 24840001 */ addiu $a0, $a0, 1 -/* 4B3110 80219F20 0089102A */ slt $v0, $a0, $t1 -/* 4B3114 80219F24 1440FFDA */ bnez $v0, .L80219E90 -/* 4B3118 80219F28 24E7000C */ addiu $a3, $a3, 0xc -.L80219F2C: -/* 4B311C 80219F2C 8E440148 */ lw $a0, 0x148($s2) -/* 4B3120 80219F30 0C09A75B */ jal get_actor -/* 4B3124 80219F34 00000000 */ nop -/* 4B3128 80219F38 24040003 */ addiu $a0, $zero, 3 -/* 4B312C 80219F3C 8C43008C */ lw $v1, 0x8c($v0) -/* 4B3130 80219F40 12240034 */ beq $s1, $a0, .L8021A014 -/* 4B3134 80219F44 2A220004 */ slti $v0, $s1, 4 -/* 4B3138 80219F48 10400005 */ beqz $v0, .L80219F60 -/* 4B313C 80219F4C 24020002 */ addiu $v0, $zero, 2 -/* 4B3140 80219F50 12220008 */ beq $s1, $v0, .L80219F74 -/* 4B3144 80219F54 00000000 */ nop -/* 4B3148 80219F58 0808689B */ j .L8021A26C -/* 4B314C 80219F5C 00000000 */ nop -.L80219F60: -/* 4B3150 80219F60 24020004 */ addiu $v0, $zero, 4 -/* 4B3154 80219F64 1222006B */ beq $s1, $v0, .L8021A114 -/* 4B3158 80219F68 00000000 */ nop -/* 4B315C 80219F6C 0808689B */ j .L8021A26C -/* 4B3160 80219F70 00000000 */ nop -.L80219F74: -/* 4B3164 80219F74 10640005 */ beq $v1, $a0, .L80219F8C -/* 4B3168 80219F78 24020006 */ addiu $v0, $zero, 6 -/* 4B316C 80219F7C 10620014 */ beq $v1, $v0, .L80219FD0 -/* 4B3170 80219F80 00000000 */ nop -/* 4B3174 80219F84 0808689B */ j .L8021A26C -/* 4B3178 80219F88 00000000 */ nop -.L80219F8C: -/* 4B317C 80219F8C 8E050000 */ lw $a1, ($s0) -/* 4B3180 80219F90 26100004 */ addiu $s0, $s0, 4 -/* 4B3184 80219F94 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B3188 80219F98 4600010D */ trunc.w.s $f4, $f0 -/* 4B318C 80219F9C 44062000 */ mfc1 $a2, $f4 -/* 4B3190 80219FA0 0C0B2026 */ jal evt_set_variable -/* 4B3194 80219FA4 0240202D */ daddu $a0, $s2, $zero -/* 4B3198 80219FA8 8E050000 */ lw $a1, ($s0) -/* 4B319C 80219FAC 26100004 */ addiu $s0, $s0, 4 -/* 4B31A0 80219FB0 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B31A4 80219FB4 4600010D */ trunc.w.s $f4, $f0 -/* 4B31A8 80219FB8 44062000 */ mfc1 $a2, $f4 -/* 4B31AC 80219FBC 0C0B2026 */ jal evt_set_variable -/* 4B31B0 80219FC0 0240202D */ daddu $a0, $s2, $zero -/* 4B31B4 80219FC4 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B31B8 80219FC8 08086896 */ j .L8021A258 -/* 4B31BC 80219FCC 0240202D */ daddu $a0, $s2, $zero -.L80219FD0: -/* 4B31C0 80219FD0 8E050000 */ lw $a1, ($s0) -/* 4B31C4 80219FD4 26100004 */ addiu $s0, $s0, 4 -/* 4B31C8 80219FD8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B31CC 80219FDC 4600010D */ trunc.w.s $f4, $f0 -/* 4B31D0 80219FE0 44062000 */ mfc1 $a2, $f4 -/* 4B31D4 80219FE4 0C0B2026 */ jal evt_set_variable -/* 4B31D8 80219FE8 0240202D */ daddu $a0, $s2, $zero -/* 4B31DC 80219FEC 8E050000 */ lw $a1, ($s0) -/* 4B31E0 80219FF0 26100004 */ addiu $s0, $s0, 4 -/* 4B31E4 80219FF4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B31E8 80219FF8 4600010D */ trunc.w.s $f4, $f0 -/* 4B31EC 80219FFC 44062000 */ mfc1 $a2, $f4 -/* 4B31F0 8021A000 0C0B2026 */ jal evt_set_variable -/* 4B31F4 8021A004 0240202D */ daddu $a0, $s2, $zero -/* 4B31F8 8021A008 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B31FC 8021A00C 08086896 */ j .L8021A258 -/* 4B3200 8021A010 0240202D */ daddu $a0, $s2, $zero -.L8021A014: -/* 4B3204 8021A014 24020005 */ addiu $v0, $zero, 5 -/* 4B3208 8021A018 1062001C */ beq $v1, $v0, .L8021A08C -/* 4B320C 8021A01C 28620006 */ slti $v0, $v1, 6 -/* 4B3210 8021A020 10400005 */ beqz $v0, .L8021A038 -/* 4B3214 8021A024 24020006 */ addiu $v0, $zero, 6 -/* 4B3218 8021A028 10640007 */ beq $v1, $a0, .L8021A048 -/* 4B321C 8021A02C 00000000 */ nop -/* 4B3220 8021A030 0808689B */ j .L8021A26C -/* 4B3224 8021A034 00000000 */ nop -.L8021A038: -/* 4B3228 8021A038 10620025 */ beq $v1, $v0, .L8021A0D0 -/* 4B322C 8021A03C 00000000 */ nop -/* 4B3230 8021A040 0808689B */ j .L8021A26C -/* 4B3234 8021A044 00000000 */ nop -.L8021A048: -/* 4B3238 8021A048 8E050000 */ lw $a1, ($s0) -/* 4B323C 8021A04C 26100004 */ addiu $s0, $s0, 4 -/* 4B3240 8021A050 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B3244 8021A054 4600010D */ trunc.w.s $f4, $f0 -/* 4B3248 8021A058 44062000 */ mfc1 $a2, $f4 -/* 4B324C 8021A05C 0C0B2026 */ jal evt_set_variable -/* 4B3250 8021A060 0240202D */ daddu $a0, $s2, $zero -/* 4B3254 8021A064 8E050000 */ lw $a1, ($s0) -/* 4B3258 8021A068 26100004 */ addiu $s0, $s0, 4 -/* 4B325C 8021A06C C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B3260 8021A070 4600010D */ trunc.w.s $f4, $f0 -/* 4B3264 8021A074 44062000 */ mfc1 $a2, $f4 -/* 4B3268 8021A078 0C0B2026 */ jal evt_set_variable -/* 4B326C 8021A07C 0240202D */ daddu $a0, $s2, $zero -/* 4B3270 8021A080 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B3274 8021A084 08086896 */ j .L8021A258 -/* 4B3278 8021A088 0240202D */ daddu $a0, $s2, $zero -.L8021A08C: -/* 4B327C 8021A08C 8E050000 */ lw $a1, ($s0) -/* 4B3280 8021A090 26100004 */ addiu $s0, $s0, 4 -/* 4B3284 8021A094 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B3288 8021A098 4600010D */ trunc.w.s $f4, $f0 -/* 4B328C 8021A09C 44062000 */ mfc1 $a2, $f4 -/* 4B3290 8021A0A0 0C0B2026 */ jal evt_set_variable -/* 4B3294 8021A0A4 0240202D */ daddu $a0, $s2, $zero -/* 4B3298 8021A0A8 8E050000 */ lw $a1, ($s0) -/* 4B329C 8021A0AC 26100004 */ addiu $s0, $s0, 4 -/* 4B32A0 8021A0B0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B32A4 8021A0B4 4600010D */ trunc.w.s $f4, $f0 -/* 4B32A8 8021A0B8 44062000 */ mfc1 $a2, $f4 -/* 4B32AC 8021A0BC 0C0B2026 */ jal evt_set_variable -/* 4B32B0 8021A0C0 0240202D */ daddu $a0, $s2, $zero -/* 4B32B4 8021A0C4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B32B8 8021A0C8 08086896 */ j .L8021A258 -/* 4B32BC 8021A0CC 0240202D */ daddu $a0, $s2, $zero -.L8021A0D0: -/* 4B32C0 8021A0D0 8E050000 */ lw $a1, ($s0) -/* 4B32C4 8021A0D4 26100004 */ addiu $s0, $s0, 4 -/* 4B32C8 8021A0D8 C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B32CC 8021A0DC 4600010D */ trunc.w.s $f4, $f0 -/* 4B32D0 8021A0E0 44062000 */ mfc1 $a2, $f4 -/* 4B32D4 8021A0E4 0C0B2026 */ jal evt_set_variable -/* 4B32D8 8021A0E8 0240202D */ daddu $a0, $s2, $zero -/* 4B32DC 8021A0EC 8E050000 */ lw $a1, ($s0) -/* 4B32E0 8021A0F0 26100004 */ addiu $s0, $s0, 4 -/* 4B32E4 8021A0F4 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B32E8 8021A0F8 4600010D */ trunc.w.s $f4, $f0 -/* 4B32EC 8021A0FC 44062000 */ mfc1 $a2, $f4 -/* 4B32F0 8021A100 0C0B2026 */ jal evt_set_variable -/* 4B32F4 8021A104 0240202D */ daddu $a0, $s2, $zero -/* 4B32F8 8021A108 C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B32FC 8021A10C 08086896 */ j .L8021A258 -/* 4B3300 8021A110 0240202D */ daddu $a0, $s2, $zero -.L8021A114: -/* 4B3304 8021A114 1071001E */ beq $v1, $s1, .L8021A190 -/* 4B3308 8021A118 28620005 */ slti $v0, $v1, 5 -/* 4B330C 8021A11C 10400005 */ beqz $v0, .L8021A134 -/* 4B3310 8021A120 24020005 */ addiu $v0, $zero, 5 -/* 4B3314 8021A124 10640009 */ beq $v1, $a0, .L8021A14C -/* 4B3318 8021A128 00000000 */ nop -/* 4B331C 8021A12C 0808689B */ j .L8021A26C -/* 4B3320 8021A130 00000000 */ nop -.L8021A134: -/* 4B3324 8021A134 10620027 */ beq $v1, $v0, .L8021A1D4 -/* 4B3328 8021A138 24020006 */ addiu $v0, $zero, 6 -/* 4B332C 8021A13C 10620036 */ beq $v1, $v0, .L8021A218 -/* 4B3330 8021A140 00000000 */ nop -/* 4B3334 8021A144 0808689B */ j .L8021A26C -/* 4B3338 8021A148 00000000 */ nop -.L8021A14C: -/* 4B333C 8021A14C 8E050000 */ lw $a1, ($s0) -/* 4B3340 8021A150 26100004 */ addiu $s0, $s0, 4 -/* 4B3344 8021A154 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 4B3348 8021A158 4600010D */ trunc.w.s $f4, $f0 -/* 4B334C 8021A15C 44062000 */ mfc1 $a2, $f4 -/* 4B3350 8021A160 0C0B2026 */ jal evt_set_variable -/* 4B3354 8021A164 0240202D */ daddu $a0, $s2, $zero -/* 4B3358 8021A168 8E050000 */ lw $a1, ($s0) -/* 4B335C 8021A16C 26100004 */ addiu $s0, $s0, 4 -/* 4B3360 8021A170 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 4B3364 8021A174 4600010D */ trunc.w.s $f4, $f0 -/* 4B3368 8021A178 44062000 */ mfc1 $a2, $f4 -/* 4B336C 8021A17C 0C0B2026 */ jal evt_set_variable -/* 4B3370 8021A180 0240202D */ daddu $a0, $s2, $zero -/* 4B3374 8021A184 C7A00028 */ lwc1 $f0, 0x28($sp) -/* 4B3378 8021A188 08086896 */ j .L8021A258 -/* 4B337C 8021A18C 0240202D */ daddu $a0, $s2, $zero -.L8021A190: -/* 4B3380 8021A190 8E050000 */ lw $a1, ($s0) -/* 4B3384 8021A194 26100004 */ addiu $s0, $s0, 4 -/* 4B3388 8021A198 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 4B338C 8021A19C 4600010D */ trunc.w.s $f4, $f0 -/* 4B3390 8021A1A0 44062000 */ mfc1 $a2, $f4 -/* 4B3394 8021A1A4 0C0B2026 */ jal evt_set_variable -/* 4B3398 8021A1A8 0240202D */ daddu $a0, $s2, $zero -/* 4B339C 8021A1AC 8E050000 */ lw $a1, ($s0) -/* 4B33A0 8021A1B0 26100004 */ addiu $s0, $s0, 4 -/* 4B33A4 8021A1B4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* 4B33A8 8021A1B8 4600010D */ trunc.w.s $f4, $f0 -/* 4B33AC 8021A1BC 44062000 */ mfc1 $a2, $f4 -/* 4B33B0 8021A1C0 0C0B2026 */ jal evt_set_variable -/* 4B33B4 8021A1C4 0240202D */ daddu $a0, $s2, $zero -/* 4B33B8 8021A1C8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* 4B33BC 8021A1CC 08086896 */ j .L8021A258 -/* 4B33C0 8021A1D0 0240202D */ daddu $a0, $s2, $zero -.L8021A1D4: -/* 4B33C4 8021A1D4 8E050000 */ lw $a1, ($s0) -/* 4B33C8 8021A1D8 26100004 */ addiu $s0, $s0, 4 -/* 4B33CC 8021A1DC C7A00038 */ lwc1 $f0, 0x38($sp) -/* 4B33D0 8021A1E0 4600010D */ trunc.w.s $f4, $f0 -/* 4B33D4 8021A1E4 44062000 */ mfc1 $a2, $f4 -/* 4B33D8 8021A1E8 0C0B2026 */ jal evt_set_variable -/* 4B33DC 8021A1EC 0240202D */ daddu $a0, $s2, $zero -/* 4B33E0 8021A1F0 8E050000 */ lw $a1, ($s0) -/* 4B33E4 8021A1F4 26100004 */ addiu $s0, $s0, 4 -/* 4B33E8 8021A1F8 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 4B33EC 8021A1FC 4600010D */ trunc.w.s $f4, $f0 -/* 4B33F0 8021A200 44062000 */ mfc1 $a2, $f4 -/* 4B33F4 8021A204 0C0B2026 */ jal evt_set_variable -/* 4B33F8 8021A208 0240202D */ daddu $a0, $s2, $zero -/* 4B33FC 8021A20C C7A00040 */ lwc1 $f0, 0x40($sp) -/* 4B3400 8021A210 08086896 */ j .L8021A258 -/* 4B3404 8021A214 0240202D */ daddu $a0, $s2, $zero -.L8021A218: -/* 4B3408 8021A218 8E050000 */ lw $a1, ($s0) -/* 4B340C 8021A21C 26100004 */ addiu $s0, $s0, 4 -/* 4B3410 8021A220 C7A00044 */ lwc1 $f0, 0x44($sp) -/* 4B3414 8021A224 4600010D */ trunc.w.s $f4, $f0 -/* 4B3418 8021A228 44062000 */ mfc1 $a2, $f4 -/* 4B341C 8021A22C 0C0B2026 */ jal evt_set_variable -/* 4B3420 8021A230 0240202D */ daddu $a0, $s2, $zero -/* 4B3424 8021A234 8E050000 */ lw $a1, ($s0) -/* 4B3428 8021A238 26100004 */ addiu $s0, $s0, 4 -/* 4B342C 8021A23C C7A00048 */ lwc1 $f0, 0x48($sp) -/* 4B3430 8021A240 4600010D */ trunc.w.s $f4, $f0 -/* 4B3434 8021A244 44062000 */ mfc1 $a2, $f4 -/* 4B3438 8021A248 0C0B2026 */ jal evt_set_variable -/* 4B343C 8021A24C 0240202D */ daddu $a0, $s2, $zero -/* 4B3440 8021A250 0240202D */ daddu $a0, $s2, $zero -/* 4B3444 8021A254 C7A0004C */ lwc1 $f0, 0x4c($sp) -.L8021A258: -/* 4B3448 8021A258 8E050000 */ lw $a1, ($s0) -/* 4B344C 8021A25C 4600010D */ trunc.w.s $f4, $f0 -/* 4B3450 8021A260 44062000 */ mfc1 $a2, $f4 -/* 4B3454 8021A264 0C0B2026 */ jal evt_set_variable -/* 4B3458 8021A268 00000000 */ nop -.L8021A26C: -/* 4B345C 8021A26C 8FBF005C */ lw $ra, 0x5c($sp) -/* 4B3460 8021A270 8FB20058 */ lw $s2, 0x58($sp) -/* 4B3464 8021A274 8FB10054 */ lw $s1, 0x54($sp) -/* 4B3468 8021A278 8FB00050 */ lw $s0, 0x50($sp) -/* 4B346C 8021A27C 24020002 */ addiu $v0, $zero, 2 -/* 4B3470 8021A280 03E00008 */ jr $ra -/* 4B3474 8021A284 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/effects/aura/aura_update.s b/ver/us/asm/nonmatchings/effects/aura/aura_update.s deleted file mode 100644 index 04d41ca6f3..0000000000 --- a/ver/us/asm/nonmatchings/effects/aura/aura_update.s +++ /dev/null @@ -1,335 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_E0076EE8 -.double 0.02 - -dlabel D_E0076EF0 -.double 0.04 - -dlabel D_E0076EF8 -.double 0.02 - -dlabel D_E0076F00 -.double 0.1 - -.section .text - -glabel aura_update -/* 3773E8 E0076378 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3773EC E007637C AFBF0010 */ sw $ra, 0x10($sp) -/* 3773F0 E0076380 8C830000 */ lw $v1, ($a0) -/* 3773F4 E0076384 8C85000C */ lw $a1, 0xc($a0) -/* 3773F8 E0076388 30620010 */ andi $v0, $v1, 0x10 -/* 3773FC E007638C 10400005 */ beqz $v0, .LE00763A4 -/* 377400 E0076390 2402FFEF */ addiu $v0, $zero, -0x11 -/* 377404 E0076394 00621024 */ and $v0, $v1, $v0 -/* 377408 E0076398 AC820000 */ sw $v0, ($a0) -/* 37740C E007639C 24020005 */ addiu $v0, $zero, 5 -/* 377410 E00763A0 ACA2002C */ sw $v0, 0x2c($a1) -.LE00763A4: -/* 377414 E00763A4 3C030004 */ lui $v1, 4 -/* 377418 E00763A8 8CA20030 */ lw $v0, 0x30($a1) -/* 37741C E00763AC 3463F1A0 */ ori $v1, $v1, 0xf1a0 -/* 377420 E00763B0 24420001 */ addiu $v0, $v0, 1 -/* 377424 E00763B4 0062182A */ slt $v1, $v1, $v0 -/* 377428 E00763B8 10600003 */ beqz $v1, .LE00763C8 -/* 37742C E00763BC ACA20030 */ sw $v0, 0x30($a1) -/* 377430 E00763C0 24020100 */ addiu $v0, $zero, 0x100 -/* 377434 E00763C4 ACA20030 */ sw $v0, 0x30($a1) -.LE00763C8: -/* 377438 E00763C8 8CA3002C */ lw $v1, 0x2c($a1) -/* 37743C E00763CC 2862000B */ slti $v0, $v1, 0xb -/* 377440 E00763D0 10400002 */ beqz $v0, .LE00763DC -/* 377444 E00763D4 2462FFFF */ addiu $v0, $v1, -1 -/* 377448 E00763D8 ACA2002C */ sw $v0, 0x2c($a1) -.LE00763DC: -/* 37744C E00763DC 8CA2002C */ lw $v0, 0x2c($a1) -/* 377450 E00763E0 04410005 */ bgez $v0, .LE00763F8 -/* 377454 E00763E4 0040382D */ daddu $a3, $v0, $zero -/* 377458 E00763E8 0C080128 */ jal shim_remove_effect -/* 37745C E00763EC 00000000 */ nop -/* 377460 E00763F0 0801D9FF */ j .LE00767FC -/* 377464 E00763F4 00000000 */ nop -.LE00763F8: -/* 377468 E00763F8 8CA60000 */ lw $a2, ($a1) -/* 37746C E00763FC 8CA40030 */ lw $a0, 0x30($a1) -/* 377470 E0076400 28C20002 */ slti $v0, $a2, 2 -/* 377474 E0076404 10400015 */ beqz $v0, .LE007645C -/* 377478 E0076408 2882000B */ slti $v0, $a0, 0xb -/* 37747C E007640C 1040001E */ beqz $v0, .LE0076488 -/* 377480 E0076410 24020080 */ addiu $v0, $zero, 0x80 -/* 377484 E0076414 8CA30028 */ lw $v1, 0x28($a1) -/* 377488 E0076418 3C013FE0 */ lui $at, 0x3fe0 -/* 37748C E007641C 44810800 */ mtc1 $at, $f1 -/* 377490 E0076420 44800000 */ mtc1 $zero, $f0 -/* 377494 E0076424 00431023 */ subu $v0, $v0, $v1 -/* 377498 E0076428 44821000 */ mtc1 $v0, $f2 -/* 37749C E007642C 00000000 */ nop -/* 3774A0 E0076430 468010A1 */ cvt.d.w $f2, $f2 -/* 3774A4 E0076434 46201082 */ mul.d $f2, $f2, $f0 -/* 3774A8 E0076438 00000000 */ nop -/* 3774AC E007643C 44830000 */ mtc1 $v1, $f0 -/* 3774B0 E0076440 00000000 */ nop -/* 3774B4 E0076444 46800021 */ cvt.d.w $f0, $f0 -/* 3774B8 E0076448 46220000 */ add.d $f0, $f0, $f2 -/* 3774BC E007644C 4620048D */ trunc.w.d $f18, $f0 -/* 3774C0 E0076450 E4B20028 */ swc1 $f18, 0x28($a1) -/* 3774C4 E0076454 0801D923 */ j .LE007648C -/* 3774C8 E0076458 28E2000A */ slti $v0, $a3, 0xa -.LE007645C: -/* 3774CC E007645C 1040000A */ beqz $v0, .LE0076488 -/* 3774D0 E0076460 3C036666 */ lui $v1, 0x6666 -/* 3774D4 E0076464 34636667 */ ori $v1, $v1, 0x6667 -/* 3774D8 E0076468 00041200 */ sll $v0, $a0, 8 -/* 3774DC E007646C 00441023 */ subu $v0, $v0, $a0 -/* 3774E0 E0076470 00430018 */ mult $v0, $v1 -/* 3774E4 E0076474 000217C3 */ sra $v0, $v0, 0x1f -/* 3774E8 E0076478 00004010 */ mfhi $t0 -/* 3774EC E007647C 00081883 */ sra $v1, $t0, 2 -/* 3774F0 E0076480 00621823 */ subu $v1, $v1, $v0 -/* 3774F4 E0076484 ACA30028 */ sw $v1, 0x28($a1) -.LE0076488: -/* 3774F8 E0076488 28E2000A */ slti $v0, $a3, 0xa -.LE007648C: -/* 3774FC E007648C 1040000A */ beqz $v0, .LE00764B8 -/* 377500 E0076490 00000000 */ nop -/* 377504 E0076494 3C013FE0 */ lui $at, 0x3fe0 -/* 377508 E0076498 44811800 */ mtc1 $at, $f3 -/* 37750C E007649C 44801000 */ mtc1 $zero, $f2 -/* 377510 E00764A0 C4A00028 */ lwc1 $f0, 0x28($a1) -/* 377514 E00764A4 46800021 */ cvt.d.w $f0, $f0 -/* 377518 E00764A8 46220002 */ mul.d $f0, $f0, $f2 -/* 37751C E00764AC 00000000 */ nop -/* 377520 E00764B0 4620048D */ trunc.w.d $f18, $f0 -/* 377524 E00764B4 E4B20028 */ swc1 $f18, 0x28($a1) -.LE00764B8: -/* 377528 E00764B8 14C0002E */ bnez $a2, .LE0076574 -/* 37752C E00764BC 00000000 */ nop -/* 377530 E00764C0 C4AE0038 */ lwc1 $f14, 0x38($a1) -/* 377534 E00764C4 C4AA003C */ lwc1 $f10, 0x3c($a1) -/* 377538 E00764C8 460E5281 */ sub.s $f10, $f10, $f14 -/* 37753C E00764CC 3C01E007 */ lui $at, %hi(D_E0076EE8) -/* 377540 E00764D0 D4206EE8 */ ldc1 $f0, %lo(D_E0076EE8)($at) -/* 377544 E00764D4 460052A1 */ cvt.d.s $f10, $f10 -/* 377548 E00764D8 46205282 */ mul.d $f10, $f10, $f0 -/* 37754C E00764DC 00000000 */ nop -/* 377550 E00764E0 C4AC0044 */ lwc1 $f12, 0x44($a1) -/* 377554 E00764E4 C4A40048 */ lwc1 $f4, 0x48($a1) -/* 377558 E00764E8 460C2101 */ sub.s $f4, $f4, $f12 -/* 37755C E00764EC 46002121 */ cvt.d.s $f4, $f4 -/* 377560 E00764F0 46202102 */ mul.d $f4, $f4, $f0 -/* 377564 E00764F4 00000000 */ nop -/* 377568 E00764F8 C4A8001C */ lwc1 $f8, 0x1c($a1) -/* 37756C E00764FC C4A60024 */ lwc1 $f6, 0x24($a1) -/* 377570 E0076500 46083181 */ sub.s $f6, $f6, $f8 -/* 377574 E0076504 3C01E007 */ lui $at, %hi(D_E0076EF0) -/* 377578 E0076508 D4306EF0 */ ldc1 $f16, %lo(D_E0076EF0)($at) -/* 37757C E007650C 460031A1 */ cvt.d.s $f6, $f6 -/* 377580 E0076510 46303182 */ mul.d $f6, $f6, $f16 -/* 377584 E0076514 00000000 */ nop -/* 377588 E0076518 C4A20020 */ lwc1 $f2, 0x20($a1) -/* 37758C E007651C C4A00024 */ lwc1 $f0, 0x24($a1) -/* 377590 E0076520 46020001 */ sub.s $f0, $f0, $f2 -/* 377594 E0076524 46000021 */ cvt.d.s $f0, $f0 -/* 377598 E0076528 46300002 */ mul.d $f0, $f0, $f16 -/* 37759C E007652C 00000000 */ nop -/* 3775A0 E0076530 460073A1 */ cvt.d.s $f14, $f14 -/* 3775A4 E0076534 462A7380 */ add.d $f14, $f14, $f10 -/* 3775A8 E0076538 46006321 */ cvt.d.s $f12, $f12 -/* 3775AC E007653C 46246300 */ add.d $f12, $f12, $f4 -/* 3775B0 E0076540 46004221 */ cvt.d.s $f8, $f8 -/* 3775B4 E0076544 460010A1 */ cvt.d.s $f2, $f2 -/* 3775B8 E0076548 46264200 */ add.d $f8, $f8, $f6 -/* 3775BC E007654C 462073A0 */ cvt.s.d $f14, $f14 -/* 3775C0 E0076550 46206320 */ cvt.s.d $f12, $f12 -/* 3775C4 E0076554 46204220 */ cvt.s.d $f8, $f8 -/* 3775C8 E0076558 E4AE0038 */ swc1 $f14, 0x38($a1) -/* 3775CC E007655C 46201080 */ add.d $f2, $f2, $f0 -/* 3775D0 E0076560 E4AC0044 */ swc1 $f12, 0x44($a1) -/* 3775D4 E0076564 E4A8001C */ swc1 $f8, 0x1c($a1) -/* 3775D8 E0076568 462010A0 */ cvt.s.d $f2, $f2 -/* 3775DC E007656C 0801D987 */ j .LE007661C -/* 3775E0 E0076570 E4A20020 */ swc1 $f2, 0x20($a1) -.LE0076574: -/* 3775E4 E0076574 C4AE0038 */ lwc1 $f14, 0x38($a1) -/* 3775E8 E0076578 C4AA003C */ lwc1 $f10, 0x3c($a1) -/* 3775EC E007657C 460E5281 */ sub.s $f10, $f10, $f14 -/* 3775F0 E0076580 3C01E007 */ lui $at, %hi(D_E0076EF8) -/* 3775F4 E0076584 D4306EF8 */ ldc1 $f16, %lo(D_E0076EF8)($at) -/* 3775F8 E0076588 460052A1 */ cvt.d.s $f10, $f10 -/* 3775FC E007658C 46305282 */ mul.d $f10, $f10, $f16 -/* 377600 E0076590 00000000 */ nop -/* 377604 E0076594 C4AC0044 */ lwc1 $f12, 0x44($a1) -/* 377608 E0076598 C4A20048 */ lwc1 $f2, 0x48($a1) -/* 37760C E007659C 460C1081 */ sub.s $f2, $f2, $f12 -/* 377610 E00765A0 460010A1 */ cvt.d.s $f2, $f2 -/* 377614 E00765A4 46301082 */ mul.d $f2, $f2, $f16 -/* 377618 E00765A8 00000000 */ nop -/* 37761C E00765AC C4A80050 */ lwc1 $f8, 0x50($a1) -/* 377620 E00765B0 C4A40054 */ lwc1 $f4, 0x54($a1) -/* 377624 E00765B4 46082101 */ sub.s $f4, $f4, $f8 -/* 377628 E00765B8 46002121 */ cvt.d.s $f4, $f4 -/* 37762C E00765BC 46302102 */ mul.d $f4, $f4, $f16 -/* 377630 E00765C0 00000000 */ nop -/* 377634 E00765C4 C4A6005C */ lwc1 $f6, 0x5c($a1) -/* 377638 E00765C8 C4A00060 */ lwc1 $f0, 0x60($a1) -/* 37763C E00765CC 46060001 */ sub.s $f0, $f0, $f6 -/* 377640 E00765D0 46000021 */ cvt.d.s $f0, $f0 -/* 377644 E00765D4 46300002 */ mul.d $f0, $f0, $f16 -/* 377648 E00765D8 00000000 */ nop -/* 37764C E00765DC 460073A1 */ cvt.d.s $f14, $f14 -/* 377650 E00765E0 462A7380 */ add.d $f14, $f14, $f10 -/* 377654 E00765E4 46006321 */ cvt.d.s $f12, $f12 -/* 377658 E00765E8 46226300 */ add.d $f12, $f12, $f2 -/* 37765C E00765EC 46004221 */ cvt.d.s $f8, $f8 -/* 377660 E00765F0 46244200 */ add.d $f8, $f8, $f4 -/* 377664 E00765F4 460031A1 */ cvt.d.s $f6, $f6 -/* 377668 E00765F8 46203180 */ add.d $f6, $f6, $f0 -/* 37766C E00765FC 462073A0 */ cvt.s.d $f14, $f14 -/* 377670 E0076600 46206320 */ cvt.s.d $f12, $f12 -/* 377674 E0076604 46204220 */ cvt.s.d $f8, $f8 -/* 377678 E0076608 462031A0 */ cvt.s.d $f6, $f6 -/* 37767C E007660C E4AE0038 */ swc1 $f14, 0x38($a1) -/* 377680 E0076610 E4AC0044 */ swc1 $f12, 0x44($a1) -/* 377684 E0076614 E4A80050 */ swc1 $f8, 0x50($a1) -/* 377688 E0076618 E4A6005C */ swc1 $f6, 0x5c($a1) -.LE007661C: -/* 37768C E007661C C4A00034 */ lwc1 $f0, 0x34($a1) -/* 377690 E0076620 C4A20038 */ lwc1 $f2, 0x38($a1) -/* 377694 E0076624 46020080 */ add.s $f2, $f0, $f2 -/* 377698 E0076628 44800000 */ mtc1 $zero, $f0 -/* 37769C E007662C 00000000 */ nop -/* 3776A0 E0076630 4600103C */ c.lt.s $f2, $f0 -/* 3776A4 E0076634 00000000 */ nop -/* 3776A8 E0076638 45000005 */ bc1f .LE0076650 -/* 3776AC E007663C E4A20034 */ swc1 $f2, 0x34($a1) -/* 3776B0 E0076640 3C014280 */ lui $at, 0x4280 -/* 3776B4 E0076644 44810000 */ mtc1 $at, $f0 -/* 3776B8 E0076648 0801D99C */ j .LE0076670 -/* 3776BC E007664C 46001000 */ add.s $f0, $f2, $f0 -.LE0076650: -/* 3776C0 E0076650 3C014280 */ lui $at, 0x4280 -/* 3776C4 E0076654 44810000 */ mtc1 $at, $f0 -/* 3776C8 E0076658 00000000 */ nop -/* 3776CC E007665C 4602003C */ c.lt.s $f0, $f2 -/* 3776D0 E0076660 00000000 */ nop -/* 3776D4 E0076664 45000003 */ bc1f .LE0076674 -/* 3776D8 E0076668 00000000 */ nop -/* 3776DC E007666C 46001001 */ sub.s $f0, $f2, $f0 -.LE0076670: -/* 3776E0 E0076670 E4A00034 */ swc1 $f0, 0x34($a1) -.LE0076674: -/* 3776E4 E0076674 C4A00040 */ lwc1 $f0, 0x40($a1) -/* 3776E8 E0076678 C4A20044 */ lwc1 $f2, 0x44($a1) -/* 3776EC E007667C 46020080 */ add.s $f2, $f0, $f2 -/* 3776F0 E0076680 44800000 */ mtc1 $zero, $f0 -/* 3776F4 E0076684 00000000 */ nop -/* 3776F8 E0076688 4600103C */ c.lt.s $f2, $f0 -/* 3776FC E007668C 00000000 */ nop -/* 377700 E0076690 45000005 */ bc1f .LE00766A8 -/* 377704 E0076694 E4A20040 */ swc1 $f2, 0x40($a1) -/* 377708 E0076698 3C014300 */ lui $at, 0x4300 -/* 37770C E007669C 44810000 */ mtc1 $at, $f0 -/* 377710 E00766A0 0801D9B2 */ j .LE00766C8 -/* 377714 E00766A4 46001000 */ add.s $f0, $f2, $f0 -.LE00766A8: -/* 377718 E00766A8 3C014300 */ lui $at, 0x4300 -/* 37771C E00766AC 44810000 */ mtc1 $at, $f0 -/* 377720 E00766B0 00000000 */ nop -/* 377724 E00766B4 4602003C */ c.lt.s $f0, $f2 -/* 377728 E00766B8 00000000 */ nop -/* 37772C E00766BC 45000003 */ bc1f .LE00766CC -/* 377730 E00766C0 00000000 */ nop -/* 377734 E00766C4 46001001 */ sub.s $f0, $f2, $f0 -.LE00766C8: -/* 377738 E00766C8 E4A00040 */ swc1 $f0, 0x40($a1) -.LE00766CC: -/* 37773C E00766CC C4A0004C */ lwc1 $f0, 0x4c($a1) -/* 377740 E00766D0 C4A20050 */ lwc1 $f2, 0x50($a1) -/* 377744 E00766D4 46020080 */ add.s $f2, $f0, $f2 -/* 377748 E00766D8 44800000 */ mtc1 $zero, $f0 -/* 37774C E00766DC 00000000 */ nop -/* 377750 E00766E0 4600103C */ c.lt.s $f2, $f0 -/* 377754 E00766E4 00000000 */ nop -/* 377758 E00766E8 45000005 */ bc1f .LE0076700 -/* 37775C E00766EC E4A2004C */ swc1 $f2, 0x4c($a1) -/* 377760 E00766F0 3C014280 */ lui $at, 0x4280 -/* 377764 E00766F4 44810000 */ mtc1 $at, $f0 -/* 377768 E00766F8 0801D9C8 */ j .LE0076720 -/* 37776C E00766FC 46001000 */ add.s $f0, $f2, $f0 -.LE0076700: -/* 377770 E0076700 3C014280 */ lui $at, 0x4280 -/* 377774 E0076704 44810000 */ mtc1 $at, $f0 -/* 377778 E0076708 00000000 */ nop -/* 37777C E007670C 4602003C */ c.lt.s $f0, $f2 -/* 377780 E0076710 00000000 */ nop -/* 377784 E0076714 45000003 */ bc1f .LE0076724 -/* 377788 E0076718 00000000 */ nop -/* 37778C E007671C 46001001 */ sub.s $f0, $f2, $f0 -.LE0076720: -/* 377790 E0076720 E4A0004C */ swc1 $f0, 0x4c($a1) -.LE0076724: -/* 377794 E0076724 C4A00058 */ lwc1 $f0, 0x58($a1) -/* 377798 E0076728 C4A2005C */ lwc1 $f2, 0x5c($a1) -/* 37779C E007672C 46020080 */ add.s $f2, $f0, $f2 -/* 3777A0 E0076730 44800000 */ mtc1 $zero, $f0 -/* 3777A4 E0076734 00000000 */ nop -/* 3777A8 E0076738 4600103C */ c.lt.s $f2, $f0 -/* 3777AC E007673C 00000000 */ nop -/* 3777B0 E0076740 45000005 */ bc1f .LE0076758 -/* 3777B4 E0076744 E4A20058 */ swc1 $f2, 0x58($a1) -/* 3777B8 E0076748 3C014300 */ lui $at, 0x4300 -/* 3777BC E007674C 44810000 */ mtc1 $at, $f0 -/* 3777C0 E0076750 0801D9DE */ j .LE0076778 -/* 3777C4 E0076754 46001000 */ add.s $f0, $f2, $f0 -.LE0076758: -/* 3777C8 E0076758 3C014300 */ lui $at, 0x4300 -/* 3777CC E007675C 44810000 */ mtc1 $at, $f0 -/* 3777D0 E0076760 00000000 */ nop -/* 3777D4 E0076764 4602003C */ c.lt.s $f0, $f2 -/* 3777D8 E0076768 00000000 */ nop -/* 3777DC E007676C 45000003 */ bc1f .LE007677C -/* 3777E0 E0076770 00000000 */ nop -/* 3777E4 E0076774 46001001 */ sub.s $f0, $f2, $f0 -.LE0076778: -/* 3777E8 E0076778 E4A00058 */ swc1 $f0, 0x58($a1) -.LE007677C: -/* 3777EC E007677C C4AA0010 */ lwc1 $f10, 0x10($a1) -/* 3777F0 E0076780 C4A60004 */ lwc1 $f6, 4($a1) -/* 3777F4 E0076784 460A3181 */ sub.s $f6, $f6, $f10 -/* 3777F8 E0076788 3C01E007 */ lui $at, %hi(D_E0076F00) -/* 3777FC E007678C D42C6F00 */ ldc1 $f12, %lo(D_E0076F00)($at) -/* 377800 E0076790 460031A1 */ cvt.d.s $f6, $f6 -/* 377804 E0076794 462C3182 */ mul.d $f6, $f6, $f12 -/* 377808 E0076798 00000000 */ nop -/* 37780C E007679C C4A80014 */ lwc1 $f8, 0x14($a1) -/* 377810 E00767A0 C4A20008 */ lwc1 $f2, 8($a1) -/* 377814 E00767A4 46081081 */ sub.s $f2, $f2, $f8 -/* 377818 E00767A8 460010A1 */ cvt.d.s $f2, $f2 -/* 37781C E00767AC 462C1082 */ mul.d $f2, $f2, $f12 -/* 377820 E00767B0 00000000 */ nop -/* 377824 E00767B4 C4A40018 */ lwc1 $f4, 0x18($a1) -/* 377828 E00767B8 C4A0000C */ lwc1 $f0, 0xc($a1) -/* 37782C E00767BC 46040001 */ sub.s $f0, $f0, $f4 -/* 377830 E00767C0 46000021 */ cvt.d.s $f0, $f0 -/* 377834 E00767C4 462C0002 */ mul.d $f0, $f0, $f12 -/* 377838 E00767C8 00000000 */ nop -/* 37783C E00767CC 460052A1 */ cvt.d.s $f10, $f10 -/* 377840 E00767D0 46265280 */ add.d $f10, $f10, $f6 -/* 377844 E00767D4 46004221 */ cvt.d.s $f8, $f8 -/* 377848 E00767D8 46224200 */ add.d $f8, $f8, $f2 -/* 37784C E00767DC 46002121 */ cvt.d.s $f4, $f4 -/* 377850 E00767E0 46202100 */ add.d $f4, $f4, $f0 -/* 377854 E00767E4 462052A0 */ cvt.s.d $f10, $f10 -/* 377858 E00767E8 46204220 */ cvt.s.d $f8, $f8 -/* 37785C E00767EC 46202120 */ cvt.s.d $f4, $f4 -/* 377860 E00767F0 E4AA0010 */ swc1 $f10, 0x10($a1) -/* 377864 E00767F4 E4A80014 */ swc1 $f8, 0x14($a1) -/* 377868 E00767F8 E4A40018 */ swc1 $f4, 0x18($a1) -.LE00767FC: -/* 37786C E00767FC 8FBF0010 */ lw $ra, 0x10($sp) -/* 377870 E0076800 03E00008 */ jr $ra -/* 377874 E0076804 27BD0018 */ addiu $sp, $sp, 0x18 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 index 4218ac9321..f365339fef 100644 --- 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 @@ -97,7 +97,7 @@ glabel flo_13_func_80241DB8_CC55C8 .L80241F14: /* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero /* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero -/* CC572C 80241F1C 0C090267 */ jal flo_13_UnkNpcAIFunc1 +/* CC572C 80241F1C 0C090267 */ jal flo_13_UnkNpcAIFunc1_copy /* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero /* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero .L80241F28: 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 index e746e9999b..30ebddde52 100644 --- 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 @@ -97,7 +97,7 @@ glabel flo_17_func_80241C64_CD8F44 .L80241DC0: /* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero /* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero -/* CD90A8 80241DC8 0C090212 */ jal flo_17_UnkNpcAIFunc1 +/* CD90A8 80241DC8 0C090212 */ jal flo_17_UnkNpcAIFunc1_copy /* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero /* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero .L80241DD4: diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s deleted file mode 100644 index 75383737d2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C44_A17E64 -/* A17E64 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A17E68 80241C48 AFB00010 */ sw $s0, 0x10($sp) -/* A17E6C 80241C4C 0080802D */ daddu $s0, $a0, $zero -/* A17E70 80241C50 AFBF0014 */ sw $ra, 0x14($sp) -/* A17E74 80241C54 8E020148 */ lw $v0, 0x148($s0) -/* A17E78 80241C58 0C00EABB */ jal get_npc_unsafe -/* A17E7C 80241C5C 84440008 */ lh $a0, 8($v0) -/* A17E80 80241C60 9443008E */ lhu $v1, 0x8e($v0) -/* A17E84 80241C64 C440003C */ lwc1 $f0, 0x3c($v0) -/* A17E88 80241C68 24640001 */ addiu $a0, $v1, 1 -/* A17E8C 80241C6C 00031C00 */ sll $v1, $v1, 0x10 -/* A17E90 80241C70 00031B83 */ sra $v1, $v1, 0xe -/* A17E94 80241C74 A444008E */ sh $a0, 0x8e($v0) -/* A17E98 80241C78 3C018024 */ lui $at, %hi(D_80244490_A1A6B0) -/* A17E9C 80241C7C 00230821 */ addu $at, $at, $v1 -/* A17EA0 80241C80 C4224490 */ lwc1 $f2, %lo(D_80244490_A1A6B0)($at) -/* A17EA4 80241C84 8443008E */ lh $v1, 0x8e($v0) -/* A17EA8 80241C88 46020000 */ add.s $f0, $f0, $f2 -/* A17EAC 80241C8C 28630005 */ slti $v1, $v1, 5 -/* A17EB0 80241C90 14600003 */ bnez $v1, .L80241CA0 -/* A17EB4 80241C94 E440003C */ swc1 $f0, 0x3c($v0) -/* A17EB8 80241C98 2402000C */ addiu $v0, $zero, 0xc -/* A17EBC 80241C9C AE020070 */ sw $v0, 0x70($s0) -.L80241CA0: -/* A17EC0 80241CA0 8FBF0014 */ lw $ra, 0x14($sp) -/* A17EC4 80241CA4 8FB00010 */ lw $s0, 0x10($sp) -/* A17EC8 80241CA8 03E00008 */ jr $ra -/* A17ECC 80241CAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s deleted file mode 100644 index 487d41066e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244E38_A1B058 -.word .L80242408_A18628, .L80242418_A18638, .L80242430_A18650, .L80242440_A18660, .L802424C0_A186E0, .L802424C0_A186E0, .L802424C0_A186E0, .L802424C0_A186E0, .L802424C0_A186E0, .L802424C0_A186E0, .L80242458_A18678, .L80242468_A18688, .L80242480_A186A0, .L80242498_A186B8, .L802424B0_A186D0, 0 - -.section .text - -glabel func_802422FC_A1851C -/* A1851C 802422FC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A18520 80242300 AFB40040 */ sw $s4, 0x40($sp) -/* A18524 80242304 0080A02D */ daddu $s4, $a0, $zero -/* A18528 80242308 AFBF0048 */ sw $ra, 0x48($sp) -/* A1852C 8024230C AFB50044 */ sw $s5, 0x44($sp) -/* A18530 80242310 AFB3003C */ sw $s3, 0x3c($sp) -/* A18534 80242314 AFB20038 */ sw $s2, 0x38($sp) -/* A18538 80242318 AFB10034 */ sw $s1, 0x34($sp) -/* A1853C 8024231C AFB00030 */ sw $s0, 0x30($sp) -/* A18540 80242320 8E920148 */ lw $s2, 0x148($s4) -/* A18544 80242324 86440008 */ lh $a0, 8($s2) -/* A18548 80242328 8E90000C */ lw $s0, 0xc($s4) -/* A1854C 8024232C 0C00EABB */ jal get_npc_unsafe -/* A18550 80242330 00A0882D */ daddu $s1, $a1, $zero -/* A18554 80242334 0280202D */ daddu $a0, $s4, $zero -/* A18558 80242338 8E050000 */ lw $a1, ($s0) -/* A1855C 8024233C 0C0B1EAF */ jal evt_get_variable -/* A18560 80242340 0040A82D */ daddu $s5, $v0, $zero -/* A18564 80242344 AFA00010 */ sw $zero, 0x10($sp) -/* A18568 80242348 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1856C 8024234C 8C630030 */ lw $v1, 0x30($v1) -/* A18570 80242350 AFA30014 */ sw $v1, 0x14($sp) -/* A18574 80242354 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18578 80242358 8C63001C */ lw $v1, 0x1c($v1) -/* A1857C 8024235C AFA30018 */ sw $v1, 0x18($sp) -/* A18580 80242360 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18584 80242364 8C630024 */ lw $v1, 0x24($v1) -/* A18588 80242368 AFA3001C */ sw $v1, 0x1c($sp) -/* A1858C 8024236C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18590 80242370 8C630028 */ lw $v1, 0x28($v1) -/* A18594 80242374 27B30010 */ addiu $s3, $sp, 0x10 -/* A18598 80242378 AFA30020 */ sw $v1, 0x20($sp) -/* A1859C 8024237C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A185A0 80242380 3C0142F0 */ lui $at, 0x42f0 -/* A185A4 80242384 44810000 */ mtc1 $at, $f0 -/* A185A8 80242388 8C63002C */ lw $v1, 0x2c($v1) -/* A185AC 8024238C 0040802D */ daddu $s0, $v0, $zero -/* A185B0 80242390 E7A00028 */ swc1 $f0, 0x28($sp) -/* A185B4 80242394 A7A0002C */ sh $zero, 0x2c($sp) -/* A185B8 80242398 12200006 */ beqz $s1, .L802423B4 -/* A185BC 8024239C AFA30024 */ sw $v1, 0x24($sp) -/* A185C0 802423A0 02A0202D */ daddu $a0, $s5, $zero -/* A185C4 802423A4 0240282D */ daddu $a1, $s2, $zero -/* A185C8 802423A8 0280302D */ daddu $a2, $s4, $zero -/* A185CC 802423AC 0C090876 */ jal hos_02_UnkFunc5 -/* A185D0 802423B0 0200382D */ daddu $a3, $s0, $zero -.L802423B4: -/* A185D4 802423B4 2402FFFE */ addiu $v0, $zero, -2 -/* A185D8 802423B8 A2A200AB */ sb $v0, 0xab($s5) -/* A185DC 802423BC 8E4300B0 */ lw $v1, 0xb0($s2) -/* A185E0 802423C0 30620004 */ andi $v0, $v1, 4 -/* A185E4 802423C4 10400007 */ beqz $v0, .L802423E4 -/* A185E8 802423C8 00000000 */ nop -/* A185EC 802423CC 824200B4 */ lb $v0, 0xb4($s2) -/* A185F0 802423D0 1440003C */ bnez $v0, .L802424C4 -/* A185F4 802423D4 0000102D */ daddu $v0, $zero, $zero -/* A185F8 802423D8 2402FFFB */ addiu $v0, $zero, -5 -/* A185FC 802423DC 00621024 */ and $v0, $v1, $v0 -/* A18600 802423E0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802423E4: -/* A18604 802423E4 8E830070 */ lw $v1, 0x70($s4) -/* A18608 802423E8 2C62000F */ sltiu $v0, $v1, 0xf -/* A1860C 802423EC 10400034 */ beqz $v0, .L802424C0_A186E0 -/* A18610 802423F0 00031080 */ sll $v0, $v1, 2 -/* A18614 802423F4 3C018024 */ lui $at, %hi(jtbl_80244E38_A1B058) -/* A18618 802423F8 00220821 */ addu $at, $at, $v0 -/* A1861C 802423FC 8C224E38 */ lw $v0, %lo(jtbl_80244E38_A1B058)($at) -/* A18620 80242400 00400008 */ jr $v0 -/* A18624 80242404 00000000 */ nop -.L80242408_A18628: -/* A18628 80242408 0280202D */ daddu $a0, $s4, $zero -/* A1862C 8024240C 0200282D */ daddu $a1, $s0, $zero -/* A18630 80242410 0C0903FC */ jal hos_02_UnkNpcAIFunc23 -/* A18634 80242414 0260302D */ daddu $a2, $s3, $zero -.L80242418_A18638: -/* A18638 80242418 0280202D */ daddu $a0, $s4, $zero -/* A1863C 8024241C 0200282D */ daddu $a1, $s0, $zero -/* A18640 80242420 0C090468 */ jal hos_02_UnkNpcAIFunc35 -/* A18644 80242424 0260302D */ daddu $a2, $s3, $zero -/* A18648 80242428 08090931 */ j .L802424C4 -/* A1864C 8024242C 0000102D */ daddu $v0, $zero, $zero -.L80242430_A18650: -/* A18650 80242430 0280202D */ daddu $a0, $s4, $zero -/* A18654 80242434 0200282D */ daddu $a1, $s0, $zero -/* A18658 80242438 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 -/* A1865C 8024243C 0260302D */ daddu $a2, $s3, $zero -.L80242440_A18660: -/* A18660 80242440 0280202D */ daddu $a0, $s4, $zero -/* A18664 80242444 0200282D */ daddu $a1, $s0, $zero -/* A18668 80242448 0C090622 */ jal hos_02_UnkFunc4 -/* A1866C 8024244C 0260302D */ daddu $a2, $s3, $zero -/* A18670 80242450 08090931 */ j .L802424C4 -/* A18674 80242454 0000102D */ daddu $v0, $zero, $zero -.L80242458_A18678: -/* A18678 80242458 0280202D */ daddu $a0, $s4, $zero -/* A1867C 8024245C 0200282D */ daddu $a1, $s0, $zero -/* A18680 80242460 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 -/* A18684 80242464 0260302D */ daddu $a2, $s3, $zero -.L80242468_A18688: -/* A18688 80242468 0280202D */ daddu $a0, $s4, $zero -/* A1868C 8024246C 0200282D */ daddu $a1, $s0, $zero -/* A18690 80242470 0C090711 */ jal func_80241C44_A17E64 -/* A18694 80242474 0260302D */ daddu $a2, $s3, $zero -/* A18698 80242478 08090931 */ j .L802424C4 -/* A1869C 8024247C 0000102D */ daddu $v0, $zero, $zero -.L80242480_A186A0: -/* A186A0 80242480 0280202D */ daddu $a0, $s4, $zero -/* A186A4 80242484 0200282D */ daddu $a1, $s0, $zero -/* A186A8 80242488 0C09072C */ jal hos_02_UnkNpcAIFunc14 -/* A186AC 8024248C 0260302D */ daddu $a2, $s3, $zero -/* A186B0 80242490 08090931 */ j .L802424C4 -/* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero -.L80242498_A186B8: -/* A186B8 80242498 0280202D */ daddu $a0, $s4, $zero -/* A186BC 8024249C 0200282D */ daddu $a1, $s0, $zero -/* A186C0 802424A0 0C090779 */ jal hos_02_UnkNpcAIFunc3 -/* A186C4 802424A4 0260302D */ daddu $a2, $s3, $zero -/* A186C8 802424A8 08090931 */ j .L802424C4 -/* A186CC 802424AC 0000102D */ daddu $v0, $zero, $zero -.L802424B0_A186D0: -/* A186D0 802424B0 0280202D */ daddu $a0, $s4, $zero -/* A186D4 802424B4 0200282D */ daddu $a1, $s0, $zero -/* A186D8 802424B8 0C090792 */ jal hos_02_UnkFunc6 -/* A186DC 802424BC 0260302D */ daddu $a2, $s3, $zero -.L802424C0_A186E0: -/* A186E0 802424C0 0000102D */ daddu $v0, $zero, $zero -.L802424C4: -/* A186E4 802424C4 8FBF0048 */ lw $ra, 0x48($sp) -/* A186E8 802424C8 8FB50044 */ lw $s5, 0x44($sp) -/* A186EC 802424CC 8FB40040 */ lw $s4, 0x40($sp) -/* A186F0 802424D0 8FB3003C */ lw $s3, 0x3c($sp) -/* A186F4 802424D4 8FB20038 */ lw $s2, 0x38($sp) -/* A186F8 802424D8 8FB10034 */ lw $s1, 0x34($sp) -/* A186FC 802424DC 8FB00030 */ lw $s0, 0x30($sp) -/* A18700 802424E0 03E00008 */ jr $ra -/* A18704 802424E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s deleted file mode 100644 index bcfb925e00..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244E80_A1B0A0 -.word .L80242A04_A18C24, .L80242A14_A18C34, .L80242A2C_A18C4C, .L80242A3C_A18C5C, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242A54_A18C74, .L80242A64_A18C84, .L80242A7C_A18C9C, .L80242A8C_A18CAC, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AB4_A18CD4, .L80242AA4_A18CC4, 0, 0, 0 - -.section .text - -glabel func_802428F4_A18B14 -/* A18B14 802428F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A18B18 802428F8 AFB40040 */ sw $s4, 0x40($sp) -/* A18B1C 802428FC 0080A02D */ daddu $s4, $a0, $zero -/* A18B20 80242900 AFBF0048 */ sw $ra, 0x48($sp) -/* A18B24 80242904 AFB50044 */ sw $s5, 0x44($sp) -/* A18B28 80242908 AFB3003C */ sw $s3, 0x3c($sp) -/* A18B2C 8024290C AFB20038 */ sw $s2, 0x38($sp) -/* A18B30 80242910 AFB10034 */ sw $s1, 0x34($sp) -/* A18B34 80242914 AFB00030 */ sw $s0, 0x30($sp) -/* A18B38 80242918 8E920148 */ lw $s2, 0x148($s4) -/* A18B3C 8024291C 86440008 */ lh $a0, 8($s2) -/* A18B40 80242920 8E90000C */ lw $s0, 0xc($s4) -/* A18B44 80242924 0C00EABB */ jal get_npc_unsafe -/* A18B48 80242928 00A0882D */ daddu $s1, $a1, $zero -/* A18B4C 8024292C 0280202D */ daddu $a0, $s4, $zero -/* A18B50 80242930 8E050000 */ lw $a1, ($s0) -/* A18B54 80242934 0C0B1EAF */ jal evt_get_variable -/* A18B58 80242938 0040A82D */ daddu $s5, $v0, $zero -/* A18B5C 8024293C AFA00010 */ sw $zero, 0x10($sp) -/* A18B60 80242940 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B64 80242944 8C630030 */ lw $v1, 0x30($v1) -/* A18B68 80242948 AFA30014 */ sw $v1, 0x14($sp) -/* A18B6C 8024294C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B70 80242950 8C63001C */ lw $v1, 0x1c($v1) -/* A18B74 80242954 AFA30018 */ sw $v1, 0x18($sp) -/* A18B78 80242958 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B7C 8024295C 8C630024 */ lw $v1, 0x24($v1) -/* A18B80 80242960 AFA3001C */ sw $v1, 0x1c($sp) -/* A18B84 80242964 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B88 80242968 8C630028 */ lw $v1, 0x28($v1) -/* A18B8C 8024296C 27B30010 */ addiu $s3, $sp, 0x10 -/* A18B90 80242970 AFA30020 */ sw $v1, 0x20($sp) -/* A18B94 80242974 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B98 80242978 3C0142F0 */ lui $at, 0x42f0 -/* A18B9C 8024297C 44810000 */ mtc1 $at, $f0 -/* A18BA0 80242980 8C63002C */ lw $v1, 0x2c($v1) -/* A18BA4 80242984 0040802D */ daddu $s0, $v0, $zero -/* A18BA8 80242988 E7A00028 */ swc1 $f0, 0x28($sp) -/* A18BAC 8024298C A7A0002C */ sh $zero, 0x2c($sp) -/* A18BB0 80242990 12200007 */ beqz $s1, .L802429B0 -/* A18BB4 80242994 AFA30024 */ sw $v1, 0x24($sp) -/* A18BB8 80242998 02A0202D */ daddu $a0, $s5, $zero -/* A18BBC 8024299C 0240282D */ daddu $a1, $s2, $zero -/* A18BC0 802429A0 0280302D */ daddu $a2, $s4, $zero -/* A18BC4 802429A4 0C090876 */ jal hos_02_UnkFunc5 -/* A18BC8 802429A8 0200382D */ daddu $a3, $s0, $zero -/* A18BCC 802429AC AE800070 */ sw $zero, 0x70($s4) -.L802429B0: -/* A18BD0 802429B0 2402FFFE */ addiu $v0, $zero, -2 -/* A18BD4 802429B4 A2A200AB */ sb $v0, 0xab($s5) -/* A18BD8 802429B8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A18BDC 802429BC 30620004 */ andi $v0, $v1, 4 -/* A18BE0 802429C0 10400007 */ beqz $v0, .L802429E0 -/* A18BE4 802429C4 00000000 */ nop -/* A18BE8 802429C8 824200B4 */ lb $v0, 0xb4($s2) -/* A18BEC 802429CC 1440003A */ bnez $v0, .L80242AB8 -/* A18BF0 802429D0 0000102D */ daddu $v0, $zero, $zero -/* A18BF4 802429D4 2402FFFB */ addiu $v0, $zero, -5 -/* A18BF8 802429D8 00621024 */ and $v0, $v1, $v0 -/* A18BFC 802429DC AE4200B0 */ sw $v0, 0xb0($s2) -.L802429E0: -/* A18C00 802429E0 8E830070 */ lw $v1, 0x70($s4) -/* A18C04 802429E4 2C620015 */ sltiu $v0, $v1, 0x15 -/* A18C08 802429E8 10400032 */ beqz $v0, .L80242AB4_A18CD4 -/* A18C0C 802429EC 00031080 */ sll $v0, $v1, 2 -/* A18C10 802429F0 3C018024 */ lui $at, %hi(jtbl_80244E80_A1B0A0) -/* A18C14 802429F4 00220821 */ addu $at, $at, $v0 -/* A18C18 802429F8 8C224E80 */ lw $v0, %lo(jtbl_80244E80_A1B0A0)($at) -/* A18C1C 802429FC 00400008 */ jr $v0 -/* A18C20 80242A00 00000000 */ nop -.L80242A04_A18C24: -/* A18C24 80242A04 0280202D */ daddu $a0, $s4, $zero -/* A18C28 80242A08 0200282D */ daddu $a1, $s0, $zero -/* A18C2C 80242A0C 0C0903FC */ jal hos_02_UnkNpcAIFunc23 -/* A18C30 80242A10 0260302D */ daddu $a2, $s3, $zero -.L80242A14_A18C34: -/* A18C34 80242A14 0280202D */ daddu $a0, $s4, $zero -/* A18C38 80242A18 0200282D */ daddu $a1, $s0, $zero -/* A18C3C 80242A1C 0C090468 */ jal hos_02_UnkNpcAIFunc35 -/* A18C40 80242A20 0260302D */ daddu $a2, $s3, $zero -/* A18C44 80242A24 08090AAE */ j .L80242AB8 -/* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero -.L80242A2C_A18C4C: -/* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero -/* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero -/* A18C54 80242A34 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 -/* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero -.L80242A3C_A18C5C: -/* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero -/* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero -/* A18C64 80242A44 0C090622 */ jal hos_02_UnkFunc4 -/* A18C68 80242A48 0260302D */ daddu $a2, $s3, $zero -/* A18C6C 80242A4C 08090AAE */ j .L80242AB8 -/* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero -.L80242A54_A18C74: -/* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero -/* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero -/* A18C7C 80242A5C 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 -/* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero -.L80242A64_A18C84: -/* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero -/* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero -/* A18C8C 80242A6C 0C090711 */ jal func_80241C44_A17E64 -/* A18C90 80242A70 0260302D */ daddu $a2, $s3, $zero -/* A18C94 80242A74 08090AAE */ j .L80242AB8 -/* A18C98 80242A78 0000102D */ daddu $v0, $zero, $zero -.L80242A7C_A18C9C: -/* A18C9C 80242A7C 0280202D */ daddu $a0, $s4, $zero -/* A18CA0 80242A80 0200282D */ daddu $a1, $s0, $zero -/* A18CA4 80242A84 0C09093A */ jal hos_02_UnkNpcAIFunc13 -/* A18CA8 80242A88 0260302D */ daddu $a2, $s3, $zero -.L80242A8C_A18CAC: -/* A18CAC 80242A8C 0280202D */ daddu $a0, $s4, $zero -/* A18CB0 80242A90 0200282D */ daddu $a1, $s0, $zero -/* A18CB4 80242A94 0C090986 */ jal hos_02_UnkNpcAIFunc34 -/* A18CB8 80242A98 0260302D */ daddu $a2, $s3, $zero -/* A18CBC 80242A9C 08090AAE */ j .L80242AB8 -/* A18CC0 80242AA0 0000102D */ daddu $v0, $zero, $zero -.L80242AA4_A18CC4: -/* A18CC4 80242AA4 0280202D */ daddu $a0, $s4, $zero -/* A18CC8 80242AA8 0200282D */ daddu $a1, $s0, $zero -/* A18CCC 80242AAC 0C090A26 */ jal hos_02_UnkFunc45 -/* A18CD0 80242AB0 0260302D */ daddu $a2, $s3, $zero -.L80242AB4_A18CD4: -/* A18CD4 80242AB4 0000102D */ daddu $v0, $zero, $zero -.L80242AB8: -/* A18CD8 80242AB8 8FBF0048 */ lw $ra, 0x48($sp) -/* A18CDC 80242ABC 8FB50044 */ lw $s5, 0x44($sp) -/* A18CE0 80242AC0 8FB40040 */ lw $s4, 0x40($sp) -/* A18CE4 80242AC4 8FB3003C */ lw $s3, 0x3c($sp) -/* A18CE8 80242AC8 8FB20038 */ lw $s2, 0x38($sp) -/* A18CEC 80242ACC 8FB10034 */ lw $s1, 0x34($sp) -/* A18CF0 80242AD0 8FB00030 */ lw $s0, 0x30($sp) -/* A18CF4 80242AD4 03E00008 */ jr $ra -/* A18CF8 80242AD8 27BD0050 */ addiu $sp, $sp, 0x50 -/* A18CFC 80242ADC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s deleted file mode 100644 index abcbd951b3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241904_A1CA04 -/* A1CA04 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1CA08 80241908 AFB00010 */ sw $s0, 0x10($sp) -/* A1CA0C 8024190C 0080802D */ daddu $s0, $a0, $zero -/* A1CA10 80241910 AFBF0014 */ sw $ra, 0x14($sp) -/* A1CA14 80241914 8E020148 */ lw $v0, 0x148($s0) -/* A1CA18 80241918 0C00EABB */ jal get_npc_unsafe -/* A1CA1C 8024191C 84440008 */ lh $a0, 8($v0) -/* A1CA20 80241920 9443008E */ lhu $v1, 0x8e($v0) -/* A1CA24 80241924 C440003C */ lwc1 $f0, 0x3c($v0) -/* A1CA28 80241928 24640001 */ addiu $a0, $v1, 1 -/* A1CA2C 8024192C 00031C00 */ sll $v1, $v1, 0x10 -/* A1CA30 80241930 00031B83 */ sra $v1, $v1, 0xe -/* A1CA34 80241934 A444008E */ sh $a0, 0x8e($v0) -/* A1CA38 80241938 3C018024 */ lui $at, %hi(D_802457F4_A208F4) -/* A1CA3C 8024193C 00230821 */ addu $at, $at, $v1 -/* A1CA40 80241940 C42257F4 */ lwc1 $f2, %lo(D_802457F4_A208F4)($at) -/* A1CA44 80241944 8443008E */ lh $v1, 0x8e($v0) -/* A1CA48 80241948 46020000 */ add.s $f0, $f0, $f2 -/* A1CA4C 8024194C 28630005 */ slti $v1, $v1, 5 -/* A1CA50 80241950 14600003 */ bnez $v1, .L80241960 -/* A1CA54 80241954 E440003C */ swc1 $f0, 0x3c($v0) -/* A1CA58 80241958 2402000C */ addiu $v0, $zero, 0xc -/* A1CA5C 8024195C AE020070 */ sw $v0, 0x70($s0) -.L80241960: -/* A1CA60 80241960 8FBF0014 */ lw $ra, 0x14($sp) -/* A1CA64 80241964 8FB00010 */ lw $s0, 0x10($sp) -/* A1CA68 80241968 03E00008 */ jr $ra -/* A1CA6C 8024196C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s deleted file mode 100644 index f851c64086..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8024BD88_A26E88 -.word .L802420C8_A1D1C8, .L802420D8_A1D1D8, .L802420F0_A1D1F0, .L80242100_A1D200, .L80242180_A1D280, .L80242180_A1D280, .L80242180_A1D280, .L80242180_A1D280, .L80242180_A1D280, .L80242180_A1D280, .L80242118_A1D218, .L80242128_A1D228, .L80242140_A1D240, .L80242158_A1D258, .L80242170_A1D270, 0, 0, 0 - -.section .text - -glabel func_80241FBC_A1D0BC -/* A1D0BC 80241FBC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A1D0C0 80241FC0 AFB40040 */ sw $s4, 0x40($sp) -/* A1D0C4 80241FC4 0080A02D */ daddu $s4, $a0, $zero -/* A1D0C8 80241FC8 AFBF0048 */ sw $ra, 0x48($sp) -/* A1D0CC 80241FCC AFB50044 */ sw $s5, 0x44($sp) -/* A1D0D0 80241FD0 AFB3003C */ sw $s3, 0x3c($sp) -/* A1D0D4 80241FD4 AFB20038 */ sw $s2, 0x38($sp) -/* A1D0D8 80241FD8 AFB10034 */ sw $s1, 0x34($sp) -/* A1D0DC 80241FDC AFB00030 */ sw $s0, 0x30($sp) -/* A1D0E0 80241FE0 8E920148 */ lw $s2, 0x148($s4) -/* A1D0E4 80241FE4 86440008 */ lh $a0, 8($s2) -/* A1D0E8 80241FE8 8E90000C */ lw $s0, 0xc($s4) -/* A1D0EC 80241FEC 0C00EABB */ jal get_npc_unsafe -/* A1D0F0 80241FF0 00A0882D */ daddu $s1, $a1, $zero -/* A1D0F4 80241FF4 0280202D */ daddu $a0, $s4, $zero -/* A1D0F8 80241FF8 8E050000 */ lw $a1, ($s0) -/* A1D0FC 80241FFC 0C0B1EAF */ jal evt_get_variable -/* A1D100 80242000 0040A82D */ daddu $s5, $v0, $zero -/* A1D104 80242004 AFA00010 */ sw $zero, 0x10($sp) -/* A1D108 80242008 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D10C 8024200C 8C630030 */ lw $v1, 0x30($v1) -/* A1D110 80242010 AFA30014 */ sw $v1, 0x14($sp) -/* A1D114 80242014 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D118 80242018 8C63001C */ lw $v1, 0x1c($v1) -/* A1D11C 8024201C AFA30018 */ sw $v1, 0x18($sp) -/* A1D120 80242020 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D124 80242024 8C630024 */ lw $v1, 0x24($v1) -/* A1D128 80242028 AFA3001C */ sw $v1, 0x1c($sp) -/* A1D12C 8024202C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D130 80242030 8C630028 */ lw $v1, 0x28($v1) -/* A1D134 80242034 27B30010 */ addiu $s3, $sp, 0x10 -/* A1D138 80242038 AFA30020 */ sw $v1, 0x20($sp) -/* A1D13C 8024203C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D140 80242040 3C0142F0 */ lui $at, 0x42f0 -/* A1D144 80242044 44810000 */ mtc1 $at, $f0 -/* A1D148 80242048 8C63002C */ lw $v1, 0x2c($v1) -/* A1D14C 8024204C 0040802D */ daddu $s0, $v0, $zero -/* A1D150 80242050 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1D154 80242054 A7A0002C */ sh $zero, 0x2c($sp) -/* A1D158 80242058 12200006 */ beqz $s1, .L80242074 -/* A1D15C 8024205C AFA30024 */ sw $v1, 0x24($sp) -/* A1D160 80242060 02A0202D */ daddu $a0, $s5, $zero -/* A1D164 80242064 0240282D */ daddu $a1, $s2, $zero -/* A1D168 80242068 0280302D */ daddu $a2, $s4, $zero -/* A1D16C 8024206C 0C0907A6 */ jal hos_03_UnkFunc5 -/* A1D170 80242070 0200382D */ daddu $a3, $s0, $zero -.L80242074: -/* A1D174 80242074 2402FFFE */ addiu $v0, $zero, -2 -/* A1D178 80242078 A2A200AB */ sb $v0, 0xab($s5) -/* A1D17C 8024207C 8E4300B0 */ lw $v1, 0xb0($s2) -/* A1D180 80242080 30620004 */ andi $v0, $v1, 4 -/* A1D184 80242084 10400007 */ beqz $v0, .L802420A4 -/* A1D188 80242088 00000000 */ nop -/* A1D18C 8024208C 824200B4 */ lb $v0, 0xb4($s2) -/* A1D190 80242090 1440003C */ bnez $v0, .L80242184 -/* A1D194 80242094 0000102D */ daddu $v0, $zero, $zero -/* A1D198 80242098 2402FFFB */ addiu $v0, $zero, -5 -/* A1D19C 8024209C 00621024 */ and $v0, $v1, $v0 -/* A1D1A0 802420A0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802420A4: -/* A1D1A4 802420A4 8E830070 */ lw $v1, 0x70($s4) -/* A1D1A8 802420A8 2C62000F */ sltiu $v0, $v1, 0xf -/* A1D1AC 802420AC 10400034 */ beqz $v0, .L80242180_A1D280 -/* A1D1B0 802420B0 00031080 */ sll $v0, $v1, 2 -/* A1D1B4 802420B4 3C018025 */ lui $at, %hi(jtbl_8024BD88_A26E88) -/* A1D1B8 802420B8 00220821 */ addu $at, $at, $v0 -/* A1D1BC 802420BC 8C22BD88 */ lw $v0, %lo(jtbl_8024BD88_A26E88)($at) -/* A1D1C0 802420C0 00400008 */ jr $v0 -/* A1D1C4 802420C4 00000000 */ nop -.L802420C8_A1D1C8: -/* A1D1C8 802420C8 0280202D */ daddu $a0, $s4, $zero -/* A1D1CC 802420CC 0200282D */ daddu $a1, $s0, $zero -/* A1D1D0 802420D0 0C09032C */ jal hos_03_UnkNpcAIFunc23 -/* A1D1D4 802420D4 0260302D */ daddu $a2, $s3, $zero -.L802420D8_A1D1D8: -/* A1D1D8 802420D8 0280202D */ daddu $a0, $s4, $zero -/* A1D1DC 802420DC 0200282D */ daddu $a1, $s0, $zero -/* A1D1E0 802420E0 0C090398 */ jal hos_03_UnkNpcAIFunc35 -/* A1D1E4 802420E4 0260302D */ daddu $a2, $s3, $zero -/* A1D1E8 802420E8 08090861 */ j .L80242184 -/* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero -.L802420F0_A1D1F0: -/* A1D1F0 802420F0 0280202D */ daddu $a0, $s4, $zero -/* A1D1F4 802420F4 0200282D */ daddu $a1, $s0, $zero -/* A1D1F8 802420F8 0C090522 */ jal hos_03_UnkNpcAIFunc1 -/* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero -.L80242100_A1D200: -/* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero -/* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero -/* A1D208 80242108 0C090552 */ jal hos_03_UnkFunc4 -/* A1D20C 8024210C 0260302D */ daddu $a2, $s3, $zero -/* A1D210 80242110 08090861 */ j .L80242184 -/* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero -.L80242118_A1D218: -/* A1D218 80242118 0280202D */ daddu $a0, $s4, $zero -/* A1D21C 8024211C 0200282D */ daddu $a1, $s0, $zero -/* A1D220 80242120 0C090623 */ jal hos_03_UnkNpcAIFunc2 -/* A1D224 80242124 0260302D */ daddu $a2, $s3, $zero -.L80242128_A1D228: -/* A1D228 80242128 0280202D */ daddu $a0, $s4, $zero -/* A1D22C 8024212C 0200282D */ daddu $a1, $s0, $zero -/* A1D230 80242130 0C090641 */ jal func_80241904_A1CA04 -/* A1D234 80242134 0260302D */ daddu $a2, $s3, $zero -/* A1D238 80242138 08090861 */ j .L80242184 -/* A1D23C 8024213C 0000102D */ daddu $v0, $zero, $zero -.L80242140_A1D240: -/* A1D240 80242140 0280202D */ daddu $a0, $s4, $zero -/* A1D244 80242144 0200282D */ daddu $a1, $s0, $zero -/* A1D248 80242148 0C09065C */ jal hos_03_UnkNpcAIFunc14 -/* A1D24C 8024214C 0260302D */ daddu $a2, $s3, $zero -/* A1D250 80242150 08090861 */ j .L80242184 -/* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero -.L80242158_A1D258: -/* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero -/* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero -/* A1D260 80242160 0C0906A9 */ jal hos_03_UnkNpcAIFunc3 -/* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero -/* A1D268 80242168 08090861 */ j .L80242184 -/* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero -.L80242170_A1D270: -/* A1D270 80242170 0280202D */ daddu $a0, $s4, $zero -/* A1D274 80242174 0200282D */ daddu $a1, $s0, $zero -/* A1D278 80242178 0C0906C2 */ jal hos_03_UnkFunc6 -/* A1D27C 8024217C 0260302D */ daddu $a2, $s3, $zero -.L80242180_A1D280: -/* A1D280 80242180 0000102D */ daddu $v0, $zero, $zero -.L80242184: -/* A1D284 80242184 8FBF0048 */ lw $ra, 0x48($sp) -/* A1D288 80242188 8FB50044 */ lw $s5, 0x44($sp) -/* A1D28C 8024218C 8FB40040 */ lw $s4, 0x40($sp) -/* A1D290 80242190 8FB3003C */ lw $s3, 0x3c($sp) -/* A1D294 80242194 8FB20038 */ lw $s2, 0x38($sp) -/* A1D298 80242198 8FB10034 */ lw $s1, 0x34($sp) -/* A1D29C 8024219C 8FB00030 */ lw $s0, 0x30($sp) -/* A1D2A0 802421A0 03E00008 */ jr $ra -/* A1D2A4 802421A4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s deleted file mode 100644 index 3aff6aca3e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_989160 -/* 989160 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 989164 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* 989168 80240608 0080B02D */ daddu $s6, $a0, $zero -/* 98916C 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* 989170 80240610 00A0802D */ daddu $s0, $a1, $zero -/* 989174 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* 989178 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* 98917C 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* 989180 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* 989184 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* 989188 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* 98918C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 989190 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 989194 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 989198 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* 98919C 8024063C 0C00EAD2 */ jal get_npc_safe -/* 9891A0 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* 9891A4 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* 9891A8 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9891AC 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9891B0 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* 9891B4 80240654 00041880 */ sll $v1, $a0, 2 -/* 9891B8 80240658 00641821 */ addu $v1, $v1, $a0 -/* 9891BC 8024065C 00031880 */ sll $v1, $v1, 2 -/* 9891C0 80240660 00641823 */ subu $v1, $v1, $a0 -/* 9891C4 80240664 000320C0 */ sll $a0, $v1, 3 -/* 9891C8 80240668 00641821 */ addu $v1, $v1, $a0 -/* 9891CC 8024066C 000318C0 */ sll $v1, $v1, 3 -/* 9891D0 80240670 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 9891D4 80240674 00230821 */ addu $at, $at, $v1 -/* 9891D8 80240678 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 9891DC 8024067C 0C00A88D */ jal sin_cos_deg -/* 9891E0 80240680 0040A82D */ daddu $s5, $v0, $zero -/* 9891E4 80240684 1200005D */ beqz $s0, .L802407FC -/* 9891E8 80240688 00000000 */ nop -/* 9891EC 8024068C 0C00AB0A */ jal general_heap_malloc -/* 9891F0 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* 9891F4 80240694 0040902D */ daddu $s2, $v0, $zero -/* 9891F8 80240698 02C0202D */ daddu $a0, $s6, $zero -/* 9891FC 8024069C 0000882D */ daddu $s1, $zero, $zero -/* 989200 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* 989204 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* 989208 802406A8 8E650000 */ lw $a1, ($s3) -/* 98920C 802406AC 3C014148 */ lui $at, 0x4148 -/* 989210 802406B0 4481C000 */ mtc1 $at, $f24 -/* 989214 802406B4 3C013F80 */ lui $at, 0x3f80 -/* 989218 802406B8 4481B000 */ mtc1 $at, $f22 -/* 98921C 802406BC 4480A000 */ mtc1 $zero, $f20 -/* 989220 802406C0 0C0B1EAF */ jal evt_get_variable -/* 989224 802406C4 0240802D */ daddu $s0, $s2, $zero -/* 989228 802406C8 0C04417A */ jal get_entity_by_index -/* 98922C 802406CC 0040202D */ daddu $a0, $v0, $zero -/* 989230 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* 989234 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* 989238 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 98923C 802406DC 0000202D */ daddu $a0, $zero, $zero -/* 989240 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 989244 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* 989248 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* 98924C 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* 989250 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* 989254 802406F4 44060000 */ mfc1 $a2, $f0 -/* 989258 802406F8 0C01C5BC */ jal fx_motion_blur_flame -/* 98925C 802406FC 26310001 */ addiu $s1, $s1, 1 -/* 989260 80240700 AE020008 */ sw $v0, 8($s0) -/* 989264 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* 989268 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* 98926C 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* 989270 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* 989274 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* 989278 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* 98927C 8024071C 2A220003 */ slti $v0, $s1, 3 -/* 989280 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* 989284 80240724 26100004 */ addiu $s0, $s0, 4 -/* 989288 80240728 0000882D */ daddu $s1, $zero, $zero -/* 98928C 8024072C 0240802D */ daddu $s0, $s2, $zero -/* 989290 80240730 3C148024 */ lui $s4, %hi(D_80241158_989CB8) -/* 989294 80240734 26941158 */ addiu $s4, $s4, %lo(D_80241158_989CB8) -/* 989298 80240738 3C014248 */ lui $at, 0x4248 -/* 98929C 8024073C 4481A000 */ mtc1 $at, $f20 -/* 9892A0 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* 9892A4 80240744 AE400000 */ sw $zero, ($s2) -/* 9892A8 80240748 AE400004 */ sw $zero, 4($s2) -/* 9892AC 8024074C AE400060 */ sw $zero, 0x60($s2) -/* 9892B0 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* 9892B4 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* 9892B8 80240758 4406A000 */ mfc1 $a2, $f20 -/* 9892BC 8024075C 8E870000 */ lw $a3, ($s4) -/* 9892C0 80240760 02532821 */ addu $a1, $s2, $s3 -/* 9892C4 80240764 0C00A7E7 */ jal add_vec2D_polar -/* 9892C8 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* 9892CC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 9892D0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 9892D4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* 9892D8 80240778 00000000 */ nop -/* 9892DC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 9892E0 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* 9892E4 80240784 00000000 */ nop -/* 9892E8 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* 9892EC 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* 9892F0 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* 9892F4 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9892F8 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* 9892FC 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* 989300 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 989304 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* 989308 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* 98930C 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* 989310 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 989314 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 989318 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* 98931C 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 989320 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* 989324 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* 989328 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* 98932C 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* 989330 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 989334 802407D4 26940004 */ addiu $s4, $s4, 4 -/* 989338 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* 98933C 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 989340 802407E0 26730004 */ addiu $s3, $s3, 4 -/* 989344 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* 989348 802407E8 26310001 */ addiu $s1, $s1, 1 -/* 98934C 802407EC 2A220003 */ slti $v0, $s1, 3 -/* 989350 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* 989354 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* 989358 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* 98935C 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* 989360 80240800 8E430000 */ lw $v1, ($s2) -/* 989364 80240804 24020001 */ addiu $v0, $zero, 1 -/* 989368 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* 98936C 8024080C 28620002 */ slti $v0, $v1, 2 -/* 989370 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* 989374 80240814 24020002 */ addiu $v0, $zero, 2 -/* 989378 80240818 10600007 */ beqz $v1, .L80240838 -/* 98937C 8024081C 24040005 */ addiu $a0, $zero, 5 -/* 989380 80240820 08090274 */ j .L802409D0 -/* 989384 80240824 00000000 */ nop -.L80240828: -/* 989388 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* 98938C 8024082C 00000000 */ nop -/* 989390 80240830 08090274 */ j .L802409D0 -/* 989394 80240834 00000000 */ nop -.L80240838: -/* 989398 80240838 0000882D */ daddu $s1, $zero, $zero -/* 98939C 8024083C 3C148024 */ lui $s4, %hi(D_80241158_989CB8) -/* 9893A0 80240840 26941158 */ addiu $s4, $s4, %lo(D_80241158_989CB8) -/* 9893A4 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* 9893A8 80240848 3C064248 */ lui $a2, 0x4248 -/* 9893AC 8024084C 44800000 */ mtc1 $zero, $f0 -/* 9893B0 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* 9893B4 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* 9893B8 80240858 44050000 */ mfc1 $a1, $f0 -/* 9893BC 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* 9893C0 80240860 4485B000 */ mtc1 $a1, $f22 -/* 9893C4 80240864 0C00A8ED */ jal update_lerp -/* 9893C8 80240868 0240802D */ daddu $s0, $s2, $zero -/* 9893CC 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* 9893D0 80240870 4406A000 */ mfc1 $a2, $f20 -/* 9893D4 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* 9893D8 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* 9893DC 8024087C 8E870000 */ lw $a3, ($s4) -/* 9893E0 80240880 02532821 */ addu $a1, $s2, $s3 -/* 9893E4 80240884 0C00A7E7 */ jal add_vec2D_polar -/* 9893E8 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* 9893EC 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 9893F0 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 9893F4 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* 9893F8 80240898 00000000 */ nop -/* 9893FC 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 989400 802408A0 26940004 */ addiu $s4, $s4, 4 -/* 989404 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* 989408 802408A8 00000000 */ nop -/* 98940C 802408AC 26730004 */ addiu $s3, $s3, 4 -/* 989410 802408B0 26310001 */ addiu $s1, $s1, 1 -/* 989414 802408B4 2A220003 */ slti $v0, $s1, 3 -/* 989418 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* 98941C 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* 989420 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* 989424 802408C4 26100004 */ addiu $s0, $s0, 4 -/* 989428 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* 98942C 802408CC 24420001 */ addiu $v0, $v0, 1 -/* 989430 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* 989434 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* 989438 802408D8 1440003D */ bnez $v0, .L802409D0 -/* 98943C 802408DC 24020001 */ addiu $v0, $zero, 1 -/* 989440 802408E0 AE420000 */ sw $v0, ($s2) -/* 989444 802408E4 08090274 */ j .L802409D0 -/* 989448 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* 98944C 802408EC 0000882D */ daddu $s1, $zero, $zero -/* 989450 802408F0 3C148024 */ lui $s4, %hi(D_80241158_989CB8) -/* 989454 802408F4 26941158 */ addiu $s4, $s4, %lo(D_80241158_989CB8) -/* 989458 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* 98945C 802408FC 0240802D */ daddu $s0, $s2, $zero -/* 989460 80240900 3C014248 */ lui $at, 0x4248 -/* 989464 80240904 4481A000 */ mtc1 $at, $f20 -/* 989468 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* 98946C 8024090C 4406A000 */ mfc1 $a2, $f20 -/* 989470 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* 989474 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* 989478 80240918 8E870000 */ lw $a3, ($s4) -/* 98947C 8024091C 02532821 */ addu $a1, $s2, $s3 -/* 989480 80240920 0C00A7E7 */ jal add_vec2D_polar -/* 989484 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* 989488 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 98948C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 989490 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* 989494 80240934 00000000 */ nop -/* 989498 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 98949C 8024093C 26940004 */ addiu $s4, $s4, 4 -/* 9894A0 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* 9894A4 80240944 00000000 */ nop -/* 9894A8 80240948 26730004 */ addiu $s3, $s3, 4 -/* 9894AC 8024094C 26310001 */ addiu $s1, $s1, 1 -/* 9894B0 80240950 2A220003 */ slti $v0, $s1, 3 -/* 9894B4 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* 9894B8 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* 9894BC 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* 9894C0 80240960 26100004 */ addiu $s0, $s0, 4 -/* 9894C4 80240964 8E420060 */ lw $v0, 0x60($s2) -/* 9894C8 80240968 24420001 */ addiu $v0, $v0, 1 -/* 9894CC 8024096C AE420060 */ sw $v0, 0x60($s2) -/* 9894D0 80240970 28420010 */ slti $v0, $v0, 0x10 -/* 9894D4 80240974 14400016 */ bnez $v0, .L802409D0 -/* 9894D8 80240978 2402000F */ addiu $v0, $zero, 0xf -/* 9894DC 8024097C AE420060 */ sw $v0, 0x60($s2) -/* 9894E0 80240980 24020002 */ addiu $v0, $zero, 2 -/* 9894E4 80240984 08090274 */ j .L802409D0 -/* 9894E8 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* 9894EC 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* 9894F0 80240990 24420001 */ addiu $v0, $v0, 1 -/* 9894F4 80240994 AE420060 */ sw $v0, 0x60($s2) -/* 9894F8 80240998 2842001F */ slti $v0, $v0, 0x1f -/* 9894FC 8024099C 1440000C */ bnez $v0, .L802409D0 -/* 989500 802409A0 0000882D */ daddu $s1, $zero, $zero -/* 989504 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* 989508 802409A8 8CA20008 */ lw $v0, 8($a1) -/* 98950C 802409AC 8C430000 */ lw $v1, ($v0) -/* 989510 802409B0 26310001 */ addiu $s1, $s1, 1 -/* 989514 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* 989518 802409B8 AC430000 */ sw $v1, ($v0) -/* 98951C 802409BC 2A220003 */ slti $v0, $s1, 3 -/* 989520 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* 989524 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* 989528 802409C8 080902C1 */ j .L80240B04 -/* 98952C 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* 989530 802409D0 8E430004 */ lw $v1, 4($s2) -/* 989534 802409D4 10600005 */ beqz $v1, .L802409EC -/* 989538 802409D8 24020001 */ addiu $v0, $zero, 1 -/* 98953C 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* 989540 802409E0 0000882D */ daddu $s1, $zero, $zero -/* 989544 802409E4 080902B0 */ j .L80240AC0 -/* 989548 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* 98954C 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* 989550 802409F0 24420001 */ addiu $v0, $v0, 1 -/* 989554 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* 989558 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* 98955C 802409FC 1440002F */ bnez $v0, .L80240ABC -/* 989560 80240A00 0000882D */ daddu $s1, $zero, $zero -/* 989564 80240A04 080902AC */ j .L80240AB0 -/* 989568 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* 98956C 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* 989570 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* 989574 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* 989578 80240A18 4405A000 */ mfc1 $a1, $f20 -/* 98957C 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* 989580 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* 989584 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* 989588 80240A28 0C00A8ED */ jal update_lerp -/* 98958C 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* 989590 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* 989594 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* 989598 80240A38 4405A000 */ mfc1 $a1, $f20 -/* 98959C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* 9895A0 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* 9895A4 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* 9895A8 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* 9895AC 80240A4C 0C00A8ED */ jal update_lerp -/* 9895B0 80240A50 24040001 */ addiu $a0, $zero, 1 -/* 9895B4 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* 9895B8 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* 9895BC 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* 9895C0 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* 9895C4 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* 9895C8 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* 9895CC 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* 9895D0 80240A70 0C00A8ED */ jal update_lerp -/* 9895D4 80240A74 24040001 */ addiu $a0, $zero, 1 -/* 9895D8 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* 9895DC 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* 9895E0 80240A80 26310001 */ addiu $s1, $s1, 1 -/* 9895E4 80240A84 2A220003 */ slti $v0, $s1, 3 -/* 9895E8 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* 9895EC 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* 9895F0 80240A90 26100004 */ addiu $s0, $s0, 4 -/* 9895F4 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* 9895F8 80240A98 24420001 */ addiu $v0, $v0, 1 -/* 9895FC 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* 989600 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* 989604 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* 989608 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* 98960C 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* 989610 80240AB0 AE420004 */ sw $v0, 4($s2) -/* 989614 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* 989618 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* 98961C 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* 989620 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* 989624 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 989628 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* 98962C 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* 989630 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* 989634 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 989638 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* 98963C 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* 989640 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* 989644 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* 989648 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 98964C 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* 989650 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* 989654 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* 989658 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* 98965C 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* 989660 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* 989664 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* 989668 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* 98966C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* 989670 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* 989674 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* 989678 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* 98967C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* 989680 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* 989684 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 989688 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 98968C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 989690 80240B30 03E00008 */ jr $ra -/* 989694 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s deleted file mode 100644 index f3846b2822..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246390_915A40 -.double 180.0 - -dlabel D_80246398_915A48 -.double 75.0 - -.section .text - -glabel func_80240520_90FBD0 -/* 90FBD0 80240520 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 90FBD4 80240524 AFB10014 */ sw $s1, 0x14($sp) -/* 90FBD8 80240528 0080882D */ daddu $s1, $a0, $zero -/* 90FBDC 8024052C 3C05800B */ lui $a1, %hi(gCameras) -/* 90FBE0 80240530 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 90FBE4 80240534 AFBF0020 */ sw $ra, 0x20($sp) -/* 90FBE8 80240538 AFB3001C */ sw $s3, 0x1c($sp) -/* 90FBEC 8024053C AFB20018 */ sw $s2, 0x18($sp) -/* 90FBF0 80240540 AFB00010 */ sw $s0, 0x10($sp) -/* 90FBF4 80240544 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 90FBF8 80240548 8E330148 */ lw $s3, 0x148($s1) -/* 90FBFC 8024054C 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* 90FC00 80240550 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* 90FC04 80240554 8E30000C */ lw $s0, 0xc($s1) -/* 90FC08 80240558 00031080 */ sll $v0, $v1, 2 -/* 90FC0C 8024055C 00431021 */ addu $v0, $v0, $v1 -/* 90FC10 80240560 00021080 */ sll $v0, $v0, 2 -/* 90FC14 80240564 00431023 */ subu $v0, $v0, $v1 -/* 90FC18 80240568 000218C0 */ sll $v1, $v0, 3 -/* 90FC1C 8024056C 00431021 */ addu $v0, $v0, $v1 -/* 90FC20 80240570 000210C0 */ sll $v0, $v0, 3 -/* 90FC24 80240574 86640008 */ lh $a0, 8($s3) -/* 90FC28 80240578 0C00EABB */ jal get_npc_unsafe -/* 90FC2C 8024057C 00459021 */ addu $s2, $v0, $a1 -/* 90FC30 80240580 0220202D */ daddu $a0, $s1, $zero -/* 90FC34 80240584 8E050000 */ lw $a1, ($s0) -/* 90FC38 80240588 0C0B1EAF */ jal evt_get_variable -/* 90FC3C 8024058C 0040802D */ daddu $s0, $v0, $zero -/* 90FC40 80240590 0260202D */ daddu $a0, $s3, $zero -/* 90FC44 80240594 8C460024 */ lw $a2, 0x24($v0) -/* 90FC48 80240598 8C470028 */ lw $a3, 0x28($v0) -/* 90FC4C 8024059C 0C0124FB */ jal func_800493EC -/* 90FC50 802405A0 0000282D */ daddu $a1, $zero, $zero -/* 90FC54 802405A4 10400052 */ beqz $v0, .L802406F0 -/* 90FC58 802405A8 2402FFFF */ addiu $v0, $zero, -1 -/* 90FC5C 802405AC C64C006C */ lwc1 $f12, 0x6c($s2) -/* 90FC60 802405B0 C60E000C */ lwc1 $f14, 0xc($s0) -/* 90FC64 802405B4 3C014387 */ lui $at, 0x4387 -/* 90FC68 802405B8 4481A000 */ mtc1 $at, $f20 -/* 90FC6C 802405BC 0C00A70A */ jal get_clamped_angle_diff -/* 90FC70 802405C0 00000000 */ nop -/* 90FC74 802405C4 0C00A6C9 */ jal clamp_angle -/* 90FC78 802405C8 46000306 */ mov.s $f12, $f0 -/* 90FC7C 802405CC 3C018024 */ lui $at, %hi(D_80246390_915A40) -/* 90FC80 802405D0 D4226390 */ ldc1 $f2, %lo(D_80246390_915A40)($at) -/* 90FC84 802405D4 46000021 */ cvt.d.s $f0, $f0 -/* 90FC88 802405D8 4622003C */ c.lt.d $f0, $f2 -/* 90FC8C 802405DC 00000000 */ nop -/* 90FC90 802405E0 45000003 */ bc1f .L802405F0 -/* 90FC94 802405E4 00000000 */ nop -/* 90FC98 802405E8 3C0142B4 */ lui $at, 0x42b4 -/* 90FC9C 802405EC 4481A000 */ mtc1 $at, $f20 -.L802405F0: -/* 90FCA0 802405F0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* 90FCA4 802405F4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* 90FCA8 802405F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 90FCAC 802405FC 8E220000 */ lw $v0, ($s1) -/* 90FCB0 80240600 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 90FCB4 80240604 8C460028 */ lw $a2, 0x28($v0) -/* 90FCB8 80240608 0C00A720 */ jal atan2 -/* 90FCBC 8024060C 8C470030 */ lw $a3, 0x30($v0) -/* 90FCC0 80240610 4600A306 */ mov.s $f12, $f20 -/* 90FCC4 80240614 0C00A70A */ jal get_clamped_angle_diff -/* 90FCC8 80240618 46000386 */ mov.s $f14, $f0 -/* 90FCCC 8024061C 46000005 */ abs.s $f0, $f0 -/* 90FCD0 80240620 3C018024 */ lui $at, %hi(D_80246398_915A48) -/* 90FCD4 80240624 D4226398 */ ldc1 $f2, %lo(D_80246398_915A48)($at) -/* 90FCD8 80240628 46000021 */ cvt.d.s $f0, $f0 -/* 90FCDC 8024062C 4620103C */ c.lt.d $f2, $f0 -/* 90FCE0 80240630 00000000 */ nop -/* 90FCE4 80240634 4501002E */ bc1t .L802406F0 -/* 90FCE8 80240638 2402FFFF */ addiu $v0, $zero, -1 -/* 90FCEC 8024063C 8E220000 */ lw $v0, ($s1) -/* 90FCF0 80240640 C600003C */ lwc1 $f0, 0x3c($s0) -/* 90FCF4 80240644 C442002C */ lwc1 $f2, 0x2c($v0) -/* 90FCF8 80240648 860200A8 */ lh $v0, 0xa8($s0) -/* 90FCFC 8024064C 46020001 */ sub.s $f0, $f0, $f2 -/* 90FD00 80240650 44821000 */ mtc1 $v0, $f2 -/* 90FD04 80240654 00000000 */ nop -/* 90FD08 80240658 468010A1 */ cvt.d.w $f2, $f2 -/* 90FD0C 8024065C 46221080 */ add.d $f2, $f2, $f2 -/* 90FD10 80240660 46000005 */ abs.s $f0, $f0 -/* 90FD14 80240664 46000021 */ cvt.d.s $f0, $f0 -/* 90FD18 80240668 4620103E */ c.le.d $f2, $f0 -/* 90FD1C 8024066C 00000000 */ nop -/* 90FD20 80240670 4501001F */ bc1t .L802406F0 -/* 90FD24 80240674 2402FFFF */ addiu $v0, $zero, -1 -/* 90FD28 80240678 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* 90FD2C 8024067C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* 90FD30 80240680 24020009 */ addiu $v0, $zero, 9 -/* 90FD34 80240684 10620019 */ beq $v1, $v0, .L802406EC -/* 90FD38 80240688 24020007 */ addiu $v0, $zero, 7 -/* 90FD3C 8024068C 14620005 */ bne $v1, $v0, .L802406A4 -/* 90FD40 80240690 2402FFFF */ addiu $v0, $zero, -1 -/* 90FD44 80240694 080901BC */ j .L802406F0 -/* 90FD48 80240698 00000000 */ nop -.L8024069C: -/* 90FD4C 8024069C 080901BC */ j .L802406F0 -/* 90FD50 802406A0 0240102D */ daddu $v0, $s2, $zero -.L802406A4: -/* 90FD54 802406A4 8E620078 */ lw $v0, 0x78($s3) -/* 90FD58 802406A8 18400010 */ blez $v0, .L802406EC -/* 90FD5C 802406AC 0000882D */ daddu $s1, $zero, $zero -.L802406B0: -/* 90FD60 802406B0 86620008 */ lh $v0, 8($s3) -/* 90FD64 802406B4 00511021 */ addu $v0, $v0, $s1 -/* 90FD68 802406B8 24520001 */ addiu $s2, $v0, 1 -/* 90FD6C 802406BC 0C00FB3A */ jal get_enemy -/* 90FD70 802406C0 0240202D */ daddu $a0, $s2, $zero -/* 90FD74 802406C4 0240202D */ daddu $a0, $s2, $zero -/* 90FD78 802406C8 0C00EABB */ jal get_npc_unsafe -/* 90FD7C 802406CC 0040802D */ daddu $s0, $v0, $zero -/* 90FD80 802406D0 8E02006C */ lw $v0, 0x6c($s0) -/* 90FD84 802406D4 1040FFF1 */ beqz $v0, .L8024069C -/* 90FD88 802406D8 26310001 */ addiu $s1, $s1, 1 -/* 90FD8C 802406DC 8E620078 */ lw $v0, 0x78($s3) -/* 90FD90 802406E0 0222102A */ slt $v0, $s1, $v0 -/* 90FD94 802406E4 1440FFF2 */ bnez $v0, .L802406B0 -/* 90FD98 802406E8 00000000 */ nop -.L802406EC: -/* 90FD9C 802406EC 2402FFFF */ addiu $v0, $zero, -1 -.L802406F0: -/* 90FDA0 802406F0 8FBF0020 */ lw $ra, 0x20($sp) -/* 90FDA4 802406F4 8FB3001C */ lw $s3, 0x1c($sp) -/* 90FDA8 802406F8 8FB20018 */ lw $s2, 0x18($sp) -/* 90FDAC 802406FC 8FB10014 */ lw $s1, 0x14($sp) -/* 90FDB0 80240700 8FB00010 */ lw $s0, 0x10($sp) -/* 90FDB4 80240704 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 90FDB8 80240708 03E00008 */ jr $ra -/* 90FDBC 8024070C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s deleted file mode 100644 index d5e7578f60..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240710_90FDC0 -/* 90FDC0 80240710 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 90FDC4 80240714 AFB20038 */ sw $s2, 0x38($sp) -/* 90FDC8 80240718 0080902D */ daddu $s2, $a0, $zero -/* 90FDCC 8024071C AFB00030 */ sw $s0, 0x30($sp) -/* 90FDD0 80240720 AFBF003C */ sw $ra, 0x3c($sp) -/* 90FDD4 80240724 AFB10034 */ sw $s1, 0x34($sp) -/* 90FDD8 80240728 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 90FDDC 8024072C F7B40040 */ sdc1 $f20, 0x40($sp) -/* 90FDE0 80240730 8E510148 */ lw $s1, 0x148($s2) -/* 90FDE4 80240734 4485A000 */ mtc1 $a1, $f20 -/* 90FDE8 80240738 86240008 */ lh $a0, 8($s1) -/* 90FDEC 8024073C 4486B000 */ mtc1 $a2, $f22 -/* 90FDF0 80240740 0C00EABB */ jal get_npc_unsafe -/* 90FDF4 80240744 00E0802D */ daddu $s0, $a3, $zero -/* 90FDF8 80240748 0200202D */ daddu $a0, $s0, $zero -/* 90FDFC 8024074C 0220282D */ daddu $a1, $s1, $zero -/* 90FE00 80240750 24030001 */ addiu $v1, $zero, 1 -/* 90FE04 80240754 4406A000 */ mfc1 $a2, $f20 -/* 90FE08 80240758 4407B000 */ mfc1 $a3, $f22 -/* 90FE0C 8024075C 0040802D */ daddu $s0, $v0, $zero -/* 90FE10 80240760 0C01242D */ jal func_800490B4 -/* 90FE14 80240764 AFA30010 */ sw $v1, 0x10($sp) -/* 90FE18 80240768 1440001D */ bnez $v0, .L802407E0 -/* 90FE1C 8024076C 24040002 */ addiu $a0, $zero, 2 -/* 90FE20 80240770 0200282D */ daddu $a1, $s0, $zero -/* 90FE24 80240774 0000302D */ daddu $a2, $zero, $zero -/* 90FE28 80240778 860300A8 */ lh $v1, 0xa8($s0) -/* 90FE2C 8024077C 3C013F80 */ lui $at, 0x3f80 -/* 90FE30 80240780 44810000 */ mtc1 $at, $f0 -/* 90FE34 80240784 3C014000 */ lui $at, 0x4000 -/* 90FE38 80240788 44811000 */ mtc1 $at, $f2 -/* 90FE3C 8024078C 3C01C1A0 */ lui $at, 0xc1a0 -/* 90FE40 80240790 44812000 */ mtc1 $at, $f4 -/* 90FE44 80240794 2402000F */ addiu $v0, $zero, 0xf -/* 90FE48 80240798 AFA2001C */ sw $v0, 0x1c($sp) -/* 90FE4C 8024079C 44833000 */ mtc1 $v1, $f6 -/* 90FE50 802407A0 00000000 */ nop -/* 90FE54 802407A4 468031A0 */ cvt.s.w $f6, $f6 -/* 90FE58 802407A8 44073000 */ mfc1 $a3, $f6 -/* 90FE5C 802407AC 27A20028 */ addiu $v0, $sp, 0x28 -/* 90FE60 802407B0 AFA20020 */ sw $v0, 0x20($sp) -/* 90FE64 802407B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 90FE68 802407B8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 90FE6C 802407BC 0C01BFA4 */ jal fx_emote -/* 90FE70 802407C0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 90FE74 802407C4 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FE78 802407C8 8C430000 */ lw $v1, ($v0) -/* 90FE7C 802407CC 24020014 */ addiu $v0, $zero, 0x14 -/* 90FE80 802407D0 A602008E */ sh $v0, 0x8e($s0) -/* 90FE84 802407D4 24020021 */ addiu $v0, $zero, 0x21 -/* 90FE88 802407D8 0809020C */ j .L80240830 -/* 90FE8C 802407DC AE030028 */ sw $v1, 0x28($s0) -.L802407E0: -/* 90FE90 802407E0 0C090148 */ jal func_80240520_90FBD0 -/* 90FE94 802407E4 0240202D */ daddu $a0, $s2, $zero -/* 90FE98 802407E8 0040202D */ daddu $a0, $v0, $zero -/* 90FE9C 802407EC 2402FFFF */ addiu $v0, $zero, -1 -/* 90FEA0 802407F0 10820010 */ beq $a0, $v0, .L80240834 -/* 90FEA4 802407F4 00000000 */ nop -/* 90FEA8 802407F8 0C00FB3A */ jal get_enemy -/* 90FEAC 802407FC 00000000 */ nop -/* 90FEB0 80240800 8C42006C */ lw $v0, 0x6c($v0) -/* 90FEB4 80240804 1440000B */ bnez $v0, .L80240834 -/* 90FEB8 80240808 00000000 */ nop -/* 90FEBC 8024080C 8602008C */ lh $v0, 0x8c($s0) -/* 90FEC0 80240810 14400008 */ bnez $v0, .L80240834 -/* 90FEC4 80240814 00000000 */ nop -/* 90FEC8 80240818 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FECC 8024081C 8C420020 */ lw $v0, 0x20($v0) -/* 90FED0 80240820 AE020028 */ sw $v0, 0x28($s0) -/* 90FED4 80240824 96220072 */ lhu $v0, 0x72($s1) -/* 90FED8 80240828 A602008E */ sh $v0, 0x8e($s0) -/* 90FEDC 8024082C 2402001E */ addiu $v0, $zero, 0x1e -.L80240830: -/* 90FEE0 80240830 AE420070 */ sw $v0, 0x70($s2) -.L80240834: -/* 90FEE4 80240834 8FBF003C */ lw $ra, 0x3c($sp) -/* 90FEE8 80240838 8FB20038 */ lw $s2, 0x38($sp) -/* 90FEEC 8024083C 8FB10034 */ lw $s1, 0x34($sp) -/* 90FEF0 80240840 8FB00030 */ lw $s0, 0x30($sp) -/* 90FEF4 80240844 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 90FEF8 80240848 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 90FEFC 8024084C 03E00008 */ jr $ra -/* 90FF00 80240850 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s deleted file mode 100644 index ba7101a535..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240854_90FF04 -/* 90FF04 80240854 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 90FF08 80240858 AFB20038 */ sw $s2, 0x38($sp) -/* 90FF0C 8024085C 0080902D */ daddu $s2, $a0, $zero -/* 90FF10 80240860 AFBF003C */ sw $ra, 0x3c($sp) -/* 90FF14 80240864 AFB10034 */ sw $s1, 0x34($sp) -/* 90FF18 80240868 AFB00030 */ sw $s0, 0x30($sp) -/* 90FF1C 8024086C 8E510148 */ lw $s1, 0x148($s2) -/* 90FF20 80240870 0C00EABB */ jal get_npc_unsafe -/* 90FF24 80240874 86240008 */ lh $a0, 8($s1) -/* 90FF28 80240878 0040802D */ daddu $s0, $v0, $zero -/* 90FF2C 8024087C 9602008E */ lhu $v0, 0x8e($s0) -/* 90FF30 80240880 2442FFFF */ addiu $v0, $v0, -1 -/* 90FF34 80240884 A602008E */ sh $v0, 0x8e($s0) -/* 90FF38 80240888 00021400 */ sll $v0, $v0, 0x10 -/* 90FF3C 8024088C 1C40002B */ bgtz $v0, .L8024093C -/* 90FF40 80240890 00000000 */ nop -/* 90FF44 80240894 0C090148 */ jal func_80240520_90FBD0 -/* 90FF48 80240898 0240202D */ daddu $a0, $s2, $zero -/* 90FF4C 8024089C 0040202D */ daddu $a0, $v0, $zero -/* 90FF50 802408A0 0481001A */ bgez $a0, .L8024090C -/* 90FF54 802408A4 2402000F */ addiu $v0, $zero, 0xf -/* 90FF58 802408A8 24040002 */ addiu $a0, $zero, 2 -/* 90FF5C 802408AC 860300A8 */ lh $v1, 0xa8($s0) -/* 90FF60 802408B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 90FF64 802408B4 27A20028 */ addiu $v0, $sp, 0x28 -/* 90FF68 802408B8 0200282D */ daddu $a1, $s0, $zero -/* 90FF6C 802408BC 3C013F80 */ lui $at, 0x3f80 -/* 90FF70 802408C0 44810000 */ mtc1 $at, $f0 -/* 90FF74 802408C4 3C014000 */ lui $at, 0x4000 -/* 90FF78 802408C8 44811000 */ mtc1 $at, $f2 -/* 90FF7C 802408CC 3C01C1A0 */ lui $at, 0xc1a0 -/* 90FF80 802408D0 44812000 */ mtc1 $at, $f4 -/* 90FF84 802408D4 44833000 */ mtc1 $v1, $f6 -/* 90FF88 802408D8 00000000 */ nop -/* 90FF8C 802408DC 468031A0 */ cvt.s.w $f6, $f6 -/* 90FF90 802408E0 44073000 */ mfc1 $a3, $f6 -/* 90FF94 802408E4 0000302D */ daddu $a2, $zero, $zero -/* 90FF98 802408E8 AFA20020 */ sw $v0, 0x20($sp) -/* 90FF9C 802408EC E7A00010 */ swc1 $f0, 0x10($sp) -/* 90FFA0 802408F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 90FFA4 802408F4 0C01BFA4 */ jal fx_emote -/* 90FFA8 802408F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 90FFAC 802408FC 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FFB0 80240900 8C420000 */ lw $v0, ($v0) -/* 90FFB4 80240904 0809024B */ j .L8024092C -/* 90FFB8 80240908 AE020028 */ sw $v0, 0x28($s0) -.L8024090C: -/* 90FFBC 8024090C 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FFC0 80240910 8C420024 */ lw $v0, 0x24($v0) -/* 90FFC4 80240914 0C00FB3A */ jal get_enemy -/* 90FFC8 80240918 AE020028 */ sw $v0, 0x28($s0) -/* 90FFCC 8024091C 86240008 */ lh $a0, 8($s1) -/* 90FFD0 80240920 24030001 */ addiu $v1, $zero, 1 -/* 90FFD4 80240924 AC43006C */ sw $v1, 0x6c($v0) -/* 90FFD8 80240928 AC44007C */ sw $a0, 0x7c($v0) -.L8024092C: -/* 90FFDC 8024092C 96220076 */ lhu $v0, 0x76($s1) -/* 90FFE0 80240930 A602008E */ sh $v0, 0x8e($s0) -/* 90FFE4 80240934 24020021 */ addiu $v0, $zero, 0x21 -/* 90FFE8 80240938 AE420070 */ sw $v0, 0x70($s2) -.L8024093C: -/* 90FFEC 8024093C 8FBF003C */ lw $ra, 0x3c($sp) -/* 90FFF0 80240940 8FB20038 */ lw $s2, 0x38($sp) -/* 90FFF4 80240944 8FB10034 */ lw $s1, 0x34($sp) -/* 90FFF8 80240948 8FB00030 */ lw $s0, 0x30($sp) -/* 90FFFC 8024094C 03E00008 */ jr $ra -/* 910000 80240950 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s deleted file mode 100644 index 4c362ea8c3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80246430_915AE0 -.word .L802420FC_9117AC, .L8024210C_9117BC, .L80242124_9117D4, .L80242134_9117E4, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L8024214C_9117FC, .L8024215C_91180C, .L80242174_911824, .L802421EC_91189C, .L80242204_9118B4, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L8024221C_9118CC, .L8024222C_9118DC, .L8024223C_9118EC, .L8024224C_9118FC, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L80242264_911914, .L8024225C_91190C - -.section .text - -glabel func_80241F6C_91161C -/* 91161C 80241F6C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 911620 80241F70 AFB3003C */ sw $s3, 0x3c($sp) -/* 911624 80241F74 0080982D */ daddu $s3, $a0, $zero -/* 911628 80241F78 AFBF0048 */ sw $ra, 0x48($sp) -/* 91162C 80241F7C AFB50044 */ sw $s5, 0x44($sp) -/* 911630 80241F80 AFB40040 */ sw $s4, 0x40($sp) -/* 911634 80241F84 AFB20038 */ sw $s2, 0x38($sp) -/* 911638 80241F88 AFB10034 */ sw $s1, 0x34($sp) -/* 91163C 80241F8C AFB00030 */ sw $s0, 0x30($sp) -/* 911640 80241F90 8E720148 */ lw $s2, 0x148($s3) -/* 911644 80241F94 86440008 */ lh $a0, 8($s2) -/* 911648 80241F98 8E70000C */ lw $s0, 0xc($s3) -/* 91164C 80241F9C 0C00EABB */ jal get_npc_unsafe -/* 911650 80241FA0 00A0882D */ daddu $s1, $a1, $zero -/* 911654 80241FA4 0260202D */ daddu $a0, $s3, $zero -/* 911658 80241FA8 8E050000 */ lw $a1, ($s0) -/* 91165C 80241FAC 0C0B1EAF */ jal evt_get_variable -/* 911660 80241FB0 0040A02D */ daddu $s4, $v0, $zero -/* 911664 80241FB4 AFA00010 */ sw $zero, 0x10($sp) -/* 911668 80241FB8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 91166C 80241FBC 8C630030 */ lw $v1, 0x30($v1) -/* 911670 80241FC0 AFA30014 */ sw $v1, 0x14($sp) -/* 911674 80241FC4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911678 80241FC8 8C63001C */ lw $v1, 0x1c($v1) -/* 91167C 80241FCC AFA30018 */ sw $v1, 0x18($sp) -/* 911680 80241FD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911684 80241FD4 8C630024 */ lw $v1, 0x24($v1) -/* 911688 80241FD8 AFA3001C */ sw $v1, 0x1c($sp) -/* 91168C 80241FDC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 911690 80241FE0 8C630028 */ lw $v1, 0x28($v1) -/* 911694 80241FE4 27B50010 */ addiu $s5, $sp, 0x10 -/* 911698 80241FE8 AFA30020 */ sw $v1, 0x20($sp) -/* 91169C 80241FEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9116A0 80241FF0 3C014220 */ lui $at, 0x4220 -/* 9116A4 80241FF4 44810000 */ mtc1 $at, $f0 -/* 9116A8 80241FF8 8C63002C */ lw $v1, 0x2c($v1) -/* 9116AC 80241FFC 0040802D */ daddu $s0, $v0, $zero -/* 9116B0 80242000 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9116B4 80242004 A7A0002C */ sh $zero, 0x2c($sp) -/* 9116B8 80242008 16200005 */ bnez $s1, .L80242020 -/* 9116BC 8024200C AFA30024 */ sw $v1, 0x24($sp) -/* 9116C0 80242010 8E4200B0 */ lw $v0, 0xb0($s2) -/* 9116C4 80242014 30420004 */ andi $v0, $v0, 4 -/* 9116C8 80242018 1040002F */ beqz $v0, .L802420D8 -/* 9116CC 8024201C 00000000 */ nop -.L80242020: -/* 9116D0 80242020 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9116D4 80242024 AE600070 */ sw $zero, 0x70($s3) -/* 9116D8 80242028 A680008E */ sh $zero, 0x8e($s4) -/* 9116DC 8024202C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9116E0 80242030 8E830000 */ lw $v1, ($s4) -/* 9116E4 80242034 8C420000 */ lw $v0, ($v0) -/* 9116E8 80242038 00641824 */ and $v1, $v1, $a0 -/* 9116EC 8024203C AE830000 */ sw $v1, ($s4) -/* 9116F0 80242040 AE820028 */ sw $v0, 0x28($s4) -/* 9116F4 80242044 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9116F8 80242048 8C420034 */ lw $v0, 0x34($v0) -/* 9116FC 8024204C 54400005 */ bnel $v0, $zero, .L80242064 -/* 911700 80242050 2402FDFF */ addiu $v0, $zero, -0x201 -/* 911704 80242054 34620200 */ ori $v0, $v1, 0x200 -/* 911708 80242058 2403FFF7 */ addiu $v1, $zero, -9 -/* 91170C 8024205C 0809081B */ j .L8024206C -/* 911710 80242060 00431024 */ and $v0, $v0, $v1 -.L80242064: -/* 911714 80242064 00621024 */ and $v0, $v1, $v0 -/* 911718 80242068 34420008 */ ori $v0, $v0, 8 -.L8024206C: -/* 91171C 8024206C AE820000 */ sw $v0, ($s4) -/* 911720 80242070 8E4200B0 */ lw $v0, 0xb0($s2) -/* 911724 80242074 30420004 */ andi $v0, $v0, 4 -/* 911728 80242078 10400008 */ beqz $v0, .L8024209C -/* 91172C 8024207C 24020063 */ addiu $v0, $zero, 0x63 -/* 911730 80242080 AE620070 */ sw $v0, 0x70($s3) -/* 911734 80242084 AE600074 */ sw $zero, 0x74($s3) -/* 911738 80242088 8E4200B0 */ lw $v0, 0xb0($s2) -/* 91173C 8024208C 2403FFFB */ addiu $v1, $zero, -5 -/* 911740 80242090 00431024 */ and $v0, $v0, $v1 -/* 911744 80242094 0809082D */ j .L802420B4 -/* 911748 80242098 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024209C: -/* 91174C 8024209C 8E420000 */ lw $v0, ($s2) -/* 911750 802420A0 3C034000 */ lui $v1, 0x4000 -/* 911754 802420A4 00431024 */ and $v0, $v0, $v1 -/* 911758 802420A8 10400002 */ beqz $v0, .L802420B4 -/* 91175C 802420AC 2402000C */ addiu $v0, $zero, 0xc -/* 911760 802420B0 AE620070 */ sw $v0, 0x70($s3) -.L802420B4: -/* 911764 802420B4 3C05BFFF */ lui $a1, 0xbfff -/* 911768 802420B8 34A5FFFF */ ori $a1, $a1, 0xffff -/* 91176C 802420BC 2404FFFB */ addiu $a0, $zero, -5 -/* 911770 802420C0 8E4200B0 */ lw $v0, 0xb0($s2) -/* 911774 802420C4 8E430000 */ lw $v1, ($s2) -/* 911778 802420C8 00441024 */ and $v0, $v0, $a0 -/* 91177C 802420CC 00651824 */ and $v1, $v1, $a1 -/* 911780 802420D0 AE4200B0 */ sw $v0, 0xb0($s2) -/* 911784 802420D4 AE430000 */ sw $v1, ($s2) -.L802420D8: -/* 911788 802420D8 8E630070 */ lw $v1, 0x70($s3) -/* 91178C 802420DC 2C620064 */ sltiu $v0, $v1, 0x64 -/* 911790 802420E0 10400060 */ beqz $v0, .L80242264_911914 -/* 911794 802420E4 00031080 */ sll $v0, $v1, 2 -/* 911798 802420E8 3C018024 */ lui $at, %hi(jtbl_80246430_915AE0) -/* 91179C 802420EC 00220821 */ addu $at, $at, $v0 -/* 9117A0 802420F0 8C226430 */ lw $v0, %lo(jtbl_80246430_915AE0)($at) -/* 9117A4 802420F4 00400008 */ jr $v0 -/* 9117A8 802420F8 00000000 */ nop -.L802420FC_9117AC: -/* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero -/* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero -/* 9117B4 80242104 0C012568 */ jal func_800495A0 -/* 9117B8 80242108 02A0302D */ daddu $a2, $s5, $zero -.L8024210C_9117BC: -/* 9117BC 8024210C 0260202D */ daddu $a0, $s3, $zero -/* 9117C0 80242110 0200282D */ daddu $a1, $s0, $zero -/* 9117C4 80242114 0C0125AE */ jal func_800496B8 -/* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero -/* 9117CC 8024211C 08090899 */ j .L80242264_911914 -/* 9117D0 80242120 00000000 */ nop -.L80242124_9117D4: -/* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero -/* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero -/* 9117DC 8024212C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* 9117E0 80242130 02A0302D */ daddu $a2, $s5, $zero -.L80242134_9117E4: -/* 9117E4 80242134 0260202D */ daddu $a0, $s3, $zero -/* 9117E8 80242138 0200282D */ daddu $a1, $s0, $zero -/* 9117EC 8024213C 0C012701 */ jal func_80049C04 -/* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero -/* 9117F4 80242144 08090899 */ j .L80242264_911914 -/* 9117F8 80242148 00000000 */ nop -.L8024214C_9117FC: -/* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero -/* 911800 80242150 0200282D */ daddu $a1, $s0, $zero -/* 911804 80242154 0C01278F */ jal func_80049E3C -/* 911808 80242158 02A0302D */ daddu $a2, $s5, $zero -.L8024215C_91180C: -/* 91180C 8024215C 0260202D */ daddu $a0, $s3, $zero -/* 911810 80242160 0200282D */ daddu $a1, $s0, $zero -/* 911814 80242164 0C0127B3 */ jal func_80049ECC -/* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero -/* 91181C 8024216C 08090899 */ j .L80242264_911914 -/* 911820 80242170 00000000 */ nop -.L80242174_911824: -/* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) -/* 911830 80242180 C68E0040 */ lwc1 $f14, 0x40($s4) -/* 911834 80242184 8C460028 */ lw $a2, 0x28($v0) -/* 911838 80242188 0C00A7B5 */ jal dist2D -/* 91183C 8024218C 8C470030 */ lw $a3, 0x30($v0) -/* 911840 80242190 8E42006C */ lw $v0, 0x6c($s2) -/* 911844 80242194 10400008 */ beqz $v0, .L802421B8 -/* 911848 80242198 46000086 */ mov.s $f2, $f0 -/* 91184C 8024219C 44820000 */ mtc1 $v0, $f0 -/* 911850 802421A0 00000000 */ nop -/* 911854 802421A4 46800020 */ cvt.s.w $f0, $f0 -/* 911858 802421A8 4602003C */ c.lt.s $f0, $f2 -/* 91185C 802421AC 00000000 */ nop -/* 911860 802421B0 4500000B */ bc1f .L802421E0 -/* 911864 802421B4 0260202D */ daddu $a0, $s3, $zero -.L802421B8: -/* 911868 802421B8 0260202D */ daddu $a0, $s3, $zero -/* 91186C 802421BC 8E050024 */ lw $a1, 0x24($s0) -/* 911870 802421C0 8E060028 */ lw $a2, 0x28($s0) -/* 911874 802421C4 0C0901C4 */ jal func_80240710_90FDC0 -/* 911878 802421C8 02A0382D */ daddu $a3, $s5, $zero -/* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) -/* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc -/* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264_911914 -/* 911888 802421D8 00000000 */ nop -/* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero -.L802421E0: -/* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero -/* 911894 802421E4 0C0127DF */ jal func_80049F7C -/* 911898 802421E8 02A0302D */ daddu $a2, $s5, $zero -.L802421EC_91189C: -/* 91189C 802421EC 0260202D */ daddu $a0, $s3, $zero -/* 9118A0 802421F0 0200282D */ daddu $a1, $s0, $zero -/* 9118A4 802421F4 0C012849 */ jal func_8004A124 -/* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero -/* 9118AC 802421FC 08090899 */ j .L80242264_911914 -/* 9118B0 80242200 00000000 */ nop -.L80242204_9118B4: -/* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero -/* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero -/* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 -/* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero -/* 9118C4 80242214 08090899 */ j .L80242264_911914 -/* 9118C8 80242218 00000000 */ nop -.L8024221C_9118CC: -/* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 -/* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero -/* 9118D4 80242224 08090899 */ j .L80242264_911914 -/* 9118D8 80242228 00000000 */ nop -.L8024222C_9118DC: -/* 9118DC 8024222C 0C090255 */ jal iwa_01_UnkSetDurationFunc -/* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero -/* 9118E4 80242234 08090899 */ j .L80242264_911914 -/* 9118E8 80242238 00000000 */ nop -.L8024223C_9118EC: -/* 9118EC 8024223C 0C090266 */ jal iwa_01_UnkNpcAIFunc9 -/* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero -/* 9118F4 80242244 08090899 */ j .L80242264_911914 -/* 9118F8 80242248 00000000 */ nop -.L8024224C_9118FC: -/* 9118FC 8024224C 0C09028E */ jal iwa_01_UnkDurationCheck -/* 911900 80242250 0260202D */ daddu $a0, $s3, $zero -/* 911904 80242254 08090899 */ j .L80242264_911914 -/* 911908 80242258 00000000 */ nop -.L8024225C_91190C: -/* 91190C 8024225C 0C0129CF */ jal func_8004A73C -/* 911910 80242260 0260202D */ daddu $a0, $s3, $zero -.L80242264_911914: -/* 911914 80242264 8FBF0048 */ lw $ra, 0x48($sp) -/* 911918 80242268 8FB50044 */ lw $s5, 0x44($sp) -/* 91191C 8024226C 8FB40040 */ lw $s4, 0x40($sp) -/* 911920 80242270 8FB3003C */ lw $s3, 0x3c($sp) -/* 911924 80242274 8FB20038 */ lw $s2, 0x38($sp) -/* 911928 80242278 8FB10034 */ lw $s1, 0x34($sp) -/* 91192C 8024227C 8FB00030 */ lw $s0, 0x30($sp) -/* 911930 80242280 0000102D */ daddu $v0, $zero, $zero -/* 911934 80242284 03E00008 */ jr $ra -/* 911938 80242288 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s deleted file mode 100644 index 85fbeb0534..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0_91EE60 -/* 91EE60 802408F0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 91EE64 802408F4 AFB60040 */ sw $s6, 0x40($sp) -/* 91EE68 802408F8 0080B02D */ daddu $s6, $a0, $zero -/* 91EE6C 802408FC AFB00028 */ sw $s0, 0x28($sp) -/* 91EE70 80240900 00A0802D */ daddu $s0, $a1, $zero -/* 91EE74 80240904 AFBF0044 */ sw $ra, 0x44($sp) -/* 91EE78 80240908 AFB5003C */ sw $s5, 0x3c($sp) -/* 91EE7C 8024090C AFB40038 */ sw $s4, 0x38($sp) -/* 91EE80 80240910 AFB30034 */ sw $s3, 0x34($sp) -/* 91EE84 80240914 AFB20030 */ sw $s2, 0x30($sp) -/* 91EE88 80240918 AFB1002C */ sw $s1, 0x2c($sp) -/* 91EE8C 8024091C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 91EE90 80240920 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 91EE94 80240924 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 91EE98 80240928 8ED3000C */ lw $s3, 0xc($s6) -/* 91EE9C 8024092C 0C00EAD2 */ jal get_npc_safe -/* 91EEA0 80240930 2404FFFC */ addiu $a0, $zero, -4 -/* 91EEA4 80240934 27A50018 */ addiu $a1, $sp, 0x18 -/* 91EEA8 80240938 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 91EEAC 8024093C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 91EEB0 80240940 27A6001C */ addiu $a2, $sp, 0x1c -/* 91EEB4 80240944 00041880 */ sll $v1, $a0, 2 -/* 91EEB8 80240948 00641821 */ addu $v1, $v1, $a0 -/* 91EEBC 8024094C 00031880 */ sll $v1, $v1, 2 -/* 91EEC0 80240950 00641823 */ subu $v1, $v1, $a0 -/* 91EEC4 80240954 000320C0 */ sll $a0, $v1, 3 -/* 91EEC8 80240958 00641821 */ addu $v1, $v1, $a0 -/* 91EECC 8024095C 000318C0 */ sll $v1, $v1, 3 -/* 91EED0 80240960 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 91EED4 80240964 00230821 */ addu $at, $at, $v1 -/* 91EED8 80240968 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 91EEDC 8024096C 0C00A88D */ jal sin_cos_deg -/* 91EEE0 80240970 0040A82D */ daddu $s5, $v0, $zero -/* 91EEE4 80240974 1200005D */ beqz $s0, .L80240AEC -/* 91EEE8 80240978 00000000 */ nop -/* 91EEEC 8024097C 0C00AB0A */ jal general_heap_malloc -/* 91EEF0 80240980 24040068 */ addiu $a0, $zero, 0x68 -/* 91EEF4 80240984 0040902D */ daddu $s2, $v0, $zero -/* 91EEF8 80240988 02C0202D */ daddu $a0, $s6, $zero -/* 91EEFC 8024098C 0000882D */ daddu $s1, $zero, $zero -/* 91EF00 80240990 2414FFFF */ addiu $s4, $zero, -1 -/* 91EF04 80240994 AED20060 */ sw $s2, 0x60($s6) -/* 91EF08 80240998 8E650000 */ lw $a1, ($s3) -/* 91EF0C 8024099C 3C014148 */ lui $at, 0x4148 -/* 91EF10 802409A0 4481C000 */ mtc1 $at, $f24 -/* 91EF14 802409A4 3C013F80 */ lui $at, 0x3f80 -/* 91EF18 802409A8 4481B000 */ mtc1 $at, $f22 -/* 91EF1C 802409AC 4480A000 */ mtc1 $zero, $f20 -/* 91EF20 802409B0 0C0B1EAF */ jal evt_get_variable -/* 91EF24 802409B4 0240802D */ daddu $s0, $s2, $zero -/* 91EF28 802409B8 0C04417A */ jal get_entity_by_index -/* 91EF2C 802409BC 0040202D */ daddu $a0, $v0, $zero -/* 91EF30 802409C0 AE42005C */ sw $v0, 0x5c($s2) -.L802409C4: -/* 91EF34 802409C4 8E42005C */ lw $v0, 0x5c($s2) -/* 91EF38 802409C8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 91EF3C 802409CC 0000202D */ daddu $a0, $zero, $zero -/* 91EF40 802409D0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 91EF44 802409D4 AFB40014 */ sw $s4, 0x14($sp) -/* 91EF48 802409D8 46180000 */ add.s $f0, $f0, $f24 -/* 91EF4C 802409DC 8C450048 */ lw $a1, 0x48($v0) -/* 91EF50 802409E0 8C470050 */ lw $a3, 0x50($v0) -/* 91EF54 802409E4 44060000 */ mfc1 $a2, $f0 -/* 91EF58 802409E8 0C01C5BC */ jal fx_motion_blur_flame -/* 91EF5C 802409EC 26310001 */ addiu $s1, $s1, 1 -/* 91EF60 802409F0 AE020008 */ sw $v0, 8($s0) -/* 91EF64 802409F4 E614002C */ swc1 $f20, 0x2c($s0) -/* 91EF68 802409F8 E6140020 */ swc1 $f20, 0x20($s0) -/* 91EF6C 802409FC E6140014 */ swc1 $f20, 0x14($s0) -/* 91EF70 80240A00 E6140050 */ swc1 $f20, 0x50($s0) -/* 91EF74 80240A04 E6140044 */ swc1 $f20, 0x44($s0) -/* 91EF78 80240A08 E6140038 */ swc1 $f20, 0x38($s0) -/* 91EF7C 80240A0C 2A220003 */ slti $v0, $s1, 3 -/* 91EF80 80240A10 1440FFEC */ bnez $v0, .L802409C4 -/* 91EF84 80240A14 26100004 */ addiu $s0, $s0, 4 -/* 91EF88 80240A18 0000882D */ daddu $s1, $zero, $zero -/* 91EF8C 80240A1C 0240802D */ daddu $s0, $s2, $zero -/* 91EF90 80240A20 3C148024 */ lui $s4, %hi(D_80245AB8_924028) -/* 91EF94 80240A24 26945AB8 */ addiu $s4, $s4, %lo(D_80245AB8_924028) -/* 91EF98 80240A28 3C014248 */ lui $at, 0x4248 -/* 91EF9C 80240A2C 4481A000 */ mtc1 $at, $f20 -/* 91EFA0 80240A30 24130044 */ addiu $s3, $zero, 0x44 -/* 91EFA4 80240A34 AE400000 */ sw $zero, ($s2) -/* 91EFA8 80240A38 AE400004 */ sw $zero, 4($s2) -/* 91EFAC 80240A3C AE400060 */ sw $zero, 0x60($s2) -/* 91EFB0 80240A40 AE400064 */ sw $zero, 0x64($s2) -.L80240A44: -/* 91EFB4 80240A44 27A40020 */ addiu $a0, $sp, 0x20 -/* 91EFB8 80240A48 4406A000 */ mfc1 $a2, $f20 -/* 91EFBC 80240A4C 8E870000 */ lw $a3, ($s4) -/* 91EFC0 80240A50 02532821 */ addu $a1, $s2, $s3 -/* 91EFC4 80240A54 0C00A7E7 */ jal add_vec2D_polar -/* 91EFC8 80240A58 AFA00020 */ sw $zero, 0x20($sp) -/* 91EFCC 80240A5C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 91EFD0 80240A60 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 91EFD4 80240A64 46041082 */ mul.s $f2, $f2, $f4 -/* 91EFD8 80240A68 00000000 */ nop -/* 91EFDC 80240A6C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 91EFE0 80240A70 46040002 */ mul.s $f0, $f0, $f4 -/* 91EFE4 80240A74 00000000 */ nop -/* 91EFE8 80240A78 E6020038 */ swc1 $f2, 0x38($s0) -/* 91EFEC 80240A7C E6000050 */ swc1 $f0, 0x50($s0) -/* 91EFF0 80240A80 8E42005C */ lw $v0, 0x5c($s2) -/* 91EFF4 80240A84 C6000038 */ lwc1 $f0, 0x38($s0) -/* 91EFF8 80240A88 C4420048 */ lwc1 $f2, 0x48($v0) -/* 91EFFC 80240A8C 46001080 */ add.s $f2, $f2, $f0 -/* 91F000 80240A90 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 91F004 80240A94 46020001 */ sub.s $f0, $f0, $f2 -/* 91F008 80240A98 E6000038 */ swc1 $f0, 0x38($s0) -/* 91F00C 80240A9C 8E42005C */ lw $v0, 0x5c($s2) -/* 91F010 80240AA0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 91F014 80240AA4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 91F018 80240AA8 46001080 */ add.s $f2, $f2, $f0 -/* 91F01C 80240AAC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 91F020 80240AB0 46020001 */ sub.s $f0, $f0, $f2 -/* 91F024 80240AB4 E6000044 */ swc1 $f0, 0x44($s0) -/* 91F028 80240AB8 8E42005C */ lw $v0, 0x5c($s2) -/* 91F02C 80240ABC C6000050 */ lwc1 $f0, 0x50($s0) -/* 91F030 80240AC0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 91F034 80240AC4 26940004 */ addiu $s4, $s4, 4 -/* 91F038 80240AC8 46001080 */ add.s $f2, $f2, $f0 -/* 91F03C 80240ACC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 91F040 80240AD0 26730004 */ addiu $s3, $s3, 4 -/* 91F044 80240AD4 46020001 */ sub.s $f0, $f0, $f2 -/* 91F048 80240AD8 26310001 */ addiu $s1, $s1, 1 -/* 91F04C 80240ADC 2A220003 */ slti $v0, $s1, 3 -/* 91F050 80240AE0 E6000050 */ swc1 $f0, 0x50($s0) -/* 91F054 80240AE4 1440FFD7 */ bnez $v0, .L80240A44 -/* 91F058 80240AE8 26100004 */ addiu $s0, $s0, 4 -.L80240AEC: -/* 91F05C 80240AEC 8ED20060 */ lw $s2, 0x60($s6) -/* 91F060 80240AF0 8E430000 */ lw $v1, ($s2) -/* 91F064 80240AF4 24020001 */ addiu $v0, $zero, 1 -/* 91F068 80240AF8 10620038 */ beq $v1, $v0, .L80240BDC -/* 91F06C 80240AFC 28620002 */ slti $v0, $v1, 2 -/* 91F070 80240B00 50400005 */ beql $v0, $zero, .L80240B18 -/* 91F074 80240B04 24020002 */ addiu $v0, $zero, 2 -/* 91F078 80240B08 10600007 */ beqz $v1, .L80240B28 -/* 91F07C 80240B0C 24040005 */ addiu $a0, $zero, 5 -/* 91F080 80240B10 08090330 */ j .L80240CC0 -/* 91F084 80240B14 00000000 */ nop -.L80240B18: -/* 91F088 80240B18 10620058 */ beq $v1, $v0, .L80240C7C -/* 91F08C 80240B1C 00000000 */ nop -/* 91F090 80240B20 08090330 */ j .L80240CC0 -/* 91F094 80240B24 00000000 */ nop -.L80240B28: -/* 91F098 80240B28 0000882D */ daddu $s1, $zero, $zero -/* 91F09C 80240B2C 3C148024 */ lui $s4, %hi(D_80245AB8_924028) -/* 91F0A0 80240B30 26945AB8 */ addiu $s4, $s4, %lo(D_80245AB8_924028) -/* 91F0A4 80240B34 24130020 */ addiu $s3, $zero, 0x20 -/* 91F0A8 80240B38 3C064248 */ lui $a2, 0x4248 -/* 91F0AC 80240B3C 44800000 */ mtc1 $zero, $f0 -/* 91F0B0 80240B40 24020014 */ addiu $v0, $zero, 0x14 -/* 91F0B4 80240B44 AFA20010 */ sw $v0, 0x10($sp) -/* 91F0B8 80240B48 44050000 */ mfc1 $a1, $f0 -/* 91F0BC 80240B4C 8E470060 */ lw $a3, 0x60($s2) -/* 91F0C0 80240B50 4485B000 */ mtc1 $a1, $f22 -/* 91F0C4 80240B54 0C00A8ED */ jal update_lerp -/* 91F0C8 80240B58 0240802D */ daddu $s0, $s2, $zero -/* 91F0CC 80240B5C 46000506 */ mov.s $f20, $f0 -.L80240B60: -/* 91F0D0 80240B60 4406A000 */ mfc1 $a2, $f20 -/* 91F0D4 80240B64 27A40020 */ addiu $a0, $sp, 0x20 -/* 91F0D8 80240B68 E6160020 */ swc1 $f22, 0x20($s0) -/* 91F0DC 80240B6C 8E870000 */ lw $a3, ($s4) -/* 91F0E0 80240B70 02532821 */ addu $a1, $s2, $s3 -/* 91F0E4 80240B74 0C00A7E7 */ jal add_vec2D_polar -/* 91F0E8 80240B78 E7B60020 */ swc1 $f22, 0x20($sp) -/* 91F0EC 80240B7C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 91F0F0 80240B80 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 91F0F4 80240B84 46002102 */ mul.s $f4, $f4, $f0 -/* 91F0F8 80240B88 00000000 */ nop -/* 91F0FC 80240B8C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 91F100 80240B90 26940004 */ addiu $s4, $s4, 4 -/* 91F104 80240B94 46001082 */ mul.s $f2, $f2, $f0 -/* 91F108 80240B98 00000000 */ nop -/* 91F10C 80240B9C 26730004 */ addiu $s3, $s3, 4 -/* 91F110 80240BA0 26310001 */ addiu $s1, $s1, 1 -/* 91F114 80240BA4 2A220003 */ slti $v0, $s1, 3 -/* 91F118 80240BA8 E6040014 */ swc1 $f4, 0x14($s0) -/* 91F11C 80240BAC E602002C */ swc1 $f2, 0x2c($s0) -/* 91F120 80240BB0 1440FFEB */ bnez $v0, .L80240B60 -/* 91F124 80240BB4 26100004 */ addiu $s0, $s0, 4 -/* 91F128 80240BB8 8E420060 */ lw $v0, 0x60($s2) -/* 91F12C 80240BBC 24420001 */ addiu $v0, $v0, 1 -/* 91F130 80240BC0 AE420060 */ sw $v0, 0x60($s2) -/* 91F134 80240BC4 28420015 */ slti $v0, $v0, 0x15 -/* 91F138 80240BC8 1440003D */ bnez $v0, .L80240CC0 -/* 91F13C 80240BCC 24020001 */ addiu $v0, $zero, 1 -/* 91F140 80240BD0 AE420000 */ sw $v0, ($s2) -/* 91F144 80240BD4 08090330 */ j .L80240CC0 -/* 91F148 80240BD8 AE400060 */ sw $zero, 0x60($s2) -.L80240BDC: -/* 91F14C 80240BDC 0000882D */ daddu $s1, $zero, $zero -/* 91F150 80240BE0 3C148024 */ lui $s4, %hi(D_80245AB8_924028) -/* 91F154 80240BE4 26945AB8 */ addiu $s4, $s4, %lo(D_80245AB8_924028) -/* 91F158 80240BE8 24130020 */ addiu $s3, $zero, 0x20 -/* 91F15C 80240BEC 0240802D */ daddu $s0, $s2, $zero -/* 91F160 80240BF0 3C014248 */ lui $at, 0x4248 -/* 91F164 80240BF4 4481A000 */ mtc1 $at, $f20 -/* 91F168 80240BF8 4480B000 */ mtc1 $zero, $f22 -.L80240BFC: -/* 91F16C 80240BFC 4406A000 */ mfc1 $a2, $f20 -/* 91F170 80240C00 27A40020 */ addiu $a0, $sp, 0x20 -/* 91F174 80240C04 E6160020 */ swc1 $f22, 0x20($s0) -/* 91F178 80240C08 8E870000 */ lw $a3, ($s4) -/* 91F17C 80240C0C 02532821 */ addu $a1, $s2, $s3 -/* 91F180 80240C10 0C00A7E7 */ jal add_vec2D_polar -/* 91F184 80240C14 E7B60020 */ swc1 $f22, 0x20($sp) -/* 91F188 80240C18 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 91F18C 80240C1C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 91F190 80240C20 46002102 */ mul.s $f4, $f4, $f0 -/* 91F194 80240C24 00000000 */ nop -/* 91F198 80240C28 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 91F19C 80240C2C 26940004 */ addiu $s4, $s4, 4 -/* 91F1A0 80240C30 46001082 */ mul.s $f2, $f2, $f0 -/* 91F1A4 80240C34 00000000 */ nop -/* 91F1A8 80240C38 26730004 */ addiu $s3, $s3, 4 -/* 91F1AC 80240C3C 26310001 */ addiu $s1, $s1, 1 -/* 91F1B0 80240C40 2A220003 */ slti $v0, $s1, 3 -/* 91F1B4 80240C44 E6040014 */ swc1 $f4, 0x14($s0) -/* 91F1B8 80240C48 E602002C */ swc1 $f2, 0x2c($s0) -/* 91F1BC 80240C4C 1440FFEB */ bnez $v0, .L80240BFC -/* 91F1C0 80240C50 26100004 */ addiu $s0, $s0, 4 -/* 91F1C4 80240C54 8E420060 */ lw $v0, 0x60($s2) -/* 91F1C8 80240C58 24420001 */ addiu $v0, $v0, 1 -/* 91F1CC 80240C5C AE420060 */ sw $v0, 0x60($s2) -/* 91F1D0 80240C60 28420010 */ slti $v0, $v0, 0x10 -/* 91F1D4 80240C64 14400016 */ bnez $v0, .L80240CC0 -/* 91F1D8 80240C68 2402000F */ addiu $v0, $zero, 0xf -/* 91F1DC 80240C6C AE420060 */ sw $v0, 0x60($s2) -/* 91F1E0 80240C70 24020002 */ addiu $v0, $zero, 2 -/* 91F1E4 80240C74 08090330 */ j .L80240CC0 -/* 91F1E8 80240C78 AE420000 */ sw $v0, ($s2) -.L80240C7C: -/* 91F1EC 80240C7C 8E420060 */ lw $v0, 0x60($s2) -/* 91F1F0 80240C80 24420001 */ addiu $v0, $v0, 1 -/* 91F1F4 80240C84 AE420060 */ sw $v0, 0x60($s2) -/* 91F1F8 80240C88 2842001F */ slti $v0, $v0, 0x1f -/* 91F1FC 80240C8C 1440000C */ bnez $v0, .L80240CC0 -/* 91F200 80240C90 0000882D */ daddu $s1, $zero, $zero -/* 91F204 80240C94 0240282D */ daddu $a1, $s2, $zero -.L80240C98: -/* 91F208 80240C98 8CA20008 */ lw $v0, 8($a1) -/* 91F20C 80240C9C 8C430000 */ lw $v1, ($v0) -/* 91F210 80240CA0 26310001 */ addiu $s1, $s1, 1 -/* 91F214 80240CA4 34630010 */ ori $v1, $v1, 0x10 -/* 91F218 80240CA8 AC430000 */ sw $v1, ($v0) -/* 91F21C 80240CAC 2A220003 */ slti $v0, $s1, 3 -/* 91F220 80240CB0 1440FFF9 */ bnez $v0, .L80240C98 -/* 91F224 80240CB4 24A50004 */ addiu $a1, $a1, 4 -/* 91F228 80240CB8 0809037D */ j .L80240DF4 -/* 91F22C 80240CBC 24020002 */ addiu $v0, $zero, 2 -.L80240CC0: -/* 91F230 80240CC0 8E430004 */ lw $v1, 4($s2) -/* 91F234 80240CC4 10600005 */ beqz $v1, .L80240CDC -/* 91F238 80240CC8 24020001 */ addiu $v0, $zero, 1 -/* 91F23C 80240CCC 1062000B */ beq $v1, $v0, .L80240CFC -/* 91F240 80240CD0 0000882D */ daddu $s1, $zero, $zero -/* 91F244 80240CD4 0809036C */ j .L80240DB0 -/* 91F248 80240CD8 0240282D */ daddu $a1, $s2, $zero -.L80240CDC: -/* 91F24C 80240CDC 8E420064 */ lw $v0, 0x64($s2) -/* 91F250 80240CE0 24420001 */ addiu $v0, $v0, 1 -/* 91F254 80240CE4 AE420064 */ sw $v0, 0x64($s2) -/* 91F258 80240CE8 28420010 */ slti $v0, $v0, 0x10 -/* 91F25C 80240CEC 1440002F */ bnez $v0, .L80240DAC -/* 91F260 80240CF0 0000882D */ daddu $s1, $zero, $zero -/* 91F264 80240CF4 08090368 */ j .L80240DA0 -/* 91F268 80240CF8 24020001 */ addiu $v0, $zero, 1 -.L80240CFC: -/* 91F26C 80240CFC 4480A000 */ mtc1 $zero, $f20 -/* 91F270 80240D00 24130014 */ addiu $s3, $zero, 0x14 -/* 91F274 80240D04 0240802D */ daddu $s0, $s2, $zero -.L80240D08: -/* 91F278 80240D08 4405A000 */ mfc1 $a1, $f20 -/* 91F27C 80240D0C AFB30010 */ sw $s3, 0x10($sp) -/* 91F280 80240D10 8E060038 */ lw $a2, 0x38($s0) -/* 91F284 80240D14 8E470064 */ lw $a3, 0x64($s2) -/* 91F288 80240D18 0C00A8ED */ jal update_lerp -/* 91F28C 80240D1C 24040001 */ addiu $a0, $zero, 1 -/* 91F290 80240D20 C6020014 */ lwc1 $f2, 0x14($s0) -/* 91F294 80240D24 46001080 */ add.s $f2, $f2, $f0 -/* 91F298 80240D28 4405A000 */ mfc1 $a1, $f20 -/* 91F29C 80240D2C E6020014 */ swc1 $f2, 0x14($s0) -/* 91F2A0 80240D30 AFB30010 */ sw $s3, 0x10($sp) -/* 91F2A4 80240D34 8E060044 */ lw $a2, 0x44($s0) -/* 91F2A8 80240D38 8E470064 */ lw $a3, 0x64($s2) -/* 91F2AC 80240D3C 0C00A8ED */ jal update_lerp -/* 91F2B0 80240D40 24040001 */ addiu $a0, $zero, 1 -/* 91F2B4 80240D44 C6020020 */ lwc1 $f2, 0x20($s0) -/* 91F2B8 80240D48 46001080 */ add.s $f2, $f2, $f0 -/* 91F2BC 80240D4C 4405A000 */ mfc1 $a1, $f20 -/* 91F2C0 80240D50 E6020020 */ swc1 $f2, 0x20($s0) -/* 91F2C4 80240D54 AFB30010 */ sw $s3, 0x10($sp) -/* 91F2C8 80240D58 8E060050 */ lw $a2, 0x50($s0) -/* 91F2CC 80240D5C 8E470064 */ lw $a3, 0x64($s2) -/* 91F2D0 80240D60 0C00A8ED */ jal update_lerp -/* 91F2D4 80240D64 24040001 */ addiu $a0, $zero, 1 -/* 91F2D8 80240D68 C602002C */ lwc1 $f2, 0x2c($s0) -/* 91F2DC 80240D6C 46001080 */ add.s $f2, $f2, $f0 -/* 91F2E0 80240D70 26310001 */ addiu $s1, $s1, 1 -/* 91F2E4 80240D74 2A220003 */ slti $v0, $s1, 3 -/* 91F2E8 80240D78 E602002C */ swc1 $f2, 0x2c($s0) -/* 91F2EC 80240D7C 1440FFE2 */ bnez $v0, .L80240D08 -/* 91F2F0 80240D80 26100004 */ addiu $s0, $s0, 4 -/* 91F2F4 80240D84 8E420064 */ lw $v0, 0x64($s2) -/* 91F2F8 80240D88 24420001 */ addiu $v0, $v0, 1 -/* 91F2FC 80240D8C AE420064 */ sw $v0, 0x64($s2) -/* 91F300 80240D90 28420015 */ slti $v0, $v0, 0x15 -/* 91F304 80240D94 14400005 */ bnez $v0, .L80240DAC -/* 91F308 80240D98 0000882D */ daddu $s1, $zero, $zero -/* 91F30C 80240D9C 24020002 */ addiu $v0, $zero, 2 -.L80240DA0: -/* 91F310 80240DA0 AE420004 */ sw $v0, 4($s2) -/* 91F314 80240DA4 AE400064 */ sw $zero, 0x64($s2) -/* 91F318 80240DA8 0000882D */ daddu $s1, $zero, $zero -.L80240DAC: -/* 91F31C 80240DAC 0240282D */ daddu $a1, $s2, $zero -.L80240DB0: -/* 91F320 80240DB0 8CA20008 */ lw $v0, 8($a1) -/* 91F324 80240DB4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 91F328 80240DB8 8C42000C */ lw $v0, 0xc($v0) -/* 91F32C 80240DBC E4400010 */ swc1 $f0, 0x10($v0) -/* 91F330 80240DC0 8CA20008 */ lw $v0, 8($a1) -/* 91F334 80240DC4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 91F338 80240DC8 8C42000C */ lw $v0, 0xc($v0) -/* 91F33C 80240DCC 26310001 */ addiu $s1, $s1, 1 -/* 91F340 80240DD0 E4400014 */ swc1 $f0, 0x14($v0) -/* 91F344 80240DD4 8CA20008 */ lw $v0, 8($a1) -/* 91F348 80240DD8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 91F34C 80240DDC 8C42000C */ lw $v0, 0xc($v0) -/* 91F350 80240DE0 E4400018 */ swc1 $f0, 0x18($v0) -/* 91F354 80240DE4 2A220003 */ slti $v0, $s1, 3 -/* 91F358 80240DE8 1440FFF1 */ bnez $v0, .L80240DB0 -/* 91F35C 80240DEC 24A50004 */ addiu $a1, $a1, 4 -/* 91F360 80240DF0 0000102D */ daddu $v0, $zero, $zero -.L80240DF4: -/* 91F364 80240DF4 8FBF0044 */ lw $ra, 0x44($sp) -/* 91F368 80240DF8 8FB60040 */ lw $s6, 0x40($sp) -/* 91F36C 80240DFC 8FB5003C */ lw $s5, 0x3c($sp) -/* 91F370 80240E00 8FB40038 */ lw $s4, 0x38($sp) -/* 91F374 80240E04 8FB30034 */ lw $s3, 0x34($sp) -/* 91F378 80240E08 8FB20030 */ lw $s2, 0x30($sp) -/* 91F37C 80240E0C 8FB1002C */ lw $s1, 0x2c($sp) -/* 91F380 80240E10 8FB00028 */ lw $s0, 0x28($sp) -/* 91F384 80240E14 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 91F388 80240E18 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 91F38C 80240E1C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 91F390 80240E20 03E00008 */ jr $ra -/* 91F394 80240E24 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s deleted file mode 100644 index 1bb78729d4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C60_B5EF10 -/* B5EF10 80240C60 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B5EF14 80240C64 AFB60040 */ sw $s6, 0x40($sp) -/* B5EF18 80240C68 0080B02D */ daddu $s6, $a0, $zero -/* B5EF1C 80240C6C AFB00028 */ sw $s0, 0x28($sp) -/* B5EF20 80240C70 00A0802D */ daddu $s0, $a1, $zero -/* B5EF24 80240C74 AFBF0044 */ sw $ra, 0x44($sp) -/* B5EF28 80240C78 AFB5003C */ sw $s5, 0x3c($sp) -/* B5EF2C 80240C7C AFB40038 */ sw $s4, 0x38($sp) -/* B5EF30 80240C80 AFB30034 */ sw $s3, 0x34($sp) -/* B5EF34 80240C84 AFB20030 */ sw $s2, 0x30($sp) -/* B5EF38 80240C88 AFB1002C */ sw $s1, 0x2c($sp) -/* B5EF3C 80240C8C F7B80058 */ sdc1 $f24, 0x58($sp) -/* B5EF40 80240C90 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B5EF44 80240C94 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B5EF48 80240C98 8ED3000C */ lw $s3, 0xc($s6) -/* B5EF4C 80240C9C 0C00EAD2 */ jal get_npc_safe -/* B5EF50 80240CA0 2404FFFC */ addiu $a0, $zero, -4 -/* B5EF54 80240CA4 27A50018 */ addiu $a1, $sp, 0x18 -/* B5EF58 80240CA8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* B5EF5C 80240CAC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* B5EF60 80240CB0 27A6001C */ addiu $a2, $sp, 0x1c -/* B5EF64 80240CB4 00041880 */ sll $v1, $a0, 2 -/* B5EF68 80240CB8 00641821 */ addu $v1, $v1, $a0 -/* B5EF6C 80240CBC 00031880 */ sll $v1, $v1, 2 -/* B5EF70 80240CC0 00641823 */ subu $v1, $v1, $a0 -/* B5EF74 80240CC4 000320C0 */ sll $a0, $v1, 3 -/* B5EF78 80240CC8 00641821 */ addu $v1, $v1, $a0 -/* B5EF7C 80240CCC 000318C0 */ sll $v1, $v1, 3 -/* B5EF80 80240CD0 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* B5EF84 80240CD4 00230821 */ addu $at, $at, $v1 -/* B5EF88 80240CD8 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* B5EF8C 80240CDC 0C00A88D */ jal sin_cos_deg -/* B5EF90 80240CE0 0040A82D */ daddu $s5, $v0, $zero -/* B5EF94 80240CE4 1200005D */ beqz $s0, .L80240E5C -/* B5EF98 80240CE8 00000000 */ nop -/* B5EF9C 80240CEC 0C00AB0A */ jal general_heap_malloc -/* B5EFA0 80240CF0 24040068 */ addiu $a0, $zero, 0x68 -/* B5EFA4 80240CF4 0040902D */ daddu $s2, $v0, $zero -/* B5EFA8 80240CF8 02C0202D */ daddu $a0, $s6, $zero -/* B5EFAC 80240CFC 0000882D */ daddu $s1, $zero, $zero -/* B5EFB0 80240D00 2414FFFF */ addiu $s4, $zero, -1 -/* B5EFB4 80240D04 AED20060 */ sw $s2, 0x60($s6) -/* B5EFB8 80240D08 8E650000 */ lw $a1, ($s3) -/* B5EFBC 80240D0C 3C014148 */ lui $at, 0x4148 -/* B5EFC0 80240D10 4481C000 */ mtc1 $at, $f24 -/* B5EFC4 80240D14 3C013F80 */ lui $at, 0x3f80 -/* B5EFC8 80240D18 4481B000 */ mtc1 $at, $f22 -/* B5EFCC 80240D1C 4480A000 */ mtc1 $zero, $f20 -/* B5EFD0 80240D20 0C0B1EAF */ jal evt_get_variable -/* B5EFD4 80240D24 0240802D */ daddu $s0, $s2, $zero -/* B5EFD8 80240D28 0C04417A */ jal get_entity_by_index -/* B5EFDC 80240D2C 0040202D */ daddu $a0, $v0, $zero -/* B5EFE0 80240D30 AE42005C */ sw $v0, 0x5c($s2) -.L80240D34: -/* B5EFE4 80240D34 8E42005C */ lw $v0, 0x5c($s2) -/* B5EFE8 80240D38 C440004C */ lwc1 $f0, 0x4c($v0) -/* B5EFEC 80240D3C 0000202D */ daddu $a0, $zero, $zero -/* B5EFF0 80240D40 E7B60010 */ swc1 $f22, 0x10($sp) -/* B5EFF4 80240D44 AFB40014 */ sw $s4, 0x14($sp) -/* B5EFF8 80240D48 46180000 */ add.s $f0, $f0, $f24 -/* B5EFFC 80240D4C 8C450048 */ lw $a1, 0x48($v0) -/* B5F000 80240D50 8C470050 */ lw $a3, 0x50($v0) -/* B5F004 80240D54 44060000 */ mfc1 $a2, $f0 -/* B5F008 80240D58 0C01C5BC */ jal fx_motion_blur_flame -/* B5F00C 80240D5C 26310001 */ addiu $s1, $s1, 1 -/* B5F010 80240D60 AE020008 */ sw $v0, 8($s0) -/* B5F014 80240D64 E614002C */ swc1 $f20, 0x2c($s0) -/* B5F018 80240D68 E6140020 */ swc1 $f20, 0x20($s0) -/* B5F01C 80240D6C E6140014 */ swc1 $f20, 0x14($s0) -/* B5F020 80240D70 E6140050 */ swc1 $f20, 0x50($s0) -/* B5F024 80240D74 E6140044 */ swc1 $f20, 0x44($s0) -/* B5F028 80240D78 E6140038 */ swc1 $f20, 0x38($s0) -/* B5F02C 80240D7C 2A220003 */ slti $v0, $s1, 3 -/* B5F030 80240D80 1440FFEC */ bnez $v0, .L80240D34 -/* B5F034 80240D84 26100004 */ addiu $s0, $s0, 4 -/* B5F038 80240D88 0000882D */ daddu $s1, $zero, $zero -/* B5F03C 80240D8C 0240802D */ daddu $s0, $s2, $zero -/* B5F040 80240D90 3C148024 */ lui $s4, %hi(D_80243E58_B62108) -/* B5F044 80240D94 26943E58 */ addiu $s4, $s4, %lo(D_80243E58_B62108) -/* B5F048 80240D98 3C014248 */ lui $at, 0x4248 -/* B5F04C 80240D9C 4481A000 */ mtc1 $at, $f20 -/* B5F050 80240DA0 24130044 */ addiu $s3, $zero, 0x44 -/* B5F054 80240DA4 AE400000 */ sw $zero, ($s2) -/* B5F058 80240DA8 AE400004 */ sw $zero, 4($s2) -/* B5F05C 80240DAC AE400060 */ sw $zero, 0x60($s2) -/* B5F060 80240DB0 AE400064 */ sw $zero, 0x64($s2) -.L80240DB4: -/* B5F064 80240DB4 27A40020 */ addiu $a0, $sp, 0x20 -/* B5F068 80240DB8 4406A000 */ mfc1 $a2, $f20 -/* B5F06C 80240DBC 8E870000 */ lw $a3, ($s4) -/* B5F070 80240DC0 02532821 */ addu $a1, $s2, $s3 -/* B5F074 80240DC4 0C00A7E7 */ jal add_vec2D_polar -/* B5F078 80240DC8 AFA00020 */ sw $zero, 0x20($sp) -/* B5F07C 80240DCC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B5F080 80240DD0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* B5F084 80240DD4 46041082 */ mul.s $f2, $f2, $f4 -/* B5F088 80240DD8 00000000 */ nop -/* B5F08C 80240DDC C7A00018 */ lwc1 $f0, 0x18($sp) -/* B5F090 80240DE0 46040002 */ mul.s $f0, $f0, $f4 -/* B5F094 80240DE4 00000000 */ nop -/* B5F098 80240DE8 E6020038 */ swc1 $f2, 0x38($s0) -/* B5F09C 80240DEC E6000050 */ swc1 $f0, 0x50($s0) -/* B5F0A0 80240DF0 8E42005C */ lw $v0, 0x5c($s2) -/* B5F0A4 80240DF4 C6000038 */ lwc1 $f0, 0x38($s0) -/* B5F0A8 80240DF8 C4420048 */ lwc1 $f2, 0x48($v0) -/* B5F0AC 80240DFC 46001080 */ add.s $f2, $f2, $f0 -/* B5F0B0 80240E00 C6A00038 */ lwc1 $f0, 0x38($s5) -/* B5F0B4 80240E04 46020001 */ sub.s $f0, $f0, $f2 -/* B5F0B8 80240E08 E6000038 */ swc1 $f0, 0x38($s0) -/* B5F0BC 80240E0C 8E42005C */ lw $v0, 0x5c($s2) -/* B5F0C0 80240E10 C6000044 */ lwc1 $f0, 0x44($s0) -/* B5F0C4 80240E14 C442004C */ lwc1 $f2, 0x4c($v0) -/* B5F0C8 80240E18 46001080 */ add.s $f2, $f2, $f0 -/* B5F0CC 80240E1C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* B5F0D0 80240E20 46020001 */ sub.s $f0, $f0, $f2 -/* B5F0D4 80240E24 E6000044 */ swc1 $f0, 0x44($s0) -/* B5F0D8 80240E28 8E42005C */ lw $v0, 0x5c($s2) -/* B5F0DC 80240E2C C6000050 */ lwc1 $f0, 0x50($s0) -/* B5F0E0 80240E30 C4420050 */ lwc1 $f2, 0x50($v0) -/* B5F0E4 80240E34 26940004 */ addiu $s4, $s4, 4 -/* B5F0E8 80240E38 46001080 */ add.s $f2, $f2, $f0 -/* B5F0EC 80240E3C C6A00040 */ lwc1 $f0, 0x40($s5) -/* B5F0F0 80240E40 26730004 */ addiu $s3, $s3, 4 -/* B5F0F4 80240E44 46020001 */ sub.s $f0, $f0, $f2 -/* B5F0F8 80240E48 26310001 */ addiu $s1, $s1, 1 -/* B5F0FC 80240E4C 2A220003 */ slti $v0, $s1, 3 -/* B5F100 80240E50 E6000050 */ swc1 $f0, 0x50($s0) -/* B5F104 80240E54 1440FFD7 */ bnez $v0, .L80240DB4 -/* B5F108 80240E58 26100004 */ addiu $s0, $s0, 4 -.L80240E5C: -/* B5F10C 80240E5C 8ED20060 */ lw $s2, 0x60($s6) -/* B5F110 80240E60 8E430000 */ lw $v1, ($s2) -/* B5F114 80240E64 24020001 */ addiu $v0, $zero, 1 -/* B5F118 80240E68 10620038 */ beq $v1, $v0, .L80240F4C -/* B5F11C 80240E6C 28620002 */ slti $v0, $v1, 2 -/* B5F120 80240E70 50400005 */ beql $v0, $zero, .L80240E88 -/* B5F124 80240E74 24020002 */ addiu $v0, $zero, 2 -/* B5F128 80240E78 10600007 */ beqz $v1, .L80240E98 -/* B5F12C 80240E7C 24040005 */ addiu $a0, $zero, 5 -/* B5F130 80240E80 0809040C */ j .L80241030 -/* B5F134 80240E84 00000000 */ nop -.L80240E88: -/* B5F138 80240E88 10620058 */ beq $v1, $v0, .L80240FEC -/* B5F13C 80240E8C 00000000 */ nop -/* B5F140 80240E90 0809040C */ j .L80241030 -/* B5F144 80240E94 00000000 */ nop -.L80240E98: -/* B5F148 80240E98 0000882D */ daddu $s1, $zero, $zero -/* B5F14C 80240E9C 3C148024 */ lui $s4, %hi(D_80243E58_B62108) -/* B5F150 80240EA0 26943E58 */ addiu $s4, $s4, %lo(D_80243E58_B62108) -/* B5F154 80240EA4 24130020 */ addiu $s3, $zero, 0x20 -/* B5F158 80240EA8 3C064248 */ lui $a2, 0x4248 -/* B5F15C 80240EAC 44800000 */ mtc1 $zero, $f0 -/* B5F160 80240EB0 24020014 */ addiu $v0, $zero, 0x14 -/* B5F164 80240EB4 AFA20010 */ sw $v0, 0x10($sp) -/* B5F168 80240EB8 44050000 */ mfc1 $a1, $f0 -/* B5F16C 80240EBC 8E470060 */ lw $a3, 0x60($s2) -/* B5F170 80240EC0 4485B000 */ mtc1 $a1, $f22 -/* B5F174 80240EC4 0C00A8ED */ jal update_lerp -/* B5F178 80240EC8 0240802D */ daddu $s0, $s2, $zero -/* B5F17C 80240ECC 46000506 */ mov.s $f20, $f0 -.L80240ED0: -/* B5F180 80240ED0 4406A000 */ mfc1 $a2, $f20 -/* B5F184 80240ED4 27A40020 */ addiu $a0, $sp, 0x20 -/* B5F188 80240ED8 E6160020 */ swc1 $f22, 0x20($s0) -/* B5F18C 80240EDC 8E870000 */ lw $a3, ($s4) -/* B5F190 80240EE0 02532821 */ addu $a1, $s2, $s3 -/* B5F194 80240EE4 0C00A7E7 */ jal add_vec2D_polar -/* B5F198 80240EE8 E7B60020 */ swc1 $f22, 0x20($sp) -/* B5F19C 80240EEC C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B5F1A0 80240EF0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* B5F1A4 80240EF4 46002102 */ mul.s $f4, $f4, $f0 -/* B5F1A8 80240EF8 00000000 */ nop -/* B5F1AC 80240EFC C7A20018 */ lwc1 $f2, 0x18($sp) -/* B5F1B0 80240F00 26940004 */ addiu $s4, $s4, 4 -/* B5F1B4 80240F04 46001082 */ mul.s $f2, $f2, $f0 -/* B5F1B8 80240F08 00000000 */ nop -/* B5F1BC 80240F0C 26730004 */ addiu $s3, $s3, 4 -/* B5F1C0 80240F10 26310001 */ addiu $s1, $s1, 1 -/* B5F1C4 80240F14 2A220003 */ slti $v0, $s1, 3 -/* B5F1C8 80240F18 E6040014 */ swc1 $f4, 0x14($s0) -/* B5F1CC 80240F1C E602002C */ swc1 $f2, 0x2c($s0) -/* B5F1D0 80240F20 1440FFEB */ bnez $v0, .L80240ED0 -/* B5F1D4 80240F24 26100004 */ addiu $s0, $s0, 4 -/* B5F1D8 80240F28 8E420060 */ lw $v0, 0x60($s2) -/* B5F1DC 80240F2C 24420001 */ addiu $v0, $v0, 1 -/* B5F1E0 80240F30 AE420060 */ sw $v0, 0x60($s2) -/* B5F1E4 80240F34 28420015 */ slti $v0, $v0, 0x15 -/* B5F1E8 80240F38 1440003D */ bnez $v0, .L80241030 -/* B5F1EC 80240F3C 24020001 */ addiu $v0, $zero, 1 -/* B5F1F0 80240F40 AE420000 */ sw $v0, ($s2) -/* B5F1F4 80240F44 0809040C */ j .L80241030 -/* B5F1F8 80240F48 AE400060 */ sw $zero, 0x60($s2) -.L80240F4C: -/* B5F1FC 80240F4C 0000882D */ daddu $s1, $zero, $zero -/* B5F200 80240F50 3C148024 */ lui $s4, %hi(D_80243E58_B62108) -/* B5F204 80240F54 26943E58 */ addiu $s4, $s4, %lo(D_80243E58_B62108) -/* B5F208 80240F58 24130020 */ addiu $s3, $zero, 0x20 -/* B5F20C 80240F5C 0240802D */ daddu $s0, $s2, $zero -/* B5F210 80240F60 3C014248 */ lui $at, 0x4248 -/* B5F214 80240F64 4481A000 */ mtc1 $at, $f20 -/* B5F218 80240F68 4480B000 */ mtc1 $zero, $f22 -.L80240F6C: -/* B5F21C 80240F6C 4406A000 */ mfc1 $a2, $f20 -/* B5F220 80240F70 27A40020 */ addiu $a0, $sp, 0x20 -/* B5F224 80240F74 E6160020 */ swc1 $f22, 0x20($s0) -/* B5F228 80240F78 8E870000 */ lw $a3, ($s4) -/* B5F22C 80240F7C 02532821 */ addu $a1, $s2, $s3 -/* B5F230 80240F80 0C00A7E7 */ jal add_vec2D_polar -/* B5F234 80240F84 E7B60020 */ swc1 $f22, 0x20($sp) -/* B5F238 80240F88 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B5F23C 80240F8C C7A00020 */ lwc1 $f0, 0x20($sp) -/* B5F240 80240F90 46002102 */ mul.s $f4, $f4, $f0 -/* B5F244 80240F94 00000000 */ nop -/* B5F248 80240F98 C7A20018 */ lwc1 $f2, 0x18($sp) -/* B5F24C 80240F9C 26940004 */ addiu $s4, $s4, 4 -/* B5F250 80240FA0 46001082 */ mul.s $f2, $f2, $f0 -/* B5F254 80240FA4 00000000 */ nop -/* B5F258 80240FA8 26730004 */ addiu $s3, $s3, 4 -/* B5F25C 80240FAC 26310001 */ addiu $s1, $s1, 1 -/* B5F260 80240FB0 2A220003 */ slti $v0, $s1, 3 -/* B5F264 80240FB4 E6040014 */ swc1 $f4, 0x14($s0) -/* B5F268 80240FB8 E602002C */ swc1 $f2, 0x2c($s0) -/* B5F26C 80240FBC 1440FFEB */ bnez $v0, .L80240F6C -/* B5F270 80240FC0 26100004 */ addiu $s0, $s0, 4 -/* B5F274 80240FC4 8E420060 */ lw $v0, 0x60($s2) -/* B5F278 80240FC8 24420001 */ addiu $v0, $v0, 1 -/* B5F27C 80240FCC AE420060 */ sw $v0, 0x60($s2) -/* B5F280 80240FD0 28420010 */ slti $v0, $v0, 0x10 -/* B5F284 80240FD4 14400016 */ bnez $v0, .L80241030 -/* B5F288 80240FD8 2402000F */ addiu $v0, $zero, 0xf -/* B5F28C 80240FDC AE420060 */ sw $v0, 0x60($s2) -/* B5F290 80240FE0 24020002 */ addiu $v0, $zero, 2 -/* B5F294 80240FE4 0809040C */ j .L80241030 -/* B5F298 80240FE8 AE420000 */ sw $v0, ($s2) -.L80240FEC: -/* B5F29C 80240FEC 8E420060 */ lw $v0, 0x60($s2) -/* B5F2A0 80240FF0 24420001 */ addiu $v0, $v0, 1 -/* B5F2A4 80240FF4 AE420060 */ sw $v0, 0x60($s2) -/* B5F2A8 80240FF8 2842001F */ slti $v0, $v0, 0x1f -/* B5F2AC 80240FFC 1440000C */ bnez $v0, .L80241030 -/* B5F2B0 80241000 0000882D */ daddu $s1, $zero, $zero -/* B5F2B4 80241004 0240282D */ daddu $a1, $s2, $zero -.L80241008: -/* B5F2B8 80241008 8CA20008 */ lw $v0, 8($a1) -/* B5F2BC 8024100C 8C430000 */ lw $v1, ($v0) -/* B5F2C0 80241010 26310001 */ addiu $s1, $s1, 1 -/* B5F2C4 80241014 34630010 */ ori $v1, $v1, 0x10 -/* B5F2C8 80241018 AC430000 */ sw $v1, ($v0) -/* B5F2CC 8024101C 2A220003 */ slti $v0, $s1, 3 -/* B5F2D0 80241020 1440FFF9 */ bnez $v0, .L80241008 -/* B5F2D4 80241024 24A50004 */ addiu $a1, $a1, 4 -/* B5F2D8 80241028 08090459 */ j .L80241164 -/* B5F2DC 8024102C 24020002 */ addiu $v0, $zero, 2 -.L80241030: -/* B5F2E0 80241030 8E430004 */ lw $v1, 4($s2) -/* B5F2E4 80241034 10600005 */ beqz $v1, .L8024104C -/* B5F2E8 80241038 24020001 */ addiu $v0, $zero, 1 -/* B5F2EC 8024103C 1062000B */ beq $v1, $v0, .L8024106C -/* B5F2F0 80241040 0000882D */ daddu $s1, $zero, $zero -/* B5F2F4 80241044 08090448 */ j .L80241120 -/* B5F2F8 80241048 0240282D */ daddu $a1, $s2, $zero -.L8024104C: -/* B5F2FC 8024104C 8E420064 */ lw $v0, 0x64($s2) -/* B5F300 80241050 24420001 */ addiu $v0, $v0, 1 -/* B5F304 80241054 AE420064 */ sw $v0, 0x64($s2) -/* B5F308 80241058 28420010 */ slti $v0, $v0, 0x10 -/* B5F30C 8024105C 1440002F */ bnez $v0, .L8024111C -/* B5F310 80241060 0000882D */ daddu $s1, $zero, $zero -/* B5F314 80241064 08090444 */ j .L80241110 -/* B5F318 80241068 24020001 */ addiu $v0, $zero, 1 -.L8024106C: -/* B5F31C 8024106C 4480A000 */ mtc1 $zero, $f20 -/* B5F320 80241070 24130014 */ addiu $s3, $zero, 0x14 -/* B5F324 80241074 0240802D */ daddu $s0, $s2, $zero -.L80241078: -/* B5F328 80241078 4405A000 */ mfc1 $a1, $f20 -/* B5F32C 8024107C AFB30010 */ sw $s3, 0x10($sp) -/* B5F330 80241080 8E060038 */ lw $a2, 0x38($s0) -/* B5F334 80241084 8E470064 */ lw $a3, 0x64($s2) -/* B5F338 80241088 0C00A8ED */ jal update_lerp -/* B5F33C 8024108C 24040001 */ addiu $a0, $zero, 1 -/* B5F340 80241090 C6020014 */ lwc1 $f2, 0x14($s0) -/* B5F344 80241094 46001080 */ add.s $f2, $f2, $f0 -/* B5F348 80241098 4405A000 */ mfc1 $a1, $f20 -/* B5F34C 8024109C E6020014 */ swc1 $f2, 0x14($s0) -/* B5F350 802410A0 AFB30010 */ sw $s3, 0x10($sp) -/* B5F354 802410A4 8E060044 */ lw $a2, 0x44($s0) -/* B5F358 802410A8 8E470064 */ lw $a3, 0x64($s2) -/* B5F35C 802410AC 0C00A8ED */ jal update_lerp -/* B5F360 802410B0 24040001 */ addiu $a0, $zero, 1 -/* B5F364 802410B4 C6020020 */ lwc1 $f2, 0x20($s0) -/* B5F368 802410B8 46001080 */ add.s $f2, $f2, $f0 -/* B5F36C 802410BC 4405A000 */ mfc1 $a1, $f20 -/* B5F370 802410C0 E6020020 */ swc1 $f2, 0x20($s0) -/* B5F374 802410C4 AFB30010 */ sw $s3, 0x10($sp) -/* B5F378 802410C8 8E060050 */ lw $a2, 0x50($s0) -/* B5F37C 802410CC 8E470064 */ lw $a3, 0x64($s2) -/* B5F380 802410D0 0C00A8ED */ jal update_lerp -/* B5F384 802410D4 24040001 */ addiu $a0, $zero, 1 -/* B5F388 802410D8 C602002C */ lwc1 $f2, 0x2c($s0) -/* B5F38C 802410DC 46001080 */ add.s $f2, $f2, $f0 -/* B5F390 802410E0 26310001 */ addiu $s1, $s1, 1 -/* B5F394 802410E4 2A220003 */ slti $v0, $s1, 3 -/* B5F398 802410E8 E602002C */ swc1 $f2, 0x2c($s0) -/* B5F39C 802410EC 1440FFE2 */ bnez $v0, .L80241078 -/* B5F3A0 802410F0 26100004 */ addiu $s0, $s0, 4 -/* B5F3A4 802410F4 8E420064 */ lw $v0, 0x64($s2) -/* B5F3A8 802410F8 24420001 */ addiu $v0, $v0, 1 -/* B5F3AC 802410FC AE420064 */ sw $v0, 0x64($s2) -/* B5F3B0 80241100 28420015 */ slti $v0, $v0, 0x15 -/* B5F3B4 80241104 14400005 */ bnez $v0, .L8024111C -/* B5F3B8 80241108 0000882D */ daddu $s1, $zero, $zero -/* B5F3BC 8024110C 24020002 */ addiu $v0, $zero, 2 -.L80241110: -/* B5F3C0 80241110 AE420004 */ sw $v0, 4($s2) -/* B5F3C4 80241114 AE400064 */ sw $zero, 0x64($s2) -/* B5F3C8 80241118 0000882D */ daddu $s1, $zero, $zero -.L8024111C: -/* B5F3CC 8024111C 0240282D */ daddu $a1, $s2, $zero -.L80241120: -/* B5F3D0 80241120 8CA20008 */ lw $v0, 8($a1) -/* B5F3D4 80241124 C4A00014 */ lwc1 $f0, 0x14($a1) -/* B5F3D8 80241128 8C42000C */ lw $v0, 0xc($v0) -/* B5F3DC 8024112C E4400010 */ swc1 $f0, 0x10($v0) -/* B5F3E0 80241130 8CA20008 */ lw $v0, 8($a1) -/* B5F3E4 80241134 C4A00020 */ lwc1 $f0, 0x20($a1) -/* B5F3E8 80241138 8C42000C */ lw $v0, 0xc($v0) -/* B5F3EC 8024113C 26310001 */ addiu $s1, $s1, 1 -/* B5F3F0 80241140 E4400014 */ swc1 $f0, 0x14($v0) -/* B5F3F4 80241144 8CA20008 */ lw $v0, 8($a1) -/* B5F3F8 80241148 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* B5F3FC 8024114C 8C42000C */ lw $v0, 0xc($v0) -/* B5F400 80241150 E4400018 */ swc1 $f0, 0x18($v0) -/* B5F404 80241154 2A220003 */ slti $v0, $s1, 3 -/* B5F408 80241158 1440FFF1 */ bnez $v0, .L80241120 -/* B5F40C 8024115C 24A50004 */ addiu $a1, $a1, 4 -/* B5F410 80241160 0000102D */ daddu $v0, $zero, $zero -.L80241164: -/* B5F414 80241164 8FBF0044 */ lw $ra, 0x44($sp) -/* B5F418 80241168 8FB60040 */ lw $s6, 0x40($sp) -/* B5F41C 8024116C 8FB5003C */ lw $s5, 0x3c($sp) -/* B5F420 80241170 8FB40038 */ lw $s4, 0x38($sp) -/* B5F424 80241174 8FB30034 */ lw $s3, 0x34($sp) -/* B5F428 80241178 8FB20030 */ lw $s2, 0x30($sp) -/* B5F42C 8024117C 8FB1002C */ lw $s1, 0x2c($sp) -/* B5F430 80241180 8FB00028 */ lw $s0, 0x28($sp) -/* B5F434 80241184 D7B80058 */ ldc1 $f24, 0x58($sp) -/* B5F438 80241188 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B5F43C 8024118C D7B40048 */ ldc1 $f20, 0x48($sp) -/* B5F440 80241190 03E00008 */ jr $ra -/* B5F444 80241194 27BD0060 */ addiu $sp, $sp, 0x60 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 5f77051ce3..937b74f782 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(D_80244CB0_87E890) -/* AF32C8 80240628 24A54CB0 */ addiu $a1, $a1, %lo(D_80244CB0_87E890) +/* AF32C4 80240624 3C058024 */ lui $a1, %hi(tik_07_sixFloats) +/* AF32C8 80240628 24A54CB0 */ addiu $a1, $a1, %lo(tik_07_sixFloats) .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(D_80244CB0_87E890) +/* AF32E8 80240648 3C018024 */ lui $at, %hi(tik_07_sixFloats) /* AF32EC 8024064C 00220821 */ addu $at, $at, $v0 -/* AF32F0 80240650 AC204CB0 */ sw $zero, %lo(D_80244CB0_87E890)($at) +/* AF32F0 80240650 AC204CB0 */ sw $zero, %lo(tik_07_sixFloats)($at) /* AF32F4 80240654 080901A1 */ j .L80240684 /* AF32F8 80240658 00000000 */ nop .L8024065C: -/* AF32FC 8024065C 3C038024 */ lui $v1, %hi(D_80244CB0_87E890) -/* AF3300 80240660 24634CB0 */ addiu $v1, $v1, %lo(D_80244CB0_87E890) +/* AF32FC 8024065C 3C038024 */ lui $v1, %hi(tik_07_sixFloats) +/* AF3300 80240660 24634CB0 */ addiu $v1, $v1, %lo(tik_07_sixFloats) /* 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 7cae326cab..e7bd70be3b 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 @@ -20,11 +20,11 @@ glabel func_802406C4_AF8014 /* AF8034 802406E4 AFB00010 */ sw $s0, 0x10($sp) /* AF8038 802406E8 10A00003 */ beqz $a1, .L802406F8 /* AF803C 802406EC 8EA6000C */ lw $a2, 0xc($s5) -/* AF8040 802406F0 3C018024 */ lui $at, %hi(D_80246558_C60C98) -/* AF8044 802406F4 AC206558 */ sw $zero, %lo(D_80246558_C60C98)($at) +/* AF8040 802406F0 3C018024 */ lui $at, %hi(D_80246558_kkj_19) +/* AF8044 802406F4 AC206558 */ sw $zero, %lo(D_80246558_kkj_19)($at) .L802406F8: -/* AF8048 802406F8 3C038024 */ lui $v1, %hi(D_80246558_C60C98) -/* AF804C 802406FC 8C636558 */ lw $v1, %lo(D_80246558_C60C98)($v1) +/* AF8048 802406F8 3C038024 */ lui $v1, %hi(D_80246558_kkj_19) +/* AF804C 802406FC 8C636558 */ lw $v1, %lo(D_80246558_kkj_19)($v1) /* AF8050 80240700 2C62000D */ sltiu $v0, $v1, 0xd /* AF8054 80240704 104000F1 */ beqz $v0, .L80240ACC_AF841C /* AF8058 80240708 00031080 */ sll $v0, $v1, 2 @@ -133,8 +133,8 @@ glabel func_802406C4_AF8014 /* AF81EC 8024089C 0C05128B */ jal clear_hud_element_flags /* AF81F0 802408A0 24050002 */ addiu $a1, $zero, 2 /* AF81F4 802408A4 24020001 */ addiu $v0, $zero, 1 -/* AF81F8 802408A8 3C018024 */ lui $at, %hi(D_80246558_C60C98) -/* AF81FC 802408AC AC226558 */ sw $v0, %lo(D_80246558_C60C98)($at) +/* AF81F8 802408A8 3C018024 */ lui $at, %hi(D_80246558_kkj_19) +/* AF81FC 802408AC AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) /* AF8200 802408B0 080902B3 */ j .L80240ACC_AF841C /* AF8204 802408B4 AEB40070 */ sw $s4, 0x70($s5) .L802408B8_AF8208: @@ -168,8 +168,8 @@ glabel func_802406C4_AF8014 /* AF8270 80240920 AEA20070 */ sw $v0, 0x70($s5) .L80240924: /* AF8274 80240924 2402000A */ addiu $v0, $zero, 0xa -/* AF8278 80240928 3C018024 */ lui $at, %hi(D_80246558_C60C98) -/* AF827C 8024092C AC226558 */ sw $v0, %lo(D_80246558_C60C98)($at) +/* AF8278 80240928 3C018024 */ lui $at, %hi(D_80246558_kkj_19) +/* AF827C 8024092C AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) /* AF8280 80240930 080902B3 */ j .L80240ACC_AF841C /* AF8284 80240934 00000000 */ nop .L80240938_AF8288: @@ -184,8 +184,8 @@ glabel func_802406C4_AF8014 /* AF82A8 80240958 AC206528 */ sw $zero, %lo(dgb_08_npcGroup_80246528)($at) /* AF82AC 8024095C 3C018024 */ lui $at, %hi(D_8024652C) /* AF82B0 80240960 AC20652C */ sw $zero, %lo(D_8024652C)($at) -/* AF82B4 80240964 3C018024 */ lui $at, %hi(D_80246558_C60C98) -/* AF82B8 80240968 AC226558 */ sw $v0, %lo(D_80246558_C60C98)($at) +/* 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) @@ -257,8 +257,8 @@ glabel func_802406C4_AF8014 /* AF83AC 80240A5C 24020005 */ addiu $v0, $zero, 5 /* AF83B0 80240A60 AC620000 */ sw $v0, ($v1) /* AF83B4 80240A64 2402000C */ addiu $v0, $zero, 0xc -/* AF83B8 80240A68 3C018024 */ lui $at, %hi(D_80246558_C60C98) -/* AF83BC 80240A6C AC226558 */ sw $v0, %lo(D_80246558_C60C98)($at) +/* AF83B8 80240A68 3C018024 */ lui $at, %hi(D_80246558_kkj_19) +/* AF83BC 80240A6C AC226558 */ sw $v0, %lo(D_80246558_kkj_19)($at) /* AF83C0 80240A70 080902B3 */ j .L80240ACC_AF841C /* AF83C4 80240A74 00000000 */ nop .L80240A78_AF83C8: diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s deleted file mode 100644 index c1800513ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_8CECC4 -/* 8CECC4 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CECC8 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* 8CECCC 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* 8CECD0 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CECD4 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* 8CECD8 80240C68 0C00EABB */ jal get_npc_unsafe -/* 8CECDC 80240C6C 84440008 */ lh $a0, 8($v0) -/* 8CECE0 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* 8CECE4 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* 8CECE8 80240C78 24640001 */ addiu $a0, $v1, 1 -/* 8CECEC 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* 8CECF0 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* 8CECF4 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* 8CECF8 80240C88 3C018024 */ lui $at, %hi(D_80241B2C_8CFB9C) -/* 8CECFC 80240C8C 00230821 */ addu $at, $at, $v1 -/* 8CED00 80240C90 C4221B2C */ lwc1 $f2, %lo(D_80241B2C_8CFB9C)($at) -/* 8CED04 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* 8CED08 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* 8CED0C 80240C9C 28630005 */ slti $v1, $v1, 5 -/* 8CED10 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* 8CED14 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* 8CED18 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* 8CED1C 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* 8CED20 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CED24 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8CED28 80240CB8 03E00008 */ jr $ra -/* 8CED2C 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s deleted file mode 100644 index 42fa8e6dca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243458_8D14C8 -.word .L80241418_8CF488, .L80241428_8CF498, .L80241440_8CF4B0, .L80241450_8CF4C0, .L802414D0_8CF540, .L802414D0_8CF540, .L802414D0_8CF540, .L802414D0_8CF540, .L802414D0_8CF540, .L802414D0_8CF540, .L80241468_8CF4D8, .L80241478_8CF4E8, .L80241490_8CF500, .L802414A8_8CF518, .L802414C0_8CF530, 0, 0, 0 - -.section .text - -glabel func_8024130C_8CF37C -/* 8CF37C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8CF380 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* 8CF384 80241314 0080A02D */ daddu $s4, $a0, $zero -/* 8CF388 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* 8CF38C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* 8CF390 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* 8CF394 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* 8CF398 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* 8CF39C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* 8CF3A0 80241330 8E920148 */ lw $s2, 0x148($s4) -/* 8CF3A4 80241334 86440008 */ lh $a0, 8($s2) -/* 8CF3A8 80241338 8E90000C */ lw $s0, 0xc($s4) -/* 8CF3AC 8024133C 0C00EABB */ jal get_npc_unsafe -/* 8CF3B0 80241340 00A0882D */ daddu $s1, $a1, $zero -/* 8CF3B4 80241344 0280202D */ daddu $a0, $s4, $zero -/* 8CF3B8 80241348 8E050000 */ lw $a1, ($s0) -/* 8CF3BC 8024134C 0C0B1EAF */ jal evt_get_variable -/* 8CF3C0 80241350 0040A82D */ daddu $s5, $v0, $zero -/* 8CF3C4 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* 8CF3C8 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3CC 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* 8CF3D0 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* 8CF3D4 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3D8 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* 8CF3DC 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* 8CF3E0 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3E4 80241374 8C630024 */ lw $v1, 0x24($v1) -/* 8CF3E8 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* 8CF3EC 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3F0 80241380 8C630028 */ lw $v1, 0x28($v1) -/* 8CF3F4 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* 8CF3F8 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* 8CF3FC 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF400 80241390 3C0142F0 */ lui $at, 0x42f0 -/* 8CF404 80241394 44810000 */ mtc1 $at, $f0 -/* 8CF408 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* 8CF40C 8024139C 0040802D */ daddu $s0, $v0, $zero -/* 8CF410 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CF414 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* 8CF418 802413A8 12200006 */ beqz $s1, .L802413C4 -/* 8CF41C 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* 8CF420 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* 8CF424 802413B4 0240282D */ daddu $a1, $s2, $zero -/* 8CF428 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8CF42C 802413BC 0C09047A */ jal kmr_05_UnkFunc5 -/* 8CF430 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* 8CF434 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* 8CF438 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* 8CF43C 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 8CF440 802413D0 30620004 */ andi $v0, $v1, 4 -/* 8CF444 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8CF448 802413D8 00000000 */ nop -/* 8CF44C 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* 8CF450 802413E0 1440003C */ bnez $v0, .L802414D4 -/* 8CF454 802413E4 0000102D */ daddu $v0, $zero, $zero -/* 8CF458 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* 8CF45C 802413EC 00621024 */ and $v0, $v1, $v0 -/* 8CF460 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* 8CF464 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* 8CF468 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8CF46C 802413FC 10400034 */ beqz $v0, .L802414D0_8CF540 -/* 8CF470 80241400 00031080 */ sll $v0, $v1, 2 -/* 8CF474 80241404 3C018024 */ lui $at, %hi(jtbl_80243458_8D14C8) -/* 8CF478 80241408 00220821 */ addu $at, $at, $v0 -/* 8CF47C 8024140C 8C223458 */ lw $v0, %lo(jtbl_80243458_8D14C8)($at) -/* 8CF480 80241410 00400008 */ jr $v0 -/* 8CF484 80241414 00000000 */ nop -.L80241418_8CF488: -/* 8CF488 80241418 0280202D */ daddu $a0, $s4, $zero -/* 8CF48C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8CF490 80241420 0C090000 */ jal kmr_05_UnkNpcAIFunc23 -/* 8CF494 80241424 0260302D */ daddu $a2, $s3, $zero -.L80241428_8CF498: -/* 8CF498 80241428 0280202D */ daddu $a0, $s4, $zero -/* 8CF49C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4A0 80241430 0C09006C */ jal kmr_05_UnkNpcAIFunc35 -/* 8CF4A4 80241434 0260302D */ daddu $a2, $s3, $zero -/* 8CF4A8 80241438 08090535 */ j .L802414D4 -/* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero -.L80241440_8CF4B0: -/* 8CF4B0 80241440 0280202D */ daddu $a0, $s4, $zero -/* 8CF4B4 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8CF4B8 80241448 0C0901F6 */ jal kmr_05_UnkNpcAIFunc1 -/* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero -.L80241450_8CF4C0: -/* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero -/* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8CF4C8 80241458 0C090226 */ jal kmr_05_UnkFunc4 -/* 8CF4CC 8024145C 0260302D */ daddu $a2, $s3, $zero -/* 8CF4D0 80241460 08090535 */ j .L802414D4 -/* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero -.L80241468_8CF4D8: -/* 8CF4D8 80241468 0280202D */ daddu $a0, $s4, $zero -/* 8CF4DC 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4E0 80241470 0C0902F7 */ jal kmr_05_UnkNpcAIFunc2 -/* 8CF4E4 80241474 0260302D */ daddu $a2, $s3, $zero -.L80241478_8CF4E8: -/* 8CF4E8 80241478 0280202D */ daddu $a0, $s4, $zero -/* 8CF4EC 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4F0 80241480 0C090315 */ jal func_80240C54_8CECC4 -/* 8CF4F4 80241484 0260302D */ daddu $a2, $s3, $zero -/* 8CF4F8 80241488 08090535 */ j .L802414D4 -/* 8CF4FC 8024148C 0000102D */ daddu $v0, $zero, $zero -.L80241490_8CF500: -/* 8CF500 80241490 0280202D */ daddu $a0, $s4, $zero -/* 8CF504 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8CF508 80241498 0C090330 */ jal kmr_05_UnkNpcAIFunc14 -/* 8CF50C 8024149C 0260302D */ daddu $a2, $s3, $zero -/* 8CF510 802414A0 08090535 */ j .L802414D4 -/* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero -.L802414A8_8CF518: -/* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero -/* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8CF520 802414B0 0C09037D */ jal kmr_05_UnkNpcAIFunc3 -/* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero -/* 8CF528 802414B8 08090535 */ j .L802414D4 -/* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero -.L802414C0_8CF530: -/* 8CF530 802414C0 0280202D */ daddu $a0, $s4, $zero -/* 8CF534 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8CF538 802414C8 0C090396 */ jal kmr_05_UnkFunc6 -/* 8CF53C 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0_8CF540: -/* 8CF540 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* 8CF544 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8CF548 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* 8CF54C 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8CF550 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8CF554 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8CF558 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8CF55C 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8CF560 802414F0 03E00008 */ jr $ra -/* 8CF564 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8CF568 802414F8 00000000 */ nop -/* 8CF56C 802414FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s deleted file mode 100644 index c6902286e7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_8D2164 -/* 8D2164 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D2168 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* 8D216C 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* 8D2170 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D2174 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* 8D2178 80240C68 0C00EABB */ jal get_npc_unsafe -/* 8D217C 80240C6C 84440008 */ lh $a0, 8($v0) -/* 8D2180 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* 8D2184 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* 8D2188 80240C78 24640001 */ addiu $a0, $v1, 1 -/* 8D218C 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* 8D2190 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* 8D2194 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* 8D2198 80240C88 3C018024 */ lui $at, %hi(D_802420BC_8D35CC) -/* 8D219C 80240C8C 00230821 */ addu $at, $at, $v1 -/* 8D21A0 80240C90 C42220BC */ lwc1 $f2, %lo(D_802420BC_8D35CC)($at) -/* 8D21A4 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* 8D21A8 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* 8D21AC 80240C9C 28630005 */ slti $v1, $v1, 5 -/* 8D21B0 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* 8D21B4 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* 8D21B8 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* 8D21BC 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* 8D21C0 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D21C4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8D21C8 80240CB8 03E00008 */ jr $ra -/* 8D21CC 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s deleted file mode 100644 index d0b52b05de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242868_8D3D78 -.word .L80241418_8D2928, .L80241428_8D2938, .L80241440_8D2950, .L80241450_8D2960, .L802414D0_8D29E0, .L802414D0_8D29E0, .L802414D0_8D29E0, .L802414D0_8D29E0, .L802414D0_8D29E0, .L802414D0_8D29E0, .L80241468_8D2978, .L80241478_8D2988, .L80241490_8D29A0, .L802414A8_8D29B8, .L802414C0_8D29D0, 0, 0, 0 - -.section .text - -glabel func_8024130C_8D281C -/* 8D281C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D2820 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* 8D2824 80241314 0080A02D */ daddu $s4, $a0, $zero -/* 8D2828 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* 8D282C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* 8D2830 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D2834 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* 8D2838 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* 8D283C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* 8D2840 80241330 8E920148 */ lw $s2, 0x148($s4) -/* 8D2844 80241334 86440008 */ lh $a0, 8($s2) -/* 8D2848 80241338 8E90000C */ lw $s0, 0xc($s4) -/* 8D284C 8024133C 0C00EABB */ jal get_npc_unsafe -/* 8D2850 80241340 00A0882D */ daddu $s1, $a1, $zero -/* 8D2854 80241344 0280202D */ daddu $a0, $s4, $zero -/* 8D2858 80241348 8E050000 */ lw $a1, ($s0) -/* 8D285C 8024134C 0C0B1EAF */ jal evt_get_variable -/* 8D2860 80241350 0040A82D */ daddu $s5, $v0, $zero -/* 8D2864 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* 8D2868 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D286C 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* 8D2870 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* 8D2874 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D2878 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* 8D287C 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* 8D2880 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D2884 80241374 8C630024 */ lw $v1, 0x24($v1) -/* 8D2888 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* 8D288C 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D2890 80241380 8C630028 */ lw $v1, 0x28($v1) -/* 8D2894 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* 8D2898 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* 8D289C 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D28A0 80241390 3C0142F0 */ lui $at, 0x42f0 -/* 8D28A4 80241394 44810000 */ mtc1 $at, $f0 -/* 8D28A8 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* 8D28AC 8024139C 0040802D */ daddu $s0, $v0, $zero -/* 8D28B0 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D28B4 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* 8D28B8 802413A8 12200006 */ beqz $s1, .L802413C4 -/* 8D28BC 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* 8D28C0 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* 8D28C4 802413B4 0240282D */ daddu $a1, $s2, $zero -/* 8D28C8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D28CC 802413BC 0C09047A */ jal kmr_06_UnkFunc5 -/* 8D28D0 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* 8D28D4 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* 8D28D8 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* 8D28DC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 8D28E0 802413D0 30620004 */ andi $v0, $v1, 4 -/* 8D28E4 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8D28E8 802413D8 00000000 */ nop -/* 8D28EC 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* 8D28F0 802413E0 1440003C */ bnez $v0, .L802414D4 -/* 8D28F4 802413E4 0000102D */ daddu $v0, $zero, $zero -/* 8D28F8 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* 8D28FC 802413EC 00621024 */ and $v0, $v1, $v0 -/* 8D2900 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* 8D2904 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* 8D2908 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8D290C 802413FC 10400034 */ beqz $v0, .L802414D0_8D29E0 -/* 8D2910 80241400 00031080 */ sll $v0, $v1, 2 -/* 8D2914 80241404 3C018024 */ lui $at, %hi(jtbl_80242868_8D3D78) -/* 8D2918 80241408 00220821 */ addu $at, $at, $v0 -/* 8D291C 8024140C 8C222868 */ lw $v0, %lo(jtbl_80242868_8D3D78)($at) -/* 8D2920 80241410 00400008 */ jr $v0 -/* 8D2924 80241414 00000000 */ nop -.L80241418_8D2928: -/* 8D2928 80241418 0280202D */ daddu $a0, $s4, $zero -/* 8D292C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D2930 80241420 0C090000 */ jal kmr_06_UnkNpcAIFunc23 -/* 8D2934 80241424 0260302D */ daddu $a2, $s3, $zero -.L80241428_8D2938: -/* 8D2938 80241428 0280202D */ daddu $a0, $s4, $zero -/* 8D293C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D2940 80241430 0C09006C */ jal kmr_06_UnkNpcAIFunc35 -/* 8D2944 80241434 0260302D */ daddu $a2, $s3, $zero -/* 8D2948 80241438 08090535 */ j .L802414D4 -/* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero -.L80241440_8D2950: -/* 8D2950 80241440 0280202D */ daddu $a0, $s4, $zero -/* 8D2954 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D2958 80241448 0C0901F6 */ jal kmr_06_UnkNpcAIFunc1 -/* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero -.L80241450_8D2960: -/* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero -/* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D2968 80241458 0C090226 */ jal kmr_06_UnkFunc4 -/* 8D296C 8024145C 0260302D */ daddu $a2, $s3, $zero -/* 8D2970 80241460 08090535 */ j .L802414D4 -/* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero -.L80241468_8D2978: -/* 8D2978 80241468 0280202D */ daddu $a0, $s4, $zero -/* 8D297C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D2980 80241470 0C0902F7 */ jal kmr_06_UnkNpcAIFunc2 -/* 8D2984 80241474 0260302D */ daddu $a2, $s3, $zero -.L80241478_8D2988: -/* 8D2988 80241478 0280202D */ daddu $a0, $s4, $zero -/* 8D298C 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8D2990 80241480 0C090315 */ jal func_80240C54_8D2164 -/* 8D2994 80241484 0260302D */ daddu $a2, $s3, $zero -/* 8D2998 80241488 08090535 */ j .L802414D4 -/* 8D299C 8024148C 0000102D */ daddu $v0, $zero, $zero -.L80241490_8D29A0: -/* 8D29A0 80241490 0280202D */ daddu $a0, $s4, $zero -/* 8D29A4 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D29A8 80241498 0C090330 */ jal kmr_06_UnkNpcAIFunc14 -/* 8D29AC 8024149C 0260302D */ daddu $a2, $s3, $zero -/* 8D29B0 802414A0 08090535 */ j .L802414D4 -/* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero -.L802414A8_8D29B8: -/* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero -/* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D29C0 802414B0 0C09037D */ jal kmr_06_UnkNpcAIFunc3 -/* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero -/* 8D29C8 802414B8 08090535 */ j .L802414D4 -/* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero -.L802414C0_8D29D0: -/* 8D29D0 802414C0 0280202D */ daddu $a0, $s4, $zero -/* 8D29D4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D29D8 802414C8 0C090396 */ jal kmr_06_UnkFunc6 -/* 8D29DC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0_8D29E0: -/* 8D29E0 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* 8D29E4 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8D29E8 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* 8D29EC 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8D29F0 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D29F4 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8D29F8 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8D29FC 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8D2A00 802414F0 03E00008 */ jr $ra -/* 8D2A04 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8D2A08 802414F8 00000000 */ nop -/* 8D2A0C 802414FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s deleted file mode 100644 index 9c246a387a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_8D6A54 -/* 8D6A54 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D6A58 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* 8D6A5C 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* 8D6A60 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D6A64 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* 8D6A68 80240C68 0C00EABB */ jal get_npc_unsafe -/* 8D6A6C 80240C6C 84440008 */ lh $a0, 8($v0) -/* 8D6A70 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* 8D6A74 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* 8D6A78 80240C78 24640001 */ addiu $a0, $v1, 1 -/* 8D6A7C 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* 8D6A80 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* 8D6A84 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* 8D6A88 80240C88 3C018024 */ lui $at, %hi(D_8024186C_8D766C) -/* 8D6A8C 80240C8C 00230821 */ addu $at, $at, $v1 -/* 8D6A90 80240C90 C422186C */ lwc1 $f2, %lo(D_8024186C_8D766C)($at) -/* 8D6A94 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* 8D6A98 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* 8D6A9C 80240C9C 28630005 */ slti $v1, $v1, 5 -/* 8D6AA0 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* 8D6AA4 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* 8D6AA8 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* 8D6AAC 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* 8D6AB0 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D6AB4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6AB8 80240CB8 03E00008 */ jr $ra -/* 8D6ABC 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s deleted file mode 100644 index f9691d6f4d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242688_8D8488 -.word .L80241418_8D7218, .L80241428_8D7228, .L80241440_8D7240, .L80241450_8D7250, .L802414D0_8D72D0, .L802414D0_8D72D0, .L802414D0_8D72D0, .L802414D0_8D72D0, .L802414D0_8D72D0, .L802414D0_8D72D0, .L80241468_8D7268, .L80241478_8D7278, .L80241490_8D7290, .L802414A8_8D72A8, .L802414C0_8D72C0, 0, 0, 0 - -.section .text - -glabel func_8024130C_8D710C -/* 8D710C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D7110 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* 8D7114 80241314 0080A02D */ daddu $s4, $a0, $zero -/* 8D7118 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* 8D711C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* 8D7120 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D7124 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* 8D7128 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* 8D712C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* 8D7130 80241330 8E920148 */ lw $s2, 0x148($s4) -/* 8D7134 80241334 86440008 */ lh $a0, 8($s2) -/* 8D7138 80241338 8E90000C */ lw $s0, 0xc($s4) -/* 8D713C 8024133C 0C00EABB */ jal get_npc_unsafe -/* 8D7140 80241340 00A0882D */ daddu $s1, $a1, $zero -/* 8D7144 80241344 0280202D */ daddu $a0, $s4, $zero -/* 8D7148 80241348 8E050000 */ lw $a1, ($s0) -/* 8D714C 8024134C 0C0B1EAF */ jal evt_get_variable -/* 8D7150 80241350 0040A82D */ daddu $s5, $v0, $zero -/* 8D7154 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* 8D7158 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D715C 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* 8D7160 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* 8D7164 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7168 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* 8D716C 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* 8D7170 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7174 80241374 8C630024 */ lw $v1, 0x24($v1) -/* 8D7178 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* 8D717C 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7180 80241380 8C630028 */ lw $v1, 0x28($v1) -/* 8D7184 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* 8D7188 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* 8D718C 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D7190 80241390 3C0142F0 */ lui $at, 0x42f0 -/* 8D7194 80241394 44810000 */ mtc1 $at, $f0 -/* 8D7198 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* 8D719C 8024139C 0040802D */ daddu $s0, $v0, $zero -/* 8D71A0 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D71A4 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* 8D71A8 802413A8 12200006 */ beqz $s1, .L802413C4 -/* 8D71AC 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* 8D71B0 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* 8D71B4 802413B4 0240282D */ daddu $a1, $s2, $zero -/* 8D71B8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D71BC 802413BC 0C09047A */ jal kmr_09_UnkFunc5 -/* 8D71C0 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* 8D71C4 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* 8D71C8 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* 8D71CC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 8D71D0 802413D0 30620004 */ andi $v0, $v1, 4 -/* 8D71D4 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8D71D8 802413D8 00000000 */ nop -/* 8D71DC 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* 8D71E0 802413E0 1440003C */ bnez $v0, .L802414D4 -/* 8D71E4 802413E4 0000102D */ daddu $v0, $zero, $zero -/* 8D71E8 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* 8D71EC 802413EC 00621024 */ and $v0, $v1, $v0 -/* 8D71F0 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* 8D71F4 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* 8D71F8 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8D71FC 802413FC 10400034 */ beqz $v0, .L802414D0_8D72D0 -/* 8D7200 80241400 00031080 */ sll $v0, $v1, 2 -/* 8D7204 80241404 3C018024 */ lui $at, %hi(jtbl_80242688_8D8488) -/* 8D7208 80241408 00220821 */ addu $at, $at, $v0 -/* 8D720C 8024140C 8C222688 */ lw $v0, %lo(jtbl_80242688_8D8488)($at) -/* 8D7210 80241410 00400008 */ jr $v0 -/* 8D7214 80241414 00000000 */ nop -.L80241418_8D7218: -/* 8D7218 80241418 0280202D */ daddu $a0, $s4, $zero -/* 8D721C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D7220 80241420 0C090000 */ jal kmr_09_UnkNpcAIFunc23 -/* 8D7224 80241424 0260302D */ daddu $a2, $s3, $zero -.L80241428_8D7228: -/* 8D7228 80241428 0280202D */ daddu $a0, $s4, $zero -/* 8D722C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D7230 80241430 0C09006C */ jal kmr_09_UnkNpcAIFunc35 -/* 8D7234 80241434 0260302D */ daddu $a2, $s3, $zero -/* 8D7238 80241438 08090535 */ j .L802414D4 -/* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero -.L80241440_8D7240: -/* 8D7240 80241440 0280202D */ daddu $a0, $s4, $zero -/* 8D7244 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D7248 80241448 0C0901F6 */ jal kmr_09_UnkNpcAIFunc1 -/* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero -.L80241450_8D7250: -/* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero -/* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D7258 80241458 0C090226 */ jal kmr_09_UnkFunc4 -/* 8D725C 8024145C 0260302D */ daddu $a2, $s3, $zero -/* 8D7260 80241460 08090535 */ j .L802414D4 -/* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero -.L80241468_8D7268: -/* 8D7268 80241468 0280202D */ daddu $a0, $s4, $zero -/* 8D726C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D7270 80241470 0C0902F7 */ jal kmr_09_UnkNpcAIFunc2 -/* 8D7274 80241474 0260302D */ daddu $a2, $s3, $zero -.L80241478_8D7278: -/* 8D7278 80241478 0280202D */ daddu $a0, $s4, $zero -/* 8D727C 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8D7280 80241480 0C090315 */ jal func_80240C54_8D6A54 -/* 8D7284 80241484 0260302D */ daddu $a2, $s3, $zero -/* 8D7288 80241488 08090535 */ j .L802414D4 -/* 8D728C 8024148C 0000102D */ daddu $v0, $zero, $zero -.L80241490_8D7290: -/* 8D7290 80241490 0280202D */ daddu $a0, $s4, $zero -/* 8D7294 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D7298 80241498 0C090330 */ jal kmr_09_UnkNpcAIFunc14 -/* 8D729C 8024149C 0260302D */ daddu $a2, $s3, $zero -/* 8D72A0 802414A0 08090535 */ j .L802414D4 -/* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero -.L802414A8_8D72A8: -/* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero -/* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D72B0 802414B0 0C09037D */ jal kmr_09_UnkNpcAIFunc3 -/* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero -/* 8D72B8 802414B8 08090535 */ j .L802414D4 -/* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero -.L802414C0_8D72C0: -/* 8D72C0 802414C0 0280202D */ daddu $a0, $s4, $zero -/* 8D72C4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D72C8 802414C8 0C090396 */ jal kmr_09_UnkFunc6 -/* 8D72CC 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0_8D72D0: -/* 8D72D0 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* 8D72D4 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8D72D8 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* 8D72DC 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8D72E0 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D72E4 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8D72E8 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8D72EC 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8D72F0 802414F0 03E00008 */ jr $ra -/* 8D72F4 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s deleted file mode 100644 index 4c6d1295e4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s +++ /dev/null @@ -1,139 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802438E0_A4BEA0 -.double 180.0 - -dlabel D_802438E8_A4BEA8 -.double 75.0 - -dlabel D_802438F0_A4BEB0 -.double 90.0 - -dlabel D_802438F8_A4BEB8 -.double 70.0 - -.section .text - -glabel func_80240A48_A49008 -/* A49008 80240A48 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A4900C 80240A4C AFB00018 */ sw $s0, 0x18($sp) -/* A49010 80240A50 AFBF0024 */ sw $ra, 0x24($sp) -/* A49014 80240A54 AFB20020 */ sw $s2, 0x20($sp) -/* A49018 80240A58 AFB1001C */ sw $s1, 0x1c($sp) -/* A4901C 80240A5C F7B60030 */ sdc1 $f22, 0x30($sp) -/* A49020 80240A60 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A49024 80240A64 8C920148 */ lw $s2, 0x148($a0) -/* A49028 80240A68 4485A000 */ mtc1 $a1, $f20 -/* A4902C 80240A6C 86440008 */ lh $a0, 8($s2) -/* A49030 80240A70 4486B000 */ mtc1 $a2, $f22 -/* A49034 80240A74 0C00EABB */ jal get_npc_unsafe -/* A49038 80240A78 00E0802D */ daddu $s0, $a3, $zero -/* A4903C 80240A7C 0200202D */ daddu $a0, $s0, $zero -/* A49040 80240A80 0040882D */ daddu $s1, $v0, $zero -/* A49044 80240A84 4406A000 */ mfc1 $a2, $f20 -/* A49048 80240A88 4407B000 */ mfc1 $a3, $f22 -/* A4904C 80240A8C 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A49050 80240A90 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A49054 80240A94 3C05800B */ lui $a1, %hi(gCameras) -/* A49058 80240A98 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A4905C 80240A9C AFA00010 */ sw $zero, 0x10($sp) -/* A49060 80240AA0 00031080 */ sll $v0, $v1, 2 -/* A49064 80240AA4 00431021 */ addu $v0, $v0, $v1 -/* A49068 80240AA8 00021080 */ sll $v0, $v0, 2 -/* A4906C 80240AAC 00431023 */ subu $v0, $v0, $v1 -/* A49070 80240AB0 000218C0 */ sll $v1, $v0, 3 -/* A49074 80240AB4 00431021 */ addu $v0, $v0, $v1 -/* A49078 80240AB8 000210C0 */ sll $v0, $v0, 3 -/* A4907C 80240ABC 00458021 */ addu $s0, $v0, $a1 -/* A49080 80240AC0 0C01242D */ jal func_800490B4 -/* A49084 80240AC4 0240282D */ daddu $a1, $s2, $zero -/* A49088 80240AC8 1040004B */ beqz $v0, .L80240BF8 -/* A4908C 80240ACC 2402FFFF */ addiu $v0, $zero, -1 -/* A49090 80240AD0 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A49094 80240AD4 C62E000C */ lwc1 $f14, 0xc($s1) -/* A49098 80240AD8 3C014387 */ lui $at, 0x4387 -/* A4909C 80240ADC 4481A000 */ mtc1 $at, $f20 -/* A490A0 80240AE0 0C00A70A */ jal get_clamped_angle_diff -/* A490A4 80240AE4 00000000 */ nop -/* A490A8 80240AE8 0C00A6C9 */ jal clamp_angle -/* A490AC 80240AEC 46000306 */ mov.s $f12, $f0 -/* A490B0 80240AF0 3C018024 */ lui $at, %hi(D_802438E0_A4BEA0) -/* A490B4 80240AF4 D42238E0 */ ldc1 $f2, %lo(D_802438E0_A4BEA0)($at) -/* A490B8 80240AF8 46000021 */ cvt.d.s $f0, $f0 -/* A490BC 80240AFC 4622003C */ c.lt.d $f0, $f2 -/* A490C0 80240B00 00000000 */ nop -/* A490C4 80240B04 45000003 */ bc1f .L80240B14 -/* A490C8 80240B08 00000000 */ nop -/* A490CC 80240B0C 3C0142B4 */ lui $at, 0x42b4 -/* A490D0 80240B10 4481A000 */ mtc1 $at, $f20 -.L80240B14: -/* A490D4 80240B14 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A490D8 80240B18 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A490DC 80240B1C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A490E0 80240B20 8E020000 */ lw $v0, ($s0) -/* A490E4 80240B24 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A490E8 80240B28 8C460028 */ lw $a2, 0x28($v0) -/* A490EC 80240B2C 0C00A720 */ jal atan2 -/* A490F0 80240B30 8C470030 */ lw $a3, 0x30($v0) -/* A490F4 80240B34 4600A306 */ mov.s $f12, $f20 -/* A490F8 80240B38 0C00A70A */ jal get_clamped_angle_diff -/* A490FC 80240B3C 46000386 */ mov.s $f14, $f0 -/* A49100 80240B40 46000005 */ abs.s $f0, $f0 -/* A49104 80240B44 3C018024 */ lui $at, %hi(D_802438E8_A4BEA8) -/* A49108 80240B48 D42238E8 */ ldc1 $f2, %lo(D_802438E8_A4BEA8)($at) -/* A4910C 80240B4C 46000021 */ cvt.d.s $f0, $f0 -/* A49110 80240B50 4620103C */ c.lt.d $f2, $f0 -/* A49114 80240B54 00000000 */ nop -/* A49118 80240B58 45010027 */ bc1t .L80240BF8 -/* A4911C 80240B5C 2402FFFF */ addiu $v0, $zero, -1 -/* A49120 80240B60 8E020000 */ lw $v0, ($s0) -/* A49124 80240B64 C6200038 */ lwc1 $f0, 0x38($s1) -/* A49128 80240B68 C4420028 */ lwc1 $f2, 0x28($v0) -/* A4912C 80240B6C 44806000 */ mtc1 $zero, $f12 -/* A49130 80240B70 46020001 */ sub.s $f0, $f0, $f2 -/* A49134 80240B74 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A49138 80240B78 8C47002C */ lw $a3, 0x2c($v0) -/* A4913C 80240B7C 46000005 */ abs.s $f0, $f0 -/* A49140 80240B80 44060000 */ mfc1 $a2, $f0 -/* A49144 80240B84 0C00A720 */ jal atan2 -/* A49148 80240B88 00000000 */ nop -/* A4914C 80240B8C 3C018024 */ lui $at, %hi(D_802438F0_A4BEB0) -/* A49150 80240B90 D42238F0 */ ldc1 $f2, %lo(D_802438F0_A4BEB0)($at) -/* A49154 80240B94 46000021 */ cvt.d.s $f0, $f0 -/* A49158 80240B98 46220001 */ sub.d $f0, $f0, $f2 -/* A4915C 80240B9C 3C018024 */ lui $at, %hi(D_802438F8_A4BEB8) -/* A49160 80240BA0 D42238F8 */ ldc1 $f2, %lo(D_802438F8_A4BEB8)($at) -/* A49164 80240BA4 46200020 */ cvt.s.d $f0, $f0 -/* A49168 80240BA8 46000005 */ abs.s $f0, $f0 -/* A4916C 80240BAC 46000021 */ cvt.d.s $f0, $f0 -/* A49170 80240BB0 4620103C */ c.lt.d $f2, $f0 -/* A49174 80240BB4 00000000 */ nop -/* A49178 80240BB8 4501000F */ bc1t .L80240BF8 -/* A4917C 80240BBC 2402FFFF */ addiu $v0, $zero, -1 -/* A49180 80240BC0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A49184 80240BC4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A49188 80240BC8 24020009 */ addiu $v0, $zero, 9 -/* A4918C 80240BCC 10620009 */ beq $v1, $v0, .L80240BF4 -/* A49190 80240BD0 24020007 */ addiu $v0, $zero, 7 -/* A49194 80240BD4 50620008 */ beql $v1, $v0, .L80240BF8 -/* A49198 80240BD8 2402FFFF */ addiu $v0, $zero, -1 -/* A4919C 80240BDC 86440008 */ lh $a0, 8($s2) -/* A491A0 80240BE0 0C00FB3A */ jal get_enemy -/* A491A4 80240BE4 24840001 */ addiu $a0, $a0, 1 -/* A491A8 80240BE8 8C43006C */ lw $v1, 0x6c($v0) -/* A491AC 80240BEC 10600002 */ beqz $v1, .L80240BF8 -/* A491B0 80240BF0 24020001 */ addiu $v0, $zero, 1 -.L80240BF4: -/* A491B4 80240BF4 2402FFFF */ addiu $v0, $zero, -1 -.L80240BF8: -/* A491B8 80240BF8 8FBF0024 */ lw $ra, 0x24($sp) -/* A491BC 80240BFC 8FB20020 */ lw $s2, 0x20($sp) -/* A491C0 80240C00 8FB1001C */ lw $s1, 0x1c($sp) -/* A491C4 80240C04 8FB00018 */ lw $s0, 0x18($sp) -/* A491C8 80240C08 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A491CC 80240C0C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A491D0 80240C10 03E00008 */ jr $ra -/* A491D4 80240C14 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s deleted file mode 100644 index 1c15f66f07..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s +++ /dev/null @@ -1,350 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243900_A4BEC0 -.word .L80240D0C_A492CC, .L80240D3C_A492FC, .L80240F68_A49528, .L80240FAC_A4956C, .L80241004_A495C4, 0 - -dlabel D_80243918_A4BED8 -.double 90.0 - -.section .text - -glabel func_80240C18_A491D8 -/* A491D8 80240C18 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A491DC 80240C1C AFB60378 */ sw $s6, 0x378($sp) -/* A491E0 80240C20 0080B02D */ daddu $s6, $a0, $zero -/* A491E4 80240C24 AFBF037C */ sw $ra, 0x37c($sp) -/* A491E8 80240C28 AFB50374 */ sw $s5, 0x374($sp) -/* A491EC 80240C2C AFB40370 */ sw $s4, 0x370($sp) -/* A491F0 80240C30 AFB3036C */ sw $s3, 0x36c($sp) -/* A491F4 80240C34 AFB20368 */ sw $s2, 0x368($sp) -/* A491F8 80240C38 AFB10364 */ sw $s1, 0x364($sp) -/* A491FC 80240C3C AFB00360 */ sw $s0, 0x360($sp) -/* A49200 80240C40 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A49204 80240C44 8ED20148 */ lw $s2, 0x148($s6) -/* A49208 80240C48 86440008 */ lh $a0, 8($s2) -/* A4920C 80240C4C 0C00EABB */ jal get_npc_unsafe -/* A49210 80240C50 00A0802D */ daddu $s0, $a1, $zero -/* A49214 80240C54 86440008 */ lh $a0, 8($s2) -/* A49218 80240C58 0040882D */ daddu $s1, $v0, $zero -/* A4921C 80240C5C 0C00FB3A */ jal get_enemy -/* A49220 80240C60 2484FFFF */ addiu $a0, $a0, -1 -/* A49224 80240C64 84440008 */ lh $a0, 8($v0) -/* A49228 80240C68 0C00EABB */ jal get_npc_unsafe -/* A4922C 80240C6C 0000A82D */ daddu $s5, $zero, $zero -/* A49230 80240C70 27B30020 */ addiu $s3, $sp, 0x20 -/* A49234 80240C74 16000005 */ bnez $s0, .L80240C8C -/* A49238 80240C78 0040A02D */ daddu $s4, $v0, $zero -/* A4923C 80240C7C 8E4200B0 */ lw $v0, 0xb0($s2) -/* A49240 80240C80 30420004 */ andi $v0, $v0, 4 -/* A49244 80240C84 10400018 */ beqz $v0, .L80240CE8 -/* A49248 80240C88 00000000 */ nop -.L80240C8C: -/* A4924C 80240C8C 3C030024 */ lui $v1, 0x24 -/* A49250 80240C90 34630102 */ ori $v1, $v1, 0x102 -/* A49254 80240C94 3C041620 */ lui $a0, 0x1620 -/* A49258 80240C98 AEC00070 */ sw $zero, 0x70($s6) -/* A4925C 80240C9C 8E220000 */ lw $v0, ($s1) -/* A49260 80240CA0 34840040 */ ori $a0, $a0, 0x40 -/* A49264 80240CA4 A620008E */ sh $zero, 0x8e($s1) -/* A49268 80240CA8 00431025 */ or $v0, $v0, $v1 -/* A4926C 80240CAC AE220000 */ sw $v0, ($s1) -/* A49270 80240CB0 8E420000 */ lw $v0, ($s2) -/* A49274 80240CB4 3C013ECC */ lui $at, 0x3ecc -/* A49278 80240CB8 3421CCCD */ ori $at, $at, 0xcccd -/* A4927C 80240CBC 44810000 */ mtc1 $at, $f0 -/* A49280 80240CC0 00441025 */ or $v0, $v0, $a0 -/* A49284 80240CC4 AE420000 */ sw $v0, ($s2) -/* A49288 80240CC8 E6200054 */ swc1 $f0, 0x54($s1) -/* A4928C 80240CCC E6200058 */ swc1 $f0, 0x58($s1) -/* A49290 80240CD0 8E4300B0 */ lw $v1, 0xb0($s2) -/* A49294 80240CD4 30620004 */ andi $v0, $v1, 4 -/* A49298 80240CD8 10400003 */ beqz $v0, .L80240CE8 -/* A4929C 80240CDC 2402FFFB */ addiu $v0, $zero, -5 -/* A492A0 80240CE0 00621024 */ and $v0, $v1, $v0 -/* A492A4 80240CE4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240CE8: -/* A492A8 80240CE8 8EC30070 */ lw $v1, 0x70($s6) -/* A492AC 80240CEC 2C620005 */ sltiu $v0, $v1, 5 -/* A492B0 80240CF0 10400101 */ beqz $v0, .L802410F8 -/* A492B4 80240CF4 00031080 */ sll $v0, $v1, 2 -/* A492B8 80240CF8 3C018024 */ lui $at, %hi(jtbl_80243900_A4BEC0) -/* A492BC 80240CFC 00220821 */ addu $at, $at, $v0 -/* A492C0 80240D00 8C223900 */ lw $v0, %lo(jtbl_80243900_A4BEC0)($at) -/* A492C4 80240D04 00400008 */ jr $v0 -/* A492C8 80240D08 00000000 */ nop -.L80240D0C_A492CC: -/* A492CC 80240D0C 3C01C47A */ lui $at, 0xc47a -/* A492D0 80240D10 44810000 */ mtc1 $at, $f0 -/* A492D4 80240D14 24020014 */ addiu $v0, $zero, 0x14 -/* A492D8 80240D18 AE400078 */ sw $zero, 0x78($s2) -/* A492DC 80240D1C A62200A6 */ sh $v0, 0xa6($s1) -/* A492E0 80240D20 A62200A8 */ sh $v0, 0xa8($s1) -/* A492E4 80240D24 24020001 */ addiu $v0, $zero, 1 -/* A492E8 80240D28 AE200038 */ sw $zero, 0x38($s1) -/* A492EC 80240D2C AE200040 */ sw $zero, 0x40($s1) -/* A492F0 80240D30 E620003C */ swc1 $f0, 0x3c($s1) -/* A492F4 80240D34 AE40006C */ sw $zero, 0x6c($s2) -/* A492F8 80240D38 AEC20070 */ sw $v0, 0x70($s6) -.L80240D3C_A492FC: -/* A492FC 80240D3C 8E50006C */ lw $s0, 0x6c($s2) -/* A49300 80240D40 24020001 */ addiu $v0, $zero, 1 -/* A49304 80240D44 160200EC */ bne $s0, $v0, .L802410F8 -/* A49308 80240D48 24150002 */ addiu $s5, $zero, 2 -/* A4930C 80240D4C AE55006C */ sw $s5, 0x6c($s2) -/* A49310 80240D50 C6800038 */ lwc1 $f0, 0x38($s4) -/* A49314 80240D54 E6600038 */ swc1 $f0, 0x38($s3) -/* A49318 80240D58 C680003C */ lwc1 $f0, 0x3c($s4) -/* A4931C 80240D5C E660003C */ swc1 $f0, 0x3c($s3) -/* A49320 80240D60 C6800040 */ lwc1 $f0, 0x40($s4) -/* A49324 80240D64 E6600040 */ swc1 $f0, 0x40($s3) -/* A49328 80240D68 C6820034 */ lwc1 $f2, 0x34($s4) -/* A4932C 80240D6C 3C014387 */ lui $at, 0x4387 -/* A49330 80240D70 44810000 */ mtc1 $at, $f0 -/* A49334 80240D74 00000000 */ nop -/* A49338 80240D78 46020001 */ sub.s $f0, $f0, $f2 -/* A4933C 80240D7C C6480074 */ lwc1 $f8, 0x74($s2) -/* A49340 80240D80 46804220 */ cvt.s.w $f8, $f8 -/* A49344 80240D84 44054000 */ mfc1 $a1, $f8 -/* A49348 80240D88 44060000 */ mfc1 $a2, $f0 -/* A4934C 80240D8C 0C00EA95 */ jal npc_move_heading -/* A49350 80240D90 0260202D */ daddu $a0, $s3, $zero -/* A49354 80240D94 C6600038 */ lwc1 $f0, 0x38($s3) -/* A49358 80240D98 E6200038 */ swc1 $f0, 0x38($s1) -/* A4935C 80240D9C C680003C */ lwc1 $f0, 0x3c($s4) -/* A49360 80240DA0 C6420070 */ lwc1 $f2, 0x70($s2) -/* A49364 80240DA4 468010A0 */ cvt.s.w $f2, $f2 -/* A49368 80240DA8 46020000 */ add.s $f0, $f0, $f2 -/* A4936C 80240DAC 3C014024 */ lui $at, 0x4024 -/* A49370 80240DB0 4481A800 */ mtc1 $at, $f21 -/* A49374 80240DB4 4480A000 */ mtc1 $zero, $f20 -/* A49378 80240DB8 E620003C */ swc1 $f0, 0x3c($s1) -/* A4937C 80240DBC C6600040 */ lwc1 $f0, 0x40($s3) -/* A49380 80240DC0 E6200040 */ swc1 $f0, 0x40($s1) -/* A49384 80240DC4 A2500007 */ sb $s0, 7($s2) -/* A49388 80240DC8 C6200038 */ lwc1 $f0, 0x38($s1) -/* A4938C 80240DCC 3C014066 */ lui $at, 0x4066 -/* A49390 80240DD0 34216666 */ ori $at, $at, 0x6666 -/* A49394 80240DD4 44811000 */ mtc1 $at, $f2 -/* A49398 80240DD8 4600020D */ trunc.w.s $f8, $f0 -/* A4939C 80240DDC 44024000 */ mfc1 $v0, $f8 -/* A493A0 80240DE0 00000000 */ nop -/* A493A4 80240DE4 A6420010 */ sh $v0, 0x10($s2) -/* A493A8 80240DE8 C620003C */ lwc1 $f0, 0x3c($s1) -/* A493AC 80240DEC 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A493B0 80240DF0 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A493B4 80240DF4 4600020D */ trunc.w.s $f8, $f0 -/* A493B8 80240DF8 44024000 */ mfc1 $v0, $f8 -/* A493BC 80240DFC 00000000 */ nop -/* A493C0 80240E00 A6420012 */ sh $v0, 0x12($s2) -/* A493C4 80240E04 C6200040 */ lwc1 $f0, 0x40($s1) -/* A493C8 80240E08 8E630000 */ lw $v1, ($s3) -/* A493CC 80240E0C 4600020D */ trunc.w.s $f8, $f0 -/* A493D0 80240E10 44024000 */ mfc1 $v0, $f8 -/* A493D4 80240E14 00000000 */ nop -/* A493D8 80240E18 A6420014 */ sh $v0, 0x14($s2) -/* A493DC 80240E1C E6220018 */ swc1 $f2, 0x18($s1) -/* A493E0 80240E20 C460002C */ lwc1 $f0, 0x2c($v1) -/* A493E4 80240E24 C6220038 */ lwc1 $f2, 0x38($s1) -/* A493E8 80240E28 46000021 */ cvt.d.s $f0, $f0 -/* A493EC 80240E2C 46340000 */ add.d $f0, $f0, $f20 -/* A493F0 80240E30 C4640028 */ lwc1 $f4, 0x28($v1) -/* A493F4 80240E34 44806000 */ mtc1 $zero, $f12 -/* A493F8 80240E38 46041081 */ sub.s $f2, $f2, $f4 -/* A493FC 80240E3C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A49400 80240E40 46200020 */ cvt.s.d $f0, $f0 -/* A49404 80240E44 46001085 */ abs.s $f2, $f2 -/* A49408 80240E48 44070000 */ mfc1 $a3, $f0 -/* A4940C 80240E4C 44061000 */ mfc1 $a2, $f2 -/* A49410 80240E50 0C00A720 */ jal atan2 -/* A49414 80240E54 00000000 */ nop -/* A49418 80240E58 3C018024 */ lui $at, %hi(D_80243918_A4BED8) -/* A4941C 80240E5C D4223918 */ ldc1 $f2, %lo(D_80243918_A4BED8)($at) -/* A49420 80240E60 46000021 */ cvt.d.s $f0, $f0 -/* A49424 80240E64 46220001 */ sub.d $f0, $f0, $f2 -/* A49428 80240E68 46200020 */ cvt.s.d $f0, $f0 -/* A4942C 80240E6C 4600020D */ trunc.w.s $f8, $f0 -/* A49430 80240E70 44044000 */ mfc1 $a0, $f8 -/* A49434 80240E74 00000000 */ nop -/* A49438 80240E78 00042400 */ sll $a0, $a0, 0x10 -/* A4943C 80240E7C 0C00A4F5 */ jal cosine -/* A49440 80240E80 00042403 */ sra $a0, $a0, 0x10 -/* A49444 80240E84 C6220018 */ lwc1 $f2, 0x18($s1) -/* A49448 80240E88 46020002 */ mul.s $f0, $f0, $f2 -/* A4944C 80240E8C 00000000 */ nop -/* A49450 80240E90 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A49454 80240E94 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A49458 80240E98 8E620000 */ lw $v0, ($s3) -/* A4945C 80240E9C E620001C */ swc1 $f0, 0x1c($s1) -/* A49460 80240EA0 8C460028 */ lw $a2, 0x28($v0) -/* A49464 80240EA4 0C00A720 */ jal atan2 -/* A49468 80240EA8 8C470030 */ lw $a3, 0x30($v0) -/* A4946C 80240EAC 8E620000 */ lw $v0, ($s3) -/* A49470 80240EB0 E620000C */ swc1 $f0, 0xc($s1) -/* A49474 80240EB4 C440002C */ lwc1 $f0, 0x2c($v0) -/* A49478 80240EB8 46000021 */ cvt.d.s $f0, $f0 -/* A4947C 80240EBC 46340000 */ add.d $f0, $f0, $f20 -/* A49480 80240EC0 46200020 */ cvt.s.d $f0, $f0 -/* A49484 80240EC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49488 80240EC8 C4400030 */ lwc1 $f0, 0x30($v0) -/* A4948C 80240ECC E7A00014 */ swc1 $f0, 0x14($sp) -/* A49490 80240ED0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A49494 80240ED4 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A49498 80240ED8 8E260040 */ lw $a2, 0x40($s1) -/* A4949C 80240EDC 0C00A7CB */ jal dist3D -/* A494A0 80240EE0 8C470028 */ lw $a3, 0x28($v0) -/* A494A4 80240EE4 C6220018 */ lwc1 $f2, 0x18($s1) -/* A494A8 80240EE8 46020003 */ div.s $f0, $f0, $f2 -/* A494AC 80240EEC 4600020D */ trunc.w.s $f8, $f0 -/* A494B0 80240EF0 44104000 */ mfc1 $s0, $f8 -/* A494B4 80240EF4 00000000 */ nop -/* A494B8 80240EF8 5A000001 */ blezl $s0, .L80240F00 -/* A494BC 80240EFC 24100001 */ addiu $s0, $zero, 1 -.L80240F00: -/* A494C0 80240F00 8E620000 */ lw $v0, ($s3) -/* A494C4 80240F04 C624003C */ lwc1 $f4, 0x3c($s1) -/* A494C8 80240F08 3C014120 */ lui $at, 0x4120 -/* A494CC 80240F0C 44811000 */ mtc1 $at, $f2 -/* A494D0 80240F10 C4400028 */ lwc1 $f0, 0x28($v0) -/* A494D4 80240F14 E7A00010 */ swc1 $f0, 0x10($sp) -/* A494D8 80240F18 C440002C */ lwc1 $f0, 0x2c($v0) -/* A494DC 80240F1C 46020000 */ add.s $f0, $f0, $f2 -/* A494E0 80240F20 3C014160 */ lui $at, 0x4160 -/* A494E4 80240F24 44811000 */ mtc1 $at, $f2 -/* A494E8 80240F28 00000000 */ nop -/* A494EC 80240F2C 46022100 */ add.s $f4, $f4, $f2 -/* A494F0 80240F30 46020000 */ add.s $f0, $f0, $f2 -/* A494F4 80240F34 44062000 */ mfc1 $a2, $f4 -/* A494F8 80240F38 E7A00014 */ swc1 $f0, 0x14($sp) -/* A494FC 80240F3C C4400030 */ lwc1 $f0, 0x30($v0) -/* A49500 80240F40 AFB0001C */ sw $s0, 0x1c($sp) -/* A49504 80240F44 E7A00018 */ swc1 $f0, 0x18($sp) -/* A49508 80240F48 8E250038 */ lw $a1, 0x38($s1) -/* A4950C 80240F4C 8E270040 */ lw $a3, 0x40($s1) -/* A49510 80240F50 0C01BFD4 */ jal fx_shape_spell -/* A49514 80240F54 0000202D */ daddu $a0, $zero, $zero -/* A49518 80240F58 AE420078 */ sw $v0, 0x78($s2) -/* A4951C 80240F5C A630008E */ sh $s0, 0x8e($s1) -/* A49520 80240F60 0809043E */ j .L802410F8 -/* A49524 80240F64 AED50070 */ sw $s5, 0x70($s6) -.L80240F68_A49528: -/* A49528 80240F68 9622008E */ lhu $v0, 0x8e($s1) -/* A4952C 80240F6C 2442FFFF */ addiu $v0, $v0, -1 -/* A49530 80240F70 A622008E */ sh $v0, 0x8e($s1) -/* A49534 80240F74 00021400 */ sll $v0, $v0, 0x10 -/* A49538 80240F78 58400001 */ blezl $v0, .L80240F80 -/* A4953C 80240F7C 24150014 */ addiu $s5, $zero, 0x14 -.L80240F80: -/* A49540 80240F80 16A0000A */ bnez $s5, .L80240FAC_A4956C -/* A49544 80240F84 00000000 */ nop -/* A49548 80240F88 8E250018 */ lw $a1, 0x18($s1) -/* A4954C 80240F8C 8E26000C */ lw $a2, 0xc($s1) -/* A49550 80240F90 0C00EA95 */ jal npc_move_heading -/* A49554 80240F94 0220202D */ daddu $a0, $s1, $zero -/* A49558 80240F98 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4955C 80240F9C C622001C */ lwc1 $f2, 0x1c($s1) -/* A49560 80240FA0 46020000 */ add.s $f0, $f0, $f2 -/* A49564 80240FA4 0809043E */ j .L802410F8 -/* A49568 80240FA8 E620003C */ swc1 $f0, 0x3c($s1) -.L80240FAC_A4956C: -/* A4956C 80240FAC 862200A8 */ lh $v0, 0xa8($s1) -/* A49570 80240FB0 3C013FE0 */ lui $at, 0x3fe0 -/* A49574 80240FB4 44810800 */ mtc1 $at, $f1 -/* A49578 80240FB8 44800000 */ mtc1 $zero, $f0 -/* A4957C 80240FBC 44821000 */ mtc1 $v0, $f2 -/* A49580 80240FC0 00000000 */ nop -/* A49584 80240FC4 468010A1 */ cvt.d.w $f2, $f2 -/* A49588 80240FC8 46201082 */ mul.d $f2, $f2, $f0 -/* A4958C 80240FCC 00000000 */ nop -/* A49590 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A49594 80240FD4 AE20001C */ sw $zero, 0x1c($s1) -/* A49598 80240FD8 46000021 */ cvt.d.s $f0, $f0 -/* A4959C 80240FDC 46220001 */ sub.d $f0, $f0, $f2 -/* A495A0 80240FE0 AE200018 */ sw $zero, 0x18($s1) -/* A495A4 80240FE4 24020003 */ addiu $v0, $zero, 3 -/* A495A8 80240FE8 46200020 */ cvt.s.d $f0, $f0 -/* A495AC 80240FEC E620003C */ swc1 $f0, 0x3c($s1) -/* A495B0 80240FF0 AE42006C */ sw $v0, 0x6c($s2) -/* A495B4 80240FF4 24020004 */ addiu $v0, $zero, 4 -/* A495B8 80240FF8 A620008E */ sh $zero, 0x8e($s1) -/* A495BC 80240FFC 0809043E */ j .L802410F8 -/* A495C0 80241000 AEC20070 */ sw $v0, 0x70($s6) -.L80241004_A495C4: -/* A495C4 80241004 9622008E */ lhu $v0, 0x8e($s1) -/* A495C8 80241008 24420001 */ addiu $v0, $v0, 1 -/* A495CC 8024100C A622008E */ sh $v0, 0x8e($s1) -/* A495D0 80241010 00021400 */ sll $v0, $v0, 0x10 -/* A495D4 80241014 00021C03 */ sra $v1, $v0, 0x10 -/* A495D8 80241018 28620007 */ slti $v0, $v1, 7 -/* A495DC 8024101C 10400027 */ beqz $v0, .L802410BC -/* A495E0 80241020 24020007 */ addiu $v0, $zero, 7 -/* A495E4 80241024 8622008E */ lh $v0, 0x8e($s1) -/* A495E8 80241028 3C01401C */ lui $at, 0x401c -/* A495EC 8024102C 44810800 */ mtc1 $at, $f1 -/* A495F0 80241030 44800000 */ mtc1 $zero, $f0 -/* A495F4 80241034 44822000 */ mtc1 $v0, $f4 -/* A495F8 80241038 00000000 */ nop -/* A495FC 8024103C 46802120 */ cvt.s.w $f4, $f4 -/* A49600 80241040 46002121 */ cvt.d.s $f4, $f4 -/* A49604 80241044 46202102 */ mul.d $f4, $f4, $f0 -/* A49608 80241048 00000000 */ nop -/* A4960C 8024104C 44821000 */ mtc1 $v0, $f2 -/* A49610 80241050 00000000 */ nop -/* A49614 80241054 468010A0 */ cvt.s.w $f2, $f2 -/* A49618 80241058 460010A1 */ cvt.d.s $f2, $f2 -/* A4961C 8024105C 46201082 */ mul.d $f2, $f2, $f0 -/* A49620 80241060 00000000 */ nop -/* A49624 80241064 C620003C */ lwc1 $f0, 0x3c($s1) -/* A49628 80241068 3C01400C */ lui $at, 0x400c -/* A4962C 8024106C 44813800 */ mtc1 $at, $f7 -/* A49630 80241070 44803000 */ mtc1 $zero, $f6 -/* A49634 80241074 46000021 */ cvt.d.s $f0, $f0 -/* A49638 80241078 46260001 */ sub.d $f0, $f0, $f6 -/* A4963C 8024107C 3C014034 */ lui $at, 0x4034 -/* A49640 80241080 44813800 */ mtc1 $at, $f7 -/* A49644 80241084 44803000 */ mtc1 $zero, $f6 -/* A49648 80241088 00000000 */ nop -/* A4964C 8024108C 46262100 */ add.d $f4, $f4, $f6 -/* A49650 80241090 46200020 */ cvt.s.d $f0, $f0 -/* A49654 80241094 E620003C */ swc1 $f0, 0x3c($s1) -/* A49658 80241098 46261080 */ add.d $f2, $f2, $f6 -/* A4965C 8024109C 4620220D */ trunc.w.d $f8, $f4 -/* A49660 802410A0 44024000 */ mfc1 $v0, $f8 -/* A49664 802410A4 00000000 */ nop -/* A49668 802410A8 A62200A6 */ sh $v0, 0xa6($s1) -/* A4966C 802410AC 4620120D */ trunc.w.d $f8, $f2 -/* A49670 802410B0 44024000 */ mfc1 $v0, $f8 -/* A49674 802410B4 0809043E */ j .L802410F8 -/* A49678 802410B8 A62200A8 */ sh $v0, 0xa8($s1) -.L802410BC: -/* A4967C 802410BC 1462000A */ bne $v1, $v0, .L802410E8 -/* A49680 802410C0 28620010 */ slti $v0, $v1, 0x10 -/* A49684 802410C4 3C01C47A */ lui $at, 0xc47a -/* A49688 802410C8 44810000 */ mtc1 $at, $f0 -/* A4968C 802410CC 24020014 */ addiu $v0, $zero, 0x14 -/* A49690 802410D0 AE200038 */ sw $zero, 0x38($s1) -/* A49694 802410D4 AE200040 */ sw $zero, 0x40($s1) -/* A49698 802410D8 A62200A6 */ sh $v0, 0xa6($s1) -/* A4969C 802410DC A62200A8 */ sh $v0, 0xa8($s1) -/* A496A0 802410E0 0809043E */ j .L802410F8 -/* A496A4 802410E4 E620003C */ swc1 $f0, 0x3c($s1) -.L802410E8: -/* A496A8 802410E8 14400003 */ bnez $v0, .L802410F8 -/* A496AC 802410EC 00000000 */ nop -/* A496B0 802410F0 AE40006C */ sw $zero, 0x6c($s2) -/* A496B4 802410F4 AEC00070 */ sw $zero, 0x70($s6) -.L802410F8: -/* A496B8 802410F8 8FBF037C */ lw $ra, 0x37c($sp) -/* A496BC 802410FC 8FB60378 */ lw $s6, 0x378($sp) -/* A496C0 80241100 8FB50374 */ lw $s5, 0x374($sp) -/* A496C4 80241104 8FB40370 */ lw $s4, 0x370($sp) -/* A496C8 80241108 8FB3036C */ lw $s3, 0x36c($sp) -/* A496CC 8024110C 8FB20368 */ lw $s2, 0x368($sp) -/* A496D0 80241110 8FB10364 */ lw $s1, 0x364($sp) -/* A496D4 80241114 8FB00360 */ lw $s0, 0x360($sp) -/* A496D8 80241118 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A496DC 8024111C 0000102D */ daddu $v0, $zero, $zero -/* A496E0 80241120 03E00008 */ jr $ra -/* A496E4 80241124 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241128_A496E8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241128_A496E8.s deleted file mode 100644 index 06a8a90cd1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241128_A496E8.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241128_A496E8 -/* A496E8 80241128 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A496EC 8024112C AFB10014 */ sw $s1, 0x14($sp) -/* A496F0 80241130 0080882D */ daddu $s1, $a0, $zero -/* A496F4 80241134 AFBF0018 */ sw $ra, 0x18($sp) -/* A496F8 80241138 AFB00010 */ sw $s0, 0x10($sp) -/* A496FC 8024113C 8E300148 */ lw $s0, 0x148($s1) -/* A49700 80241140 0C00EABB */ jal get_npc_unsafe -/* A49704 80241144 86040008 */ lh $a0, 8($s0) -/* A49708 80241148 0040282D */ daddu $a1, $v0, $zero -/* A4970C 8024114C 94A2008E */ lhu $v0, 0x8e($a1) -/* A49710 80241150 2442FFFF */ addiu $v0, $v0, -1 -/* A49714 80241154 A4A2008E */ sh $v0, 0x8e($a1) -/* A49718 80241158 00021400 */ sll $v0, $v0, 0x10 -/* A4971C 8024115C 1C40000A */ bgtz $v0, .L80241188 -/* A49720 80241160 2404FFFD */ addiu $a0, $zero, -3 -/* A49724 80241164 8E0300CC */ lw $v1, 0xcc($s0) -/* A49728 80241168 8CA20000 */ lw $v0, ($a1) -/* A4972C 8024116C 8C630000 */ lw $v1, ($v1) -/* A49730 80241170 00441024 */ and $v0, $v0, $a0 -/* A49734 80241174 ACA20000 */ sw $v0, ($a1) -/* A49738 80241178 24020001 */ addiu $v0, $zero, 1 -/* A4973C 8024117C A4A0008E */ sh $zero, 0x8e($a1) -/* A49740 80241180 ACA30028 */ sw $v1, 0x28($a1) -/* A49744 80241184 AE220070 */ sw $v0, 0x70($s1) -.L80241188: -/* A49748 80241188 8FBF0018 */ lw $ra, 0x18($sp) -/* A4974C 8024118C 8FB10014 */ lw $s1, 0x14($sp) -/* A49750 80241190 8FB00010 */ lw $s0, 0x10($sp) -/* A49754 80241194 03E00008 */ jr $ra -/* A49758 80241198 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s deleted file mode 100644 index 6169da9aa8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C8_A49888 -/* A49888 802412C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4988C 802412CC AFB10014 */ sw $s1, 0x14($sp) -/* A49890 802412D0 0080882D */ daddu $s1, $a0, $zero -/* A49894 802412D4 AFBF0018 */ sw $ra, 0x18($sp) -/* A49898 802412D8 AFB00010 */ sw $s0, 0x10($sp) -/* A4989C 802412DC 8E220148 */ lw $v0, 0x148($s1) -/* A498A0 802412E0 0C00EABB */ jal get_npc_unsafe -/* A498A4 802412E4 84440008 */ lh $a0, 8($v0) -/* A498A8 802412E8 24040064 */ addiu $a0, $zero, 0x64 -/* A498AC 802412EC 0C00A67F */ jal rand_int -/* A498B0 802412F0 0040802D */ daddu $s0, $v0, $zero -/* A498B4 802412F4 00021FC2 */ srl $v1, $v0, 0x1f -/* A498B8 802412F8 00431821 */ addu $v1, $v0, $v1 -/* A498BC 802412FC 00031843 */ sra $v1, $v1, 1 -/* A498C0 80241300 00031840 */ sll $v1, $v1, 1 -/* A498C4 80241304 00431023 */ subu $v0, $v0, $v1 -/* A498C8 80241308 3C014334 */ lui $at, 0x4334 -/* A498CC 8024130C 44811000 */ mtc1 $at, $f2 -/* A498D0 80241310 44820000 */ mtc1 $v0, $f0 -/* A498D4 80241314 00000000 */ nop -/* A498D8 80241318 46800020 */ cvt.s.w $f0, $f0 -/* A498DC 8024131C 46020002 */ mul.s $f0, $f0, $f2 -/* A498E0 80241320 00000000 */ nop -/* A498E4 80241324 3C013F4C */ lui $at, 0x3f4c -/* A498E8 80241328 3421CCCD */ ori $at, $at, 0xcccd -/* A498EC 8024132C 44812000 */ mtc1 $at, $f4 -/* A498F0 80241330 3C0142B4 */ lui $at, 0x42b4 -/* A498F4 80241334 44811000 */ mtc1 $at, $f2 -/* A498F8 80241338 2402000F */ addiu $v0, $zero, 0xf -/* A498FC 8024133C A602008E */ sh $v0, 0x8e($s0) -/* A49900 80241340 46020000 */ add.s $f0, $f0, $f2 -/* A49904 80241344 24020006 */ addiu $v0, $zero, 6 -/* A49908 80241348 E6040018 */ swc1 $f4, 0x18($s0) -/* A4990C 8024134C E600000C */ swc1 $f0, 0xc($s0) -/* A49910 80241350 AE220070 */ sw $v0, 0x70($s1) -/* A49914 80241354 8FBF0018 */ lw $ra, 0x18($sp) -/* A49918 80241358 8FB10014 */ lw $s1, 0x14($sp) -/* A4991C 8024135C 8FB00010 */ lw $s0, 0x10($sp) -/* A49920 80241360 03E00008 */ jr $ra -/* A49924 80241364 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0_A49C70.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0_A49C70.s deleted file mode 100644 index 78e0a04fba..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0_A49C70.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416B0_A49C70 -/* A49C70 802416B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A49C74 802416B4 AFB00010 */ sw $s0, 0x10($sp) -/* A49C78 802416B8 0080802D */ daddu $s0, $a0, $zero -/* A49C7C 802416BC AFBF0014 */ sw $ra, 0x14($sp) -/* A49C80 802416C0 8E020148 */ lw $v0, 0x148($s0) -/* A49C84 802416C4 0C00EABB */ jal get_npc_unsafe -/* A49C88 802416C8 84440008 */ lh $a0, 8($v0) -/* A49C8C 802416CC 24030028 */ addiu $v1, $zero, 0x28 -/* A49C90 802416D0 A443008E */ sh $v1, 0x8e($v0) -/* A49C94 802416D4 24020015 */ addiu $v0, $zero, 0x15 -/* A49C98 802416D8 AE020070 */ sw $v0, 0x70($s0) -/* A49C9C 802416DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A49CA0 802416E0 8FB00010 */ lw $s0, 0x10($sp) -/* A49CA4 802416E4 03E00008 */ jr $ra -/* A49CA8 802416E8 27BD0018 */ addiu $sp, $sp, 0x18 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 index 748826c2c5..538bcc8c34 100644 --- 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 @@ -58,7 +58,7 @@ glabel func_802416EC_A49CAC .L802417C0: /* A49D80 802417C0 8E450024 */ lw $a1, 0x24($s2) /* A49D84 802417C4 8E460028 */ lw $a2, 0x28($s2) -/* A49D88 802417C8 0C090292 */ jal func_80240A48_A49008 +/* 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 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 index 2629148e22..5d1ae0ae11 100644 --- 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 @@ -25,7 +25,7 @@ glabel func_80241918_A49ED8 /* 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 func_80240A48_A49008 +/* 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 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 index d6615e872d..dd1d372648 100644 --- 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 @@ -98,7 +98,7 @@ glabel func_80241AB4_A4A074 .L80241C00_A4A1C0: /* A4A1C0 80241C00 02A0202D */ daddu $a0, $s5, $zero /* A4A1C4 80241C04 0260282D */ daddu $a1, $s3, $zero -/* A4A1C8 80241C08 0C09044A */ jal func_80241128_A496E8 +/* 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 @@ -114,7 +114,7 @@ glabel func_80241AB4_A4A074 .L80241C38_A4A1F8: /* A4A1F8 80241C38 02A0202D */ daddu $a0, $s5, $zero /* A4A1FC 80241C3C 0260282D */ daddu $a1, $s3, $zero -/* A4A200 80241C40 0C0904B2 */ jal func_802412C8_A49888 +/* A4A200 80241C40 0C0904B2 */ jal kpa_03_UnkFunc59 /* A4A204 80241C44 0280302D */ daddu $a2, $s4, $zero .L80241C48_A4A208: /* A4A208 80241C48 02A0202D */ daddu $a0, $s5, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s deleted file mode 100644 index 3b3517475b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s +++ /dev/null @@ -1,139 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242520_A4EF40 -.double 180.0 - -dlabel D_80242528_A4EF48 -.double 75.0 - -dlabel D_80242530_A4EF50 -.double 90.0 - -dlabel D_80242538_A4EF58 -.double 70.0 - -.section .text - -glabel func_802400A0_A4CAC0 -/* A4CAC0 802400A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A4CAC4 802400A4 AFB00018 */ sw $s0, 0x18($sp) -/* A4CAC8 802400A8 AFBF0024 */ sw $ra, 0x24($sp) -/* A4CACC 802400AC AFB20020 */ sw $s2, 0x20($sp) -/* A4CAD0 802400B0 AFB1001C */ sw $s1, 0x1c($sp) -/* A4CAD4 802400B4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A4CAD8 802400B8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A4CADC 802400BC 8C920148 */ lw $s2, 0x148($a0) -/* A4CAE0 802400C0 4485A000 */ mtc1 $a1, $f20 -/* A4CAE4 802400C4 86440008 */ lh $a0, 8($s2) -/* A4CAE8 802400C8 4486B000 */ mtc1 $a2, $f22 -/* A4CAEC 802400CC 0C00EABB */ jal get_npc_unsafe -/* A4CAF0 802400D0 00E0802D */ daddu $s0, $a3, $zero -/* A4CAF4 802400D4 0200202D */ daddu $a0, $s0, $zero -/* A4CAF8 802400D8 0040882D */ daddu $s1, $v0, $zero -/* A4CAFC 802400DC 4406A000 */ mfc1 $a2, $f20 -/* A4CB00 802400E0 4407B000 */ mfc1 $a3, $f22 -/* A4CB04 802400E4 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A4CB08 802400E8 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A4CB0C 802400EC 3C05800B */ lui $a1, %hi(gCameras) -/* A4CB10 802400F0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A4CB14 802400F4 AFA00010 */ sw $zero, 0x10($sp) -/* A4CB18 802400F8 00031080 */ sll $v0, $v1, 2 -/* A4CB1C 802400FC 00431021 */ addu $v0, $v0, $v1 -/* A4CB20 80240100 00021080 */ sll $v0, $v0, 2 -/* A4CB24 80240104 00431023 */ subu $v0, $v0, $v1 -/* A4CB28 80240108 000218C0 */ sll $v1, $v0, 3 -/* A4CB2C 8024010C 00431021 */ addu $v0, $v0, $v1 -/* A4CB30 80240110 000210C0 */ sll $v0, $v0, 3 -/* A4CB34 80240114 00458021 */ addu $s0, $v0, $a1 -/* A4CB38 80240118 0C01242D */ jal func_800490B4 -/* A4CB3C 8024011C 0240282D */ daddu $a1, $s2, $zero -/* A4CB40 80240120 1040004B */ beqz $v0, .L80240250 -/* A4CB44 80240124 2402FFFF */ addiu $v0, $zero, -1 -/* A4CB48 80240128 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A4CB4C 8024012C C62E000C */ lwc1 $f14, 0xc($s1) -/* A4CB50 80240130 3C014387 */ lui $at, 0x4387 -/* A4CB54 80240134 4481A000 */ mtc1 $at, $f20 -/* A4CB58 80240138 0C00A70A */ jal get_clamped_angle_diff -/* A4CB5C 8024013C 00000000 */ nop -/* A4CB60 80240140 0C00A6C9 */ jal clamp_angle -/* A4CB64 80240144 46000306 */ mov.s $f12, $f0 -/* A4CB68 80240148 3C018024 */ lui $at, %hi(D_80242520_A4EF40) -/* A4CB6C 8024014C D4222520 */ ldc1 $f2, %lo(D_80242520_A4EF40)($at) -/* A4CB70 80240150 46000021 */ cvt.d.s $f0, $f0 -/* A4CB74 80240154 4622003C */ c.lt.d $f0, $f2 -/* A4CB78 80240158 00000000 */ nop -/* A4CB7C 8024015C 45000003 */ bc1f .L8024016C -/* A4CB80 80240160 00000000 */ nop -/* A4CB84 80240164 3C0142B4 */ lui $at, 0x42b4 -/* A4CB88 80240168 4481A000 */ mtc1 $at, $f20 -.L8024016C: -/* A4CB8C 8024016C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A4CB90 80240170 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A4CB94 80240174 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4CB98 80240178 8E020000 */ lw $v0, ($s0) -/* A4CB9C 8024017C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A4CBA0 80240180 8C460028 */ lw $a2, 0x28($v0) -/* A4CBA4 80240184 0C00A720 */ jal atan2 -/* A4CBA8 80240188 8C470030 */ lw $a3, 0x30($v0) -/* A4CBAC 8024018C 4600A306 */ mov.s $f12, $f20 -/* A4CBB0 80240190 0C00A70A */ jal get_clamped_angle_diff -/* A4CBB4 80240194 46000386 */ mov.s $f14, $f0 -/* A4CBB8 80240198 46000005 */ abs.s $f0, $f0 -/* A4CBBC 8024019C 3C018024 */ lui $at, %hi(D_80242528_A4EF48) -/* A4CBC0 802401A0 D4222528 */ ldc1 $f2, %lo(D_80242528_A4EF48)($at) -/* A4CBC4 802401A4 46000021 */ cvt.d.s $f0, $f0 -/* A4CBC8 802401A8 4620103C */ c.lt.d $f2, $f0 -/* A4CBCC 802401AC 00000000 */ nop -/* A4CBD0 802401B0 45010027 */ bc1t .L80240250 -/* A4CBD4 802401B4 2402FFFF */ addiu $v0, $zero, -1 -/* A4CBD8 802401B8 8E020000 */ lw $v0, ($s0) -/* A4CBDC 802401BC C6200038 */ lwc1 $f0, 0x38($s1) -/* A4CBE0 802401C0 C4420028 */ lwc1 $f2, 0x28($v0) -/* A4CBE4 802401C4 44806000 */ mtc1 $zero, $f12 -/* A4CBE8 802401C8 46020001 */ sub.s $f0, $f0, $f2 -/* A4CBEC 802401CC C62E003C */ lwc1 $f14, 0x3c($s1) -/* A4CBF0 802401D0 8C47002C */ lw $a3, 0x2c($v0) -/* A4CBF4 802401D4 46000005 */ abs.s $f0, $f0 -/* A4CBF8 802401D8 44060000 */ mfc1 $a2, $f0 -/* A4CBFC 802401DC 0C00A720 */ jal atan2 -/* A4CC00 802401E0 00000000 */ nop -/* A4CC04 802401E4 3C018024 */ lui $at, %hi(D_80242530_A4EF50) -/* A4CC08 802401E8 D4222530 */ ldc1 $f2, %lo(D_80242530_A4EF50)($at) -/* A4CC0C 802401EC 46000021 */ cvt.d.s $f0, $f0 -/* A4CC10 802401F0 46220001 */ sub.d $f0, $f0, $f2 -/* A4CC14 802401F4 3C018024 */ lui $at, %hi(D_80242538_A4EF58) -/* A4CC18 802401F8 D4222538 */ ldc1 $f2, %lo(D_80242538_A4EF58)($at) -/* A4CC1C 802401FC 46200020 */ cvt.s.d $f0, $f0 -/* A4CC20 80240200 46000005 */ abs.s $f0, $f0 -/* A4CC24 80240204 46000021 */ cvt.d.s $f0, $f0 -/* A4CC28 80240208 4620103C */ c.lt.d $f2, $f0 -/* A4CC2C 8024020C 00000000 */ nop -/* A4CC30 80240210 4501000F */ bc1t .L80240250 -/* A4CC34 80240214 2402FFFF */ addiu $v0, $zero, -1 -/* A4CC38 80240218 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A4CC3C 8024021C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A4CC40 80240220 24020009 */ addiu $v0, $zero, 9 -/* A4CC44 80240224 10620009 */ beq $v1, $v0, .L8024024C -/* A4CC48 80240228 24020007 */ addiu $v0, $zero, 7 -/* A4CC4C 8024022C 50620008 */ beql $v1, $v0, .L80240250 -/* A4CC50 80240230 2402FFFF */ addiu $v0, $zero, -1 -/* A4CC54 80240234 86440008 */ lh $a0, 8($s2) -/* A4CC58 80240238 0C00FB3A */ jal get_enemy -/* A4CC5C 8024023C 24840001 */ addiu $a0, $a0, 1 -/* A4CC60 80240240 8C43006C */ lw $v1, 0x6c($v0) -/* A4CC64 80240244 10600002 */ beqz $v1, .L80240250 -/* A4CC68 80240248 24020001 */ addiu $v0, $zero, 1 -.L8024024C: -/* A4CC6C 8024024C 2402FFFF */ addiu $v0, $zero, -1 -.L80240250: -/* A4CC70 80240250 8FBF0024 */ lw $ra, 0x24($sp) -/* A4CC74 80240254 8FB20020 */ lw $s2, 0x20($sp) -/* A4CC78 80240258 8FB1001C */ lw $s1, 0x1c($sp) -/* A4CC7C 8024025C 8FB00018 */ lw $s0, 0x18($sp) -/* A4CC80 80240260 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A4CC84 80240264 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A4CC88 80240268 03E00008 */ jr $ra -/* A4CC8C 8024026C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s deleted file mode 100644 index 7fd79bee7d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s +++ /dev/null @@ -1,350 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242540_A4EF60 -.word .L80240364_A4CD84, .L80240394_A4CDB4, .L802405C0_A4CFE0, .L80240604_A4D024, .L8024065C_A4D07C, 0 - -dlabel D_80242558_A4EF78 -.double 90.0 - -.section .text - -glabel func_80240270_A4CC90 -/* A4CC90 80240270 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A4CC94 80240274 AFB60378 */ sw $s6, 0x378($sp) -/* A4CC98 80240278 0080B02D */ daddu $s6, $a0, $zero -/* A4CC9C 8024027C AFBF037C */ sw $ra, 0x37c($sp) -/* A4CCA0 80240280 AFB50374 */ sw $s5, 0x374($sp) -/* A4CCA4 80240284 AFB40370 */ sw $s4, 0x370($sp) -/* A4CCA8 80240288 AFB3036C */ sw $s3, 0x36c($sp) -/* A4CCAC 8024028C AFB20368 */ sw $s2, 0x368($sp) -/* A4CCB0 80240290 AFB10364 */ sw $s1, 0x364($sp) -/* A4CCB4 80240294 AFB00360 */ sw $s0, 0x360($sp) -/* A4CCB8 80240298 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A4CCBC 8024029C 8ED20148 */ lw $s2, 0x148($s6) -/* A4CCC0 802402A0 86440008 */ lh $a0, 8($s2) -/* A4CCC4 802402A4 0C00EABB */ jal get_npc_unsafe -/* A4CCC8 802402A8 00A0802D */ daddu $s0, $a1, $zero -/* A4CCCC 802402AC 86440008 */ lh $a0, 8($s2) -/* A4CCD0 802402B0 0040882D */ daddu $s1, $v0, $zero -/* A4CCD4 802402B4 0C00FB3A */ jal get_enemy -/* A4CCD8 802402B8 2484FFFF */ addiu $a0, $a0, -1 -/* A4CCDC 802402BC 84440008 */ lh $a0, 8($v0) -/* A4CCE0 802402C0 0C00EABB */ jal get_npc_unsafe -/* A4CCE4 802402C4 0000A82D */ daddu $s5, $zero, $zero -/* A4CCE8 802402C8 27B30020 */ addiu $s3, $sp, 0x20 -/* A4CCEC 802402CC 16000005 */ bnez $s0, .L802402E4 -/* A4CCF0 802402D0 0040A02D */ daddu $s4, $v0, $zero -/* A4CCF4 802402D4 8E4200B0 */ lw $v0, 0xb0($s2) -/* A4CCF8 802402D8 30420004 */ andi $v0, $v0, 4 -/* A4CCFC 802402DC 10400018 */ beqz $v0, .L80240340 -/* A4CD00 802402E0 00000000 */ nop -.L802402E4: -/* A4CD04 802402E4 3C030024 */ lui $v1, 0x24 -/* A4CD08 802402E8 34630102 */ ori $v1, $v1, 0x102 -/* A4CD0C 802402EC 3C041620 */ lui $a0, 0x1620 -/* A4CD10 802402F0 AEC00070 */ sw $zero, 0x70($s6) -/* A4CD14 802402F4 8E220000 */ lw $v0, ($s1) -/* A4CD18 802402F8 34840040 */ ori $a0, $a0, 0x40 -/* A4CD1C 802402FC A620008E */ sh $zero, 0x8e($s1) -/* A4CD20 80240300 00431025 */ or $v0, $v0, $v1 -/* A4CD24 80240304 AE220000 */ sw $v0, ($s1) -/* A4CD28 80240308 8E420000 */ lw $v0, ($s2) -/* A4CD2C 8024030C 3C013ECC */ lui $at, 0x3ecc -/* A4CD30 80240310 3421CCCD */ ori $at, $at, 0xcccd -/* A4CD34 80240314 44810000 */ mtc1 $at, $f0 -/* A4CD38 80240318 00441025 */ or $v0, $v0, $a0 -/* A4CD3C 8024031C AE420000 */ sw $v0, ($s2) -/* A4CD40 80240320 E6200054 */ swc1 $f0, 0x54($s1) -/* A4CD44 80240324 E6200058 */ swc1 $f0, 0x58($s1) -/* A4CD48 80240328 8E4300B0 */ lw $v1, 0xb0($s2) -/* A4CD4C 8024032C 30620004 */ andi $v0, $v1, 4 -/* A4CD50 80240330 10400003 */ beqz $v0, .L80240340 -/* A4CD54 80240334 2402FFFB */ addiu $v0, $zero, -5 -/* A4CD58 80240338 00621024 */ and $v0, $v1, $v0 -/* A4CD5C 8024033C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240340: -/* A4CD60 80240340 8EC30070 */ lw $v1, 0x70($s6) -/* A4CD64 80240344 2C620005 */ sltiu $v0, $v1, 5 -/* A4CD68 80240348 10400101 */ beqz $v0, .L80240750 -/* A4CD6C 8024034C 00031080 */ sll $v0, $v1, 2 -/* A4CD70 80240350 3C018024 */ lui $at, %hi(jtbl_80242540_A4EF60) -/* A4CD74 80240354 00220821 */ addu $at, $at, $v0 -/* A4CD78 80240358 8C222540 */ lw $v0, %lo(jtbl_80242540_A4EF60)($at) -/* A4CD7C 8024035C 00400008 */ jr $v0 -/* A4CD80 80240360 00000000 */ nop -.L80240364_A4CD84: -/* A4CD84 80240364 3C01C47A */ lui $at, 0xc47a -/* A4CD88 80240368 44810000 */ mtc1 $at, $f0 -/* A4CD8C 8024036C 24020014 */ addiu $v0, $zero, 0x14 -/* A4CD90 80240370 AE400078 */ sw $zero, 0x78($s2) -/* A4CD94 80240374 A62200A6 */ sh $v0, 0xa6($s1) -/* A4CD98 80240378 A62200A8 */ sh $v0, 0xa8($s1) -/* A4CD9C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* A4CDA0 80240380 AE200038 */ sw $zero, 0x38($s1) -/* A4CDA4 80240384 AE200040 */ sw $zero, 0x40($s1) -/* A4CDA8 80240388 E620003C */ swc1 $f0, 0x3c($s1) -/* A4CDAC 8024038C AE40006C */ sw $zero, 0x6c($s2) -/* A4CDB0 80240390 AEC20070 */ sw $v0, 0x70($s6) -.L80240394_A4CDB4: -/* A4CDB4 80240394 8E50006C */ lw $s0, 0x6c($s2) -/* A4CDB8 80240398 24020001 */ addiu $v0, $zero, 1 -/* A4CDBC 8024039C 160200EC */ bne $s0, $v0, .L80240750 -/* A4CDC0 802403A0 24150002 */ addiu $s5, $zero, 2 -/* A4CDC4 802403A4 AE55006C */ sw $s5, 0x6c($s2) -/* A4CDC8 802403A8 C6800038 */ lwc1 $f0, 0x38($s4) -/* A4CDCC 802403AC E6600038 */ swc1 $f0, 0x38($s3) -/* A4CDD0 802403B0 C680003C */ lwc1 $f0, 0x3c($s4) -/* A4CDD4 802403B4 E660003C */ swc1 $f0, 0x3c($s3) -/* A4CDD8 802403B8 C6800040 */ lwc1 $f0, 0x40($s4) -/* A4CDDC 802403BC E6600040 */ swc1 $f0, 0x40($s3) -/* A4CDE0 802403C0 C6820034 */ lwc1 $f2, 0x34($s4) -/* A4CDE4 802403C4 3C014387 */ lui $at, 0x4387 -/* A4CDE8 802403C8 44810000 */ mtc1 $at, $f0 -/* A4CDEC 802403CC 00000000 */ nop -/* A4CDF0 802403D0 46020001 */ sub.s $f0, $f0, $f2 -/* A4CDF4 802403D4 C6480074 */ lwc1 $f8, 0x74($s2) -/* A4CDF8 802403D8 46804220 */ cvt.s.w $f8, $f8 -/* A4CDFC 802403DC 44054000 */ mfc1 $a1, $f8 -/* A4CE00 802403E0 44060000 */ mfc1 $a2, $f0 -/* A4CE04 802403E4 0C00EA95 */ jal npc_move_heading -/* A4CE08 802403E8 0260202D */ daddu $a0, $s3, $zero -/* A4CE0C 802403EC C6600038 */ lwc1 $f0, 0x38($s3) -/* A4CE10 802403F0 E6200038 */ swc1 $f0, 0x38($s1) -/* A4CE14 802403F4 C680003C */ lwc1 $f0, 0x3c($s4) -/* A4CE18 802403F8 C6420070 */ lwc1 $f2, 0x70($s2) -/* A4CE1C 802403FC 468010A0 */ cvt.s.w $f2, $f2 -/* A4CE20 80240400 46020000 */ add.s $f0, $f0, $f2 -/* A4CE24 80240404 3C014024 */ lui $at, 0x4024 -/* A4CE28 80240408 4481A800 */ mtc1 $at, $f21 -/* A4CE2C 8024040C 4480A000 */ mtc1 $zero, $f20 -/* A4CE30 80240410 E620003C */ swc1 $f0, 0x3c($s1) -/* A4CE34 80240414 C6600040 */ lwc1 $f0, 0x40($s3) -/* A4CE38 80240418 E6200040 */ swc1 $f0, 0x40($s1) -/* A4CE3C 8024041C A2500007 */ sb $s0, 7($s2) -/* A4CE40 80240420 C6200038 */ lwc1 $f0, 0x38($s1) -/* A4CE44 80240424 3C014066 */ lui $at, 0x4066 -/* A4CE48 80240428 34216666 */ ori $at, $at, 0x6666 -/* A4CE4C 8024042C 44811000 */ mtc1 $at, $f2 -/* A4CE50 80240430 4600020D */ trunc.w.s $f8, $f0 -/* A4CE54 80240434 44024000 */ mfc1 $v0, $f8 -/* A4CE58 80240438 00000000 */ nop -/* A4CE5C 8024043C A6420010 */ sh $v0, 0x10($s2) -/* A4CE60 80240440 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4CE64 80240444 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A4CE68 80240448 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A4CE6C 8024044C 4600020D */ trunc.w.s $f8, $f0 -/* A4CE70 80240450 44024000 */ mfc1 $v0, $f8 -/* A4CE74 80240454 00000000 */ nop -/* A4CE78 80240458 A6420012 */ sh $v0, 0x12($s2) -/* A4CE7C 8024045C C6200040 */ lwc1 $f0, 0x40($s1) -/* A4CE80 80240460 8E630000 */ lw $v1, ($s3) -/* A4CE84 80240464 4600020D */ trunc.w.s $f8, $f0 -/* A4CE88 80240468 44024000 */ mfc1 $v0, $f8 -/* A4CE8C 8024046C 00000000 */ nop -/* A4CE90 80240470 A6420014 */ sh $v0, 0x14($s2) -/* A4CE94 80240474 E6220018 */ swc1 $f2, 0x18($s1) -/* A4CE98 80240478 C460002C */ lwc1 $f0, 0x2c($v1) -/* A4CE9C 8024047C C6220038 */ lwc1 $f2, 0x38($s1) -/* A4CEA0 80240480 46000021 */ cvt.d.s $f0, $f0 -/* A4CEA4 80240484 46340000 */ add.d $f0, $f0, $f20 -/* A4CEA8 80240488 C4640028 */ lwc1 $f4, 0x28($v1) -/* A4CEAC 8024048C 44806000 */ mtc1 $zero, $f12 -/* A4CEB0 80240490 46041081 */ sub.s $f2, $f2, $f4 -/* A4CEB4 80240494 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A4CEB8 80240498 46200020 */ cvt.s.d $f0, $f0 -/* A4CEBC 8024049C 46001085 */ abs.s $f2, $f2 -/* A4CEC0 802404A0 44070000 */ mfc1 $a3, $f0 -/* A4CEC4 802404A4 44061000 */ mfc1 $a2, $f2 -/* A4CEC8 802404A8 0C00A720 */ jal atan2 -/* A4CECC 802404AC 00000000 */ nop -/* A4CED0 802404B0 3C018024 */ lui $at, %hi(D_80242558_A4EF78) -/* A4CED4 802404B4 D4222558 */ ldc1 $f2, %lo(D_80242558_A4EF78)($at) -/* A4CED8 802404B8 46000021 */ cvt.d.s $f0, $f0 -/* A4CEDC 802404BC 46220001 */ sub.d $f0, $f0, $f2 -/* A4CEE0 802404C0 46200020 */ cvt.s.d $f0, $f0 -/* A4CEE4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* A4CEE8 802404C8 44044000 */ mfc1 $a0, $f8 -/* A4CEEC 802404CC 00000000 */ nop -/* A4CEF0 802404D0 00042400 */ sll $a0, $a0, 0x10 -/* A4CEF4 802404D4 0C00A4F5 */ jal cosine -/* A4CEF8 802404D8 00042403 */ sra $a0, $a0, 0x10 -/* A4CEFC 802404DC C6220018 */ lwc1 $f2, 0x18($s1) -/* A4CF00 802404E0 46020002 */ mul.s $f0, $f0, $f2 -/* A4CF04 802404E4 00000000 */ nop -/* A4CF08 802404E8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4CF0C 802404EC C62E0040 */ lwc1 $f14, 0x40($s1) -/* A4CF10 802404F0 8E620000 */ lw $v0, ($s3) -/* A4CF14 802404F4 E620001C */ swc1 $f0, 0x1c($s1) -/* A4CF18 802404F8 8C460028 */ lw $a2, 0x28($v0) -/* A4CF1C 802404FC 0C00A720 */ jal atan2 -/* A4CF20 80240500 8C470030 */ lw $a3, 0x30($v0) -/* A4CF24 80240504 8E620000 */ lw $v0, ($s3) -/* A4CF28 80240508 E620000C */ swc1 $f0, 0xc($s1) -/* A4CF2C 8024050C C440002C */ lwc1 $f0, 0x2c($v0) -/* A4CF30 80240510 46000021 */ cvt.d.s $f0, $f0 -/* A4CF34 80240514 46340000 */ add.d $f0, $f0, $f20 -/* A4CF38 80240518 46200020 */ cvt.s.d $f0, $f0 -/* A4CF3C 8024051C E7A00010 */ swc1 $f0, 0x10($sp) -/* A4CF40 80240520 C4400030 */ lwc1 $f0, 0x30($v0) -/* A4CF44 80240524 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4CF48 80240528 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4CF4C 8024052C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A4CF50 80240530 8E260040 */ lw $a2, 0x40($s1) -/* A4CF54 80240534 0C00A7CB */ jal dist3D -/* A4CF58 80240538 8C470028 */ lw $a3, 0x28($v0) -/* A4CF5C 8024053C C6220018 */ lwc1 $f2, 0x18($s1) -/* A4CF60 80240540 46020003 */ div.s $f0, $f0, $f2 -/* A4CF64 80240544 4600020D */ trunc.w.s $f8, $f0 -/* A4CF68 80240548 44104000 */ mfc1 $s0, $f8 -/* A4CF6C 8024054C 00000000 */ nop -/* A4CF70 80240550 5A000001 */ blezl $s0, .L80240558 -/* A4CF74 80240554 24100001 */ addiu $s0, $zero, 1 -.L80240558: -/* A4CF78 80240558 8E620000 */ lw $v0, ($s3) -/* A4CF7C 8024055C C624003C */ lwc1 $f4, 0x3c($s1) -/* A4CF80 80240560 3C014120 */ lui $at, 0x4120 -/* A4CF84 80240564 44811000 */ mtc1 $at, $f2 -/* A4CF88 80240568 C4400028 */ lwc1 $f0, 0x28($v0) -/* A4CF8C 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* A4CF90 80240570 C440002C */ lwc1 $f0, 0x2c($v0) -/* A4CF94 80240574 46020000 */ add.s $f0, $f0, $f2 -/* A4CF98 80240578 3C014160 */ lui $at, 0x4160 -/* A4CF9C 8024057C 44811000 */ mtc1 $at, $f2 -/* A4CFA0 80240580 00000000 */ nop -/* A4CFA4 80240584 46022100 */ add.s $f4, $f4, $f2 -/* A4CFA8 80240588 46020000 */ add.s $f0, $f0, $f2 -/* A4CFAC 8024058C 44062000 */ mfc1 $a2, $f4 -/* A4CFB0 80240590 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4CFB4 80240594 C4400030 */ lwc1 $f0, 0x30($v0) -/* A4CFB8 80240598 AFB0001C */ sw $s0, 0x1c($sp) -/* A4CFBC 8024059C E7A00018 */ swc1 $f0, 0x18($sp) -/* A4CFC0 802405A0 8E250038 */ lw $a1, 0x38($s1) -/* A4CFC4 802405A4 8E270040 */ lw $a3, 0x40($s1) -/* A4CFC8 802405A8 0C01BFD4 */ jal fx_shape_spell -/* A4CFCC 802405AC 0000202D */ daddu $a0, $zero, $zero -/* A4CFD0 802405B0 AE420078 */ sw $v0, 0x78($s2) -/* A4CFD4 802405B4 A630008E */ sh $s0, 0x8e($s1) -/* A4CFD8 802405B8 080901D4 */ j .L80240750 -/* A4CFDC 802405BC AED50070 */ sw $s5, 0x70($s6) -.L802405C0_A4CFE0: -/* A4CFE0 802405C0 9622008E */ lhu $v0, 0x8e($s1) -/* A4CFE4 802405C4 2442FFFF */ addiu $v0, $v0, -1 -/* A4CFE8 802405C8 A622008E */ sh $v0, 0x8e($s1) -/* A4CFEC 802405CC 00021400 */ sll $v0, $v0, 0x10 -/* A4CFF0 802405D0 58400001 */ blezl $v0, .L802405D8 -/* A4CFF4 802405D4 24150014 */ addiu $s5, $zero, 0x14 -.L802405D8: -/* A4CFF8 802405D8 16A0000A */ bnez $s5, .L80240604_A4D024 -/* A4CFFC 802405DC 00000000 */ nop -/* A4D000 802405E0 8E250018 */ lw $a1, 0x18($s1) -/* A4D004 802405E4 8E26000C */ lw $a2, 0xc($s1) -/* A4D008 802405E8 0C00EA95 */ jal npc_move_heading -/* A4D00C 802405EC 0220202D */ daddu $a0, $s1, $zero -/* A4D010 802405F0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4D014 802405F4 C622001C */ lwc1 $f2, 0x1c($s1) -/* A4D018 802405F8 46020000 */ add.s $f0, $f0, $f2 -/* A4D01C 802405FC 080901D4 */ j .L80240750 -/* A4D020 80240600 E620003C */ swc1 $f0, 0x3c($s1) -.L80240604_A4D024: -/* A4D024 80240604 862200A8 */ lh $v0, 0xa8($s1) -/* A4D028 80240608 3C013FE0 */ lui $at, 0x3fe0 -/* A4D02C 8024060C 44810800 */ mtc1 $at, $f1 -/* A4D030 80240610 44800000 */ mtc1 $zero, $f0 -/* A4D034 80240614 44821000 */ mtc1 $v0, $f2 -/* A4D038 80240618 00000000 */ nop -/* A4D03C 8024061C 468010A1 */ cvt.d.w $f2, $f2 -/* A4D040 80240620 46201082 */ mul.d $f2, $f2, $f0 -/* A4D044 80240624 00000000 */ nop -/* A4D048 80240628 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4D04C 8024062C AE20001C */ sw $zero, 0x1c($s1) -/* A4D050 80240630 46000021 */ cvt.d.s $f0, $f0 -/* A4D054 80240634 46220001 */ sub.d $f0, $f0, $f2 -/* A4D058 80240638 AE200018 */ sw $zero, 0x18($s1) -/* A4D05C 8024063C 24020003 */ addiu $v0, $zero, 3 -/* A4D060 80240640 46200020 */ cvt.s.d $f0, $f0 -/* A4D064 80240644 E620003C */ swc1 $f0, 0x3c($s1) -/* A4D068 80240648 AE42006C */ sw $v0, 0x6c($s2) -/* A4D06C 8024064C 24020004 */ addiu $v0, $zero, 4 -/* A4D070 80240650 A620008E */ sh $zero, 0x8e($s1) -/* A4D074 80240654 080901D4 */ j .L80240750 -/* A4D078 80240658 AEC20070 */ sw $v0, 0x70($s6) -.L8024065C_A4D07C: -/* A4D07C 8024065C 9622008E */ lhu $v0, 0x8e($s1) -/* A4D080 80240660 24420001 */ addiu $v0, $v0, 1 -/* A4D084 80240664 A622008E */ sh $v0, 0x8e($s1) -/* A4D088 80240668 00021400 */ sll $v0, $v0, 0x10 -/* A4D08C 8024066C 00021C03 */ sra $v1, $v0, 0x10 -/* A4D090 80240670 28620007 */ slti $v0, $v1, 7 -/* A4D094 80240674 10400027 */ beqz $v0, .L80240714 -/* A4D098 80240678 24020007 */ addiu $v0, $zero, 7 -/* A4D09C 8024067C 8622008E */ lh $v0, 0x8e($s1) -/* A4D0A0 80240680 3C01401C */ lui $at, 0x401c -/* A4D0A4 80240684 44810800 */ mtc1 $at, $f1 -/* A4D0A8 80240688 44800000 */ mtc1 $zero, $f0 -/* A4D0AC 8024068C 44822000 */ mtc1 $v0, $f4 -/* A4D0B0 80240690 00000000 */ nop -/* A4D0B4 80240694 46802120 */ cvt.s.w $f4, $f4 -/* A4D0B8 80240698 46002121 */ cvt.d.s $f4, $f4 -/* A4D0BC 8024069C 46202102 */ mul.d $f4, $f4, $f0 -/* A4D0C0 802406A0 00000000 */ nop -/* A4D0C4 802406A4 44821000 */ mtc1 $v0, $f2 -/* A4D0C8 802406A8 00000000 */ nop -/* A4D0CC 802406AC 468010A0 */ cvt.s.w $f2, $f2 -/* A4D0D0 802406B0 460010A1 */ cvt.d.s $f2, $f2 -/* A4D0D4 802406B4 46201082 */ mul.d $f2, $f2, $f0 -/* A4D0D8 802406B8 00000000 */ nop -/* A4D0DC 802406BC C620003C */ lwc1 $f0, 0x3c($s1) -/* A4D0E0 802406C0 3C01400C */ lui $at, 0x400c -/* A4D0E4 802406C4 44813800 */ mtc1 $at, $f7 -/* A4D0E8 802406C8 44803000 */ mtc1 $zero, $f6 -/* A4D0EC 802406CC 46000021 */ cvt.d.s $f0, $f0 -/* A4D0F0 802406D0 46260001 */ sub.d $f0, $f0, $f6 -/* A4D0F4 802406D4 3C014034 */ lui $at, 0x4034 -/* A4D0F8 802406D8 44813800 */ mtc1 $at, $f7 -/* A4D0FC 802406DC 44803000 */ mtc1 $zero, $f6 -/* A4D100 802406E0 00000000 */ nop -/* A4D104 802406E4 46262100 */ add.d $f4, $f4, $f6 -/* A4D108 802406E8 46200020 */ cvt.s.d $f0, $f0 -/* A4D10C 802406EC E620003C */ swc1 $f0, 0x3c($s1) -/* A4D110 802406F0 46261080 */ add.d $f2, $f2, $f6 -/* A4D114 802406F4 4620220D */ trunc.w.d $f8, $f4 -/* A4D118 802406F8 44024000 */ mfc1 $v0, $f8 -/* A4D11C 802406FC 00000000 */ nop -/* A4D120 80240700 A62200A6 */ sh $v0, 0xa6($s1) -/* A4D124 80240704 4620120D */ trunc.w.d $f8, $f2 -/* A4D128 80240708 44024000 */ mfc1 $v0, $f8 -/* A4D12C 8024070C 080901D4 */ j .L80240750 -/* A4D130 80240710 A62200A8 */ sh $v0, 0xa8($s1) -.L80240714: -/* A4D134 80240714 1462000A */ bne $v1, $v0, .L80240740 -/* A4D138 80240718 28620010 */ slti $v0, $v1, 0x10 -/* A4D13C 8024071C 3C01C47A */ lui $at, 0xc47a -/* A4D140 80240720 44810000 */ mtc1 $at, $f0 -/* A4D144 80240724 24020014 */ addiu $v0, $zero, 0x14 -/* A4D148 80240728 AE200038 */ sw $zero, 0x38($s1) -/* A4D14C 8024072C AE200040 */ sw $zero, 0x40($s1) -/* A4D150 80240730 A62200A6 */ sh $v0, 0xa6($s1) -/* A4D154 80240734 A62200A8 */ sh $v0, 0xa8($s1) -/* A4D158 80240738 080901D4 */ j .L80240750 -/* A4D15C 8024073C E620003C */ swc1 $f0, 0x3c($s1) -.L80240740: -/* A4D160 80240740 14400003 */ bnez $v0, .L80240750 -/* A4D164 80240744 00000000 */ nop -/* A4D168 80240748 AE40006C */ sw $zero, 0x6c($s2) -/* A4D16C 8024074C AEC00070 */ sw $zero, 0x70($s6) -.L80240750: -/* A4D170 80240750 8FBF037C */ lw $ra, 0x37c($sp) -/* A4D174 80240754 8FB60378 */ lw $s6, 0x378($sp) -/* A4D178 80240758 8FB50374 */ lw $s5, 0x374($sp) -/* A4D17C 8024075C 8FB40370 */ lw $s4, 0x370($sp) -/* A4D180 80240760 8FB3036C */ lw $s3, 0x36c($sp) -/* A4D184 80240764 8FB20368 */ lw $s2, 0x368($sp) -/* A4D188 80240768 8FB10364 */ lw $s1, 0x364($sp) -/* A4D18C 8024076C 8FB00360 */ lw $s0, 0x360($sp) -/* A4D190 80240770 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A4D194 80240774 0000102D */ daddu $v0, $zero, $zero -/* A4D198 80240778 03E00008 */ jr $ra -/* A4D19C 8024077C 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780_A4D1A0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780_A4D1A0.s deleted file mode 100644 index d245e07300..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780_A4D1A0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240780_A4D1A0 -/* A4D1A0 80240780 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D1A4 80240784 AFB10014 */ sw $s1, 0x14($sp) -/* A4D1A8 80240788 0080882D */ daddu $s1, $a0, $zero -/* A4D1AC 8024078C AFBF0018 */ sw $ra, 0x18($sp) -/* A4D1B0 80240790 AFB00010 */ sw $s0, 0x10($sp) -/* A4D1B4 80240794 8E300148 */ lw $s0, 0x148($s1) -/* A4D1B8 80240798 0C00EABB */ jal get_npc_unsafe -/* A4D1BC 8024079C 86040008 */ lh $a0, 8($s0) -/* A4D1C0 802407A0 0040282D */ daddu $a1, $v0, $zero -/* A4D1C4 802407A4 94A2008E */ lhu $v0, 0x8e($a1) -/* A4D1C8 802407A8 2442FFFF */ addiu $v0, $v0, -1 -/* A4D1CC 802407AC A4A2008E */ sh $v0, 0x8e($a1) -/* A4D1D0 802407B0 00021400 */ sll $v0, $v0, 0x10 -/* A4D1D4 802407B4 1C40000A */ bgtz $v0, .L802407E0 -/* A4D1D8 802407B8 2404FFFD */ addiu $a0, $zero, -3 -/* A4D1DC 802407BC 8E0300CC */ lw $v1, 0xcc($s0) -/* A4D1E0 802407C0 8CA20000 */ lw $v0, ($a1) -/* A4D1E4 802407C4 8C630000 */ lw $v1, ($v1) -/* A4D1E8 802407C8 00441024 */ and $v0, $v0, $a0 -/* A4D1EC 802407CC ACA20000 */ sw $v0, ($a1) -/* A4D1F0 802407D0 24020001 */ addiu $v0, $zero, 1 -/* A4D1F4 802407D4 A4A0008E */ sh $zero, 0x8e($a1) -/* A4D1F8 802407D8 ACA30028 */ sw $v1, 0x28($a1) -/* A4D1FC 802407DC AE220070 */ sw $v0, 0x70($s1) -.L802407E0: -/* A4D200 802407E0 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D204 802407E4 8FB10014 */ lw $s1, 0x14($sp) -/* A4D208 802407E8 8FB00010 */ lw $s0, 0x10($sp) -/* A4D20C 802407EC 03E00008 */ jr $ra -/* A4D210 802407F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s deleted file mode 100644 index f85713921f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240920_A4D340 -/* A4D340 80240920 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D344 80240924 AFB10014 */ sw $s1, 0x14($sp) -/* A4D348 80240928 0080882D */ daddu $s1, $a0, $zero -/* A4D34C 8024092C AFBF0018 */ sw $ra, 0x18($sp) -/* A4D350 80240930 AFB00010 */ sw $s0, 0x10($sp) -/* A4D354 80240934 8E220148 */ lw $v0, 0x148($s1) -/* A4D358 80240938 0C00EABB */ jal get_npc_unsafe -/* A4D35C 8024093C 84440008 */ lh $a0, 8($v0) -/* A4D360 80240940 24040064 */ addiu $a0, $zero, 0x64 -/* A4D364 80240944 0C00A67F */ jal rand_int -/* A4D368 80240948 0040802D */ daddu $s0, $v0, $zero -/* A4D36C 8024094C 00021FC2 */ srl $v1, $v0, 0x1f -/* A4D370 80240950 00431821 */ addu $v1, $v0, $v1 -/* A4D374 80240954 00031843 */ sra $v1, $v1, 1 -/* A4D378 80240958 00031840 */ sll $v1, $v1, 1 -/* A4D37C 8024095C 00431023 */ subu $v0, $v0, $v1 -/* A4D380 80240960 3C014334 */ lui $at, 0x4334 -/* A4D384 80240964 44811000 */ mtc1 $at, $f2 -/* A4D388 80240968 44820000 */ mtc1 $v0, $f0 -/* A4D38C 8024096C 00000000 */ nop -/* A4D390 80240970 46800020 */ cvt.s.w $f0, $f0 -/* A4D394 80240974 46020002 */ mul.s $f0, $f0, $f2 -/* A4D398 80240978 00000000 */ nop -/* A4D39C 8024097C 3C013F4C */ lui $at, 0x3f4c -/* A4D3A0 80240980 3421CCCD */ ori $at, $at, 0xcccd -/* A4D3A4 80240984 44812000 */ mtc1 $at, $f4 -/* A4D3A8 80240988 3C0142B4 */ lui $at, 0x42b4 -/* A4D3AC 8024098C 44811000 */ mtc1 $at, $f2 -/* A4D3B0 80240990 2402000F */ addiu $v0, $zero, 0xf -/* A4D3B4 80240994 A602008E */ sh $v0, 0x8e($s0) -/* A4D3B8 80240998 46020000 */ add.s $f0, $f0, $f2 -/* A4D3BC 8024099C 24020006 */ addiu $v0, $zero, 6 -/* A4D3C0 802409A0 E6040018 */ swc1 $f4, 0x18($s0) -/* A4D3C4 802409A4 E600000C */ swc1 $f0, 0xc($s0) -/* A4D3C8 802409A8 AE220070 */ sw $v0, 0x70($s1) -/* A4D3CC 802409AC 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D3D0 802409B0 8FB10014 */ lw $s1, 0x14($sp) -/* A4D3D4 802409B4 8FB00010 */ lw $s0, 0x10($sp) -/* A4D3D8 802409B8 03E00008 */ jr $ra -/* A4D3DC 802409BC 27BD0020 */ addiu $sp, $sp, 0x20 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 index 22d526b637..8b3698bfdd 100644 --- 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 @@ -58,7 +58,7 @@ glabel func_80240D44_A4D764 .L80240E18: /* A4D838 80240E18 8E450024 */ lw $a1, 0x24($s2) /* A4D83C 80240E1C 8E460028 */ lw $a2, 0x28($s2) -/* A4D840 80240E20 0C090028 */ jal func_802400A0_A4CAC0 +/* 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 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 index 5a8771dba2..5e2a41bfce 100644 --- 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 @@ -25,7 +25,7 @@ glabel func_80240F70_A4D990 /* 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 func_802400A0_A4CAC0 +/* 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 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 index dc91e48223..3ac490204d 100644 --- 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 @@ -98,7 +98,7 @@ glabel func_8024110C_A4DB2C .L80241258_A4DC78: /* A4DC78 80241258 02A0202D */ daddu $a0, $s5, $zero /* A4DC7C 8024125C 0260282D */ daddu $a1, $s3, $zero -/* A4DC80 80241260 0C0901E0 */ jal func_80240780_A4D1A0 +/* 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 @@ -114,7 +114,7 @@ glabel func_8024110C_A4DB2C .L80241290_A4DCB0: /* A4DCB0 80241290 02A0202D */ daddu $a0, $s5, $zero /* A4DCB4 80241294 0260282D */ daddu $a1, $s3, $zero -/* A4DCB8 80241298 0C090248 */ jal func_80240920_A4D340 +/* A4DCB8 80241298 0C090248 */ jal kpa_08_UnkFunc59 /* A4DCBC 8024129C 0280302D */ daddu $a2, $s4, $zero .L802412A0_A4DCC0: /* A4DCC0 802412A0 02A0202D */ daddu $a0, $s5, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s deleted file mode 100644 index 86a9e72e5e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802427C0_A517C0 -.double 180.0 - -dlabel D_802427C8_A517C8 -.double 75.0 - -.section .text - -glabel func_802400A0_A4F0A0 -/* A4F0A0 802400A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A4F0A4 802400A4 AFB10014 */ sw $s1, 0x14($sp) -/* A4F0A8 802400A8 0080882D */ daddu $s1, $a0, $zero -/* A4F0AC 802400AC 3C05800B */ lui $a1, %hi(gCameras) -/* A4F0B0 802400B0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A4F0B4 802400B4 AFBF0020 */ sw $ra, 0x20($sp) -/* A4F0B8 802400B8 AFB3001C */ sw $s3, 0x1c($sp) -/* A4F0BC 802400BC AFB20018 */ sw $s2, 0x18($sp) -/* A4F0C0 802400C0 AFB00010 */ sw $s0, 0x10($sp) -/* A4F0C4 802400C4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A4F0C8 802400C8 8E330148 */ lw $s3, 0x148($s1) -/* A4F0CC 802400CC 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A4F0D0 802400D0 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A4F0D4 802400D4 8E30000C */ lw $s0, 0xc($s1) -/* A4F0D8 802400D8 00031080 */ sll $v0, $v1, 2 -/* A4F0DC 802400DC 00431021 */ addu $v0, $v0, $v1 -/* A4F0E0 802400E0 00021080 */ sll $v0, $v0, 2 -/* A4F0E4 802400E4 00431023 */ subu $v0, $v0, $v1 -/* A4F0E8 802400E8 000218C0 */ sll $v1, $v0, 3 -/* A4F0EC 802400EC 00431021 */ addu $v0, $v0, $v1 -/* A4F0F0 802400F0 000210C0 */ sll $v0, $v0, 3 -/* A4F0F4 802400F4 86640008 */ lh $a0, 8($s3) -/* A4F0F8 802400F8 0C00EABB */ jal get_npc_unsafe -/* A4F0FC 802400FC 00459021 */ addu $s2, $v0, $a1 -/* A4F100 80240100 0220202D */ daddu $a0, $s1, $zero -/* A4F104 80240104 8E050000 */ lw $a1, ($s0) -/* A4F108 80240108 0C0B1EAF */ jal evt_get_variable -/* A4F10C 8024010C 0040802D */ daddu $s0, $v0, $zero -/* A4F110 80240110 0260202D */ daddu $a0, $s3, $zero -/* A4F114 80240114 8C460024 */ lw $a2, 0x24($v0) -/* A4F118 80240118 8C470028 */ lw $a3, 0x28($v0) -/* A4F11C 8024011C 0C0124FB */ jal func_800493EC -/* A4F120 80240120 0000282D */ daddu $a1, $zero, $zero -/* A4F124 80240124 10400052 */ beqz $v0, .L80240270 -/* A4F128 80240128 2402FFFF */ addiu $v0, $zero, -1 -/* A4F12C 8024012C C64C006C */ lwc1 $f12, 0x6c($s2) -/* A4F130 80240130 C60E000C */ lwc1 $f14, 0xc($s0) -/* A4F134 80240134 3C014387 */ lui $at, 0x4387 -/* A4F138 80240138 4481A000 */ mtc1 $at, $f20 -/* A4F13C 8024013C 0C00A70A */ jal get_clamped_angle_diff -/* A4F140 80240140 00000000 */ nop -/* A4F144 80240144 0C00A6C9 */ jal clamp_angle -/* A4F148 80240148 46000306 */ mov.s $f12, $f0 -/* A4F14C 8024014C 3C018024 */ lui $at, %hi(D_802427C0_A517C0) -/* A4F150 80240150 D42227C0 */ ldc1 $f2, %lo(D_802427C0_A517C0)($at) -/* A4F154 80240154 46000021 */ cvt.d.s $f0, $f0 -/* A4F158 80240158 4622003C */ c.lt.d $f0, $f2 -/* A4F15C 8024015C 00000000 */ nop -/* A4F160 80240160 45000003 */ bc1f .L80240170 -/* A4F164 80240164 00000000 */ nop -/* A4F168 80240168 3C0142B4 */ lui $at, 0x42b4 -/* A4F16C 8024016C 4481A000 */ mtc1 $at, $f20 -.L80240170: -/* A4F170 80240170 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A4F174 80240174 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A4F178 80240178 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A4F17C 8024017C 8E220000 */ lw $v0, ($s1) -/* A4F180 80240180 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A4F184 80240184 8C460028 */ lw $a2, 0x28($v0) -/* A4F188 80240188 0C00A720 */ jal atan2 -/* A4F18C 8024018C 8C470030 */ lw $a3, 0x30($v0) -/* A4F190 80240190 4600A306 */ mov.s $f12, $f20 -/* A4F194 80240194 0C00A70A */ jal get_clamped_angle_diff -/* A4F198 80240198 46000386 */ mov.s $f14, $f0 -/* A4F19C 8024019C 46000005 */ abs.s $f0, $f0 -/* A4F1A0 802401A0 3C018024 */ lui $at, %hi(D_802427C8_A517C8) -/* A4F1A4 802401A4 D42227C8 */ ldc1 $f2, %lo(D_802427C8_A517C8)($at) -/* A4F1A8 802401A8 46000021 */ cvt.d.s $f0, $f0 -/* A4F1AC 802401AC 4620103C */ c.lt.d $f2, $f0 -/* A4F1B0 802401B0 00000000 */ nop -/* A4F1B4 802401B4 4501002E */ bc1t .L80240270 -/* A4F1B8 802401B8 2402FFFF */ addiu $v0, $zero, -1 -/* A4F1BC 802401BC 8E220000 */ lw $v0, ($s1) -/* A4F1C0 802401C0 C600003C */ lwc1 $f0, 0x3c($s0) -/* A4F1C4 802401C4 C442002C */ lwc1 $f2, 0x2c($v0) -/* A4F1C8 802401C8 860200A8 */ lh $v0, 0xa8($s0) -/* A4F1CC 802401CC 46020001 */ sub.s $f0, $f0, $f2 -/* A4F1D0 802401D0 44821000 */ mtc1 $v0, $f2 -/* A4F1D4 802401D4 00000000 */ nop -/* A4F1D8 802401D8 468010A1 */ cvt.d.w $f2, $f2 -/* A4F1DC 802401DC 46221080 */ add.d $f2, $f2, $f2 -/* A4F1E0 802401E0 46000005 */ abs.s $f0, $f0 -/* A4F1E4 802401E4 46000021 */ cvt.d.s $f0, $f0 -/* A4F1E8 802401E8 4620103E */ c.le.d $f2, $f0 -/* A4F1EC 802401EC 00000000 */ nop -/* A4F1F0 802401F0 4501001F */ bc1t .L80240270 -/* A4F1F4 802401F4 2402FFFF */ addiu $v0, $zero, -1 -/* A4F1F8 802401F8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A4F1FC 802401FC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A4F200 80240200 24020009 */ addiu $v0, $zero, 9 -/* A4F204 80240204 10620019 */ beq $v1, $v0, .L8024026C -/* A4F208 80240208 24020007 */ addiu $v0, $zero, 7 -/* A4F20C 8024020C 14620005 */ bne $v1, $v0, .L80240224 -/* A4F210 80240210 2402FFFF */ addiu $v0, $zero, -1 -/* A4F214 80240214 0809009C */ j .L80240270 -/* A4F218 80240218 00000000 */ nop -.L8024021C: -/* A4F21C 8024021C 0809009C */ j .L80240270 -/* A4F220 80240220 0240102D */ daddu $v0, $s2, $zero -.L80240224: -/* A4F224 80240224 8E620078 */ lw $v0, 0x78($s3) -/* A4F228 80240228 18400010 */ blez $v0, .L8024026C -/* A4F22C 8024022C 0000882D */ daddu $s1, $zero, $zero -.L80240230: -/* A4F230 80240230 86620008 */ lh $v0, 8($s3) -/* A4F234 80240234 00511021 */ addu $v0, $v0, $s1 -/* A4F238 80240238 24520001 */ addiu $s2, $v0, 1 -/* A4F23C 8024023C 0C00FB3A */ jal get_enemy -/* A4F240 80240240 0240202D */ daddu $a0, $s2, $zero -/* A4F244 80240244 0240202D */ daddu $a0, $s2, $zero -/* A4F248 80240248 0C00EABB */ jal get_npc_unsafe -/* A4F24C 8024024C 0040802D */ daddu $s0, $v0, $zero -/* A4F250 80240250 8E02006C */ lw $v0, 0x6c($s0) -/* A4F254 80240254 1040FFF1 */ beqz $v0, .L8024021C -/* A4F258 80240258 26310001 */ addiu $s1, $s1, 1 -/* A4F25C 8024025C 8E620078 */ lw $v0, 0x78($s3) -/* A4F260 80240260 0222102A */ slt $v0, $s1, $v0 -/* A4F264 80240264 1440FFF2 */ bnez $v0, .L80240230 -/* A4F268 80240268 00000000 */ nop -.L8024026C: -/* A4F26C 8024026C 2402FFFF */ addiu $v0, $zero, -1 -.L80240270: -/* A4F270 80240270 8FBF0020 */ lw $ra, 0x20($sp) -/* A4F274 80240274 8FB3001C */ lw $s3, 0x1c($sp) -/* A4F278 80240278 8FB20018 */ lw $s2, 0x18($sp) -/* A4F27C 8024027C 8FB10014 */ lw $s1, 0x14($sp) -/* A4F280 80240280 8FB00010 */ lw $s0, 0x10($sp) -/* A4F284 80240284 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A4F288 80240288 03E00008 */ jr $ra -/* A4F28C 8024028C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s deleted file mode 100644 index dfae319ef8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_A4F290 -/* A4F290 80240290 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4F294 80240294 AFB20038 */ sw $s2, 0x38($sp) -/* A4F298 80240298 0080902D */ daddu $s2, $a0, $zero -/* A4F29C 8024029C AFB00030 */ sw $s0, 0x30($sp) -/* A4F2A0 802402A0 AFBF003C */ sw $ra, 0x3c($sp) -/* A4F2A4 802402A4 AFB10034 */ sw $s1, 0x34($sp) -/* A4F2A8 802402A8 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A4F2AC 802402AC F7B40040 */ sdc1 $f20, 0x40($sp) -/* A4F2B0 802402B0 8E510148 */ lw $s1, 0x148($s2) -/* A4F2B4 802402B4 4485A000 */ mtc1 $a1, $f20 -/* A4F2B8 802402B8 86240008 */ lh $a0, 8($s1) -/* A4F2BC 802402BC 4486B000 */ mtc1 $a2, $f22 -/* A4F2C0 802402C0 0C00EABB */ jal get_npc_unsafe -/* A4F2C4 802402C4 00E0802D */ daddu $s0, $a3, $zero -/* A4F2C8 802402C8 0200202D */ daddu $a0, $s0, $zero -/* A4F2CC 802402CC 0220282D */ daddu $a1, $s1, $zero -/* A4F2D0 802402D0 24030001 */ addiu $v1, $zero, 1 -/* A4F2D4 802402D4 4406A000 */ mfc1 $a2, $f20 -/* A4F2D8 802402D8 4407B000 */ mfc1 $a3, $f22 -/* A4F2DC 802402DC 0040802D */ daddu $s0, $v0, $zero -/* A4F2E0 802402E0 0C01242D */ jal func_800490B4 -/* A4F2E4 802402E4 AFA30010 */ sw $v1, 0x10($sp) -/* A4F2E8 802402E8 1440001D */ bnez $v0, .L80240360 -/* A4F2EC 802402EC 24040002 */ addiu $a0, $zero, 2 -/* A4F2F0 802402F0 0200282D */ daddu $a1, $s0, $zero -/* A4F2F4 802402F4 0000302D */ daddu $a2, $zero, $zero -/* A4F2F8 802402F8 860300A8 */ lh $v1, 0xa8($s0) -/* A4F2FC 802402FC 3C013F80 */ lui $at, 0x3f80 -/* A4F300 80240300 44810000 */ mtc1 $at, $f0 -/* A4F304 80240304 3C014000 */ lui $at, 0x4000 -/* A4F308 80240308 44811000 */ mtc1 $at, $f2 -/* A4F30C 8024030C 3C01C1A0 */ lui $at, 0xc1a0 -/* A4F310 80240310 44812000 */ mtc1 $at, $f4 -/* A4F314 80240314 2402000F */ addiu $v0, $zero, 0xf -/* A4F318 80240318 AFA2001C */ sw $v0, 0x1c($sp) -/* A4F31C 8024031C 44833000 */ mtc1 $v1, $f6 -/* A4F320 80240320 00000000 */ nop -/* A4F324 80240324 468031A0 */ cvt.s.w $f6, $f6 -/* A4F328 80240328 44073000 */ mfc1 $a3, $f6 -/* A4F32C 8024032C 27A20028 */ addiu $v0, $sp, 0x28 -/* A4F330 80240330 AFA20020 */ sw $v0, 0x20($sp) -/* A4F334 80240334 E7A00010 */ swc1 $f0, 0x10($sp) -/* A4F338 80240338 E7A20014 */ swc1 $f2, 0x14($sp) -/* A4F33C 8024033C 0C01BFA4 */ jal fx_emote -/* A4F340 80240340 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4F344 80240344 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F348 80240348 8C430000 */ lw $v1, ($v0) -/* A4F34C 8024034C 24020014 */ addiu $v0, $zero, 0x14 -/* A4F350 80240350 A602008E */ sh $v0, 0x8e($s0) -/* A4F354 80240354 24020021 */ addiu $v0, $zero, 0x21 -/* A4F358 80240358 080900EC */ j .L802403B0 -/* A4F35C 8024035C AE030028 */ sw $v1, 0x28($s0) -.L80240360: -/* A4F360 80240360 0C090028 */ jal func_802400A0_A4F0A0 -/* A4F364 80240364 0240202D */ daddu $a0, $s2, $zero -/* A4F368 80240368 0040202D */ daddu $a0, $v0, $zero -/* A4F36C 8024036C 2402FFFF */ addiu $v0, $zero, -1 -/* A4F370 80240370 10820010 */ beq $a0, $v0, .L802403B4 -/* A4F374 80240374 00000000 */ nop -/* A4F378 80240378 0C00FB3A */ jal get_enemy -/* A4F37C 8024037C 00000000 */ nop -/* A4F380 80240380 8C42006C */ lw $v0, 0x6c($v0) -/* A4F384 80240384 1440000B */ bnez $v0, .L802403B4 -/* A4F388 80240388 00000000 */ nop -/* A4F38C 8024038C 8602008C */ lh $v0, 0x8c($s0) -/* A4F390 80240390 14400008 */ bnez $v0, .L802403B4 -/* A4F394 80240394 00000000 */ nop -/* A4F398 80240398 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F39C 8024039C 8C420020 */ lw $v0, 0x20($v0) -/* A4F3A0 802403A0 AE020028 */ sw $v0, 0x28($s0) -/* A4F3A4 802403A4 96220072 */ lhu $v0, 0x72($s1) -/* A4F3A8 802403A8 A602008E */ sh $v0, 0x8e($s0) -/* A4F3AC 802403AC 2402001E */ addiu $v0, $zero, 0x1e -.L802403B0: -/* A4F3B0 802403B0 AE420070 */ sw $v0, 0x70($s2) -.L802403B4: -/* A4F3B4 802403B4 8FBF003C */ lw $ra, 0x3c($sp) -/* A4F3B8 802403B8 8FB20038 */ lw $s2, 0x38($sp) -/* A4F3BC 802403BC 8FB10034 */ lw $s1, 0x34($sp) -/* A4F3C0 802403C0 8FB00030 */ lw $s0, 0x30($sp) -/* A4F3C4 802403C4 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A4F3C8 802403C8 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A4F3CC 802403CC 03E00008 */ jr $ra -/* A4F3D0 802403D0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s deleted file mode 100644 index 90dfeaf01c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D4_A4F3D4 -/* A4F3D4 802403D4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A4F3D8 802403D8 AFB20038 */ sw $s2, 0x38($sp) -/* A4F3DC 802403DC 0080902D */ daddu $s2, $a0, $zero -/* A4F3E0 802403E0 AFBF003C */ sw $ra, 0x3c($sp) -/* A4F3E4 802403E4 AFB10034 */ sw $s1, 0x34($sp) -/* A4F3E8 802403E8 AFB00030 */ sw $s0, 0x30($sp) -/* A4F3EC 802403EC 8E510148 */ lw $s1, 0x148($s2) -/* A4F3F0 802403F0 0C00EABB */ jal get_npc_unsafe -/* A4F3F4 802403F4 86240008 */ lh $a0, 8($s1) -/* A4F3F8 802403F8 0040802D */ daddu $s0, $v0, $zero -/* A4F3FC 802403FC 9602008E */ lhu $v0, 0x8e($s0) -/* A4F400 80240400 2442FFFF */ addiu $v0, $v0, -1 -/* A4F404 80240404 A602008E */ sh $v0, 0x8e($s0) -/* A4F408 80240408 00021400 */ sll $v0, $v0, 0x10 -/* A4F40C 8024040C 1C40002B */ bgtz $v0, .L802404BC -/* A4F410 80240410 00000000 */ nop -/* A4F414 80240414 0C090028 */ jal func_802400A0_A4F0A0 -/* A4F418 80240418 0240202D */ daddu $a0, $s2, $zero -/* A4F41C 8024041C 0040202D */ daddu $a0, $v0, $zero -/* A4F420 80240420 0481001A */ bgez $a0, .L8024048C -/* A4F424 80240424 2402000F */ addiu $v0, $zero, 0xf -/* A4F428 80240428 24040002 */ addiu $a0, $zero, 2 -/* A4F42C 8024042C 860300A8 */ lh $v1, 0xa8($s0) -/* A4F430 80240430 AFA2001C */ sw $v0, 0x1c($sp) -/* A4F434 80240434 27A20028 */ addiu $v0, $sp, 0x28 -/* A4F438 80240438 0200282D */ daddu $a1, $s0, $zero -/* A4F43C 8024043C 3C013F80 */ lui $at, 0x3f80 -/* A4F440 80240440 44810000 */ mtc1 $at, $f0 -/* A4F444 80240444 3C014000 */ lui $at, 0x4000 -/* A4F448 80240448 44811000 */ mtc1 $at, $f2 -/* A4F44C 8024044C 3C01C1A0 */ lui $at, 0xc1a0 -/* A4F450 80240450 44812000 */ mtc1 $at, $f4 -/* A4F454 80240454 44833000 */ mtc1 $v1, $f6 -/* A4F458 80240458 00000000 */ nop -/* A4F45C 8024045C 468031A0 */ cvt.s.w $f6, $f6 -/* A4F460 80240460 44073000 */ mfc1 $a3, $f6 -/* A4F464 80240464 0000302D */ daddu $a2, $zero, $zero -/* A4F468 80240468 AFA20020 */ sw $v0, 0x20($sp) -/* A4F46C 8024046C E7A00010 */ swc1 $f0, 0x10($sp) -/* A4F470 80240470 E7A20014 */ swc1 $f2, 0x14($sp) -/* A4F474 80240474 0C01BFA4 */ jal fx_emote -/* A4F478 80240478 E7A40018 */ swc1 $f4, 0x18($sp) -/* A4F47C 8024047C 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F480 80240480 8C420000 */ lw $v0, ($v0) -/* A4F484 80240484 0809012B */ j .L802404AC -/* A4F488 80240488 AE020028 */ sw $v0, 0x28($s0) -.L8024048C: -/* A4F48C 8024048C 8E2200CC */ lw $v0, 0xcc($s1) -/* A4F490 80240490 8C420024 */ lw $v0, 0x24($v0) -/* A4F494 80240494 0C00FB3A */ jal get_enemy -/* A4F498 80240498 AE020028 */ sw $v0, 0x28($s0) -/* A4F49C 8024049C 86240008 */ lh $a0, 8($s1) -/* A4F4A0 802404A0 24030001 */ addiu $v1, $zero, 1 -/* A4F4A4 802404A4 AC43006C */ sw $v1, 0x6c($v0) -/* A4F4A8 802404A8 AC44007C */ sw $a0, 0x7c($v0) -.L802404AC: -/* A4F4AC 802404AC 96220076 */ lhu $v0, 0x76($s1) -/* A4F4B0 802404B0 A602008E */ sh $v0, 0x8e($s0) -/* A4F4B4 802404B4 24020021 */ addiu $v0, $zero, 0x21 -/* A4F4B8 802404B8 AE420070 */ sw $v0, 0x70($s2) -.L802404BC: -/* A4F4BC 802404BC 8FBF003C */ lw $ra, 0x3c($sp) -/* A4F4C0 802404C0 8FB20038 */ lw $s2, 0x38($sp) -/* A4F4C4 802404C4 8FB10034 */ lw $s1, 0x34($sp) -/* A4F4C8 802404C8 8FB00030 */ lw $s0, 0x30($sp) -/* A4F4CC 802404CC 03E00008 */ jr $ra -/* A4F4D0 802404D0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s deleted file mode 100644 index d592439051..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802427E8_A517E8 -.word .L80241124_A50124, .L80241134_A50134, .L8024114C_A5014C, .L8024115C_A5015C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L80241174_A50174, .L80241184_A50184, .L8024119C_A5019C, .L80241214_A50214, .L8024122C_A5022C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L80241244_A50244, .L80241254_A50254, .L80241264_A50264, .L80241274_A50274, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L8024128C_A5028C, .L80241284_A50284, 0, 0 - -.section .text - -glabel func_80240F94_A4FF94 -/* A4FF94 80240F94 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4FF98 80240F98 AFB3003C */ sw $s3, 0x3c($sp) -/* A4FF9C 80240F9C 0080982D */ daddu $s3, $a0, $zero -/* A4FFA0 80240FA0 AFBF0048 */ sw $ra, 0x48($sp) -/* A4FFA4 80240FA4 AFB50044 */ sw $s5, 0x44($sp) -/* A4FFA8 80240FA8 AFB40040 */ sw $s4, 0x40($sp) -/* A4FFAC 80240FAC AFB20038 */ sw $s2, 0x38($sp) -/* A4FFB0 80240FB0 AFB10034 */ sw $s1, 0x34($sp) -/* A4FFB4 80240FB4 AFB00030 */ sw $s0, 0x30($sp) -/* A4FFB8 80240FB8 8E720148 */ lw $s2, 0x148($s3) -/* A4FFBC 80240FBC 86440008 */ lh $a0, 8($s2) -/* A4FFC0 80240FC0 8E70000C */ lw $s0, 0xc($s3) -/* A4FFC4 80240FC4 0C00EABB */ jal get_npc_unsafe -/* A4FFC8 80240FC8 00A0882D */ daddu $s1, $a1, $zero -/* A4FFCC 80240FCC 0260202D */ daddu $a0, $s3, $zero -/* A4FFD0 80240FD0 8E050000 */ lw $a1, ($s0) -/* A4FFD4 80240FD4 0C0B1EAF */ jal evt_get_variable -/* A4FFD8 80240FD8 0040A02D */ daddu $s4, $v0, $zero -/* A4FFDC 80240FDC AFA00010 */ sw $zero, 0x10($sp) -/* A4FFE0 80240FE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A4FFE4 80240FE4 8C630030 */ lw $v1, 0x30($v1) -/* A4FFE8 80240FE8 AFA30014 */ sw $v1, 0x14($sp) -/* A4FFEC 80240FEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A4FFF0 80240FF0 8C63001C */ lw $v1, 0x1c($v1) -/* A4FFF4 80240FF4 AFA30018 */ sw $v1, 0x18($sp) -/* A4FFF8 80240FF8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A4FFFC 80240FFC 8C630024 */ lw $v1, 0x24($v1) -/* A50000 80241000 AFA3001C */ sw $v1, 0x1c($sp) -/* A50004 80241004 8E4300D0 */ lw $v1, 0xd0($s2) -/* A50008 80241008 8C630028 */ lw $v1, 0x28($v1) -/* A5000C 8024100C 27B50010 */ addiu $s5, $sp, 0x10 -/* A50010 80241010 AFA30020 */ sw $v1, 0x20($sp) -/* A50014 80241014 8E4300D0 */ lw $v1, 0xd0($s2) -/* A50018 80241018 3C014220 */ lui $at, 0x4220 -/* A5001C 8024101C 44810000 */ mtc1 $at, $f0 -/* A50020 80241020 8C63002C */ lw $v1, 0x2c($v1) -/* A50024 80241024 0040802D */ daddu $s0, $v0, $zero -/* A50028 80241028 E7A00028 */ swc1 $f0, 0x28($sp) -/* A5002C 8024102C A7A0002C */ sh $zero, 0x2c($sp) -/* A50030 80241030 16200005 */ bnez $s1, .L80241048 -/* A50034 80241034 AFA30024 */ sw $v1, 0x24($sp) -/* A50038 80241038 8E4200B0 */ lw $v0, 0xb0($s2) -/* A5003C 8024103C 30420004 */ andi $v0, $v0, 4 -/* A50040 80241040 1040002F */ beqz $v0, .L80241100 -/* A50044 80241044 00000000 */ nop -.L80241048: -/* A50048 80241048 2404F7FF */ addiu $a0, $zero, -0x801 -/* A5004C 8024104C AE600070 */ sw $zero, 0x70($s3) -/* A50050 80241050 A680008E */ sh $zero, 0x8e($s4) -/* A50054 80241054 8E4200CC */ lw $v0, 0xcc($s2) -/* A50058 80241058 8E830000 */ lw $v1, ($s4) -/* A5005C 8024105C 8C420000 */ lw $v0, ($v0) -/* A50060 80241060 00641824 */ and $v1, $v1, $a0 -/* A50064 80241064 AE830000 */ sw $v1, ($s4) -/* A50068 80241068 AE820028 */ sw $v0, 0x28($s4) -/* A5006C 8024106C 8E4200D0 */ lw $v0, 0xd0($s2) -/* A50070 80241070 8C420034 */ lw $v0, 0x34($v0) -/* A50074 80241074 54400005 */ bnel $v0, $zero, .L8024108C -/* A50078 80241078 2402FDFF */ addiu $v0, $zero, -0x201 -/* A5007C 8024107C 34620200 */ ori $v0, $v1, 0x200 -/* A50080 80241080 2403FFF7 */ addiu $v1, $zero, -9 -/* A50084 80241084 08090425 */ j .L80241094 -/* A50088 80241088 00431024 */ and $v0, $v0, $v1 -.L8024108C: -/* A5008C 8024108C 00621024 */ and $v0, $v1, $v0 -/* A50090 80241090 34420008 */ ori $v0, $v0, 8 -.L80241094: -/* A50094 80241094 AE820000 */ sw $v0, ($s4) -/* A50098 80241098 8E4200B0 */ lw $v0, 0xb0($s2) -/* A5009C 8024109C 30420004 */ andi $v0, $v0, 4 -/* A500A0 802410A0 10400008 */ beqz $v0, .L802410C4 -/* A500A4 802410A4 24020063 */ addiu $v0, $zero, 0x63 -/* A500A8 802410A8 AE620070 */ sw $v0, 0x70($s3) -/* A500AC 802410AC AE600074 */ sw $zero, 0x74($s3) -/* A500B0 802410B0 8E4200B0 */ lw $v0, 0xb0($s2) -/* A500B4 802410B4 2403FFFB */ addiu $v1, $zero, -5 -/* A500B8 802410B8 00431024 */ and $v0, $v0, $v1 -/* A500BC 802410BC 08090437 */ j .L802410DC -/* A500C0 802410C0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802410C4: -/* A500C4 802410C4 8E420000 */ lw $v0, ($s2) -/* A500C8 802410C8 3C034000 */ lui $v1, 0x4000 -/* A500CC 802410CC 00431024 */ and $v0, $v0, $v1 -/* A500D0 802410D0 10400002 */ beqz $v0, .L802410DC -/* A500D4 802410D4 2402000C */ addiu $v0, $zero, 0xc -/* A500D8 802410D8 AE620070 */ sw $v0, 0x70($s3) -.L802410DC: -/* A500DC 802410DC 3C05BFFF */ lui $a1, 0xbfff -/* A500E0 802410E0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A500E4 802410E4 2404FFFB */ addiu $a0, $zero, -5 -/* A500E8 802410E8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A500EC 802410EC 8E430000 */ lw $v1, ($s2) -/* A500F0 802410F0 00441024 */ and $v0, $v0, $a0 -/* A500F4 802410F4 00651824 */ and $v1, $v1, $a1 -/* A500F8 802410F8 AE4200B0 */ sw $v0, 0xb0($s2) -/* A500FC 802410FC AE430000 */ sw $v1, ($s2) -.L80241100: -/* A50100 80241100 8E630070 */ lw $v1, 0x70($s3) -/* A50104 80241104 2C620064 */ sltiu $v0, $v1, 0x64 -/* A50108 80241108 10400060 */ beqz $v0, .L8024128C_A5028C -/* A5010C 8024110C 00031080 */ sll $v0, $v1, 2 -/* A50110 80241110 3C018024 */ lui $at, %hi(jtbl_802427E8_A517E8) -/* A50114 80241114 00220821 */ addu $at, $at, $v0 -/* A50118 80241118 8C2227E8 */ lw $v0, %lo(jtbl_802427E8_A517E8)($at) -/* A5011C 8024111C 00400008 */ jr $v0 -/* A50120 80241120 00000000 */ nop -.L80241124_A50124: -/* A50124 80241124 0260202D */ daddu $a0, $s3, $zero -/* A50128 80241128 0200282D */ daddu $a1, $s0, $zero -/* A5012C 8024112C 0C012568 */ jal func_800495A0 -/* A50130 80241130 02A0302D */ daddu $a2, $s5, $zero -.L80241134_A50134: -/* A50134 80241134 0260202D */ daddu $a0, $s3, $zero -/* A50138 80241138 0200282D */ daddu $a1, $s0, $zero -/* A5013C 8024113C 0C0125AE */ jal func_800496B8 -/* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero -/* A50144 80241144 080904A3 */ j .L8024128C_A5028C -/* A50148 80241148 00000000 */ nop -.L8024114C_A5014C: -/* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero -/* A50150 80241150 0200282D */ daddu $a1, $s0, $zero -/* A50154 80241154 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A50158 80241158 02A0302D */ daddu $a2, $s5, $zero -.L8024115C_A5015C: -/* A5015C 8024115C 0260202D */ daddu $a0, $s3, $zero -/* A50160 80241160 0200282D */ daddu $a1, $s0, $zero -/* A50164 80241164 0C012701 */ jal func_80049C04 -/* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero -/* A5016C 8024116C 080904A3 */ j .L8024128C_A5028C -/* A50170 80241170 00000000 */ nop -.L80241174_A50174: -/* A50174 80241174 0260202D */ daddu $a0, $s3, $zero -/* A50178 80241178 0200282D */ daddu $a1, $s0, $zero -/* A5017C 8024117C 0C01278F */ jal func_80049E3C -/* A50180 80241180 02A0302D */ daddu $a2, $s5, $zero -.L80241184_A50184: -/* A50184 80241184 0260202D */ daddu $a0, $s3, $zero -/* A50188 80241188 0200282D */ daddu $a1, $s0, $zero -/* A5018C 8024118C 0C0127B3 */ jal func_80049ECC -/* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero -/* A50194 80241194 080904A3 */ j .L8024128C_A5028C -/* A50198 80241198 00000000 */ nop -.L8024119C_A5019C: -/* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A501A0 802411A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A501A4 802411A4 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A501A8 802411A8 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A501AC 802411AC 8C460028 */ lw $a2, 0x28($v0) -/* A501B0 802411B0 0C00A7B5 */ jal dist2D -/* A501B4 802411B4 8C470030 */ lw $a3, 0x30($v0) -/* A501B8 802411B8 8E42006C */ lw $v0, 0x6c($s2) -/* A501BC 802411BC 10400008 */ beqz $v0, .L802411E0 -/* A501C0 802411C0 46000086 */ mov.s $f2, $f0 -/* A501C4 802411C4 44820000 */ mtc1 $v0, $f0 -/* A501C8 802411C8 00000000 */ nop -/* A501CC 802411CC 46800020 */ cvt.s.w $f0, $f0 -/* A501D0 802411D0 4602003C */ c.lt.s $f0, $f2 -/* A501D4 802411D4 00000000 */ nop -/* A501D8 802411D8 4500000B */ bc1f .L80241208 -/* A501DC 802411DC 0260202D */ daddu $a0, $s3, $zero -.L802411E0: -/* A501E0 802411E0 0260202D */ daddu $a0, $s3, $zero -/* A501E4 802411E4 8E050024 */ lw $a1, 0x24($s0) -/* A501E8 802411E8 8E060028 */ lw $a2, 0x28($s0) -/* A501EC 802411EC 0C0900A4 */ jal func_80240290_A4F290 -/* A501F0 802411F0 02A0382D */ daddu $a3, $s5, $zero -/* A501F4 802411F4 8E630070 */ lw $v1, 0x70($s3) -/* A501F8 802411F8 2402000C */ addiu $v0, $zero, 0xc -/* A501FC 802411FC 14620023 */ bne $v1, $v0, .L8024128C_A5028C -/* A50200 80241200 00000000 */ nop -/* A50204 80241204 0260202D */ daddu $a0, $s3, $zero -.L80241208: -/* A50208 80241208 0200282D */ daddu $a1, $s0, $zero -/* A5020C 8024120C 0C0127DF */ jal func_80049F7C -/* A50210 80241210 02A0302D */ daddu $a2, $s5, $zero -.L80241214_A50214: -/* A50214 80241214 0260202D */ daddu $a0, $s3, $zero -/* A50218 80241218 0200282D */ daddu $a1, $s0, $zero -/* A5021C 8024121C 0C012849 */ jal func_8004A124 -/* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero -/* A50224 80241224 080904A3 */ j .L8024128C_A5028C -/* A50228 80241228 00000000 */ nop -.L8024122C_A5022C: -/* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero -/* A50230 80241230 0200282D */ daddu $a1, $s0, $zero -/* A50234 80241234 0C0128FA */ jal func_8004A3E8 -/* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A5023C 8024123C 080904A3 */ j .L8024128C_A5028C -/* A50240 80241240 00000000 */ nop -.L80241244_A50244: -/* A50244 80241244 0C0900F5 */ jal func_802403D4_A4F3D4 -/* A50248 80241248 0260202D */ daddu $a0, $s3, $zero -/* A5024C 8024124C 080904A3 */ j .L8024128C_A5028C -/* A50250 80241250 00000000 */ nop -.L80241254_A50254: -/* A50254 80241254 0C090135 */ jal kpa_09_UnkSetDurationFunc -/* A50258 80241258 0260202D */ daddu $a0, $s3, $zero -/* A5025C 8024125C 080904A3 */ j .L8024128C_A5028C -/* A50260 80241260 00000000 */ nop -.L80241264_A50264: -/* A50264 80241264 0C090146 */ jal kpa_09_UnkNpcAIFunc9 -/* A50268 80241268 0260202D */ daddu $a0, $s3, $zero -/* A5026C 8024126C 080904A3 */ j .L8024128C_A5028C -/* A50270 80241270 00000000 */ nop -.L80241274_A50274: -/* A50274 80241274 0C09016E */ jal kpa_09_UnkDurationCheck -/* A50278 80241278 0260202D */ daddu $a0, $s3, $zero -/* A5027C 8024127C 080904A3 */ j .L8024128C_A5028C -/* A50280 80241280 00000000 */ nop -.L80241284_A50284: -/* A50284 80241284 0C0129CF */ jal func_8004A73C -/* A50288 80241288 0260202D */ daddu $a0, $s3, $zero -.L8024128C_A5028C: -/* A5028C 8024128C 8FBF0048 */ lw $ra, 0x48($sp) -/* A50290 80241290 8FB50044 */ lw $s5, 0x44($sp) -/* A50294 80241294 8FB40040 */ lw $s4, 0x40($sp) -/* A50298 80241298 8FB3003C */ lw $s3, 0x3c($sp) -/* A5029C 8024129C 8FB20038 */ lw $s2, 0x38($sp) -/* A502A0 802412A0 8FB10034 */ lw $s1, 0x34($sp) -/* A502A4 802412A4 8FB00030 */ lw $s0, 0x30($sp) -/* A502A8 802412A8 0000102D */ daddu $v0, $zero, $zero -/* A502AC 802412AC 03E00008 */ jr $ra -/* A502B0 802412B0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s deleted file mode 100644 index 99561620ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245B20_A99260 -.double 180.0 - -dlabel D_80245B28_A99268 -.double 75.0 - -.section .text - -glabel func_80240310_A93A50 -/* A93A50 80240310 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A93A54 80240314 AFB10014 */ sw $s1, 0x14($sp) -/* A93A58 80240318 0080882D */ daddu $s1, $a0, $zero -/* A93A5C 8024031C 3C05800B */ lui $a1, %hi(gCameras) -/* A93A60 80240320 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A93A64 80240324 AFBF0020 */ sw $ra, 0x20($sp) -/* A93A68 80240328 AFB3001C */ sw $s3, 0x1c($sp) -/* A93A6C 8024032C AFB20018 */ sw $s2, 0x18($sp) -/* A93A70 80240330 AFB00010 */ sw $s0, 0x10($sp) -/* A93A74 80240334 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A93A78 80240338 8E330148 */ lw $s3, 0x148($s1) -/* A93A7C 8024033C 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A93A80 80240340 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A93A84 80240344 8E30000C */ lw $s0, 0xc($s1) -/* A93A88 80240348 00031080 */ sll $v0, $v1, 2 -/* A93A8C 8024034C 00431021 */ addu $v0, $v0, $v1 -/* A93A90 80240350 00021080 */ sll $v0, $v0, 2 -/* A93A94 80240354 00431023 */ subu $v0, $v0, $v1 -/* A93A98 80240358 000218C0 */ sll $v1, $v0, 3 -/* A93A9C 8024035C 00431021 */ addu $v0, $v0, $v1 -/* A93AA0 80240360 000210C0 */ sll $v0, $v0, 3 -/* A93AA4 80240364 86640008 */ lh $a0, 8($s3) -/* A93AA8 80240368 0C00EABB */ jal get_npc_unsafe -/* A93AAC 8024036C 00459021 */ addu $s2, $v0, $a1 -/* A93AB0 80240370 0220202D */ daddu $a0, $s1, $zero -/* A93AB4 80240374 8E050000 */ lw $a1, ($s0) -/* A93AB8 80240378 0C0B1EAF */ jal evt_get_variable -/* A93ABC 8024037C 0040802D */ daddu $s0, $v0, $zero -/* A93AC0 80240380 0260202D */ daddu $a0, $s3, $zero -/* A93AC4 80240384 8C460024 */ lw $a2, 0x24($v0) -/* A93AC8 80240388 8C470028 */ lw $a3, 0x28($v0) -/* A93ACC 8024038C 0C0124FB */ jal func_800493EC -/* A93AD0 80240390 0000282D */ daddu $a1, $zero, $zero -/* A93AD4 80240394 10400052 */ beqz $v0, .L802404E0 -/* A93AD8 80240398 2402FFFF */ addiu $v0, $zero, -1 -/* A93ADC 8024039C C64C006C */ lwc1 $f12, 0x6c($s2) -/* A93AE0 802403A0 C60E000C */ lwc1 $f14, 0xc($s0) -/* A93AE4 802403A4 3C014387 */ lui $at, 0x4387 -/* A93AE8 802403A8 4481A000 */ mtc1 $at, $f20 -/* A93AEC 802403AC 0C00A70A */ jal get_clamped_angle_diff -/* A93AF0 802403B0 00000000 */ nop -/* A93AF4 802403B4 0C00A6C9 */ jal clamp_angle -/* A93AF8 802403B8 46000306 */ mov.s $f12, $f0 -/* A93AFC 802403BC 3C018024 */ lui $at, %hi(D_80245B20_A99260) -/* A93B00 802403C0 D4225B20 */ ldc1 $f2, %lo(D_80245B20_A99260)($at) -/* A93B04 802403C4 46000021 */ cvt.d.s $f0, $f0 -/* A93B08 802403C8 4622003C */ c.lt.d $f0, $f2 -/* A93B0C 802403CC 00000000 */ nop -/* A93B10 802403D0 45000003 */ bc1f .L802403E0 -/* A93B14 802403D4 00000000 */ nop -/* A93B18 802403D8 3C0142B4 */ lui $at, 0x42b4 -/* A93B1C 802403DC 4481A000 */ mtc1 $at, $f20 -.L802403E0: -/* A93B20 802403E0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A93B24 802403E4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A93B28 802403E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A93B2C 802403EC 8E220000 */ lw $v0, ($s1) -/* A93B30 802403F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A93B34 802403F4 8C460028 */ lw $a2, 0x28($v0) -/* A93B38 802403F8 0C00A720 */ jal atan2 -/* A93B3C 802403FC 8C470030 */ lw $a3, 0x30($v0) -/* A93B40 80240400 4600A306 */ mov.s $f12, $f20 -/* A93B44 80240404 0C00A70A */ jal get_clamped_angle_diff -/* A93B48 80240408 46000386 */ mov.s $f14, $f0 -/* A93B4C 8024040C 46000005 */ abs.s $f0, $f0 -/* A93B50 80240410 3C018024 */ lui $at, %hi(D_80245B28_A99268) -/* A93B54 80240414 D4225B28 */ ldc1 $f2, %lo(D_80245B28_A99268)($at) -/* A93B58 80240418 46000021 */ cvt.d.s $f0, $f0 -/* A93B5C 8024041C 4620103C */ c.lt.d $f2, $f0 -/* A93B60 80240420 00000000 */ nop -/* A93B64 80240424 4501002E */ bc1t .L802404E0 -/* A93B68 80240428 2402FFFF */ addiu $v0, $zero, -1 -/* A93B6C 8024042C 8E220000 */ lw $v0, ($s1) -/* A93B70 80240430 C600003C */ lwc1 $f0, 0x3c($s0) -/* A93B74 80240434 C442002C */ lwc1 $f2, 0x2c($v0) -/* A93B78 80240438 860200A8 */ lh $v0, 0xa8($s0) -/* A93B7C 8024043C 46020001 */ sub.s $f0, $f0, $f2 -/* A93B80 80240440 44821000 */ mtc1 $v0, $f2 -/* A93B84 80240444 00000000 */ nop -/* A93B88 80240448 468010A1 */ cvt.d.w $f2, $f2 -/* A93B8C 8024044C 46221080 */ add.d $f2, $f2, $f2 -/* A93B90 80240450 46000005 */ abs.s $f0, $f0 -/* A93B94 80240454 46000021 */ cvt.d.s $f0, $f0 -/* A93B98 80240458 4620103E */ c.le.d $f2, $f0 -/* A93B9C 8024045C 00000000 */ nop -/* A93BA0 80240460 4501001F */ bc1t .L802404E0 -/* A93BA4 80240464 2402FFFF */ addiu $v0, $zero, -1 -/* A93BA8 80240468 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A93BAC 8024046C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A93BB0 80240470 24020009 */ addiu $v0, $zero, 9 -/* A93BB4 80240474 10620019 */ beq $v1, $v0, .L802404DC -/* A93BB8 80240478 24020007 */ addiu $v0, $zero, 7 -/* A93BBC 8024047C 14620005 */ bne $v1, $v0, .L80240494 -/* A93BC0 80240480 2402FFFF */ addiu $v0, $zero, -1 -/* A93BC4 80240484 08090138 */ j .L802404E0 -/* A93BC8 80240488 00000000 */ nop -.L8024048C: -/* A93BCC 8024048C 08090138 */ j .L802404E0 -/* A93BD0 80240490 0240102D */ daddu $v0, $s2, $zero -.L80240494: -/* A93BD4 80240494 8E620078 */ lw $v0, 0x78($s3) -/* A93BD8 80240498 18400010 */ blez $v0, .L802404DC -/* A93BDC 8024049C 0000882D */ daddu $s1, $zero, $zero -.L802404A0: -/* A93BE0 802404A0 86620008 */ lh $v0, 8($s3) -/* A93BE4 802404A4 00511021 */ addu $v0, $v0, $s1 -/* A93BE8 802404A8 24520001 */ addiu $s2, $v0, 1 -/* A93BEC 802404AC 0C00FB3A */ jal get_enemy -/* A93BF0 802404B0 0240202D */ daddu $a0, $s2, $zero -/* A93BF4 802404B4 0240202D */ daddu $a0, $s2, $zero -/* A93BF8 802404B8 0C00EABB */ jal get_npc_unsafe -/* A93BFC 802404BC 0040802D */ daddu $s0, $v0, $zero -/* A93C00 802404C0 8E02006C */ lw $v0, 0x6c($s0) -/* A93C04 802404C4 1040FFF1 */ beqz $v0, .L8024048C -/* A93C08 802404C8 26310001 */ addiu $s1, $s1, 1 -/* A93C0C 802404CC 8E620078 */ lw $v0, 0x78($s3) -/* A93C10 802404D0 0222102A */ slt $v0, $s1, $v0 -/* A93C14 802404D4 1440FFF2 */ bnez $v0, .L802404A0 -/* A93C18 802404D8 00000000 */ nop -.L802404DC: -/* A93C1C 802404DC 2402FFFF */ addiu $v0, $zero, -1 -.L802404E0: -/* A93C20 802404E0 8FBF0020 */ lw $ra, 0x20($sp) -/* A93C24 802404E4 8FB3001C */ lw $s3, 0x1c($sp) -/* A93C28 802404E8 8FB20018 */ lw $s2, 0x18($sp) -/* A93C2C 802404EC 8FB10014 */ lw $s1, 0x14($sp) -/* A93C30 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* A93C34 802404F4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A93C38 802404F8 03E00008 */ jr $ra -/* A93C3C 802404FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s deleted file mode 100644 index a76396ff48..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_A93C40 -/* A93C40 80240500 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A93C44 80240504 AFB20038 */ sw $s2, 0x38($sp) -/* A93C48 80240508 0080902D */ daddu $s2, $a0, $zero -/* A93C4C 8024050C AFB00030 */ sw $s0, 0x30($sp) -/* A93C50 80240510 AFBF003C */ sw $ra, 0x3c($sp) -/* A93C54 80240514 AFB10034 */ sw $s1, 0x34($sp) -/* A93C58 80240518 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A93C5C 8024051C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A93C60 80240520 8E510148 */ lw $s1, 0x148($s2) -/* A93C64 80240524 4485A000 */ mtc1 $a1, $f20 -/* A93C68 80240528 86240008 */ lh $a0, 8($s1) -/* A93C6C 8024052C 4486B000 */ mtc1 $a2, $f22 -/* A93C70 80240530 0C00EABB */ jal get_npc_unsafe -/* A93C74 80240534 00E0802D */ daddu $s0, $a3, $zero -/* A93C78 80240538 0200202D */ daddu $a0, $s0, $zero -/* A93C7C 8024053C 0220282D */ daddu $a1, $s1, $zero -/* A93C80 80240540 24030001 */ addiu $v1, $zero, 1 -/* A93C84 80240544 4406A000 */ mfc1 $a2, $f20 -/* A93C88 80240548 4407B000 */ mfc1 $a3, $f22 -/* A93C8C 8024054C 0040802D */ daddu $s0, $v0, $zero -/* A93C90 80240550 0C01242D */ jal func_800490B4 -/* A93C94 80240554 AFA30010 */ sw $v1, 0x10($sp) -/* A93C98 80240558 1440001D */ bnez $v0, .L802405D0 -/* A93C9C 8024055C 24040002 */ addiu $a0, $zero, 2 -/* A93CA0 80240560 0200282D */ daddu $a1, $s0, $zero -/* A93CA4 80240564 0000302D */ daddu $a2, $zero, $zero -/* A93CA8 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* A93CAC 8024056C 3C013F80 */ lui $at, 0x3f80 -/* A93CB0 80240570 44810000 */ mtc1 $at, $f0 -/* A93CB4 80240574 3C014000 */ lui $at, 0x4000 -/* A93CB8 80240578 44811000 */ mtc1 $at, $f2 -/* A93CBC 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* A93CC0 80240580 44812000 */ mtc1 $at, $f4 -/* A93CC4 80240584 2402000F */ addiu $v0, $zero, 0xf -/* A93CC8 80240588 AFA2001C */ sw $v0, 0x1c($sp) -/* A93CCC 8024058C 44833000 */ mtc1 $v1, $f6 -/* A93CD0 80240590 00000000 */ nop -/* A93CD4 80240594 468031A0 */ cvt.s.w $f6, $f6 -/* A93CD8 80240598 44073000 */ mfc1 $a3, $f6 -/* A93CDC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 -/* A93CE0 802405A0 AFA20020 */ sw $v0, 0x20($sp) -/* A93CE4 802405A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A93CE8 802405A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* A93CEC 802405AC 0C01BFA4 */ jal fx_emote -/* A93CF0 802405B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A93CF4 802405B4 8E2200CC */ lw $v0, 0xcc($s1) -/* A93CF8 802405B8 8C430000 */ lw $v1, ($v0) -/* A93CFC 802405BC 24020014 */ addiu $v0, $zero, 0x14 -/* A93D00 802405C0 A602008E */ sh $v0, 0x8e($s0) -/* A93D04 802405C4 24020021 */ addiu $v0, $zero, 0x21 -/* A93D08 802405C8 08090188 */ j .L80240620 -/* A93D0C 802405CC AE030028 */ sw $v1, 0x28($s0) -.L802405D0: -/* A93D10 802405D0 0C0900C4 */ jal func_80240310_A93A50 -/* A93D14 802405D4 0240202D */ daddu $a0, $s2, $zero -/* A93D18 802405D8 0040202D */ daddu $a0, $v0, $zero -/* A93D1C 802405DC 2402FFFF */ addiu $v0, $zero, -1 -/* A93D20 802405E0 10820010 */ beq $a0, $v0, .L80240624 -/* A93D24 802405E4 00000000 */ nop -/* A93D28 802405E8 0C00FB3A */ jal get_enemy -/* A93D2C 802405EC 00000000 */ nop -/* A93D30 802405F0 8C42006C */ lw $v0, 0x6c($v0) -/* A93D34 802405F4 1440000B */ bnez $v0, .L80240624 -/* A93D38 802405F8 00000000 */ nop -/* A93D3C 802405FC 8602008C */ lh $v0, 0x8c($s0) -/* A93D40 80240600 14400008 */ bnez $v0, .L80240624 -/* A93D44 80240604 00000000 */ nop -/* A93D48 80240608 8E2200CC */ lw $v0, 0xcc($s1) -/* A93D4C 8024060C 8C420020 */ lw $v0, 0x20($v0) -/* A93D50 80240610 AE020028 */ sw $v0, 0x28($s0) -/* A93D54 80240614 96220072 */ lhu $v0, 0x72($s1) -/* A93D58 80240618 A602008E */ sh $v0, 0x8e($s0) -/* A93D5C 8024061C 2402001E */ addiu $v0, $zero, 0x1e -.L80240620: -/* A93D60 80240620 AE420070 */ sw $v0, 0x70($s2) -.L80240624: -/* A93D64 80240624 8FBF003C */ lw $ra, 0x3c($sp) -/* A93D68 80240628 8FB20038 */ lw $s2, 0x38($sp) -/* A93D6C 8024062C 8FB10034 */ lw $s1, 0x34($sp) -/* A93D70 80240630 8FB00030 */ lw $s0, 0x30($sp) -/* A93D74 80240634 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A93D78 80240638 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A93D7C 8024063C 03E00008 */ jr $ra -/* A93D80 80240640 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s deleted file mode 100644 index eeabd35002..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644_A93D84 -/* A93D84 80240644 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A93D88 80240648 AFB20038 */ sw $s2, 0x38($sp) -/* A93D8C 8024064C 0080902D */ daddu $s2, $a0, $zero -/* A93D90 80240650 AFBF003C */ sw $ra, 0x3c($sp) -/* A93D94 80240654 AFB10034 */ sw $s1, 0x34($sp) -/* A93D98 80240658 AFB00030 */ sw $s0, 0x30($sp) -/* A93D9C 8024065C 8E510148 */ lw $s1, 0x148($s2) -/* A93DA0 80240660 0C00EABB */ jal get_npc_unsafe -/* A93DA4 80240664 86240008 */ lh $a0, 8($s1) -/* A93DA8 80240668 0040802D */ daddu $s0, $v0, $zero -/* A93DAC 8024066C 9602008E */ lhu $v0, 0x8e($s0) -/* A93DB0 80240670 2442FFFF */ addiu $v0, $v0, -1 -/* A93DB4 80240674 A602008E */ sh $v0, 0x8e($s0) -/* A93DB8 80240678 00021400 */ sll $v0, $v0, 0x10 -/* A93DBC 8024067C 1C40002B */ bgtz $v0, .L8024072C -/* A93DC0 80240680 00000000 */ nop -/* A93DC4 80240684 0C0900C4 */ jal func_80240310_A93A50 -/* A93DC8 80240688 0240202D */ daddu $a0, $s2, $zero -/* A93DCC 8024068C 0040202D */ daddu $a0, $v0, $zero -/* A93DD0 80240690 0481001A */ bgez $a0, .L802406FC -/* A93DD4 80240694 2402000F */ addiu $v0, $zero, 0xf -/* A93DD8 80240698 24040002 */ addiu $a0, $zero, 2 -/* A93DDC 8024069C 860300A8 */ lh $v1, 0xa8($s0) -/* A93DE0 802406A0 AFA2001C */ sw $v0, 0x1c($sp) -/* A93DE4 802406A4 27A20028 */ addiu $v0, $sp, 0x28 -/* A93DE8 802406A8 0200282D */ daddu $a1, $s0, $zero -/* A93DEC 802406AC 3C013F80 */ lui $at, 0x3f80 -/* A93DF0 802406B0 44810000 */ mtc1 $at, $f0 -/* A93DF4 802406B4 3C014000 */ lui $at, 0x4000 -/* A93DF8 802406B8 44811000 */ mtc1 $at, $f2 -/* A93DFC 802406BC 3C01C1A0 */ lui $at, 0xc1a0 -/* A93E00 802406C0 44812000 */ mtc1 $at, $f4 -/* A93E04 802406C4 44833000 */ mtc1 $v1, $f6 -/* A93E08 802406C8 00000000 */ nop -/* A93E0C 802406CC 468031A0 */ cvt.s.w $f6, $f6 -/* A93E10 802406D0 44073000 */ mfc1 $a3, $f6 -/* A93E14 802406D4 0000302D */ daddu $a2, $zero, $zero -/* A93E18 802406D8 AFA20020 */ sw $v0, 0x20($sp) -/* A93E1C 802406DC E7A00010 */ swc1 $f0, 0x10($sp) -/* A93E20 802406E0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A93E24 802406E4 0C01BFA4 */ jal fx_emote -/* A93E28 802406E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A93E2C 802406EC 8E2200CC */ lw $v0, 0xcc($s1) -/* A93E30 802406F0 8C420000 */ lw $v0, ($v0) -/* A93E34 802406F4 080901C7 */ j .L8024071C -/* A93E38 802406F8 AE020028 */ sw $v0, 0x28($s0) -.L802406FC: -/* A93E3C 802406FC 8E2200CC */ lw $v0, 0xcc($s1) -/* A93E40 80240700 8C420024 */ lw $v0, 0x24($v0) -/* A93E44 80240704 0C00FB3A */ jal get_enemy -/* A93E48 80240708 AE020028 */ sw $v0, 0x28($s0) -/* A93E4C 8024070C 86240008 */ lh $a0, 8($s1) -/* A93E50 80240710 24030001 */ addiu $v1, $zero, 1 -/* A93E54 80240714 AC43006C */ sw $v1, 0x6c($v0) -/* A93E58 80240718 AC44007C */ sw $a0, 0x7c($v0) -.L8024071C: -/* A93E5C 8024071C 96220076 */ lhu $v0, 0x76($s1) -/* A93E60 80240720 A602008E */ sh $v0, 0x8e($s0) -/* A93E64 80240724 24020021 */ addiu $v0, $zero, 0x21 -/* A93E68 80240728 AE420070 */ sw $v0, 0x70($s2) -.L8024072C: -/* A93E6C 8024072C 8FBF003C */ lw $ra, 0x3c($sp) -/* A93E70 80240730 8FB20038 */ lw $s2, 0x38($sp) -/* A93E74 80240734 8FB10034 */ lw $s1, 0x34($sp) -/* A93E78 80240738 8FB00030 */ lw $s0, 0x30($sp) -/* A93E7C 8024073C 03E00008 */ jr $ra -/* A93E80 80240740 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s deleted file mode 100644 index b2a0bbdcf8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245B48_A99288 -.word .L80241394_A94AD4, .L802413A4_A94AE4, .L802413BC_A94AFC, .L802413CC_A94B0C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802413E4_A94B24, .L802413F4_A94B34, .L8024140C_A94B4C, .L80241484_A94BC4, .L8024149C_A94BDC, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414B4_A94BF4, .L802414C4_A94C04, .L802414D4_A94C14, .L802414E4_A94C24, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414FC_A94C3C, .L802414F4_A94C34 - -.section .text - -glabel func_80241204_A94944 -/* A94944 80241204 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A94948 80241208 AFB3003C */ sw $s3, 0x3c($sp) -/* A9494C 8024120C 0080982D */ daddu $s3, $a0, $zero -/* A94950 80241210 AFBF0048 */ sw $ra, 0x48($sp) -/* A94954 80241214 AFB50044 */ sw $s5, 0x44($sp) -/* A94958 80241218 AFB40040 */ sw $s4, 0x40($sp) -/* A9495C 8024121C AFB20038 */ sw $s2, 0x38($sp) -/* A94960 80241220 AFB10034 */ sw $s1, 0x34($sp) -/* A94964 80241224 AFB00030 */ sw $s0, 0x30($sp) -/* A94968 80241228 8E720148 */ lw $s2, 0x148($s3) -/* A9496C 8024122C 86440008 */ lh $a0, 8($s2) -/* A94970 80241230 8E70000C */ lw $s0, 0xc($s3) -/* A94974 80241234 0C00EABB */ jal get_npc_unsafe -/* A94978 80241238 00A0882D */ daddu $s1, $a1, $zero -/* A9497C 8024123C 0260202D */ daddu $a0, $s3, $zero -/* A94980 80241240 8E050000 */ lw $a1, ($s0) -/* A94984 80241244 0C0B1EAF */ jal evt_get_variable -/* A94988 80241248 0040A02D */ daddu $s4, $v0, $zero -/* A9498C 8024124C AFA00010 */ sw $zero, 0x10($sp) -/* A94990 80241250 8E4300D0 */ lw $v1, 0xd0($s2) -/* A94994 80241254 8C630030 */ lw $v1, 0x30($v1) -/* A94998 80241258 AFA30014 */ sw $v1, 0x14($sp) -/* A9499C 8024125C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949A0 80241260 8C63001C */ lw $v1, 0x1c($v1) -/* A949A4 80241264 AFA30018 */ sw $v1, 0x18($sp) -/* A949A8 80241268 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949AC 8024126C 8C630024 */ lw $v1, 0x24($v1) -/* A949B0 80241270 AFA3001C */ sw $v1, 0x1c($sp) -/* A949B4 80241274 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949B8 80241278 8C630028 */ lw $v1, 0x28($v1) -/* A949BC 8024127C 27B50010 */ addiu $s5, $sp, 0x10 -/* A949C0 80241280 AFA30020 */ sw $v1, 0x20($sp) -/* A949C4 80241284 8E4300D0 */ lw $v1, 0xd0($s2) -/* A949C8 80241288 3C014220 */ lui $at, 0x4220 -/* A949CC 8024128C 44810000 */ mtc1 $at, $f0 -/* A949D0 80241290 8C63002C */ lw $v1, 0x2c($v1) -/* A949D4 80241294 0040802D */ daddu $s0, $v0, $zero -/* A949D8 80241298 E7A00028 */ swc1 $f0, 0x28($sp) -/* A949DC 8024129C A7A0002C */ sh $zero, 0x2c($sp) -/* A949E0 802412A0 16200005 */ bnez $s1, .L802412B8 -/* A949E4 802412A4 AFA30024 */ sw $v1, 0x24($sp) -/* A949E8 802412A8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A949EC 802412AC 30420004 */ andi $v0, $v0, 4 -/* A949F0 802412B0 1040002F */ beqz $v0, .L80241370 -/* A949F4 802412B4 00000000 */ nop -.L802412B8: -/* A949F8 802412B8 2404F7FF */ addiu $a0, $zero, -0x801 -/* A949FC 802412BC AE600070 */ sw $zero, 0x70($s3) -/* A94A00 802412C0 A680008E */ sh $zero, 0x8e($s4) -/* A94A04 802412C4 8E4200CC */ lw $v0, 0xcc($s2) -/* A94A08 802412C8 8E830000 */ lw $v1, ($s4) -/* A94A0C 802412CC 8C420000 */ lw $v0, ($v0) -/* A94A10 802412D0 00641824 */ and $v1, $v1, $a0 -/* A94A14 802412D4 AE830000 */ sw $v1, ($s4) -/* A94A18 802412D8 AE820028 */ sw $v0, 0x28($s4) -/* A94A1C 802412DC 8E4200D0 */ lw $v0, 0xd0($s2) -/* A94A20 802412E0 8C420034 */ lw $v0, 0x34($v0) -/* A94A24 802412E4 54400005 */ bnel $v0, $zero, .L802412FC -/* A94A28 802412E8 2402FDFF */ addiu $v0, $zero, -0x201 -/* A94A2C 802412EC 34620200 */ ori $v0, $v1, 0x200 -/* A94A30 802412F0 2403FFF7 */ addiu $v1, $zero, -9 -/* A94A34 802412F4 080904C1 */ j .L80241304 -/* A94A38 802412F8 00431024 */ and $v0, $v0, $v1 -.L802412FC: -/* A94A3C 802412FC 00621024 */ and $v0, $v1, $v0 -/* A94A40 80241300 34420008 */ ori $v0, $v0, 8 -.L80241304: -/* A94A44 80241304 AE820000 */ sw $v0, ($s4) -/* A94A48 80241308 8E4200B0 */ lw $v0, 0xb0($s2) -/* A94A4C 8024130C 30420004 */ andi $v0, $v0, 4 -/* A94A50 80241310 10400008 */ beqz $v0, .L80241334 -/* A94A54 80241314 24020063 */ addiu $v0, $zero, 0x63 -/* A94A58 80241318 AE620070 */ sw $v0, 0x70($s3) -/* A94A5C 8024131C AE600074 */ sw $zero, 0x74($s3) -/* A94A60 80241320 8E4200B0 */ lw $v0, 0xb0($s2) -/* A94A64 80241324 2403FFFB */ addiu $v1, $zero, -5 -/* A94A68 80241328 00431024 */ and $v0, $v0, $v1 -/* A94A6C 8024132C 080904D3 */ j .L8024134C -/* A94A70 80241330 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241334: -/* A94A74 80241334 8E420000 */ lw $v0, ($s2) -/* A94A78 80241338 3C034000 */ lui $v1, 0x4000 -/* A94A7C 8024133C 00431024 */ and $v0, $v0, $v1 -/* A94A80 80241340 10400002 */ beqz $v0, .L8024134C -/* A94A84 80241344 2402000C */ addiu $v0, $zero, 0xc -/* A94A88 80241348 AE620070 */ sw $v0, 0x70($s3) -.L8024134C: -/* A94A8C 8024134C 3C05BFFF */ lui $a1, 0xbfff -/* A94A90 80241350 34A5FFFF */ ori $a1, $a1, 0xffff -/* A94A94 80241354 2404FFFB */ addiu $a0, $zero, -5 -/* A94A98 80241358 8E4200B0 */ lw $v0, 0xb0($s2) -/* A94A9C 8024135C 8E430000 */ lw $v1, ($s2) -/* A94AA0 80241360 00441024 */ and $v0, $v0, $a0 -/* A94AA4 80241364 00651824 */ and $v1, $v1, $a1 -/* A94AA8 80241368 AE4200B0 */ sw $v0, 0xb0($s2) -/* A94AAC 8024136C AE430000 */ sw $v1, ($s2) -.L80241370: -/* A94AB0 80241370 8E630070 */ lw $v1, 0x70($s3) -/* A94AB4 80241374 2C620064 */ sltiu $v0, $v1, 0x64 -/* A94AB8 80241378 10400060 */ beqz $v0, .L802414FC_A94C3C -/* A94ABC 8024137C 00031080 */ sll $v0, $v1, 2 -/* A94AC0 80241380 3C018024 */ lui $at, %hi(jtbl_80245B48_A99288) -/* A94AC4 80241384 00220821 */ addu $at, $at, $v0 -/* A94AC8 80241388 8C225B48 */ lw $v0, %lo(jtbl_80245B48_A99288)($at) -/* A94ACC 8024138C 00400008 */ jr $v0 -/* A94AD0 80241390 00000000 */ nop -.L80241394_A94AD4: -/* A94AD4 80241394 0260202D */ daddu $a0, $s3, $zero -/* A94AD8 80241398 0200282D */ daddu $a1, $s0, $zero -/* A94ADC 8024139C 0C012568 */ jal func_800495A0 -/* A94AE0 802413A0 02A0302D */ daddu $a2, $s5, $zero -.L802413A4_A94AE4: -/* A94AE4 802413A4 0260202D */ daddu $a0, $s3, $zero -/* A94AE8 802413A8 0200282D */ daddu $a1, $s0, $zero -/* A94AEC 802413AC 0C0125AE */ jal func_800496B8 -/* A94AF0 802413B0 02A0302D */ daddu $a2, $s5, $zero -/* A94AF4 802413B4 0809053F */ j .L802414FC_A94C3C -/* A94AF8 802413B8 00000000 */ nop -.L802413BC_A94AFC: -/* A94AFC 802413BC 0260202D */ daddu $a0, $s3, $zero -/* A94B00 802413C0 0200282D */ daddu $a1, $s0, $zero -/* A94B04 802413C4 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A94B08 802413C8 02A0302D */ daddu $a2, $s5, $zero -.L802413CC_A94B0C: -/* A94B0C 802413CC 0260202D */ daddu $a0, $s3, $zero -/* A94B10 802413D0 0200282D */ daddu $a1, $s0, $zero -/* A94B14 802413D4 0C012701 */ jal func_80049C04 -/* A94B18 802413D8 02A0302D */ daddu $a2, $s5, $zero -/* A94B1C 802413DC 0809053F */ j .L802414FC_A94C3C -/* A94B20 802413E0 00000000 */ nop -.L802413E4_A94B24: -/* A94B24 802413E4 0260202D */ daddu $a0, $s3, $zero -/* A94B28 802413E8 0200282D */ daddu $a1, $s0, $zero -/* A94B2C 802413EC 0C01278F */ jal func_80049E3C -/* A94B30 802413F0 02A0302D */ daddu $a2, $s5, $zero -.L802413F4_A94B34: -/* A94B34 802413F4 0260202D */ daddu $a0, $s3, $zero -/* A94B38 802413F8 0200282D */ daddu $a1, $s0, $zero -/* A94B3C 802413FC 0C0127B3 */ jal func_80049ECC -/* A94B40 80241400 02A0302D */ daddu $a2, $s5, $zero -/* A94B44 80241404 0809053F */ j .L802414FC_A94C3C -/* A94B48 80241408 00000000 */ nop -.L8024140C_A94B4C: -/* A94B4C 8024140C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A94B50 80241410 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A94B54 80241414 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A94B58 80241418 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A94B5C 8024141C 8C460028 */ lw $a2, 0x28($v0) -/* A94B60 80241420 0C00A7B5 */ jal dist2D -/* A94B64 80241424 8C470030 */ lw $a3, 0x30($v0) -/* A94B68 80241428 8E42006C */ lw $v0, 0x6c($s2) -/* A94B6C 8024142C 10400008 */ beqz $v0, .L80241450 -/* A94B70 80241430 46000086 */ mov.s $f2, $f0 -/* A94B74 80241434 44820000 */ mtc1 $v0, $f0 -/* A94B78 80241438 00000000 */ nop -/* A94B7C 8024143C 46800020 */ cvt.s.w $f0, $f0 -/* A94B80 80241440 4602003C */ c.lt.s $f0, $f2 -/* A94B84 80241444 00000000 */ nop -/* A94B88 80241448 4500000B */ bc1f .L80241478 -/* A94B8C 8024144C 0260202D */ daddu $a0, $s3, $zero -.L80241450: -/* A94B90 80241450 0260202D */ daddu $a0, $s3, $zero -/* A94B94 80241454 8E050024 */ lw $a1, 0x24($s0) -/* A94B98 80241458 8E060028 */ lw $a2, 0x28($s0) -/* A94B9C 8024145C 0C090140 */ jal func_80240500_A93C40 -/* A94BA0 80241460 02A0382D */ daddu $a3, $s5, $zero -/* A94BA4 80241464 8E630070 */ lw $v1, 0x70($s3) -/* A94BA8 80241468 2402000C */ addiu $v0, $zero, 0xc -/* A94BAC 8024146C 14620023 */ bne $v1, $v0, .L802414FC_A94C3C -/* A94BB0 80241470 00000000 */ nop -/* A94BB4 80241474 0260202D */ daddu $a0, $s3, $zero -.L80241478: -/* A94BB8 80241478 0200282D */ daddu $a1, $s0, $zero -/* A94BBC 8024147C 0C0127DF */ jal func_80049F7C -/* A94BC0 80241480 02A0302D */ daddu $a2, $s5, $zero -.L80241484_A94BC4: -/* A94BC4 80241484 0260202D */ daddu $a0, $s3, $zero -/* A94BC8 80241488 0200282D */ daddu $a1, $s0, $zero -/* A94BCC 8024148C 0C012849 */ jal func_8004A124 -/* A94BD0 80241490 02A0302D */ daddu $a2, $s5, $zero -/* A94BD4 80241494 0809053F */ j .L802414FC_A94C3C -/* A94BD8 80241498 00000000 */ nop -.L8024149C_A94BDC: -/* A94BDC 8024149C 0260202D */ daddu $a0, $s3, $zero -/* A94BE0 802414A0 0200282D */ daddu $a1, $s0, $zero -/* A94BE4 802414A4 0C0128FA */ jal func_8004A3E8 -/* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero -/* A94BEC 802414AC 0809053F */ j .L802414FC_A94C3C -/* A94BF0 802414B0 00000000 */ nop -.L802414B4_A94BF4: -/* A94BF4 802414B4 0C090191 */ jal func_80240644_A93D84 -/* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero -/* A94BFC 802414BC 0809053F */ j .L802414FC_A94C3C -/* A94C00 802414C0 00000000 */ nop -.L802414C4_A94C04: -/* A94C04 802414C4 0C0901D1 */ jal kpa_102_UnkSetDurationFunc -/* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero -/* A94C0C 802414CC 0809053F */ j .L802414FC_A94C3C -/* A94C10 802414D0 00000000 */ nop -.L802414D4_A94C14: -/* A94C14 802414D4 0C0901E2 */ jal kpa_102_UnkNpcAIFunc9 -/* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero -/* A94C1C 802414DC 0809053F */ j .L802414FC_A94C3C -/* A94C20 802414E0 00000000 */ nop -.L802414E4_A94C24: -/* A94C24 802414E4 0C09020A */ jal kpa_102_UnkDurationCheck -/* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero -/* A94C2C 802414EC 0809053F */ j .L802414FC_A94C3C -/* A94C30 802414F0 00000000 */ nop -.L802414F4_A94C34: -/* A94C34 802414F4 0C0129CF */ jal func_8004A73C -/* A94C38 802414F8 0260202D */ daddu $a0, $s3, $zero -.L802414FC_A94C3C: -/* A94C3C 802414FC 8FBF0048 */ lw $ra, 0x48($sp) -/* A94C40 80241500 8FB50044 */ lw $s5, 0x44($sp) -/* A94C44 80241504 8FB40040 */ lw $s4, 0x40($sp) -/* A94C48 80241508 8FB3003C */ lw $s3, 0x3c($sp) -/* A94C4C 8024150C 8FB20038 */ lw $s2, 0x38($sp) -/* A94C50 80241510 8FB10034 */ lw $s1, 0x34($sp) -/* A94C54 80241514 8FB00030 */ lw $s0, 0x30($sp) -/* A94C58 80241518 0000102D */ daddu $v0, $zero, $zero -/* A94C5C 8024151C 03E00008 */ jr $ra -/* A94C60 80241520 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s deleted file mode 100644 index 51bbe6e56a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s +++ /dev/null @@ -1,139 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245D38_A99478 -.double 180.0 - -dlabel D_80245D40_A99480 -.double 75.0 - -dlabel D_80245D48_A99488 -.double 90.0 - -dlabel D_80245D50_A99490 -.double 70.0 - -.section .text - -glabel func_80241D30_A95470 -/* A95470 80241D30 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A95474 80241D34 AFB00018 */ sw $s0, 0x18($sp) -/* A95478 80241D38 AFBF0024 */ sw $ra, 0x24($sp) -/* A9547C 80241D3C AFB20020 */ sw $s2, 0x20($sp) -/* A95480 80241D40 AFB1001C */ sw $s1, 0x1c($sp) -/* A95484 80241D44 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A95488 80241D48 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A9548C 80241D4C 8C920148 */ lw $s2, 0x148($a0) -/* A95490 80241D50 4485A000 */ mtc1 $a1, $f20 -/* A95494 80241D54 86440008 */ lh $a0, 8($s2) -/* A95498 80241D58 4486B000 */ mtc1 $a2, $f22 -/* A9549C 80241D5C 0C00EABB */ jal get_npc_unsafe -/* A954A0 80241D60 00E0802D */ daddu $s0, $a3, $zero -/* A954A4 80241D64 0200202D */ daddu $a0, $s0, $zero -/* A954A8 80241D68 0040882D */ daddu $s1, $v0, $zero -/* A954AC 80241D6C 4406A000 */ mfc1 $a2, $f20 -/* A954B0 80241D70 4407B000 */ mfc1 $a3, $f22 -/* A954B4 80241D74 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A954B8 80241D78 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A954BC 80241D7C 3C05800B */ lui $a1, %hi(gCameras) -/* A954C0 80241D80 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A954C4 80241D84 AFA00010 */ sw $zero, 0x10($sp) -/* A954C8 80241D88 00031080 */ sll $v0, $v1, 2 -/* A954CC 80241D8C 00431021 */ addu $v0, $v0, $v1 -/* A954D0 80241D90 00021080 */ sll $v0, $v0, 2 -/* A954D4 80241D94 00431023 */ subu $v0, $v0, $v1 -/* A954D8 80241D98 000218C0 */ sll $v1, $v0, 3 -/* A954DC 80241D9C 00431021 */ addu $v0, $v0, $v1 -/* A954E0 80241DA0 000210C0 */ sll $v0, $v0, 3 -/* A954E4 80241DA4 00458021 */ addu $s0, $v0, $a1 -/* A954E8 80241DA8 0C01242D */ jal func_800490B4 -/* A954EC 80241DAC 0240282D */ daddu $a1, $s2, $zero -/* A954F0 80241DB0 1040004B */ beqz $v0, .L80241EE0 -/* A954F4 80241DB4 2402FFFF */ addiu $v0, $zero, -1 -/* A954F8 80241DB8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A954FC 80241DBC C62E000C */ lwc1 $f14, 0xc($s1) -/* A95500 80241DC0 3C014387 */ lui $at, 0x4387 -/* A95504 80241DC4 4481A000 */ mtc1 $at, $f20 -/* A95508 80241DC8 0C00A70A */ jal get_clamped_angle_diff -/* A9550C 80241DCC 00000000 */ nop -/* A95510 80241DD0 0C00A6C9 */ jal clamp_angle -/* A95514 80241DD4 46000306 */ mov.s $f12, $f0 -/* A95518 80241DD8 3C018024 */ lui $at, %hi(D_80245D38_A99478) -/* A9551C 80241DDC D4225D38 */ ldc1 $f2, %lo(D_80245D38_A99478)($at) -/* A95520 80241DE0 46000021 */ cvt.d.s $f0, $f0 -/* A95524 80241DE4 4622003C */ c.lt.d $f0, $f2 -/* A95528 80241DE8 00000000 */ nop -/* A9552C 80241DEC 45000003 */ bc1f .L80241DFC -/* A95530 80241DF0 00000000 */ nop -/* A95534 80241DF4 3C0142B4 */ lui $at, 0x42b4 -/* A95538 80241DF8 4481A000 */ mtc1 $at, $f20 -.L80241DFC: -/* A9553C 80241DFC 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A95540 80241E00 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A95544 80241E04 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A95548 80241E08 8E020000 */ lw $v0, ($s0) -/* A9554C 80241E0C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A95550 80241E10 8C460028 */ lw $a2, 0x28($v0) -/* A95554 80241E14 0C00A720 */ jal atan2 -/* A95558 80241E18 8C470030 */ lw $a3, 0x30($v0) -/* A9555C 80241E1C 4600A306 */ mov.s $f12, $f20 -/* A95560 80241E20 0C00A70A */ jal get_clamped_angle_diff -/* A95564 80241E24 46000386 */ mov.s $f14, $f0 -/* A95568 80241E28 46000005 */ abs.s $f0, $f0 -/* A9556C 80241E2C 3C018024 */ lui $at, %hi(D_80245D40_A99480) -/* A95570 80241E30 D4225D40 */ ldc1 $f2, %lo(D_80245D40_A99480)($at) -/* A95574 80241E34 46000021 */ cvt.d.s $f0, $f0 -/* A95578 80241E38 4620103C */ c.lt.d $f2, $f0 -/* A9557C 80241E3C 00000000 */ nop -/* A95580 80241E40 45010027 */ bc1t .L80241EE0 -/* A95584 80241E44 2402FFFF */ addiu $v0, $zero, -1 -/* A95588 80241E48 8E020000 */ lw $v0, ($s0) -/* A9558C 80241E4C C6200038 */ lwc1 $f0, 0x38($s1) -/* A95590 80241E50 C4420028 */ lwc1 $f2, 0x28($v0) -/* A95594 80241E54 44806000 */ mtc1 $zero, $f12 -/* A95598 80241E58 46020001 */ sub.s $f0, $f0, $f2 -/* A9559C 80241E5C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A955A0 80241E60 8C47002C */ lw $a3, 0x2c($v0) -/* A955A4 80241E64 46000005 */ abs.s $f0, $f0 -/* A955A8 80241E68 44060000 */ mfc1 $a2, $f0 -/* A955AC 80241E6C 0C00A720 */ jal atan2 -/* A955B0 80241E70 00000000 */ nop -/* A955B4 80241E74 3C018024 */ lui $at, %hi(D_80245D48_A99488) -/* A955B8 80241E78 D4225D48 */ ldc1 $f2, %lo(D_80245D48_A99488)($at) -/* A955BC 80241E7C 46000021 */ cvt.d.s $f0, $f0 -/* A955C0 80241E80 46220001 */ sub.d $f0, $f0, $f2 -/* A955C4 80241E84 3C018024 */ lui $at, %hi(D_80245D50_A99490) -/* A955C8 80241E88 D4225D50 */ ldc1 $f2, %lo(D_80245D50_A99490)($at) -/* A955CC 80241E8C 46200020 */ cvt.s.d $f0, $f0 -/* A955D0 80241E90 46000005 */ abs.s $f0, $f0 -/* A955D4 80241E94 46000021 */ cvt.d.s $f0, $f0 -/* A955D8 80241E98 4620103C */ c.lt.d $f2, $f0 -/* A955DC 80241E9C 00000000 */ nop -/* A955E0 80241EA0 4501000F */ bc1t .L80241EE0 -/* A955E4 80241EA4 2402FFFF */ addiu $v0, $zero, -1 -/* A955E8 80241EA8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A955EC 80241EAC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A955F0 80241EB0 24020009 */ addiu $v0, $zero, 9 -/* A955F4 80241EB4 10620009 */ beq $v1, $v0, .L80241EDC -/* A955F8 80241EB8 24020007 */ addiu $v0, $zero, 7 -/* A955FC 80241EBC 50620008 */ beql $v1, $v0, .L80241EE0 -/* A95600 80241EC0 2402FFFF */ addiu $v0, $zero, -1 -/* A95604 80241EC4 86440008 */ lh $a0, 8($s2) -/* A95608 80241EC8 0C00FB3A */ jal get_enemy -/* A9560C 80241ECC 24840001 */ addiu $a0, $a0, 1 -/* A95610 80241ED0 8C43006C */ lw $v1, 0x6c($v0) -/* A95614 80241ED4 10600002 */ beqz $v1, .L80241EE0 -/* A95618 80241ED8 24020001 */ addiu $v0, $zero, 1 -.L80241EDC: -/* A9561C 80241EDC 2402FFFF */ addiu $v0, $zero, -1 -.L80241EE0: -/* A95620 80241EE0 8FBF0024 */ lw $ra, 0x24($sp) -/* A95624 80241EE4 8FB20020 */ lw $s2, 0x20($sp) -/* A95628 80241EE8 8FB1001C */ lw $s1, 0x1c($sp) -/* A9562C 80241EEC 8FB00018 */ lw $s0, 0x18($sp) -/* A95630 80241EF0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A95634 80241EF4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A95638 80241EF8 03E00008 */ jr $ra -/* A9563C 80241EFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s deleted file mode 100644 index 2f3e02fcdc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s +++ /dev/null @@ -1,350 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245D58_A99498 -.word .L80241FF4_A95734, .L80242024_A95764, .L80242250_A95990, .L80242294_A959D4, .L802422EC_A95A2C, 0 - -dlabel D_80245D70_A994B0 -.double 90.0 - -.section .text - -glabel func_80241F00_A95640 -/* A95640 80241F00 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A95644 80241F04 AFB60378 */ sw $s6, 0x378($sp) -/* A95648 80241F08 0080B02D */ daddu $s6, $a0, $zero -/* A9564C 80241F0C AFBF037C */ sw $ra, 0x37c($sp) -/* A95650 80241F10 AFB50374 */ sw $s5, 0x374($sp) -/* A95654 80241F14 AFB40370 */ sw $s4, 0x370($sp) -/* A95658 80241F18 AFB3036C */ sw $s3, 0x36c($sp) -/* A9565C 80241F1C AFB20368 */ sw $s2, 0x368($sp) -/* A95660 80241F20 AFB10364 */ sw $s1, 0x364($sp) -/* A95664 80241F24 AFB00360 */ sw $s0, 0x360($sp) -/* A95668 80241F28 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A9566C 80241F2C 8ED20148 */ lw $s2, 0x148($s6) -/* A95670 80241F30 86440008 */ lh $a0, 8($s2) -/* A95674 80241F34 0C00EABB */ jal get_npc_unsafe -/* A95678 80241F38 00A0802D */ daddu $s0, $a1, $zero -/* A9567C 80241F3C 86440008 */ lh $a0, 8($s2) -/* A95680 80241F40 0040882D */ daddu $s1, $v0, $zero -/* A95684 80241F44 0C00FB3A */ jal get_enemy -/* A95688 80241F48 2484FFFF */ addiu $a0, $a0, -1 -/* A9568C 80241F4C 84440008 */ lh $a0, 8($v0) -/* A95690 80241F50 0C00EABB */ jal get_npc_unsafe -/* A95694 80241F54 0000A82D */ daddu $s5, $zero, $zero -/* A95698 80241F58 27B30020 */ addiu $s3, $sp, 0x20 -/* A9569C 80241F5C 16000005 */ bnez $s0, .L80241F74 -/* A956A0 80241F60 0040A02D */ daddu $s4, $v0, $zero -/* A956A4 80241F64 8E4200B0 */ lw $v0, 0xb0($s2) -/* A956A8 80241F68 30420004 */ andi $v0, $v0, 4 -/* A956AC 80241F6C 10400018 */ beqz $v0, .L80241FD0 -/* A956B0 80241F70 00000000 */ nop -.L80241F74: -/* A956B4 80241F74 3C030024 */ lui $v1, 0x24 -/* A956B8 80241F78 34630102 */ ori $v1, $v1, 0x102 -/* A956BC 80241F7C 3C041620 */ lui $a0, 0x1620 -/* A956C0 80241F80 AEC00070 */ sw $zero, 0x70($s6) -/* A956C4 80241F84 8E220000 */ lw $v0, ($s1) -/* A956C8 80241F88 34840040 */ ori $a0, $a0, 0x40 -/* A956CC 80241F8C A620008E */ sh $zero, 0x8e($s1) -/* A956D0 80241F90 00431025 */ or $v0, $v0, $v1 -/* A956D4 80241F94 AE220000 */ sw $v0, ($s1) -/* A956D8 80241F98 8E420000 */ lw $v0, ($s2) -/* A956DC 80241F9C 3C013ECC */ lui $at, 0x3ecc -/* A956E0 80241FA0 3421CCCD */ ori $at, $at, 0xcccd -/* A956E4 80241FA4 44810000 */ mtc1 $at, $f0 -/* A956E8 80241FA8 00441025 */ or $v0, $v0, $a0 -/* A956EC 80241FAC AE420000 */ sw $v0, ($s2) -/* A956F0 80241FB0 E6200054 */ swc1 $f0, 0x54($s1) -/* A956F4 80241FB4 E6200058 */ swc1 $f0, 0x58($s1) -/* A956F8 80241FB8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A956FC 80241FBC 30620004 */ andi $v0, $v1, 4 -/* A95700 80241FC0 10400003 */ beqz $v0, .L80241FD0 -/* A95704 80241FC4 2402FFFB */ addiu $v0, $zero, -5 -/* A95708 80241FC8 00621024 */ and $v0, $v1, $v0 -/* A9570C 80241FCC AE4200B0 */ sw $v0, 0xb0($s2) -.L80241FD0: -/* A95710 80241FD0 8EC30070 */ lw $v1, 0x70($s6) -/* A95714 80241FD4 2C620005 */ sltiu $v0, $v1, 5 -/* A95718 80241FD8 10400101 */ beqz $v0, .L802423E0 -/* A9571C 80241FDC 00031080 */ sll $v0, $v1, 2 -/* A95720 80241FE0 3C018024 */ lui $at, %hi(jtbl_80245D58_A99498) -/* A95724 80241FE4 00220821 */ addu $at, $at, $v0 -/* A95728 80241FE8 8C225D58 */ lw $v0, %lo(jtbl_80245D58_A99498)($at) -/* A9572C 80241FEC 00400008 */ jr $v0 -/* A95730 80241FF0 00000000 */ nop -.L80241FF4_A95734: -/* A95734 80241FF4 3C01C47A */ lui $at, 0xc47a -/* A95738 80241FF8 44810000 */ mtc1 $at, $f0 -/* A9573C 80241FFC 24020014 */ addiu $v0, $zero, 0x14 -/* A95740 80242000 AE400078 */ sw $zero, 0x78($s2) -/* A95744 80242004 A62200A6 */ sh $v0, 0xa6($s1) -/* A95748 80242008 A62200A8 */ sh $v0, 0xa8($s1) -/* A9574C 8024200C 24020001 */ addiu $v0, $zero, 1 -/* A95750 80242010 AE200038 */ sw $zero, 0x38($s1) -/* A95754 80242014 AE200040 */ sw $zero, 0x40($s1) -/* A95758 80242018 E620003C */ swc1 $f0, 0x3c($s1) -/* A9575C 8024201C AE40006C */ sw $zero, 0x6c($s2) -/* A95760 80242020 AEC20070 */ sw $v0, 0x70($s6) -.L80242024_A95764: -/* A95764 80242024 8E50006C */ lw $s0, 0x6c($s2) -/* A95768 80242028 24020001 */ addiu $v0, $zero, 1 -/* A9576C 8024202C 160200EC */ bne $s0, $v0, .L802423E0 -/* A95770 80242030 24150002 */ addiu $s5, $zero, 2 -/* A95774 80242034 AE55006C */ sw $s5, 0x6c($s2) -/* A95778 80242038 C6800038 */ lwc1 $f0, 0x38($s4) -/* A9577C 8024203C E6600038 */ swc1 $f0, 0x38($s3) -/* A95780 80242040 C680003C */ lwc1 $f0, 0x3c($s4) -/* A95784 80242044 E660003C */ swc1 $f0, 0x3c($s3) -/* A95788 80242048 C6800040 */ lwc1 $f0, 0x40($s4) -/* A9578C 8024204C E6600040 */ swc1 $f0, 0x40($s3) -/* A95790 80242050 C6820034 */ lwc1 $f2, 0x34($s4) -/* A95794 80242054 3C014387 */ lui $at, 0x4387 -/* A95798 80242058 44810000 */ mtc1 $at, $f0 -/* A9579C 8024205C 00000000 */ nop -/* A957A0 80242060 46020001 */ sub.s $f0, $f0, $f2 -/* A957A4 80242064 C6480074 */ lwc1 $f8, 0x74($s2) -/* A957A8 80242068 46804220 */ cvt.s.w $f8, $f8 -/* A957AC 8024206C 44054000 */ mfc1 $a1, $f8 -/* A957B0 80242070 44060000 */ mfc1 $a2, $f0 -/* A957B4 80242074 0C00EA95 */ jal npc_move_heading -/* A957B8 80242078 0260202D */ daddu $a0, $s3, $zero -/* A957BC 8024207C C6600038 */ lwc1 $f0, 0x38($s3) -/* A957C0 80242080 E6200038 */ swc1 $f0, 0x38($s1) -/* A957C4 80242084 C680003C */ lwc1 $f0, 0x3c($s4) -/* A957C8 80242088 C6420070 */ lwc1 $f2, 0x70($s2) -/* A957CC 8024208C 468010A0 */ cvt.s.w $f2, $f2 -/* A957D0 80242090 46020000 */ add.s $f0, $f0, $f2 -/* A957D4 80242094 3C014024 */ lui $at, 0x4024 -/* A957D8 80242098 4481A800 */ mtc1 $at, $f21 -/* A957DC 8024209C 4480A000 */ mtc1 $zero, $f20 -/* A957E0 802420A0 E620003C */ swc1 $f0, 0x3c($s1) -/* A957E4 802420A4 C6600040 */ lwc1 $f0, 0x40($s3) -/* A957E8 802420A8 E6200040 */ swc1 $f0, 0x40($s1) -/* A957EC 802420AC A2500007 */ sb $s0, 7($s2) -/* A957F0 802420B0 C6200038 */ lwc1 $f0, 0x38($s1) -/* A957F4 802420B4 3C014066 */ lui $at, 0x4066 -/* A957F8 802420B8 34216666 */ ori $at, $at, 0x6666 -/* A957FC 802420BC 44811000 */ mtc1 $at, $f2 -/* A95800 802420C0 4600020D */ trunc.w.s $f8, $f0 -/* A95804 802420C4 44024000 */ mfc1 $v0, $f8 -/* A95808 802420C8 00000000 */ nop -/* A9580C 802420CC A6420010 */ sh $v0, 0x10($s2) -/* A95810 802420D0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A95814 802420D4 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A95818 802420D8 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A9581C 802420DC 4600020D */ trunc.w.s $f8, $f0 -/* A95820 802420E0 44024000 */ mfc1 $v0, $f8 -/* A95824 802420E4 00000000 */ nop -/* A95828 802420E8 A6420012 */ sh $v0, 0x12($s2) -/* A9582C 802420EC C6200040 */ lwc1 $f0, 0x40($s1) -/* A95830 802420F0 8E630000 */ lw $v1, ($s3) -/* A95834 802420F4 4600020D */ trunc.w.s $f8, $f0 -/* A95838 802420F8 44024000 */ mfc1 $v0, $f8 -/* A9583C 802420FC 00000000 */ nop -/* A95840 80242100 A6420014 */ sh $v0, 0x14($s2) -/* A95844 80242104 E6220018 */ swc1 $f2, 0x18($s1) -/* A95848 80242108 C460002C */ lwc1 $f0, 0x2c($v1) -/* A9584C 8024210C C6220038 */ lwc1 $f2, 0x38($s1) -/* A95850 80242110 46000021 */ cvt.d.s $f0, $f0 -/* A95854 80242114 46340000 */ add.d $f0, $f0, $f20 -/* A95858 80242118 C4640028 */ lwc1 $f4, 0x28($v1) -/* A9585C 8024211C 44806000 */ mtc1 $zero, $f12 -/* A95860 80242120 46041081 */ sub.s $f2, $f2, $f4 -/* A95864 80242124 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A95868 80242128 46200020 */ cvt.s.d $f0, $f0 -/* A9586C 8024212C 46001085 */ abs.s $f2, $f2 -/* A95870 80242130 44070000 */ mfc1 $a3, $f0 -/* A95874 80242134 44061000 */ mfc1 $a2, $f2 -/* A95878 80242138 0C00A720 */ jal atan2 -/* A9587C 8024213C 00000000 */ nop -/* A95880 80242140 3C018024 */ lui $at, %hi(D_80245D70_A994B0) -/* A95884 80242144 D4225D70 */ ldc1 $f2, %lo(D_80245D70_A994B0)($at) -/* A95888 80242148 46000021 */ cvt.d.s $f0, $f0 -/* A9588C 8024214C 46220001 */ sub.d $f0, $f0, $f2 -/* A95890 80242150 46200020 */ cvt.s.d $f0, $f0 -/* A95894 80242154 4600020D */ trunc.w.s $f8, $f0 -/* A95898 80242158 44044000 */ mfc1 $a0, $f8 -/* A9589C 8024215C 00000000 */ nop -/* A958A0 80242160 00042400 */ sll $a0, $a0, 0x10 -/* A958A4 80242164 0C00A4F5 */ jal cosine -/* A958A8 80242168 00042403 */ sra $a0, $a0, 0x10 -/* A958AC 8024216C C6220018 */ lwc1 $f2, 0x18($s1) -/* A958B0 80242170 46020002 */ mul.s $f0, $f0, $f2 -/* A958B4 80242174 00000000 */ nop -/* A958B8 80242178 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A958BC 8024217C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A958C0 80242180 8E620000 */ lw $v0, ($s3) -/* A958C4 80242184 E620001C */ swc1 $f0, 0x1c($s1) -/* A958C8 80242188 8C460028 */ lw $a2, 0x28($v0) -/* A958CC 8024218C 0C00A720 */ jal atan2 -/* A958D0 80242190 8C470030 */ lw $a3, 0x30($v0) -/* A958D4 80242194 8E620000 */ lw $v0, ($s3) -/* A958D8 80242198 E620000C */ swc1 $f0, 0xc($s1) -/* A958DC 8024219C C440002C */ lwc1 $f0, 0x2c($v0) -/* A958E0 802421A0 46000021 */ cvt.d.s $f0, $f0 -/* A958E4 802421A4 46340000 */ add.d $f0, $f0, $f20 -/* A958E8 802421A8 46200020 */ cvt.s.d $f0, $f0 -/* A958EC 802421AC E7A00010 */ swc1 $f0, 0x10($sp) -/* A958F0 802421B0 C4400030 */ lwc1 $f0, 0x30($v0) -/* A958F4 802421B4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A958F8 802421B8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A958FC 802421BC C62E003C */ lwc1 $f14, 0x3c($s1) -/* A95900 802421C0 8E260040 */ lw $a2, 0x40($s1) -/* A95904 802421C4 0C00A7CB */ jal dist3D -/* A95908 802421C8 8C470028 */ lw $a3, 0x28($v0) -/* A9590C 802421CC C6220018 */ lwc1 $f2, 0x18($s1) -/* A95910 802421D0 46020003 */ div.s $f0, $f0, $f2 -/* A95914 802421D4 4600020D */ trunc.w.s $f8, $f0 -/* A95918 802421D8 44104000 */ mfc1 $s0, $f8 -/* A9591C 802421DC 00000000 */ nop -/* A95920 802421E0 5A000001 */ blezl $s0, .L802421E8 -/* A95924 802421E4 24100001 */ addiu $s0, $zero, 1 -.L802421E8: -/* A95928 802421E8 8E620000 */ lw $v0, ($s3) -/* A9592C 802421EC C624003C */ lwc1 $f4, 0x3c($s1) -/* A95930 802421F0 3C014120 */ lui $at, 0x4120 -/* A95934 802421F4 44811000 */ mtc1 $at, $f2 -/* A95938 802421F8 C4400028 */ lwc1 $f0, 0x28($v0) -/* A9593C 802421FC E7A00010 */ swc1 $f0, 0x10($sp) -/* A95940 80242200 C440002C */ lwc1 $f0, 0x2c($v0) -/* A95944 80242204 46020000 */ add.s $f0, $f0, $f2 -/* A95948 80242208 3C014160 */ lui $at, 0x4160 -/* A9594C 8024220C 44811000 */ mtc1 $at, $f2 -/* A95950 80242210 00000000 */ nop -/* A95954 80242214 46022100 */ add.s $f4, $f4, $f2 -/* A95958 80242218 46020000 */ add.s $f0, $f0, $f2 -/* A9595C 8024221C 44062000 */ mfc1 $a2, $f4 -/* A95960 80242220 E7A00014 */ swc1 $f0, 0x14($sp) -/* A95964 80242224 C4400030 */ lwc1 $f0, 0x30($v0) -/* A95968 80242228 AFB0001C */ sw $s0, 0x1c($sp) -/* A9596C 8024222C E7A00018 */ swc1 $f0, 0x18($sp) -/* A95970 80242230 8E250038 */ lw $a1, 0x38($s1) -/* A95974 80242234 8E270040 */ lw $a3, 0x40($s1) -/* A95978 80242238 0C01BFD4 */ jal fx_shape_spell -/* A9597C 8024223C 0000202D */ daddu $a0, $zero, $zero -/* A95980 80242240 AE420078 */ sw $v0, 0x78($s2) -/* A95984 80242244 A630008E */ sh $s0, 0x8e($s1) -/* A95988 80242248 080908F8 */ j .L802423E0 -/* A9598C 8024224C AED50070 */ sw $s5, 0x70($s6) -.L80242250_A95990: -/* A95990 80242250 9622008E */ lhu $v0, 0x8e($s1) -/* A95994 80242254 2442FFFF */ addiu $v0, $v0, -1 -/* A95998 80242258 A622008E */ sh $v0, 0x8e($s1) -/* A9599C 8024225C 00021400 */ sll $v0, $v0, 0x10 -/* A959A0 80242260 58400001 */ blezl $v0, .L80242268 -/* A959A4 80242264 24150014 */ addiu $s5, $zero, 0x14 -.L80242268: -/* A959A8 80242268 16A0000A */ bnez $s5, .L80242294_A959D4 -/* A959AC 8024226C 00000000 */ nop -/* A959B0 80242270 8E250018 */ lw $a1, 0x18($s1) -/* A959B4 80242274 8E26000C */ lw $a2, 0xc($s1) -/* A959B8 80242278 0C00EA95 */ jal npc_move_heading -/* A959BC 8024227C 0220202D */ daddu $a0, $s1, $zero -/* A959C0 80242280 C620003C */ lwc1 $f0, 0x3c($s1) -/* A959C4 80242284 C622001C */ lwc1 $f2, 0x1c($s1) -/* A959C8 80242288 46020000 */ add.s $f0, $f0, $f2 -/* A959CC 8024228C 080908F8 */ j .L802423E0 -/* A959D0 80242290 E620003C */ swc1 $f0, 0x3c($s1) -.L80242294_A959D4: -/* A959D4 80242294 862200A8 */ lh $v0, 0xa8($s1) -/* A959D8 80242298 3C013FE0 */ lui $at, 0x3fe0 -/* A959DC 8024229C 44810800 */ mtc1 $at, $f1 -/* A959E0 802422A0 44800000 */ mtc1 $zero, $f0 -/* A959E4 802422A4 44821000 */ mtc1 $v0, $f2 -/* A959E8 802422A8 00000000 */ nop -/* A959EC 802422AC 468010A1 */ cvt.d.w $f2, $f2 -/* A959F0 802422B0 46201082 */ mul.d $f2, $f2, $f0 -/* A959F4 802422B4 00000000 */ nop -/* A959F8 802422B8 C620003C */ lwc1 $f0, 0x3c($s1) -/* A959FC 802422BC AE20001C */ sw $zero, 0x1c($s1) -/* A95A00 802422C0 46000021 */ cvt.d.s $f0, $f0 -/* A95A04 802422C4 46220001 */ sub.d $f0, $f0, $f2 -/* A95A08 802422C8 AE200018 */ sw $zero, 0x18($s1) -/* A95A0C 802422CC 24020003 */ addiu $v0, $zero, 3 -/* A95A10 802422D0 46200020 */ cvt.s.d $f0, $f0 -/* A95A14 802422D4 E620003C */ swc1 $f0, 0x3c($s1) -/* A95A18 802422D8 AE42006C */ sw $v0, 0x6c($s2) -/* A95A1C 802422DC 24020004 */ addiu $v0, $zero, 4 -/* A95A20 802422E0 A620008E */ sh $zero, 0x8e($s1) -/* A95A24 802422E4 080908F8 */ j .L802423E0 -/* A95A28 802422E8 AEC20070 */ sw $v0, 0x70($s6) -.L802422EC_A95A2C: -/* A95A2C 802422EC 9622008E */ lhu $v0, 0x8e($s1) -/* A95A30 802422F0 24420001 */ addiu $v0, $v0, 1 -/* A95A34 802422F4 A622008E */ sh $v0, 0x8e($s1) -/* A95A38 802422F8 00021400 */ sll $v0, $v0, 0x10 -/* A95A3C 802422FC 00021C03 */ sra $v1, $v0, 0x10 -/* A95A40 80242300 28620007 */ slti $v0, $v1, 7 -/* A95A44 80242304 10400027 */ beqz $v0, .L802423A4 -/* A95A48 80242308 24020007 */ addiu $v0, $zero, 7 -/* A95A4C 8024230C 8622008E */ lh $v0, 0x8e($s1) -/* A95A50 80242310 3C01401C */ lui $at, 0x401c -/* A95A54 80242314 44810800 */ mtc1 $at, $f1 -/* A95A58 80242318 44800000 */ mtc1 $zero, $f0 -/* A95A5C 8024231C 44822000 */ mtc1 $v0, $f4 -/* A95A60 80242320 00000000 */ nop -/* A95A64 80242324 46802120 */ cvt.s.w $f4, $f4 -/* A95A68 80242328 46002121 */ cvt.d.s $f4, $f4 -/* A95A6C 8024232C 46202102 */ mul.d $f4, $f4, $f0 -/* A95A70 80242330 00000000 */ nop -/* A95A74 80242334 44821000 */ mtc1 $v0, $f2 -/* A95A78 80242338 00000000 */ nop -/* A95A7C 8024233C 468010A0 */ cvt.s.w $f2, $f2 -/* A95A80 80242340 460010A1 */ cvt.d.s $f2, $f2 -/* A95A84 80242344 46201082 */ mul.d $f2, $f2, $f0 -/* A95A88 80242348 00000000 */ nop -/* A95A8C 8024234C C620003C */ lwc1 $f0, 0x3c($s1) -/* A95A90 80242350 3C01400C */ lui $at, 0x400c -/* A95A94 80242354 44813800 */ mtc1 $at, $f7 -/* A95A98 80242358 44803000 */ mtc1 $zero, $f6 -/* A95A9C 8024235C 46000021 */ cvt.d.s $f0, $f0 -/* A95AA0 80242360 46260001 */ sub.d $f0, $f0, $f6 -/* A95AA4 80242364 3C014034 */ lui $at, 0x4034 -/* A95AA8 80242368 44813800 */ mtc1 $at, $f7 -/* A95AAC 8024236C 44803000 */ mtc1 $zero, $f6 -/* A95AB0 80242370 00000000 */ nop -/* A95AB4 80242374 46262100 */ add.d $f4, $f4, $f6 -/* A95AB8 80242378 46200020 */ cvt.s.d $f0, $f0 -/* A95ABC 8024237C E620003C */ swc1 $f0, 0x3c($s1) -/* A95AC0 80242380 46261080 */ add.d $f2, $f2, $f6 -/* A95AC4 80242384 4620220D */ trunc.w.d $f8, $f4 -/* A95AC8 80242388 44024000 */ mfc1 $v0, $f8 -/* A95ACC 8024238C 00000000 */ nop -/* A95AD0 80242390 A62200A6 */ sh $v0, 0xa6($s1) -/* A95AD4 80242394 4620120D */ trunc.w.d $f8, $f2 -/* A95AD8 80242398 44024000 */ mfc1 $v0, $f8 -/* A95ADC 8024239C 080908F8 */ j .L802423E0 -/* A95AE0 802423A0 A62200A8 */ sh $v0, 0xa8($s1) -.L802423A4: -/* A95AE4 802423A4 1462000A */ bne $v1, $v0, .L802423D0 -/* A95AE8 802423A8 28620010 */ slti $v0, $v1, 0x10 -/* A95AEC 802423AC 3C01C47A */ lui $at, 0xc47a -/* A95AF0 802423B0 44810000 */ mtc1 $at, $f0 -/* A95AF4 802423B4 24020014 */ addiu $v0, $zero, 0x14 -/* A95AF8 802423B8 AE200038 */ sw $zero, 0x38($s1) -/* A95AFC 802423BC AE200040 */ sw $zero, 0x40($s1) -/* A95B00 802423C0 A62200A6 */ sh $v0, 0xa6($s1) -/* A95B04 802423C4 A62200A8 */ sh $v0, 0xa8($s1) -/* A95B08 802423C8 080908F8 */ j .L802423E0 -/* A95B0C 802423CC E620003C */ swc1 $f0, 0x3c($s1) -.L802423D0: -/* A95B10 802423D0 14400003 */ bnez $v0, .L802423E0 -/* A95B14 802423D4 00000000 */ nop -/* A95B18 802423D8 AE40006C */ sw $zero, 0x6c($s2) -/* A95B1C 802423DC AEC00070 */ sw $zero, 0x70($s6) -.L802423E0: -/* A95B20 802423E0 8FBF037C */ lw $ra, 0x37c($sp) -/* A95B24 802423E4 8FB60378 */ lw $s6, 0x378($sp) -/* A95B28 802423E8 8FB50374 */ lw $s5, 0x374($sp) -/* A95B2C 802423EC 8FB40370 */ lw $s4, 0x370($sp) -/* A95B30 802423F0 8FB3036C */ lw $s3, 0x36c($sp) -/* A95B34 802423F4 8FB20368 */ lw $s2, 0x368($sp) -/* A95B38 802423F8 8FB10364 */ lw $s1, 0x364($sp) -/* A95B3C 802423FC 8FB00360 */ lw $s0, 0x360($sp) -/* A95B40 80242400 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A95B44 80242404 0000102D */ daddu $v0, $zero, $zero -/* A95B48 80242408 03E00008 */ jr $ra -/* A95B4C 8024240C 27BD0388 */ addiu $sp, $sp, 0x388 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 index 963add0bbd..d88d6a4632 100644 --- 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 @@ -49,7 +49,7 @@ glabel func_8024244C_A95B8C /* 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 func_80241D30_A95470 +/* 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 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 index 643a3aff47..7297f1f8e2 100644 --- 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 @@ -58,7 +58,7 @@ glabel func_80242D3C_A9647C .L80242E10: /* A96550 80242E10 8E450024 */ lw $a1, 0x24($s2) /* A96554 80242E14 8E460028 */ lw $a2, 0x28($s2) -/* A96558 80242E18 0C09074C */ jal func_80241D30_A95470 +/* 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 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 index 3d5b117a82..ec143689d8 100644 --- 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 @@ -25,7 +25,7 @@ glabel func_80242F74_A966B4 /* 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 func_80241D30_A95470 +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s deleted file mode 100644 index cd40ce1794..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243240_A9C7D0 -.double 180.0 - -dlabel D_80243248_A9C7D8 -.double 75.0 - -.section .text - -glabel func_80240170_A99700 -/* A99700 80240170 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A99704 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* A99708 80240178 0080882D */ daddu $s1, $a0, $zero -/* A9970C 8024017C 3C05800B */ lui $a1, %hi(gCameras) -/* A99710 80240180 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A99714 80240184 AFBF0020 */ sw $ra, 0x20($sp) -/* A99718 80240188 AFB3001C */ sw $s3, 0x1c($sp) -/* A9971C 8024018C AFB20018 */ sw $s2, 0x18($sp) -/* A99720 80240190 AFB00010 */ sw $s0, 0x10($sp) -/* A99724 80240194 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A99728 80240198 8E330148 */ lw $s3, 0x148($s1) -/* A9972C 8024019C 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A99730 802401A0 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A99734 802401A4 8E30000C */ lw $s0, 0xc($s1) -/* A99738 802401A8 00031080 */ sll $v0, $v1, 2 -/* A9973C 802401AC 00431021 */ addu $v0, $v0, $v1 -/* A99740 802401B0 00021080 */ sll $v0, $v0, 2 -/* A99744 802401B4 00431023 */ subu $v0, $v0, $v1 -/* A99748 802401B8 000218C0 */ sll $v1, $v0, 3 -/* A9974C 802401BC 00431021 */ addu $v0, $v0, $v1 -/* A99750 802401C0 000210C0 */ sll $v0, $v0, 3 -/* A99754 802401C4 86640008 */ lh $a0, 8($s3) -/* A99758 802401C8 0C00EABB */ jal get_npc_unsafe -/* A9975C 802401CC 00459021 */ addu $s2, $v0, $a1 -/* A99760 802401D0 0220202D */ daddu $a0, $s1, $zero -/* A99764 802401D4 8E050000 */ lw $a1, ($s0) -/* A99768 802401D8 0C0B1EAF */ jal evt_get_variable -/* A9976C 802401DC 0040802D */ daddu $s0, $v0, $zero -/* A99770 802401E0 0260202D */ daddu $a0, $s3, $zero -/* A99774 802401E4 8C460024 */ lw $a2, 0x24($v0) -/* A99778 802401E8 8C470028 */ lw $a3, 0x28($v0) -/* A9977C 802401EC 0C0124FB */ jal func_800493EC -/* A99780 802401F0 0000282D */ daddu $a1, $zero, $zero -/* A99784 802401F4 10400052 */ beqz $v0, .L80240340 -/* A99788 802401F8 2402FFFF */ addiu $v0, $zero, -1 -/* A9978C 802401FC C64C006C */ lwc1 $f12, 0x6c($s2) -/* A99790 80240200 C60E000C */ lwc1 $f14, 0xc($s0) -/* A99794 80240204 3C014387 */ lui $at, 0x4387 -/* A99798 80240208 4481A000 */ mtc1 $at, $f20 -/* A9979C 8024020C 0C00A70A */ jal get_clamped_angle_diff -/* A997A0 80240210 00000000 */ nop -/* A997A4 80240214 0C00A6C9 */ jal clamp_angle -/* A997A8 80240218 46000306 */ mov.s $f12, $f0 -/* A997AC 8024021C 3C018024 */ lui $at, %hi(D_80243240_A9C7D0) -/* A997B0 80240220 D4223240 */ ldc1 $f2, %lo(D_80243240_A9C7D0)($at) -/* A997B4 80240224 46000021 */ cvt.d.s $f0, $f0 -/* A997B8 80240228 4622003C */ c.lt.d $f0, $f2 -/* A997BC 8024022C 00000000 */ nop -/* A997C0 80240230 45000003 */ bc1f .L80240240 -/* A997C4 80240234 00000000 */ nop -/* A997C8 80240238 3C0142B4 */ lui $at, 0x42b4 -/* A997CC 8024023C 4481A000 */ mtc1 $at, $f20 -.L80240240: -/* A997D0 80240240 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A997D4 80240244 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A997D8 80240248 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A997DC 8024024C 8E220000 */ lw $v0, ($s1) -/* A997E0 80240250 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A997E4 80240254 8C460028 */ lw $a2, 0x28($v0) -/* A997E8 80240258 0C00A720 */ jal atan2 -/* A997EC 8024025C 8C470030 */ lw $a3, 0x30($v0) -/* A997F0 80240260 4600A306 */ mov.s $f12, $f20 -/* A997F4 80240264 0C00A70A */ jal get_clamped_angle_diff -/* A997F8 80240268 46000386 */ mov.s $f14, $f0 -/* A997FC 8024026C 46000005 */ abs.s $f0, $f0 -/* A99800 80240270 3C018024 */ lui $at, %hi(D_80243248_A9C7D8) -/* A99804 80240274 D4223248 */ ldc1 $f2, %lo(D_80243248_A9C7D8)($at) -/* A99808 80240278 46000021 */ cvt.d.s $f0, $f0 -/* A9980C 8024027C 4620103C */ c.lt.d $f2, $f0 -/* A99810 80240280 00000000 */ nop -/* A99814 80240284 4501002E */ bc1t .L80240340 -/* A99818 80240288 2402FFFF */ addiu $v0, $zero, -1 -/* A9981C 8024028C 8E220000 */ lw $v0, ($s1) -/* A99820 80240290 C600003C */ lwc1 $f0, 0x3c($s0) -/* A99824 80240294 C442002C */ lwc1 $f2, 0x2c($v0) -/* A99828 80240298 860200A8 */ lh $v0, 0xa8($s0) -/* A9982C 8024029C 46020001 */ sub.s $f0, $f0, $f2 -/* A99830 802402A0 44821000 */ mtc1 $v0, $f2 -/* A99834 802402A4 00000000 */ nop -/* A99838 802402A8 468010A1 */ cvt.d.w $f2, $f2 -/* A9983C 802402AC 46221080 */ add.d $f2, $f2, $f2 -/* A99840 802402B0 46000005 */ abs.s $f0, $f0 -/* A99844 802402B4 46000021 */ cvt.d.s $f0, $f0 -/* A99848 802402B8 4620103E */ c.le.d $f2, $f0 -/* A9984C 802402BC 00000000 */ nop -/* A99850 802402C0 4501001F */ bc1t .L80240340 -/* A99854 802402C4 2402FFFF */ addiu $v0, $zero, -1 -/* A99858 802402C8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A9985C 802402CC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A99860 802402D0 24020009 */ addiu $v0, $zero, 9 -/* A99864 802402D4 10620019 */ beq $v1, $v0, .L8024033C -/* A99868 802402D8 24020007 */ addiu $v0, $zero, 7 -/* A9986C 802402DC 14620005 */ bne $v1, $v0, .L802402F4 -/* A99870 802402E0 2402FFFF */ addiu $v0, $zero, -1 -/* A99874 802402E4 080900D0 */ j .L80240340 -/* A99878 802402E8 00000000 */ nop -.L802402EC: -/* A9987C 802402EC 080900D0 */ j .L80240340 -/* A99880 802402F0 0240102D */ daddu $v0, $s2, $zero -.L802402F4: -/* A99884 802402F4 8E620078 */ lw $v0, 0x78($s3) -/* A99888 802402F8 18400010 */ blez $v0, .L8024033C -/* A9988C 802402FC 0000882D */ daddu $s1, $zero, $zero -.L80240300: -/* A99890 80240300 86620008 */ lh $v0, 8($s3) -/* A99894 80240304 00511021 */ addu $v0, $v0, $s1 -/* A99898 80240308 24520001 */ addiu $s2, $v0, 1 -/* A9989C 8024030C 0C00FB3A */ jal get_enemy -/* A998A0 80240310 0240202D */ daddu $a0, $s2, $zero -/* A998A4 80240314 0240202D */ daddu $a0, $s2, $zero -/* A998A8 80240318 0C00EABB */ jal get_npc_unsafe -/* A998AC 8024031C 0040802D */ daddu $s0, $v0, $zero -/* A998B0 80240320 8E02006C */ lw $v0, 0x6c($s0) -/* A998B4 80240324 1040FFF1 */ beqz $v0, .L802402EC -/* A998B8 80240328 26310001 */ addiu $s1, $s1, 1 -/* A998BC 8024032C 8E620078 */ lw $v0, 0x78($s3) -/* A998C0 80240330 0222102A */ slt $v0, $s1, $v0 -/* A998C4 80240334 1440FFF2 */ bnez $v0, .L80240300 -/* A998C8 80240338 00000000 */ nop -.L8024033C: -/* A998CC 8024033C 2402FFFF */ addiu $v0, $zero, -1 -.L80240340: -/* A998D0 80240340 8FBF0020 */ lw $ra, 0x20($sp) -/* A998D4 80240344 8FB3001C */ lw $s3, 0x1c($sp) -/* A998D8 80240348 8FB20018 */ lw $s2, 0x18($sp) -/* A998DC 8024034C 8FB10014 */ lw $s1, 0x14($sp) -/* A998E0 80240350 8FB00010 */ lw $s0, 0x10($sp) -/* A998E4 80240354 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A998E8 80240358 03E00008 */ jr $ra -/* A998EC 8024035C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s deleted file mode 100644 index 3f839d1204..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_A998F0 -/* A998F0 80240360 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A998F4 80240364 AFB20038 */ sw $s2, 0x38($sp) -/* A998F8 80240368 0080902D */ daddu $s2, $a0, $zero -/* A998FC 8024036C AFB00030 */ sw $s0, 0x30($sp) -/* A99900 80240370 AFBF003C */ sw $ra, 0x3c($sp) -/* A99904 80240374 AFB10034 */ sw $s1, 0x34($sp) -/* A99908 80240378 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A9990C 8024037C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A99910 80240380 8E510148 */ lw $s1, 0x148($s2) -/* A99914 80240384 4485A000 */ mtc1 $a1, $f20 -/* A99918 80240388 86240008 */ lh $a0, 8($s1) -/* A9991C 8024038C 4486B000 */ mtc1 $a2, $f22 -/* A99920 80240390 0C00EABB */ jal get_npc_unsafe -/* A99924 80240394 00E0802D */ daddu $s0, $a3, $zero -/* A99928 80240398 0200202D */ daddu $a0, $s0, $zero -/* A9992C 8024039C 0220282D */ daddu $a1, $s1, $zero -/* A99930 802403A0 24030001 */ addiu $v1, $zero, 1 -/* A99934 802403A4 4406A000 */ mfc1 $a2, $f20 -/* A99938 802403A8 4407B000 */ mfc1 $a3, $f22 -/* A9993C 802403AC 0040802D */ daddu $s0, $v0, $zero -/* A99940 802403B0 0C01242D */ jal func_800490B4 -/* A99944 802403B4 AFA30010 */ sw $v1, 0x10($sp) -/* A99948 802403B8 1440001D */ bnez $v0, .L80240430 -/* A9994C 802403BC 24040002 */ addiu $a0, $zero, 2 -/* A99950 802403C0 0200282D */ daddu $a1, $s0, $zero -/* A99954 802403C4 0000302D */ daddu $a2, $zero, $zero -/* A99958 802403C8 860300A8 */ lh $v1, 0xa8($s0) -/* A9995C 802403CC 3C013F80 */ lui $at, 0x3f80 -/* A99960 802403D0 44810000 */ mtc1 $at, $f0 -/* A99964 802403D4 3C014000 */ lui $at, 0x4000 -/* A99968 802403D8 44811000 */ mtc1 $at, $f2 -/* A9996C 802403DC 3C01C1A0 */ lui $at, 0xc1a0 -/* A99970 802403E0 44812000 */ mtc1 $at, $f4 -/* A99974 802403E4 2402000F */ addiu $v0, $zero, 0xf -/* A99978 802403E8 AFA2001C */ sw $v0, 0x1c($sp) -/* A9997C 802403EC 44833000 */ mtc1 $v1, $f6 -/* A99980 802403F0 00000000 */ nop -/* A99984 802403F4 468031A0 */ cvt.s.w $f6, $f6 -/* A99988 802403F8 44073000 */ mfc1 $a3, $f6 -/* A9998C 802403FC 27A20028 */ addiu $v0, $sp, 0x28 -/* A99990 80240400 AFA20020 */ sw $v0, 0x20($sp) -/* A99994 80240404 E7A00010 */ swc1 $f0, 0x10($sp) -/* A99998 80240408 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9999C 8024040C 0C01BFA4 */ jal fx_emote -/* A999A0 80240410 E7A40018 */ swc1 $f4, 0x18($sp) -/* A999A4 80240414 8E2200CC */ lw $v0, 0xcc($s1) -/* A999A8 80240418 8C430000 */ lw $v1, ($v0) -/* A999AC 8024041C 24020014 */ addiu $v0, $zero, 0x14 -/* A999B0 80240420 A602008E */ sh $v0, 0x8e($s0) -/* A999B4 80240424 24020021 */ addiu $v0, $zero, 0x21 -/* A999B8 80240428 08090120 */ j .L80240480 -/* A999BC 8024042C AE030028 */ sw $v1, 0x28($s0) -.L80240430: -/* A999C0 80240430 0C09005C */ jal func_80240170_A99700 -/* A999C4 80240434 0240202D */ daddu $a0, $s2, $zero -/* A999C8 80240438 0040202D */ daddu $a0, $v0, $zero -/* A999CC 8024043C 2402FFFF */ addiu $v0, $zero, -1 -/* A999D0 80240440 10820010 */ beq $a0, $v0, .L80240484 -/* A999D4 80240444 00000000 */ nop -/* A999D8 80240448 0C00FB3A */ jal get_enemy -/* A999DC 8024044C 00000000 */ nop -/* A999E0 80240450 8C42006C */ lw $v0, 0x6c($v0) -/* A999E4 80240454 1440000B */ bnez $v0, .L80240484 -/* A999E8 80240458 00000000 */ nop -/* A999EC 8024045C 8602008C */ lh $v0, 0x8c($s0) -/* A999F0 80240460 14400008 */ bnez $v0, .L80240484 -/* A999F4 80240464 00000000 */ nop -/* A999F8 80240468 8E2200CC */ lw $v0, 0xcc($s1) -/* A999FC 8024046C 8C420020 */ lw $v0, 0x20($v0) -/* A99A00 80240470 AE020028 */ sw $v0, 0x28($s0) -/* A99A04 80240474 96220072 */ lhu $v0, 0x72($s1) -/* A99A08 80240478 A602008E */ sh $v0, 0x8e($s0) -/* A99A0C 8024047C 2402001E */ addiu $v0, $zero, 0x1e -.L80240480: -/* A99A10 80240480 AE420070 */ sw $v0, 0x70($s2) -.L80240484: -/* A99A14 80240484 8FBF003C */ lw $ra, 0x3c($sp) -/* A99A18 80240488 8FB20038 */ lw $s2, 0x38($sp) -/* A99A1C 8024048C 8FB10034 */ lw $s1, 0x34($sp) -/* A99A20 80240490 8FB00030 */ lw $s0, 0x30($sp) -/* A99A24 80240494 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A99A28 80240498 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A99A2C 8024049C 03E00008 */ jr $ra -/* A99A30 802404A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s deleted file mode 100644 index f220cb75c9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A4_A99A34 -/* A99A34 802404A4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A99A38 802404A8 AFB20038 */ sw $s2, 0x38($sp) -/* A99A3C 802404AC 0080902D */ daddu $s2, $a0, $zero -/* A99A40 802404B0 AFBF003C */ sw $ra, 0x3c($sp) -/* A99A44 802404B4 AFB10034 */ sw $s1, 0x34($sp) -/* A99A48 802404B8 AFB00030 */ sw $s0, 0x30($sp) -/* A99A4C 802404BC 8E510148 */ lw $s1, 0x148($s2) -/* A99A50 802404C0 0C00EABB */ jal get_npc_unsafe -/* A99A54 802404C4 86240008 */ lh $a0, 8($s1) -/* A99A58 802404C8 0040802D */ daddu $s0, $v0, $zero -/* A99A5C 802404CC 9602008E */ lhu $v0, 0x8e($s0) -/* A99A60 802404D0 2442FFFF */ addiu $v0, $v0, -1 -/* A99A64 802404D4 A602008E */ sh $v0, 0x8e($s0) -/* A99A68 802404D8 00021400 */ sll $v0, $v0, 0x10 -/* A99A6C 802404DC 1C40002B */ bgtz $v0, .L8024058C -/* A99A70 802404E0 00000000 */ nop -/* A99A74 802404E4 0C09005C */ jal func_80240170_A99700 -/* A99A78 802404E8 0240202D */ daddu $a0, $s2, $zero -/* A99A7C 802404EC 0040202D */ daddu $a0, $v0, $zero -/* A99A80 802404F0 0481001A */ bgez $a0, .L8024055C -/* A99A84 802404F4 2402000F */ addiu $v0, $zero, 0xf -/* A99A88 802404F8 24040002 */ addiu $a0, $zero, 2 -/* A99A8C 802404FC 860300A8 */ lh $v1, 0xa8($s0) -/* A99A90 80240500 AFA2001C */ sw $v0, 0x1c($sp) -/* A99A94 80240504 27A20028 */ addiu $v0, $sp, 0x28 -/* A99A98 80240508 0200282D */ daddu $a1, $s0, $zero -/* A99A9C 8024050C 3C013F80 */ lui $at, 0x3f80 -/* A99AA0 80240510 44810000 */ mtc1 $at, $f0 -/* A99AA4 80240514 3C014000 */ lui $at, 0x4000 -/* A99AA8 80240518 44811000 */ mtc1 $at, $f2 -/* A99AAC 8024051C 3C01C1A0 */ lui $at, 0xc1a0 -/* A99AB0 80240520 44812000 */ mtc1 $at, $f4 -/* A99AB4 80240524 44833000 */ mtc1 $v1, $f6 -/* A99AB8 80240528 00000000 */ nop -/* A99ABC 8024052C 468031A0 */ cvt.s.w $f6, $f6 -/* A99AC0 80240530 44073000 */ mfc1 $a3, $f6 -/* A99AC4 80240534 0000302D */ daddu $a2, $zero, $zero -/* A99AC8 80240538 AFA20020 */ sw $v0, 0x20($sp) -/* A99ACC 8024053C E7A00010 */ swc1 $f0, 0x10($sp) -/* A99AD0 80240540 E7A20014 */ swc1 $f2, 0x14($sp) -/* A99AD4 80240544 0C01BFA4 */ jal fx_emote -/* A99AD8 80240548 E7A40018 */ swc1 $f4, 0x18($sp) -/* A99ADC 8024054C 8E2200CC */ lw $v0, 0xcc($s1) -/* A99AE0 80240550 8C420000 */ lw $v0, ($v0) -/* A99AE4 80240554 0809015F */ j .L8024057C -/* A99AE8 80240558 AE020028 */ sw $v0, 0x28($s0) -.L8024055C: -/* A99AEC 8024055C 8E2200CC */ lw $v0, 0xcc($s1) -/* A99AF0 80240560 8C420024 */ lw $v0, 0x24($v0) -/* A99AF4 80240564 0C00FB3A */ jal get_enemy -/* A99AF8 80240568 AE020028 */ sw $v0, 0x28($s0) -/* A99AFC 8024056C 86240008 */ lh $a0, 8($s1) -/* A99B00 80240570 24030001 */ addiu $v1, $zero, 1 -/* A99B04 80240574 AC43006C */ sw $v1, 0x6c($v0) -/* A99B08 80240578 AC44007C */ sw $a0, 0x7c($v0) -.L8024057C: -/* A99B0C 8024057C 96220076 */ lhu $v0, 0x76($s1) -/* A99B10 80240580 A602008E */ sh $v0, 0x8e($s0) -/* A99B14 80240584 24020021 */ addiu $v0, $zero, 0x21 -/* A99B18 80240588 AE420070 */ sw $v0, 0x70($s2) -.L8024058C: -/* A99B1C 8024058C 8FBF003C */ lw $ra, 0x3c($sp) -/* A99B20 80240590 8FB20038 */ lw $s2, 0x38($sp) -/* A99B24 80240594 8FB10034 */ lw $s1, 0x34($sp) -/* A99B28 80240598 8FB00030 */ lw $s0, 0x30($sp) -/* A99B2C 8024059C 03E00008 */ jr $ra -/* A99B30 802405A0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s deleted file mode 100644 index 5a8ac4fd1f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243268_A9C7F8 -.word .L802411F4_A9A784, .L80241204_A9A794, .L8024121C_A9A7AC, .L8024122C_A9A7BC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L80241244_A9A7D4, .L80241254_A9A7E4, .L8024126C_A9A7FC, .L802412E4_A9A874, .L802412FC_A9A88C, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L80241314_A9A8A4, .L80241324_A9A8B4, .L80241334_A9A8C4, .L80241344_A9A8D4, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L8024135C_A9A8EC, .L80241354_A9A8E4, 0, 0 - -.section .text - -glabel func_80241064_A9A5F4 -/* A9A5F4 80241064 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9A5F8 80241068 AFB3003C */ sw $s3, 0x3c($sp) -/* A9A5FC 8024106C 0080982D */ daddu $s3, $a0, $zero -/* A9A600 80241070 AFBF0048 */ sw $ra, 0x48($sp) -/* A9A604 80241074 AFB50044 */ sw $s5, 0x44($sp) -/* A9A608 80241078 AFB40040 */ sw $s4, 0x40($sp) -/* A9A60C 8024107C AFB20038 */ sw $s2, 0x38($sp) -/* A9A610 80241080 AFB10034 */ sw $s1, 0x34($sp) -/* A9A614 80241084 AFB00030 */ sw $s0, 0x30($sp) -/* A9A618 80241088 8E720148 */ lw $s2, 0x148($s3) -/* A9A61C 8024108C 86440008 */ lh $a0, 8($s2) -/* A9A620 80241090 8E70000C */ lw $s0, 0xc($s3) -/* A9A624 80241094 0C00EABB */ jal get_npc_unsafe -/* A9A628 80241098 00A0882D */ daddu $s1, $a1, $zero -/* A9A62C 8024109C 0260202D */ daddu $a0, $s3, $zero -/* A9A630 802410A0 8E050000 */ lw $a1, ($s0) -/* A9A634 802410A4 0C0B1EAF */ jal evt_get_variable -/* A9A638 802410A8 0040A02D */ daddu $s4, $v0, $zero -/* A9A63C 802410AC AFA00010 */ sw $zero, 0x10($sp) -/* A9A640 802410B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A644 802410B4 8C630030 */ lw $v1, 0x30($v1) -/* A9A648 802410B8 AFA30014 */ sw $v1, 0x14($sp) -/* A9A64C 802410BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A650 802410C0 8C63001C */ lw $v1, 0x1c($v1) -/* A9A654 802410C4 AFA30018 */ sw $v1, 0x18($sp) -/* A9A658 802410C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A65C 802410CC 8C630024 */ lw $v1, 0x24($v1) -/* A9A660 802410D0 AFA3001C */ sw $v1, 0x1c($sp) -/* A9A664 802410D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A668 802410D8 8C630028 */ lw $v1, 0x28($v1) -/* A9A66C 802410DC 27B50010 */ addiu $s5, $sp, 0x10 -/* A9A670 802410E0 AFA30020 */ sw $v1, 0x20($sp) -/* A9A674 802410E4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9A678 802410E8 3C014220 */ lui $at, 0x4220 -/* A9A67C 802410EC 44810000 */ mtc1 $at, $f0 -/* A9A680 802410F0 8C63002C */ lw $v1, 0x2c($v1) -/* A9A684 802410F4 0040802D */ daddu $s0, $v0, $zero -/* A9A688 802410F8 E7A00028 */ swc1 $f0, 0x28($sp) -/* A9A68C 802410FC A7A0002C */ sh $zero, 0x2c($sp) -/* A9A690 80241100 16200005 */ bnez $s1, .L80241118 -/* A9A694 80241104 AFA30024 */ sw $v1, 0x24($sp) -/* A9A698 80241108 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A69C 8024110C 30420004 */ andi $v0, $v0, 4 -/* A9A6A0 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9A6A4 80241114 00000000 */ nop -.L80241118: -/* A9A6A8 80241118 2404F7FF */ addiu $a0, $zero, -0x801 -/* A9A6AC 8024111C AE600070 */ sw $zero, 0x70($s3) -/* A9A6B0 80241120 A680008E */ sh $zero, 0x8e($s4) -/* A9A6B4 80241124 8E4200CC */ lw $v0, 0xcc($s2) -/* A9A6B8 80241128 8E830000 */ lw $v1, ($s4) -/* A9A6BC 8024112C 8C420000 */ lw $v0, ($v0) -/* A9A6C0 80241130 00641824 */ and $v1, $v1, $a0 -/* A9A6C4 80241134 AE830000 */ sw $v1, ($s4) -/* A9A6C8 80241138 AE820028 */ sw $v0, 0x28($s4) -/* A9A6CC 8024113C 8E4200D0 */ lw $v0, 0xd0($s2) -/* A9A6D0 80241140 8C420034 */ lw $v0, 0x34($v0) -/* A9A6D4 80241144 54400005 */ bnel $v0, $zero, .L8024115C -/* A9A6D8 80241148 2402FDFF */ addiu $v0, $zero, -0x201 -/* A9A6DC 8024114C 34620200 */ ori $v0, $v1, 0x200 -/* A9A6E0 80241150 2403FFF7 */ addiu $v1, $zero, -9 -/* A9A6E4 80241154 08090459 */ j .L80241164 -/* A9A6E8 80241158 00431024 */ and $v0, $v0, $v1 -.L8024115C: -/* A9A6EC 8024115C 00621024 */ and $v0, $v1, $v0 -/* A9A6F0 80241160 34420008 */ ori $v0, $v0, 8 -.L80241164: -/* A9A6F4 80241164 AE820000 */ sw $v0, ($s4) -/* A9A6F8 80241168 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A6FC 8024116C 30420004 */ andi $v0, $v0, 4 -/* A9A700 80241170 10400008 */ beqz $v0, .L80241194 -/* A9A704 80241174 24020063 */ addiu $v0, $zero, 0x63 -/* A9A708 80241178 AE620070 */ sw $v0, 0x70($s3) -/* A9A70C 8024117C AE600074 */ sw $zero, 0x74($s3) -/* A9A710 80241180 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A714 80241184 2403FFFB */ addiu $v1, $zero, -5 -/* A9A718 80241188 00431024 */ and $v0, $v0, $v1 -/* A9A71C 8024118C 0809046B */ j .L802411AC -/* A9A720 80241190 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241194: -/* A9A724 80241194 8E420000 */ lw $v0, ($s2) -/* A9A728 80241198 3C034000 */ lui $v1, 0x4000 -/* A9A72C 8024119C 00431024 */ and $v0, $v0, $v1 -/* A9A730 802411A0 10400002 */ beqz $v0, .L802411AC -/* A9A734 802411A4 2402000C */ addiu $v0, $zero, 0xc -/* A9A738 802411A8 AE620070 */ sw $v0, 0x70($s3) -.L802411AC: -/* A9A73C 802411AC 3C05BFFF */ lui $a1, 0xbfff -/* A9A740 802411B0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A9A744 802411B4 2404FFFB */ addiu $a0, $zero, -5 -/* A9A748 802411B8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9A74C 802411BC 8E430000 */ lw $v1, ($s2) -/* A9A750 802411C0 00441024 */ and $v0, $v0, $a0 -/* A9A754 802411C4 00651824 */ and $v1, $v1, $a1 -/* A9A758 802411C8 AE4200B0 */ sw $v0, 0xb0($s2) -/* A9A75C 802411CC AE430000 */ sw $v1, ($s2) -.L802411D0: -/* A9A760 802411D0 8E630070 */ lw $v1, 0x70($s3) -/* A9A764 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* A9A768 802411D8 10400060 */ beqz $v0, .L8024135C_A9A8EC -/* A9A76C 802411DC 00031080 */ sll $v0, $v1, 2 -/* A9A770 802411E0 3C018024 */ lui $at, %hi(jtbl_80243268_A9C7F8) -/* A9A774 802411E4 00220821 */ addu $at, $at, $v0 -/* A9A778 802411E8 8C223268 */ lw $v0, %lo(jtbl_80243268_A9C7F8)($at) -/* A9A77C 802411EC 00400008 */ jr $v0 -/* A9A780 802411F0 00000000 */ nop -.L802411F4_A9A784: -/* A9A784 802411F4 0260202D */ daddu $a0, $s3, $zero -/* A9A788 802411F8 0200282D */ daddu $a1, $s0, $zero -/* A9A78C 802411FC 0C012568 */ jal func_800495A0 -/* A9A790 80241200 02A0302D */ daddu $a2, $s5, $zero -.L80241204_A9A794: -/* A9A794 80241204 0260202D */ daddu $a0, $s3, $zero -/* A9A798 80241208 0200282D */ daddu $a1, $s0, $zero -/* A9A79C 8024120C 0C0125AE */ jal func_800496B8 -/* A9A7A0 80241210 02A0302D */ daddu $a2, $s5, $zero -/* A9A7A4 80241214 080904D7 */ j .L8024135C_A9A8EC -/* A9A7A8 80241218 00000000 */ nop -.L8024121C_A9A7AC: -/* A9A7AC 8024121C 0260202D */ daddu $a0, $s3, $zero -/* A9A7B0 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9A7B4 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A9A7B8 80241228 02A0302D */ daddu $a2, $s5, $zero -.L8024122C_A9A7BC: -/* A9A7BC 8024122C 0260202D */ daddu $a0, $s3, $zero -/* A9A7C0 80241230 0200282D */ daddu $a1, $s0, $zero -/* A9A7C4 80241234 0C012701 */ jal func_80049C04 -/* A9A7C8 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A9A7CC 8024123C 080904D7 */ j .L8024135C_A9A8EC -/* A9A7D0 80241240 00000000 */ nop -.L80241244_A9A7D4: -/* A9A7D4 80241244 0260202D */ daddu $a0, $s3, $zero -/* A9A7D8 80241248 0200282D */ daddu $a1, $s0, $zero -/* A9A7DC 8024124C 0C01278F */ jal func_80049E3C -/* A9A7E0 80241250 02A0302D */ daddu $a2, $s5, $zero -.L80241254_A9A7E4: -/* A9A7E4 80241254 0260202D */ daddu $a0, $s3, $zero -/* A9A7E8 80241258 0200282D */ daddu $a1, $s0, $zero -/* A9A7EC 8024125C 0C0127B3 */ jal func_80049ECC -/* A9A7F0 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A9A7F4 80241264 080904D7 */ j .L8024135C_A9A8EC -/* A9A7F8 80241268 00000000 */ nop -.L8024126C_A9A7FC: -/* A9A7FC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9A800 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9A804 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A9A808 80241278 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A9A80C 8024127C 8C460028 */ lw $a2, 0x28($v0) -/* A9A810 80241280 0C00A7B5 */ jal dist2D -/* A9A814 80241284 8C470030 */ lw $a3, 0x30($v0) -/* A9A818 80241288 8E42006C */ lw $v0, 0x6c($s2) -/* A9A81C 8024128C 10400008 */ beqz $v0, .L802412B0 -/* A9A820 80241290 46000086 */ mov.s $f2, $f0 -/* A9A824 80241294 44820000 */ mtc1 $v0, $f0 -/* A9A828 80241298 00000000 */ nop -/* A9A82C 8024129C 46800020 */ cvt.s.w $f0, $f0 -/* A9A830 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9A834 802412A4 00000000 */ nop -/* A9A838 802412A8 4500000B */ bc1f .L802412D8 -/* A9A83C 802412AC 0260202D */ daddu $a0, $s3, $zero -.L802412B0: -/* A9A840 802412B0 0260202D */ daddu $a0, $s3, $zero -/* A9A844 802412B4 8E050024 */ lw $a1, 0x24($s0) -/* A9A848 802412B8 8E060028 */ lw $a2, 0x28($s0) -/* A9A84C 802412BC 0C0900D8 */ jal func_80240360_A998F0 -/* A9A850 802412C0 02A0382D */ daddu $a3, $s5, $zero -/* A9A854 802412C4 8E630070 */ lw $v1, 0x70($s3) -/* A9A858 802412C8 2402000C */ addiu $v0, $zero, 0xc -/* A9A85C 802412CC 14620023 */ bne $v1, $v0, .L8024135C_A9A8EC -/* A9A860 802412D0 00000000 */ nop -/* A9A864 802412D4 0260202D */ daddu $a0, $s3, $zero -.L802412D8: -/* A9A868 802412D8 0200282D */ daddu $a1, $s0, $zero -/* A9A86C 802412DC 0C0127DF */ jal func_80049F7C -/* A9A870 802412E0 02A0302D */ daddu $a2, $s5, $zero -.L802412E4_A9A874: -/* A9A874 802412E4 0260202D */ daddu $a0, $s3, $zero -/* A9A878 802412E8 0200282D */ daddu $a1, $s0, $zero -/* A9A87C 802412EC 0C012849 */ jal func_8004A124 -/* A9A880 802412F0 02A0302D */ daddu $a2, $s5, $zero -/* A9A884 802412F4 080904D7 */ j .L8024135C_A9A8EC -/* A9A888 802412F8 00000000 */ nop -.L802412FC_A9A88C: -/* A9A88C 802412FC 0260202D */ daddu $a0, $s3, $zero -/* A9A890 80241300 0200282D */ daddu $a1, $s0, $zero -/* A9A894 80241304 0C0128FA */ jal func_8004A3E8 -/* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero -/* A9A89C 8024130C 080904D7 */ j .L8024135C_A9A8EC -/* A9A8A0 80241310 00000000 */ nop -.L80241314_A9A8A4: -/* A9A8A4 80241314 0C090129 */ jal func_802404A4_A99A34 -/* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero -/* A9A8AC 8024131C 080904D7 */ j .L8024135C_A9A8EC -/* A9A8B0 80241320 00000000 */ nop -.L80241324_A9A8B4: -/* A9A8B4 80241324 0C090169 */ jal kpa_111_UnkSetDurationFunc -/* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero -/* A9A8BC 8024132C 080904D7 */ j .L8024135C_A9A8EC -/* A9A8C0 80241330 00000000 */ nop -.L80241334_A9A8C4: -/* A9A8C4 80241334 0C09017A */ jal kpa_111_UnkNpcAIFunc9 -/* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero -/* A9A8CC 8024133C 080904D7 */ j .L8024135C_A9A8EC -/* A9A8D0 80241340 00000000 */ nop -.L80241344_A9A8D4: -/* A9A8D4 80241344 0C0901A2 */ jal kpa_111_UnkDurationCheck -/* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero -/* A9A8DC 8024134C 080904D7 */ j .L8024135C_A9A8EC -/* A9A8E0 80241350 00000000 */ nop -.L80241354_A9A8E4: -/* A9A8E4 80241354 0C0129CF */ jal func_8004A73C -/* A9A8E8 80241358 0260202D */ daddu $a0, $s3, $zero -.L8024135C_A9A8EC: -/* A9A8EC 8024135C 8FBF0048 */ lw $ra, 0x48($sp) -/* A9A8F0 80241360 8FB50044 */ lw $s5, 0x44($sp) -/* A9A8F4 80241364 8FB40040 */ lw $s4, 0x40($sp) -/* A9A8F8 80241368 8FB3003C */ lw $s3, 0x3c($sp) -/* A9A8FC 8024136C 8FB20038 */ lw $s2, 0x38($sp) -/* A9A900 80241370 8FB10034 */ lw $s1, 0x34($sp) -/* A9A904 80241374 8FB00030 */ lw $s0, 0x30($sp) -/* A9A908 80241378 0000102D */ daddu $v0, $zero, $zero -/* A9A90C 8024137C 03E00008 */ jr $ra -/* A9A910 80241380 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s deleted file mode 100644 index ea93c639f8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242FE0_AA1D20 -.double 180.0 - -dlabel D_80242FE8_AA1D28 -.double 75.0 - -.section .text - -glabel func_80240170_A9EEB0 -/* A9EEB0 80240170 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9EEB4 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* A9EEB8 80240178 0080882D */ daddu $s1, $a0, $zero -/* A9EEBC 8024017C 3C05800B */ lui $a1, %hi(gCameras) -/* A9EEC0 80240180 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A9EEC4 80240184 AFBF0020 */ sw $ra, 0x20($sp) -/* A9EEC8 80240188 AFB3001C */ sw $s3, 0x1c($sp) -/* A9EECC 8024018C AFB20018 */ sw $s2, 0x18($sp) -/* A9EED0 80240190 AFB00010 */ sw $s0, 0x10($sp) -/* A9EED4 80240194 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A9EED8 80240198 8E330148 */ lw $s3, 0x148($s1) -/* A9EEDC 8024019C 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A9EEE0 802401A0 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A9EEE4 802401A4 8E30000C */ lw $s0, 0xc($s1) -/* A9EEE8 802401A8 00031080 */ sll $v0, $v1, 2 -/* A9EEEC 802401AC 00431021 */ addu $v0, $v0, $v1 -/* A9EEF0 802401B0 00021080 */ sll $v0, $v0, 2 -/* A9EEF4 802401B4 00431023 */ subu $v0, $v0, $v1 -/* A9EEF8 802401B8 000218C0 */ sll $v1, $v0, 3 -/* A9EEFC 802401BC 00431021 */ addu $v0, $v0, $v1 -/* A9EF00 802401C0 000210C0 */ sll $v0, $v0, 3 -/* A9EF04 802401C4 86640008 */ lh $a0, 8($s3) -/* A9EF08 802401C8 0C00EABB */ jal get_npc_unsafe -/* A9EF0C 802401CC 00459021 */ addu $s2, $v0, $a1 -/* A9EF10 802401D0 0220202D */ daddu $a0, $s1, $zero -/* A9EF14 802401D4 8E050000 */ lw $a1, ($s0) -/* A9EF18 802401D8 0C0B1EAF */ jal evt_get_variable -/* A9EF1C 802401DC 0040802D */ daddu $s0, $v0, $zero -/* A9EF20 802401E0 0260202D */ daddu $a0, $s3, $zero -/* A9EF24 802401E4 8C460024 */ lw $a2, 0x24($v0) -/* A9EF28 802401E8 8C470028 */ lw $a3, 0x28($v0) -/* A9EF2C 802401EC 0C0124FB */ jal func_800493EC -/* A9EF30 802401F0 0000282D */ daddu $a1, $zero, $zero -/* A9EF34 802401F4 10400052 */ beqz $v0, .L80240340 -/* A9EF38 802401F8 2402FFFF */ addiu $v0, $zero, -1 -/* A9EF3C 802401FC C64C006C */ lwc1 $f12, 0x6c($s2) -/* A9EF40 80240200 C60E000C */ lwc1 $f14, 0xc($s0) -/* A9EF44 80240204 3C014387 */ lui $at, 0x4387 -/* A9EF48 80240208 4481A000 */ mtc1 $at, $f20 -/* A9EF4C 8024020C 0C00A70A */ jal get_clamped_angle_diff -/* A9EF50 80240210 00000000 */ nop -/* A9EF54 80240214 0C00A6C9 */ jal clamp_angle -/* A9EF58 80240218 46000306 */ mov.s $f12, $f0 -/* A9EF5C 8024021C 3C018024 */ lui $at, %hi(D_80242FE0_AA1D20) -/* A9EF60 80240220 D4222FE0 */ ldc1 $f2, %lo(D_80242FE0_AA1D20)($at) -/* A9EF64 80240224 46000021 */ cvt.d.s $f0, $f0 -/* A9EF68 80240228 4622003C */ c.lt.d $f0, $f2 -/* A9EF6C 8024022C 00000000 */ nop -/* A9EF70 80240230 45000003 */ bc1f .L80240240 -/* A9EF74 80240234 00000000 */ nop -/* A9EF78 80240238 3C0142B4 */ lui $at, 0x42b4 -/* A9EF7C 8024023C 4481A000 */ mtc1 $at, $f20 -.L80240240: -/* A9EF80 80240240 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A9EF84 80240244 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A9EF88 80240248 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A9EF8C 8024024C 8E220000 */ lw $v0, ($s1) -/* A9EF90 80240250 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A9EF94 80240254 8C460028 */ lw $a2, 0x28($v0) -/* A9EF98 80240258 0C00A720 */ jal atan2 -/* A9EF9C 8024025C 8C470030 */ lw $a3, 0x30($v0) -/* A9EFA0 80240260 4600A306 */ mov.s $f12, $f20 -/* A9EFA4 80240264 0C00A70A */ jal get_clamped_angle_diff -/* A9EFA8 80240268 46000386 */ mov.s $f14, $f0 -/* A9EFAC 8024026C 46000005 */ abs.s $f0, $f0 -/* A9EFB0 80240270 3C018024 */ lui $at, %hi(D_80242FE8_AA1D28) -/* A9EFB4 80240274 D4222FE8 */ ldc1 $f2, %lo(D_80242FE8_AA1D28)($at) -/* A9EFB8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* A9EFBC 8024027C 4620103C */ c.lt.d $f2, $f0 -/* A9EFC0 80240280 00000000 */ nop -/* A9EFC4 80240284 4501002E */ bc1t .L80240340 -/* A9EFC8 80240288 2402FFFF */ addiu $v0, $zero, -1 -/* A9EFCC 8024028C 8E220000 */ lw $v0, ($s1) -/* A9EFD0 80240290 C600003C */ lwc1 $f0, 0x3c($s0) -/* A9EFD4 80240294 C442002C */ lwc1 $f2, 0x2c($v0) -/* A9EFD8 80240298 860200A8 */ lh $v0, 0xa8($s0) -/* A9EFDC 8024029C 46020001 */ sub.s $f0, $f0, $f2 -/* A9EFE0 802402A0 44821000 */ mtc1 $v0, $f2 -/* A9EFE4 802402A4 00000000 */ nop -/* A9EFE8 802402A8 468010A1 */ cvt.d.w $f2, $f2 -/* A9EFEC 802402AC 46221080 */ add.d $f2, $f2, $f2 -/* A9EFF0 802402B0 46000005 */ abs.s $f0, $f0 -/* A9EFF4 802402B4 46000021 */ cvt.d.s $f0, $f0 -/* A9EFF8 802402B8 4620103E */ c.le.d $f2, $f0 -/* A9EFFC 802402BC 00000000 */ nop -/* A9F000 802402C0 4501001F */ bc1t .L80240340 -/* A9F004 802402C4 2402FFFF */ addiu $v0, $zero, -1 -/* A9F008 802402C8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A9F00C 802402CC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A9F010 802402D0 24020009 */ addiu $v0, $zero, 9 -/* A9F014 802402D4 10620019 */ beq $v1, $v0, .L8024033C -/* A9F018 802402D8 24020007 */ addiu $v0, $zero, 7 -/* A9F01C 802402DC 14620005 */ bne $v1, $v0, .L802402F4 -/* A9F020 802402E0 2402FFFF */ addiu $v0, $zero, -1 -/* A9F024 802402E4 080900D0 */ j .L80240340 -/* A9F028 802402E8 00000000 */ nop -.L802402EC: -/* A9F02C 802402EC 080900D0 */ j .L80240340 -/* A9F030 802402F0 0240102D */ daddu $v0, $s2, $zero -.L802402F4: -/* A9F034 802402F4 8E620078 */ lw $v0, 0x78($s3) -/* A9F038 802402F8 18400010 */ blez $v0, .L8024033C -/* A9F03C 802402FC 0000882D */ daddu $s1, $zero, $zero -.L80240300: -/* A9F040 80240300 86620008 */ lh $v0, 8($s3) -/* A9F044 80240304 00511021 */ addu $v0, $v0, $s1 -/* A9F048 80240308 24520001 */ addiu $s2, $v0, 1 -/* A9F04C 8024030C 0C00FB3A */ jal get_enemy -/* A9F050 80240310 0240202D */ daddu $a0, $s2, $zero -/* A9F054 80240314 0240202D */ daddu $a0, $s2, $zero -/* A9F058 80240318 0C00EABB */ jal get_npc_unsafe -/* A9F05C 8024031C 0040802D */ daddu $s0, $v0, $zero -/* A9F060 80240320 8E02006C */ lw $v0, 0x6c($s0) -/* A9F064 80240324 1040FFF1 */ beqz $v0, .L802402EC -/* A9F068 80240328 26310001 */ addiu $s1, $s1, 1 -/* A9F06C 8024032C 8E620078 */ lw $v0, 0x78($s3) -/* A9F070 80240330 0222102A */ slt $v0, $s1, $v0 -/* A9F074 80240334 1440FFF2 */ bnez $v0, .L80240300 -/* A9F078 80240338 00000000 */ nop -.L8024033C: -/* A9F07C 8024033C 2402FFFF */ addiu $v0, $zero, -1 -.L80240340: -/* A9F080 80240340 8FBF0020 */ lw $ra, 0x20($sp) -/* A9F084 80240344 8FB3001C */ lw $s3, 0x1c($sp) -/* A9F088 80240348 8FB20018 */ lw $s2, 0x18($sp) -/* A9F08C 8024034C 8FB10014 */ lw $s1, 0x14($sp) -/* A9F090 80240350 8FB00010 */ lw $s0, 0x10($sp) -/* A9F094 80240354 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A9F098 80240358 03E00008 */ jr $ra -/* A9F09C 8024035C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s deleted file mode 100644 index 5183d204b3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360_A9F0A0 -/* A9F0A0 80240360 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9F0A4 80240364 AFB20038 */ sw $s2, 0x38($sp) -/* A9F0A8 80240368 0080902D */ daddu $s2, $a0, $zero -/* A9F0AC 8024036C AFB00030 */ sw $s0, 0x30($sp) -/* A9F0B0 80240370 AFBF003C */ sw $ra, 0x3c($sp) -/* A9F0B4 80240374 AFB10034 */ sw $s1, 0x34($sp) -/* A9F0B8 80240378 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A9F0BC 8024037C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A9F0C0 80240380 8E510148 */ lw $s1, 0x148($s2) -/* A9F0C4 80240384 4485A000 */ mtc1 $a1, $f20 -/* A9F0C8 80240388 86240008 */ lh $a0, 8($s1) -/* A9F0CC 8024038C 4486B000 */ mtc1 $a2, $f22 -/* A9F0D0 80240390 0C00EABB */ jal get_npc_unsafe -/* A9F0D4 80240394 00E0802D */ daddu $s0, $a3, $zero -/* A9F0D8 80240398 0200202D */ daddu $a0, $s0, $zero -/* A9F0DC 8024039C 0220282D */ daddu $a1, $s1, $zero -/* A9F0E0 802403A0 24030001 */ addiu $v1, $zero, 1 -/* A9F0E4 802403A4 4406A000 */ mfc1 $a2, $f20 -/* A9F0E8 802403A8 4407B000 */ mfc1 $a3, $f22 -/* A9F0EC 802403AC 0040802D */ daddu $s0, $v0, $zero -/* A9F0F0 802403B0 0C01242D */ jal func_800490B4 -/* A9F0F4 802403B4 AFA30010 */ sw $v1, 0x10($sp) -/* A9F0F8 802403B8 1440001D */ bnez $v0, .L80240430 -/* A9F0FC 802403BC 24040002 */ addiu $a0, $zero, 2 -/* A9F100 802403C0 0200282D */ daddu $a1, $s0, $zero -/* A9F104 802403C4 0000302D */ daddu $a2, $zero, $zero -/* A9F108 802403C8 860300A8 */ lh $v1, 0xa8($s0) -/* A9F10C 802403CC 3C013F80 */ lui $at, 0x3f80 -/* A9F110 802403D0 44810000 */ mtc1 $at, $f0 -/* A9F114 802403D4 3C014000 */ lui $at, 0x4000 -/* A9F118 802403D8 44811000 */ mtc1 $at, $f2 -/* A9F11C 802403DC 3C01C1A0 */ lui $at, 0xc1a0 -/* A9F120 802403E0 44812000 */ mtc1 $at, $f4 -/* A9F124 802403E4 2402000F */ addiu $v0, $zero, 0xf -/* A9F128 802403E8 AFA2001C */ sw $v0, 0x1c($sp) -/* A9F12C 802403EC 44833000 */ mtc1 $v1, $f6 -/* A9F130 802403F0 00000000 */ nop -/* A9F134 802403F4 468031A0 */ cvt.s.w $f6, $f6 -/* A9F138 802403F8 44073000 */ mfc1 $a3, $f6 -/* A9F13C 802403FC 27A20028 */ addiu $v0, $sp, 0x28 -/* A9F140 80240400 AFA20020 */ sw $v0, 0x20($sp) -/* A9F144 80240404 E7A00010 */ swc1 $f0, 0x10($sp) -/* A9F148 80240408 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9F14C 8024040C 0C01BFA4 */ jal fx_emote -/* A9F150 80240410 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9F154 80240414 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F158 80240418 8C430000 */ lw $v1, ($v0) -/* A9F15C 8024041C 24020014 */ addiu $v0, $zero, 0x14 -/* A9F160 80240420 A602008E */ sh $v0, 0x8e($s0) -/* A9F164 80240424 24020021 */ addiu $v0, $zero, 0x21 -/* A9F168 80240428 08090120 */ j .L80240480 -/* A9F16C 8024042C AE030028 */ sw $v1, 0x28($s0) -.L80240430: -/* A9F170 80240430 0C09005C */ jal func_80240170_A9EEB0 -/* A9F174 80240434 0240202D */ daddu $a0, $s2, $zero -/* A9F178 80240438 0040202D */ daddu $a0, $v0, $zero -/* A9F17C 8024043C 2402FFFF */ addiu $v0, $zero, -1 -/* A9F180 80240440 10820010 */ beq $a0, $v0, .L80240484 -/* A9F184 80240444 00000000 */ nop -/* A9F188 80240448 0C00FB3A */ jal get_enemy -/* A9F18C 8024044C 00000000 */ nop -/* A9F190 80240450 8C42006C */ lw $v0, 0x6c($v0) -/* A9F194 80240454 1440000B */ bnez $v0, .L80240484 -/* A9F198 80240458 00000000 */ nop -/* A9F19C 8024045C 8602008C */ lh $v0, 0x8c($s0) -/* A9F1A0 80240460 14400008 */ bnez $v0, .L80240484 -/* A9F1A4 80240464 00000000 */ nop -/* A9F1A8 80240468 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F1AC 8024046C 8C420020 */ lw $v0, 0x20($v0) -/* A9F1B0 80240470 AE020028 */ sw $v0, 0x28($s0) -/* A9F1B4 80240474 96220072 */ lhu $v0, 0x72($s1) -/* A9F1B8 80240478 A602008E */ sh $v0, 0x8e($s0) -/* A9F1BC 8024047C 2402001E */ addiu $v0, $zero, 0x1e -.L80240480: -/* A9F1C0 80240480 AE420070 */ sw $v0, 0x70($s2) -.L80240484: -/* A9F1C4 80240484 8FBF003C */ lw $ra, 0x3c($sp) -/* A9F1C8 80240488 8FB20038 */ lw $s2, 0x38($sp) -/* A9F1CC 8024048C 8FB10034 */ lw $s1, 0x34($sp) -/* A9F1D0 80240490 8FB00030 */ lw $s0, 0x30($sp) -/* A9F1D4 80240494 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A9F1D8 80240498 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A9F1DC 8024049C 03E00008 */ jr $ra -/* A9F1E0 802404A0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s deleted file mode 100644 index 31c6bf7629..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A4_A9F1E4 -/* A9F1E4 802404A4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A9F1E8 802404A8 AFB20038 */ sw $s2, 0x38($sp) -/* A9F1EC 802404AC 0080902D */ daddu $s2, $a0, $zero -/* A9F1F0 802404B0 AFBF003C */ sw $ra, 0x3c($sp) -/* A9F1F4 802404B4 AFB10034 */ sw $s1, 0x34($sp) -/* A9F1F8 802404B8 AFB00030 */ sw $s0, 0x30($sp) -/* A9F1FC 802404BC 8E510148 */ lw $s1, 0x148($s2) -/* A9F200 802404C0 0C00EABB */ jal get_npc_unsafe -/* A9F204 802404C4 86240008 */ lh $a0, 8($s1) -/* A9F208 802404C8 0040802D */ daddu $s0, $v0, $zero -/* A9F20C 802404CC 9602008E */ lhu $v0, 0x8e($s0) -/* A9F210 802404D0 2442FFFF */ addiu $v0, $v0, -1 -/* A9F214 802404D4 A602008E */ sh $v0, 0x8e($s0) -/* A9F218 802404D8 00021400 */ sll $v0, $v0, 0x10 -/* A9F21C 802404DC 1C40002B */ bgtz $v0, .L8024058C -/* A9F220 802404E0 00000000 */ nop -/* A9F224 802404E4 0C09005C */ jal func_80240170_A9EEB0 -/* A9F228 802404E8 0240202D */ daddu $a0, $s2, $zero -/* A9F22C 802404EC 0040202D */ daddu $a0, $v0, $zero -/* A9F230 802404F0 0481001A */ bgez $a0, .L8024055C -/* A9F234 802404F4 2402000F */ addiu $v0, $zero, 0xf -/* A9F238 802404F8 24040002 */ addiu $a0, $zero, 2 -/* A9F23C 802404FC 860300A8 */ lh $v1, 0xa8($s0) -/* A9F240 80240500 AFA2001C */ sw $v0, 0x1c($sp) -/* A9F244 80240504 27A20028 */ addiu $v0, $sp, 0x28 -/* A9F248 80240508 0200282D */ daddu $a1, $s0, $zero -/* A9F24C 8024050C 3C013F80 */ lui $at, 0x3f80 -/* A9F250 80240510 44810000 */ mtc1 $at, $f0 -/* A9F254 80240514 3C014000 */ lui $at, 0x4000 -/* A9F258 80240518 44811000 */ mtc1 $at, $f2 -/* A9F25C 8024051C 3C01C1A0 */ lui $at, 0xc1a0 -/* A9F260 80240520 44812000 */ mtc1 $at, $f4 -/* A9F264 80240524 44833000 */ mtc1 $v1, $f6 -/* A9F268 80240528 00000000 */ nop -/* A9F26C 8024052C 468031A0 */ cvt.s.w $f6, $f6 -/* A9F270 80240530 44073000 */ mfc1 $a3, $f6 -/* A9F274 80240534 0000302D */ daddu $a2, $zero, $zero -/* A9F278 80240538 AFA20020 */ sw $v0, 0x20($sp) -/* A9F27C 8024053C E7A00010 */ swc1 $f0, 0x10($sp) -/* A9F280 80240540 E7A20014 */ swc1 $f2, 0x14($sp) -/* A9F284 80240544 0C01BFA4 */ jal fx_emote -/* A9F288 80240548 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9F28C 8024054C 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F290 80240550 8C420000 */ lw $v0, ($v0) -/* A9F294 80240554 0809015F */ j .L8024057C -/* A9F298 80240558 AE020028 */ sw $v0, 0x28($s0) -.L8024055C: -/* A9F29C 8024055C 8E2200CC */ lw $v0, 0xcc($s1) -/* A9F2A0 80240560 8C420024 */ lw $v0, 0x24($v0) -/* A9F2A4 80240564 0C00FB3A */ jal get_enemy -/* A9F2A8 80240568 AE020028 */ sw $v0, 0x28($s0) -/* A9F2AC 8024056C 86240008 */ lh $a0, 8($s1) -/* A9F2B0 80240570 24030001 */ addiu $v1, $zero, 1 -/* A9F2B4 80240574 AC43006C */ sw $v1, 0x6c($v0) -/* A9F2B8 80240578 AC44007C */ sw $a0, 0x7c($v0) -.L8024057C: -/* A9F2BC 8024057C 96220076 */ lhu $v0, 0x76($s1) -/* A9F2C0 80240580 A602008E */ sh $v0, 0x8e($s0) -/* A9F2C4 80240584 24020021 */ addiu $v0, $zero, 0x21 -/* A9F2C8 80240588 AE420070 */ sw $v0, 0x70($s2) -.L8024058C: -/* A9F2CC 8024058C 8FBF003C */ lw $ra, 0x3c($sp) -/* A9F2D0 80240590 8FB20038 */ lw $s2, 0x38($sp) -/* A9F2D4 80240594 8FB10034 */ lw $s1, 0x34($sp) -/* A9F2D8 80240598 8FB00030 */ lw $s0, 0x30($sp) -/* A9F2DC 8024059C 03E00008 */ jr $ra -/* A9F2E0 802405A0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s deleted file mode 100644 index 52dc1b4a34..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243008_AA1D48 -.word .L802411F4_A9FF34, .L80241204_A9FF44, .L8024121C_A9FF5C, .L8024122C_A9FF6C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L80241244_A9FF84, .L80241254_A9FF94, .L8024126C_A9FFAC, .L802412E4_AA0024, .L802412FC_AA003C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L80241314_AA0054, .L80241324_AA0064, .L80241334_AA0074, .L80241344_AA0084, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L8024135C_AA009C, .L80241354_AA0094, 0, 0 - -.section .text - -glabel func_80241064_A9FDA4 -/* A9FDA4 80241064 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9FDA8 80241068 AFB3003C */ sw $s3, 0x3c($sp) -/* A9FDAC 8024106C 0080982D */ daddu $s3, $a0, $zero -/* A9FDB0 80241070 AFBF0048 */ sw $ra, 0x48($sp) -/* A9FDB4 80241074 AFB50044 */ sw $s5, 0x44($sp) -/* A9FDB8 80241078 AFB40040 */ sw $s4, 0x40($sp) -/* A9FDBC 8024107C AFB20038 */ sw $s2, 0x38($sp) -/* A9FDC0 80241080 AFB10034 */ sw $s1, 0x34($sp) -/* A9FDC4 80241084 AFB00030 */ sw $s0, 0x30($sp) -/* A9FDC8 80241088 8E720148 */ lw $s2, 0x148($s3) -/* A9FDCC 8024108C 86440008 */ lh $a0, 8($s2) -/* A9FDD0 80241090 8E70000C */ lw $s0, 0xc($s3) -/* A9FDD4 80241094 0C00EABB */ jal get_npc_unsafe -/* A9FDD8 80241098 00A0882D */ daddu $s1, $a1, $zero -/* A9FDDC 8024109C 0260202D */ daddu $a0, $s3, $zero -/* A9FDE0 802410A0 8E050000 */ lw $a1, ($s0) -/* A9FDE4 802410A4 0C0B1EAF */ jal evt_get_variable -/* A9FDE8 802410A8 0040A02D */ daddu $s4, $v0, $zero -/* A9FDEC 802410AC AFA00010 */ sw $zero, 0x10($sp) -/* A9FDF0 802410B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FDF4 802410B4 8C630030 */ lw $v1, 0x30($v1) -/* A9FDF8 802410B8 AFA30014 */ sw $v1, 0x14($sp) -/* A9FDFC 802410BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE00 802410C0 8C63001C */ lw $v1, 0x1c($v1) -/* A9FE04 802410C4 AFA30018 */ sw $v1, 0x18($sp) -/* A9FE08 802410C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE0C 802410CC 8C630024 */ lw $v1, 0x24($v1) -/* A9FE10 802410D0 AFA3001C */ sw $v1, 0x1c($sp) -/* A9FE14 802410D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE18 802410D8 8C630028 */ lw $v1, 0x28($v1) -/* A9FE1C 802410DC 27B50010 */ addiu $s5, $sp, 0x10 -/* A9FE20 802410E0 AFA30020 */ sw $v1, 0x20($sp) -/* A9FE24 802410E4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A9FE28 802410E8 3C014220 */ lui $at, 0x4220 -/* A9FE2C 802410EC 44810000 */ mtc1 $at, $f0 -/* A9FE30 802410F0 8C63002C */ lw $v1, 0x2c($v1) -/* A9FE34 802410F4 0040802D */ daddu $s0, $v0, $zero -/* A9FE38 802410F8 E7A00028 */ swc1 $f0, 0x28($sp) -/* A9FE3C 802410FC A7A0002C */ sh $zero, 0x2c($sp) -/* A9FE40 80241100 16200005 */ bnez $s1, .L80241118 -/* A9FE44 80241104 AFA30024 */ sw $v1, 0x24($sp) -/* A9FE48 80241108 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FE4C 8024110C 30420004 */ andi $v0, $v0, 4 -/* A9FE50 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9FE54 80241114 00000000 */ nop -.L80241118: -/* A9FE58 80241118 2404F7FF */ addiu $a0, $zero, -0x801 -/* A9FE5C 8024111C AE600070 */ sw $zero, 0x70($s3) -/* A9FE60 80241120 A680008E */ sh $zero, 0x8e($s4) -/* A9FE64 80241124 8E4200CC */ lw $v0, 0xcc($s2) -/* A9FE68 80241128 8E830000 */ lw $v1, ($s4) -/* A9FE6C 8024112C 8C420000 */ lw $v0, ($v0) -/* A9FE70 80241130 00641824 */ and $v1, $v1, $a0 -/* A9FE74 80241134 AE830000 */ sw $v1, ($s4) -/* A9FE78 80241138 AE820028 */ sw $v0, 0x28($s4) -/* A9FE7C 8024113C 8E4200D0 */ lw $v0, 0xd0($s2) -/* A9FE80 80241140 8C420034 */ lw $v0, 0x34($v0) -/* A9FE84 80241144 54400005 */ bnel $v0, $zero, .L8024115C -/* A9FE88 80241148 2402FDFF */ addiu $v0, $zero, -0x201 -/* A9FE8C 8024114C 34620200 */ ori $v0, $v1, 0x200 -/* A9FE90 80241150 2403FFF7 */ addiu $v1, $zero, -9 -/* A9FE94 80241154 08090459 */ j .L80241164 -/* A9FE98 80241158 00431024 */ and $v0, $v0, $v1 -.L8024115C: -/* A9FE9C 8024115C 00621024 */ and $v0, $v1, $v0 -/* A9FEA0 80241160 34420008 */ ori $v0, $v0, 8 -.L80241164: -/* A9FEA4 80241164 AE820000 */ sw $v0, ($s4) -/* A9FEA8 80241168 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FEAC 8024116C 30420004 */ andi $v0, $v0, 4 -/* A9FEB0 80241170 10400008 */ beqz $v0, .L80241194 -/* A9FEB4 80241174 24020063 */ addiu $v0, $zero, 0x63 -/* A9FEB8 80241178 AE620070 */ sw $v0, 0x70($s3) -/* A9FEBC 8024117C AE600074 */ sw $zero, 0x74($s3) -/* A9FEC0 80241180 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FEC4 80241184 2403FFFB */ addiu $v1, $zero, -5 -/* A9FEC8 80241188 00431024 */ and $v0, $v0, $v1 -/* A9FECC 8024118C 0809046B */ j .L802411AC -/* A9FED0 80241190 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241194: -/* A9FED4 80241194 8E420000 */ lw $v0, ($s2) -/* A9FED8 80241198 3C034000 */ lui $v1, 0x4000 -/* A9FEDC 8024119C 00431024 */ and $v0, $v0, $v1 -/* A9FEE0 802411A0 10400002 */ beqz $v0, .L802411AC -/* A9FEE4 802411A4 2402000C */ addiu $v0, $zero, 0xc -/* A9FEE8 802411A8 AE620070 */ sw $v0, 0x70($s3) -.L802411AC: -/* A9FEEC 802411AC 3C05BFFF */ lui $a1, 0xbfff -/* A9FEF0 802411B0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A9FEF4 802411B4 2404FFFB */ addiu $a0, $zero, -5 -/* A9FEF8 802411B8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A9FEFC 802411BC 8E430000 */ lw $v1, ($s2) -/* A9FF00 802411C0 00441024 */ and $v0, $v0, $a0 -/* A9FF04 802411C4 00651824 */ and $v1, $v1, $a1 -/* A9FF08 802411C8 AE4200B0 */ sw $v0, 0xb0($s2) -/* A9FF0C 802411CC AE430000 */ sw $v1, ($s2) -.L802411D0: -/* A9FF10 802411D0 8E630070 */ lw $v1, 0x70($s3) -/* A9FF14 802411D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* A9FF18 802411D8 10400060 */ beqz $v0, .L8024135C_AA009C -/* A9FF1C 802411DC 00031080 */ sll $v0, $v1, 2 -/* A9FF20 802411E0 3C018024 */ lui $at, %hi(jtbl_80243008_AA1D48) -/* A9FF24 802411E4 00220821 */ addu $at, $at, $v0 -/* A9FF28 802411E8 8C223008 */ lw $v0, %lo(jtbl_80243008_AA1D48)($at) -/* A9FF2C 802411EC 00400008 */ jr $v0 -/* A9FF30 802411F0 00000000 */ nop -.L802411F4_A9FF34: -/* A9FF34 802411F4 0260202D */ daddu $a0, $s3, $zero -/* A9FF38 802411F8 0200282D */ daddu $a1, $s0, $zero -/* A9FF3C 802411FC 0C012568 */ jal func_800495A0 -/* A9FF40 80241200 02A0302D */ daddu $a2, $s5, $zero -.L80241204_A9FF44: -/* A9FF44 80241204 0260202D */ daddu $a0, $s3, $zero -/* A9FF48 80241208 0200282D */ daddu $a1, $s0, $zero -/* A9FF4C 8024120C 0C0125AE */ jal func_800496B8 -/* A9FF50 80241210 02A0302D */ daddu $a2, $s5, $zero -/* A9FF54 80241214 080904D7 */ j .L8024135C_AA009C -/* A9FF58 80241218 00000000 */ nop -.L8024121C_A9FF5C: -/* A9FF5C 8024121C 0260202D */ daddu $a0, $s3, $zero -/* A9FF60 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9FF64 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A9FF68 80241228 02A0302D */ daddu $a2, $s5, $zero -.L8024122C_A9FF6C: -/* A9FF6C 8024122C 0260202D */ daddu $a0, $s3, $zero -/* A9FF70 80241230 0200282D */ daddu $a1, $s0, $zero -/* A9FF74 80241234 0C012701 */ jal func_80049C04 -/* A9FF78 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A9FF7C 8024123C 080904D7 */ j .L8024135C_AA009C -/* A9FF80 80241240 00000000 */ nop -.L80241244_A9FF84: -/* A9FF84 80241244 0260202D */ daddu $a0, $s3, $zero -/* A9FF88 80241248 0200282D */ daddu $a1, $s0, $zero -/* A9FF8C 8024124C 0C01278F */ jal func_80049E3C -/* A9FF90 80241250 02A0302D */ daddu $a2, $s5, $zero -.L80241254_A9FF94: -/* A9FF94 80241254 0260202D */ daddu $a0, $s3, $zero -/* A9FF98 80241258 0200282D */ daddu $a1, $s0, $zero -/* A9FF9C 8024125C 0C0127B3 */ jal func_80049ECC -/* A9FFA0 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A9FFA4 80241264 080904D7 */ j .L8024135C_AA009C -/* A9FFA8 80241268 00000000 */ nop -.L8024126C_A9FFAC: -/* A9FFAC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9FFB0 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9FFB4 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A9FFB8 80241278 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A9FFBC 8024127C 8C460028 */ lw $a2, 0x28($v0) -/* A9FFC0 80241280 0C00A7B5 */ jal dist2D -/* A9FFC4 80241284 8C470030 */ lw $a3, 0x30($v0) -/* A9FFC8 80241288 8E42006C */ lw $v0, 0x6c($s2) -/* A9FFCC 8024128C 10400008 */ beqz $v0, .L802412B0 -/* A9FFD0 80241290 46000086 */ mov.s $f2, $f0 -/* A9FFD4 80241294 44820000 */ mtc1 $v0, $f0 -/* A9FFD8 80241298 00000000 */ nop -/* A9FFDC 8024129C 46800020 */ cvt.s.w $f0, $f0 -/* A9FFE0 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9FFE4 802412A4 00000000 */ nop -/* A9FFE8 802412A8 4500000B */ bc1f .L802412D8 -/* A9FFEC 802412AC 0260202D */ daddu $a0, $s3, $zero -.L802412B0: -/* A9FFF0 802412B0 0260202D */ daddu $a0, $s3, $zero -/* A9FFF4 802412B4 8E050024 */ lw $a1, 0x24($s0) -/* A9FFF8 802412B8 8E060028 */ lw $a2, 0x28($s0) -/* A9FFFC 802412BC 0C0900D8 */ jal func_80240360_A9F0A0 -/* AA0000 802412C0 02A0382D */ daddu $a3, $s5, $zero -/* AA0004 802412C4 8E630070 */ lw $v1, 0x70($s3) -/* AA0008 802412C8 2402000C */ addiu $v0, $zero, 0xc -/* AA000C 802412CC 14620023 */ bne $v1, $v0, .L8024135C_AA009C -/* AA0010 802412D0 00000000 */ nop -/* AA0014 802412D4 0260202D */ daddu $a0, $s3, $zero -.L802412D8: -/* AA0018 802412D8 0200282D */ daddu $a1, $s0, $zero -/* AA001C 802412DC 0C0127DF */ jal func_80049F7C -/* AA0020 802412E0 02A0302D */ daddu $a2, $s5, $zero -.L802412E4_AA0024: -/* AA0024 802412E4 0260202D */ daddu $a0, $s3, $zero -/* AA0028 802412E8 0200282D */ daddu $a1, $s0, $zero -/* AA002C 802412EC 0C012849 */ jal func_8004A124 -/* AA0030 802412F0 02A0302D */ daddu $a2, $s5, $zero -/* AA0034 802412F4 080904D7 */ j .L8024135C_AA009C -/* AA0038 802412F8 00000000 */ nop -.L802412FC_AA003C: -/* AA003C 802412FC 0260202D */ daddu $a0, $s3, $zero -/* AA0040 80241300 0200282D */ daddu $a1, $s0, $zero -/* AA0044 80241304 0C0128FA */ jal func_8004A3E8 -/* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero -/* AA004C 8024130C 080904D7 */ j .L8024135C_AA009C -/* AA0050 80241310 00000000 */ nop -.L80241314_AA0054: -/* AA0054 80241314 0C090129 */ jal func_802404A4_A9F1E4 -/* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero -/* AA005C 8024131C 080904D7 */ j .L8024135C_AA009C -/* AA0060 80241320 00000000 */ nop -.L80241324_AA0064: -/* AA0064 80241324 0C090169 */ jal kpa_115_UnkSetDurationFunc -/* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero -/* AA006C 8024132C 080904D7 */ j .L8024135C_AA009C -/* AA0070 80241330 00000000 */ nop -.L80241334_AA0074: -/* AA0074 80241334 0C09017A */ jal kpa_115_UnkNpcAIFunc9 -/* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero -/* AA007C 8024133C 080904D7 */ j .L8024135C_AA009C -/* AA0080 80241340 00000000 */ nop -.L80241344_AA0084: -/* AA0084 80241344 0C0901A2 */ jal kpa_115_UnkDurationCheck -/* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero -/* AA008C 8024134C 080904D7 */ j .L8024135C_AA009C -/* AA0090 80241350 00000000 */ nop -.L80241354_AA0094: -/* AA0094 80241354 0C0129CF */ jal func_8004A73C -/* AA0098 80241358 0260202D */ daddu $a0, $s3, $zero -.L8024135C_AA009C: -/* AA009C 8024135C 8FBF0048 */ lw $ra, 0x48($sp) -/* AA00A0 80241360 8FB50044 */ lw $s5, 0x44($sp) -/* AA00A4 80241364 8FB40040 */ lw $s4, 0x40($sp) -/* AA00A8 80241368 8FB3003C */ lw $s3, 0x3c($sp) -/* AA00AC 8024136C 8FB20038 */ lw $s2, 0x38($sp) -/* AA00B0 80241370 8FB10034 */ lw $s1, 0x34($sp) -/* AA00B4 80241374 8FB00030 */ lw $s0, 0x30($sp) -/* AA00B8 80241378 0000102D */ daddu $v0, $zero, $zero -/* AA00BC 8024137C 03E00008 */ jr $ra -/* AA00C0 80241380 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s deleted file mode 100644 index 5dbdfa2ab4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802434A0_A63E70 -.double 180.0 - -dlabel D_802434A8_A63E78 -.double 75.0 - -.section .text - -glabel func_80240000_A609D0 -/* A609D0 80240000 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A609D4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* A609D8 80240008 0080882D */ daddu $s1, $a0, $zero -/* A609DC 8024000C 3C05800B */ lui $a1, %hi(gCameras) -/* A609E0 80240010 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A609E4 80240014 AFBF0020 */ sw $ra, 0x20($sp) -/* A609E8 80240018 AFB3001C */ sw $s3, 0x1c($sp) -/* A609EC 8024001C AFB20018 */ sw $s2, 0x18($sp) -/* A609F0 80240020 AFB00010 */ sw $s0, 0x10($sp) -/* A609F4 80240024 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A609F8 80240028 8E330148 */ lw $s3, 0x148($s1) -/* A609FC 8024002C 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A60A00 80240030 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A60A04 80240034 8E30000C */ lw $s0, 0xc($s1) -/* A60A08 80240038 00031080 */ sll $v0, $v1, 2 -/* A60A0C 8024003C 00431021 */ addu $v0, $v0, $v1 -/* A60A10 80240040 00021080 */ sll $v0, $v0, 2 -/* A60A14 80240044 00431023 */ subu $v0, $v0, $v1 -/* A60A18 80240048 000218C0 */ sll $v1, $v0, 3 -/* A60A1C 8024004C 00431021 */ addu $v0, $v0, $v1 -/* A60A20 80240050 000210C0 */ sll $v0, $v0, 3 -/* A60A24 80240054 86640008 */ lh $a0, 8($s3) -/* A60A28 80240058 0C00EABB */ jal get_npc_unsafe -/* A60A2C 8024005C 00459021 */ addu $s2, $v0, $a1 -/* A60A30 80240060 0220202D */ daddu $a0, $s1, $zero -/* A60A34 80240064 8E050000 */ lw $a1, ($s0) -/* A60A38 80240068 0C0B1EAF */ jal evt_get_variable -/* A60A3C 8024006C 0040802D */ daddu $s0, $v0, $zero -/* A60A40 80240070 0260202D */ daddu $a0, $s3, $zero -/* A60A44 80240074 8C460024 */ lw $a2, 0x24($v0) -/* A60A48 80240078 8C470028 */ lw $a3, 0x28($v0) -/* A60A4C 8024007C 0C0124FB */ jal func_800493EC -/* A60A50 80240080 0000282D */ daddu $a1, $zero, $zero -/* A60A54 80240084 10400052 */ beqz $v0, .L802401D0 -/* A60A58 80240088 2402FFFF */ addiu $v0, $zero, -1 -/* A60A5C 8024008C C64C006C */ lwc1 $f12, 0x6c($s2) -/* A60A60 80240090 C60E000C */ lwc1 $f14, 0xc($s0) -/* A60A64 80240094 3C014387 */ lui $at, 0x4387 -/* A60A68 80240098 4481A000 */ mtc1 $at, $f20 -/* A60A6C 8024009C 0C00A70A */ jal get_clamped_angle_diff -/* A60A70 802400A0 00000000 */ nop -/* A60A74 802400A4 0C00A6C9 */ jal clamp_angle -/* A60A78 802400A8 46000306 */ mov.s $f12, $f0 -/* A60A7C 802400AC 3C018024 */ lui $at, %hi(D_802434A0_A63E70) -/* A60A80 802400B0 D42234A0 */ ldc1 $f2, %lo(D_802434A0_A63E70)($at) -/* A60A84 802400B4 46000021 */ cvt.d.s $f0, $f0 -/* A60A88 802400B8 4622003C */ c.lt.d $f0, $f2 -/* A60A8C 802400BC 00000000 */ nop -/* A60A90 802400C0 45000003 */ bc1f .L802400D0 -/* A60A94 802400C4 00000000 */ nop -/* A60A98 802400C8 3C0142B4 */ lui $at, 0x42b4 -/* A60A9C 802400CC 4481A000 */ mtc1 $at, $f20 -.L802400D0: -/* A60AA0 802400D0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A60AA4 802400D4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A60AA8 802400D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A60AAC 802400DC 8E220000 */ lw $v0, ($s1) -/* A60AB0 802400E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A60AB4 802400E4 8C460028 */ lw $a2, 0x28($v0) -/* A60AB8 802400E8 0C00A720 */ jal atan2 -/* A60ABC 802400EC 8C470030 */ lw $a3, 0x30($v0) -/* A60AC0 802400F0 4600A306 */ mov.s $f12, $f20 -/* A60AC4 802400F4 0C00A70A */ jal get_clamped_angle_diff -/* A60AC8 802400F8 46000386 */ mov.s $f14, $f0 -/* A60ACC 802400FC 46000005 */ abs.s $f0, $f0 -/* A60AD0 80240100 3C018024 */ lui $at, %hi(D_802434A8_A63E78) -/* A60AD4 80240104 D42234A8 */ ldc1 $f2, %lo(D_802434A8_A63E78)($at) -/* A60AD8 80240108 46000021 */ cvt.d.s $f0, $f0 -/* A60ADC 8024010C 4620103C */ c.lt.d $f2, $f0 -/* A60AE0 80240110 00000000 */ nop -/* A60AE4 80240114 4501002E */ bc1t .L802401D0 -/* A60AE8 80240118 2402FFFF */ addiu $v0, $zero, -1 -/* A60AEC 8024011C 8E220000 */ lw $v0, ($s1) -/* A60AF0 80240120 C600003C */ lwc1 $f0, 0x3c($s0) -/* A60AF4 80240124 C442002C */ lwc1 $f2, 0x2c($v0) -/* A60AF8 80240128 860200A8 */ lh $v0, 0xa8($s0) -/* A60AFC 8024012C 46020001 */ sub.s $f0, $f0, $f2 -/* A60B00 80240130 44821000 */ mtc1 $v0, $f2 -/* A60B04 80240134 00000000 */ nop -/* A60B08 80240138 468010A1 */ cvt.d.w $f2, $f2 -/* A60B0C 8024013C 46221080 */ add.d $f2, $f2, $f2 -/* A60B10 80240140 46000005 */ abs.s $f0, $f0 -/* A60B14 80240144 46000021 */ cvt.d.s $f0, $f0 -/* A60B18 80240148 4620103E */ c.le.d $f2, $f0 -/* A60B1C 8024014C 00000000 */ nop -/* A60B20 80240150 4501001F */ bc1t .L802401D0 -/* A60B24 80240154 2402FFFF */ addiu $v0, $zero, -1 -/* A60B28 80240158 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A60B2C 8024015C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A60B30 80240160 24020009 */ addiu $v0, $zero, 9 -/* A60B34 80240164 10620019 */ beq $v1, $v0, .L802401CC -/* A60B38 80240168 24020007 */ addiu $v0, $zero, 7 -/* A60B3C 8024016C 14620005 */ bne $v1, $v0, .L80240184 -/* A60B40 80240170 2402FFFF */ addiu $v0, $zero, -1 -/* A60B44 80240174 08090074 */ j .L802401D0 -/* A60B48 80240178 00000000 */ nop -.L8024017C: -/* A60B4C 8024017C 08090074 */ j .L802401D0 -/* A60B50 80240180 0240102D */ daddu $v0, $s2, $zero -.L80240184: -/* A60B54 80240184 8E620078 */ lw $v0, 0x78($s3) -/* A60B58 80240188 18400010 */ blez $v0, .L802401CC -/* A60B5C 8024018C 0000882D */ daddu $s1, $zero, $zero -.L80240190: -/* A60B60 80240190 86620008 */ lh $v0, 8($s3) -/* A60B64 80240194 00511021 */ addu $v0, $v0, $s1 -/* A60B68 80240198 24520001 */ addiu $s2, $v0, 1 -/* A60B6C 8024019C 0C00FB3A */ jal get_enemy -/* A60B70 802401A0 0240202D */ daddu $a0, $s2, $zero -/* A60B74 802401A4 0240202D */ daddu $a0, $s2, $zero -/* A60B78 802401A8 0C00EABB */ jal get_npc_unsafe -/* A60B7C 802401AC 0040802D */ daddu $s0, $v0, $zero -/* A60B80 802401B0 8E02006C */ lw $v0, 0x6c($s0) -/* A60B84 802401B4 1040FFF1 */ beqz $v0, .L8024017C -/* A60B88 802401B8 26310001 */ addiu $s1, $s1, 1 -/* A60B8C 802401BC 8E620078 */ lw $v0, 0x78($s3) -/* A60B90 802401C0 0222102A */ slt $v0, $s1, $v0 -/* A60B94 802401C4 1440FFF2 */ bnez $v0, .L80240190 -/* A60B98 802401C8 00000000 */ nop -.L802401CC: -/* A60B9C 802401CC 2402FFFF */ addiu $v0, $zero, -1 -.L802401D0: -/* A60BA0 802401D0 8FBF0020 */ lw $ra, 0x20($sp) -/* A60BA4 802401D4 8FB3001C */ lw $s3, 0x1c($sp) -/* A60BA8 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* A60BAC 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* A60BB0 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* A60BB4 802401E4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A60BB8 802401E8 03E00008 */ jr $ra -/* A60BBC 802401EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s deleted file mode 100644 index 4ec7a67233..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401F0_A60BC0 -/* A60BC0 802401F0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A60BC4 802401F4 AFB20038 */ sw $s2, 0x38($sp) -/* A60BC8 802401F8 0080902D */ daddu $s2, $a0, $zero -/* A60BCC 802401FC AFB00030 */ sw $s0, 0x30($sp) -/* A60BD0 80240200 AFBF003C */ sw $ra, 0x3c($sp) -/* A60BD4 80240204 AFB10034 */ sw $s1, 0x34($sp) -/* A60BD8 80240208 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A60BDC 8024020C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A60BE0 80240210 8E510148 */ lw $s1, 0x148($s2) -/* A60BE4 80240214 4485A000 */ mtc1 $a1, $f20 -/* A60BE8 80240218 86240008 */ lh $a0, 8($s1) -/* A60BEC 8024021C 4486B000 */ mtc1 $a2, $f22 -/* A60BF0 80240220 0C00EABB */ jal get_npc_unsafe -/* A60BF4 80240224 00E0802D */ daddu $s0, $a3, $zero -/* A60BF8 80240228 0200202D */ daddu $a0, $s0, $zero -/* A60BFC 8024022C 0220282D */ daddu $a1, $s1, $zero -/* A60C00 80240230 24030001 */ addiu $v1, $zero, 1 -/* A60C04 80240234 4406A000 */ mfc1 $a2, $f20 -/* A60C08 80240238 4407B000 */ mfc1 $a3, $f22 -/* A60C0C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* A60C10 80240240 0C01242D */ jal func_800490B4 -/* A60C14 80240244 AFA30010 */ sw $v1, 0x10($sp) -/* A60C18 80240248 1440001D */ bnez $v0, .L802402C0 -/* A60C1C 8024024C 24040002 */ addiu $a0, $zero, 2 -/* A60C20 80240250 0200282D */ daddu $a1, $s0, $zero -/* A60C24 80240254 0000302D */ daddu $a2, $zero, $zero -/* A60C28 80240258 860300A8 */ lh $v1, 0xa8($s0) -/* A60C2C 8024025C 3C013F80 */ lui $at, 0x3f80 -/* A60C30 80240260 44810000 */ mtc1 $at, $f0 -/* A60C34 80240264 3C014000 */ lui $at, 0x4000 -/* A60C38 80240268 44811000 */ mtc1 $at, $f2 -/* A60C3C 8024026C 3C01C1A0 */ lui $at, 0xc1a0 -/* A60C40 80240270 44812000 */ mtc1 $at, $f4 -/* A60C44 80240274 2402000F */ addiu $v0, $zero, 0xf -/* A60C48 80240278 AFA2001C */ sw $v0, 0x1c($sp) -/* A60C4C 8024027C 44833000 */ mtc1 $v1, $f6 -/* A60C50 80240280 00000000 */ nop -/* A60C54 80240284 468031A0 */ cvt.s.w $f6, $f6 -/* A60C58 80240288 44073000 */ mfc1 $a3, $f6 -/* A60C5C 8024028C 27A20028 */ addiu $v0, $sp, 0x28 -/* A60C60 80240290 AFA20020 */ sw $v0, 0x20($sp) -/* A60C64 80240294 E7A00010 */ swc1 $f0, 0x10($sp) -/* A60C68 80240298 E7A20014 */ swc1 $f2, 0x14($sp) -/* A60C6C 8024029C 0C01BFA4 */ jal fx_emote -/* A60C70 802402A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A60C74 802402A4 8E2200CC */ lw $v0, 0xcc($s1) -/* A60C78 802402A8 8C430000 */ lw $v1, ($v0) -/* A60C7C 802402AC 24020014 */ addiu $v0, $zero, 0x14 -/* A60C80 802402B0 A602008E */ sh $v0, 0x8e($s0) -/* A60C84 802402B4 24020021 */ addiu $v0, $zero, 0x21 -/* A60C88 802402B8 080900C4 */ j .L80240310 -/* A60C8C 802402BC AE030028 */ sw $v1, 0x28($s0) -.L802402C0: -/* A60C90 802402C0 0C090000 */ jal func_80240000_A609D0 -/* A60C94 802402C4 0240202D */ daddu $a0, $s2, $zero -/* A60C98 802402C8 0040202D */ daddu $a0, $v0, $zero -/* A60C9C 802402CC 2402FFFF */ addiu $v0, $zero, -1 -/* A60CA0 802402D0 10820010 */ beq $a0, $v0, .L80240314 -/* A60CA4 802402D4 00000000 */ nop -/* A60CA8 802402D8 0C00FB3A */ jal get_enemy -/* A60CAC 802402DC 00000000 */ nop -/* A60CB0 802402E0 8C42006C */ lw $v0, 0x6c($v0) -/* A60CB4 802402E4 1440000B */ bnez $v0, .L80240314 -/* A60CB8 802402E8 00000000 */ nop -/* A60CBC 802402EC 8602008C */ lh $v0, 0x8c($s0) -/* A60CC0 802402F0 14400008 */ bnez $v0, .L80240314 -/* A60CC4 802402F4 00000000 */ nop -/* A60CC8 802402F8 8E2200CC */ lw $v0, 0xcc($s1) -/* A60CCC 802402FC 8C420020 */ lw $v0, 0x20($v0) -/* A60CD0 80240300 AE020028 */ sw $v0, 0x28($s0) -/* A60CD4 80240304 96220072 */ lhu $v0, 0x72($s1) -/* A60CD8 80240308 A602008E */ sh $v0, 0x8e($s0) -/* A60CDC 8024030C 2402001E */ addiu $v0, $zero, 0x1e -.L80240310: -/* A60CE0 80240310 AE420070 */ sw $v0, 0x70($s2) -.L80240314: -/* A60CE4 80240314 8FBF003C */ lw $ra, 0x3c($sp) -/* A60CE8 80240318 8FB20038 */ lw $s2, 0x38($sp) -/* A60CEC 8024031C 8FB10034 */ lw $s1, 0x34($sp) -/* A60CF0 80240320 8FB00030 */ lw $s0, 0x30($sp) -/* A60CF4 80240324 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A60CF8 80240328 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A60CFC 8024032C 03E00008 */ jr $ra -/* A60D00 80240330 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s deleted file mode 100644 index 1b41a4fe68..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240334_A60D04 -/* A60D04 80240334 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A60D08 80240338 AFB20038 */ sw $s2, 0x38($sp) -/* A60D0C 8024033C 0080902D */ daddu $s2, $a0, $zero -/* A60D10 80240340 AFBF003C */ sw $ra, 0x3c($sp) -/* A60D14 80240344 AFB10034 */ sw $s1, 0x34($sp) -/* A60D18 80240348 AFB00030 */ sw $s0, 0x30($sp) -/* A60D1C 8024034C 8E510148 */ lw $s1, 0x148($s2) -/* A60D20 80240350 0C00EABB */ jal get_npc_unsafe -/* A60D24 80240354 86240008 */ lh $a0, 8($s1) -/* A60D28 80240358 0040802D */ daddu $s0, $v0, $zero -/* A60D2C 8024035C 9602008E */ lhu $v0, 0x8e($s0) -/* A60D30 80240360 2442FFFF */ addiu $v0, $v0, -1 -/* A60D34 80240364 A602008E */ sh $v0, 0x8e($s0) -/* A60D38 80240368 00021400 */ sll $v0, $v0, 0x10 -/* A60D3C 8024036C 1C40002B */ bgtz $v0, .L8024041C -/* A60D40 80240370 00000000 */ nop -/* A60D44 80240374 0C090000 */ jal func_80240000_A609D0 -/* A60D48 80240378 0240202D */ daddu $a0, $s2, $zero -/* A60D4C 8024037C 0040202D */ daddu $a0, $v0, $zero -/* A60D50 80240380 0481001A */ bgez $a0, .L802403EC -/* A60D54 80240384 2402000F */ addiu $v0, $zero, 0xf -/* A60D58 80240388 24040002 */ addiu $a0, $zero, 2 -/* A60D5C 8024038C 860300A8 */ lh $v1, 0xa8($s0) -/* A60D60 80240390 AFA2001C */ sw $v0, 0x1c($sp) -/* A60D64 80240394 27A20028 */ addiu $v0, $sp, 0x28 -/* A60D68 80240398 0200282D */ daddu $a1, $s0, $zero -/* A60D6C 8024039C 3C013F80 */ lui $at, 0x3f80 -/* A60D70 802403A0 44810000 */ mtc1 $at, $f0 -/* A60D74 802403A4 3C014000 */ lui $at, 0x4000 -/* A60D78 802403A8 44811000 */ mtc1 $at, $f2 -/* A60D7C 802403AC 3C01C1A0 */ lui $at, 0xc1a0 -/* A60D80 802403B0 44812000 */ mtc1 $at, $f4 -/* A60D84 802403B4 44833000 */ mtc1 $v1, $f6 -/* A60D88 802403B8 00000000 */ nop -/* A60D8C 802403BC 468031A0 */ cvt.s.w $f6, $f6 -/* A60D90 802403C0 44073000 */ mfc1 $a3, $f6 -/* A60D94 802403C4 0000302D */ daddu $a2, $zero, $zero -/* A60D98 802403C8 AFA20020 */ sw $v0, 0x20($sp) -/* A60D9C 802403CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A60DA0 802403D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A60DA4 802403D4 0C01BFA4 */ jal fx_emote -/* A60DA8 802403D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A60DAC 802403DC 8E2200CC */ lw $v0, 0xcc($s1) -/* A60DB0 802403E0 8C420000 */ lw $v0, ($v0) -/* A60DB4 802403E4 08090103 */ j .L8024040C -/* A60DB8 802403E8 AE020028 */ sw $v0, 0x28($s0) -.L802403EC: -/* A60DBC 802403EC 8E2200CC */ lw $v0, 0xcc($s1) -/* A60DC0 802403F0 8C420024 */ lw $v0, 0x24($v0) -/* A60DC4 802403F4 0C00FB3A */ jal get_enemy -/* A60DC8 802403F8 AE020028 */ sw $v0, 0x28($s0) -/* A60DCC 802403FC 86240008 */ lh $a0, 8($s1) -/* A60DD0 80240400 24030001 */ addiu $v1, $zero, 1 -/* A60DD4 80240404 AC43006C */ sw $v1, 0x6c($v0) -/* A60DD8 80240408 AC44007C */ sw $a0, 0x7c($v0) -.L8024040C: -/* A60DDC 8024040C 96220076 */ lhu $v0, 0x76($s1) -/* A60DE0 80240410 A602008E */ sh $v0, 0x8e($s0) -/* A60DE4 80240414 24020021 */ addiu $v0, $zero, 0x21 -/* A60DE8 80240418 AE420070 */ sw $v0, 0x70($s2) -.L8024041C: -/* A60DEC 8024041C 8FBF003C */ lw $ra, 0x3c($sp) -/* A60DF0 80240420 8FB20038 */ lw $s2, 0x38($sp) -/* A60DF4 80240424 8FB10034 */ lw $s1, 0x34($sp) -/* A60DF8 80240428 8FB00030 */ lw $s0, 0x30($sp) -/* A60DFC 8024042C 03E00008 */ jr $ra -/* A60E00 80240430 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s deleted file mode 100644 index e044c4bf8b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802434C8_A63E98 -.word .L80241084_A61A54, .L80241094_A61A64, .L802410AC_A61A7C, .L802410BC_A61A8C, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802410D4_A61AA4, .L802410E4_A61AB4, .L802410FC_A61ACC, .L80241174_A61B44, .L8024118C_A61B5C, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411A4_A61B74, .L802411B4_A61B84, .L802411C4_A61B94, .L802411D4_A61BA4, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411EC_A61BBC, .L802411E4_A61BB4 - -.section .text - -glabel func_80240EF4_A618C4 -/* A618C4 80240EF4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A618C8 80240EF8 AFB3003C */ sw $s3, 0x3c($sp) -/* A618CC 80240EFC 0080982D */ daddu $s3, $a0, $zero -/* A618D0 80240F00 AFBF0048 */ sw $ra, 0x48($sp) -/* A618D4 80240F04 AFB50044 */ sw $s5, 0x44($sp) -/* A618D8 80240F08 AFB40040 */ sw $s4, 0x40($sp) -/* A618DC 80240F0C AFB20038 */ sw $s2, 0x38($sp) -/* A618E0 80240F10 AFB10034 */ sw $s1, 0x34($sp) -/* A618E4 80240F14 AFB00030 */ sw $s0, 0x30($sp) -/* A618E8 80240F18 8E720148 */ lw $s2, 0x148($s3) -/* A618EC 80240F1C 86440008 */ lh $a0, 8($s2) -/* A618F0 80240F20 8E70000C */ lw $s0, 0xc($s3) -/* A618F4 80240F24 0C00EABB */ jal get_npc_unsafe -/* A618F8 80240F28 00A0882D */ daddu $s1, $a1, $zero -/* A618FC 80240F2C 0260202D */ daddu $a0, $s3, $zero -/* A61900 80240F30 8E050000 */ lw $a1, ($s0) -/* A61904 80240F34 0C0B1EAF */ jal evt_get_variable -/* A61908 80240F38 0040A02D */ daddu $s4, $v0, $zero -/* A6190C 80240F3C AFA00010 */ sw $zero, 0x10($sp) -/* A61910 80240F40 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61914 80240F44 8C630030 */ lw $v1, 0x30($v1) -/* A61918 80240F48 AFA30014 */ sw $v1, 0x14($sp) -/* A6191C 80240F4C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61920 80240F50 8C63001C */ lw $v1, 0x1c($v1) -/* A61924 80240F54 AFA30018 */ sw $v1, 0x18($sp) -/* A61928 80240F58 8E4300D0 */ lw $v1, 0xd0($s2) -/* A6192C 80240F5C 8C630024 */ lw $v1, 0x24($v1) -/* A61930 80240F60 AFA3001C */ sw $v1, 0x1c($sp) -/* A61934 80240F64 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61938 80240F68 8C630028 */ lw $v1, 0x28($v1) -/* A6193C 80240F6C 27B50010 */ addiu $s5, $sp, 0x10 -/* A61940 80240F70 AFA30020 */ sw $v1, 0x20($sp) -/* A61944 80240F74 8E4300D0 */ lw $v1, 0xd0($s2) -/* A61948 80240F78 3C014220 */ lui $at, 0x4220 -/* A6194C 80240F7C 44810000 */ mtc1 $at, $f0 -/* A61950 80240F80 8C63002C */ lw $v1, 0x2c($v1) -/* A61954 80240F84 0040802D */ daddu $s0, $v0, $zero -/* A61958 80240F88 E7A00028 */ swc1 $f0, 0x28($sp) -/* A6195C 80240F8C A7A0002C */ sh $zero, 0x2c($sp) -/* A61960 80240F90 16200005 */ bnez $s1, .L80240FA8 -/* A61964 80240F94 AFA30024 */ sw $v1, 0x24($sp) -/* A61968 80240F98 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6196C 80240F9C 30420004 */ andi $v0, $v0, 4 -/* A61970 80240FA0 1040002F */ beqz $v0, .L80241060 -/* A61974 80240FA4 00000000 */ nop -.L80240FA8: -/* A61978 80240FA8 2404F7FF */ addiu $a0, $zero, -0x801 -/* A6197C 80240FAC AE600070 */ sw $zero, 0x70($s3) -/* A61980 80240FB0 A680008E */ sh $zero, 0x8e($s4) -/* A61984 80240FB4 8E4200CC */ lw $v0, 0xcc($s2) -/* A61988 80240FB8 8E830000 */ lw $v1, ($s4) -/* A6198C 80240FBC 8C420000 */ lw $v0, ($v0) -/* A61990 80240FC0 00641824 */ and $v1, $v1, $a0 -/* A61994 80240FC4 AE830000 */ sw $v1, ($s4) -/* A61998 80240FC8 AE820028 */ sw $v0, 0x28($s4) -/* A6199C 80240FCC 8E4200D0 */ lw $v0, 0xd0($s2) -/* A619A0 80240FD0 8C420034 */ lw $v0, 0x34($v0) -/* A619A4 80240FD4 54400005 */ bnel $v0, $zero, .L80240FEC -/* A619A8 80240FD8 2402FDFF */ addiu $v0, $zero, -0x201 -/* A619AC 80240FDC 34620200 */ ori $v0, $v1, 0x200 -/* A619B0 80240FE0 2403FFF7 */ addiu $v1, $zero, -9 -/* A619B4 80240FE4 080903FD */ j .L80240FF4 -/* A619B8 80240FE8 00431024 */ and $v0, $v0, $v1 -.L80240FEC: -/* A619BC 80240FEC 00621024 */ and $v0, $v1, $v0 -/* A619C0 80240FF0 34420008 */ ori $v0, $v0, 8 -.L80240FF4: -/* A619C4 80240FF4 AE820000 */ sw $v0, ($s4) -/* A619C8 80240FF8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A619CC 80240FFC 30420004 */ andi $v0, $v0, 4 -/* A619D0 80241000 10400008 */ beqz $v0, .L80241024 -/* A619D4 80241004 24020063 */ addiu $v0, $zero, 0x63 -/* A619D8 80241008 AE620070 */ sw $v0, 0x70($s3) -/* A619DC 8024100C AE600074 */ sw $zero, 0x74($s3) -/* A619E0 80241010 8E4200B0 */ lw $v0, 0xb0($s2) -/* A619E4 80241014 2403FFFB */ addiu $v1, $zero, -5 -/* A619E8 80241018 00431024 */ and $v0, $v0, $v1 -/* A619EC 8024101C 0809040F */ j .L8024103C -/* A619F0 80241020 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241024: -/* A619F4 80241024 8E420000 */ lw $v0, ($s2) -/* A619F8 80241028 3C034000 */ lui $v1, 0x4000 -/* A619FC 8024102C 00431024 */ and $v0, $v0, $v1 -/* A61A00 80241030 10400002 */ beqz $v0, .L8024103C -/* A61A04 80241034 2402000C */ addiu $v0, $zero, 0xc -/* A61A08 80241038 AE620070 */ sw $v0, 0x70($s3) -.L8024103C: -/* A61A0C 8024103C 3C05BFFF */ lui $a1, 0xbfff -/* A61A10 80241040 34A5FFFF */ ori $a1, $a1, 0xffff -/* A61A14 80241044 2404FFFB */ addiu $a0, $zero, -5 -/* A61A18 80241048 8E4200B0 */ lw $v0, 0xb0($s2) -/* A61A1C 8024104C 8E430000 */ lw $v1, ($s2) -/* A61A20 80241050 00441024 */ and $v0, $v0, $a0 -/* A61A24 80241054 00651824 */ and $v1, $v1, $a1 -/* A61A28 80241058 AE4200B0 */ sw $v0, 0xb0($s2) -/* A61A2C 8024105C AE430000 */ sw $v1, ($s2) -.L80241060: -/* A61A30 80241060 8E630070 */ lw $v1, 0x70($s3) -/* A61A34 80241064 2C620064 */ sltiu $v0, $v1, 0x64 -/* A61A38 80241068 10400060 */ beqz $v0, .L802411EC_A61BBC -/* A61A3C 8024106C 00031080 */ sll $v0, $v1, 2 -/* A61A40 80241070 3C018024 */ lui $at, %hi(jtbl_802434C8_A63E98) -/* A61A44 80241074 00220821 */ addu $at, $at, $v0 -/* A61A48 80241078 8C2234C8 */ lw $v0, %lo(jtbl_802434C8_A63E98)($at) -/* A61A4C 8024107C 00400008 */ jr $v0 -/* A61A50 80241080 00000000 */ nop -.L80241084_A61A54: -/* A61A54 80241084 0260202D */ daddu $a0, $s3, $zero -/* A61A58 80241088 0200282D */ daddu $a1, $s0, $zero -/* A61A5C 8024108C 0C012568 */ jal func_800495A0 -/* A61A60 80241090 02A0302D */ daddu $a2, $s5, $zero -.L80241094_A61A64: -/* A61A64 80241094 0260202D */ daddu $a0, $s3, $zero -/* A61A68 80241098 0200282D */ daddu $a1, $s0, $zero -/* A61A6C 8024109C 0C0125AE */ jal func_800496B8 -/* A61A70 802410A0 02A0302D */ daddu $a2, $s5, $zero -/* A61A74 802410A4 0809047B */ j .L802411EC_A61BBC -/* A61A78 802410A8 00000000 */ nop -.L802410AC_A61A7C: -/* A61A7C 802410AC 0260202D */ daddu $a0, $s3, $zero -/* A61A80 802410B0 0200282D */ daddu $a1, $s0, $zero -/* A61A84 802410B4 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A61A88 802410B8 02A0302D */ daddu $a2, $s5, $zero -.L802410BC_A61A8C: -/* A61A8C 802410BC 0260202D */ daddu $a0, $s3, $zero -/* A61A90 802410C0 0200282D */ daddu $a1, $s0, $zero -/* A61A94 802410C4 0C012701 */ jal func_80049C04 -/* A61A98 802410C8 02A0302D */ daddu $a2, $s5, $zero -/* A61A9C 802410CC 0809047B */ j .L802411EC_A61BBC -/* A61AA0 802410D0 00000000 */ nop -.L802410D4_A61AA4: -/* A61AA4 802410D4 0260202D */ daddu $a0, $s3, $zero -/* A61AA8 802410D8 0200282D */ daddu $a1, $s0, $zero -/* A61AAC 802410DC 0C01278F */ jal func_80049E3C -/* A61AB0 802410E0 02A0302D */ daddu $a2, $s5, $zero -.L802410E4_A61AB4: -/* A61AB4 802410E4 0260202D */ daddu $a0, $s3, $zero -/* A61AB8 802410E8 0200282D */ daddu $a1, $s0, $zero -/* A61ABC 802410EC 0C0127B3 */ jal func_80049ECC -/* A61AC0 802410F0 02A0302D */ daddu $a2, $s5, $zero -/* A61AC4 802410F4 0809047B */ j .L802411EC_A61BBC -/* A61AC8 802410F8 00000000 */ nop -.L802410FC_A61ACC: -/* A61ACC 802410FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A61AD0 80241100 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A61AD4 80241104 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A61AD8 80241108 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A61ADC 8024110C 8C460028 */ lw $a2, 0x28($v0) -/* A61AE0 80241110 0C00A7B5 */ jal dist2D -/* A61AE4 80241114 8C470030 */ lw $a3, 0x30($v0) -/* A61AE8 80241118 8E42006C */ lw $v0, 0x6c($s2) -/* A61AEC 8024111C 10400008 */ beqz $v0, .L80241140 -/* A61AF0 80241120 46000086 */ mov.s $f2, $f0 -/* A61AF4 80241124 44820000 */ mtc1 $v0, $f0 -/* A61AF8 80241128 00000000 */ nop -/* A61AFC 8024112C 46800020 */ cvt.s.w $f0, $f0 -/* A61B00 80241130 4602003C */ c.lt.s $f0, $f2 -/* A61B04 80241134 00000000 */ nop -/* A61B08 80241138 4500000B */ bc1f .L80241168 -/* A61B0C 8024113C 0260202D */ daddu $a0, $s3, $zero -.L80241140: -/* A61B10 80241140 0260202D */ daddu $a0, $s3, $zero -/* A61B14 80241144 8E050024 */ lw $a1, 0x24($s0) -/* A61B18 80241148 8E060028 */ lw $a2, 0x28($s0) -/* A61B1C 8024114C 0C09007C */ jal func_802401F0_A60BC0 -/* A61B20 80241150 02A0382D */ daddu $a3, $s5, $zero -/* A61B24 80241154 8E630070 */ lw $v1, 0x70($s3) -/* A61B28 80241158 2402000C */ addiu $v0, $zero, 0xc -/* A61B2C 8024115C 14620023 */ bne $v1, $v0, .L802411EC_A61BBC -/* A61B30 80241160 00000000 */ nop -/* A61B34 80241164 0260202D */ daddu $a0, $s3, $zero -.L80241168: -/* A61B38 80241168 0200282D */ daddu $a1, $s0, $zero -/* A61B3C 8024116C 0C0127DF */ jal func_80049F7C -/* A61B40 80241170 02A0302D */ daddu $a2, $s5, $zero -.L80241174_A61B44: -/* A61B44 80241174 0260202D */ daddu $a0, $s3, $zero -/* A61B48 80241178 0200282D */ daddu $a1, $s0, $zero -/* A61B4C 8024117C 0C012849 */ jal func_8004A124 -/* A61B50 80241180 02A0302D */ daddu $a2, $s5, $zero -/* A61B54 80241184 0809047B */ j .L802411EC_A61BBC -/* A61B58 80241188 00000000 */ nop -.L8024118C_A61B5C: -/* A61B5C 8024118C 0260202D */ daddu $a0, $s3, $zero -/* A61B60 80241190 0200282D */ daddu $a1, $s0, $zero -/* A61B64 80241194 0C0128FA */ jal func_8004A3E8 -/* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero -/* A61B6C 8024119C 0809047B */ j .L802411EC_A61BBC -/* A61B70 802411A0 00000000 */ nop -.L802411A4_A61B74: -/* A61B74 802411A4 0C0900CD */ jal func_80240334_A60D04 -/* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero -/* A61B7C 802411AC 0809047B */ j .L802411EC_A61BBC -/* A61B80 802411B0 00000000 */ nop -.L802411B4_A61B84: -/* A61B84 802411B4 0C09010D */ jal kpa_50_UnkSetDurationFunc -/* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero -/* A61B8C 802411BC 0809047B */ j .L802411EC_A61BBC -/* A61B90 802411C0 00000000 */ nop -.L802411C4_A61B94: -/* A61B94 802411C4 0C09011E */ jal kpa_50_UnkNpcAIFunc9 -/* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero -/* A61B9C 802411CC 0809047B */ j .L802411EC_A61BBC -/* A61BA0 802411D0 00000000 */ nop -.L802411D4_A61BA4: -/* A61BA4 802411D4 0C090146 */ jal kpa_50_UnkDurationCheck -/* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero -/* A61BAC 802411DC 0809047B */ j .L802411EC_A61BBC -/* A61BB0 802411E0 00000000 */ nop -.L802411E4_A61BB4: -/* A61BB4 802411E4 0C0129CF */ jal func_8004A73C -/* A61BB8 802411E8 0260202D */ daddu $a0, $s3, $zero -.L802411EC_A61BBC: -/* A61BBC 802411EC 8FBF0048 */ lw $ra, 0x48($sp) -/* A61BC0 802411F0 8FB50044 */ lw $s5, 0x44($sp) -/* A61BC4 802411F4 8FB40040 */ lw $s4, 0x40($sp) -/* A61BC8 802411F8 8FB3003C */ lw $s3, 0x3c($sp) -/* A61BCC 802411FC 8FB20038 */ lw $s2, 0x38($sp) -/* A61BD0 80241200 8FB10034 */ lw $s1, 0x34($sp) -/* A61BD4 80241204 8FB00030 */ lw $s0, 0x30($sp) -/* A61BD8 80241208 0000102D */ daddu $v0, $zero, $zero -/* A61BDC 8024120C 03E00008 */ jr $ra -/* A61BE0 80241210 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s deleted file mode 100644 index 727f905ca1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s +++ /dev/null @@ -1,139 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80242F50_A66FE0 -.double 180.0 - -dlabel D_80242F58_A66FE8 -.double 75.0 - -dlabel D_80242F60_A66FF0 -.double 90.0 - -dlabel D_80242F68_A66FF8 -.double 70.0 - -.section .text - -glabel func_80240050_A640E0 -/* A640E0 80240050 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A640E4 80240054 AFB00018 */ sw $s0, 0x18($sp) -/* A640E8 80240058 AFBF0024 */ sw $ra, 0x24($sp) -/* A640EC 8024005C AFB20020 */ sw $s2, 0x20($sp) -/* A640F0 80240060 AFB1001C */ sw $s1, 0x1c($sp) -/* A640F4 80240064 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A640F8 80240068 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A640FC 8024006C 8C920148 */ lw $s2, 0x148($a0) -/* A64100 80240070 4485A000 */ mtc1 $a1, $f20 -/* A64104 80240074 86440008 */ lh $a0, 8($s2) -/* A64108 80240078 4486B000 */ mtc1 $a2, $f22 -/* A6410C 8024007C 0C00EABB */ jal get_npc_unsafe -/* A64110 80240080 00E0802D */ daddu $s0, $a3, $zero -/* A64114 80240084 0200202D */ daddu $a0, $s0, $zero -/* A64118 80240088 0040882D */ daddu $s1, $v0, $zero -/* A6411C 8024008C 4406A000 */ mfc1 $a2, $f20 -/* A64120 80240090 4407B000 */ mfc1 $a3, $f22 -/* A64124 80240094 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A64128 80240098 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A6412C 8024009C 3C05800B */ lui $a1, %hi(gCameras) -/* A64130 802400A0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A64134 802400A4 AFA00010 */ sw $zero, 0x10($sp) -/* A64138 802400A8 00031080 */ sll $v0, $v1, 2 -/* A6413C 802400AC 00431021 */ addu $v0, $v0, $v1 -/* A64140 802400B0 00021080 */ sll $v0, $v0, 2 -/* A64144 802400B4 00431023 */ subu $v0, $v0, $v1 -/* A64148 802400B8 000218C0 */ sll $v1, $v0, 3 -/* A6414C 802400BC 00431021 */ addu $v0, $v0, $v1 -/* A64150 802400C0 000210C0 */ sll $v0, $v0, 3 -/* A64154 802400C4 00458021 */ addu $s0, $v0, $a1 -/* A64158 802400C8 0C01242D */ jal func_800490B4 -/* A6415C 802400CC 0240282D */ daddu $a1, $s2, $zero -/* A64160 802400D0 1040004B */ beqz $v0, .L80240200 -/* A64164 802400D4 2402FFFF */ addiu $v0, $zero, -1 -/* A64168 802400D8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A6416C 802400DC C62E000C */ lwc1 $f14, 0xc($s1) -/* A64170 802400E0 3C014387 */ lui $at, 0x4387 -/* A64174 802400E4 4481A000 */ mtc1 $at, $f20 -/* A64178 802400E8 0C00A70A */ jal get_clamped_angle_diff -/* A6417C 802400EC 00000000 */ nop -/* A64180 802400F0 0C00A6C9 */ jal clamp_angle -/* A64184 802400F4 46000306 */ mov.s $f12, $f0 -/* A64188 802400F8 3C018024 */ lui $at, %hi(D_80242F50_A66FE0) -/* A6418C 802400FC D4222F50 */ ldc1 $f2, %lo(D_80242F50_A66FE0)($at) -/* A64190 80240100 46000021 */ cvt.d.s $f0, $f0 -/* A64194 80240104 4622003C */ c.lt.d $f0, $f2 -/* A64198 80240108 00000000 */ nop -/* A6419C 8024010C 45000003 */ bc1f .L8024011C -/* A641A0 80240110 00000000 */ nop -/* A641A4 80240114 3C0142B4 */ lui $at, 0x42b4 -/* A641A8 80240118 4481A000 */ mtc1 $at, $f20 -.L8024011C: -/* A641AC 8024011C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A641B0 80240120 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A641B4 80240124 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A641B8 80240128 8E020000 */ lw $v0, ($s0) -/* A641BC 8024012C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A641C0 80240130 8C460028 */ lw $a2, 0x28($v0) -/* A641C4 80240134 0C00A720 */ jal atan2 -/* A641C8 80240138 8C470030 */ lw $a3, 0x30($v0) -/* A641CC 8024013C 4600A306 */ mov.s $f12, $f20 -/* A641D0 80240140 0C00A70A */ jal get_clamped_angle_diff -/* A641D4 80240144 46000386 */ mov.s $f14, $f0 -/* A641D8 80240148 46000005 */ abs.s $f0, $f0 -/* A641DC 8024014C 3C018024 */ lui $at, %hi(D_80242F58_A66FE8) -/* A641E0 80240150 D4222F58 */ ldc1 $f2, %lo(D_80242F58_A66FE8)($at) -/* A641E4 80240154 46000021 */ cvt.d.s $f0, $f0 -/* A641E8 80240158 4620103C */ c.lt.d $f2, $f0 -/* A641EC 8024015C 00000000 */ nop -/* A641F0 80240160 45010027 */ bc1t .L80240200 -/* A641F4 80240164 2402FFFF */ addiu $v0, $zero, -1 -/* A641F8 80240168 8E020000 */ lw $v0, ($s0) -/* A641FC 8024016C C6200038 */ lwc1 $f0, 0x38($s1) -/* A64200 80240170 C4420028 */ lwc1 $f2, 0x28($v0) -/* A64204 80240174 44806000 */ mtc1 $zero, $f12 -/* A64208 80240178 46020001 */ sub.s $f0, $f0, $f2 -/* A6420C 8024017C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A64210 80240180 8C47002C */ lw $a3, 0x2c($v0) -/* A64214 80240184 46000005 */ abs.s $f0, $f0 -/* A64218 80240188 44060000 */ mfc1 $a2, $f0 -/* A6421C 8024018C 0C00A720 */ jal atan2 -/* A64220 80240190 00000000 */ nop -/* A64224 80240194 3C018024 */ lui $at, %hi(D_80242F60_A66FF0) -/* A64228 80240198 D4222F60 */ ldc1 $f2, %lo(D_80242F60_A66FF0)($at) -/* A6422C 8024019C 46000021 */ cvt.d.s $f0, $f0 -/* A64230 802401A0 46220001 */ sub.d $f0, $f0, $f2 -/* A64234 802401A4 3C018024 */ lui $at, %hi(D_80242F68_A66FF8) -/* A64238 802401A8 D4222F68 */ ldc1 $f2, %lo(D_80242F68_A66FF8)($at) -/* A6423C 802401AC 46200020 */ cvt.s.d $f0, $f0 -/* A64240 802401B0 46000005 */ abs.s $f0, $f0 -/* A64244 802401B4 46000021 */ cvt.d.s $f0, $f0 -/* A64248 802401B8 4620103C */ c.lt.d $f2, $f0 -/* A6424C 802401BC 00000000 */ nop -/* A64250 802401C0 4501000F */ bc1t .L80240200 -/* A64254 802401C4 2402FFFF */ addiu $v0, $zero, -1 -/* A64258 802401C8 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A6425C 802401CC 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A64260 802401D0 24020009 */ addiu $v0, $zero, 9 -/* A64264 802401D4 10620009 */ beq $v1, $v0, .L802401FC -/* A64268 802401D8 24020007 */ addiu $v0, $zero, 7 -/* A6426C 802401DC 50620008 */ beql $v1, $v0, .L80240200 -/* A64270 802401E0 2402FFFF */ addiu $v0, $zero, -1 -/* A64274 802401E4 86440008 */ lh $a0, 8($s2) -/* A64278 802401E8 0C00FB3A */ jal get_enemy -/* A6427C 802401EC 24840001 */ addiu $a0, $a0, 1 -/* A64280 802401F0 8C43006C */ lw $v1, 0x6c($v0) -/* A64284 802401F4 10600002 */ beqz $v1, .L80240200 -/* A64288 802401F8 24020001 */ addiu $v0, $zero, 1 -.L802401FC: -/* A6428C 802401FC 2402FFFF */ addiu $v0, $zero, -1 -.L80240200: -/* A64290 80240200 8FBF0024 */ lw $ra, 0x24($sp) -/* A64294 80240204 8FB20020 */ lw $s2, 0x20($sp) -/* A64298 80240208 8FB1001C */ lw $s1, 0x1c($sp) -/* A6429C 8024020C 8FB00018 */ lw $s0, 0x18($sp) -/* A642A0 80240210 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A642A4 80240214 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A642A8 80240218 03E00008 */ jr $ra -/* A642AC 8024021C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s deleted file mode 100644 index fda784ae44..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s +++ /dev/null @@ -1,350 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80242F70_A67000 -.word .L80240314_A643A4, .L80240344_A643D4, .L80240570_A64600, .L802405B4_A64644, .L8024060C_A6469C, 0 - -dlabel D_80242F88_A67018 -.double 90.0 - -.section .text - -glabel func_80240220_A642B0 -/* A642B0 80240220 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A642B4 80240224 AFB60378 */ sw $s6, 0x378($sp) -/* A642B8 80240228 0080B02D */ daddu $s6, $a0, $zero -/* A642BC 8024022C AFBF037C */ sw $ra, 0x37c($sp) -/* A642C0 80240230 AFB50374 */ sw $s5, 0x374($sp) -/* A642C4 80240234 AFB40370 */ sw $s4, 0x370($sp) -/* A642C8 80240238 AFB3036C */ sw $s3, 0x36c($sp) -/* A642CC 8024023C AFB20368 */ sw $s2, 0x368($sp) -/* A642D0 80240240 AFB10364 */ sw $s1, 0x364($sp) -/* A642D4 80240244 AFB00360 */ sw $s0, 0x360($sp) -/* A642D8 80240248 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A642DC 8024024C 8ED20148 */ lw $s2, 0x148($s6) -/* A642E0 80240250 86440008 */ lh $a0, 8($s2) -/* A642E4 80240254 0C00EABB */ jal get_npc_unsafe -/* A642E8 80240258 00A0802D */ daddu $s0, $a1, $zero -/* A642EC 8024025C 86440008 */ lh $a0, 8($s2) -/* A642F0 80240260 0040882D */ daddu $s1, $v0, $zero -/* A642F4 80240264 0C00FB3A */ jal get_enemy -/* A642F8 80240268 2484FFFF */ addiu $a0, $a0, -1 -/* A642FC 8024026C 84440008 */ lh $a0, 8($v0) -/* A64300 80240270 0C00EABB */ jal get_npc_unsafe -/* A64304 80240274 0000A82D */ daddu $s5, $zero, $zero -/* A64308 80240278 27B30020 */ addiu $s3, $sp, 0x20 -/* A6430C 8024027C 16000005 */ bnez $s0, .L80240294 -/* A64310 80240280 0040A02D */ daddu $s4, $v0, $zero -/* A64314 80240284 8E4200B0 */ lw $v0, 0xb0($s2) -/* A64318 80240288 30420004 */ andi $v0, $v0, 4 -/* A6431C 8024028C 10400018 */ beqz $v0, .L802402F0 -/* A64320 80240290 00000000 */ nop -.L80240294: -/* A64324 80240294 3C030024 */ lui $v1, 0x24 -/* A64328 80240298 34630102 */ ori $v1, $v1, 0x102 -/* A6432C 8024029C 3C041620 */ lui $a0, 0x1620 -/* A64330 802402A0 AEC00070 */ sw $zero, 0x70($s6) -/* A64334 802402A4 8E220000 */ lw $v0, ($s1) -/* A64338 802402A8 34840040 */ ori $a0, $a0, 0x40 -/* A6433C 802402AC A620008E */ sh $zero, 0x8e($s1) -/* A64340 802402B0 00431025 */ or $v0, $v0, $v1 -/* A64344 802402B4 AE220000 */ sw $v0, ($s1) -/* A64348 802402B8 8E420000 */ lw $v0, ($s2) -/* A6434C 802402BC 3C013ECC */ lui $at, 0x3ecc -/* A64350 802402C0 3421CCCD */ ori $at, $at, 0xcccd -/* A64354 802402C4 44810000 */ mtc1 $at, $f0 -/* A64358 802402C8 00441025 */ or $v0, $v0, $a0 -/* A6435C 802402CC AE420000 */ sw $v0, ($s2) -/* A64360 802402D0 E6200054 */ swc1 $f0, 0x54($s1) -/* A64364 802402D4 E6200058 */ swc1 $f0, 0x58($s1) -/* A64368 802402D8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A6436C 802402DC 30620004 */ andi $v0, $v1, 4 -/* A64370 802402E0 10400003 */ beqz $v0, .L802402F0 -/* A64374 802402E4 2402FFFB */ addiu $v0, $zero, -5 -/* A64378 802402E8 00621024 */ and $v0, $v1, $v0 -/* A6437C 802402EC AE4200B0 */ sw $v0, 0xb0($s2) -.L802402F0: -/* A64380 802402F0 8EC30070 */ lw $v1, 0x70($s6) -/* A64384 802402F4 2C620005 */ sltiu $v0, $v1, 5 -/* A64388 802402F8 10400101 */ beqz $v0, .L80240700 -/* A6438C 802402FC 00031080 */ sll $v0, $v1, 2 -/* A64390 80240300 3C018024 */ lui $at, %hi(jtbl_80242F70_A67000) -/* A64394 80240304 00220821 */ addu $at, $at, $v0 -/* A64398 80240308 8C222F70 */ lw $v0, %lo(jtbl_80242F70_A67000)($at) -/* A6439C 8024030C 00400008 */ jr $v0 -/* A643A0 80240310 00000000 */ nop -.L80240314_A643A4: -/* A643A4 80240314 3C01C47A */ lui $at, 0xc47a -/* A643A8 80240318 44810000 */ mtc1 $at, $f0 -/* A643AC 8024031C 24020014 */ addiu $v0, $zero, 0x14 -/* A643B0 80240320 AE400078 */ sw $zero, 0x78($s2) -/* A643B4 80240324 A62200A6 */ sh $v0, 0xa6($s1) -/* A643B8 80240328 A62200A8 */ sh $v0, 0xa8($s1) -/* A643BC 8024032C 24020001 */ addiu $v0, $zero, 1 -/* A643C0 80240330 AE200038 */ sw $zero, 0x38($s1) -/* A643C4 80240334 AE200040 */ sw $zero, 0x40($s1) -/* A643C8 80240338 E620003C */ swc1 $f0, 0x3c($s1) -/* A643CC 8024033C AE40006C */ sw $zero, 0x6c($s2) -/* A643D0 80240340 AEC20070 */ sw $v0, 0x70($s6) -.L80240344_A643D4: -/* A643D4 80240344 8E50006C */ lw $s0, 0x6c($s2) -/* A643D8 80240348 24020001 */ addiu $v0, $zero, 1 -/* A643DC 8024034C 160200EC */ bne $s0, $v0, .L80240700 -/* A643E0 80240350 24150002 */ addiu $s5, $zero, 2 -/* A643E4 80240354 AE55006C */ sw $s5, 0x6c($s2) -/* A643E8 80240358 C6800038 */ lwc1 $f0, 0x38($s4) -/* A643EC 8024035C E6600038 */ swc1 $f0, 0x38($s3) -/* A643F0 80240360 C680003C */ lwc1 $f0, 0x3c($s4) -/* A643F4 80240364 E660003C */ swc1 $f0, 0x3c($s3) -/* A643F8 80240368 C6800040 */ lwc1 $f0, 0x40($s4) -/* A643FC 8024036C E6600040 */ swc1 $f0, 0x40($s3) -/* A64400 80240370 C6820034 */ lwc1 $f2, 0x34($s4) -/* A64404 80240374 3C014387 */ lui $at, 0x4387 -/* A64408 80240378 44810000 */ mtc1 $at, $f0 -/* A6440C 8024037C 00000000 */ nop -/* A64410 80240380 46020001 */ sub.s $f0, $f0, $f2 -/* A64414 80240384 C6480074 */ lwc1 $f8, 0x74($s2) -/* A64418 80240388 46804220 */ cvt.s.w $f8, $f8 -/* A6441C 8024038C 44054000 */ mfc1 $a1, $f8 -/* A64420 80240390 44060000 */ mfc1 $a2, $f0 -/* A64424 80240394 0C00EA95 */ jal npc_move_heading -/* A64428 80240398 0260202D */ daddu $a0, $s3, $zero -/* A6442C 8024039C C6600038 */ lwc1 $f0, 0x38($s3) -/* A64430 802403A0 E6200038 */ swc1 $f0, 0x38($s1) -/* A64434 802403A4 C680003C */ lwc1 $f0, 0x3c($s4) -/* A64438 802403A8 C6420070 */ lwc1 $f2, 0x70($s2) -/* A6443C 802403AC 468010A0 */ cvt.s.w $f2, $f2 -/* A64440 802403B0 46020000 */ add.s $f0, $f0, $f2 -/* A64444 802403B4 3C014024 */ lui $at, 0x4024 -/* A64448 802403B8 4481A800 */ mtc1 $at, $f21 -/* A6444C 802403BC 4480A000 */ mtc1 $zero, $f20 -/* A64450 802403C0 E620003C */ swc1 $f0, 0x3c($s1) -/* A64454 802403C4 C6600040 */ lwc1 $f0, 0x40($s3) -/* A64458 802403C8 E6200040 */ swc1 $f0, 0x40($s1) -/* A6445C 802403CC A2500007 */ sb $s0, 7($s2) -/* A64460 802403D0 C6200038 */ lwc1 $f0, 0x38($s1) -/* A64464 802403D4 3C014066 */ lui $at, 0x4066 -/* A64468 802403D8 34216666 */ ori $at, $at, 0x6666 -/* A6446C 802403DC 44811000 */ mtc1 $at, $f2 -/* A64470 802403E0 4600020D */ trunc.w.s $f8, $f0 -/* A64474 802403E4 44024000 */ mfc1 $v0, $f8 -/* A64478 802403E8 00000000 */ nop -/* A6447C 802403EC A6420010 */ sh $v0, 0x10($s2) -/* A64480 802403F0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A64484 802403F4 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A64488 802403F8 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A6448C 802403FC 4600020D */ trunc.w.s $f8, $f0 -/* A64490 80240400 44024000 */ mfc1 $v0, $f8 -/* A64494 80240404 00000000 */ nop -/* A64498 80240408 A6420012 */ sh $v0, 0x12($s2) -/* A6449C 8024040C C6200040 */ lwc1 $f0, 0x40($s1) -/* A644A0 80240410 8E630000 */ lw $v1, ($s3) -/* A644A4 80240414 4600020D */ trunc.w.s $f8, $f0 -/* A644A8 80240418 44024000 */ mfc1 $v0, $f8 -/* A644AC 8024041C 00000000 */ nop -/* A644B0 80240420 A6420014 */ sh $v0, 0x14($s2) -/* A644B4 80240424 E6220018 */ swc1 $f2, 0x18($s1) -/* A644B8 80240428 C460002C */ lwc1 $f0, 0x2c($v1) -/* A644BC 8024042C C6220038 */ lwc1 $f2, 0x38($s1) -/* A644C0 80240430 46000021 */ cvt.d.s $f0, $f0 -/* A644C4 80240434 46340000 */ add.d $f0, $f0, $f20 -/* A644C8 80240438 C4640028 */ lwc1 $f4, 0x28($v1) -/* A644CC 8024043C 44806000 */ mtc1 $zero, $f12 -/* A644D0 80240440 46041081 */ sub.s $f2, $f2, $f4 -/* A644D4 80240444 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A644D8 80240448 46200020 */ cvt.s.d $f0, $f0 -/* A644DC 8024044C 46001085 */ abs.s $f2, $f2 -/* A644E0 80240450 44070000 */ mfc1 $a3, $f0 -/* A644E4 80240454 44061000 */ mfc1 $a2, $f2 -/* A644E8 80240458 0C00A720 */ jal atan2 -/* A644EC 8024045C 00000000 */ nop -/* A644F0 80240460 3C018024 */ lui $at, %hi(D_80242F88_A67018) -/* A644F4 80240464 D4222F88 */ ldc1 $f2, %lo(D_80242F88_A67018)($at) -/* A644F8 80240468 46000021 */ cvt.d.s $f0, $f0 -/* A644FC 8024046C 46220001 */ sub.d $f0, $f0, $f2 -/* A64500 80240470 46200020 */ cvt.s.d $f0, $f0 -/* A64504 80240474 4600020D */ trunc.w.s $f8, $f0 -/* A64508 80240478 44044000 */ mfc1 $a0, $f8 -/* A6450C 8024047C 00000000 */ nop -/* A64510 80240480 00042400 */ sll $a0, $a0, 0x10 -/* A64514 80240484 0C00A4F5 */ jal cosine -/* A64518 80240488 00042403 */ sra $a0, $a0, 0x10 -/* A6451C 8024048C C6220018 */ lwc1 $f2, 0x18($s1) -/* A64520 80240490 46020002 */ mul.s $f0, $f0, $f2 -/* A64524 80240494 00000000 */ nop -/* A64528 80240498 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6452C 8024049C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A64530 802404A0 8E620000 */ lw $v0, ($s3) -/* A64534 802404A4 E620001C */ swc1 $f0, 0x1c($s1) -/* A64538 802404A8 8C460028 */ lw $a2, 0x28($v0) -/* A6453C 802404AC 0C00A720 */ jal atan2 -/* A64540 802404B0 8C470030 */ lw $a3, 0x30($v0) -/* A64544 802404B4 8E620000 */ lw $v0, ($s3) -/* A64548 802404B8 E620000C */ swc1 $f0, 0xc($s1) -/* A6454C 802404BC C440002C */ lwc1 $f0, 0x2c($v0) -/* A64550 802404C0 46000021 */ cvt.d.s $f0, $f0 -/* A64554 802404C4 46340000 */ add.d $f0, $f0, $f20 -/* A64558 802404C8 46200020 */ cvt.s.d $f0, $f0 -/* A6455C 802404CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A64560 802404D0 C4400030 */ lwc1 $f0, 0x30($v0) -/* A64564 802404D4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A64568 802404D8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6456C 802404DC C62E003C */ lwc1 $f14, 0x3c($s1) -/* A64570 802404E0 8E260040 */ lw $a2, 0x40($s1) -/* A64574 802404E4 0C00A7CB */ jal dist3D -/* A64578 802404E8 8C470028 */ lw $a3, 0x28($v0) -/* A6457C 802404EC C6220018 */ lwc1 $f2, 0x18($s1) -/* A64580 802404F0 46020003 */ div.s $f0, $f0, $f2 -/* A64584 802404F4 4600020D */ trunc.w.s $f8, $f0 -/* A64588 802404F8 44104000 */ mfc1 $s0, $f8 -/* A6458C 802404FC 00000000 */ nop -/* A64590 80240500 5A000001 */ blezl $s0, .L80240508 -/* A64594 80240504 24100001 */ addiu $s0, $zero, 1 -.L80240508: -/* A64598 80240508 8E620000 */ lw $v0, ($s3) -/* A6459C 8024050C C624003C */ lwc1 $f4, 0x3c($s1) -/* A645A0 80240510 3C014120 */ lui $at, 0x4120 -/* A645A4 80240514 44811000 */ mtc1 $at, $f2 -/* A645A8 80240518 C4400028 */ lwc1 $f0, 0x28($v0) -/* A645AC 8024051C E7A00010 */ swc1 $f0, 0x10($sp) -/* A645B0 80240520 C440002C */ lwc1 $f0, 0x2c($v0) -/* A645B4 80240524 46020000 */ add.s $f0, $f0, $f2 -/* A645B8 80240528 3C014160 */ lui $at, 0x4160 -/* A645BC 8024052C 44811000 */ mtc1 $at, $f2 -/* A645C0 80240530 00000000 */ nop -/* A645C4 80240534 46022100 */ add.s $f4, $f4, $f2 -/* A645C8 80240538 46020000 */ add.s $f0, $f0, $f2 -/* A645CC 8024053C 44062000 */ mfc1 $a2, $f4 -/* A645D0 80240540 E7A00014 */ swc1 $f0, 0x14($sp) -/* A645D4 80240544 C4400030 */ lwc1 $f0, 0x30($v0) -/* A645D8 80240548 AFB0001C */ sw $s0, 0x1c($sp) -/* A645DC 8024054C E7A00018 */ swc1 $f0, 0x18($sp) -/* A645E0 80240550 8E250038 */ lw $a1, 0x38($s1) -/* A645E4 80240554 8E270040 */ lw $a3, 0x40($s1) -/* A645E8 80240558 0C01BFD4 */ jal fx_shape_spell -/* A645EC 8024055C 0000202D */ daddu $a0, $zero, $zero -/* A645F0 80240560 AE420078 */ sw $v0, 0x78($s2) -/* A645F4 80240564 A630008E */ sh $s0, 0x8e($s1) -/* A645F8 80240568 080901C0 */ j .L80240700 -/* A645FC 8024056C AED50070 */ sw $s5, 0x70($s6) -.L80240570_A64600: -/* A64600 80240570 9622008E */ lhu $v0, 0x8e($s1) -/* A64604 80240574 2442FFFF */ addiu $v0, $v0, -1 -/* A64608 80240578 A622008E */ sh $v0, 0x8e($s1) -/* A6460C 8024057C 00021400 */ sll $v0, $v0, 0x10 -/* A64610 80240580 58400001 */ blezl $v0, .L80240588 -/* A64614 80240584 24150014 */ addiu $s5, $zero, 0x14 -.L80240588: -/* A64618 80240588 16A0000A */ bnez $s5, .L802405B4_A64644 -/* A6461C 8024058C 00000000 */ nop -/* A64620 80240590 8E250018 */ lw $a1, 0x18($s1) -/* A64624 80240594 8E26000C */ lw $a2, 0xc($s1) -/* A64628 80240598 0C00EA95 */ jal npc_move_heading -/* A6462C 8024059C 0220202D */ daddu $a0, $s1, $zero -/* A64630 802405A0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A64634 802405A4 C622001C */ lwc1 $f2, 0x1c($s1) -/* A64638 802405A8 46020000 */ add.s $f0, $f0, $f2 -/* A6463C 802405AC 080901C0 */ j .L80240700 -/* A64640 802405B0 E620003C */ swc1 $f0, 0x3c($s1) -.L802405B4_A64644: -/* A64644 802405B4 862200A8 */ lh $v0, 0xa8($s1) -/* A64648 802405B8 3C013FE0 */ lui $at, 0x3fe0 -/* A6464C 802405BC 44810800 */ mtc1 $at, $f1 -/* A64650 802405C0 44800000 */ mtc1 $zero, $f0 -/* A64654 802405C4 44821000 */ mtc1 $v0, $f2 -/* A64658 802405C8 00000000 */ nop -/* A6465C 802405CC 468010A1 */ cvt.d.w $f2, $f2 -/* A64660 802405D0 46201082 */ mul.d $f2, $f2, $f0 -/* A64664 802405D4 00000000 */ nop -/* A64668 802405D8 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6466C 802405DC AE20001C */ sw $zero, 0x1c($s1) -/* A64670 802405E0 46000021 */ cvt.d.s $f0, $f0 -/* A64674 802405E4 46220001 */ sub.d $f0, $f0, $f2 -/* A64678 802405E8 AE200018 */ sw $zero, 0x18($s1) -/* A6467C 802405EC 24020003 */ addiu $v0, $zero, 3 -/* A64680 802405F0 46200020 */ cvt.s.d $f0, $f0 -/* A64684 802405F4 E620003C */ swc1 $f0, 0x3c($s1) -/* A64688 802405F8 AE42006C */ sw $v0, 0x6c($s2) -/* A6468C 802405FC 24020004 */ addiu $v0, $zero, 4 -/* A64690 80240600 A620008E */ sh $zero, 0x8e($s1) -/* A64694 80240604 080901C0 */ j .L80240700 -/* A64698 80240608 AEC20070 */ sw $v0, 0x70($s6) -.L8024060C_A6469C: -/* A6469C 8024060C 9622008E */ lhu $v0, 0x8e($s1) -/* A646A0 80240610 24420001 */ addiu $v0, $v0, 1 -/* A646A4 80240614 A622008E */ sh $v0, 0x8e($s1) -/* A646A8 80240618 00021400 */ sll $v0, $v0, 0x10 -/* A646AC 8024061C 00021C03 */ sra $v1, $v0, 0x10 -/* A646B0 80240620 28620007 */ slti $v0, $v1, 7 -/* A646B4 80240624 10400027 */ beqz $v0, .L802406C4 -/* A646B8 80240628 24020007 */ addiu $v0, $zero, 7 -/* A646BC 8024062C 8622008E */ lh $v0, 0x8e($s1) -/* A646C0 80240630 3C01401C */ lui $at, 0x401c -/* A646C4 80240634 44810800 */ mtc1 $at, $f1 -/* A646C8 80240638 44800000 */ mtc1 $zero, $f0 -/* A646CC 8024063C 44822000 */ mtc1 $v0, $f4 -/* A646D0 80240640 00000000 */ nop -/* A646D4 80240644 46802120 */ cvt.s.w $f4, $f4 -/* A646D8 80240648 46002121 */ cvt.d.s $f4, $f4 -/* A646DC 8024064C 46202102 */ mul.d $f4, $f4, $f0 -/* A646E0 80240650 00000000 */ nop -/* A646E4 80240654 44821000 */ mtc1 $v0, $f2 -/* A646E8 80240658 00000000 */ nop -/* A646EC 8024065C 468010A0 */ cvt.s.w $f2, $f2 -/* A646F0 80240660 460010A1 */ cvt.d.s $f2, $f2 -/* A646F4 80240664 46201082 */ mul.d $f2, $f2, $f0 -/* A646F8 80240668 00000000 */ nop -/* A646FC 8024066C C620003C */ lwc1 $f0, 0x3c($s1) -/* A64700 80240670 3C01400C */ lui $at, 0x400c -/* A64704 80240674 44813800 */ mtc1 $at, $f7 -/* A64708 80240678 44803000 */ mtc1 $zero, $f6 -/* A6470C 8024067C 46000021 */ cvt.d.s $f0, $f0 -/* A64710 80240680 46260001 */ sub.d $f0, $f0, $f6 -/* A64714 80240684 3C014034 */ lui $at, 0x4034 -/* A64718 80240688 44813800 */ mtc1 $at, $f7 -/* A6471C 8024068C 44803000 */ mtc1 $zero, $f6 -/* A64720 80240690 00000000 */ nop -/* A64724 80240694 46262100 */ add.d $f4, $f4, $f6 -/* A64728 80240698 46200020 */ cvt.s.d $f0, $f0 -/* A6472C 8024069C E620003C */ swc1 $f0, 0x3c($s1) -/* A64730 802406A0 46261080 */ add.d $f2, $f2, $f6 -/* A64734 802406A4 4620220D */ trunc.w.d $f8, $f4 -/* A64738 802406A8 44024000 */ mfc1 $v0, $f8 -/* A6473C 802406AC 00000000 */ nop -/* A64740 802406B0 A62200A6 */ sh $v0, 0xa6($s1) -/* A64744 802406B4 4620120D */ trunc.w.d $f8, $f2 -/* A64748 802406B8 44024000 */ mfc1 $v0, $f8 -/* A6474C 802406BC 080901C0 */ j .L80240700 -/* A64750 802406C0 A62200A8 */ sh $v0, 0xa8($s1) -.L802406C4: -/* A64754 802406C4 1462000A */ bne $v1, $v0, .L802406F0 -/* A64758 802406C8 28620010 */ slti $v0, $v1, 0x10 -/* A6475C 802406CC 3C01C47A */ lui $at, 0xc47a -/* A64760 802406D0 44810000 */ mtc1 $at, $f0 -/* A64764 802406D4 24020014 */ addiu $v0, $zero, 0x14 -/* A64768 802406D8 AE200038 */ sw $zero, 0x38($s1) -/* A6476C 802406DC AE200040 */ sw $zero, 0x40($s1) -/* A64770 802406E0 A62200A6 */ sh $v0, 0xa6($s1) -/* A64774 802406E4 A62200A8 */ sh $v0, 0xa8($s1) -/* A64778 802406E8 080901C0 */ j .L80240700 -/* A6477C 802406EC E620003C */ swc1 $f0, 0x3c($s1) -.L802406F0: -/* A64780 802406F0 14400003 */ bnez $v0, .L80240700 -/* A64784 802406F4 00000000 */ nop -/* A64788 802406F8 AE40006C */ sw $zero, 0x6c($s2) -/* A6478C 802406FC AEC00070 */ sw $zero, 0x70($s6) -.L80240700: -/* A64790 80240700 8FBF037C */ lw $ra, 0x37c($sp) -/* A64794 80240704 8FB60378 */ lw $s6, 0x378($sp) -/* A64798 80240708 8FB50374 */ lw $s5, 0x374($sp) -/* A6479C 8024070C 8FB40370 */ lw $s4, 0x370($sp) -/* A647A0 80240710 8FB3036C */ lw $s3, 0x36c($sp) -/* A647A4 80240714 8FB20368 */ lw $s2, 0x368($sp) -/* A647A8 80240718 8FB10364 */ lw $s1, 0x364($sp) -/* A647AC 8024071C 8FB00360 */ lw $s0, 0x360($sp) -/* A647B0 80240720 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A647B4 80240724 0000102D */ daddu $v0, $zero, $zero -/* A647B8 80240728 03E00008 */ jr $ra -/* A647BC 8024072C 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240730_A647C0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240730_A647C0.s deleted file mode 100644 index 4fdc08270f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240730_A647C0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730_A647C0 -/* A647C0 80240730 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A647C4 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* A647C8 80240738 0080882D */ daddu $s1, $a0, $zero -/* A647CC 8024073C AFBF0018 */ sw $ra, 0x18($sp) -/* A647D0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* A647D4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* A647D8 80240748 0C00EABB */ jal get_npc_unsafe -/* A647DC 8024074C 86040008 */ lh $a0, 8($s0) -/* A647E0 80240750 0040282D */ daddu $a1, $v0, $zero -/* A647E4 80240754 94A2008E */ lhu $v0, 0x8e($a1) -/* A647E8 80240758 2442FFFF */ addiu $v0, $v0, -1 -/* A647EC 8024075C A4A2008E */ sh $v0, 0x8e($a1) -/* A647F0 80240760 00021400 */ sll $v0, $v0, 0x10 -/* A647F4 80240764 1C40000A */ bgtz $v0, .L80240790 -/* A647F8 80240768 2404FFFD */ addiu $a0, $zero, -3 -/* A647FC 8024076C 8E0300CC */ lw $v1, 0xcc($s0) -/* A64800 80240770 8CA20000 */ lw $v0, ($a1) -/* A64804 80240774 8C630000 */ lw $v1, ($v1) -/* A64808 80240778 00441024 */ and $v0, $v0, $a0 -/* A6480C 8024077C ACA20000 */ sw $v0, ($a1) -/* A64810 80240780 24020001 */ addiu $v0, $zero, 1 -/* A64814 80240784 A4A0008E */ sh $zero, 0x8e($a1) -/* A64818 80240788 ACA30028 */ sw $v1, 0x28($a1) -/* A6481C 8024078C AE220070 */ sw $v0, 0x70($s1) -.L80240790: -/* A64820 80240790 8FBF0018 */ lw $ra, 0x18($sp) -/* A64824 80240794 8FB10014 */ lw $s1, 0x14($sp) -/* A64828 80240798 8FB00010 */ lw $s0, 0x10($sp) -/* A6482C 8024079C 03E00008 */ jr $ra -/* A64830 802407A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s deleted file mode 100644 index 104edd6c19..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802408D0_A64960.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_A64960 -/* A64960 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A64964 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* A64968 802408D8 0080882D */ daddu $s1, $a0, $zero -/* A6496C 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* A64970 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* A64974 802408E4 8E220148 */ lw $v0, 0x148($s1) -/* A64978 802408E8 0C00EABB */ jal get_npc_unsafe -/* A6497C 802408EC 84440008 */ lh $a0, 8($v0) -/* A64980 802408F0 24040064 */ addiu $a0, $zero, 0x64 -/* A64984 802408F4 0C00A67F */ jal rand_int -/* A64988 802408F8 0040802D */ daddu $s0, $v0, $zero -/* A6498C 802408FC 00021FC2 */ srl $v1, $v0, 0x1f -/* A64990 80240900 00431821 */ addu $v1, $v0, $v1 -/* A64994 80240904 00031843 */ sra $v1, $v1, 1 -/* A64998 80240908 00031840 */ sll $v1, $v1, 1 -/* A6499C 8024090C 00431023 */ subu $v0, $v0, $v1 -/* A649A0 80240910 3C014334 */ lui $at, 0x4334 -/* A649A4 80240914 44811000 */ mtc1 $at, $f2 -/* A649A8 80240918 44820000 */ mtc1 $v0, $f0 -/* A649AC 8024091C 00000000 */ nop -/* A649B0 80240920 46800020 */ cvt.s.w $f0, $f0 -/* A649B4 80240924 46020002 */ mul.s $f0, $f0, $f2 -/* A649B8 80240928 00000000 */ nop -/* A649BC 8024092C 3C013F4C */ lui $at, 0x3f4c -/* A649C0 80240930 3421CCCD */ ori $at, $at, 0xcccd -/* A649C4 80240934 44812000 */ mtc1 $at, $f4 -/* A649C8 80240938 3C0142B4 */ lui $at, 0x42b4 -/* A649CC 8024093C 44811000 */ mtc1 $at, $f2 -/* A649D0 80240940 2402000F */ addiu $v0, $zero, 0xf -/* A649D4 80240944 A602008E */ sh $v0, 0x8e($s0) -/* A649D8 80240948 46020000 */ add.s $f0, $f0, $f2 -/* A649DC 8024094C 24020006 */ addiu $v0, $zero, 6 -/* A649E0 80240950 E6040018 */ swc1 $f4, 0x18($s0) -/* A649E4 80240954 E600000C */ swc1 $f0, 0xc($s0) -/* A649E8 80240958 AE220070 */ sw $v0, 0x70($s1) -/* A649EC 8024095C 8FBF0018 */ lw $ra, 0x18($sp) -/* A649F0 80240960 8FB10014 */ lw $s1, 0x14($sp) -/* A649F4 80240964 8FB00010 */ lw $s0, 0x10($sp) -/* A649F8 80240968 03E00008 */ jr $ra -/* A649FC 8024096C 27BD0020 */ addiu $sp, $sp, 0x20 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 index fbc9912f80..4db37a4dad 100644 --- 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 @@ -58,7 +58,7 @@ glabel func_80240CF4_A64D84 .L80240DC8: /* A64E58 80240DC8 8E450024 */ lw $a1, 0x24($s2) /* A64E5C 80240DCC 8E460028 */ lw $a2, 0x28($s2) -/* A64E60 80240DD0 0C090014 */ jal func_80240050_A640E0 +/* 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 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 index 8c9272f694..419b1d40f1 100644 --- 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 @@ -25,7 +25,7 @@ glabel func_80240F20_A64FB0 /* 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 func_80240050_A640E0 +/* 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 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 index 489f71d20e..2a1bab00f0 100644 --- 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 @@ -98,7 +98,7 @@ glabel func_802410BC_A6514C .L80241208_A65298: /* A65298 80241208 02A0202D */ daddu $a0, $s5, $zero /* A6529C 8024120C 0260282D */ daddu $a1, $s3, $zero -/* A652A0 80241210 0C0901CC */ jal func_80240730_A647C0 +/* 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 @@ -114,7 +114,7 @@ glabel func_802410BC_A6514C .L80241240_A652D0: /* A652D0 80241240 02A0202D */ daddu $a0, $s5, $zero /* A652D4 80241244 0260282D */ daddu $a1, $s3, $zero -/* A652D8 80241248 0C090234 */ jal func_802408D0_A64960 +/* A652D8 80241248 0C090234 */ jal kpa_51_UnkFunc59 /* A652DC 8024124C 0280302D */ daddu $a2, $s4, $zero .L80241250_A652E0: /* A652E0 80241250 02A0202D */ daddu $a0, $s5, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s deleted file mode 100644 index ca7c604599..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802439E0_A6AAE0 -.double 180.0 - -dlabel D_802439E8_A6AAE8 -.double 75.0 - -.section .text - -glabel func_802400E0_A671E0 -/* A671E0 802400E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A671E4 802400E4 AFB10014 */ sw $s1, 0x14($sp) -/* A671E8 802400E8 0080882D */ daddu $s1, $a0, $zero -/* A671EC 802400EC 3C05800B */ lui $a1, %hi(gCameras) -/* A671F0 802400F0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A671F4 802400F4 AFBF0020 */ sw $ra, 0x20($sp) -/* A671F8 802400F8 AFB3001C */ sw $s3, 0x1c($sp) -/* A671FC 802400FC AFB20018 */ sw $s2, 0x18($sp) -/* A67200 80240100 AFB00010 */ sw $s0, 0x10($sp) -/* A67204 80240104 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A67208 80240108 8E330148 */ lw $s3, 0x148($s1) -/* A6720C 8024010C 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A67210 80240110 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A67214 80240114 8E30000C */ lw $s0, 0xc($s1) -/* A67218 80240118 00031080 */ sll $v0, $v1, 2 -/* A6721C 8024011C 00431021 */ addu $v0, $v0, $v1 -/* A67220 80240120 00021080 */ sll $v0, $v0, 2 -/* A67224 80240124 00431023 */ subu $v0, $v0, $v1 -/* A67228 80240128 000218C0 */ sll $v1, $v0, 3 -/* A6722C 8024012C 00431021 */ addu $v0, $v0, $v1 -/* A67230 80240130 000210C0 */ sll $v0, $v0, 3 -/* A67234 80240134 86640008 */ lh $a0, 8($s3) -/* A67238 80240138 0C00EABB */ jal get_npc_unsafe -/* A6723C 8024013C 00459021 */ addu $s2, $v0, $a1 -/* A67240 80240140 0220202D */ daddu $a0, $s1, $zero -/* A67244 80240144 8E050000 */ lw $a1, ($s0) -/* A67248 80240148 0C0B1EAF */ jal evt_get_variable -/* A6724C 8024014C 0040802D */ daddu $s0, $v0, $zero -/* A67250 80240150 0260202D */ daddu $a0, $s3, $zero -/* A67254 80240154 8C460024 */ lw $a2, 0x24($v0) -/* A67258 80240158 8C470028 */ lw $a3, 0x28($v0) -/* A6725C 8024015C 0C0124FB */ jal func_800493EC -/* A67260 80240160 0000282D */ daddu $a1, $zero, $zero -/* A67264 80240164 10400052 */ beqz $v0, .L802402B0 -/* A67268 80240168 2402FFFF */ addiu $v0, $zero, -1 -/* A6726C 8024016C C64C006C */ lwc1 $f12, 0x6c($s2) -/* A67270 80240170 C60E000C */ lwc1 $f14, 0xc($s0) -/* A67274 80240174 3C014387 */ lui $at, 0x4387 -/* A67278 80240178 4481A000 */ mtc1 $at, $f20 -/* A6727C 8024017C 0C00A70A */ jal get_clamped_angle_diff -/* A67280 80240180 00000000 */ nop -/* A67284 80240184 0C00A6C9 */ jal clamp_angle -/* A67288 80240188 46000306 */ mov.s $f12, $f0 -/* A6728C 8024018C 3C018024 */ lui $at, %hi(D_802439E0_A6AAE0) -/* A67290 80240190 D42239E0 */ ldc1 $f2, %lo(D_802439E0_A6AAE0)($at) -/* A67294 80240194 46000021 */ cvt.d.s $f0, $f0 -/* A67298 80240198 4622003C */ c.lt.d $f0, $f2 -/* A6729C 8024019C 00000000 */ nop -/* A672A0 802401A0 45000003 */ bc1f .L802401B0 -/* A672A4 802401A4 00000000 */ nop -/* A672A8 802401A8 3C0142B4 */ lui $at, 0x42b4 -/* A672AC 802401AC 4481A000 */ mtc1 $at, $f20 -.L802401B0: -/* A672B0 802401B0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A672B4 802401B4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A672B8 802401B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A672BC 802401BC 8E220000 */ lw $v0, ($s1) -/* A672C0 802401C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A672C4 802401C4 8C460028 */ lw $a2, 0x28($v0) -/* A672C8 802401C8 0C00A720 */ jal atan2 -/* A672CC 802401CC 8C470030 */ lw $a3, 0x30($v0) -/* A672D0 802401D0 4600A306 */ mov.s $f12, $f20 -/* A672D4 802401D4 0C00A70A */ jal get_clamped_angle_diff -/* A672D8 802401D8 46000386 */ mov.s $f14, $f0 -/* A672DC 802401DC 46000005 */ abs.s $f0, $f0 -/* A672E0 802401E0 3C018024 */ lui $at, %hi(D_802439E8_A6AAE8) -/* A672E4 802401E4 D42239E8 */ ldc1 $f2, %lo(D_802439E8_A6AAE8)($at) -/* A672E8 802401E8 46000021 */ cvt.d.s $f0, $f0 -/* A672EC 802401EC 4620103C */ c.lt.d $f2, $f0 -/* A672F0 802401F0 00000000 */ nop -/* A672F4 802401F4 4501002E */ bc1t .L802402B0 -/* A672F8 802401F8 2402FFFF */ addiu $v0, $zero, -1 -/* A672FC 802401FC 8E220000 */ lw $v0, ($s1) -/* A67300 80240200 C600003C */ lwc1 $f0, 0x3c($s0) -/* A67304 80240204 C442002C */ lwc1 $f2, 0x2c($v0) -/* A67308 80240208 860200A8 */ lh $v0, 0xa8($s0) -/* A6730C 8024020C 46020001 */ sub.s $f0, $f0, $f2 -/* A67310 80240210 44821000 */ mtc1 $v0, $f2 -/* A67314 80240214 00000000 */ nop -/* A67318 80240218 468010A1 */ cvt.d.w $f2, $f2 -/* A6731C 8024021C 46221080 */ add.d $f2, $f2, $f2 -/* A67320 80240220 46000005 */ abs.s $f0, $f0 -/* A67324 80240224 46000021 */ cvt.d.s $f0, $f0 -/* A67328 80240228 4620103E */ c.le.d $f2, $f0 -/* A6732C 8024022C 00000000 */ nop -/* A67330 80240230 4501001F */ bc1t .L802402B0 -/* A67334 80240234 2402FFFF */ addiu $v0, $zero, -1 -/* A67338 80240238 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A6733C 8024023C 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A67340 80240240 24020009 */ addiu $v0, $zero, 9 -/* A67344 80240244 10620019 */ beq $v1, $v0, .L802402AC -/* A67348 80240248 24020007 */ addiu $v0, $zero, 7 -/* A6734C 8024024C 14620005 */ bne $v1, $v0, .L80240264 -/* A67350 80240250 2402FFFF */ addiu $v0, $zero, -1 -/* A67354 80240254 080900AC */ j .L802402B0 -/* A67358 80240258 00000000 */ nop -.L8024025C: -/* A6735C 8024025C 080900AC */ j .L802402B0 -/* A67360 80240260 0240102D */ daddu $v0, $s2, $zero -.L80240264: -/* A67364 80240264 8E620078 */ lw $v0, 0x78($s3) -/* A67368 80240268 18400010 */ blez $v0, .L802402AC -/* A6736C 8024026C 0000882D */ daddu $s1, $zero, $zero -.L80240270: -/* A67370 80240270 86620008 */ lh $v0, 8($s3) -/* A67374 80240274 00511021 */ addu $v0, $v0, $s1 -/* A67378 80240278 24520001 */ addiu $s2, $v0, 1 -/* A6737C 8024027C 0C00FB3A */ jal get_enemy -/* A67380 80240280 0240202D */ daddu $a0, $s2, $zero -/* A67384 80240284 0240202D */ daddu $a0, $s2, $zero -/* A67388 80240288 0C00EABB */ jal get_npc_unsafe -/* A6738C 8024028C 0040802D */ daddu $s0, $v0, $zero -/* A67390 80240290 8E02006C */ lw $v0, 0x6c($s0) -/* A67394 80240294 1040FFF1 */ beqz $v0, .L8024025C -/* A67398 80240298 26310001 */ addiu $s1, $s1, 1 -/* A6739C 8024029C 8E620078 */ lw $v0, 0x78($s3) -/* A673A0 802402A0 0222102A */ slt $v0, $s1, $v0 -/* A673A4 802402A4 1440FFF2 */ bnez $v0, .L80240270 -/* A673A8 802402A8 00000000 */ nop -.L802402AC: -/* A673AC 802402AC 2402FFFF */ addiu $v0, $zero, -1 -.L802402B0: -/* A673B0 802402B0 8FBF0020 */ lw $ra, 0x20($sp) -/* A673B4 802402B4 8FB3001C */ lw $s3, 0x1c($sp) -/* A673B8 802402B8 8FB20018 */ lw $s2, 0x18($sp) -/* A673BC 802402BC 8FB10014 */ lw $s1, 0x14($sp) -/* A673C0 802402C0 8FB00010 */ lw $s0, 0x10($sp) -/* A673C4 802402C4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A673C8 802402C8 03E00008 */ jr $ra -/* A673CC 802402CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s deleted file mode 100644 index de15369156..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0_A673D0 -/* A673D0 802402D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A673D4 802402D4 AFB20038 */ sw $s2, 0x38($sp) -/* A673D8 802402D8 0080902D */ daddu $s2, $a0, $zero -/* A673DC 802402DC AFB00030 */ sw $s0, 0x30($sp) -/* A673E0 802402E0 AFBF003C */ sw $ra, 0x3c($sp) -/* A673E4 802402E4 AFB10034 */ sw $s1, 0x34($sp) -/* A673E8 802402E8 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A673EC 802402EC F7B40040 */ sdc1 $f20, 0x40($sp) -/* A673F0 802402F0 8E510148 */ lw $s1, 0x148($s2) -/* A673F4 802402F4 4485A000 */ mtc1 $a1, $f20 -/* A673F8 802402F8 86240008 */ lh $a0, 8($s1) -/* A673FC 802402FC 4486B000 */ mtc1 $a2, $f22 -/* A67400 80240300 0C00EABB */ jal get_npc_unsafe -/* A67404 80240304 00E0802D */ daddu $s0, $a3, $zero -/* A67408 80240308 0200202D */ daddu $a0, $s0, $zero -/* A6740C 8024030C 0220282D */ daddu $a1, $s1, $zero -/* A67410 80240310 24030001 */ addiu $v1, $zero, 1 -/* A67414 80240314 4406A000 */ mfc1 $a2, $f20 -/* A67418 80240318 4407B000 */ mfc1 $a3, $f22 -/* A6741C 8024031C 0040802D */ daddu $s0, $v0, $zero -/* A67420 80240320 0C01242D */ jal func_800490B4 -/* A67424 80240324 AFA30010 */ sw $v1, 0x10($sp) -/* A67428 80240328 1440001D */ bnez $v0, .L802403A0 -/* A6742C 8024032C 24040002 */ addiu $a0, $zero, 2 -/* A67430 80240330 0200282D */ daddu $a1, $s0, $zero -/* A67434 80240334 0000302D */ daddu $a2, $zero, $zero -/* A67438 80240338 860300A8 */ lh $v1, 0xa8($s0) -/* A6743C 8024033C 3C013F80 */ lui $at, 0x3f80 -/* A67440 80240340 44810000 */ mtc1 $at, $f0 -/* A67444 80240344 3C014000 */ lui $at, 0x4000 -/* A67448 80240348 44811000 */ mtc1 $at, $f2 -/* A6744C 8024034C 3C01C1A0 */ lui $at, 0xc1a0 -/* A67450 80240350 44812000 */ mtc1 $at, $f4 -/* A67454 80240354 2402000F */ addiu $v0, $zero, 0xf -/* A67458 80240358 AFA2001C */ sw $v0, 0x1c($sp) -/* A6745C 8024035C 44833000 */ mtc1 $v1, $f6 -/* A67460 80240360 00000000 */ nop -/* A67464 80240364 468031A0 */ cvt.s.w $f6, $f6 -/* A67468 80240368 44073000 */ mfc1 $a3, $f6 -/* A6746C 8024036C 27A20028 */ addiu $v0, $sp, 0x28 -/* A67470 80240370 AFA20020 */ sw $v0, 0x20($sp) -/* A67474 80240374 E7A00010 */ swc1 $f0, 0x10($sp) -/* A67478 80240378 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6747C 8024037C 0C01BFA4 */ jal fx_emote -/* A67480 80240380 E7A40018 */ swc1 $f4, 0x18($sp) -/* A67484 80240384 8E2200CC */ lw $v0, 0xcc($s1) -/* A67488 80240388 8C430000 */ lw $v1, ($v0) -/* A6748C 8024038C 24020014 */ addiu $v0, $zero, 0x14 -/* A67490 80240390 A602008E */ sh $v0, 0x8e($s0) -/* A67494 80240394 24020021 */ addiu $v0, $zero, 0x21 -/* A67498 80240398 080900FC */ j .L802403F0 -/* A6749C 8024039C AE030028 */ sw $v1, 0x28($s0) -.L802403A0: -/* A674A0 802403A0 0C090038 */ jal func_802400E0_A671E0 -/* A674A4 802403A4 0240202D */ daddu $a0, $s2, $zero -/* A674A8 802403A8 0040202D */ daddu $a0, $v0, $zero -/* A674AC 802403AC 2402FFFF */ addiu $v0, $zero, -1 -/* A674B0 802403B0 10820010 */ beq $a0, $v0, .L802403F4 -/* A674B4 802403B4 00000000 */ nop -/* A674B8 802403B8 0C00FB3A */ jal get_enemy -/* A674BC 802403BC 00000000 */ nop -/* A674C0 802403C0 8C42006C */ lw $v0, 0x6c($v0) -/* A674C4 802403C4 1440000B */ bnez $v0, .L802403F4 -/* A674C8 802403C8 00000000 */ nop -/* A674CC 802403CC 8602008C */ lh $v0, 0x8c($s0) -/* A674D0 802403D0 14400008 */ bnez $v0, .L802403F4 -/* A674D4 802403D4 00000000 */ nop -/* A674D8 802403D8 8E2200CC */ lw $v0, 0xcc($s1) -/* A674DC 802403DC 8C420020 */ lw $v0, 0x20($v0) -/* A674E0 802403E0 AE020028 */ sw $v0, 0x28($s0) -/* A674E4 802403E4 96220072 */ lhu $v0, 0x72($s1) -/* A674E8 802403E8 A602008E */ sh $v0, 0x8e($s0) -/* A674EC 802403EC 2402001E */ addiu $v0, $zero, 0x1e -.L802403F0: -/* A674F0 802403F0 AE420070 */ sw $v0, 0x70($s2) -.L802403F4: -/* A674F4 802403F4 8FBF003C */ lw $ra, 0x3c($sp) -/* A674F8 802403F8 8FB20038 */ lw $s2, 0x38($sp) -/* A674FC 802403FC 8FB10034 */ lw $s1, 0x34($sp) -/* A67500 80240400 8FB00030 */ lw $s0, 0x30($sp) -/* A67504 80240404 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A67508 80240408 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A6750C 8024040C 03E00008 */ jr $ra -/* A67510 80240410 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s deleted file mode 100644 index e927a0d1d6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240414_A67514 -/* A67514 80240414 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A67518 80240418 AFB20038 */ sw $s2, 0x38($sp) -/* A6751C 8024041C 0080902D */ daddu $s2, $a0, $zero -/* A67520 80240420 AFBF003C */ sw $ra, 0x3c($sp) -/* A67524 80240424 AFB10034 */ sw $s1, 0x34($sp) -/* A67528 80240428 AFB00030 */ sw $s0, 0x30($sp) -/* A6752C 8024042C 8E510148 */ lw $s1, 0x148($s2) -/* A67530 80240430 0C00EABB */ jal get_npc_unsafe -/* A67534 80240434 86240008 */ lh $a0, 8($s1) -/* A67538 80240438 0040802D */ daddu $s0, $v0, $zero -/* A6753C 8024043C 9602008E */ lhu $v0, 0x8e($s0) -/* A67540 80240440 2442FFFF */ addiu $v0, $v0, -1 -/* A67544 80240444 A602008E */ sh $v0, 0x8e($s0) -/* A67548 80240448 00021400 */ sll $v0, $v0, 0x10 -/* A6754C 8024044C 1C40002B */ bgtz $v0, .L802404FC -/* A67550 80240450 00000000 */ nop -/* A67554 80240454 0C090038 */ jal func_802400E0_A671E0 -/* A67558 80240458 0240202D */ daddu $a0, $s2, $zero -/* A6755C 8024045C 0040202D */ daddu $a0, $v0, $zero -/* A67560 80240460 0481001A */ bgez $a0, .L802404CC -/* A67564 80240464 2402000F */ addiu $v0, $zero, 0xf -/* A67568 80240468 24040002 */ addiu $a0, $zero, 2 -/* A6756C 8024046C 860300A8 */ lh $v1, 0xa8($s0) -/* A67570 80240470 AFA2001C */ sw $v0, 0x1c($sp) -/* A67574 80240474 27A20028 */ addiu $v0, $sp, 0x28 -/* A67578 80240478 0200282D */ daddu $a1, $s0, $zero -/* A6757C 8024047C 3C013F80 */ lui $at, 0x3f80 -/* A67580 80240480 44810000 */ mtc1 $at, $f0 -/* A67584 80240484 3C014000 */ lui $at, 0x4000 -/* A67588 80240488 44811000 */ mtc1 $at, $f2 -/* A6758C 8024048C 3C01C1A0 */ lui $at, 0xc1a0 -/* A67590 80240490 44812000 */ mtc1 $at, $f4 -/* A67594 80240494 44833000 */ mtc1 $v1, $f6 -/* A67598 80240498 00000000 */ nop -/* A6759C 8024049C 468031A0 */ cvt.s.w $f6, $f6 -/* A675A0 802404A0 44073000 */ mfc1 $a3, $f6 -/* A675A4 802404A4 0000302D */ daddu $a2, $zero, $zero -/* A675A8 802404A8 AFA20020 */ sw $v0, 0x20($sp) -/* A675AC 802404AC E7A00010 */ swc1 $f0, 0x10($sp) -/* A675B0 802404B0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A675B4 802404B4 0C01BFA4 */ jal fx_emote -/* A675B8 802404B8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A675BC 802404BC 8E2200CC */ lw $v0, 0xcc($s1) -/* A675C0 802404C0 8C420000 */ lw $v0, ($v0) -/* A675C4 802404C4 0809013B */ j .L802404EC -/* A675C8 802404C8 AE020028 */ sw $v0, 0x28($s0) -.L802404CC: -/* A675CC 802404CC 8E2200CC */ lw $v0, 0xcc($s1) -/* A675D0 802404D0 8C420024 */ lw $v0, 0x24($v0) -/* A675D4 802404D4 0C00FB3A */ jal get_enemy -/* A675D8 802404D8 AE020028 */ sw $v0, 0x28($s0) -/* A675DC 802404DC 86240008 */ lh $a0, 8($s1) -/* A675E0 802404E0 24030001 */ addiu $v1, $zero, 1 -/* A675E4 802404E4 AC43006C */ sw $v1, 0x6c($v0) -/* A675E8 802404E8 AC44007C */ sw $a0, 0x7c($v0) -.L802404EC: -/* A675EC 802404EC 96220076 */ lhu $v0, 0x76($s1) -/* A675F0 802404F0 A602008E */ sh $v0, 0x8e($s0) -/* A675F4 802404F4 24020021 */ addiu $v0, $zero, 0x21 -/* A675F8 802404F8 AE420070 */ sw $v0, 0x70($s2) -.L802404FC: -/* A675FC 802404FC 8FBF003C */ lw $ra, 0x3c($sp) -/* A67600 80240500 8FB20038 */ lw $s2, 0x38($sp) -/* A67604 80240504 8FB10034 */ lw $s1, 0x34($sp) -/* A67608 80240508 8FB00030 */ lw $s0, 0x30($sp) -/* A6760C 8024050C 03E00008 */ jr $ra -/* A67610 80240510 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s deleted file mode 100644 index 01500e3931..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243A08_A6AB08 -.word .L80241164_A68264, .L80241174_A68274, .L8024118C_A6828C, .L8024119C_A6829C, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802411B4_A682B4, .L802411C4_A682C4, .L802411DC_A682DC, .L80241254_A68354, .L8024126C_A6836C, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L80241284_A68384, .L80241294_A68394, .L802412A4_A683A4, .L802412B4_A683B4, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412CC_A683CC, .L802412C4_A683C4, 0, 0 - -.section .text - -glabel func_80240FD4_A680D4 -/* A680D4 80240FD4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A680D8 80240FD8 AFB3003C */ sw $s3, 0x3c($sp) -/* A680DC 80240FDC 0080982D */ daddu $s3, $a0, $zero -/* A680E0 80240FE0 AFBF0048 */ sw $ra, 0x48($sp) -/* A680E4 80240FE4 AFB50044 */ sw $s5, 0x44($sp) -/* A680E8 80240FE8 AFB40040 */ sw $s4, 0x40($sp) -/* A680EC 80240FEC AFB20038 */ sw $s2, 0x38($sp) -/* A680F0 80240FF0 AFB10034 */ sw $s1, 0x34($sp) -/* A680F4 80240FF4 AFB00030 */ sw $s0, 0x30($sp) -/* A680F8 80240FF8 8E720148 */ lw $s2, 0x148($s3) -/* A680FC 80240FFC 86440008 */ lh $a0, 8($s2) -/* A68100 80241000 8E70000C */ lw $s0, 0xc($s3) -/* A68104 80241004 0C00EABB */ jal get_npc_unsafe -/* A68108 80241008 00A0882D */ daddu $s1, $a1, $zero -/* A6810C 8024100C 0260202D */ daddu $a0, $s3, $zero -/* A68110 80241010 8E050000 */ lw $a1, ($s0) -/* A68114 80241014 0C0B1EAF */ jal evt_get_variable -/* A68118 80241018 0040A02D */ daddu $s4, $v0, $zero -/* A6811C 8024101C AFA00010 */ sw $zero, 0x10($sp) -/* A68120 80241020 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68124 80241024 8C630030 */ lw $v1, 0x30($v1) -/* A68128 80241028 AFA30014 */ sw $v1, 0x14($sp) -/* A6812C 8024102C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68130 80241030 8C63001C */ lw $v1, 0x1c($v1) -/* A68134 80241034 AFA30018 */ sw $v1, 0x18($sp) -/* A68138 80241038 8E4300D0 */ lw $v1, 0xd0($s2) -/* A6813C 8024103C 8C630024 */ lw $v1, 0x24($v1) -/* A68140 80241040 AFA3001C */ sw $v1, 0x1c($sp) -/* A68144 80241044 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68148 80241048 8C630028 */ lw $v1, 0x28($v1) -/* A6814C 8024104C 27B50010 */ addiu $s5, $sp, 0x10 -/* A68150 80241050 AFA30020 */ sw $v1, 0x20($sp) -/* A68154 80241054 8E4300D0 */ lw $v1, 0xd0($s2) -/* A68158 80241058 3C014220 */ lui $at, 0x4220 -/* A6815C 8024105C 44810000 */ mtc1 $at, $f0 -/* A68160 80241060 8C63002C */ lw $v1, 0x2c($v1) -/* A68164 80241064 0040802D */ daddu $s0, $v0, $zero -/* A68168 80241068 E7A00028 */ swc1 $f0, 0x28($sp) -/* A6816C 8024106C A7A0002C */ sh $zero, 0x2c($sp) -/* A68170 80241070 16200005 */ bnez $s1, .L80241088 -/* A68174 80241074 AFA30024 */ sw $v1, 0x24($sp) -/* A68178 80241078 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6817C 8024107C 30420004 */ andi $v0, $v0, 4 -/* A68180 80241080 1040002F */ beqz $v0, .L80241140 -/* A68184 80241084 00000000 */ nop -.L80241088: -/* A68188 80241088 2404F7FF */ addiu $a0, $zero, -0x801 -/* A6818C 8024108C AE600070 */ sw $zero, 0x70($s3) -/* A68190 80241090 A680008E */ sh $zero, 0x8e($s4) -/* A68194 80241094 8E4200CC */ lw $v0, 0xcc($s2) -/* A68198 80241098 8E830000 */ lw $v1, ($s4) -/* A6819C 8024109C 8C420000 */ lw $v0, ($v0) -/* A681A0 802410A0 00641824 */ and $v1, $v1, $a0 -/* A681A4 802410A4 AE830000 */ sw $v1, ($s4) -/* A681A8 802410A8 AE820028 */ sw $v0, 0x28($s4) -/* A681AC 802410AC 8E4200D0 */ lw $v0, 0xd0($s2) -/* A681B0 802410B0 8C420034 */ lw $v0, 0x34($v0) -/* A681B4 802410B4 54400005 */ bnel $v0, $zero, .L802410CC -/* A681B8 802410B8 2402FDFF */ addiu $v0, $zero, -0x201 -/* A681BC 802410BC 34620200 */ ori $v0, $v1, 0x200 -/* A681C0 802410C0 2403FFF7 */ addiu $v1, $zero, -9 -/* A681C4 802410C4 08090435 */ j .L802410D4 -/* A681C8 802410C8 00431024 */ and $v0, $v0, $v1 -.L802410CC: -/* A681CC 802410CC 00621024 */ and $v0, $v1, $v0 -/* A681D0 802410D0 34420008 */ ori $v0, $v0, 8 -.L802410D4: -/* A681D4 802410D4 AE820000 */ sw $v0, ($s4) -/* A681D8 802410D8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A681DC 802410DC 30420004 */ andi $v0, $v0, 4 -/* A681E0 802410E0 10400008 */ beqz $v0, .L80241104 -/* A681E4 802410E4 24020063 */ addiu $v0, $zero, 0x63 -/* A681E8 802410E8 AE620070 */ sw $v0, 0x70($s3) -/* A681EC 802410EC AE600074 */ sw $zero, 0x74($s3) -/* A681F0 802410F0 8E4200B0 */ lw $v0, 0xb0($s2) -/* A681F4 802410F4 2403FFFB */ addiu $v1, $zero, -5 -/* A681F8 802410F8 00431024 */ and $v0, $v0, $v1 -/* A681FC 802410FC 08090447 */ j .L8024111C -/* A68200 80241100 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241104: -/* A68204 80241104 8E420000 */ lw $v0, ($s2) -/* A68208 80241108 3C034000 */ lui $v1, 0x4000 -/* A6820C 8024110C 00431024 */ and $v0, $v0, $v1 -/* A68210 80241110 10400002 */ beqz $v0, .L8024111C -/* A68214 80241114 2402000C */ addiu $v0, $zero, 0xc -/* A68218 80241118 AE620070 */ sw $v0, 0x70($s3) -.L8024111C: -/* A6821C 8024111C 3C05BFFF */ lui $a1, 0xbfff -/* A68220 80241120 34A5FFFF */ ori $a1, $a1, 0xffff -/* A68224 80241124 2404FFFB */ addiu $a0, $zero, -5 -/* A68228 80241128 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6822C 8024112C 8E430000 */ lw $v1, ($s2) -/* A68230 80241130 00441024 */ and $v0, $v0, $a0 -/* A68234 80241134 00651824 */ and $v1, $v1, $a1 -/* A68238 80241138 AE4200B0 */ sw $v0, 0xb0($s2) -/* A6823C 8024113C AE430000 */ sw $v1, ($s2) -.L80241140: -/* A68240 80241140 8E630070 */ lw $v1, 0x70($s3) -/* A68244 80241144 2C620064 */ sltiu $v0, $v1, 0x64 -/* A68248 80241148 10400060 */ beqz $v0, .L802412CC_A683CC -/* A6824C 8024114C 00031080 */ sll $v0, $v1, 2 -/* A68250 80241150 3C018024 */ lui $at, %hi(jtbl_80243A08_A6AB08) -/* A68254 80241154 00220821 */ addu $at, $at, $v0 -/* A68258 80241158 8C223A08 */ lw $v0, %lo(jtbl_80243A08_A6AB08)($at) -/* A6825C 8024115C 00400008 */ jr $v0 -/* A68260 80241160 00000000 */ nop -.L80241164_A68264: -/* A68264 80241164 0260202D */ daddu $a0, $s3, $zero -/* A68268 80241168 0200282D */ daddu $a1, $s0, $zero -/* A6826C 8024116C 0C012568 */ jal func_800495A0 -/* A68270 80241170 02A0302D */ daddu $a2, $s5, $zero -.L80241174_A68274: -/* A68274 80241174 0260202D */ daddu $a0, $s3, $zero -/* A68278 80241178 0200282D */ daddu $a1, $s0, $zero -/* A6827C 8024117C 0C0125AE */ jal func_800496B8 -/* A68280 80241180 02A0302D */ daddu $a2, $s5, $zero -/* A68284 80241184 080904B3 */ j .L802412CC_A683CC -/* A68288 80241188 00000000 */ nop -.L8024118C_A6828C: -/* A6828C 8024118C 0260202D */ daddu $a0, $s3, $zero -/* A68290 80241190 0200282D */ daddu $a1, $s0, $zero -/* A68294 80241194 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* A68298 80241198 02A0302D */ daddu $a2, $s5, $zero -.L8024119C_A6829C: -/* A6829C 8024119C 0260202D */ daddu $a0, $s3, $zero -/* A682A0 802411A0 0200282D */ daddu $a1, $s0, $zero -/* A682A4 802411A4 0C012701 */ jal func_80049C04 -/* A682A8 802411A8 02A0302D */ daddu $a2, $s5, $zero -/* A682AC 802411AC 080904B3 */ j .L802412CC_A683CC -/* A682B0 802411B0 00000000 */ nop -.L802411B4_A682B4: -/* A682B4 802411B4 0260202D */ daddu $a0, $s3, $zero -/* A682B8 802411B8 0200282D */ daddu $a1, $s0, $zero -/* A682BC 802411BC 0C01278F */ jal func_80049E3C -/* A682C0 802411C0 02A0302D */ daddu $a2, $s5, $zero -.L802411C4_A682C4: -/* A682C4 802411C4 0260202D */ daddu $a0, $s3, $zero -/* A682C8 802411C8 0200282D */ daddu $a1, $s0, $zero -/* A682CC 802411CC 0C0127B3 */ jal func_80049ECC -/* A682D0 802411D0 02A0302D */ daddu $a2, $s5, $zero -/* A682D4 802411D4 080904B3 */ j .L802412CC_A683CC -/* A682D8 802411D8 00000000 */ nop -.L802411DC_A682DC: -/* A682DC 802411DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A682E0 802411E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A682E4 802411E4 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A682E8 802411E8 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A682EC 802411EC 8C460028 */ lw $a2, 0x28($v0) -/* A682F0 802411F0 0C00A7B5 */ jal dist2D -/* A682F4 802411F4 8C470030 */ lw $a3, 0x30($v0) -/* A682F8 802411F8 8E42006C */ lw $v0, 0x6c($s2) -/* A682FC 802411FC 10400008 */ beqz $v0, .L80241220 -/* A68300 80241200 46000086 */ mov.s $f2, $f0 -/* A68304 80241204 44820000 */ mtc1 $v0, $f0 -/* A68308 80241208 00000000 */ nop -/* A6830C 8024120C 46800020 */ cvt.s.w $f0, $f0 -/* A68310 80241210 4602003C */ c.lt.s $f0, $f2 -/* A68314 80241214 00000000 */ nop -/* A68318 80241218 4500000B */ bc1f .L80241248 -/* A6831C 8024121C 0260202D */ daddu $a0, $s3, $zero -.L80241220: -/* A68320 80241220 0260202D */ daddu $a0, $s3, $zero -/* A68324 80241224 8E050024 */ lw $a1, 0x24($s0) -/* A68328 80241228 8E060028 */ lw $a2, 0x28($s0) -/* A6832C 8024122C 0C0900B4 */ jal func_802402D0_A673D0 -/* A68330 80241230 02A0382D */ daddu $a3, $s5, $zero -/* A68334 80241234 8E630070 */ lw $v1, 0x70($s3) -/* A68338 80241238 2402000C */ addiu $v0, $zero, 0xc -/* A6833C 8024123C 14620023 */ bne $v1, $v0, .L802412CC_A683CC -/* A68340 80241240 00000000 */ nop -/* A68344 80241244 0260202D */ daddu $a0, $s3, $zero -.L80241248: -/* A68348 80241248 0200282D */ daddu $a1, $s0, $zero -/* A6834C 8024124C 0C0127DF */ jal func_80049F7C -/* A68350 80241250 02A0302D */ daddu $a2, $s5, $zero -.L80241254_A68354: -/* A68354 80241254 0260202D */ daddu $a0, $s3, $zero -/* A68358 80241258 0200282D */ daddu $a1, $s0, $zero -/* A6835C 8024125C 0C012849 */ jal func_8004A124 -/* A68360 80241260 02A0302D */ daddu $a2, $s5, $zero -/* A68364 80241264 080904B3 */ j .L802412CC_A683CC -/* A68368 80241268 00000000 */ nop -.L8024126C_A6836C: -/* A6836C 8024126C 0260202D */ daddu $a0, $s3, $zero -/* A68370 80241270 0200282D */ daddu $a1, $s0, $zero -/* A68374 80241274 0C0128FA */ jal func_8004A3E8 -/* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero -/* A6837C 8024127C 080904B3 */ j .L802412CC_A683CC -/* A68380 80241280 00000000 */ nop -.L80241284_A68384: -/* A68384 80241284 0C090105 */ jal func_80240414_A67514 -/* A68388 80241288 0260202D */ daddu $a0, $s3, $zero -/* A6838C 8024128C 080904B3 */ j .L802412CC_A683CC -/* A68390 80241290 00000000 */ nop -.L80241294_A68394: -/* A68394 80241294 0C090145 */ jal kpa_52_UnkSetDurationFunc -/* A68398 80241298 0260202D */ daddu $a0, $s3, $zero -/* A6839C 8024129C 080904B3 */ j .L802412CC_A683CC -/* A683A0 802412A0 00000000 */ nop -.L802412A4_A683A4: -/* A683A4 802412A4 0C090156 */ jal kpa_52_UnkNpcAIFunc9 -/* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero -/* A683AC 802412AC 080904B3 */ j .L802412CC_A683CC -/* A683B0 802412B0 00000000 */ nop -.L802412B4_A683B4: -/* A683B4 802412B4 0C09017E */ jal kpa_52_UnkDurationCheck -/* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero -/* A683BC 802412BC 080904B3 */ j .L802412CC_A683CC -/* A683C0 802412C0 00000000 */ nop -.L802412C4_A683C4: -/* A683C4 802412C4 0C0129CF */ jal func_8004A73C -/* A683C8 802412C8 0260202D */ daddu $a0, $s3, $zero -.L802412CC_A683CC: -/* A683CC 802412CC 8FBF0048 */ lw $ra, 0x48($sp) -/* A683D0 802412D0 8FB50044 */ lw $s5, 0x44($sp) -/* A683D4 802412D4 8FB40040 */ lw $s4, 0x40($sp) -/* A683D8 802412D8 8FB3003C */ lw $s3, 0x3c($sp) -/* A683DC 802412DC 8FB20038 */ lw $s2, 0x38($sp) -/* A683E0 802412E0 8FB10034 */ lw $s1, 0x34($sp) -/* A683E4 802412E4 8FB00030 */ lw $s0, 0x30($sp) -/* A683E8 802412E8 0000102D */ daddu $v0, $zero, $zero -/* A683EC 802412EC 03E00008 */ jr $ra -/* A683F0 802412F0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s deleted file mode 100644 index bca96527d9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s +++ /dev/null @@ -1,139 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243D30_A72110 -.double 180.0 - -dlabel D_80243D38_A72118 -.double 75.0 - -dlabel D_80243D40_A72120 -.double 90.0 - -dlabel D_80243D48_A72128 -.double 70.0 - -.section .text - -glabel func_80240AE4_A6EEC4 -/* A6EEC4 80240AE4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A6EEC8 80240AE8 AFB00018 */ sw $s0, 0x18($sp) -/* A6EECC 80240AEC AFBF0024 */ sw $ra, 0x24($sp) -/* A6EED0 80240AF0 AFB20020 */ sw $s2, 0x20($sp) -/* A6EED4 80240AF4 AFB1001C */ sw $s1, 0x1c($sp) -/* A6EED8 80240AF8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A6EEDC 80240AFC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A6EEE0 80240B00 8C920148 */ lw $s2, 0x148($a0) -/* A6EEE4 80240B04 4485A000 */ mtc1 $a1, $f20 -/* A6EEE8 80240B08 86440008 */ lh $a0, 8($s2) -/* A6EEEC 80240B0C 4486B000 */ mtc1 $a2, $f22 -/* A6EEF0 80240B10 0C00EABB */ jal get_npc_unsafe -/* A6EEF4 80240B14 00E0802D */ daddu $s0, $a3, $zero -/* A6EEF8 80240B18 0200202D */ daddu $a0, $s0, $zero -/* A6EEFC 80240B1C 0040882D */ daddu $s1, $v0, $zero -/* A6EF00 80240B20 4406A000 */ mfc1 $a2, $f20 -/* A6EF04 80240B24 4407B000 */ mfc1 $a3, $f22 -/* A6EF08 80240B28 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* A6EF0C 80240B2C 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* A6EF10 80240B30 3C05800B */ lui $a1, %hi(gCameras) -/* A6EF14 80240B34 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A6EF18 80240B38 AFA00010 */ sw $zero, 0x10($sp) -/* A6EF1C 80240B3C 00031080 */ sll $v0, $v1, 2 -/* A6EF20 80240B40 00431021 */ addu $v0, $v0, $v1 -/* A6EF24 80240B44 00021080 */ sll $v0, $v0, 2 -/* A6EF28 80240B48 00431023 */ subu $v0, $v0, $v1 -/* A6EF2C 80240B4C 000218C0 */ sll $v1, $v0, 3 -/* A6EF30 80240B50 00431021 */ addu $v0, $v0, $v1 -/* A6EF34 80240B54 000210C0 */ sll $v0, $v0, 3 -/* A6EF38 80240B58 00458021 */ addu $s0, $v0, $a1 -/* A6EF3C 80240B5C 0C01242D */ jal func_800490B4 -/* A6EF40 80240B60 0240282D */ daddu $a1, $s2, $zero -/* A6EF44 80240B64 1040004B */ beqz $v0, .L80240C94 -/* A6EF48 80240B68 2402FFFF */ addiu $v0, $zero, -1 -/* A6EF4C 80240B6C C60C006C */ lwc1 $f12, 0x6c($s0) -/* A6EF50 80240B70 C62E000C */ lwc1 $f14, 0xc($s1) -/* A6EF54 80240B74 3C014387 */ lui $at, 0x4387 -/* A6EF58 80240B78 4481A000 */ mtc1 $at, $f20 -/* A6EF5C 80240B7C 0C00A70A */ jal get_clamped_angle_diff -/* A6EF60 80240B80 00000000 */ nop -/* A6EF64 80240B84 0C00A6C9 */ jal clamp_angle -/* A6EF68 80240B88 46000306 */ mov.s $f12, $f0 -/* A6EF6C 80240B8C 3C018024 */ lui $at, %hi(D_80243D30_A72110) -/* A6EF70 80240B90 D4223D30 */ ldc1 $f2, %lo(D_80243D30_A72110)($at) -/* A6EF74 80240B94 46000021 */ cvt.d.s $f0, $f0 -/* A6EF78 80240B98 4622003C */ c.lt.d $f0, $f2 -/* A6EF7C 80240B9C 00000000 */ nop -/* A6EF80 80240BA0 45000003 */ bc1f .L80240BB0 -/* A6EF84 80240BA4 00000000 */ nop -/* A6EF88 80240BA8 3C0142B4 */ lui $at, 0x42b4 -/* A6EF8C 80240BAC 4481A000 */ mtc1 $at, $f20 -.L80240BB0: -/* A6EF90 80240BB0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A6EF94 80240BB4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A6EF98 80240BB8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6EF9C 80240BBC 8E020000 */ lw $v0, ($s0) -/* A6EFA0 80240BC0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A6EFA4 80240BC4 8C460028 */ lw $a2, 0x28($v0) -/* A6EFA8 80240BC8 0C00A720 */ jal atan2 -/* A6EFAC 80240BCC 8C470030 */ lw $a3, 0x30($v0) -/* A6EFB0 80240BD0 4600A306 */ mov.s $f12, $f20 -/* A6EFB4 80240BD4 0C00A70A */ jal get_clamped_angle_diff -/* A6EFB8 80240BD8 46000386 */ mov.s $f14, $f0 -/* A6EFBC 80240BDC 46000005 */ abs.s $f0, $f0 -/* A6EFC0 80240BE0 3C018024 */ lui $at, %hi(D_80243D38_A72118) -/* A6EFC4 80240BE4 D4223D38 */ ldc1 $f2, %lo(D_80243D38_A72118)($at) -/* A6EFC8 80240BE8 46000021 */ cvt.d.s $f0, $f0 -/* A6EFCC 80240BEC 4620103C */ c.lt.d $f2, $f0 -/* A6EFD0 80240BF0 00000000 */ nop -/* A6EFD4 80240BF4 45010027 */ bc1t .L80240C94 -/* A6EFD8 80240BF8 2402FFFF */ addiu $v0, $zero, -1 -/* A6EFDC 80240BFC 8E020000 */ lw $v0, ($s0) -/* A6EFE0 80240C00 C6200038 */ lwc1 $f0, 0x38($s1) -/* A6EFE4 80240C04 C4420028 */ lwc1 $f2, 0x28($v0) -/* A6EFE8 80240C08 44806000 */ mtc1 $zero, $f12 -/* A6EFEC 80240C0C 46020001 */ sub.s $f0, $f0, $f2 -/* A6EFF0 80240C10 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A6EFF4 80240C14 8C47002C */ lw $a3, 0x2c($v0) -/* A6EFF8 80240C18 46000005 */ abs.s $f0, $f0 -/* A6EFFC 80240C1C 44060000 */ mfc1 $a2, $f0 -/* A6F000 80240C20 0C00A720 */ jal atan2 -/* A6F004 80240C24 00000000 */ nop -/* A6F008 80240C28 3C018024 */ lui $at, %hi(D_80243D40_A72120) -/* A6F00C 80240C2C D4223D40 */ ldc1 $f2, %lo(D_80243D40_A72120)($at) -/* A6F010 80240C30 46000021 */ cvt.d.s $f0, $f0 -/* A6F014 80240C34 46220001 */ sub.d $f0, $f0, $f2 -/* A6F018 80240C38 3C018024 */ lui $at, %hi(D_80243D48_A72128) -/* A6F01C 80240C3C D4223D48 */ ldc1 $f2, %lo(D_80243D48_A72128)($at) -/* A6F020 80240C40 46200020 */ cvt.s.d $f0, $f0 -/* A6F024 80240C44 46000005 */ abs.s $f0, $f0 -/* A6F028 80240C48 46000021 */ cvt.d.s $f0, $f0 -/* A6F02C 80240C4C 4620103C */ c.lt.d $f2, $f0 -/* A6F030 80240C50 00000000 */ nop -/* A6F034 80240C54 4501000F */ bc1t .L80240C94 -/* A6F038 80240C58 2402FFFF */ addiu $v0, $zero, -1 -/* A6F03C 80240C5C 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* A6F040 80240C60 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* A6F044 80240C64 24020009 */ addiu $v0, $zero, 9 -/* A6F048 80240C68 10620009 */ beq $v1, $v0, .L80240C90 -/* A6F04C 80240C6C 24020007 */ addiu $v0, $zero, 7 -/* A6F050 80240C70 50620008 */ beql $v1, $v0, .L80240C94 -/* A6F054 80240C74 2402FFFF */ addiu $v0, $zero, -1 -/* A6F058 80240C78 86440008 */ lh $a0, 8($s2) -/* A6F05C 80240C7C 0C00FB3A */ jal get_enemy -/* A6F060 80240C80 24840001 */ addiu $a0, $a0, 1 -/* A6F064 80240C84 8C43006C */ lw $v1, 0x6c($v0) -/* A6F068 80240C88 10600002 */ beqz $v1, .L80240C94 -/* A6F06C 80240C8C 24020001 */ addiu $v0, $zero, 1 -.L80240C90: -/* A6F070 80240C90 2402FFFF */ addiu $v0, $zero, -1 -.L80240C94: -/* A6F074 80240C94 8FBF0024 */ lw $ra, 0x24($sp) -/* A6F078 80240C98 8FB20020 */ lw $s2, 0x20($sp) -/* A6F07C 80240C9C 8FB1001C */ lw $s1, 0x1c($sp) -/* A6F080 80240CA0 8FB00018 */ lw $s0, 0x18($sp) -/* A6F084 80240CA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A6F088 80240CA8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A6F08C 80240CAC 03E00008 */ jr $ra -/* A6F090 80240CB0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s deleted file mode 100644 index 7d560138f1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s +++ /dev/null @@ -1,350 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243D50_A72130 -.word .L80240DA8_A6F188, .L80240DD8_A6F1B8, .L80241004_A6F3E4, .L80241048_A6F428, .L802410A0_A6F480, 0 - -dlabel D_80243D68_A72148 -.double 90.0 - -.section .text - -glabel func_80240CB4_A6F094 -/* A6F094 80240CB4 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A6F098 80240CB8 AFB60378 */ sw $s6, 0x378($sp) -/* A6F09C 80240CBC 0080B02D */ daddu $s6, $a0, $zero -/* A6F0A0 80240CC0 AFBF037C */ sw $ra, 0x37c($sp) -/* A6F0A4 80240CC4 AFB50374 */ sw $s5, 0x374($sp) -/* A6F0A8 80240CC8 AFB40370 */ sw $s4, 0x370($sp) -/* A6F0AC 80240CCC AFB3036C */ sw $s3, 0x36c($sp) -/* A6F0B0 80240CD0 AFB20368 */ sw $s2, 0x368($sp) -/* A6F0B4 80240CD4 AFB10364 */ sw $s1, 0x364($sp) -/* A6F0B8 80240CD8 AFB00360 */ sw $s0, 0x360($sp) -/* A6F0BC 80240CDC F7B40380 */ sdc1 $f20, 0x380($sp) -/* A6F0C0 80240CE0 8ED20148 */ lw $s2, 0x148($s6) -/* A6F0C4 80240CE4 86440008 */ lh $a0, 8($s2) -/* A6F0C8 80240CE8 0C00EABB */ jal get_npc_unsafe -/* A6F0CC 80240CEC 00A0802D */ daddu $s0, $a1, $zero -/* A6F0D0 80240CF0 86440008 */ lh $a0, 8($s2) -/* A6F0D4 80240CF4 0040882D */ daddu $s1, $v0, $zero -/* A6F0D8 80240CF8 0C00FB3A */ jal get_enemy -/* A6F0DC 80240CFC 2484FFFF */ addiu $a0, $a0, -1 -/* A6F0E0 80240D00 84440008 */ lh $a0, 8($v0) -/* A6F0E4 80240D04 0C00EABB */ jal get_npc_unsafe -/* A6F0E8 80240D08 0000A82D */ daddu $s5, $zero, $zero -/* A6F0EC 80240D0C 27B30020 */ addiu $s3, $sp, 0x20 -/* A6F0F0 80240D10 16000005 */ bnez $s0, .L80240D28 -/* A6F0F4 80240D14 0040A02D */ daddu $s4, $v0, $zero -/* A6F0F8 80240D18 8E4200B0 */ lw $v0, 0xb0($s2) -/* A6F0FC 80240D1C 30420004 */ andi $v0, $v0, 4 -/* A6F100 80240D20 10400018 */ beqz $v0, .L80240D84 -/* A6F104 80240D24 00000000 */ nop -.L80240D28: -/* A6F108 80240D28 3C030024 */ lui $v1, 0x24 -/* A6F10C 80240D2C 34630102 */ ori $v1, $v1, 0x102 -/* A6F110 80240D30 3C041620 */ lui $a0, 0x1620 -/* A6F114 80240D34 AEC00070 */ sw $zero, 0x70($s6) -/* A6F118 80240D38 8E220000 */ lw $v0, ($s1) -/* A6F11C 80240D3C 34840040 */ ori $a0, $a0, 0x40 -/* A6F120 80240D40 A620008E */ sh $zero, 0x8e($s1) -/* A6F124 80240D44 00431025 */ or $v0, $v0, $v1 -/* A6F128 80240D48 AE220000 */ sw $v0, ($s1) -/* A6F12C 80240D4C 8E420000 */ lw $v0, ($s2) -/* A6F130 80240D50 3C013ECC */ lui $at, 0x3ecc -/* A6F134 80240D54 3421CCCD */ ori $at, $at, 0xcccd -/* A6F138 80240D58 44810000 */ mtc1 $at, $f0 -/* A6F13C 80240D5C 00441025 */ or $v0, $v0, $a0 -/* A6F140 80240D60 AE420000 */ sw $v0, ($s2) -/* A6F144 80240D64 E6200054 */ swc1 $f0, 0x54($s1) -/* A6F148 80240D68 E6200058 */ swc1 $f0, 0x58($s1) -/* A6F14C 80240D6C 8E4300B0 */ lw $v1, 0xb0($s2) -/* A6F150 80240D70 30620004 */ andi $v0, $v1, 4 -/* A6F154 80240D74 10400003 */ beqz $v0, .L80240D84 -/* A6F158 80240D78 2402FFFB */ addiu $v0, $zero, -5 -/* A6F15C 80240D7C 00621024 */ and $v0, $v1, $v0 -/* A6F160 80240D80 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240D84: -/* A6F164 80240D84 8EC30070 */ lw $v1, 0x70($s6) -/* A6F168 80240D88 2C620005 */ sltiu $v0, $v1, 5 -/* A6F16C 80240D8C 10400101 */ beqz $v0, .L80241194 -/* A6F170 80240D90 00031080 */ sll $v0, $v1, 2 -/* A6F174 80240D94 3C018024 */ lui $at, %hi(jtbl_80243D50_A72130) -/* A6F178 80240D98 00220821 */ addu $at, $at, $v0 -/* A6F17C 80240D9C 8C223D50 */ lw $v0, %lo(jtbl_80243D50_A72130)($at) -/* A6F180 80240DA0 00400008 */ jr $v0 -/* A6F184 80240DA4 00000000 */ nop -.L80240DA8_A6F188: -/* A6F188 80240DA8 3C01C47A */ lui $at, 0xc47a -/* A6F18C 80240DAC 44810000 */ mtc1 $at, $f0 -/* A6F190 80240DB0 24020014 */ addiu $v0, $zero, 0x14 -/* A6F194 80240DB4 AE400078 */ sw $zero, 0x78($s2) -/* A6F198 80240DB8 A62200A6 */ sh $v0, 0xa6($s1) -/* A6F19C 80240DBC A62200A8 */ sh $v0, 0xa8($s1) -/* A6F1A0 80240DC0 24020001 */ addiu $v0, $zero, 1 -/* A6F1A4 80240DC4 AE200038 */ sw $zero, 0x38($s1) -/* A6F1A8 80240DC8 AE200040 */ sw $zero, 0x40($s1) -/* A6F1AC 80240DCC E620003C */ swc1 $f0, 0x3c($s1) -/* A6F1B0 80240DD0 AE40006C */ sw $zero, 0x6c($s2) -/* A6F1B4 80240DD4 AEC20070 */ sw $v0, 0x70($s6) -.L80240DD8_A6F1B8: -/* A6F1B8 80240DD8 8E50006C */ lw $s0, 0x6c($s2) -/* A6F1BC 80240DDC 24020001 */ addiu $v0, $zero, 1 -/* A6F1C0 80240DE0 160200EC */ bne $s0, $v0, .L80241194 -/* A6F1C4 80240DE4 24150002 */ addiu $s5, $zero, 2 -/* A6F1C8 80240DE8 AE55006C */ sw $s5, 0x6c($s2) -/* A6F1CC 80240DEC C6800038 */ lwc1 $f0, 0x38($s4) -/* A6F1D0 80240DF0 E6600038 */ swc1 $f0, 0x38($s3) -/* A6F1D4 80240DF4 C680003C */ lwc1 $f0, 0x3c($s4) -/* A6F1D8 80240DF8 E660003C */ swc1 $f0, 0x3c($s3) -/* A6F1DC 80240DFC C6800040 */ lwc1 $f0, 0x40($s4) -/* A6F1E0 80240E00 E6600040 */ swc1 $f0, 0x40($s3) -/* A6F1E4 80240E04 C6820034 */ lwc1 $f2, 0x34($s4) -/* A6F1E8 80240E08 3C014387 */ lui $at, 0x4387 -/* A6F1EC 80240E0C 44810000 */ mtc1 $at, $f0 -/* A6F1F0 80240E10 00000000 */ nop -/* A6F1F4 80240E14 46020001 */ sub.s $f0, $f0, $f2 -/* A6F1F8 80240E18 C6480074 */ lwc1 $f8, 0x74($s2) -/* A6F1FC 80240E1C 46804220 */ cvt.s.w $f8, $f8 -/* A6F200 80240E20 44054000 */ mfc1 $a1, $f8 -/* A6F204 80240E24 44060000 */ mfc1 $a2, $f0 -/* A6F208 80240E28 0C00EA95 */ jal npc_move_heading -/* A6F20C 80240E2C 0260202D */ daddu $a0, $s3, $zero -/* A6F210 80240E30 C6600038 */ lwc1 $f0, 0x38($s3) -/* A6F214 80240E34 E6200038 */ swc1 $f0, 0x38($s1) -/* A6F218 80240E38 C680003C */ lwc1 $f0, 0x3c($s4) -/* A6F21C 80240E3C C6420070 */ lwc1 $f2, 0x70($s2) -/* A6F220 80240E40 468010A0 */ cvt.s.w $f2, $f2 -/* A6F224 80240E44 46020000 */ add.s $f0, $f0, $f2 -/* A6F228 80240E48 3C014024 */ lui $at, 0x4024 -/* A6F22C 80240E4C 4481A800 */ mtc1 $at, $f21 -/* A6F230 80240E50 4480A000 */ mtc1 $zero, $f20 -/* A6F234 80240E54 E620003C */ swc1 $f0, 0x3c($s1) -/* A6F238 80240E58 C6600040 */ lwc1 $f0, 0x40($s3) -/* A6F23C 80240E5C E6200040 */ swc1 $f0, 0x40($s1) -/* A6F240 80240E60 A2500007 */ sb $s0, 7($s2) -/* A6F244 80240E64 C6200038 */ lwc1 $f0, 0x38($s1) -/* A6F248 80240E68 3C014066 */ lui $at, 0x4066 -/* A6F24C 80240E6C 34216666 */ ori $at, $at, 0x6666 -/* A6F250 80240E70 44811000 */ mtc1 $at, $f2 -/* A6F254 80240E74 4600020D */ trunc.w.s $f8, $f0 -/* A6F258 80240E78 44024000 */ mfc1 $v0, $f8 -/* A6F25C 80240E7C 00000000 */ nop -/* A6F260 80240E80 A6420010 */ sh $v0, 0x10($s2) -/* A6F264 80240E84 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F268 80240E88 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A6F26C 80240E8C 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A6F270 80240E90 4600020D */ trunc.w.s $f8, $f0 -/* A6F274 80240E94 44024000 */ mfc1 $v0, $f8 -/* A6F278 80240E98 00000000 */ nop -/* A6F27C 80240E9C A6420012 */ sh $v0, 0x12($s2) -/* A6F280 80240EA0 C6200040 */ lwc1 $f0, 0x40($s1) -/* A6F284 80240EA4 8E630000 */ lw $v1, ($s3) -/* A6F288 80240EA8 4600020D */ trunc.w.s $f8, $f0 -/* A6F28C 80240EAC 44024000 */ mfc1 $v0, $f8 -/* A6F290 80240EB0 00000000 */ nop -/* A6F294 80240EB4 A6420014 */ sh $v0, 0x14($s2) -/* A6F298 80240EB8 E6220018 */ swc1 $f2, 0x18($s1) -/* A6F29C 80240EBC C460002C */ lwc1 $f0, 0x2c($v1) -/* A6F2A0 80240EC0 C6220038 */ lwc1 $f2, 0x38($s1) -/* A6F2A4 80240EC4 46000021 */ cvt.d.s $f0, $f0 -/* A6F2A8 80240EC8 46340000 */ add.d $f0, $f0, $f20 -/* A6F2AC 80240ECC C4640028 */ lwc1 $f4, 0x28($v1) -/* A6F2B0 80240ED0 44806000 */ mtc1 $zero, $f12 -/* A6F2B4 80240ED4 46041081 */ sub.s $f2, $f2, $f4 -/* A6F2B8 80240ED8 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A6F2BC 80240EDC 46200020 */ cvt.s.d $f0, $f0 -/* A6F2C0 80240EE0 46001085 */ abs.s $f2, $f2 -/* A6F2C4 80240EE4 44070000 */ mfc1 $a3, $f0 -/* A6F2C8 80240EE8 44061000 */ mfc1 $a2, $f2 -/* A6F2CC 80240EEC 0C00A720 */ jal atan2 -/* A6F2D0 80240EF0 00000000 */ nop -/* A6F2D4 80240EF4 3C018024 */ lui $at, %hi(D_80243D68_A72148) -/* A6F2D8 80240EF8 D4223D68 */ ldc1 $f2, %lo(D_80243D68_A72148)($at) -/* A6F2DC 80240EFC 46000021 */ cvt.d.s $f0, $f0 -/* A6F2E0 80240F00 46220001 */ sub.d $f0, $f0, $f2 -/* A6F2E4 80240F04 46200020 */ cvt.s.d $f0, $f0 -/* A6F2E8 80240F08 4600020D */ trunc.w.s $f8, $f0 -/* A6F2EC 80240F0C 44044000 */ mfc1 $a0, $f8 -/* A6F2F0 80240F10 00000000 */ nop -/* A6F2F4 80240F14 00042400 */ sll $a0, $a0, 0x10 -/* A6F2F8 80240F18 0C00A4F5 */ jal cosine -/* A6F2FC 80240F1C 00042403 */ sra $a0, $a0, 0x10 -/* A6F300 80240F20 C6220018 */ lwc1 $f2, 0x18($s1) -/* A6F304 80240F24 46020002 */ mul.s $f0, $f0, $f2 -/* A6F308 80240F28 00000000 */ nop -/* A6F30C 80240F2C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6F310 80240F30 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A6F314 80240F34 8E620000 */ lw $v0, ($s3) -/* A6F318 80240F38 E620001C */ swc1 $f0, 0x1c($s1) -/* A6F31C 80240F3C 8C460028 */ lw $a2, 0x28($v0) -/* A6F320 80240F40 0C00A720 */ jal atan2 -/* A6F324 80240F44 8C470030 */ lw $a3, 0x30($v0) -/* A6F328 80240F48 8E620000 */ lw $v0, ($s3) -/* A6F32C 80240F4C E620000C */ swc1 $f0, 0xc($s1) -/* A6F330 80240F50 C440002C */ lwc1 $f0, 0x2c($v0) -/* A6F334 80240F54 46000021 */ cvt.d.s $f0, $f0 -/* A6F338 80240F58 46340000 */ add.d $f0, $f0, $f20 -/* A6F33C 80240F5C 46200020 */ cvt.s.d $f0, $f0 -/* A6F340 80240F60 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F344 80240F64 C4400030 */ lwc1 $f0, 0x30($v0) -/* A6F348 80240F68 E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F34C 80240F6C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A6F350 80240F70 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A6F354 80240F74 8E260040 */ lw $a2, 0x40($s1) -/* A6F358 80240F78 0C00A7CB */ jal dist3D -/* A6F35C 80240F7C 8C470028 */ lw $a3, 0x28($v0) -/* A6F360 80240F80 C6220018 */ lwc1 $f2, 0x18($s1) -/* A6F364 80240F84 46020003 */ div.s $f0, $f0, $f2 -/* A6F368 80240F88 4600020D */ trunc.w.s $f8, $f0 -/* A6F36C 80240F8C 44104000 */ mfc1 $s0, $f8 -/* A6F370 80240F90 00000000 */ nop -/* A6F374 80240F94 5A000001 */ blezl $s0, .L80240F9C -/* A6F378 80240F98 24100001 */ addiu $s0, $zero, 1 -.L80240F9C: -/* A6F37C 80240F9C 8E620000 */ lw $v0, ($s3) -/* A6F380 80240FA0 C624003C */ lwc1 $f4, 0x3c($s1) -/* A6F384 80240FA4 3C014120 */ lui $at, 0x4120 -/* A6F388 80240FA8 44811000 */ mtc1 $at, $f2 -/* A6F38C 80240FAC C4400028 */ lwc1 $f0, 0x28($v0) -/* A6F390 80240FB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F394 80240FB4 C440002C */ lwc1 $f0, 0x2c($v0) -/* A6F398 80240FB8 46020000 */ add.s $f0, $f0, $f2 -/* A6F39C 80240FBC 3C014160 */ lui $at, 0x4160 -/* A6F3A0 80240FC0 44811000 */ mtc1 $at, $f2 -/* A6F3A4 80240FC4 00000000 */ nop -/* A6F3A8 80240FC8 46022100 */ add.s $f4, $f4, $f2 -/* A6F3AC 80240FCC 46020000 */ add.s $f0, $f0, $f2 -/* A6F3B0 80240FD0 44062000 */ mfc1 $a2, $f4 -/* A6F3B4 80240FD4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F3B8 80240FD8 C4400030 */ lwc1 $f0, 0x30($v0) -/* A6F3BC 80240FDC AFB0001C */ sw $s0, 0x1c($sp) -/* A6F3C0 80240FE0 E7A00018 */ swc1 $f0, 0x18($sp) -/* A6F3C4 80240FE4 8E250038 */ lw $a1, 0x38($s1) -/* A6F3C8 80240FE8 8E270040 */ lw $a3, 0x40($s1) -/* A6F3CC 80240FEC 0C01BFD4 */ jal fx_shape_spell -/* A6F3D0 80240FF0 0000202D */ daddu $a0, $zero, $zero -/* A6F3D4 80240FF4 AE420078 */ sw $v0, 0x78($s2) -/* A6F3D8 80240FF8 A630008E */ sh $s0, 0x8e($s1) -/* A6F3DC 80240FFC 08090465 */ j .L80241194 -/* A6F3E0 80241000 AED50070 */ sw $s5, 0x70($s6) -.L80241004_A6F3E4: -/* A6F3E4 80241004 9622008E */ lhu $v0, 0x8e($s1) -/* A6F3E8 80241008 2442FFFF */ addiu $v0, $v0, -1 -/* A6F3EC 8024100C A622008E */ sh $v0, 0x8e($s1) -/* A6F3F0 80241010 00021400 */ sll $v0, $v0, 0x10 -/* A6F3F4 80241014 58400001 */ blezl $v0, .L8024101C -/* A6F3F8 80241018 24150014 */ addiu $s5, $zero, 0x14 -.L8024101C: -/* A6F3FC 8024101C 16A0000A */ bnez $s5, .L80241048_A6F428 -/* A6F400 80241020 00000000 */ nop -/* A6F404 80241024 8E250018 */ lw $a1, 0x18($s1) -/* A6F408 80241028 8E26000C */ lw $a2, 0xc($s1) -/* A6F40C 8024102C 0C00EA95 */ jal npc_move_heading -/* A6F410 80241030 0220202D */ daddu $a0, $s1, $zero -/* A6F414 80241034 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F418 80241038 C622001C */ lwc1 $f2, 0x1c($s1) -/* A6F41C 8024103C 46020000 */ add.s $f0, $f0, $f2 -/* A6F420 80241040 08090465 */ j .L80241194 -/* A6F424 80241044 E620003C */ swc1 $f0, 0x3c($s1) -.L80241048_A6F428: -/* A6F428 80241048 862200A8 */ lh $v0, 0xa8($s1) -/* A6F42C 8024104C 3C013FE0 */ lui $at, 0x3fe0 -/* A6F430 80241050 44810800 */ mtc1 $at, $f1 -/* A6F434 80241054 44800000 */ mtc1 $zero, $f0 -/* A6F438 80241058 44821000 */ mtc1 $v0, $f2 -/* A6F43C 8024105C 00000000 */ nop -/* A6F440 80241060 468010A1 */ cvt.d.w $f2, $f2 -/* A6F444 80241064 46201082 */ mul.d $f2, $f2, $f0 -/* A6F448 80241068 00000000 */ nop -/* A6F44C 8024106C C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F450 80241070 AE20001C */ sw $zero, 0x1c($s1) -/* A6F454 80241074 46000021 */ cvt.d.s $f0, $f0 -/* A6F458 80241078 46220001 */ sub.d $f0, $f0, $f2 -/* A6F45C 8024107C AE200018 */ sw $zero, 0x18($s1) -/* A6F460 80241080 24020003 */ addiu $v0, $zero, 3 -/* A6F464 80241084 46200020 */ cvt.s.d $f0, $f0 -/* A6F468 80241088 E620003C */ swc1 $f0, 0x3c($s1) -/* A6F46C 8024108C AE42006C */ sw $v0, 0x6c($s2) -/* A6F470 80241090 24020004 */ addiu $v0, $zero, 4 -/* A6F474 80241094 A620008E */ sh $zero, 0x8e($s1) -/* A6F478 80241098 08090465 */ j .L80241194 -/* A6F47C 8024109C AEC20070 */ sw $v0, 0x70($s6) -.L802410A0_A6F480: -/* A6F480 802410A0 9622008E */ lhu $v0, 0x8e($s1) -/* A6F484 802410A4 24420001 */ addiu $v0, $v0, 1 -/* A6F488 802410A8 A622008E */ sh $v0, 0x8e($s1) -/* A6F48C 802410AC 00021400 */ sll $v0, $v0, 0x10 -/* A6F490 802410B0 00021C03 */ sra $v1, $v0, 0x10 -/* A6F494 802410B4 28620007 */ slti $v0, $v1, 7 -/* A6F498 802410B8 10400027 */ beqz $v0, .L80241158 -/* A6F49C 802410BC 24020007 */ addiu $v0, $zero, 7 -/* A6F4A0 802410C0 8622008E */ lh $v0, 0x8e($s1) -/* A6F4A4 802410C4 3C01401C */ lui $at, 0x401c -/* A6F4A8 802410C8 44810800 */ mtc1 $at, $f1 -/* A6F4AC 802410CC 44800000 */ mtc1 $zero, $f0 -/* A6F4B0 802410D0 44822000 */ mtc1 $v0, $f4 -/* A6F4B4 802410D4 00000000 */ nop -/* A6F4B8 802410D8 46802120 */ cvt.s.w $f4, $f4 -/* A6F4BC 802410DC 46002121 */ cvt.d.s $f4, $f4 -/* A6F4C0 802410E0 46202102 */ mul.d $f4, $f4, $f0 -/* A6F4C4 802410E4 00000000 */ nop -/* A6F4C8 802410E8 44821000 */ mtc1 $v0, $f2 -/* A6F4CC 802410EC 00000000 */ nop -/* A6F4D0 802410F0 468010A0 */ cvt.s.w $f2, $f2 -/* A6F4D4 802410F4 460010A1 */ cvt.d.s $f2, $f2 -/* A6F4D8 802410F8 46201082 */ mul.d $f2, $f2, $f0 -/* A6F4DC 802410FC 00000000 */ nop -/* A6F4E0 80241100 C620003C */ lwc1 $f0, 0x3c($s1) -/* A6F4E4 80241104 3C01400C */ lui $at, 0x400c -/* A6F4E8 80241108 44813800 */ mtc1 $at, $f7 -/* A6F4EC 8024110C 44803000 */ mtc1 $zero, $f6 -/* A6F4F0 80241110 46000021 */ cvt.d.s $f0, $f0 -/* A6F4F4 80241114 46260001 */ sub.d $f0, $f0, $f6 -/* A6F4F8 80241118 3C014034 */ lui $at, 0x4034 -/* A6F4FC 8024111C 44813800 */ mtc1 $at, $f7 -/* A6F500 80241120 44803000 */ mtc1 $zero, $f6 -/* A6F504 80241124 00000000 */ nop -/* A6F508 80241128 46262100 */ add.d $f4, $f4, $f6 -/* A6F50C 8024112C 46200020 */ cvt.s.d $f0, $f0 -/* A6F510 80241130 E620003C */ swc1 $f0, 0x3c($s1) -/* A6F514 80241134 46261080 */ add.d $f2, $f2, $f6 -/* A6F518 80241138 4620220D */ trunc.w.d $f8, $f4 -/* A6F51C 8024113C 44024000 */ mfc1 $v0, $f8 -/* A6F520 80241140 00000000 */ nop -/* A6F524 80241144 A62200A6 */ sh $v0, 0xa6($s1) -/* A6F528 80241148 4620120D */ trunc.w.d $f8, $f2 -/* A6F52C 8024114C 44024000 */ mfc1 $v0, $f8 -/* A6F530 80241150 08090465 */ j .L80241194 -/* A6F534 80241154 A62200A8 */ sh $v0, 0xa8($s1) -.L80241158: -/* A6F538 80241158 1462000A */ bne $v1, $v0, .L80241184 -/* A6F53C 8024115C 28620010 */ slti $v0, $v1, 0x10 -/* A6F540 80241160 3C01C47A */ lui $at, 0xc47a -/* A6F544 80241164 44810000 */ mtc1 $at, $f0 -/* A6F548 80241168 24020014 */ addiu $v0, $zero, 0x14 -/* A6F54C 8024116C AE200038 */ sw $zero, 0x38($s1) -/* A6F550 80241170 AE200040 */ sw $zero, 0x40($s1) -/* A6F554 80241174 A62200A6 */ sh $v0, 0xa6($s1) -/* A6F558 80241178 A62200A8 */ sh $v0, 0xa8($s1) -/* A6F55C 8024117C 08090465 */ j .L80241194 -/* A6F560 80241180 E620003C */ swc1 $f0, 0x3c($s1) -.L80241184: -/* A6F564 80241184 14400003 */ bnez $v0, .L80241194 -/* A6F568 80241188 00000000 */ nop -/* A6F56C 8024118C AE40006C */ sw $zero, 0x6c($s2) -/* A6F570 80241190 AEC00070 */ sw $zero, 0x70($s6) -.L80241194: -/* A6F574 80241194 8FBF037C */ lw $ra, 0x37c($sp) -/* A6F578 80241198 8FB60378 */ lw $s6, 0x378($sp) -/* A6F57C 8024119C 8FB50374 */ lw $s5, 0x374($sp) -/* A6F580 802411A0 8FB40370 */ lw $s4, 0x370($sp) -/* A6F584 802411A4 8FB3036C */ lw $s3, 0x36c($sp) -/* A6F588 802411A8 8FB20368 */ lw $s2, 0x368($sp) -/* A6F58C 802411AC 8FB10364 */ lw $s1, 0x364($sp) -/* A6F590 802411B0 8FB00360 */ lw $s0, 0x360($sp) -/* A6F594 802411B4 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A6F598 802411B8 0000102D */ daddu $v0, $zero, $zero -/* A6F59C 802411BC 03E00008 */ jr $ra -/* A6F5A0 802411C0 27BD0388 */ addiu $sp, $sp, 0x388 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 index 67f55c1791..1bc4960aa5 100644 --- 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 @@ -49,7 +49,7 @@ glabel func_80241200_A6F5E0 /* 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 func_80240AE4_A6EEC4 +/* 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 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 index e806d6193d..3168c44312 100644 --- 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 @@ -58,7 +58,7 @@ glabel func_80241AF0_A6FED0 .L80241BC4: /* A6FFA4 80241BC4 8E450024 */ lw $a1, 0x24($s2) /* A6FFA8 80241BC8 8E460028 */ lw $a2, 0x28($s2) -/* A6FFAC 80241BCC 0C0902B9 */ jal func_80240AE4_A6EEC4 +/* 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 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 index e41fb75328..e01e8fb75d 100644 --- 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 @@ -25,7 +25,7 @@ glabel func_80241D28_A70108 /* 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 func_80240AE4_A6EEC4 +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s deleted file mode 100644 index a1d86645f0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ /dev/null @@ -1,221 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245BD8_A8C628 -.word .L80241430_A87E80, .L80241448_A87E98, .L80241460_A87EB0, .L80241470_A87EC0, .L80241488_A87ED8, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L802414A0_A87EF0, .L802414B0_A87F00, .L802414C8_A87F18, .L802414E0_A87F30, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L80241500_A87F50, .L802414F8_A87F48, 0, 0 - -.section .text - -glabel func_80241224_A87C74 -/* A87C74 80241224 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A87C78 80241228 AFB3005C */ sw $s3, 0x5c($sp) -/* A87C7C 8024122C 0080982D */ daddu $s3, $a0, $zero -/* A87C80 80241230 AFBF0068 */ sw $ra, 0x68($sp) -/* A87C84 80241234 AFB50064 */ sw $s5, 0x64($sp) -/* A87C88 80241238 AFB40060 */ sw $s4, 0x60($sp) -/* A87C8C 8024123C AFB20058 */ sw $s2, 0x58($sp) -/* A87C90 80241240 AFB10054 */ sw $s1, 0x54($sp) -/* A87C94 80241244 AFB00050 */ sw $s0, 0x50($sp) -/* A87C98 80241248 8E710148 */ lw $s1, 0x148($s3) -/* A87C9C 8024124C 86240008 */ lh $a0, 8($s1) -/* A87CA0 80241250 0C00EABB */ jal get_npc_unsafe -/* A87CA4 80241254 00A0802D */ daddu $s0, $a1, $zero -/* A87CA8 80241258 8E63000C */ lw $v1, 0xc($s3) -/* A87CAC 8024125C 0260202D */ daddu $a0, $s3, $zero -/* A87CB0 80241260 8C650000 */ lw $a1, ($v1) -/* A87CB4 80241264 0C0B1EAF */ jal evt_get_variable -/* A87CB8 80241268 0040902D */ daddu $s2, $v0, $zero -/* A87CBC 8024126C AFA00028 */ sw $zero, 0x28($sp) -/* A87CC0 80241270 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CC4 80241274 8C630094 */ lw $v1, 0x94($v1) -/* A87CC8 80241278 AFA3002C */ sw $v1, 0x2c($sp) -/* A87CCC 8024127C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CD0 80241280 8C630080 */ lw $v1, 0x80($v1) -/* A87CD4 80241284 AFA30030 */ sw $v1, 0x30($sp) -/* A87CD8 80241288 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CDC 8024128C 8C630088 */ lw $v1, 0x88($v1) -/* A87CE0 80241290 AFA30034 */ sw $v1, 0x34($sp) -/* A87CE4 80241294 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CE8 80241298 8C63008C */ lw $v1, 0x8c($v1) -/* A87CEC 8024129C 27B50028 */ addiu $s5, $sp, 0x28 -/* A87CF0 802412A0 AFA30038 */ sw $v1, 0x38($sp) -/* A87CF4 802412A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87CF8 802412A8 3C0142C8 */ lui $at, 0x42c8 -/* A87CFC 802412AC 44810000 */ mtc1 $at, $f0 -/* A87D00 802412B0 8C630090 */ lw $v1, 0x90($v1) -/* A87D04 802412B4 0040A02D */ daddu $s4, $v0, $zero -/* A87D08 802412B8 E7A00040 */ swc1 $f0, 0x40($sp) -/* A87D0C 802412BC A7A00044 */ sh $zero, 0x44($sp) -/* A87D10 802412C0 12000007 */ beqz $s0, .L802412E0 -/* A87D14 802412C4 AFA3003C */ sw $v1, 0x3c($sp) -/* A87D18 802412C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87D1C 802412CC 864300A8 */ lh $v1, 0xa8($s2) -/* A87D20 802412D0 34420008 */ ori $v0, $v0, 8 -/* A87D24 802412D4 AE230084 */ sw $v1, 0x84($s1) -/* A87D28 802412D8 080904BC */ j .L802412F0 -/* A87D2C 802412DC AE2200B0 */ sw $v0, 0xb0($s1) -.L802412E0: -/* A87D30 802412E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87D34 802412E4 30420004 */ andi $v0, $v0, 4 -/* A87D38 802412E8 10400048 */ beqz $v0, .L8024140C -/* A87D3C 802412EC 00000000 */ nop -.L802412F0: -/* A87D40 802412F0 A640008E */ sh $zero, 0x8e($s2) -/* A87D44 802412F4 AE600070 */ sw $zero, 0x70($s3) -/* A87D48 802412F8 8E2300CC */ lw $v1, 0xcc($s1) -/* A87D4C 802412FC 2404F7FF */ addiu $a0, $zero, -0x801 -/* A87D50 80241300 A2200007 */ sb $zero, 7($s1) -/* A87D54 80241304 8E420000 */ lw $v0, ($s2) -/* A87D58 80241308 8C630000 */ lw $v1, ($v1) -/* A87D5C 8024130C 00441024 */ and $v0, $v0, $a0 -/* A87D60 80241310 AE420000 */ sw $v0, ($s2) -/* A87D64 80241314 AE430028 */ sw $v1, 0x28($s2) -/* A87D68 80241318 96220086 */ lhu $v0, 0x86($s1) -/* A87D6C 8024131C A64200A8 */ sh $v0, 0xa8($s2) -/* A87D70 80241320 8E2200D0 */ lw $v0, 0xd0($s1) -/* A87D74 80241324 A22000B5 */ sb $zero, 0xb5($s1) -/* A87D78 80241328 AE20008C */ sw $zero, 0x8c($s1) -/* A87D7C 8024132C 8C420098 */ lw $v0, 0x98($v0) -/* A87D80 80241330 14400006 */ bnez $v0, .L8024134C -/* A87D84 80241334 2403FDFF */ addiu $v1, $zero, -0x201 -/* A87D88 80241338 8E420000 */ lw $v0, ($s2) -/* A87D8C 8024133C 2403FFF7 */ addiu $v1, $zero, -9 -/* A87D90 80241340 34420200 */ ori $v0, $v0, 0x200 -/* A87D94 80241344 080904D6 */ j .L80241358 -/* A87D98 80241348 00431024 */ and $v0, $v0, $v1 -.L8024134C: -/* A87D9C 8024134C 8E420000 */ lw $v0, ($s2) -/* A87DA0 80241350 00431024 */ and $v0, $v0, $v1 -/* A87DA4 80241354 34420008 */ ori $v0, $v0, 8 -.L80241358: -/* A87DA8 80241358 AE420000 */ sw $v0, ($s2) -/* A87DAC 8024135C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87DB0 80241360 30420004 */ andi $v0, $v0, 4 -/* A87DB4 80241364 1040001E */ beqz $v0, .L802413E0 -/* A87DB8 80241368 24040002 */ addiu $a0, $zero, 2 -/* A87DBC 8024136C 0240282D */ daddu $a1, $s2, $zero -/* A87DC0 80241370 0000302D */ daddu $a2, $zero, $zero -/* A87DC4 80241374 24020063 */ addiu $v0, $zero, 0x63 -/* A87DC8 80241378 AE620070 */ sw $v0, 0x70($s3) -/* A87DCC 8024137C AE600074 */ sw $zero, 0x74($s3) -/* A87DD0 80241380 864300A8 */ lh $v1, 0xa8($s2) -/* A87DD4 80241384 3C013F80 */ lui $at, 0x3f80 -/* A87DD8 80241388 44810000 */ mtc1 $at, $f0 -/* A87DDC 8024138C 3C014000 */ lui $at, 0x4000 -/* A87DE0 80241390 44811000 */ mtc1 $at, $f2 -/* A87DE4 80241394 3C01C1A0 */ lui $at, 0xc1a0 -/* A87DE8 80241398 44812000 */ mtc1 $at, $f4 -/* A87DEC 8024139C 24020028 */ addiu $v0, $zero, 0x28 -/* A87DF0 802413A0 AFA2001C */ sw $v0, 0x1c($sp) -/* A87DF4 802413A4 44833000 */ mtc1 $v1, $f6 -/* A87DF8 802413A8 00000000 */ nop -/* A87DFC 802413AC 468031A0 */ cvt.s.w $f6, $f6 -/* A87E00 802413B0 44073000 */ mfc1 $a3, $f6 -/* A87E04 802413B4 27A20048 */ addiu $v0, $sp, 0x48 -/* A87E08 802413B8 AFA20020 */ sw $v0, 0x20($sp) -/* A87E0C 802413BC E7A00010 */ swc1 $f0, 0x10($sp) -/* A87E10 802413C0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A87E14 802413C4 0C01BFA4 */ jal fx_emote -/* A87E18 802413C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A87E1C 802413CC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87E20 802413D0 2403FFFB */ addiu $v1, $zero, -5 -/* A87E24 802413D4 00431024 */ and $v0, $v0, $v1 -/* A87E28 802413D8 08090503 */ j .L8024140C -/* A87E2C 802413DC AE2200B0 */ sw $v0, 0xb0($s1) -.L802413E0: -/* A87E30 802413E0 8E220000 */ lw $v0, ($s1) -/* A87E34 802413E4 3C034000 */ lui $v1, 0x4000 -/* A87E38 802413E8 00431024 */ and $v0, $v0, $v1 -/* A87E3C 802413EC 10400007 */ beqz $v0, .L8024140C -/* A87E40 802413F0 3C03BFFF */ lui $v1, 0xbfff -/* A87E44 802413F4 2402000C */ addiu $v0, $zero, 0xc -/* A87E48 802413F8 AE620070 */ sw $v0, 0x70($s3) -/* A87E4C 802413FC 8E220000 */ lw $v0, ($s1) -/* A87E50 80241400 3463FFFF */ ori $v1, $v1, 0xffff -/* A87E54 80241404 00431024 */ and $v0, $v0, $v1 -/* A87E58 80241408 AE220000 */ sw $v0, ($s1) -.L8024140C: -/* A87E5C 8024140C 8E630070 */ lw $v1, 0x70($s3) -/* A87E60 80241410 2C620064 */ sltiu $v0, $v1, 0x64 -/* A87E64 80241414 1040003A */ beqz $v0, .L80241500_A87F50 -/* A87E68 80241418 00031080 */ sll $v0, $v1, 2 -/* A87E6C 8024141C 3C018024 */ lui $at, %hi(jtbl_80245BD8_A8C628) -/* A87E70 80241420 00220821 */ addu $at, $at, $v0 -/* A87E74 80241424 8C225BD8 */ lw $v0, %lo(jtbl_80245BD8_A8C628)($at) -/* A87E78 80241428 00400008 */ jr $v0 -/* A87E7C 8024142C 00000000 */ nop -.L80241430_A87E80: -/* A87E80 80241430 0260202D */ daddu $a0, $s3, $zero -/* A87E84 80241434 0280282D */ daddu $a1, $s4, $zero -/* A87E88 80241438 0C090000 */ jal kpa_91_UnkNpcAIFunc24 -/* A87E8C 8024143C 02A0302D */ daddu $a2, $s5, $zero -/* A87E90 80241440 96220086 */ lhu $v0, 0x86($s1) -/* A87E94 80241444 A64200A8 */ sh $v0, 0xa8($s2) -.L80241448_A87E98: -/* A87E98 80241448 0260202D */ daddu $a0, $s3, $zero -/* A87E9C 8024144C 0280282D */ daddu $a1, $s4, $zero -/* A87EA0 80241450 0C090056 */ jal kpa_91_UnkFunc13 -/* A87EA4 80241454 02A0302D */ daddu $a2, $s5, $zero -/* A87EA8 80241458 08090540 */ j .L80241500_A87F50 -/* A87EAC 8024145C 00000000 */ nop -.L80241460_A87EB0: -/* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero -/* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero -/* A87EB8 80241468 0C090100 */ jal kpa_91_UnkNpcAIFunc1 -/* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero -.L80241470_A87EC0: -/* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero -/* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero -/* A87EC8 80241478 0C090130 */ jal kpa_91_UnkFunc14 -/* A87ECC 8024147C 02A0302D */ daddu $a2, $s5, $zero -/* A87ED0 80241480 08090540 */ j .L80241500_A87F50 -/* A87ED4 80241484 00000000 */ nop -.L80241488_A87ED8: -/* A87ED8 80241488 0260202D */ daddu $a0, $s3, $zero -/* A87EDC 8024148C 0280282D */ daddu $a1, $s4, $zero -/* A87EE0 80241490 0C09019F */ jal kpa_91_UnkNpcAIFunc25 -/* A87EE4 80241494 02A0302D */ daddu $a2, $s5, $zero -/* A87EE8 80241498 08090540 */ j .L80241500_A87F50 -/* A87EEC 8024149C 00000000 */ nop -.L802414A0_A87EF0: -/* A87EF0 802414A0 0260202D */ daddu $a0, $s3, $zero -/* A87EF4 802414A4 0280282D */ daddu $a1, $s4, $zero -/* A87EF8 802414A8 0C0903A4 */ jal kpa_91_set_script_owner_npc_anim -/* A87EFC 802414AC 02A0302D */ daddu $a2, $s5, $zero -.L802414B0_A87F00: -/* A87F00 802414B0 0260202D */ daddu $a0, $s3, $zero -/* A87F04 802414B4 0280282D */ daddu $a1, $s4, $zero -/* A87F08 802414B8 0C0903C3 */ jal kpa_91_UnkDistFunc -/* A87F0C 802414BC 02A0302D */ daddu $a2, $s5, $zero -/* A87F10 802414C0 08090540 */ j .L80241500_A87F50 -/* A87F14 802414C4 00000000 */ nop -.L802414C8_A87F18: -/* A87F18 802414C8 0260202D */ daddu $a0, $s3, $zero -/* A87F1C 802414CC 0280282D */ daddu $a1, $s4, $zero -/* A87F20 802414D0 0C090410 */ jal kpa_91_UnkNpcAIFunc12 -/* A87F24 802414D4 02A0302D */ daddu $a2, $s5, $zero -/* A87F28 802414D8 08090540 */ j .L80241500_A87F50 -/* A87F2C 802414DC 00000000 */ nop -.L802414E0_A87F30: -/* A87F30 802414E0 0260202D */ daddu $a0, $s3, $zero -/* A87F34 802414E4 0280282D */ daddu $a1, $s4, $zero -/* A87F38 802414E8 0C090469 */ jal kpa_91_set_script_owner_npc_col_height -/* A87F3C 802414EC 02A0302D */ daddu $a2, $s5, $zero -/* A87F40 802414F0 08090540 */ j .L80241500_A87F50 -/* A87F44 802414F4 00000000 */ nop -.L802414F8_A87F48: -/* A87F48 802414F8 0C0129CF */ jal func_8004A73C -/* A87F4C 802414FC 0260202D */ daddu $a0, $s3, $zero -.L80241500_A87F50: -/* A87F50 80241500 8FBF0068 */ lw $ra, 0x68($sp) -/* A87F54 80241504 8FB50064 */ lw $s5, 0x64($sp) -/* A87F58 80241508 8FB40060 */ lw $s4, 0x60($sp) -/* A87F5C 8024150C 8FB3005C */ lw $s3, 0x5c($sp) -/* A87F60 80241510 8FB20058 */ lw $s2, 0x58($sp) -/* A87F64 80241514 8FB10054 */ lw $s1, 0x54($sp) -/* A87F68 80241518 8FB00050 */ lw $s0, 0x50($sp) -/* A87F6C 8024151C 0000102D */ daddu $v0, $zero, $zero -/* A87F70 80241520 03E00008 */ jr $ra -/* A87F74 80241524 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s deleted file mode 100644 index e9a47bef43..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ /dev/null @@ -1,221 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245BA8_A92628 -.word .L80241510_A8DF90, .L80241528_A8DFA8, .L80241540_A8DFC0, .L80241550_A8DFD0, .L80241568_A8DFE8, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L80241580_A8E000, .L80241590_A8E010, .L802415A8_A8E028, .L802415C0_A8E040, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415E0_A8E060, .L802415D8_A8E058, 0, 0 - -.section .text - -glabel func_80241304_A8DD84 -/* A8DD84 80241304 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A8DD88 80241308 AFB3005C */ sw $s3, 0x5c($sp) -/* A8DD8C 8024130C 0080982D */ daddu $s3, $a0, $zero -/* A8DD90 80241310 AFBF0068 */ sw $ra, 0x68($sp) -/* A8DD94 80241314 AFB50064 */ sw $s5, 0x64($sp) -/* A8DD98 80241318 AFB40060 */ sw $s4, 0x60($sp) -/* A8DD9C 8024131C AFB20058 */ sw $s2, 0x58($sp) -/* A8DDA0 80241320 AFB10054 */ sw $s1, 0x54($sp) -/* A8DDA4 80241324 AFB00050 */ sw $s0, 0x50($sp) -/* A8DDA8 80241328 8E710148 */ lw $s1, 0x148($s3) -/* A8DDAC 8024132C 86240008 */ lh $a0, 8($s1) -/* A8DDB0 80241330 0C00EABB */ jal get_npc_unsafe -/* A8DDB4 80241334 00A0802D */ daddu $s0, $a1, $zero -/* A8DDB8 80241338 8E63000C */ lw $v1, 0xc($s3) -/* A8DDBC 8024133C 0260202D */ daddu $a0, $s3, $zero -/* A8DDC0 80241340 8C650000 */ lw $a1, ($v1) -/* A8DDC4 80241344 0C0B1EAF */ jal evt_get_variable -/* A8DDC8 80241348 0040902D */ daddu $s2, $v0, $zero -/* A8DDCC 8024134C AFA00028 */ sw $zero, 0x28($sp) -/* A8DDD0 80241350 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDD4 80241354 8C630094 */ lw $v1, 0x94($v1) -/* A8DDD8 80241358 AFA3002C */ sw $v1, 0x2c($sp) -/* A8DDDC 8024135C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDE0 80241360 8C630080 */ lw $v1, 0x80($v1) -/* A8DDE4 80241364 AFA30030 */ sw $v1, 0x30($sp) -/* A8DDE8 80241368 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDEC 8024136C 8C630088 */ lw $v1, 0x88($v1) -/* A8DDF0 80241370 AFA30034 */ sw $v1, 0x34($sp) -/* A8DDF4 80241374 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDF8 80241378 8C63008C */ lw $v1, 0x8c($v1) -/* A8DDFC 8024137C 27B50028 */ addiu $s5, $sp, 0x28 -/* A8DE00 80241380 AFA30038 */ sw $v1, 0x38($sp) -/* A8DE04 80241384 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DE08 80241388 3C0142C8 */ lui $at, 0x42c8 -/* A8DE0C 8024138C 44810000 */ mtc1 $at, $f0 -/* A8DE10 80241390 8C630090 */ lw $v1, 0x90($v1) -/* A8DE14 80241394 0040A02D */ daddu $s4, $v0, $zero -/* A8DE18 80241398 E7A00040 */ swc1 $f0, 0x40($sp) -/* A8DE1C 8024139C A7A00044 */ sh $zero, 0x44($sp) -/* A8DE20 802413A0 12000007 */ beqz $s0, .L802413C0 -/* A8DE24 802413A4 AFA3003C */ sw $v1, 0x3c($sp) -/* A8DE28 802413A8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DE2C 802413AC 864300A8 */ lh $v1, 0xa8($s2) -/* A8DE30 802413B0 34420008 */ ori $v0, $v0, 8 -/* A8DE34 802413B4 AE230084 */ sw $v1, 0x84($s1) -/* A8DE38 802413B8 080904F4 */ j .L802413D0 -/* A8DE3C 802413BC AE2200B0 */ sw $v0, 0xb0($s1) -.L802413C0: -/* A8DE40 802413C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DE44 802413C4 30420004 */ andi $v0, $v0, 4 -/* A8DE48 802413C8 10400048 */ beqz $v0, .L802414EC -/* A8DE4C 802413CC 00000000 */ nop -.L802413D0: -/* A8DE50 802413D0 A640008E */ sh $zero, 0x8e($s2) -/* A8DE54 802413D4 AE600070 */ sw $zero, 0x70($s3) -/* A8DE58 802413D8 8E2300CC */ lw $v1, 0xcc($s1) -/* A8DE5C 802413DC 2404F7FF */ addiu $a0, $zero, -0x801 -/* A8DE60 802413E0 A2200007 */ sb $zero, 7($s1) -/* A8DE64 802413E4 8E420000 */ lw $v0, ($s2) -/* A8DE68 802413E8 8C630000 */ lw $v1, ($v1) -/* A8DE6C 802413EC 00441024 */ and $v0, $v0, $a0 -/* A8DE70 802413F0 AE420000 */ sw $v0, ($s2) -/* A8DE74 802413F4 AE430028 */ sw $v1, 0x28($s2) -/* A8DE78 802413F8 96220086 */ lhu $v0, 0x86($s1) -/* A8DE7C 802413FC A64200A8 */ sh $v0, 0xa8($s2) -/* A8DE80 80241400 8E2200D0 */ lw $v0, 0xd0($s1) -/* A8DE84 80241404 A22000B5 */ sb $zero, 0xb5($s1) -/* A8DE88 80241408 AE20008C */ sw $zero, 0x8c($s1) -/* A8DE8C 8024140C 8C420098 */ lw $v0, 0x98($v0) -/* A8DE90 80241410 14400006 */ bnez $v0, .L8024142C -/* A8DE94 80241414 2403FDFF */ addiu $v1, $zero, -0x201 -/* A8DE98 80241418 8E420000 */ lw $v0, ($s2) -/* A8DE9C 8024141C 2403FFF7 */ addiu $v1, $zero, -9 -/* A8DEA0 80241420 34420200 */ ori $v0, $v0, 0x200 -/* A8DEA4 80241424 0809050E */ j .L80241438 -/* A8DEA8 80241428 00431024 */ and $v0, $v0, $v1 -.L8024142C: -/* A8DEAC 8024142C 8E420000 */ lw $v0, ($s2) -/* A8DEB0 80241430 00431024 */ and $v0, $v0, $v1 -/* A8DEB4 80241434 34420008 */ ori $v0, $v0, 8 -.L80241438: -/* A8DEB8 80241438 AE420000 */ sw $v0, ($s2) -/* A8DEBC 8024143C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DEC0 80241440 30420004 */ andi $v0, $v0, 4 -/* A8DEC4 80241444 1040001E */ beqz $v0, .L802414C0 -/* A8DEC8 80241448 24040002 */ addiu $a0, $zero, 2 -/* A8DECC 8024144C 0240282D */ daddu $a1, $s2, $zero -/* A8DED0 80241450 0000302D */ daddu $a2, $zero, $zero -/* A8DED4 80241454 24020063 */ addiu $v0, $zero, 0x63 -/* A8DED8 80241458 AE620070 */ sw $v0, 0x70($s3) -/* A8DEDC 8024145C AE600074 */ sw $zero, 0x74($s3) -/* A8DEE0 80241460 864300A8 */ lh $v1, 0xa8($s2) -/* A8DEE4 80241464 3C013F80 */ lui $at, 0x3f80 -/* A8DEE8 80241468 44810000 */ mtc1 $at, $f0 -/* A8DEEC 8024146C 3C014000 */ lui $at, 0x4000 -/* A8DEF0 80241470 44811000 */ mtc1 $at, $f2 -/* A8DEF4 80241474 3C01C1A0 */ lui $at, 0xc1a0 -/* A8DEF8 80241478 44812000 */ mtc1 $at, $f4 -/* A8DEFC 8024147C 24020028 */ addiu $v0, $zero, 0x28 -/* A8DF00 80241480 AFA2001C */ sw $v0, 0x1c($sp) -/* A8DF04 80241484 44833000 */ mtc1 $v1, $f6 -/* A8DF08 80241488 00000000 */ nop -/* A8DF0C 8024148C 468031A0 */ cvt.s.w $f6, $f6 -/* A8DF10 80241490 44073000 */ mfc1 $a3, $f6 -/* A8DF14 80241494 27A20048 */ addiu $v0, $sp, 0x48 -/* A8DF18 80241498 AFA20020 */ sw $v0, 0x20($sp) -/* A8DF1C 8024149C E7A00010 */ swc1 $f0, 0x10($sp) -/* A8DF20 802414A0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8DF24 802414A4 0C01BFA4 */ jal fx_emote -/* A8DF28 802414A8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8DF2C 802414AC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DF30 802414B0 2403FFFB */ addiu $v1, $zero, -5 -/* A8DF34 802414B4 00431024 */ and $v0, $v0, $v1 -/* A8DF38 802414B8 0809053B */ j .L802414EC -/* A8DF3C 802414BC AE2200B0 */ sw $v0, 0xb0($s1) -.L802414C0: -/* A8DF40 802414C0 8E220000 */ lw $v0, ($s1) -/* A8DF44 802414C4 3C034000 */ lui $v1, 0x4000 -/* A8DF48 802414C8 00431024 */ and $v0, $v0, $v1 -/* A8DF4C 802414CC 10400007 */ beqz $v0, .L802414EC -/* A8DF50 802414D0 3C03BFFF */ lui $v1, 0xbfff -/* A8DF54 802414D4 2402000C */ addiu $v0, $zero, 0xc -/* A8DF58 802414D8 AE620070 */ sw $v0, 0x70($s3) -/* A8DF5C 802414DC 8E220000 */ lw $v0, ($s1) -/* A8DF60 802414E0 3463FFFF */ ori $v1, $v1, 0xffff -/* A8DF64 802414E4 00431024 */ and $v0, $v0, $v1 -/* A8DF68 802414E8 AE220000 */ sw $v0, ($s1) -.L802414EC: -/* A8DF6C 802414EC 8E630070 */ lw $v1, 0x70($s3) -/* A8DF70 802414F0 2C620064 */ sltiu $v0, $v1, 0x64 -/* A8DF74 802414F4 1040003A */ beqz $v0, .L802415E0_A8E060 -/* A8DF78 802414F8 00031080 */ sll $v0, $v1, 2 -/* A8DF7C 802414FC 3C018024 */ lui $at, %hi(jtbl_80245BA8_A92628) -/* A8DF80 80241500 00220821 */ addu $at, $at, $v0 -/* A8DF84 80241504 8C225BA8 */ lw $v0, %lo(jtbl_80245BA8_A92628)($at) -/* A8DF88 80241508 00400008 */ jr $v0 -/* A8DF8C 8024150C 00000000 */ nop -.L80241510_A8DF90: -/* A8DF90 80241510 0260202D */ daddu $a0, $s3, $zero -/* A8DF94 80241514 0280282D */ daddu $a1, $s4, $zero -/* A8DF98 80241518 0C090038 */ jal kpa_95_UnkNpcAIFunc24 -/* A8DF9C 8024151C 02A0302D */ daddu $a2, $s5, $zero -/* A8DFA0 80241520 96220086 */ lhu $v0, 0x86($s1) -/* A8DFA4 80241524 A64200A8 */ sh $v0, 0xa8($s2) -.L80241528_A8DFA8: -/* A8DFA8 80241528 0260202D */ daddu $a0, $s3, $zero -/* A8DFAC 8024152C 0280282D */ daddu $a1, $s4, $zero -/* A8DFB0 80241530 0C09008E */ jal kpa_95_UnkFunc13 -/* A8DFB4 80241534 02A0302D */ daddu $a2, $s5, $zero -/* A8DFB8 80241538 08090578 */ j .L802415E0_A8E060 -/* A8DFBC 8024153C 00000000 */ nop -.L80241540_A8DFC0: -/* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero -/* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero -/* A8DFC8 80241548 0C090138 */ jal kpa_95_UnkNpcAIFunc1 -/* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero -.L80241550_A8DFD0: -/* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero -/* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero -/* A8DFD8 80241558 0C090168 */ jal kpa_95_UnkFunc14 -/* A8DFDC 8024155C 02A0302D */ daddu $a2, $s5, $zero -/* A8DFE0 80241560 08090578 */ j .L802415E0_A8E060 -/* A8DFE4 80241564 00000000 */ nop -.L80241568_A8DFE8: -/* A8DFE8 80241568 0260202D */ daddu $a0, $s3, $zero -/* A8DFEC 8024156C 0280282D */ daddu $a1, $s4, $zero -/* A8DFF0 80241570 0C0901D7 */ jal kpa_95_UnkNpcAIFunc25 -/* A8DFF4 80241574 02A0302D */ daddu $a2, $s5, $zero -/* A8DFF8 80241578 08090578 */ j .L802415E0_A8E060 -/* A8DFFC 8024157C 00000000 */ nop -.L80241580_A8E000: -/* A8E000 80241580 0260202D */ daddu $a0, $s3, $zero -/* A8E004 80241584 0280282D */ daddu $a1, $s4, $zero -/* A8E008 80241588 0C0903DC */ jal kpa_95_set_script_owner_npc_anim -/* A8E00C 8024158C 02A0302D */ daddu $a2, $s5, $zero -.L80241590_A8E010: -/* A8E010 80241590 0260202D */ daddu $a0, $s3, $zero -/* A8E014 80241594 0280282D */ daddu $a1, $s4, $zero -/* A8E018 80241598 0C0903FB */ jal kpa_95_UnkDistFunc -/* A8E01C 8024159C 02A0302D */ daddu $a2, $s5, $zero -/* A8E020 802415A0 08090578 */ j .L802415E0_A8E060 -/* A8E024 802415A4 00000000 */ nop -.L802415A8_A8E028: -/* A8E028 802415A8 0260202D */ daddu $a0, $s3, $zero -/* A8E02C 802415AC 0280282D */ daddu $a1, $s4, $zero -/* A8E030 802415B0 0C090448 */ jal kpa_95_UnkNpcAIFunc12 -/* A8E034 802415B4 02A0302D */ daddu $a2, $s5, $zero -/* A8E038 802415B8 08090578 */ j .L802415E0_A8E060 -/* A8E03C 802415BC 00000000 */ nop -.L802415C0_A8E040: -/* A8E040 802415C0 0260202D */ daddu $a0, $s3, $zero -/* A8E044 802415C4 0280282D */ daddu $a1, $s4, $zero -/* A8E048 802415C8 0C0904A1 */ jal kpa_95_set_script_owner_npc_col_height -/* A8E04C 802415CC 02A0302D */ daddu $a2, $s5, $zero -/* A8E050 802415D0 08090578 */ j .L802415E0_A8E060 -/* A8E054 802415D4 00000000 */ nop -.L802415D8_A8E058: -/* A8E058 802415D8 0C0129CF */ jal func_8004A73C -/* A8E05C 802415DC 0260202D */ daddu $a0, $s3, $zero -.L802415E0_A8E060: -/* A8E060 802415E0 8FBF0068 */ lw $ra, 0x68($sp) -/* A8E064 802415E4 8FB50064 */ lw $s5, 0x64($sp) -/* A8E068 802415E8 8FB40060 */ lw $s4, 0x60($sp) -/* A8E06C 802415EC 8FB3005C */ lw $s3, 0x5c($sp) -/* A8E070 802415F0 8FB20058 */ lw $s2, 0x58($sp) -/* A8E074 802415F4 8FB10054 */ lw $s1, 0x54($sp) -/* A8E078 802415F8 8FB00050 */ lw $s0, 0x50($sp) -/* A8E07C 802415FC 0000102D */ daddu $v0, $zero, $zero -/* A8E080 80241600 03E00008 */ jr $ra -/* A8E084 80241604 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s deleted file mode 100644 index 9105e563d9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241134_C5B874 -/* C5B874 80241134 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5B878 80241138 AFB00010 */ sw $s0, 0x10($sp) -/* C5B87C 8024113C 0080802D */ daddu $s0, $a0, $zero -/* C5B880 80241140 AFBF0014 */ sw $ra, 0x14($sp) -/* C5B884 80241144 8E020148 */ lw $v0, 0x148($s0) -/* C5B888 80241148 0C00EABB */ jal get_npc_unsafe -/* C5B88C 8024114C 84440008 */ lh $a0, 8($v0) -/* C5B890 80241150 9443008E */ lhu $v1, 0x8e($v0) -/* C5B894 80241154 C440003C */ lwc1 $f0, 0x3c($v0) -/* C5B898 80241158 24640001 */ addiu $a0, $v1, 1 -/* C5B89C 8024115C 00031C00 */ sll $v1, $v1, 0x10 -/* C5B8A0 80241160 00031B83 */ sra $v1, $v1, 0xe -/* C5B8A4 80241164 A444008E */ sh $a0, 0x8e($v0) -/* C5B8A8 80241168 3C018024 */ lui $at, %hi(D_80244900_C5F040) -/* C5B8AC 8024116C 00230821 */ addu $at, $at, $v1 -/* C5B8B0 80241170 C4224900 */ lwc1 $f2, %lo(D_80244900_C5F040)($at) -/* C5B8B4 80241174 8443008E */ lh $v1, 0x8e($v0) -/* C5B8B8 80241178 46020000 */ add.s $f0, $f0, $f2 -/* C5B8BC 8024117C 28630005 */ slti $v1, $v1, 5 -/* C5B8C0 80241180 14600003 */ bnez $v1, .L80241190 -/* C5B8C4 80241184 E440003C */ swc1 $f0, 0x3c($v0) -/* C5B8C8 80241188 2402000C */ addiu $v0, $zero, 0xc -/* C5B8CC 8024118C AE020070 */ sw $v0, 0x70($s0) -.L80241190: -/* C5B8D0 80241190 8FBF0014 */ lw $ra, 0x14($sp) -/* C5B8D4 80241194 8FB00010 */ lw $s0, 0x10($sp) -/* C5B8D8 80241198 03E00008 */ jr $ra -/* C5B8DC 8024119C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s deleted file mode 100644 index 4c90cf5d1e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80246518_C60C58 -.word .L802418F8_C5C038, .L80241908_C5C048, .L80241920_C5C060, .L80241930_C5C070, .L802419B0_C5C0F0, .L802419B0_C5C0F0, .L802419B0_C5C0F0, .L802419B0_C5C0F0, .L802419B0_C5C0F0, .L802419B0_C5C0F0, .L80241948_C5C088, .L80241958_C5C098, .L80241970_C5C0B0, .L80241988_C5C0C8, .L802419A0_C5C0E0, 0 - -.section .text - -glabel func_802417EC_C5BF2C -/* C5BF2C 802417EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C5BF30 802417F0 AFB40040 */ sw $s4, 0x40($sp) -/* C5BF34 802417F4 0080A02D */ daddu $s4, $a0, $zero -/* C5BF38 802417F8 AFBF0048 */ sw $ra, 0x48($sp) -/* C5BF3C 802417FC AFB50044 */ sw $s5, 0x44($sp) -/* C5BF40 80241800 AFB3003C */ sw $s3, 0x3c($sp) -/* C5BF44 80241804 AFB20038 */ sw $s2, 0x38($sp) -/* C5BF48 80241808 AFB10034 */ sw $s1, 0x34($sp) -/* C5BF4C 8024180C AFB00030 */ sw $s0, 0x30($sp) -/* C5BF50 80241810 8E920148 */ lw $s2, 0x148($s4) -/* C5BF54 80241814 86440008 */ lh $a0, 8($s2) -/* C5BF58 80241818 8E90000C */ lw $s0, 0xc($s4) -/* C5BF5C 8024181C 0C00EABB */ jal get_npc_unsafe -/* C5BF60 80241820 00A0882D */ daddu $s1, $a1, $zero -/* C5BF64 80241824 0280202D */ daddu $a0, $s4, $zero -/* C5BF68 80241828 8E050000 */ lw $a1, ($s0) -/* C5BF6C 8024182C 0C0B1EAF */ jal evt_get_variable -/* C5BF70 80241830 0040A82D */ daddu $s5, $v0, $zero -/* C5BF74 80241834 AFA00010 */ sw $zero, 0x10($sp) -/* C5BF78 80241838 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BF7C 8024183C 8C630030 */ lw $v1, 0x30($v1) -/* C5BF80 80241840 AFA30014 */ sw $v1, 0x14($sp) -/* C5BF84 80241844 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BF88 80241848 8C63001C */ lw $v1, 0x1c($v1) -/* C5BF8C 8024184C AFA30018 */ sw $v1, 0x18($sp) -/* C5BF90 80241850 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BF94 80241854 8C630024 */ lw $v1, 0x24($v1) -/* C5BF98 80241858 AFA3001C */ sw $v1, 0x1c($sp) -/* C5BF9C 8024185C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BFA0 80241860 8C630028 */ lw $v1, 0x28($v1) -/* C5BFA4 80241864 27B30010 */ addiu $s3, $sp, 0x10 -/* C5BFA8 80241868 AFA30020 */ sw $v1, 0x20($sp) -/* C5BFAC 8024186C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5BFB0 80241870 3C0142F0 */ lui $at, 0x42f0 -/* C5BFB4 80241874 44810000 */ mtc1 $at, $f0 -/* C5BFB8 80241878 8C63002C */ lw $v1, 0x2c($v1) -/* C5BFBC 8024187C 0040802D */ daddu $s0, $v0, $zero -/* C5BFC0 80241880 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5BFC4 80241884 A7A0002C */ sh $zero, 0x2c($sp) -/* C5BFC8 80241888 12200006 */ beqz $s1, .L802418A4 -/* C5BFCC 8024188C AFA30024 */ sw $v1, 0x24($sp) -/* C5BFD0 80241890 02A0202D */ daddu $a0, $s5, $zero -/* C5BFD4 80241894 0240282D */ daddu $a1, $s2, $zero -/* C5BFD8 80241898 0280302D */ daddu $a2, $s4, $zero -/* C5BFDC 8024189C 0C0905B2 */ jal kzn_02_UnkFunc5 -/* C5BFE0 802418A0 0200382D */ daddu $a3, $s0, $zero -.L802418A4: -/* C5BFE4 802418A4 2402FFFE */ addiu $v0, $zero, -2 -/* C5BFE8 802418A8 A2A200AB */ sb $v0, 0xab($s5) -/* C5BFEC 802418AC 8E4300B0 */ lw $v1, 0xb0($s2) -/* C5BFF0 802418B0 30620004 */ andi $v0, $v1, 4 -/* C5BFF4 802418B4 10400007 */ beqz $v0, .L802418D4 -/* C5BFF8 802418B8 00000000 */ nop -/* C5BFFC 802418BC 824200B4 */ lb $v0, 0xb4($s2) -/* C5C000 802418C0 1440003C */ bnez $v0, .L802419B4 -/* C5C004 802418C4 0000102D */ daddu $v0, $zero, $zero -/* C5C008 802418C8 2402FFFB */ addiu $v0, $zero, -5 -/* C5C00C 802418CC 00621024 */ and $v0, $v1, $v0 -/* C5C010 802418D0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802418D4: -/* C5C014 802418D4 8E830070 */ lw $v1, 0x70($s4) -/* C5C018 802418D8 2C62000F */ sltiu $v0, $v1, 0xf -/* C5C01C 802418DC 10400034 */ beqz $v0, .L802419B0_C5C0F0 -/* C5C020 802418E0 00031080 */ sll $v0, $v1, 2 -/* C5C024 802418E4 3C018024 */ lui $at, %hi(jtbl_80246518_C60C58) -/* C5C028 802418E8 00220821 */ addu $at, $at, $v0 -/* C5C02C 802418EC 8C226518 */ lw $v0, %lo(jtbl_80246518_C60C58)($at) -/* C5C030 802418F0 00400008 */ jr $v0 -/* C5C034 802418F4 00000000 */ nop -.L802418F8_C5C038: -/* C5C038 802418F8 0280202D */ daddu $a0, $s4, $zero -/* C5C03C 802418FC 0200282D */ daddu $a1, $s0, $zero -/* C5C040 80241900 0C090138 */ jal kzn_02_UnkNpcAIFunc23 -/* C5C044 80241904 0260302D */ daddu $a2, $s3, $zero -.L80241908_C5C048: -/* C5C048 80241908 0280202D */ daddu $a0, $s4, $zero -/* C5C04C 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C5C050 80241910 0C0901A4 */ jal kzn_02_UnkNpcAIFunc35 -/* C5C054 80241914 0260302D */ daddu $a2, $s3, $zero -/* C5C058 80241918 0809066D */ j .L802419B4 -/* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero -.L80241920_C5C060: -/* C5C060 80241920 0280202D */ daddu $a0, $s4, $zero -/* C5C064 80241924 0200282D */ daddu $a1, $s0, $zero -/* C5C068 80241928 0C09032E */ jal kzn_02_UnkNpcAIFunc1 -/* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero -.L80241930_C5C070: -/* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero -/* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero -/* C5C078 80241938 0C09035E */ jal kzn_02_UnkFunc4 -/* C5C07C 8024193C 0260302D */ daddu $a2, $s3, $zero -/* C5C080 80241940 0809066D */ j .L802419B4 -/* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero -.L80241948_C5C088: -/* C5C088 80241948 0280202D */ daddu $a0, $s4, $zero -/* C5C08C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* C5C090 80241950 0C09042F */ jal kzn_02_UnkNpcAIFunc2 -/* C5C094 80241954 0260302D */ daddu $a2, $s3, $zero -.L80241958_C5C098: -/* C5C098 80241958 0280202D */ daddu $a0, $s4, $zero -/* C5C09C 8024195C 0200282D */ daddu $a1, $s0, $zero -/* C5C0A0 80241960 0C09044D */ jal func_80241134_C5B874 -/* C5C0A4 80241964 0260302D */ daddu $a2, $s3, $zero -/* C5C0A8 80241968 0809066D */ j .L802419B4 -/* C5C0AC 8024196C 0000102D */ daddu $v0, $zero, $zero -.L80241970_C5C0B0: -/* C5C0B0 80241970 0280202D */ daddu $a0, $s4, $zero -/* C5C0B4 80241974 0200282D */ daddu $a1, $s0, $zero -/* C5C0B8 80241978 0C090468 */ jal kzn_02_UnkNpcAIFunc14 -/* C5C0BC 8024197C 0260302D */ daddu $a2, $s3, $zero -/* C5C0C0 80241980 0809066D */ j .L802419B4 -/* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero -.L80241988_C5C0C8: -/* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero -/* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero -/* C5C0D0 80241990 0C0904B5 */ jal kzn_02_UnkNpcAIFunc3 -/* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero -/* C5C0D8 80241998 0809066D */ j .L802419B4 -/* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero -.L802419A0_C5C0E0: -/* C5C0E0 802419A0 0280202D */ daddu $a0, $s4, $zero -/* C5C0E4 802419A4 0200282D */ daddu $a1, $s0, $zero -/* C5C0E8 802419A8 0C0904CE */ jal kzn_02_UnkFunc6 -/* C5C0EC 802419AC 0260302D */ daddu $a2, $s3, $zero -.L802419B0_C5C0F0: -/* C5C0F0 802419B0 0000102D */ daddu $v0, $zero, $zero -.L802419B4: -/* C5C0F4 802419B4 8FBF0048 */ lw $ra, 0x48($sp) -/* C5C0F8 802419B8 8FB50044 */ lw $s5, 0x44($sp) -/* C5C0FC 802419BC 8FB40040 */ lw $s4, 0x40($sp) -/* C5C100 802419C0 8FB3003C */ lw $s3, 0x3c($sp) -/* C5C104 802419C4 8FB20038 */ lw $s2, 0x38($sp) -/* C5C108 802419C8 8FB10034 */ lw $s1, 0x34($sp) -/* C5C10C 802419CC 8FB00030 */ lw $s0, 0x30($sp) -/* C5C110 802419D0 03E00008 */ jr $ra -/* C5C114 802419D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s deleted file mode 100644 index abedf0b21e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80246558_C60C98 -.double 0.06 - -.section .text - -glabel hzn_02_UnkNpcAIFunc34 -/* C5C248 80241B08 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C5C24C 80241B0C AFB3004C */ sw $s3, 0x4c($sp) -/* C5C250 80241B10 0080982D */ daddu $s3, $a0, $zero -/* C5C254 80241B14 AFBF0050 */ sw $ra, 0x50($sp) -/* C5C258 80241B18 AFB20048 */ sw $s2, 0x48($sp) -/* C5C25C 80241B1C AFB10044 */ sw $s1, 0x44($sp) -/* C5C260 80241B20 AFB00040 */ sw $s0, 0x40($sp) -/* C5C264 80241B24 8E720148 */ lw $s2, 0x148($s3) -/* C5C268 80241B28 00A0882D */ daddu $s1, $a1, $zero -/* C5C26C 80241B2C 86440008 */ lh $a0, 8($s2) -/* C5C270 80241B30 0C00EABB */ jal get_npc_unsafe -/* C5C274 80241B34 00C0802D */ daddu $s0, $a2, $zero -/* C5C278 80241B38 0200202D */ daddu $a0, $s0, $zero -/* C5C27C 80241B3C 0240282D */ daddu $a1, $s2, $zero -/* C5C280 80241B40 24030001 */ addiu $v1, $zero, 1 -/* C5C284 80241B44 AFA30010 */ sw $v1, 0x10($sp) -/* C5C288 80241B48 8E260024 */ lw $a2, 0x24($s1) -/* C5C28C 80241B4C 8E270028 */ lw $a3, 0x28($s1) -/* C5C290 80241B50 0C01242D */ jal func_800490B4 -/* C5C294 80241B54 0040802D */ daddu $s0, $v0, $zero -/* C5C298 80241B58 14400020 */ bnez $v0, .L80241BDC -/* C5C29C 80241B5C 24040002 */ addiu $a0, $zero, 2 -/* C5C2A0 80241B60 0200282D */ daddu $a1, $s0, $zero -/* C5C2A4 80241B64 0000302D */ daddu $a2, $zero, $zero -/* C5C2A8 80241B68 860300A8 */ lh $v1, 0xa8($s0) -/* C5C2AC 80241B6C 3C013F80 */ lui $at, 0x3f80 -/* C5C2B0 80241B70 44810000 */ mtc1 $at, $f0 -/* C5C2B4 80241B74 3C014000 */ lui $at, 0x4000 -/* C5C2B8 80241B78 44811000 */ mtc1 $at, $f2 -/* C5C2BC 80241B7C 3C01C1A0 */ lui $at, 0xc1a0 -/* C5C2C0 80241B80 44812000 */ mtc1 $at, $f4 -/* C5C2C4 80241B84 2402000F */ addiu $v0, $zero, 0xf -/* C5C2C8 80241B88 AFA2001C */ sw $v0, 0x1c($sp) -/* C5C2CC 80241B8C 44834000 */ mtc1 $v1, $f8 -/* C5C2D0 80241B90 00000000 */ nop -/* C5C2D4 80241B94 46804220 */ cvt.s.w $f8, $f8 -/* C5C2D8 80241B98 44074000 */ mfc1 $a3, $f8 -/* C5C2DC 80241B9C 27A20028 */ addiu $v0, $sp, 0x28 -/* C5C2E0 80241BA0 AFA20020 */ sw $v0, 0x20($sp) -/* C5C2E4 80241BA4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5C2E8 80241BA8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5C2EC 80241BAC 0C01BFA4 */ jal fx_emote -/* C5C2F0 80241BB0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C5C2F4 80241BB4 8E4200CC */ lw $v0, 0xcc($s2) -/* C5C2F8 80241BB8 8C430000 */ lw $v1, ($v0) -/* C5C2FC 80241BBC 2402001E */ addiu $v0, $zero, 0x1e -/* C5C300 80241BC0 A602008E */ sh $v0, 0x8e($s0) -/* C5C304 80241BC4 24020014 */ addiu $v0, $zero, 0x14 -/* C5C308 80241BC8 AE030028 */ sw $v1, 0x28($s0) -/* C5C30C 80241BCC AE620070 */ sw $v0, 0x70($s3) -/* C5C310 80241BD0 2402001E */ addiu $v0, $zero, 0x1e -/* C5C314 80241BD4 0809075B */ j .L80241D6C -/* C5C318 80241BD8 AE420090 */ sw $v0, 0x90($s2) -.L80241BDC: -/* C5C31C 80241BDC 8E050018 */ lw $a1, 0x18($s0) -/* C5C320 80241BE0 8E06000C */ lw $a2, 0xc($s0) -/* C5C324 80241BE4 0C00EA95 */ jal npc_move_heading -/* C5C328 80241BE8 0200202D */ daddu $a0, $s0, $zero -/* C5C32C 80241BEC 8E020000 */ lw $v0, ($s0) -/* C5C330 80241BF0 30420008 */ andi $v0, $v0, 8 -/* C5C334 80241BF4 14400028 */ bnez $v0, .L80241C98 -/* C5C338 80241BF8 0000882D */ daddu $s1, $zero, $zero -/* C5C33C 80241BFC 27A5002C */ addiu $a1, $sp, 0x2c -/* C5C340 80241C00 27A60030 */ addiu $a2, $sp, 0x30 -/* C5C344 80241C04 860200A8 */ lh $v0, 0xa8($s0) -/* C5C348 80241C08 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5C34C 80241C0C 44821000 */ mtc1 $v0, $f2 -/* C5C350 80241C10 00000000 */ nop -/* C5C354 80241C14 468010A0 */ cvt.s.w $f2, $f2 -/* C5C358 80241C18 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C5C35C 80241C1C 860200A8 */ lh $v0, 0xa8($s0) -/* C5C360 80241C20 C604003C */ lwc1 $f4, 0x3c($s0) -/* C5C364 80241C24 C6060040 */ lwc1 $f6, 0x40($s0) -/* C5C368 80241C28 44820000 */ mtc1 $v0, $f0 -/* C5C36C 80241C2C 00000000 */ nop -/* C5C370 80241C30 46800021 */ cvt.d.w $f0, $f0 -/* C5C374 80241C34 46022100 */ add.s $f4, $f4, $f2 -/* C5C378 80241C38 3C014008 */ lui $at, 0x4008 -/* C5C37C 80241C3C 44811800 */ mtc1 $at, $f3 -/* C5C380 80241C40 44801000 */ mtc1 $zero, $f2 -/* C5C384 80241C44 27A20038 */ addiu $v0, $sp, 0x38 -/* C5C388 80241C48 46220000 */ add.d $f0, $f0, $f2 -/* C5C38C 80241C4C E7A60034 */ swc1 $f6, 0x34($sp) -/* C5C390 80241C50 E7A40030 */ swc1 $f4, 0x30($sp) -/* C5C394 80241C54 46200020 */ cvt.s.d $f0, $f0 -/* C5C398 80241C58 E7A00038 */ swc1 $f0, 0x38($sp) -/* C5C39C 80241C5C AFA20010 */ sw $v0, 0x10($sp) -/* C5C3A0 80241C60 8E040080 */ lw $a0, 0x80($s0) -/* C5C3A4 80241C64 0C0372DF */ jal npc_raycast_down_sides -/* C5C3A8 80241C68 27A70034 */ addiu $a3, $sp, 0x34 -/* C5C3AC 80241C6C 1040000A */ beqz $v0, .L80241C98 -/* C5C3B0 80241C70 00000000 */ nop -/* C5C3B4 80241C74 860200A8 */ lh $v0, 0xa8($s0) -/* C5C3B8 80241C78 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C5C3BC 80241C7C 44820000 */ mtc1 $v0, $f0 -/* C5C3C0 80241C80 00000000 */ nop -/* C5C3C4 80241C84 46800020 */ cvt.s.w $f0, $f0 -/* C5C3C8 80241C88 4600103C */ c.lt.s $f2, $f0 -/* C5C3CC 80241C8C 00000000 */ nop -/* C5C3D0 80241C90 45030001 */ bc1tl .L80241C98 -/* C5C3D4 80241C94 24110001 */ addiu $s1, $zero, 1 -.L80241C98: -/* C5C3D8 80241C98 12200008 */ beqz $s1, .L80241CBC -/* C5C3DC 80241C9C 00000000 */ nop -/* C5C3E0 80241CA0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C5C3E4 80241CA4 3C013FF0 */ lui $at, 0x3ff0 -/* C5C3E8 80241CA8 44811800 */ mtc1 $at, $f3 -/* C5C3EC 80241CAC 44801000 */ mtc1 $zero, $f2 -/* C5C3F0 80241CB0 46000021 */ cvt.d.s $f0, $f0 -/* C5C3F4 80241CB4 08090751 */ j .L80241D44 -/* C5C3F8 80241CB8 46220000 */ add.d $f0, $f0, $f2 -.L80241CBC: -/* C5C3FC 80241CBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5C400 80241CC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5C404 80241CC4 3C014018 */ lui $at, 0x4018 -/* C5C408 80241CC8 44811800 */ mtc1 $at, $f3 -/* C5C40C 80241CCC 44801000 */ mtc1 $zero, $f2 -/* C5C410 80241CD0 C440002C */ lwc1 $f0, 0x2c($v0) -/* C5C414 80241CD4 C604003C */ lwc1 $f4, 0x3c($s0) -/* C5C418 80241CD8 46000021 */ cvt.d.s $f0, $f0 -/* C5C41C 80241CDC 46220000 */ add.d $f0, $f0, $f2 -/* C5C420 80241CE0 46002121 */ cvt.d.s $f4, $f4 -/* C5C424 80241CE4 46202001 */ sub.d $f0, $f4, $f0 -/* C5C428 80241CE8 462001A0 */ cvt.s.d $f6, $f0 -/* C5C42C 80241CEC 44800000 */ mtc1 $zero, $f0 -/* C5C430 80241CF0 44800800 */ mtc1 $zero, $f1 -/* C5C434 80241CF4 460030A1 */ cvt.d.s $f2, $f6 -/* C5C438 80241CF8 4620103C */ c.lt.d $f2, $f0 -/* C5C43C 80241CFC 00000000 */ nop -/* C5C440 80241D00 45010009 */ bc1t .L80241D28 -/* C5C444 80241D04 00000000 */ nop -/* C5C448 80241D08 3C014010 */ lui $at, 0x4010 -/* C5C44C 80241D0C 44810800 */ mtc1 $at, $f1 -/* C5C450 80241D10 44800000 */ mtc1 $zero, $f0 -/* C5C454 80241D14 00000000 */ nop -/* C5C458 80241D18 4622003C */ c.lt.d $f0, $f2 -/* C5C45C 80241D1C 00000000 */ nop -/* C5C460 80241D20 4500000A */ bc1f .L80241D4C -/* C5C464 80241D24 00000000 */ nop -.L80241D28: -/* C5C468 80241D28 3C018024 */ lui $at, %hi(D_80246558_C60C98) -/* C5C46C 80241D2C D4226558 */ ldc1 $f2, %lo(D_80246558_C60C98)($at) -/* C5C470 80241D30 46003187 */ neg.s $f6, $f6 -/* C5C474 80241D34 46003021 */ cvt.d.s $f0, $f6 -/* C5C478 80241D38 46220002 */ mul.d $f0, $f0, $f2 -/* C5C47C 80241D3C 00000000 */ nop -/* C5C480 80241D40 46202000 */ add.d $f0, $f4, $f0 -.L80241D44: -/* C5C484 80241D44 46200020 */ cvt.s.d $f0, $f0 -/* C5C488 80241D48 E600003C */ swc1 $f0, 0x3c($s0) -.L80241D4C: -/* C5C48C 80241D4C 8602008E */ lh $v0, 0x8e($s0) -/* C5C490 80241D50 9603008E */ lhu $v1, 0x8e($s0) -/* C5C494 80241D54 18400003 */ blez $v0, .L80241D64 -/* C5C498 80241D58 2462FFFF */ addiu $v0, $v1, -1 -/* C5C49C 80241D5C 0809075B */ j .L80241D6C -/* C5C4A0 80241D60 A602008E */ sh $v0, 0x8e($s0) -.L80241D64: -/* C5C4A4 80241D64 2402000C */ addiu $v0, $zero, 0xc -/* C5C4A8 80241D68 AE620070 */ sw $v0, 0x70($s3) -.L80241D6C: -/* C5C4AC 80241D6C 8FBF0050 */ lw $ra, 0x50($sp) -/* C5C4B0 80241D70 8FB3004C */ lw $s3, 0x4c($sp) -/* C5C4B4 80241D74 8FB20048 */ lw $s2, 0x48($sp) -/* C5C4B8 80241D78 8FB10044 */ lw $s1, 0x44($sp) -/* C5C4BC 80241D7C 8FB00040 */ lw $s0, 0x40($sp) -/* C5C4C0 80241D80 03E00008 */ jr $ra -/* C5C4C4 80241D84 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s deleted file mode 100644 index 15d97a8199..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80246560_C60CA0 -.word .L80241EF4_C5C634, .L80241F04_C5C644, .L80241F1C_C5C65C, .L80241F2C_C5C66C, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241F44_C5C684, .L80241F54_C5C694, .L80241F6C_C5C6AC, .L80241F7C_C5C6BC, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241FA4_C5C6E4, .L80241F94_C5C6D4, 0, 0, 0 - -.section .text - -glabel func_80241DE4_C5C524 -/* C5C524 80241DE4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C5C528 80241DE8 AFB40040 */ sw $s4, 0x40($sp) -/* C5C52C 80241DEC 0080A02D */ daddu $s4, $a0, $zero -/* C5C530 80241DF0 AFBF0048 */ sw $ra, 0x48($sp) -/* C5C534 80241DF4 AFB50044 */ sw $s5, 0x44($sp) -/* C5C538 80241DF8 AFB3003C */ sw $s3, 0x3c($sp) -/* C5C53C 80241DFC AFB20038 */ sw $s2, 0x38($sp) -/* C5C540 80241E00 AFB10034 */ sw $s1, 0x34($sp) -/* C5C544 80241E04 AFB00030 */ sw $s0, 0x30($sp) -/* C5C548 80241E08 8E920148 */ lw $s2, 0x148($s4) -/* C5C54C 80241E0C 86440008 */ lh $a0, 8($s2) -/* C5C550 80241E10 8E90000C */ lw $s0, 0xc($s4) -/* C5C554 80241E14 0C00EABB */ jal get_npc_unsafe -/* C5C558 80241E18 00A0882D */ daddu $s1, $a1, $zero -/* C5C55C 80241E1C 0280202D */ daddu $a0, $s4, $zero -/* C5C560 80241E20 8E050000 */ lw $a1, ($s0) -/* C5C564 80241E24 0C0B1EAF */ jal evt_get_variable -/* C5C568 80241E28 0040A82D */ daddu $s5, $v0, $zero -/* C5C56C 80241E2C AFA00010 */ sw $zero, 0x10($sp) -/* C5C570 80241E30 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C574 80241E34 8C630030 */ lw $v1, 0x30($v1) -/* C5C578 80241E38 AFA30014 */ sw $v1, 0x14($sp) -/* C5C57C 80241E3C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C580 80241E40 8C63001C */ lw $v1, 0x1c($v1) -/* C5C584 80241E44 AFA30018 */ sw $v1, 0x18($sp) -/* C5C588 80241E48 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C58C 80241E4C 8C630024 */ lw $v1, 0x24($v1) -/* C5C590 80241E50 AFA3001C */ sw $v1, 0x1c($sp) -/* C5C594 80241E54 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C598 80241E58 8C630028 */ lw $v1, 0x28($v1) -/* C5C59C 80241E5C 27B30010 */ addiu $s3, $sp, 0x10 -/* C5C5A0 80241E60 AFA30020 */ sw $v1, 0x20($sp) -/* C5C5A4 80241E64 8E4300D0 */ lw $v1, 0xd0($s2) -/* C5C5A8 80241E68 3C0142F0 */ lui $at, 0x42f0 -/* C5C5AC 80241E6C 44810000 */ mtc1 $at, $f0 -/* C5C5B0 80241E70 8C63002C */ lw $v1, 0x2c($v1) -/* C5C5B4 80241E74 0040802D */ daddu $s0, $v0, $zero -/* C5C5B8 80241E78 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5C5BC 80241E7C A7A0002C */ sh $zero, 0x2c($sp) -/* C5C5C0 80241E80 12200007 */ beqz $s1, .L80241EA0 -/* C5C5C4 80241E84 AFA30024 */ sw $v1, 0x24($sp) -/* C5C5C8 80241E88 02A0202D */ daddu $a0, $s5, $zero -/* C5C5CC 80241E8C 0240282D */ daddu $a1, $s2, $zero -/* C5C5D0 80241E90 0280302D */ daddu $a2, $s4, $zero -/* C5C5D4 80241E94 0C0905B2 */ jal kzn_02_UnkFunc5 -/* C5C5D8 80241E98 0200382D */ daddu $a3, $s0, $zero -/* C5C5DC 80241E9C AE800070 */ sw $zero, 0x70($s4) -.L80241EA0: -/* C5C5E0 80241EA0 2402FFFE */ addiu $v0, $zero, -2 -/* C5C5E4 80241EA4 A2A200AB */ sb $v0, 0xab($s5) -/* C5C5E8 80241EA8 8E4300B0 */ lw $v1, 0xb0($s2) -/* C5C5EC 80241EAC 30620004 */ andi $v0, $v1, 4 -/* C5C5F0 80241EB0 10400007 */ beqz $v0, .L80241ED0 -/* C5C5F4 80241EB4 00000000 */ nop -/* C5C5F8 80241EB8 824200B4 */ lb $v0, 0xb4($s2) -/* C5C5FC 80241EBC 1440003A */ bnez $v0, .L80241FA8 -/* C5C600 80241EC0 0000102D */ daddu $v0, $zero, $zero -/* C5C604 80241EC4 2402FFFB */ addiu $v0, $zero, -5 -/* C5C608 80241EC8 00621024 */ and $v0, $v1, $v0 -/* C5C60C 80241ECC AE4200B0 */ sw $v0, 0xb0($s2) -.L80241ED0: -/* C5C610 80241ED0 8E830070 */ lw $v1, 0x70($s4) -/* C5C614 80241ED4 2C620015 */ sltiu $v0, $v1, 0x15 -/* C5C618 80241ED8 10400032 */ beqz $v0, .L80241FA4_C5C6E4 -/* C5C61C 80241EDC 00031080 */ sll $v0, $v1, 2 -/* C5C620 80241EE0 3C018024 */ lui $at, %hi(jtbl_80246560_C60CA0) -/* C5C624 80241EE4 00220821 */ addu $at, $at, $v0 -/* C5C628 80241EE8 8C226560 */ lw $v0, %lo(jtbl_80246560_C60CA0)($at) -/* C5C62C 80241EEC 00400008 */ jr $v0 -/* C5C630 80241EF0 00000000 */ nop -.L80241EF4_C5C634: -/* C5C634 80241EF4 0280202D */ daddu $a0, $s4, $zero -/* C5C638 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* C5C63C 80241EFC 0C090138 */ jal kzn_02_UnkNpcAIFunc23 -/* C5C640 80241F00 0260302D */ daddu $a2, $s3, $zero -.L80241F04_C5C644: -/* C5C644 80241F04 0280202D */ daddu $a0, $s4, $zero -/* C5C648 80241F08 0200282D */ daddu $a1, $s0, $zero -/* C5C64C 80241F0C 0C0901A4 */ jal kzn_02_UnkNpcAIFunc35 -/* C5C650 80241F10 0260302D */ daddu $a2, $s3, $zero -/* C5C654 80241F14 080907EA */ j .L80241FA8 -/* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero -.L80241F1C_C5C65C: -/* C5C65C 80241F1C 0280202D */ daddu $a0, $s4, $zero -/* C5C660 80241F20 0200282D */ daddu $a1, $s0, $zero -/* C5C664 80241F24 0C09032E */ jal kzn_02_UnkNpcAIFunc1 -/* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero -.L80241F2C_C5C66C: -/* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero -/* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero -/* C5C674 80241F34 0C09035E */ jal kzn_02_UnkFunc4 -/* C5C678 80241F38 0260302D */ daddu $a2, $s3, $zero -/* C5C67C 80241F3C 080907EA */ j .L80241FA8 -/* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero -.L80241F44_C5C684: -/* C5C684 80241F44 0280202D */ daddu $a0, $s4, $zero -/* C5C688 80241F48 0200282D */ daddu $a1, $s0, $zero -/* C5C68C 80241F4C 0C09042F */ jal kzn_02_UnkNpcAIFunc2 -/* C5C690 80241F50 0260302D */ daddu $a2, $s3, $zero -.L80241F54_C5C694: -/* C5C694 80241F54 0280202D */ daddu $a0, $s4, $zero -/* C5C698 80241F58 0200282D */ daddu $a1, $s0, $zero -/* C5C69C 80241F5C 0C09044D */ jal func_80241134_C5B874 -/* C5C6A0 80241F60 0260302D */ daddu $a2, $s3, $zero -/* C5C6A4 80241F64 080907EA */ j .L80241FA8 -/* C5C6A8 80241F68 0000102D */ daddu $v0, $zero, $zero -.L80241F6C_C5C6AC: -/* C5C6AC 80241F6C 0280202D */ daddu $a0, $s4, $zero -/* C5C6B0 80241F70 0200282D */ daddu $a1, $s0, $zero -/* C5C6B4 80241F74 0C090676 */ jal kzn_02_UnkNpcAIFunc13 -/* C5C6B8 80241F78 0260302D */ daddu $a2, $s3, $zero -.L80241F7C_C5C6BC: -/* C5C6BC 80241F7C 0280202D */ daddu $a0, $s4, $zero -/* C5C6C0 80241F80 0200282D */ daddu $a1, $s0, $zero -/* C5C6C4 80241F84 0C0906C2 */ jal hzn_02_UnkNpcAIFunc34 -/* C5C6C8 80241F88 0260302D */ daddu $a2, $s3, $zero -/* C5C6CC 80241F8C 080907EA */ j .L80241FA8 -/* C5C6D0 80241F90 0000102D */ daddu $v0, $zero, $zero -.L80241F94_C5C6D4: -/* C5C6D4 80241F94 0280202D */ daddu $a0, $s4, $zero -/* C5C6D8 80241F98 0200282D */ daddu $a1, $s0, $zero -/* C5C6DC 80241F9C 0C090762 */ jal kzn_02_UnkFunc45 -/* C5C6E0 80241FA0 0260302D */ daddu $a2, $s3, $zero -.L80241FA4_C5C6E4: -/* C5C6E4 80241FA4 0000102D */ daddu $v0, $zero, $zero -.L80241FA8: -/* C5C6E8 80241FA8 8FBF0048 */ lw $ra, 0x48($sp) -/* C5C6EC 80241FAC 8FB50044 */ lw $s5, 0x44($sp) -/* C5C6F0 80241FB0 8FB40040 */ lw $s4, 0x40($sp) -/* C5C6F4 80241FB4 8FB3003C */ lw $s3, 0x3c($sp) -/* C5C6F8 80241FB8 8FB20038 */ lw $s2, 0x38($sp) -/* C5C6FC 80241FBC 8FB10034 */ lw $s1, 0x34($sp) -/* C5C700 80241FC0 8FB00030 */ lw $s0, 0x30($sp) -/* C5C704 80241FC4 03E00008 */ jr $ra -/* C5C708 80241FC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s deleted file mode 100644 index 17852ce5e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240910_C68A40 -/* C68A40 80240910 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C68A44 80240914 AFB60040 */ sw $s6, 0x40($sp) -/* C68A48 80240918 0080B02D */ daddu $s6, $a0, $zero -/* C68A4C 8024091C AFB00028 */ sw $s0, 0x28($sp) -/* C68A50 80240920 00A0802D */ daddu $s0, $a1, $zero -/* C68A54 80240924 AFBF0044 */ sw $ra, 0x44($sp) -/* C68A58 80240928 AFB5003C */ sw $s5, 0x3c($sp) -/* C68A5C 8024092C AFB40038 */ sw $s4, 0x38($sp) -/* C68A60 80240930 AFB30034 */ sw $s3, 0x34($sp) -/* C68A64 80240934 AFB20030 */ sw $s2, 0x30($sp) -/* C68A68 80240938 AFB1002C */ sw $s1, 0x2c($sp) -/* C68A6C 8024093C F7B80058 */ sdc1 $f24, 0x58($sp) -/* C68A70 80240940 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C68A74 80240944 F7B40048 */ sdc1 $f20, 0x48($sp) -/* C68A78 80240948 8ED3000C */ lw $s3, 0xc($s6) -/* C68A7C 8024094C 0C00EAD2 */ jal get_npc_safe -/* C68A80 80240950 2404FFFC */ addiu $a0, $zero, -4 -/* C68A84 80240954 27A50018 */ addiu $a1, $sp, 0x18 -/* C68A88 80240958 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C68A8C 8024095C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C68A90 80240960 27A6001C */ addiu $a2, $sp, 0x1c -/* C68A94 80240964 00041880 */ sll $v1, $a0, 2 -/* C68A98 80240968 00641821 */ addu $v1, $v1, $a0 -/* C68A9C 8024096C 00031880 */ sll $v1, $v1, 2 -/* C68AA0 80240970 00641823 */ subu $v1, $v1, $a0 -/* C68AA4 80240974 000320C0 */ sll $a0, $v1, 3 -/* C68AA8 80240978 00641821 */ addu $v1, $v1, $a0 -/* C68AAC 8024097C 000318C0 */ sll $v1, $v1, 3 -/* C68AB0 80240980 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* C68AB4 80240984 00230821 */ addu $at, $at, $v1 -/* C68AB8 80240988 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* C68ABC 8024098C 0C00A88D */ jal sin_cos_deg -/* C68AC0 80240990 0040A82D */ daddu $s5, $v0, $zero -/* C68AC4 80240994 1200005D */ beqz $s0, .L80240B0C -/* C68AC8 80240998 00000000 */ nop -/* C68ACC 8024099C 0C00AB0A */ jal general_heap_malloc -/* C68AD0 802409A0 24040068 */ addiu $a0, $zero, 0x68 -/* C68AD4 802409A4 0040902D */ daddu $s2, $v0, $zero -/* C68AD8 802409A8 02C0202D */ daddu $a0, $s6, $zero -/* C68ADC 802409AC 0000882D */ daddu $s1, $zero, $zero -/* C68AE0 802409B0 2414FFFF */ addiu $s4, $zero, -1 -/* C68AE4 802409B4 AED20060 */ sw $s2, 0x60($s6) -/* C68AE8 802409B8 8E650000 */ lw $a1, ($s3) -/* C68AEC 802409BC 3C014148 */ lui $at, 0x4148 -/* C68AF0 802409C0 4481C000 */ mtc1 $at, $f24 -/* C68AF4 802409C4 3C013F80 */ lui $at, 0x3f80 -/* C68AF8 802409C8 4481B000 */ mtc1 $at, $f22 -/* C68AFC 802409CC 4480A000 */ mtc1 $zero, $f20 -/* C68B00 802409D0 0C0B1EAF */ jal evt_get_variable -/* C68B04 802409D4 0240802D */ daddu $s0, $s2, $zero -/* C68B08 802409D8 0C04417A */ jal get_entity_by_index -/* C68B0C 802409DC 0040202D */ daddu $a0, $v0, $zero -/* C68B10 802409E0 AE42005C */ sw $v0, 0x5c($s2) -.L802409E4: -/* C68B14 802409E4 8E42005C */ lw $v0, 0x5c($s2) -/* C68B18 802409E8 C440004C */ lwc1 $f0, 0x4c($v0) -/* C68B1C 802409EC 0000202D */ daddu $a0, $zero, $zero -/* C68B20 802409F0 E7B60010 */ swc1 $f22, 0x10($sp) -/* C68B24 802409F4 AFB40014 */ sw $s4, 0x14($sp) -/* C68B28 802409F8 46180000 */ add.s $f0, $f0, $f24 -/* C68B2C 802409FC 8C450048 */ lw $a1, 0x48($v0) -/* C68B30 80240A00 8C470050 */ lw $a3, 0x50($v0) -/* C68B34 80240A04 44060000 */ mfc1 $a2, $f0 -/* C68B38 80240A08 0C01C5BC */ jal fx_motion_blur_flame -/* C68B3C 80240A0C 26310001 */ addiu $s1, $s1, 1 -/* C68B40 80240A10 AE020008 */ sw $v0, 8($s0) -/* C68B44 80240A14 E614002C */ swc1 $f20, 0x2c($s0) -/* C68B48 80240A18 E6140020 */ swc1 $f20, 0x20($s0) -/* C68B4C 80240A1C E6140014 */ swc1 $f20, 0x14($s0) -/* C68B50 80240A20 E6140050 */ swc1 $f20, 0x50($s0) -/* C68B54 80240A24 E6140044 */ swc1 $f20, 0x44($s0) -/* C68B58 80240A28 E6140038 */ swc1 $f20, 0x38($s0) -/* C68B5C 80240A2C 2A220003 */ slti $v0, $s1, 3 -/* C68B60 80240A30 1440FFEC */ bnez $v0, .L802409E4 -/* C68B64 80240A34 26100004 */ addiu $s0, $s0, 4 -/* C68B68 80240A38 0000882D */ daddu $s1, $zero, $zero -/* C68B6C 80240A3C 0240802D */ daddu $s0, $s2, $zero -/* C68B70 80240A40 3C148024 */ lui $s4, %hi(D_80241C98_C69DC8) -/* C68B74 80240A44 26941C98 */ addiu $s4, $s4, %lo(D_80241C98_C69DC8) -/* C68B78 80240A48 3C014248 */ lui $at, 0x4248 -/* C68B7C 80240A4C 4481A000 */ mtc1 $at, $f20 -/* C68B80 80240A50 24130044 */ addiu $s3, $zero, 0x44 -/* C68B84 80240A54 AE400000 */ sw $zero, ($s2) -/* C68B88 80240A58 AE400004 */ sw $zero, 4($s2) -/* C68B8C 80240A5C AE400060 */ sw $zero, 0x60($s2) -/* C68B90 80240A60 AE400064 */ sw $zero, 0x64($s2) -.L80240A64: -/* C68B94 80240A64 27A40020 */ addiu $a0, $sp, 0x20 -/* C68B98 80240A68 4406A000 */ mfc1 $a2, $f20 -/* C68B9C 80240A6C 8E870000 */ lw $a3, ($s4) -/* C68BA0 80240A70 02532821 */ addu $a1, $s2, $s3 -/* C68BA4 80240A74 0C00A7E7 */ jal add_vec2D_polar -/* C68BA8 80240A78 AFA00020 */ sw $zero, 0x20($sp) -/* C68BAC 80240A7C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C68BB0 80240A80 C7A40020 */ lwc1 $f4, 0x20($sp) -/* C68BB4 80240A84 46041082 */ mul.s $f2, $f2, $f4 -/* C68BB8 80240A88 00000000 */ nop -/* C68BBC 80240A8C C7A00018 */ lwc1 $f0, 0x18($sp) -/* C68BC0 80240A90 46040002 */ mul.s $f0, $f0, $f4 -/* C68BC4 80240A94 00000000 */ nop -/* C68BC8 80240A98 E6020038 */ swc1 $f2, 0x38($s0) -/* C68BCC 80240A9C E6000050 */ swc1 $f0, 0x50($s0) -/* C68BD0 80240AA0 8E42005C */ lw $v0, 0x5c($s2) -/* C68BD4 80240AA4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C68BD8 80240AA8 C4420048 */ lwc1 $f2, 0x48($v0) -/* C68BDC 80240AAC 46001080 */ add.s $f2, $f2, $f0 -/* C68BE0 80240AB0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* C68BE4 80240AB4 46020001 */ sub.s $f0, $f0, $f2 -/* C68BE8 80240AB8 E6000038 */ swc1 $f0, 0x38($s0) -/* C68BEC 80240ABC 8E42005C */ lw $v0, 0x5c($s2) -/* C68BF0 80240AC0 C6000044 */ lwc1 $f0, 0x44($s0) -/* C68BF4 80240AC4 C442004C */ lwc1 $f2, 0x4c($v0) -/* C68BF8 80240AC8 46001080 */ add.s $f2, $f2, $f0 -/* C68BFC 80240ACC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* C68C00 80240AD0 46020001 */ sub.s $f0, $f0, $f2 -/* C68C04 80240AD4 E6000044 */ swc1 $f0, 0x44($s0) -/* C68C08 80240AD8 8E42005C */ lw $v0, 0x5c($s2) -/* C68C0C 80240ADC C6000050 */ lwc1 $f0, 0x50($s0) -/* C68C10 80240AE0 C4420050 */ lwc1 $f2, 0x50($v0) -/* C68C14 80240AE4 26940004 */ addiu $s4, $s4, 4 -/* C68C18 80240AE8 46001080 */ add.s $f2, $f2, $f0 -/* C68C1C 80240AEC C6A00040 */ lwc1 $f0, 0x40($s5) -/* C68C20 80240AF0 26730004 */ addiu $s3, $s3, 4 -/* C68C24 80240AF4 46020001 */ sub.s $f0, $f0, $f2 -/* C68C28 80240AF8 26310001 */ addiu $s1, $s1, 1 -/* C68C2C 80240AFC 2A220003 */ slti $v0, $s1, 3 -/* C68C30 80240B00 E6000050 */ swc1 $f0, 0x50($s0) -/* C68C34 80240B04 1440FFD7 */ bnez $v0, .L80240A64 -/* C68C38 80240B08 26100004 */ addiu $s0, $s0, 4 -.L80240B0C: -/* C68C3C 80240B0C 8ED20060 */ lw $s2, 0x60($s6) -/* C68C40 80240B10 8E430000 */ lw $v1, ($s2) -/* C68C44 80240B14 24020001 */ addiu $v0, $zero, 1 -/* C68C48 80240B18 10620038 */ beq $v1, $v0, .L80240BFC -/* C68C4C 80240B1C 28620002 */ slti $v0, $v1, 2 -/* C68C50 80240B20 50400005 */ beql $v0, $zero, .L80240B38 -/* C68C54 80240B24 24020002 */ addiu $v0, $zero, 2 -/* C68C58 80240B28 10600007 */ beqz $v1, .L80240B48 -/* C68C5C 80240B2C 24040005 */ addiu $a0, $zero, 5 -/* C68C60 80240B30 08090338 */ j .L80240CE0 -/* C68C64 80240B34 00000000 */ nop -.L80240B38: -/* C68C68 80240B38 10620058 */ beq $v1, $v0, .L80240C9C -/* C68C6C 80240B3C 00000000 */ nop -/* C68C70 80240B40 08090338 */ j .L80240CE0 -/* C68C74 80240B44 00000000 */ nop -.L80240B48: -/* C68C78 80240B48 0000882D */ daddu $s1, $zero, $zero -/* C68C7C 80240B4C 3C148024 */ lui $s4, %hi(D_80241C98_C69DC8) -/* C68C80 80240B50 26941C98 */ addiu $s4, $s4, %lo(D_80241C98_C69DC8) -/* C68C84 80240B54 24130020 */ addiu $s3, $zero, 0x20 -/* C68C88 80240B58 3C064248 */ lui $a2, 0x4248 -/* C68C8C 80240B5C 44800000 */ mtc1 $zero, $f0 -/* C68C90 80240B60 24020014 */ addiu $v0, $zero, 0x14 -/* C68C94 80240B64 AFA20010 */ sw $v0, 0x10($sp) -/* C68C98 80240B68 44050000 */ mfc1 $a1, $f0 -/* C68C9C 80240B6C 8E470060 */ lw $a3, 0x60($s2) -/* C68CA0 80240B70 4485B000 */ mtc1 $a1, $f22 -/* C68CA4 80240B74 0C00A8ED */ jal update_lerp -/* C68CA8 80240B78 0240802D */ daddu $s0, $s2, $zero -/* C68CAC 80240B7C 46000506 */ mov.s $f20, $f0 -.L80240B80: -/* C68CB0 80240B80 4406A000 */ mfc1 $a2, $f20 -/* C68CB4 80240B84 27A40020 */ addiu $a0, $sp, 0x20 -/* C68CB8 80240B88 E6160020 */ swc1 $f22, 0x20($s0) -/* C68CBC 80240B8C 8E870000 */ lw $a3, ($s4) -/* C68CC0 80240B90 02532821 */ addu $a1, $s2, $s3 -/* C68CC4 80240B94 0C00A7E7 */ jal add_vec2D_polar -/* C68CC8 80240B98 E7B60020 */ swc1 $f22, 0x20($sp) -/* C68CCC 80240B9C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C68CD0 80240BA0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* C68CD4 80240BA4 46002102 */ mul.s $f4, $f4, $f0 -/* C68CD8 80240BA8 00000000 */ nop -/* C68CDC 80240BAC C7A20018 */ lwc1 $f2, 0x18($sp) -/* C68CE0 80240BB0 26940004 */ addiu $s4, $s4, 4 -/* C68CE4 80240BB4 46001082 */ mul.s $f2, $f2, $f0 -/* C68CE8 80240BB8 00000000 */ nop -/* C68CEC 80240BBC 26730004 */ addiu $s3, $s3, 4 -/* C68CF0 80240BC0 26310001 */ addiu $s1, $s1, 1 -/* C68CF4 80240BC4 2A220003 */ slti $v0, $s1, 3 -/* C68CF8 80240BC8 E6040014 */ swc1 $f4, 0x14($s0) -/* C68CFC 80240BCC E602002C */ swc1 $f2, 0x2c($s0) -/* C68D00 80240BD0 1440FFEB */ bnez $v0, .L80240B80 -/* C68D04 80240BD4 26100004 */ addiu $s0, $s0, 4 -/* C68D08 80240BD8 8E420060 */ lw $v0, 0x60($s2) -/* C68D0C 80240BDC 24420001 */ addiu $v0, $v0, 1 -/* C68D10 80240BE0 AE420060 */ sw $v0, 0x60($s2) -/* C68D14 80240BE4 28420015 */ slti $v0, $v0, 0x15 -/* C68D18 80240BE8 1440003D */ bnez $v0, .L80240CE0 -/* C68D1C 80240BEC 24020001 */ addiu $v0, $zero, 1 -/* C68D20 80240BF0 AE420000 */ sw $v0, ($s2) -/* C68D24 80240BF4 08090338 */ j .L80240CE0 -/* C68D28 80240BF8 AE400060 */ sw $zero, 0x60($s2) -.L80240BFC: -/* C68D2C 80240BFC 0000882D */ daddu $s1, $zero, $zero -/* C68D30 80240C00 3C148024 */ lui $s4, %hi(D_80241C98_C69DC8) -/* C68D34 80240C04 26941C98 */ addiu $s4, $s4, %lo(D_80241C98_C69DC8) -/* C68D38 80240C08 24130020 */ addiu $s3, $zero, 0x20 -/* C68D3C 80240C0C 0240802D */ daddu $s0, $s2, $zero -/* C68D40 80240C10 3C014248 */ lui $at, 0x4248 -/* C68D44 80240C14 4481A000 */ mtc1 $at, $f20 -/* C68D48 80240C18 4480B000 */ mtc1 $zero, $f22 -.L80240C1C: -/* C68D4C 80240C1C 4406A000 */ mfc1 $a2, $f20 -/* C68D50 80240C20 27A40020 */ addiu $a0, $sp, 0x20 -/* C68D54 80240C24 E6160020 */ swc1 $f22, 0x20($s0) -/* C68D58 80240C28 8E870000 */ lw $a3, ($s4) -/* C68D5C 80240C2C 02532821 */ addu $a1, $s2, $s3 -/* C68D60 80240C30 0C00A7E7 */ jal add_vec2D_polar -/* C68D64 80240C34 E7B60020 */ swc1 $f22, 0x20($sp) -/* C68D68 80240C38 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C68D6C 80240C3C C7A00020 */ lwc1 $f0, 0x20($sp) -/* C68D70 80240C40 46002102 */ mul.s $f4, $f4, $f0 -/* C68D74 80240C44 00000000 */ nop -/* C68D78 80240C48 C7A20018 */ lwc1 $f2, 0x18($sp) -/* C68D7C 80240C4C 26940004 */ addiu $s4, $s4, 4 -/* C68D80 80240C50 46001082 */ mul.s $f2, $f2, $f0 -/* C68D84 80240C54 00000000 */ nop -/* C68D88 80240C58 26730004 */ addiu $s3, $s3, 4 -/* C68D8C 80240C5C 26310001 */ addiu $s1, $s1, 1 -/* C68D90 80240C60 2A220003 */ slti $v0, $s1, 3 -/* C68D94 80240C64 E6040014 */ swc1 $f4, 0x14($s0) -/* C68D98 80240C68 E602002C */ swc1 $f2, 0x2c($s0) -/* C68D9C 80240C6C 1440FFEB */ bnez $v0, .L80240C1C -/* C68DA0 80240C70 26100004 */ addiu $s0, $s0, 4 -/* C68DA4 80240C74 8E420060 */ lw $v0, 0x60($s2) -/* C68DA8 80240C78 24420001 */ addiu $v0, $v0, 1 -/* C68DAC 80240C7C AE420060 */ sw $v0, 0x60($s2) -/* C68DB0 80240C80 28420010 */ slti $v0, $v0, 0x10 -/* C68DB4 80240C84 14400016 */ bnez $v0, .L80240CE0 -/* C68DB8 80240C88 2402000F */ addiu $v0, $zero, 0xf -/* C68DBC 80240C8C AE420060 */ sw $v0, 0x60($s2) -/* C68DC0 80240C90 24020002 */ addiu $v0, $zero, 2 -/* C68DC4 80240C94 08090338 */ j .L80240CE0 -/* C68DC8 80240C98 AE420000 */ sw $v0, ($s2) -.L80240C9C: -/* C68DCC 80240C9C 8E420060 */ lw $v0, 0x60($s2) -/* C68DD0 80240CA0 24420001 */ addiu $v0, $v0, 1 -/* C68DD4 80240CA4 AE420060 */ sw $v0, 0x60($s2) -/* C68DD8 80240CA8 2842001F */ slti $v0, $v0, 0x1f -/* C68DDC 80240CAC 1440000C */ bnez $v0, .L80240CE0 -/* C68DE0 80240CB0 0000882D */ daddu $s1, $zero, $zero -/* C68DE4 80240CB4 0240282D */ daddu $a1, $s2, $zero -.L80240CB8: -/* C68DE8 80240CB8 8CA20008 */ lw $v0, 8($a1) -/* C68DEC 80240CBC 8C430000 */ lw $v1, ($v0) -/* C68DF0 80240CC0 26310001 */ addiu $s1, $s1, 1 -/* C68DF4 80240CC4 34630010 */ ori $v1, $v1, 0x10 -/* C68DF8 80240CC8 AC430000 */ sw $v1, ($v0) -/* C68DFC 80240CCC 2A220003 */ slti $v0, $s1, 3 -/* C68E00 80240CD0 1440FFF9 */ bnez $v0, .L80240CB8 -/* C68E04 80240CD4 24A50004 */ addiu $a1, $a1, 4 -/* C68E08 80240CD8 08090385 */ j .L80240E14 -/* C68E0C 80240CDC 24020002 */ addiu $v0, $zero, 2 -.L80240CE0: -/* C68E10 80240CE0 8E430004 */ lw $v1, 4($s2) -/* C68E14 80240CE4 10600005 */ beqz $v1, .L80240CFC -/* C68E18 80240CE8 24020001 */ addiu $v0, $zero, 1 -/* C68E1C 80240CEC 1062000B */ beq $v1, $v0, .L80240D1C -/* C68E20 80240CF0 0000882D */ daddu $s1, $zero, $zero -/* C68E24 80240CF4 08090374 */ j .L80240DD0 -/* C68E28 80240CF8 0240282D */ daddu $a1, $s2, $zero -.L80240CFC: -/* C68E2C 80240CFC 8E420064 */ lw $v0, 0x64($s2) -/* C68E30 80240D00 24420001 */ addiu $v0, $v0, 1 -/* C68E34 80240D04 AE420064 */ sw $v0, 0x64($s2) -/* C68E38 80240D08 28420010 */ slti $v0, $v0, 0x10 -/* C68E3C 80240D0C 1440002F */ bnez $v0, .L80240DCC -/* C68E40 80240D10 0000882D */ daddu $s1, $zero, $zero -/* C68E44 80240D14 08090370 */ j .L80240DC0 -/* C68E48 80240D18 24020001 */ addiu $v0, $zero, 1 -.L80240D1C: -/* C68E4C 80240D1C 4480A000 */ mtc1 $zero, $f20 -/* C68E50 80240D20 24130014 */ addiu $s3, $zero, 0x14 -/* C68E54 80240D24 0240802D */ daddu $s0, $s2, $zero -.L80240D28: -/* C68E58 80240D28 4405A000 */ mfc1 $a1, $f20 -/* C68E5C 80240D2C AFB30010 */ sw $s3, 0x10($sp) -/* C68E60 80240D30 8E060038 */ lw $a2, 0x38($s0) -/* C68E64 80240D34 8E470064 */ lw $a3, 0x64($s2) -/* C68E68 80240D38 0C00A8ED */ jal update_lerp -/* C68E6C 80240D3C 24040001 */ addiu $a0, $zero, 1 -/* C68E70 80240D40 C6020014 */ lwc1 $f2, 0x14($s0) -/* C68E74 80240D44 46001080 */ add.s $f2, $f2, $f0 -/* C68E78 80240D48 4405A000 */ mfc1 $a1, $f20 -/* C68E7C 80240D4C E6020014 */ swc1 $f2, 0x14($s0) -/* C68E80 80240D50 AFB30010 */ sw $s3, 0x10($sp) -/* C68E84 80240D54 8E060044 */ lw $a2, 0x44($s0) -/* C68E88 80240D58 8E470064 */ lw $a3, 0x64($s2) -/* C68E8C 80240D5C 0C00A8ED */ jal update_lerp -/* C68E90 80240D60 24040001 */ addiu $a0, $zero, 1 -/* C68E94 80240D64 C6020020 */ lwc1 $f2, 0x20($s0) -/* C68E98 80240D68 46001080 */ add.s $f2, $f2, $f0 -/* C68E9C 80240D6C 4405A000 */ mfc1 $a1, $f20 -/* C68EA0 80240D70 E6020020 */ swc1 $f2, 0x20($s0) -/* C68EA4 80240D74 AFB30010 */ sw $s3, 0x10($sp) -/* C68EA8 80240D78 8E060050 */ lw $a2, 0x50($s0) -/* C68EAC 80240D7C 8E470064 */ lw $a3, 0x64($s2) -/* C68EB0 80240D80 0C00A8ED */ jal update_lerp -/* C68EB4 80240D84 24040001 */ addiu $a0, $zero, 1 -/* C68EB8 80240D88 C602002C */ lwc1 $f2, 0x2c($s0) -/* C68EBC 80240D8C 46001080 */ add.s $f2, $f2, $f0 -/* C68EC0 80240D90 26310001 */ addiu $s1, $s1, 1 -/* C68EC4 80240D94 2A220003 */ slti $v0, $s1, 3 -/* C68EC8 80240D98 E602002C */ swc1 $f2, 0x2c($s0) -/* C68ECC 80240D9C 1440FFE2 */ bnez $v0, .L80240D28 -/* C68ED0 80240DA0 26100004 */ addiu $s0, $s0, 4 -/* C68ED4 80240DA4 8E420064 */ lw $v0, 0x64($s2) -/* C68ED8 80240DA8 24420001 */ addiu $v0, $v0, 1 -/* C68EDC 80240DAC AE420064 */ sw $v0, 0x64($s2) -/* C68EE0 80240DB0 28420015 */ slti $v0, $v0, 0x15 -/* C68EE4 80240DB4 14400005 */ bnez $v0, .L80240DCC -/* C68EE8 80240DB8 0000882D */ daddu $s1, $zero, $zero -/* C68EEC 80240DBC 24020002 */ addiu $v0, $zero, 2 -.L80240DC0: -/* C68EF0 80240DC0 AE420004 */ sw $v0, 4($s2) -/* C68EF4 80240DC4 AE400064 */ sw $zero, 0x64($s2) -/* C68EF8 80240DC8 0000882D */ daddu $s1, $zero, $zero -.L80240DCC: -/* C68EFC 80240DCC 0240282D */ daddu $a1, $s2, $zero -.L80240DD0: -/* C68F00 80240DD0 8CA20008 */ lw $v0, 8($a1) -/* C68F04 80240DD4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* C68F08 80240DD8 8C42000C */ lw $v0, 0xc($v0) -/* C68F0C 80240DDC E4400010 */ swc1 $f0, 0x10($v0) -/* C68F10 80240DE0 8CA20008 */ lw $v0, 8($a1) -/* C68F14 80240DE4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* C68F18 80240DE8 8C42000C */ lw $v0, 0xc($v0) -/* C68F1C 80240DEC 26310001 */ addiu $s1, $s1, 1 -/* C68F20 80240DF0 E4400014 */ swc1 $f0, 0x14($v0) -/* C68F24 80240DF4 8CA20008 */ lw $v0, 8($a1) -/* C68F28 80240DF8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* C68F2C 80240DFC 8C42000C */ lw $v0, 0xc($v0) -/* C68F30 80240E00 E4400018 */ swc1 $f0, 0x18($v0) -/* C68F34 80240E04 2A220003 */ slti $v0, $s1, 3 -/* C68F38 80240E08 1440FFF1 */ bnez $v0, .L80240DD0 -/* C68F3C 80240E0C 24A50004 */ addiu $a1, $a1, 4 -/* C68F40 80240E10 0000102D */ daddu $v0, $zero, $zero -.L80240E14: -/* C68F44 80240E14 8FBF0044 */ lw $ra, 0x44($sp) -/* C68F48 80240E18 8FB60040 */ lw $s6, 0x40($sp) -/* C68F4C 80240E1C 8FB5003C */ lw $s5, 0x3c($sp) -/* C68F50 80240E20 8FB40038 */ lw $s4, 0x38($sp) -/* C68F54 80240E24 8FB30034 */ lw $s3, 0x34($sp) -/* C68F58 80240E28 8FB20030 */ lw $s2, 0x30($sp) -/* C68F5C 80240E2C 8FB1002C */ lw $s1, 0x2c($sp) -/* C68F60 80240E30 8FB00028 */ lw $s0, 0x28($sp) -/* C68F64 80240E34 D7B80058 */ ldc1 $f24, 0x58($sp) -/* C68F68 80240E38 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C68F6C 80240E3C D7B40048 */ ldc1 $f20, 0x48($sp) -/* C68F70 80240E40 03E00008 */ jr $ra -/* C68F74 80240E44 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s deleted file mode 100644 index 8a9d310eab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241474_C6F7A4 -/* C6F7A4 80241474 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6F7A8 80241478 AFB00010 */ sw $s0, 0x10($sp) -/* C6F7AC 8024147C 0080802D */ daddu $s0, $a0, $zero -/* C6F7B0 80241480 AFBF0014 */ sw $ra, 0x14($sp) -/* C6F7B4 80241484 8E020148 */ lw $v0, 0x148($s0) -/* C6F7B8 80241488 0C00EABB */ jal get_npc_unsafe -/* C6F7BC 8024148C 84440008 */ lh $a0, 8($v0) -/* C6F7C0 80241490 9443008E */ lhu $v1, 0x8e($v0) -/* C6F7C4 80241494 C440003C */ lwc1 $f0, 0x3c($v0) -/* C6F7C8 80241498 24640001 */ addiu $a0, $v1, 1 -/* C6F7CC 8024149C 00031C00 */ sll $v1, $v1, 0x10 -/* C6F7D0 802414A0 00031B83 */ sra $v1, $v1, 0xe -/* C6F7D4 802414A4 A444008E */ sh $a0, 0x8e($v0) -/* C6F7D8 802414A8 3C018024 */ lui $at, %hi(D_80242B90_C70EC0) -/* C6F7DC 802414AC 00230821 */ addu $at, $at, $v1 -/* C6F7E0 802414B0 C4222B90 */ lwc1 $f2, %lo(D_80242B90_C70EC0)($at) -/* C6F7E4 802414B4 8443008E */ lh $v1, 0x8e($v0) -/* C6F7E8 802414B8 46020000 */ add.s $f0, $f0, $f2 -/* C6F7EC 802414BC 28630005 */ slti $v1, $v1, 5 -/* C6F7F0 802414C0 14600003 */ bnez $v1, .L802414D0 -/* C6F7F4 802414C4 E440003C */ swc1 $f0, 0x3c($v0) -/* C6F7F8 802414C8 2402000C */ addiu $v0, $zero, 0xc -/* C6F7FC 802414CC AE020070 */ sw $v0, 0x70($s0) -.L802414D0: -/* C6F800 802414D0 8FBF0014 */ lw $ra, 0x14($sp) -/* C6F804 802414D4 8FB00010 */ lw $s0, 0x10($sp) -/* C6F808 802414D8 03E00008 */ jr $ra -/* C6F80C 802414DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s deleted file mode 100644 index b2fb75708b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802430A8_C713D8 -.word .L80241C38_C6FF68, .L80241C48_C6FF78, .L80241C60_C6FF90, .L80241C70_C6FFA0, .L80241CF0_C70020, .L80241CF0_C70020, .L80241CF0_C70020, .L80241CF0_C70020, .L80241CF0_C70020, .L80241CF0_C70020, .L80241C88_C6FFB8, .L80241C98_C6FFC8, .L80241CB0_C6FFE0, .L80241CC8_C6FFF8, .L80241CE0_C70010, 0 - -.section .text - -glabel func_80241B2C_C6FE5C -/* C6FE5C 80241B2C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C6FE60 80241B30 AFB40040 */ sw $s4, 0x40($sp) -/* C6FE64 80241B34 0080A02D */ daddu $s4, $a0, $zero -/* C6FE68 80241B38 AFBF0048 */ sw $ra, 0x48($sp) -/* C6FE6C 80241B3C AFB50044 */ sw $s5, 0x44($sp) -/* C6FE70 80241B40 AFB3003C */ sw $s3, 0x3c($sp) -/* C6FE74 80241B44 AFB20038 */ sw $s2, 0x38($sp) -/* C6FE78 80241B48 AFB10034 */ sw $s1, 0x34($sp) -/* C6FE7C 80241B4C AFB00030 */ sw $s0, 0x30($sp) -/* C6FE80 80241B50 8E920148 */ lw $s2, 0x148($s4) -/* C6FE84 80241B54 86440008 */ lh $a0, 8($s2) -/* C6FE88 80241B58 8E90000C */ lw $s0, 0xc($s4) -/* C6FE8C 80241B5C 0C00EABB */ jal get_npc_unsafe -/* C6FE90 80241B60 00A0882D */ daddu $s1, $a1, $zero -/* C6FE94 80241B64 0280202D */ daddu $a0, $s4, $zero -/* C6FE98 80241B68 8E050000 */ lw $a1, ($s0) -/* C6FE9C 80241B6C 0C0B1EAF */ jal evt_get_variable -/* C6FEA0 80241B70 0040A82D */ daddu $s5, $v0, $zero -/* C6FEA4 80241B74 AFA00010 */ sw $zero, 0x10($sp) -/* C6FEA8 80241B78 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEAC 80241B7C 8C630030 */ lw $v1, 0x30($v1) -/* C6FEB0 80241B80 AFA30014 */ sw $v1, 0x14($sp) -/* C6FEB4 80241B84 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEB8 80241B88 8C63001C */ lw $v1, 0x1c($v1) -/* C6FEBC 80241B8C AFA30018 */ sw $v1, 0x18($sp) -/* C6FEC0 80241B90 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEC4 80241B94 8C630024 */ lw $v1, 0x24($v1) -/* C6FEC8 80241B98 AFA3001C */ sw $v1, 0x1c($sp) -/* C6FECC 80241B9C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FED0 80241BA0 8C630028 */ lw $v1, 0x28($v1) -/* C6FED4 80241BA4 27B30010 */ addiu $s3, $sp, 0x10 -/* C6FED8 80241BA8 AFA30020 */ sw $v1, 0x20($sp) -/* C6FEDC 80241BAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEE0 80241BB0 3C0142F0 */ lui $at, 0x42f0 -/* C6FEE4 80241BB4 44810000 */ mtc1 $at, $f0 -/* C6FEE8 80241BB8 8C63002C */ lw $v1, 0x2c($v1) -/* C6FEEC 80241BBC 0040802D */ daddu $s0, $v0, $zero -/* C6FEF0 80241BC0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6FEF4 80241BC4 A7A0002C */ sh $zero, 0x2c($sp) -/* C6FEF8 80241BC8 12200006 */ beqz $s1, .L80241BE4 -/* C6FEFC 80241BCC AFA30024 */ sw $v1, 0x24($sp) -/* C6FF00 80241BD0 02A0202D */ daddu $a0, $s5, $zero -/* C6FF04 80241BD4 0240282D */ daddu $a1, $s2, $zero -/* C6FF08 80241BD8 0280302D */ daddu $a2, $s4, $zero -/* C6FF0C 80241BDC 0C090682 */ jal kzn_07_UnkFunc5 -/* C6FF10 80241BE0 0200382D */ daddu $a3, $s0, $zero -.L80241BE4: -/* C6FF14 80241BE4 2402FFFE */ addiu $v0, $zero, -2 -/* C6FF18 80241BE8 A2A200AB */ sb $v0, 0xab($s5) -/* C6FF1C 80241BEC 8E4300B0 */ lw $v1, 0xb0($s2) -/* C6FF20 80241BF0 30620004 */ andi $v0, $v1, 4 -/* C6FF24 80241BF4 10400007 */ beqz $v0, .L80241C14 -/* C6FF28 80241BF8 00000000 */ nop -/* C6FF2C 80241BFC 824200B4 */ lb $v0, 0xb4($s2) -/* C6FF30 80241C00 1440003C */ bnez $v0, .L80241CF4 -/* C6FF34 80241C04 0000102D */ daddu $v0, $zero, $zero -/* C6FF38 80241C08 2402FFFB */ addiu $v0, $zero, -5 -/* C6FF3C 80241C0C 00621024 */ and $v0, $v1, $v0 -/* C6FF40 80241C10 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241C14: -/* C6FF44 80241C14 8E830070 */ lw $v1, 0x70($s4) -/* C6FF48 80241C18 2C62000F */ sltiu $v0, $v1, 0xf -/* C6FF4C 80241C1C 10400034 */ beqz $v0, .L80241CF0_C70020 -/* C6FF50 80241C20 00031080 */ sll $v0, $v1, 2 -/* C6FF54 80241C24 3C018024 */ lui $at, %hi(jtbl_802430A8_C713D8) -/* C6FF58 80241C28 00220821 */ addu $at, $at, $v0 -/* C6FF5C 80241C2C 8C2230A8 */ lw $v0, %lo(jtbl_802430A8_C713D8)($at) -/* C6FF60 80241C30 00400008 */ jr $v0 -/* C6FF64 80241C34 00000000 */ nop -.L80241C38_C6FF68: -/* C6FF68 80241C38 0280202D */ daddu $a0, $s4, $zero -/* C6FF6C 80241C3C 0200282D */ daddu $a1, $s0, $zero -/* C6FF70 80241C40 0C090208 */ jal kzn_07_UnkNpcAIFunc23 -/* C6FF74 80241C44 0260302D */ daddu $a2, $s3, $zero -.L80241C48_C6FF78: -/* C6FF78 80241C48 0280202D */ daddu $a0, $s4, $zero -/* C6FF7C 80241C4C 0200282D */ daddu $a1, $s0, $zero -/* C6FF80 80241C50 0C090274 */ jal kzn_07_UnkNpcAIFunc35 -/* C6FF84 80241C54 0260302D */ daddu $a2, $s3, $zero -/* C6FF88 80241C58 0809073D */ j .L80241CF4 -/* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero -.L80241C60_C6FF90: -/* C6FF90 80241C60 0280202D */ daddu $a0, $s4, $zero -/* C6FF94 80241C64 0200282D */ daddu $a1, $s0, $zero -/* C6FF98 80241C68 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 -/* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero -.L80241C70_C6FFA0: -/* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero -/* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero -/* C6FFA8 80241C78 0C09042E */ jal kzn_07_UnkFunc4 -/* C6FFAC 80241C7C 0260302D */ daddu $a2, $s3, $zero -/* C6FFB0 80241C80 0809073D */ j .L80241CF4 -/* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero -.L80241C88_C6FFB8: -/* C6FFB8 80241C88 0280202D */ daddu $a0, $s4, $zero -/* C6FFBC 80241C8C 0200282D */ daddu $a1, $s0, $zero -/* C6FFC0 80241C90 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 -/* C6FFC4 80241C94 0260302D */ daddu $a2, $s3, $zero -.L80241C98_C6FFC8: -/* C6FFC8 80241C98 0280202D */ daddu $a0, $s4, $zero -/* C6FFCC 80241C9C 0200282D */ daddu $a1, $s0, $zero -/* C6FFD0 80241CA0 0C09051D */ jal func_80241474_C6F7A4 -/* C6FFD4 80241CA4 0260302D */ daddu $a2, $s3, $zero -/* C6FFD8 80241CA8 0809073D */ j .L80241CF4 -/* C6FFDC 80241CAC 0000102D */ daddu $v0, $zero, $zero -.L80241CB0_C6FFE0: -/* C6FFE0 80241CB0 0280202D */ daddu $a0, $s4, $zero -/* C6FFE4 80241CB4 0200282D */ daddu $a1, $s0, $zero -/* C6FFE8 80241CB8 0C090538 */ jal kzn_07_UnkNpcAIFunc14 -/* C6FFEC 80241CBC 0260302D */ daddu $a2, $s3, $zero -/* C6FFF0 80241CC0 0809073D */ j .L80241CF4 -/* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero -.L80241CC8_C6FFF8: -/* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero -/* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero -/* C70000 80241CD0 0C090585 */ jal kzn_07_UnkNpcAIFunc3 -/* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero -/* C70008 80241CD8 0809073D */ j .L80241CF4 -/* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero -.L80241CE0_C70010: -/* C70010 80241CE0 0280202D */ daddu $a0, $s4, $zero -/* C70014 80241CE4 0200282D */ daddu $a1, $s0, $zero -/* C70018 80241CE8 0C09059E */ jal kzn_07_UnkFunc6 -/* C7001C 80241CEC 0260302D */ daddu $a2, $s3, $zero -.L80241CF0_C70020: -/* C70020 80241CF0 0000102D */ daddu $v0, $zero, $zero -.L80241CF4: -/* C70024 80241CF4 8FBF0048 */ lw $ra, 0x48($sp) -/* C70028 80241CF8 8FB50044 */ lw $s5, 0x44($sp) -/* C7002C 80241CFC 8FB40040 */ lw $s4, 0x40($sp) -/* C70030 80241D00 8FB3003C */ lw $s3, 0x3c($sp) -/* C70034 80241D04 8FB20038 */ lw $s2, 0x38($sp) -/* C70038 80241D08 8FB10034 */ lw $s1, 0x34($sp) -/* C7003C 80241D0C 8FB00030 */ lw $s0, 0x30($sp) -/* C70040 80241D10 03E00008 */ jr $ra -/* C70044 80241D14 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s deleted file mode 100644 index fd7414e73f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802430E8_C71418 -.double 0.06 - -.section .text - -glabel func_80241E48_C70178 -/* C70178 80241E48 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C7017C 80241E4C AFB3004C */ sw $s3, 0x4c($sp) -/* C70180 80241E50 0080982D */ daddu $s3, $a0, $zero -/* C70184 80241E54 AFBF0050 */ sw $ra, 0x50($sp) -/* C70188 80241E58 AFB20048 */ sw $s2, 0x48($sp) -/* C7018C 80241E5C AFB10044 */ sw $s1, 0x44($sp) -/* C70190 80241E60 AFB00040 */ sw $s0, 0x40($sp) -/* C70194 80241E64 8E720148 */ lw $s2, 0x148($s3) -/* C70198 80241E68 00A0882D */ daddu $s1, $a1, $zero -/* C7019C 80241E6C 86440008 */ lh $a0, 8($s2) -/* C701A0 80241E70 0C00EABB */ jal get_npc_unsafe -/* C701A4 80241E74 00C0802D */ daddu $s0, $a2, $zero -/* C701A8 80241E78 0200202D */ daddu $a0, $s0, $zero -/* C701AC 80241E7C 0240282D */ daddu $a1, $s2, $zero -/* C701B0 80241E80 24030001 */ addiu $v1, $zero, 1 -/* C701B4 80241E84 AFA30010 */ sw $v1, 0x10($sp) -/* C701B8 80241E88 8E260024 */ lw $a2, 0x24($s1) -/* C701BC 80241E8C 8E270028 */ lw $a3, 0x28($s1) -/* C701C0 80241E90 0C01242D */ jal func_800490B4 -/* C701C4 80241E94 0040802D */ daddu $s0, $v0, $zero -/* C701C8 80241E98 14400020 */ bnez $v0, .L80241F1C -/* C701CC 80241E9C 24040002 */ addiu $a0, $zero, 2 -/* C701D0 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C701D4 80241EA4 0000302D */ daddu $a2, $zero, $zero -/* C701D8 80241EA8 860300A8 */ lh $v1, 0xa8($s0) -/* C701DC 80241EAC 3C013F80 */ lui $at, 0x3f80 -/* C701E0 80241EB0 44810000 */ mtc1 $at, $f0 -/* C701E4 80241EB4 3C014000 */ lui $at, 0x4000 -/* C701E8 80241EB8 44811000 */ mtc1 $at, $f2 -/* C701EC 80241EBC 3C01C1A0 */ lui $at, 0xc1a0 -/* C701F0 80241EC0 44812000 */ mtc1 $at, $f4 -/* C701F4 80241EC4 2402000F */ addiu $v0, $zero, 0xf -/* C701F8 80241EC8 AFA2001C */ sw $v0, 0x1c($sp) -/* C701FC 80241ECC 44834000 */ mtc1 $v1, $f8 -/* C70200 80241ED0 00000000 */ nop -/* C70204 80241ED4 46804220 */ cvt.s.w $f8, $f8 -/* C70208 80241ED8 44074000 */ mfc1 $a3, $f8 -/* C7020C 80241EDC 27A20028 */ addiu $v0, $sp, 0x28 -/* C70210 80241EE0 AFA20020 */ sw $v0, 0x20($sp) -/* C70214 80241EE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C70218 80241EE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C7021C 80241EEC 0C01BFA4 */ jal fx_emote -/* C70220 80241EF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C70224 80241EF4 8E4200CC */ lw $v0, 0xcc($s2) -/* C70228 80241EF8 8C430000 */ lw $v1, ($v0) -/* C7022C 80241EFC 2402001E */ addiu $v0, $zero, 0x1e -/* C70230 80241F00 A602008E */ sh $v0, 0x8e($s0) -/* C70234 80241F04 24020014 */ addiu $v0, $zero, 0x14 -/* C70238 80241F08 AE030028 */ sw $v1, 0x28($s0) -/* C7023C 80241F0C AE620070 */ sw $v0, 0x70($s3) -/* C70240 80241F10 2402001E */ addiu $v0, $zero, 0x1e -/* C70244 80241F14 0809082B */ j .L802420AC -/* C70248 80241F18 AE420090 */ sw $v0, 0x90($s2) -.L80241F1C: -/* C7024C 80241F1C 8E050018 */ lw $a1, 0x18($s0) -/* C70250 80241F20 8E06000C */ lw $a2, 0xc($s0) -/* C70254 80241F24 0C00EA95 */ jal npc_move_heading -/* C70258 80241F28 0200202D */ daddu $a0, $s0, $zero -/* C7025C 80241F2C 8E020000 */ lw $v0, ($s0) -/* C70260 80241F30 30420008 */ andi $v0, $v0, 8 -/* C70264 80241F34 14400028 */ bnez $v0, .L80241FD8 -/* C70268 80241F38 0000882D */ daddu $s1, $zero, $zero -/* C7026C 80241F3C 27A5002C */ addiu $a1, $sp, 0x2c -/* C70270 80241F40 27A60030 */ addiu $a2, $sp, 0x30 -/* C70274 80241F44 860200A8 */ lh $v0, 0xa8($s0) -/* C70278 80241F48 C6000038 */ lwc1 $f0, 0x38($s0) -/* C7027C 80241F4C 44821000 */ mtc1 $v0, $f2 -/* C70280 80241F50 00000000 */ nop -/* C70284 80241F54 468010A0 */ cvt.s.w $f2, $f2 -/* C70288 80241F58 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C7028C 80241F5C 860200A8 */ lh $v0, 0xa8($s0) -/* C70290 80241F60 C604003C */ lwc1 $f4, 0x3c($s0) -/* C70294 80241F64 C6060040 */ lwc1 $f6, 0x40($s0) -/* C70298 80241F68 44820000 */ mtc1 $v0, $f0 -/* C7029C 80241F6C 00000000 */ nop -/* C702A0 80241F70 46800021 */ cvt.d.w $f0, $f0 -/* C702A4 80241F74 46022100 */ add.s $f4, $f4, $f2 -/* C702A8 80241F78 3C014008 */ lui $at, 0x4008 -/* C702AC 80241F7C 44811800 */ mtc1 $at, $f3 -/* C702B0 80241F80 44801000 */ mtc1 $zero, $f2 -/* C702B4 80241F84 27A20038 */ addiu $v0, $sp, 0x38 -/* C702B8 80241F88 46220000 */ add.d $f0, $f0, $f2 -/* C702BC 80241F8C E7A60034 */ swc1 $f6, 0x34($sp) -/* C702C0 80241F90 E7A40030 */ swc1 $f4, 0x30($sp) -/* C702C4 80241F94 46200020 */ cvt.s.d $f0, $f0 -/* C702C8 80241F98 E7A00038 */ swc1 $f0, 0x38($sp) -/* C702CC 80241F9C AFA20010 */ sw $v0, 0x10($sp) -/* C702D0 80241FA0 8E040080 */ lw $a0, 0x80($s0) -/* C702D4 80241FA4 0C0372DF */ jal npc_raycast_down_sides -/* C702D8 80241FA8 27A70034 */ addiu $a3, $sp, 0x34 -/* C702DC 80241FAC 1040000A */ beqz $v0, .L80241FD8 -/* C702E0 80241FB0 00000000 */ nop -/* C702E4 80241FB4 860200A8 */ lh $v0, 0xa8($s0) -/* C702E8 80241FB8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C702EC 80241FBC 44820000 */ mtc1 $v0, $f0 -/* C702F0 80241FC0 00000000 */ nop -/* C702F4 80241FC4 46800020 */ cvt.s.w $f0, $f0 -/* C702F8 80241FC8 4600103C */ c.lt.s $f2, $f0 -/* C702FC 80241FCC 00000000 */ nop -/* C70300 80241FD0 45030001 */ bc1tl .L80241FD8 -/* C70304 80241FD4 24110001 */ addiu $s1, $zero, 1 -.L80241FD8: -/* C70308 80241FD8 12200008 */ beqz $s1, .L80241FFC -/* C7030C 80241FDC 00000000 */ nop -/* C70310 80241FE0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C70314 80241FE4 3C013FF0 */ lui $at, 0x3ff0 -/* C70318 80241FE8 44811800 */ mtc1 $at, $f3 -/* C7031C 80241FEC 44801000 */ mtc1 $zero, $f2 -/* C70320 80241FF0 46000021 */ cvt.d.s $f0, $f0 -/* C70324 80241FF4 08090821 */ j .L80242084 -/* C70328 80241FF8 46220000 */ add.d $f0, $f0, $f2 -.L80241FFC: -/* C7032C 80241FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C70330 80242000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C70334 80242004 3C014018 */ lui $at, 0x4018 -/* C70338 80242008 44811800 */ mtc1 $at, $f3 -/* C7033C 8024200C 44801000 */ mtc1 $zero, $f2 -/* C70340 80242010 C440002C */ lwc1 $f0, 0x2c($v0) -/* C70344 80242014 C604003C */ lwc1 $f4, 0x3c($s0) -/* C70348 80242018 46000021 */ cvt.d.s $f0, $f0 -/* C7034C 8024201C 46220000 */ add.d $f0, $f0, $f2 -/* C70350 80242020 46002121 */ cvt.d.s $f4, $f4 -/* C70354 80242024 46202001 */ sub.d $f0, $f4, $f0 -/* C70358 80242028 462001A0 */ cvt.s.d $f6, $f0 -/* C7035C 8024202C 44800000 */ mtc1 $zero, $f0 -/* C70360 80242030 44800800 */ mtc1 $zero, $f1 -/* C70364 80242034 460030A1 */ cvt.d.s $f2, $f6 -/* C70368 80242038 4620103C */ c.lt.d $f2, $f0 -/* C7036C 8024203C 00000000 */ nop -/* C70370 80242040 45010009 */ bc1t .L80242068 -/* C70374 80242044 00000000 */ nop -/* C70378 80242048 3C014010 */ lui $at, 0x4010 -/* C7037C 8024204C 44810800 */ mtc1 $at, $f1 -/* C70380 80242050 44800000 */ mtc1 $zero, $f0 -/* C70384 80242054 00000000 */ nop -/* C70388 80242058 4622003C */ c.lt.d $f0, $f2 -/* C7038C 8024205C 00000000 */ nop -/* C70390 80242060 4500000A */ bc1f .L8024208C -/* C70394 80242064 00000000 */ nop -.L80242068: -/* C70398 80242068 3C018024 */ lui $at, %hi(D_802430E8_C71418) -/* C7039C 8024206C D42230E8 */ ldc1 $f2, %lo(D_802430E8_C71418)($at) -/* C703A0 80242070 46003187 */ neg.s $f6, $f6 -/* C703A4 80242074 46003021 */ cvt.d.s $f0, $f6 -/* C703A8 80242078 46220002 */ mul.d $f0, $f0, $f2 -/* C703AC 8024207C 00000000 */ nop -/* C703B0 80242080 46202000 */ add.d $f0, $f4, $f0 -.L80242084: -/* C703B4 80242084 46200020 */ cvt.s.d $f0, $f0 -/* C703B8 80242088 E600003C */ swc1 $f0, 0x3c($s0) -.L8024208C: -/* C703BC 8024208C 8602008E */ lh $v0, 0x8e($s0) -/* C703C0 80242090 9603008E */ lhu $v1, 0x8e($s0) -/* C703C4 80242094 18400003 */ blez $v0, .L802420A4 -/* C703C8 80242098 2462FFFF */ addiu $v0, $v1, -1 -/* C703CC 8024209C 0809082B */ j .L802420AC -/* C703D0 802420A0 A602008E */ sh $v0, 0x8e($s0) -.L802420A4: -/* C703D4 802420A4 2402000C */ addiu $v0, $zero, 0xc -/* C703D8 802420A8 AE620070 */ sw $v0, 0x70($s3) -.L802420AC: -/* C703DC 802420AC 8FBF0050 */ lw $ra, 0x50($sp) -/* C703E0 802420B0 8FB3004C */ lw $s3, 0x4c($sp) -/* C703E4 802420B4 8FB20048 */ lw $s2, 0x48($sp) -/* C703E8 802420B8 8FB10044 */ lw $s1, 0x44($sp) -/* C703EC 802420BC 8FB00040 */ lw $s0, 0x40($sp) -/* C703F0 802420C0 03E00008 */ jr $ra -/* C703F4 802420C4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s deleted file mode 100644 index 83ee654c48..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802430F0_C71420 -.word .L80242234_C70564, .L80242244_C70574, .L8024225C_C7058C, .L8024226C_C7059C, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L80242284_C705B4, .L80242294_C705C4, .L802422AC_C705DC, .L802422BC_C705EC, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L802422E4_C70614, .L802422D4_C70604, 0, 0, 0 - -.section .text - -glabel func_80242124_C70454 -/* C70454 80242124 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C70458 80242128 AFB40040 */ sw $s4, 0x40($sp) -/* C7045C 8024212C 0080A02D */ daddu $s4, $a0, $zero -/* C70460 80242130 AFBF0048 */ sw $ra, 0x48($sp) -/* C70464 80242134 AFB50044 */ sw $s5, 0x44($sp) -/* C70468 80242138 AFB3003C */ sw $s3, 0x3c($sp) -/* C7046C 8024213C AFB20038 */ sw $s2, 0x38($sp) -/* C70470 80242140 AFB10034 */ sw $s1, 0x34($sp) -/* C70474 80242144 AFB00030 */ sw $s0, 0x30($sp) -/* C70478 80242148 8E920148 */ lw $s2, 0x148($s4) -/* C7047C 8024214C 86440008 */ lh $a0, 8($s2) -/* C70480 80242150 8E90000C */ lw $s0, 0xc($s4) -/* C70484 80242154 0C00EABB */ jal get_npc_unsafe -/* C70488 80242158 00A0882D */ daddu $s1, $a1, $zero -/* C7048C 8024215C 0280202D */ daddu $a0, $s4, $zero -/* C70490 80242160 8E050000 */ lw $a1, ($s0) -/* C70494 80242164 0C0B1EAF */ jal evt_get_variable -/* C70498 80242168 0040A82D */ daddu $s5, $v0, $zero -/* C7049C 8024216C AFA00010 */ sw $zero, 0x10($sp) -/* C704A0 80242170 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704A4 80242174 8C630030 */ lw $v1, 0x30($v1) -/* C704A8 80242178 AFA30014 */ sw $v1, 0x14($sp) -/* C704AC 8024217C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704B0 80242180 8C63001C */ lw $v1, 0x1c($v1) -/* C704B4 80242184 AFA30018 */ sw $v1, 0x18($sp) -/* C704B8 80242188 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704BC 8024218C 8C630024 */ lw $v1, 0x24($v1) -/* C704C0 80242190 AFA3001C */ sw $v1, 0x1c($sp) -/* C704C4 80242194 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704C8 80242198 8C630028 */ lw $v1, 0x28($v1) -/* C704CC 8024219C 27B30010 */ addiu $s3, $sp, 0x10 -/* C704D0 802421A0 AFA30020 */ sw $v1, 0x20($sp) -/* C704D4 802421A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704D8 802421A8 3C0142F0 */ lui $at, 0x42f0 -/* C704DC 802421AC 44810000 */ mtc1 $at, $f0 -/* C704E0 802421B0 8C63002C */ lw $v1, 0x2c($v1) -/* C704E4 802421B4 0040802D */ daddu $s0, $v0, $zero -/* C704E8 802421B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C704EC 802421BC A7A0002C */ sh $zero, 0x2c($sp) -/* C704F0 802421C0 12200007 */ beqz $s1, .L802421E0 -/* C704F4 802421C4 AFA30024 */ sw $v1, 0x24($sp) -/* C704F8 802421C8 02A0202D */ daddu $a0, $s5, $zero -/* C704FC 802421CC 0240282D */ daddu $a1, $s2, $zero -/* C70500 802421D0 0280302D */ daddu $a2, $s4, $zero -/* C70504 802421D4 0C090682 */ jal kzn_07_UnkFunc5 -/* C70508 802421D8 0200382D */ daddu $a3, $s0, $zero -/* C7050C 802421DC AE800070 */ sw $zero, 0x70($s4) -.L802421E0: -/* C70510 802421E0 2402FFFE */ addiu $v0, $zero, -2 -/* C70514 802421E4 A2A200AB */ sb $v0, 0xab($s5) -/* C70518 802421E8 8E4300B0 */ lw $v1, 0xb0($s2) -/* C7051C 802421EC 30620004 */ andi $v0, $v1, 4 -/* C70520 802421F0 10400007 */ beqz $v0, .L80242210 -/* C70524 802421F4 00000000 */ nop -/* C70528 802421F8 824200B4 */ lb $v0, 0xb4($s2) -/* C7052C 802421FC 1440003A */ bnez $v0, .L802422E8 -/* C70530 80242200 0000102D */ daddu $v0, $zero, $zero -/* C70534 80242204 2402FFFB */ addiu $v0, $zero, -5 -/* C70538 80242208 00621024 */ and $v0, $v1, $v0 -/* C7053C 8024220C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242210: -/* C70540 80242210 8E830070 */ lw $v1, 0x70($s4) -/* C70544 80242214 2C620015 */ sltiu $v0, $v1, 0x15 -/* C70548 80242218 10400032 */ beqz $v0, .L802422E4_C70614 -/* C7054C 8024221C 00031080 */ sll $v0, $v1, 2 -/* C70550 80242220 3C018024 */ lui $at, %hi(jtbl_802430F0_C71420) -/* C70554 80242224 00220821 */ addu $at, $at, $v0 -/* C70558 80242228 8C2230F0 */ lw $v0, %lo(jtbl_802430F0_C71420)($at) -/* C7055C 8024222C 00400008 */ jr $v0 -/* C70560 80242230 00000000 */ nop -.L80242234_C70564: -/* C70564 80242234 0280202D */ daddu $a0, $s4, $zero -/* C70568 80242238 0200282D */ daddu $a1, $s0, $zero -/* C7056C 8024223C 0C090208 */ jal kzn_07_UnkNpcAIFunc23 -/* C70570 80242240 0260302D */ daddu $a2, $s3, $zero -.L80242244_C70574: -/* C70574 80242244 0280202D */ daddu $a0, $s4, $zero -/* C70578 80242248 0200282D */ daddu $a1, $s0, $zero -/* C7057C 8024224C 0C090274 */ jal kzn_07_UnkNpcAIFunc35 -/* C70580 80242250 0260302D */ daddu $a2, $s3, $zero -/* C70584 80242254 080908BA */ j .L802422E8 -/* C70588 80242258 0000102D */ daddu $v0, $zero, $zero -.L8024225C_C7058C: -/* C7058C 8024225C 0280202D */ daddu $a0, $s4, $zero -/* C70590 80242260 0200282D */ daddu $a1, $s0, $zero -/* C70594 80242264 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 -/* C70598 80242268 0260302D */ daddu $a2, $s3, $zero -.L8024226C_C7059C: -/* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero -/* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero -/* C705A4 80242274 0C09042E */ jal kzn_07_UnkFunc4 -/* C705A8 80242278 0260302D */ daddu $a2, $s3, $zero -/* C705AC 8024227C 080908BA */ j .L802422E8 -/* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero -.L80242284_C705B4: -/* C705B4 80242284 0280202D */ daddu $a0, $s4, $zero -/* C705B8 80242288 0200282D */ daddu $a1, $s0, $zero -/* C705BC 8024228C 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 -/* C705C0 80242290 0260302D */ daddu $a2, $s3, $zero -.L80242294_C705C4: -/* C705C4 80242294 0280202D */ daddu $a0, $s4, $zero -/* C705C8 80242298 0200282D */ daddu $a1, $s0, $zero -/* C705CC 8024229C 0C09051D */ jal func_80241474_C6F7A4 -/* C705D0 802422A0 0260302D */ daddu $a2, $s3, $zero -/* C705D4 802422A4 080908BA */ j .L802422E8 -/* C705D8 802422A8 0000102D */ daddu $v0, $zero, $zero -.L802422AC_C705DC: -/* C705DC 802422AC 0280202D */ daddu $a0, $s4, $zero -/* C705E0 802422B0 0200282D */ daddu $a1, $s0, $zero -/* C705E4 802422B4 0C090746 */ jal kzn_07_UnkNpcAIFunc13 -/* C705E8 802422B8 0260302D */ daddu $a2, $s3, $zero -.L802422BC_C705EC: -/* C705EC 802422BC 0280202D */ daddu $a0, $s4, $zero -/* C705F0 802422C0 0200282D */ daddu $a1, $s0, $zero -/* C705F4 802422C4 0C090792 */ jal func_80241E48_C70178 -/* C705F8 802422C8 0260302D */ daddu $a2, $s3, $zero -/* C705FC 802422CC 080908BA */ j .L802422E8 -/* C70600 802422D0 0000102D */ daddu $v0, $zero, $zero -.L802422D4_C70604: -/* C70604 802422D4 0280202D */ daddu $a0, $s4, $zero -/* C70608 802422D8 0200282D */ daddu $a1, $s0, $zero -/* C7060C 802422DC 0C090832 */ jal kzn_07_UnkFunc45 -/* C70610 802422E0 0260302D */ daddu $a2, $s3, $zero -.L802422E4_C70614: -/* C70614 802422E4 0000102D */ daddu $v0, $zero, $zero -.L802422E8: -/* C70618 802422E8 8FBF0048 */ lw $ra, 0x48($sp) -/* C7061C 802422EC 8FB50044 */ lw $s5, 0x44($sp) -/* C70620 802422F0 8FB40040 */ lw $s4, 0x40($sp) -/* C70624 802422F4 8FB3003C */ lw $s3, 0x3c($sp) -/* C70628 802422F8 8FB20038 */ lw $s2, 0x38($sp) -/* C7062C 802422FC 8FB10034 */ lw $s1, 0x34($sp) -/* C70630 80242300 8FB00030 */ lw $s0, 0x30($sp) -/* C70634 80242304 03E00008 */ jr $ra -/* C70638 80242308 27BD0050 */ addiu $sp, $sp, 0x50 -/* C7063C 8024230C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s deleted file mode 100644 index ea874cc6ae..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416A4_C72B24 -/* C72B24 802416A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C72B28 802416A8 AFB00010 */ sw $s0, 0x10($sp) -/* C72B2C 802416AC 0080802D */ daddu $s0, $a0, $zero -/* C72B30 802416B0 AFBF0014 */ sw $ra, 0x14($sp) -/* C72B34 802416B4 8E020148 */ lw $v0, 0x148($s0) -/* C72B38 802416B8 0C00EABB */ jal get_npc_unsafe -/* C72B3C 802416BC 84440008 */ lh $a0, 8($v0) -/* C72B40 802416C0 9443008E */ lhu $v1, 0x8e($v0) -/* C72B44 802416C4 C440003C */ lwc1 $f0, 0x3c($v0) -/* C72B48 802416C8 24640001 */ addiu $a0, $v1, 1 -/* C72B4C 802416CC 00031C00 */ sll $v1, $v1, 0x10 -/* C72B50 802416D0 00031B83 */ sra $v1, $v1, 0xe -/* C72B54 802416D4 A444008E */ sh $a0, 0x8e($v0) -/* C72B58 802416D8 3C018024 */ lui $at, %hi(D_80244DA0_C76220) -/* C72B5C 802416DC 00230821 */ addu $at, $at, $v1 -/* C72B60 802416E0 C4224DA0 */ lwc1 $f2, %lo(D_80244DA0_C76220)($at) -/* C72B64 802416E4 8443008E */ lh $v1, 0x8e($v0) -/* C72B68 802416E8 46020000 */ add.s $f0, $f0, $f2 -/* C72B6C 802416EC 28630005 */ slti $v1, $v1, 5 -/* C72B70 802416F0 14600003 */ bnez $v1, .L80241700 -/* C72B74 802416F4 E440003C */ swc1 $f0, 0x3c($v0) -/* C72B78 802416F8 2402000C */ addiu $v0, $zero, 0xc -/* C72B7C 802416FC AE020070 */ sw $v0, 0x70($s0) -.L80241700: -/* C72B80 80241700 8FBF0014 */ lw $ra, 0x14($sp) -/* C72B84 80241704 8FB00010 */ lw $s0, 0x10($sp) -/* C72B88 80241708 03E00008 */ jr $ra -/* C72B8C 8024170C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s deleted file mode 100644 index 4e04291c51..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802455F8_C76A78 -.word .L80241E68_C732E8, .L80241E78_C732F8, .L80241E90_C73310, .L80241EA0_C73320, .L80241F20_C733A0, .L80241F20_C733A0, .L80241F20_C733A0, .L80241F20_C733A0, .L80241F20_C733A0, .L80241F20_C733A0, .L80241EB8_C73338, .L80241EC8_C73348, .L80241EE0_C73360, .L80241EF8_C73378, .L80241F10_C73390, 0 - -.section .text - -glabel func_80241D5C_C731DC -/* C731DC 80241D5C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C731E0 80241D60 AFB40040 */ sw $s4, 0x40($sp) -/* C731E4 80241D64 0080A02D */ daddu $s4, $a0, $zero -/* C731E8 80241D68 AFBF0048 */ sw $ra, 0x48($sp) -/* C731EC 80241D6C AFB50044 */ sw $s5, 0x44($sp) -/* C731F0 80241D70 AFB3003C */ sw $s3, 0x3c($sp) -/* C731F4 80241D74 AFB20038 */ sw $s2, 0x38($sp) -/* C731F8 80241D78 AFB10034 */ sw $s1, 0x34($sp) -/* C731FC 80241D7C AFB00030 */ sw $s0, 0x30($sp) -/* C73200 80241D80 8E920148 */ lw $s2, 0x148($s4) -/* C73204 80241D84 86440008 */ lh $a0, 8($s2) -/* C73208 80241D88 8E90000C */ lw $s0, 0xc($s4) -/* C7320C 80241D8C 0C00EABB */ jal get_npc_unsafe -/* C73210 80241D90 00A0882D */ daddu $s1, $a1, $zero -/* C73214 80241D94 0280202D */ daddu $a0, $s4, $zero -/* C73218 80241D98 8E050000 */ lw $a1, ($s0) -/* C7321C 80241D9C 0C0B1EAF */ jal evt_get_variable -/* C73220 80241DA0 0040A82D */ daddu $s5, $v0, $zero -/* C73224 80241DA4 AFA00010 */ sw $zero, 0x10($sp) -/* C73228 80241DA8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C7322C 80241DAC 8C630030 */ lw $v1, 0x30($v1) -/* C73230 80241DB0 AFA30014 */ sw $v1, 0x14($sp) -/* C73234 80241DB4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73238 80241DB8 8C63001C */ lw $v1, 0x1c($v1) -/* C7323C 80241DBC AFA30018 */ sw $v1, 0x18($sp) -/* C73240 80241DC0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73244 80241DC4 8C630024 */ lw $v1, 0x24($v1) -/* C73248 80241DC8 AFA3001C */ sw $v1, 0x1c($sp) -/* C7324C 80241DCC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73250 80241DD0 8C630028 */ lw $v1, 0x28($v1) -/* C73254 80241DD4 27B30010 */ addiu $s3, $sp, 0x10 -/* C73258 80241DD8 AFA30020 */ sw $v1, 0x20($sp) -/* C7325C 80241DDC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73260 80241DE0 3C0142F0 */ lui $at, 0x42f0 -/* C73264 80241DE4 44810000 */ mtc1 $at, $f0 -/* C73268 80241DE8 8C63002C */ lw $v1, 0x2c($v1) -/* C7326C 80241DEC 0040802D */ daddu $s0, $v0, $zero -/* C73270 80241DF0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C73274 80241DF4 A7A0002C */ sh $zero, 0x2c($sp) -/* C73278 80241DF8 12200006 */ beqz $s1, .L80241E14 -/* C7327C 80241DFC AFA30024 */ sw $v1, 0x24($sp) -/* C73280 80241E00 02A0202D */ daddu $a0, $s5, $zero -/* C73284 80241E04 0240282D */ daddu $a1, $s2, $zero -/* C73288 80241E08 0280302D */ daddu $a2, $s4, $zero -/* C7328C 80241E0C 0C09070E */ jal kzn_08_UnkFunc5 -/* C73290 80241E10 0200382D */ daddu $a3, $s0, $zero -.L80241E14: -/* C73294 80241E14 2402FFFE */ addiu $v0, $zero, -2 -/* C73298 80241E18 A2A200AB */ sb $v0, 0xab($s5) -/* C7329C 80241E1C 8E4300B0 */ lw $v1, 0xb0($s2) -/* C732A0 80241E20 30620004 */ andi $v0, $v1, 4 -/* C732A4 80241E24 10400007 */ beqz $v0, .L80241E44 -/* C732A8 80241E28 00000000 */ nop -/* C732AC 80241E2C 824200B4 */ lb $v0, 0xb4($s2) -/* C732B0 80241E30 1440003C */ bnez $v0, .L80241F24 -/* C732B4 80241E34 0000102D */ daddu $v0, $zero, $zero -/* C732B8 80241E38 2402FFFB */ addiu $v0, $zero, -5 -/* C732BC 80241E3C 00621024 */ and $v0, $v1, $v0 -/* C732C0 80241E40 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E44: -/* C732C4 80241E44 8E830070 */ lw $v1, 0x70($s4) -/* C732C8 80241E48 2C62000F */ sltiu $v0, $v1, 0xf -/* C732CC 80241E4C 10400034 */ beqz $v0, .L80241F20_C733A0 -/* C732D0 80241E50 00031080 */ sll $v0, $v1, 2 -/* C732D4 80241E54 3C018024 */ lui $at, %hi(jtbl_802455F8_C76A78) -/* C732D8 80241E58 00220821 */ addu $at, $at, $v0 -/* C732DC 80241E5C 8C2255F8 */ lw $v0, %lo(jtbl_802455F8_C76A78)($at) -/* C732E0 80241E60 00400008 */ jr $v0 -/* C732E4 80241E64 00000000 */ nop -.L80241E68_C732E8: -/* C732E8 80241E68 0280202D */ daddu $a0, $s4, $zero -/* C732EC 80241E6C 0200282D */ daddu $a1, $s0, $zero -/* C732F0 80241E70 0C090294 */ jal kzn_08_UnkNpcAIFunc23 -/* C732F4 80241E74 0260302D */ daddu $a2, $s3, $zero -.L80241E78_C732F8: -/* C732F8 80241E78 0280202D */ daddu $a0, $s4, $zero -/* C732FC 80241E7C 0200282D */ daddu $a1, $s0, $zero -/* C73300 80241E80 0C090300 */ jal kzn_08_UnkNpcAIFunc35 -/* C73304 80241E84 0260302D */ daddu $a2, $s3, $zero -/* C73308 80241E88 080907C9 */ j .L80241F24 -/* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero -.L80241E90_C73310: -/* C73310 80241E90 0280202D */ daddu $a0, $s4, $zero -/* C73314 80241E94 0200282D */ daddu $a1, $s0, $zero -/* C73318 80241E98 0C09048A */ jal kzn_08_UnkNpcAIFunc1 -/* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero -.L80241EA0_C73320: -/* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero -/* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero -/* C73328 80241EA8 0C0904BA */ jal kzn_08_UnkFunc4 -/* C7332C 80241EAC 0260302D */ daddu $a2, $s3, $zero -/* C73330 80241EB0 080907C9 */ j .L80241F24 -/* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero -.L80241EB8_C73338: -/* C73338 80241EB8 0280202D */ daddu $a0, $s4, $zero -/* C7333C 80241EBC 0200282D */ daddu $a1, $s0, $zero -/* C73340 80241EC0 0C09058B */ jal kzn_08_UnkNpcAIFunc2 -/* C73344 80241EC4 0260302D */ daddu $a2, $s3, $zero -.L80241EC8_C73348: -/* C73348 80241EC8 0280202D */ daddu $a0, $s4, $zero -/* C7334C 80241ECC 0200282D */ daddu $a1, $s0, $zero -/* C73350 80241ED0 0C0905A9 */ jal func_802416A4_C72B24 -/* C73354 80241ED4 0260302D */ daddu $a2, $s3, $zero -/* C73358 80241ED8 080907C9 */ j .L80241F24 -/* C7335C 80241EDC 0000102D */ daddu $v0, $zero, $zero -.L80241EE0_C73360: -/* C73360 80241EE0 0280202D */ daddu $a0, $s4, $zero -/* C73364 80241EE4 0200282D */ daddu $a1, $s0, $zero -/* C73368 80241EE8 0C0905C4 */ jal kzn_08_UnkNpcAIFunc14 -/* C7336C 80241EEC 0260302D */ daddu $a2, $s3, $zero -/* C73370 80241EF0 080907C9 */ j .L80241F24 -/* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero -.L80241EF8_C73378: -/* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero -/* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero -/* C73380 80241F00 0C090611 */ jal kzn_08_UnkNpcAIFunc3 -/* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero -/* C73388 80241F08 080907C9 */ j .L80241F24 -/* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero -.L80241F10_C73390: -/* C73390 80241F10 0280202D */ daddu $a0, $s4, $zero -/* C73394 80241F14 0200282D */ daddu $a1, $s0, $zero -/* C73398 80241F18 0C09062A */ jal kzn_08_UnkFunc6 -/* C7339C 80241F1C 0260302D */ daddu $a2, $s3, $zero -.L80241F20_C733A0: -/* C733A0 80241F20 0000102D */ daddu $v0, $zero, $zero -.L80241F24: -/* C733A4 80241F24 8FBF0048 */ lw $ra, 0x48($sp) -/* C733A8 80241F28 8FB50044 */ lw $s5, 0x44($sp) -/* C733AC 80241F2C 8FB40040 */ lw $s4, 0x40($sp) -/* C733B0 80241F30 8FB3003C */ lw $s3, 0x3c($sp) -/* C733B4 80241F34 8FB20038 */ lw $s2, 0x38($sp) -/* C733B8 80241F38 8FB10034 */ lw $s1, 0x34($sp) -/* C733BC 80241F3C 8FB00030 */ lw $s0, 0x30($sp) -/* C733C0 80241F40 03E00008 */ jr $ra -/* C733C4 80241F44 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s deleted file mode 100644 index cc2c2d3469..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245638_C76AB8 -.double 0.06 - -.section .text - -glabel func_80242078_C734F8 -/* C734F8 80242078 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C734FC 8024207C AFB3004C */ sw $s3, 0x4c($sp) -/* C73500 80242080 0080982D */ daddu $s3, $a0, $zero -/* C73504 80242084 AFBF0050 */ sw $ra, 0x50($sp) -/* C73508 80242088 AFB20048 */ sw $s2, 0x48($sp) -/* C7350C 8024208C AFB10044 */ sw $s1, 0x44($sp) -/* C73510 80242090 AFB00040 */ sw $s0, 0x40($sp) -/* C73514 80242094 8E720148 */ lw $s2, 0x148($s3) -/* C73518 80242098 00A0882D */ daddu $s1, $a1, $zero -/* C7351C 8024209C 86440008 */ lh $a0, 8($s2) -/* C73520 802420A0 0C00EABB */ jal get_npc_unsafe -/* C73524 802420A4 00C0802D */ daddu $s0, $a2, $zero -/* C73528 802420A8 0200202D */ daddu $a0, $s0, $zero -/* C7352C 802420AC 0240282D */ daddu $a1, $s2, $zero -/* C73530 802420B0 24030001 */ addiu $v1, $zero, 1 -/* C73534 802420B4 AFA30010 */ sw $v1, 0x10($sp) -/* C73538 802420B8 8E260024 */ lw $a2, 0x24($s1) -/* C7353C 802420BC 8E270028 */ lw $a3, 0x28($s1) -/* C73540 802420C0 0C01242D */ jal func_800490B4 -/* C73544 802420C4 0040802D */ daddu $s0, $v0, $zero -/* C73548 802420C8 14400020 */ bnez $v0, .L8024214C -/* C7354C 802420CC 24040002 */ addiu $a0, $zero, 2 -/* C73550 802420D0 0200282D */ daddu $a1, $s0, $zero -/* C73554 802420D4 0000302D */ daddu $a2, $zero, $zero -/* C73558 802420D8 860300A8 */ lh $v1, 0xa8($s0) -/* C7355C 802420DC 3C013F80 */ lui $at, 0x3f80 -/* C73560 802420E0 44810000 */ mtc1 $at, $f0 -/* C73564 802420E4 3C014000 */ lui $at, 0x4000 -/* C73568 802420E8 44811000 */ mtc1 $at, $f2 -/* C7356C 802420EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C73570 802420F0 44812000 */ mtc1 $at, $f4 -/* C73574 802420F4 2402000F */ addiu $v0, $zero, 0xf -/* C73578 802420F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C7357C 802420FC 44834000 */ mtc1 $v1, $f8 -/* C73580 80242100 00000000 */ nop -/* C73584 80242104 46804220 */ cvt.s.w $f8, $f8 -/* C73588 80242108 44074000 */ mfc1 $a3, $f8 -/* C7358C 8024210C 27A20028 */ addiu $v0, $sp, 0x28 -/* C73590 80242110 AFA20020 */ sw $v0, 0x20($sp) -/* C73594 80242114 E7A00010 */ swc1 $f0, 0x10($sp) -/* C73598 80242118 E7A20014 */ swc1 $f2, 0x14($sp) -/* C7359C 8024211C 0C01BFA4 */ jal fx_emote -/* C735A0 80242120 E7A40018 */ swc1 $f4, 0x18($sp) -/* C735A4 80242124 8E4200CC */ lw $v0, 0xcc($s2) -/* C735A8 80242128 8C430000 */ lw $v1, ($v0) -/* C735AC 8024212C 2402001E */ addiu $v0, $zero, 0x1e -/* C735B0 80242130 A602008E */ sh $v0, 0x8e($s0) -/* C735B4 80242134 24020014 */ addiu $v0, $zero, 0x14 -/* C735B8 80242138 AE030028 */ sw $v1, 0x28($s0) -/* C735BC 8024213C AE620070 */ sw $v0, 0x70($s3) -/* C735C0 80242140 2402001E */ addiu $v0, $zero, 0x1e -/* C735C4 80242144 080908B7 */ j .L802422DC -/* C735C8 80242148 AE420090 */ sw $v0, 0x90($s2) -.L8024214C: -/* C735CC 8024214C 8E050018 */ lw $a1, 0x18($s0) -/* C735D0 80242150 8E06000C */ lw $a2, 0xc($s0) -/* C735D4 80242154 0C00EA95 */ jal npc_move_heading -/* C735D8 80242158 0200202D */ daddu $a0, $s0, $zero -/* C735DC 8024215C 8E020000 */ lw $v0, ($s0) -/* C735E0 80242160 30420008 */ andi $v0, $v0, 8 -/* C735E4 80242164 14400028 */ bnez $v0, .L80242208 -/* C735E8 80242168 0000882D */ daddu $s1, $zero, $zero -/* C735EC 8024216C 27A5002C */ addiu $a1, $sp, 0x2c -/* C735F0 80242170 27A60030 */ addiu $a2, $sp, 0x30 -/* C735F4 80242174 860200A8 */ lh $v0, 0xa8($s0) -/* C735F8 80242178 C6000038 */ lwc1 $f0, 0x38($s0) -/* C735FC 8024217C 44821000 */ mtc1 $v0, $f2 -/* C73600 80242180 00000000 */ nop -/* C73604 80242184 468010A0 */ cvt.s.w $f2, $f2 -/* C73608 80242188 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C7360C 8024218C 860200A8 */ lh $v0, 0xa8($s0) -/* C73610 80242190 C604003C */ lwc1 $f4, 0x3c($s0) -/* C73614 80242194 C6060040 */ lwc1 $f6, 0x40($s0) -/* C73618 80242198 44820000 */ mtc1 $v0, $f0 -/* C7361C 8024219C 00000000 */ nop -/* C73620 802421A0 46800021 */ cvt.d.w $f0, $f0 -/* C73624 802421A4 46022100 */ add.s $f4, $f4, $f2 -/* C73628 802421A8 3C014008 */ lui $at, 0x4008 -/* C7362C 802421AC 44811800 */ mtc1 $at, $f3 -/* C73630 802421B0 44801000 */ mtc1 $zero, $f2 -/* C73634 802421B4 27A20038 */ addiu $v0, $sp, 0x38 -/* C73638 802421B8 46220000 */ add.d $f0, $f0, $f2 -/* C7363C 802421BC E7A60034 */ swc1 $f6, 0x34($sp) -/* C73640 802421C0 E7A40030 */ swc1 $f4, 0x30($sp) -/* C73644 802421C4 46200020 */ cvt.s.d $f0, $f0 -/* C73648 802421C8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C7364C 802421CC AFA20010 */ sw $v0, 0x10($sp) -/* C73650 802421D0 8E040080 */ lw $a0, 0x80($s0) -/* C73654 802421D4 0C0372DF */ jal npc_raycast_down_sides -/* C73658 802421D8 27A70034 */ addiu $a3, $sp, 0x34 -/* C7365C 802421DC 1040000A */ beqz $v0, .L80242208 -/* C73660 802421E0 00000000 */ nop -/* C73664 802421E4 860200A8 */ lh $v0, 0xa8($s0) -/* C73668 802421E8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C7366C 802421EC 44820000 */ mtc1 $v0, $f0 -/* C73670 802421F0 00000000 */ nop -/* C73674 802421F4 46800020 */ cvt.s.w $f0, $f0 -/* C73678 802421F8 4600103C */ c.lt.s $f2, $f0 -/* C7367C 802421FC 00000000 */ nop -/* C73680 80242200 45030001 */ bc1tl .L80242208 -/* C73684 80242204 24110001 */ addiu $s1, $zero, 1 -.L80242208: -/* C73688 80242208 12200008 */ beqz $s1, .L8024222C -/* C7368C 8024220C 00000000 */ nop -/* C73690 80242210 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C73694 80242214 3C013FF0 */ lui $at, 0x3ff0 -/* C73698 80242218 44811800 */ mtc1 $at, $f3 -/* C7369C 8024221C 44801000 */ mtc1 $zero, $f2 -/* C736A0 80242220 46000021 */ cvt.d.s $f0, $f0 -/* C736A4 80242224 080908AD */ j .L802422B4 -/* C736A8 80242228 46220000 */ add.d $f0, $f0, $f2 -.L8024222C: -/* C736AC 8024222C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C736B0 80242230 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C736B4 80242234 3C014018 */ lui $at, 0x4018 -/* C736B8 80242238 44811800 */ mtc1 $at, $f3 -/* C736BC 8024223C 44801000 */ mtc1 $zero, $f2 -/* C736C0 80242240 C440002C */ lwc1 $f0, 0x2c($v0) -/* C736C4 80242244 C604003C */ lwc1 $f4, 0x3c($s0) -/* C736C8 80242248 46000021 */ cvt.d.s $f0, $f0 -/* C736CC 8024224C 46220000 */ add.d $f0, $f0, $f2 -/* C736D0 80242250 46002121 */ cvt.d.s $f4, $f4 -/* C736D4 80242254 46202001 */ sub.d $f0, $f4, $f0 -/* C736D8 80242258 462001A0 */ cvt.s.d $f6, $f0 -/* C736DC 8024225C 44800000 */ mtc1 $zero, $f0 -/* C736E0 80242260 44800800 */ mtc1 $zero, $f1 -/* C736E4 80242264 460030A1 */ cvt.d.s $f2, $f6 -/* C736E8 80242268 4620103C */ c.lt.d $f2, $f0 -/* C736EC 8024226C 00000000 */ nop -/* C736F0 80242270 45010009 */ bc1t .L80242298 -/* C736F4 80242274 00000000 */ nop -/* C736F8 80242278 3C014010 */ lui $at, 0x4010 -/* C736FC 8024227C 44810800 */ mtc1 $at, $f1 -/* C73700 80242280 44800000 */ mtc1 $zero, $f0 -/* C73704 80242284 00000000 */ nop -/* C73708 80242288 4622003C */ c.lt.d $f0, $f2 -/* C7370C 8024228C 00000000 */ nop -/* C73710 80242290 4500000A */ bc1f .L802422BC -/* C73714 80242294 00000000 */ nop -.L80242298: -/* C73718 80242298 3C018024 */ lui $at, %hi(D_80245638_C76AB8) -/* C7371C 8024229C D4225638 */ ldc1 $f2, %lo(D_80245638_C76AB8)($at) -/* C73720 802422A0 46003187 */ neg.s $f6, $f6 -/* C73724 802422A4 46003021 */ cvt.d.s $f0, $f6 -/* C73728 802422A8 46220002 */ mul.d $f0, $f0, $f2 -/* C7372C 802422AC 00000000 */ nop -/* C73730 802422B0 46202000 */ add.d $f0, $f4, $f0 -.L802422B4: -/* C73734 802422B4 46200020 */ cvt.s.d $f0, $f0 -/* C73738 802422B8 E600003C */ swc1 $f0, 0x3c($s0) -.L802422BC: -/* C7373C 802422BC 8602008E */ lh $v0, 0x8e($s0) -/* C73740 802422C0 9603008E */ lhu $v1, 0x8e($s0) -/* C73744 802422C4 18400003 */ blez $v0, .L802422D4 -/* C73748 802422C8 2462FFFF */ addiu $v0, $v1, -1 -/* C7374C 802422CC 080908B7 */ j .L802422DC -/* C73750 802422D0 A602008E */ sh $v0, 0x8e($s0) -.L802422D4: -/* C73754 802422D4 2402000C */ addiu $v0, $zero, 0xc -/* C73758 802422D8 AE620070 */ sw $v0, 0x70($s3) -.L802422DC: -/* C7375C 802422DC 8FBF0050 */ lw $ra, 0x50($sp) -/* C73760 802422E0 8FB3004C */ lw $s3, 0x4c($sp) -/* C73764 802422E4 8FB20048 */ lw $s2, 0x48($sp) -/* C73768 802422E8 8FB10044 */ lw $s1, 0x44($sp) -/* C7376C 802422EC 8FB00040 */ lw $s0, 0x40($sp) -/* C73770 802422F0 03E00008 */ jr $ra -/* C73774 802422F4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s deleted file mode 100644 index 925295eef7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245640_C76AC0 -.word .L80242464_C738E4, .L80242474_C738F4, .L8024248C_C7390C, .L8024249C_C7391C, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L802424B4_C73934, .L802424C4_C73944, .L802424DC_C7395C, .L802424EC_C7396C, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L80242514_C73994, .L80242504_C73984, 0 - -.section .text - -glabel func_80242354_C737D4 -/* C737D4 80242354 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C737D8 80242358 AFB40040 */ sw $s4, 0x40($sp) -/* C737DC 8024235C 0080A02D */ daddu $s4, $a0, $zero -/* C737E0 80242360 AFBF0048 */ sw $ra, 0x48($sp) -/* C737E4 80242364 AFB50044 */ sw $s5, 0x44($sp) -/* C737E8 80242368 AFB3003C */ sw $s3, 0x3c($sp) -/* C737EC 8024236C AFB20038 */ sw $s2, 0x38($sp) -/* C737F0 80242370 AFB10034 */ sw $s1, 0x34($sp) -/* C737F4 80242374 AFB00030 */ sw $s0, 0x30($sp) -/* C737F8 80242378 8E920148 */ lw $s2, 0x148($s4) -/* C737FC 8024237C 86440008 */ lh $a0, 8($s2) -/* C73800 80242380 8E90000C */ lw $s0, 0xc($s4) -/* C73804 80242384 0C00EABB */ jal get_npc_unsafe -/* C73808 80242388 00A0882D */ daddu $s1, $a1, $zero -/* C7380C 8024238C 0280202D */ daddu $a0, $s4, $zero -/* C73810 80242390 8E050000 */ lw $a1, ($s0) -/* C73814 80242394 0C0B1EAF */ jal evt_get_variable -/* C73818 80242398 0040A82D */ daddu $s5, $v0, $zero -/* C7381C 8024239C AFA00010 */ sw $zero, 0x10($sp) -/* C73820 802423A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73824 802423A4 8C630030 */ lw $v1, 0x30($v1) -/* C73828 802423A8 AFA30014 */ sw $v1, 0x14($sp) -/* C7382C 802423AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73830 802423B0 8C63001C */ lw $v1, 0x1c($v1) -/* C73834 802423B4 AFA30018 */ sw $v1, 0x18($sp) -/* C73838 802423B8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C7383C 802423BC 8C630024 */ lw $v1, 0x24($v1) -/* C73840 802423C0 AFA3001C */ sw $v1, 0x1c($sp) -/* C73844 802423C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73848 802423C8 8C630028 */ lw $v1, 0x28($v1) -/* C7384C 802423CC 27B30010 */ addiu $s3, $sp, 0x10 -/* C73850 802423D0 AFA30020 */ sw $v1, 0x20($sp) -/* C73854 802423D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73858 802423D8 3C0142F0 */ lui $at, 0x42f0 -/* C7385C 802423DC 44810000 */ mtc1 $at, $f0 -/* C73860 802423E0 8C63002C */ lw $v1, 0x2c($v1) -/* C73864 802423E4 0040802D */ daddu $s0, $v0, $zero -/* C73868 802423E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C7386C 802423EC A7A0002C */ sh $zero, 0x2c($sp) -/* C73870 802423F0 12200007 */ beqz $s1, .L80242410 -/* C73874 802423F4 AFA30024 */ sw $v1, 0x24($sp) -/* C73878 802423F8 02A0202D */ daddu $a0, $s5, $zero -/* C7387C 802423FC 0240282D */ daddu $a1, $s2, $zero -/* C73880 80242400 0280302D */ daddu $a2, $s4, $zero -/* C73884 80242404 0C09070E */ jal kzn_08_UnkFunc5 -/* C73888 80242408 0200382D */ daddu $a3, $s0, $zero -/* C7388C 8024240C AE800070 */ sw $zero, 0x70($s4) -.L80242410: -/* C73890 80242410 2402FFFE */ addiu $v0, $zero, -2 -/* C73894 80242414 A2A200AB */ sb $v0, 0xab($s5) -/* C73898 80242418 8E4300B0 */ lw $v1, 0xb0($s2) -/* C7389C 8024241C 30620004 */ andi $v0, $v1, 4 -/* C738A0 80242420 10400007 */ beqz $v0, .L80242440 -/* C738A4 80242424 00000000 */ nop -/* C738A8 80242428 824200B4 */ lb $v0, 0xb4($s2) -/* C738AC 8024242C 1440003A */ bnez $v0, .L80242518 -/* C738B0 80242430 0000102D */ daddu $v0, $zero, $zero -/* C738B4 80242434 2402FFFB */ addiu $v0, $zero, -5 -/* C738B8 80242438 00621024 */ and $v0, $v1, $v0 -/* C738BC 8024243C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242440: -/* C738C0 80242440 8E830070 */ lw $v1, 0x70($s4) -/* C738C4 80242444 2C620015 */ sltiu $v0, $v1, 0x15 -/* C738C8 80242448 10400032 */ beqz $v0, .L80242514_C73994 -/* C738CC 8024244C 00031080 */ sll $v0, $v1, 2 -/* C738D0 80242450 3C018024 */ lui $at, %hi(jtbl_80245640_C76AC0) -/* C738D4 80242454 00220821 */ addu $at, $at, $v0 -/* C738D8 80242458 8C225640 */ lw $v0, %lo(jtbl_80245640_C76AC0)($at) -/* C738DC 8024245C 00400008 */ jr $v0 -/* C738E0 80242460 00000000 */ nop -.L80242464_C738E4: -/* C738E4 80242464 0280202D */ daddu $a0, $s4, $zero -/* C738E8 80242468 0200282D */ daddu $a1, $s0, $zero -/* C738EC 8024246C 0C090294 */ jal kzn_08_UnkNpcAIFunc23 -/* C738F0 80242470 0260302D */ daddu $a2, $s3, $zero -.L80242474_C738F4: -/* C738F4 80242474 0280202D */ daddu $a0, $s4, $zero -/* C738F8 80242478 0200282D */ daddu $a1, $s0, $zero -/* C738FC 8024247C 0C090300 */ jal kzn_08_UnkNpcAIFunc35 -/* C73900 80242480 0260302D */ daddu $a2, $s3, $zero -/* C73904 80242484 08090946 */ j .L80242518 -/* C73908 80242488 0000102D */ daddu $v0, $zero, $zero -.L8024248C_C7390C: -/* C7390C 8024248C 0280202D */ daddu $a0, $s4, $zero -/* C73910 80242490 0200282D */ daddu $a1, $s0, $zero -/* C73914 80242494 0C09048A */ jal kzn_08_UnkNpcAIFunc1 -/* C73918 80242498 0260302D */ daddu $a2, $s3, $zero -.L8024249C_C7391C: -/* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero -/* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero -/* C73924 802424A4 0C0904BA */ jal kzn_08_UnkFunc4 -/* C73928 802424A8 0260302D */ daddu $a2, $s3, $zero -/* C7392C 802424AC 08090946 */ j .L80242518 -/* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero -.L802424B4_C73934: -/* C73934 802424B4 0280202D */ daddu $a0, $s4, $zero -/* C73938 802424B8 0200282D */ daddu $a1, $s0, $zero -/* C7393C 802424BC 0C09058B */ jal kzn_08_UnkNpcAIFunc2 -/* C73940 802424C0 0260302D */ daddu $a2, $s3, $zero -.L802424C4_C73944: -/* C73944 802424C4 0280202D */ daddu $a0, $s4, $zero -/* C73948 802424C8 0200282D */ daddu $a1, $s0, $zero -/* C7394C 802424CC 0C0905A9 */ jal func_802416A4_C72B24 -/* C73950 802424D0 0260302D */ daddu $a2, $s3, $zero -/* C73954 802424D4 08090946 */ j .L80242518 -/* C73958 802424D8 0000102D */ daddu $v0, $zero, $zero -.L802424DC_C7395C: -/* C7395C 802424DC 0280202D */ daddu $a0, $s4, $zero -/* C73960 802424E0 0200282D */ daddu $a1, $s0, $zero -/* C73964 802424E4 0C0907D2 */ jal kzn_08_UnkNpcAIFunc13 -/* C73968 802424E8 0260302D */ daddu $a2, $s3, $zero -.L802424EC_C7396C: -/* C7396C 802424EC 0280202D */ daddu $a0, $s4, $zero -/* C73970 802424F0 0200282D */ daddu $a1, $s0, $zero -/* C73974 802424F4 0C09081E */ jal func_80242078_C734F8 -/* C73978 802424F8 0260302D */ daddu $a2, $s3, $zero -/* C7397C 802424FC 08090946 */ j .L80242518 -/* C73980 80242500 0000102D */ daddu $v0, $zero, $zero -.L80242504_C73984: -/* C73984 80242504 0280202D */ daddu $a0, $s4, $zero -/* C73988 80242508 0200282D */ daddu $a1, $s0, $zero -/* C7398C 8024250C 0C0908BE */ jal kzn_08_UnkFunc45 -/* C73990 80242510 0260302D */ daddu $a2, $s3, $zero -.L80242514_C73994: -/* C73994 80242514 0000102D */ daddu $v0, $zero, $zero -.L80242518: -/* C73998 80242518 8FBF0048 */ lw $ra, 0x48($sp) -/* C7399C 8024251C 8FB50044 */ lw $s5, 0x44($sp) -/* C739A0 80242520 8FB40040 */ lw $s4, 0x40($sp) -/* C739A4 80242524 8FB3003C */ lw $s3, 0x3c($sp) -/* C739A8 80242528 8FB20038 */ lw $s2, 0x38($sp) -/* C739AC 8024252C 8FB10034 */ lw $s1, 0x34($sp) -/* C739B0 80242530 8FB00030 */ lw $s0, 0x30($sp) -/* C739B4 80242534 03E00008 */ jr $ra -/* C739B8 80242538 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s deleted file mode 100644 index 4b4d7588a7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_C772E0 -/* C772E0 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C772E4 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* C772E8 80240608 0080B02D */ daddu $s6, $a0, $zero -/* C772EC 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* C772F0 80240610 00A0802D */ daddu $s0, $a1, $zero -/* C772F4 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* C772F8 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* C772FC 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* C77300 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* C77304 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* C77308 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* C7730C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* C77310 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C77314 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* C77318 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* C7731C 8024063C 0C00EAD2 */ jal get_npc_safe -/* C77320 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* C77324 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* C77328 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C7732C 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C77330 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* C77334 80240654 00041880 */ sll $v1, $a0, 2 -/* C77338 80240658 00641821 */ addu $v1, $v1, $a0 -/* C7733C 8024065C 00031880 */ sll $v1, $v1, 2 -/* C77340 80240660 00641823 */ subu $v1, $v1, $a0 -/* C77344 80240664 000320C0 */ sll $a0, $v1, 3 -/* C77348 80240668 00641821 */ addu $v1, $v1, $a0 -/* C7734C 8024066C 000318C0 */ sll $v1, $v1, 3 -/* C77350 80240670 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* C77354 80240674 00230821 */ addu $at, $at, $v1 -/* C77358 80240678 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* C7735C 8024067C 0C00A88D */ jal sin_cos_deg -/* C77360 80240680 0040A82D */ daddu $s5, $v0, $zero -/* C77364 80240684 1200005D */ beqz $s0, .L802407FC -/* C77368 80240688 00000000 */ nop -/* C7736C 8024068C 0C00AB0A */ jal general_heap_malloc -/* C77370 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* C77374 80240694 0040902D */ daddu $s2, $v0, $zero -/* C77378 80240698 02C0202D */ daddu $a0, $s6, $zero -/* C7737C 8024069C 0000882D */ daddu $s1, $zero, $zero -/* C77380 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* C77384 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* C77388 802406A8 8E650000 */ lw $a1, ($s3) -/* C7738C 802406AC 3C014148 */ lui $at, 0x4148 -/* C77390 802406B0 4481C000 */ mtc1 $at, $f24 -/* C77394 802406B4 3C013F80 */ lui $at, 0x3f80 -/* C77398 802406B8 4481B000 */ mtc1 $at, $f22 -/* C7739C 802406BC 4480A000 */ mtc1 $zero, $f20 -/* C773A0 802406C0 0C0B1EAF */ jal evt_get_variable -/* C773A4 802406C4 0240802D */ daddu $s0, $s2, $zero -/* C773A8 802406C8 0C04417A */ jal get_entity_by_index -/* C773AC 802406CC 0040202D */ daddu $a0, $v0, $zero -/* C773B0 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* C773B4 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* C773B8 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* C773BC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* C773C0 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* C773C4 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* C773C8 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* C773CC 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* C773D0 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* C773D4 802406F4 44060000 */ mfc1 $a2, $f0 -/* C773D8 802406F8 0C01C5BC */ jal fx_motion_blur_flame -/* C773DC 802406FC 26310001 */ addiu $s1, $s1, 1 -/* C773E0 80240700 AE020008 */ sw $v0, 8($s0) -/* C773E4 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* C773E8 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* C773EC 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* C773F0 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* C773F4 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* C773F8 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* C773FC 8024071C 2A220003 */ slti $v0, $s1, 3 -/* C77400 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* C77404 80240724 26100004 */ addiu $s0, $s0, 4 -/* C77408 80240728 0000882D */ daddu $s1, $zero, $zero -/* C7740C 8024072C 0240802D */ daddu $s0, $s2, $zero -/* C77410 80240730 3C148024 */ lui $s4, %hi(D_80243D58_C7AA38) -/* C77414 80240734 26943D58 */ addiu $s4, $s4, %lo(D_80243D58_C7AA38) -/* C77418 80240738 3C014248 */ lui $at, 0x4248 -/* C7741C 8024073C 4481A000 */ mtc1 $at, $f20 -/* C77420 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* C77424 80240744 AE400000 */ sw $zero, ($s2) -/* C77428 80240748 AE400004 */ sw $zero, 4($s2) -/* C7742C 8024074C AE400060 */ sw $zero, 0x60($s2) -/* C77430 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* C77434 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* C77438 80240758 4406A000 */ mfc1 $a2, $f20 -/* C7743C 8024075C 8E870000 */ lw $a3, ($s4) -/* C77440 80240760 02532821 */ addu $a1, $s2, $s3 -/* C77444 80240764 0C00A7E7 */ jal add_vec2D_polar -/* C77448 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* C7744C 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C77450 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* C77454 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* C77458 80240778 00000000 */ nop -/* C7745C 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* C77460 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* C77464 80240784 00000000 */ nop -/* C77468 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* C7746C 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* C77470 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* C77474 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* C77478 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* C7747C 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* C77480 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* C77484 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* C77488 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* C7748C 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* C77490 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* C77494 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* C77498 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* C7749C 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* C774A0 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* C774A4 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* C774A8 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* C774AC 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* C774B0 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* C774B4 802407D4 26940004 */ addiu $s4, $s4, 4 -/* C774B8 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* C774BC 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* C774C0 802407E0 26730004 */ addiu $s3, $s3, 4 -/* C774C4 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* C774C8 802407E8 26310001 */ addiu $s1, $s1, 1 -/* C774CC 802407EC 2A220003 */ slti $v0, $s1, 3 -/* C774D0 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* C774D4 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* C774D8 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* C774DC 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* C774E0 80240800 8E430000 */ lw $v1, ($s2) -/* C774E4 80240804 24020001 */ addiu $v0, $zero, 1 -/* C774E8 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* C774EC 8024080C 28620002 */ slti $v0, $v1, 2 -/* C774F0 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* C774F4 80240814 24020002 */ addiu $v0, $zero, 2 -/* C774F8 80240818 10600007 */ beqz $v1, .L80240838 -/* C774FC 8024081C 24040005 */ addiu $a0, $zero, 5 -/* C77500 80240820 08090274 */ j .L802409D0 -/* C77504 80240824 00000000 */ nop -.L80240828: -/* C77508 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* C7750C 8024082C 00000000 */ nop -/* C77510 80240830 08090274 */ j .L802409D0 -/* C77514 80240834 00000000 */ nop -.L80240838: -/* C77518 80240838 0000882D */ daddu $s1, $zero, $zero -/* C7751C 8024083C 3C148024 */ lui $s4, %hi(D_80243D58_C7AA38) -/* C77520 80240840 26943D58 */ addiu $s4, $s4, %lo(D_80243D58_C7AA38) -/* C77524 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* C77528 80240848 3C064248 */ lui $a2, 0x4248 -/* C7752C 8024084C 44800000 */ mtc1 $zero, $f0 -/* C77530 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* C77534 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* C77538 80240858 44050000 */ mfc1 $a1, $f0 -/* C7753C 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* C77540 80240860 4485B000 */ mtc1 $a1, $f22 -/* C77544 80240864 0C00A8ED */ jal update_lerp -/* C77548 80240868 0240802D */ daddu $s0, $s2, $zero -/* C7754C 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* C77550 80240870 4406A000 */ mfc1 $a2, $f20 -/* C77554 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* C77558 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* C7755C 8024087C 8E870000 */ lw $a3, ($s4) -/* C77560 80240880 02532821 */ addu $a1, $s2, $s3 -/* C77564 80240884 0C00A7E7 */ jal add_vec2D_polar -/* C77568 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* C7756C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C77570 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* C77574 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* C77578 80240898 00000000 */ nop -/* C7757C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* C77580 802408A0 26940004 */ addiu $s4, $s4, 4 -/* C77584 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* C77588 802408A8 00000000 */ nop -/* C7758C 802408AC 26730004 */ addiu $s3, $s3, 4 -/* C77590 802408B0 26310001 */ addiu $s1, $s1, 1 -/* C77594 802408B4 2A220003 */ slti $v0, $s1, 3 -/* C77598 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* C7759C 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* C775A0 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* C775A4 802408C4 26100004 */ addiu $s0, $s0, 4 -/* C775A8 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* C775AC 802408CC 24420001 */ addiu $v0, $v0, 1 -/* C775B0 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* C775B4 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* C775B8 802408D8 1440003D */ bnez $v0, .L802409D0 -/* C775BC 802408DC 24020001 */ addiu $v0, $zero, 1 -/* C775C0 802408E0 AE420000 */ sw $v0, ($s2) -/* C775C4 802408E4 08090274 */ j .L802409D0 -/* C775C8 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* C775CC 802408EC 0000882D */ daddu $s1, $zero, $zero -/* C775D0 802408F0 3C148024 */ lui $s4, %hi(D_80243D58_C7AA38) -/* C775D4 802408F4 26943D58 */ addiu $s4, $s4, %lo(D_80243D58_C7AA38) -/* C775D8 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* C775DC 802408FC 0240802D */ daddu $s0, $s2, $zero -/* C775E0 80240900 3C014248 */ lui $at, 0x4248 -/* C775E4 80240904 4481A000 */ mtc1 $at, $f20 -/* C775E8 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* C775EC 8024090C 4406A000 */ mfc1 $a2, $f20 -/* C775F0 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* C775F4 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* C775F8 80240918 8E870000 */ lw $a3, ($s4) -/* C775FC 8024091C 02532821 */ addu $a1, $s2, $s3 -/* C77600 80240920 0C00A7E7 */ jal add_vec2D_polar -/* C77604 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* C77608 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C7760C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* C77610 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* C77614 80240934 00000000 */ nop -/* C77618 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* C7761C 8024093C 26940004 */ addiu $s4, $s4, 4 -/* C77620 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* C77624 80240944 00000000 */ nop -/* C77628 80240948 26730004 */ addiu $s3, $s3, 4 -/* C7762C 8024094C 26310001 */ addiu $s1, $s1, 1 -/* C77630 80240950 2A220003 */ slti $v0, $s1, 3 -/* C77634 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* C77638 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* C7763C 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* C77640 80240960 26100004 */ addiu $s0, $s0, 4 -/* C77644 80240964 8E420060 */ lw $v0, 0x60($s2) -/* C77648 80240968 24420001 */ addiu $v0, $v0, 1 -/* C7764C 8024096C AE420060 */ sw $v0, 0x60($s2) -/* C77650 80240970 28420010 */ slti $v0, $v0, 0x10 -/* C77654 80240974 14400016 */ bnez $v0, .L802409D0 -/* C77658 80240978 2402000F */ addiu $v0, $zero, 0xf -/* C7765C 8024097C AE420060 */ sw $v0, 0x60($s2) -/* C77660 80240980 24020002 */ addiu $v0, $zero, 2 -/* C77664 80240984 08090274 */ j .L802409D0 -/* C77668 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* C7766C 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* C77670 80240990 24420001 */ addiu $v0, $v0, 1 -/* C77674 80240994 AE420060 */ sw $v0, 0x60($s2) -/* C77678 80240998 2842001F */ slti $v0, $v0, 0x1f -/* C7767C 8024099C 1440000C */ bnez $v0, .L802409D0 -/* C77680 802409A0 0000882D */ daddu $s1, $zero, $zero -/* C77684 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* C77688 802409A8 8CA20008 */ lw $v0, 8($a1) -/* C7768C 802409AC 8C430000 */ lw $v1, ($v0) -/* C77690 802409B0 26310001 */ addiu $s1, $s1, 1 -/* C77694 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* C77698 802409B8 AC430000 */ sw $v1, ($v0) -/* C7769C 802409BC 2A220003 */ slti $v0, $s1, 3 -/* C776A0 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* C776A4 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* C776A8 802409C8 080902C1 */ j .L80240B04 -/* C776AC 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* C776B0 802409D0 8E430004 */ lw $v1, 4($s2) -/* C776B4 802409D4 10600005 */ beqz $v1, .L802409EC -/* C776B8 802409D8 24020001 */ addiu $v0, $zero, 1 -/* C776BC 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* C776C0 802409E0 0000882D */ daddu $s1, $zero, $zero -/* C776C4 802409E4 080902B0 */ j .L80240AC0 -/* C776C8 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* C776CC 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* C776D0 802409F0 24420001 */ addiu $v0, $v0, 1 -/* C776D4 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* C776D8 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* C776DC 802409FC 1440002F */ bnez $v0, .L80240ABC -/* C776E0 80240A00 0000882D */ daddu $s1, $zero, $zero -/* C776E4 80240A04 080902AC */ j .L80240AB0 -/* C776E8 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* C776EC 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* C776F0 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* C776F4 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* C776F8 80240A18 4405A000 */ mfc1 $a1, $f20 -/* C776FC 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* C77700 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* C77704 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* C77708 80240A28 0C00A8ED */ jal update_lerp -/* C7770C 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* C77710 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* C77714 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* C77718 80240A38 4405A000 */ mfc1 $a1, $f20 -/* C7771C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* C77720 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* C77724 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* C77728 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* C7772C 80240A4C 0C00A8ED */ jal update_lerp -/* C77730 80240A50 24040001 */ addiu $a0, $zero, 1 -/* C77734 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* C77738 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* C7773C 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* C77740 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* C77744 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* C77748 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* C7774C 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* C77750 80240A70 0C00A8ED */ jal update_lerp -/* C77754 80240A74 24040001 */ addiu $a0, $zero, 1 -/* C77758 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* C7775C 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* C77760 80240A80 26310001 */ addiu $s1, $s1, 1 -/* C77764 80240A84 2A220003 */ slti $v0, $s1, 3 -/* C77768 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* C7776C 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* C77770 80240A90 26100004 */ addiu $s0, $s0, 4 -/* C77774 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* C77778 80240A98 24420001 */ addiu $v0, $v0, 1 -/* C7777C 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* C77780 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* C77784 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* C77788 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* C7778C 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* C77790 80240AB0 AE420004 */ sw $v0, 4($s2) -/* C77794 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* C77798 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* C7779C 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* C777A0 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* C777A4 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* C777A8 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* C777AC 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* C777B0 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* C777B4 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* C777B8 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* C777BC 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* C777C0 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* C777C4 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* C777C8 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* C777CC 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* C777D0 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* C777D4 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* C777D8 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* C777DC 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* C777E0 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* C777E4 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* C777E8 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* C777EC 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* C777F0 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* C777F4 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* C777F8 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* C777FC 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* C77800 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* C77804 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* C77808 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C7780C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* C77810 80240B30 03E00008 */ jr $ra -/* C77814 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s deleted file mode 100644 index 2349799880..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B4_C81254 -/* C81254 802410B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C81258 802410B8 AFB00010 */ sw $s0, 0x10($sp) -/* C8125C 802410BC 0080802D */ daddu $s0, $a0, $zero -/* C81260 802410C0 AFBF0014 */ sw $ra, 0x14($sp) -/* C81264 802410C4 8E020148 */ lw $v0, 0x148($s0) -/* C81268 802410C8 0C00EABB */ jal get_npc_unsafe -/* C8126C 802410CC 84440008 */ lh $a0, 8($v0) -/* C81270 802410D0 9443008E */ lhu $v1, 0x8e($v0) -/* C81274 802410D4 C440003C */ lwc1 $f0, 0x3c($v0) -/* C81278 802410D8 24640001 */ addiu $a0, $v1, 1 -/* C8127C 802410DC 00031C00 */ sll $v1, $v1, 0x10 -/* C81280 802410E0 00031B83 */ sra $v1, $v1, 0xe -/* C81284 802410E4 A444008E */ sh $a0, 0x8e($v0) -/* C81288 802410E8 3C018024 */ lui $at, %hi(D_802436D0_C83870) -/* C8128C 802410EC 00230821 */ addu $at, $at, $v1 -/* C81290 802410F0 C42236D0 */ lwc1 $f2, %lo(D_802436D0_C83870)($at) -/* C81294 802410F4 8443008E */ lh $v1, 0x8e($v0) -/* C81298 802410F8 46020000 */ add.s $f0, $f0, $f2 -/* C8129C 802410FC 28630005 */ slti $v1, $v1, 5 -/* C812A0 80241100 14600003 */ bnez $v1, .L80241110 -/* C812A4 80241104 E440003C */ swc1 $f0, 0x3c($v0) -/* C812A8 80241108 2402000C */ addiu $v0, $zero, 0xc -/* C812AC 8024110C AE020070 */ sw $v0, 0x70($s0) -.L80241110: -/* C812B0 80241110 8FBF0014 */ lw $ra, 0x14($sp) -/* C812B4 80241114 8FB00010 */ lw $s0, 0x10($sp) -/* C812B8 80241118 03E00008 */ jr $ra -/* C812BC 8024111C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s deleted file mode 100644 index 05b609d687..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245868_C85A08 -.word .L80241878_C81A18, .L80241888_C81A28, .L802418A0_C81A40, .L802418B0_C81A50, .L80241930_C81AD0, .L80241930_C81AD0, .L80241930_C81AD0, .L80241930_C81AD0, .L80241930_C81AD0, .L80241930_C81AD0, .L802418C8_C81A68, .L802418D8_C81A78, .L802418F0_C81A90, .L80241908_C81AA8, .L80241920_C81AC0, 0 - -.section .text - -glabel func_8024176C_C8190C -/* C8190C 8024176C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C81910 80241770 AFB40040 */ sw $s4, 0x40($sp) -/* C81914 80241774 0080A02D */ daddu $s4, $a0, $zero -/* C81918 80241778 AFBF0048 */ sw $ra, 0x48($sp) -/* C8191C 8024177C AFB50044 */ sw $s5, 0x44($sp) -/* C81920 80241780 AFB3003C */ sw $s3, 0x3c($sp) -/* C81924 80241784 AFB20038 */ sw $s2, 0x38($sp) -/* C81928 80241788 AFB10034 */ sw $s1, 0x34($sp) -/* C8192C 8024178C AFB00030 */ sw $s0, 0x30($sp) -/* C81930 80241790 8E920148 */ lw $s2, 0x148($s4) -/* C81934 80241794 86440008 */ lh $a0, 8($s2) -/* C81938 80241798 8E90000C */ lw $s0, 0xc($s4) -/* C8193C 8024179C 0C00EABB */ jal get_npc_unsafe -/* C81940 802417A0 00A0882D */ daddu $s1, $a1, $zero -/* C81944 802417A4 0280202D */ daddu $a0, $s4, $zero -/* C81948 802417A8 8E050000 */ lw $a1, ($s0) -/* C8194C 802417AC 0C0B1EAF */ jal evt_get_variable -/* C81950 802417B0 0040A82D */ daddu $s5, $v0, $zero -/* C81954 802417B4 AFA00010 */ sw $zero, 0x10($sp) -/* C81958 802417B8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C8195C 802417BC 8C630030 */ lw $v1, 0x30($v1) -/* C81960 802417C0 AFA30014 */ sw $v1, 0x14($sp) -/* C81964 802417C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81968 802417C8 8C63001C */ lw $v1, 0x1c($v1) -/* C8196C 802417CC AFA30018 */ sw $v1, 0x18($sp) -/* C81970 802417D0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81974 802417D4 8C630024 */ lw $v1, 0x24($v1) -/* C81978 802417D8 AFA3001C */ sw $v1, 0x1c($sp) -/* C8197C 802417DC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81980 802417E0 8C630028 */ lw $v1, 0x28($v1) -/* C81984 802417E4 27B30010 */ addiu $s3, $sp, 0x10 -/* C81988 802417E8 AFA30020 */ sw $v1, 0x20($sp) -/* C8198C 802417EC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81990 802417F0 3C0142F0 */ lui $at, 0x42f0 -/* C81994 802417F4 44810000 */ mtc1 $at, $f0 -/* C81998 802417F8 8C63002C */ lw $v1, 0x2c($v1) -/* C8199C 802417FC 0040802D */ daddu $s0, $v0, $zero -/* C819A0 80241800 E7A00028 */ swc1 $f0, 0x28($sp) -/* C819A4 80241804 A7A0002C */ sh $zero, 0x2c($sp) -/* C819A8 80241808 12200006 */ beqz $s1, .L80241824 -/* C819AC 8024180C AFA30024 */ sw $v1, 0x24($sp) -/* C819B0 80241810 02A0202D */ daddu $a0, $s5, $zero -/* C819B4 80241814 0240282D */ daddu $a1, $s2, $zero -/* C819B8 80241818 0280302D */ daddu $a2, $s4, $zero -/* C819BC 8024181C 0C090592 */ jal kzn_11_UnkFunc5 -/* C819C0 80241820 0200382D */ daddu $a3, $s0, $zero -.L80241824: -/* C819C4 80241824 2402FFFE */ addiu $v0, $zero, -2 -/* C819C8 80241828 A2A200AB */ sb $v0, 0xab($s5) -/* C819CC 8024182C 8E4300B0 */ lw $v1, 0xb0($s2) -/* C819D0 80241830 30620004 */ andi $v0, $v1, 4 -/* C819D4 80241834 10400007 */ beqz $v0, .L80241854 -/* C819D8 80241838 00000000 */ nop -/* C819DC 8024183C 824200B4 */ lb $v0, 0xb4($s2) -/* C819E0 80241840 1440003C */ bnez $v0, .L80241934 -/* C819E4 80241844 0000102D */ daddu $v0, $zero, $zero -/* C819E8 80241848 2402FFFB */ addiu $v0, $zero, -5 -/* C819EC 8024184C 00621024 */ and $v0, $v1, $v0 -/* C819F0 80241850 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241854: -/* C819F4 80241854 8E830070 */ lw $v1, 0x70($s4) -/* C819F8 80241858 2C62000F */ sltiu $v0, $v1, 0xf -/* C819FC 8024185C 10400034 */ beqz $v0, .L80241930_C81AD0 -/* C81A00 80241860 00031080 */ sll $v0, $v1, 2 -/* C81A04 80241864 3C018024 */ lui $at, %hi(jtbl_80245868_C85A08) -/* C81A08 80241868 00220821 */ addu $at, $at, $v0 -/* C81A0C 8024186C 8C225868 */ lw $v0, %lo(jtbl_80245868_C85A08)($at) -/* C81A10 80241870 00400008 */ jr $v0 -/* C81A14 80241874 00000000 */ nop -.L80241878_C81A18: -/* C81A18 80241878 0280202D */ daddu $a0, $s4, $zero -/* C81A1C 8024187C 0200282D */ daddu $a1, $s0, $zero -/* C81A20 80241880 0C090118 */ jal kzn_11_UnkNpcAIFunc23 -/* C81A24 80241884 0260302D */ daddu $a2, $s3, $zero -.L80241888_C81A28: -/* C81A28 80241888 0280202D */ daddu $a0, $s4, $zero -/* C81A2C 8024188C 0200282D */ daddu $a1, $s0, $zero -/* C81A30 80241890 0C090184 */ jal kzn_11_UnkNpcAIFunc35 -/* C81A34 80241894 0260302D */ daddu $a2, $s3, $zero -/* C81A38 80241898 0809064D */ j .L80241934 -/* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero -.L802418A0_C81A40: -/* C81A40 802418A0 0280202D */ daddu $a0, $s4, $zero -/* C81A44 802418A4 0200282D */ daddu $a1, $s0, $zero -/* C81A48 802418A8 0C09030E */ jal kzn_11_UnkNpcAIFunc1 -/* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero -.L802418B0_C81A50: -/* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero -/* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero -/* C81A58 802418B8 0C09033E */ jal kzn_11_UnkFunc4 -/* C81A5C 802418BC 0260302D */ daddu $a2, $s3, $zero -/* C81A60 802418C0 0809064D */ j .L80241934 -/* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero -.L802418C8_C81A68: -/* C81A68 802418C8 0280202D */ daddu $a0, $s4, $zero -/* C81A6C 802418CC 0200282D */ daddu $a1, $s0, $zero -/* C81A70 802418D0 0C09040F */ jal kzn_11_UnkNpcAIFunc2 -/* C81A74 802418D4 0260302D */ daddu $a2, $s3, $zero -.L802418D8_C81A78: -/* C81A78 802418D8 0280202D */ daddu $a0, $s4, $zero -/* C81A7C 802418DC 0200282D */ daddu $a1, $s0, $zero -/* C81A80 802418E0 0C09042D */ jal func_802410B4_C81254 -/* C81A84 802418E4 0260302D */ daddu $a2, $s3, $zero -/* C81A88 802418E8 0809064D */ j .L80241934 -/* C81A8C 802418EC 0000102D */ daddu $v0, $zero, $zero -.L802418F0_C81A90: -/* C81A90 802418F0 0280202D */ daddu $a0, $s4, $zero -/* C81A94 802418F4 0200282D */ daddu $a1, $s0, $zero -/* C81A98 802418F8 0C090448 */ jal kzn_11_UnkNpcAIFunc14 -/* C81A9C 802418FC 0260302D */ daddu $a2, $s3, $zero -/* C81AA0 80241900 0809064D */ j .L80241934 -/* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero -.L80241908_C81AA8: -/* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero -/* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C81AB0 80241910 0C090495 */ jal kzn_11_UnkNpcAIFunc3 -/* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero -/* C81AB8 80241918 0809064D */ j .L80241934 -/* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero -.L80241920_C81AC0: -/* C81AC0 80241920 0280202D */ daddu $a0, $s4, $zero -/* C81AC4 80241924 0200282D */ daddu $a1, $s0, $zero -/* C81AC8 80241928 0C0904AE */ jal kzn_11_UnkFunc6 -/* C81ACC 8024192C 0260302D */ daddu $a2, $s3, $zero -.L80241930_C81AD0: -/* C81AD0 80241930 0000102D */ daddu $v0, $zero, $zero -.L80241934: -/* C81AD4 80241934 8FBF0048 */ lw $ra, 0x48($sp) -/* C81AD8 80241938 8FB50044 */ lw $s5, 0x44($sp) -/* C81ADC 8024193C 8FB40040 */ lw $s4, 0x40($sp) -/* C81AE0 80241940 8FB3003C */ lw $s3, 0x3c($sp) -/* C81AE4 80241944 8FB20038 */ lw $s2, 0x38($sp) -/* C81AE8 80241948 8FB10034 */ lw $s1, 0x34($sp) -/* C81AEC 8024194C 8FB00030 */ lw $s0, 0x30($sp) -/* C81AF0 80241950 03E00008 */ jr $ra -/* C81AF4 80241954 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s deleted file mode 100644 index 4b376420e3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802458A8_C85A48 -.double 0.06 - -.section .text - -glabel func_80241A88_C81C28 -/* C81C28 80241A88 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C81C2C 80241A8C AFB3004C */ sw $s3, 0x4c($sp) -/* C81C30 80241A90 0080982D */ daddu $s3, $a0, $zero -/* C81C34 80241A94 AFBF0050 */ sw $ra, 0x50($sp) -/* C81C38 80241A98 AFB20048 */ sw $s2, 0x48($sp) -/* C81C3C 80241A9C AFB10044 */ sw $s1, 0x44($sp) -/* C81C40 80241AA0 AFB00040 */ sw $s0, 0x40($sp) -/* C81C44 80241AA4 8E720148 */ lw $s2, 0x148($s3) -/* C81C48 80241AA8 00A0882D */ daddu $s1, $a1, $zero -/* C81C4C 80241AAC 86440008 */ lh $a0, 8($s2) -/* C81C50 80241AB0 0C00EABB */ jal get_npc_unsafe -/* C81C54 80241AB4 00C0802D */ daddu $s0, $a2, $zero -/* C81C58 80241AB8 0200202D */ daddu $a0, $s0, $zero -/* C81C5C 80241ABC 0240282D */ daddu $a1, $s2, $zero -/* C81C60 80241AC0 24030001 */ addiu $v1, $zero, 1 -/* C81C64 80241AC4 AFA30010 */ sw $v1, 0x10($sp) -/* C81C68 80241AC8 8E260024 */ lw $a2, 0x24($s1) -/* C81C6C 80241ACC 8E270028 */ lw $a3, 0x28($s1) -/* C81C70 80241AD0 0C01242D */ jal func_800490B4 -/* C81C74 80241AD4 0040802D */ daddu $s0, $v0, $zero -/* C81C78 80241AD8 14400020 */ bnez $v0, .L80241B5C -/* C81C7C 80241ADC 24040002 */ addiu $a0, $zero, 2 -/* C81C80 80241AE0 0200282D */ daddu $a1, $s0, $zero -/* C81C84 80241AE4 0000302D */ daddu $a2, $zero, $zero -/* C81C88 80241AE8 860300A8 */ lh $v1, 0xa8($s0) -/* C81C8C 80241AEC 3C013F80 */ lui $at, 0x3f80 -/* C81C90 80241AF0 44810000 */ mtc1 $at, $f0 -/* C81C94 80241AF4 3C014000 */ lui $at, 0x4000 -/* C81C98 80241AF8 44811000 */ mtc1 $at, $f2 -/* C81C9C 80241AFC 3C01C1A0 */ lui $at, 0xc1a0 -/* C81CA0 80241B00 44812000 */ mtc1 $at, $f4 -/* C81CA4 80241B04 2402000F */ addiu $v0, $zero, 0xf -/* C81CA8 80241B08 AFA2001C */ sw $v0, 0x1c($sp) -/* C81CAC 80241B0C 44834000 */ mtc1 $v1, $f8 -/* C81CB0 80241B10 00000000 */ nop -/* C81CB4 80241B14 46804220 */ cvt.s.w $f8, $f8 -/* C81CB8 80241B18 44074000 */ mfc1 $a3, $f8 -/* C81CBC 80241B1C 27A20028 */ addiu $v0, $sp, 0x28 -/* C81CC0 80241B20 AFA20020 */ sw $v0, 0x20($sp) -/* C81CC4 80241B24 E7A00010 */ swc1 $f0, 0x10($sp) -/* C81CC8 80241B28 E7A20014 */ swc1 $f2, 0x14($sp) -/* C81CCC 80241B2C 0C01BFA4 */ jal fx_emote -/* C81CD0 80241B30 E7A40018 */ swc1 $f4, 0x18($sp) -/* C81CD4 80241B34 8E4200CC */ lw $v0, 0xcc($s2) -/* C81CD8 80241B38 8C430000 */ lw $v1, ($v0) -/* C81CDC 80241B3C 2402001E */ addiu $v0, $zero, 0x1e -/* C81CE0 80241B40 A602008E */ sh $v0, 0x8e($s0) -/* C81CE4 80241B44 24020014 */ addiu $v0, $zero, 0x14 -/* C81CE8 80241B48 AE030028 */ sw $v1, 0x28($s0) -/* C81CEC 80241B4C AE620070 */ sw $v0, 0x70($s3) -/* C81CF0 80241B50 2402001E */ addiu $v0, $zero, 0x1e -/* C81CF4 80241B54 0809073B */ j .L80241CEC -/* C81CF8 80241B58 AE420090 */ sw $v0, 0x90($s2) -.L80241B5C: -/* C81CFC 80241B5C 8E050018 */ lw $a1, 0x18($s0) -/* C81D00 80241B60 8E06000C */ lw $a2, 0xc($s0) -/* C81D04 80241B64 0C00EA95 */ jal npc_move_heading -/* C81D08 80241B68 0200202D */ daddu $a0, $s0, $zero -/* C81D0C 80241B6C 8E020000 */ lw $v0, ($s0) -/* C81D10 80241B70 30420008 */ andi $v0, $v0, 8 -/* C81D14 80241B74 14400028 */ bnez $v0, .L80241C18 -/* C81D18 80241B78 0000882D */ daddu $s1, $zero, $zero -/* C81D1C 80241B7C 27A5002C */ addiu $a1, $sp, 0x2c -/* C81D20 80241B80 27A60030 */ addiu $a2, $sp, 0x30 -/* C81D24 80241B84 860200A8 */ lh $v0, 0xa8($s0) -/* C81D28 80241B88 C6000038 */ lwc1 $f0, 0x38($s0) -/* C81D2C 80241B8C 44821000 */ mtc1 $v0, $f2 -/* C81D30 80241B90 00000000 */ nop -/* C81D34 80241B94 468010A0 */ cvt.s.w $f2, $f2 -/* C81D38 80241B98 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C81D3C 80241B9C 860200A8 */ lh $v0, 0xa8($s0) -/* C81D40 80241BA0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C81D44 80241BA4 C6060040 */ lwc1 $f6, 0x40($s0) -/* C81D48 80241BA8 44820000 */ mtc1 $v0, $f0 -/* C81D4C 80241BAC 00000000 */ nop -/* C81D50 80241BB0 46800021 */ cvt.d.w $f0, $f0 -/* C81D54 80241BB4 46022100 */ add.s $f4, $f4, $f2 -/* C81D58 80241BB8 3C014008 */ lui $at, 0x4008 -/* C81D5C 80241BBC 44811800 */ mtc1 $at, $f3 -/* C81D60 80241BC0 44801000 */ mtc1 $zero, $f2 -/* C81D64 80241BC4 27A20038 */ addiu $v0, $sp, 0x38 -/* C81D68 80241BC8 46220000 */ add.d $f0, $f0, $f2 -/* C81D6C 80241BCC E7A60034 */ swc1 $f6, 0x34($sp) -/* C81D70 80241BD0 E7A40030 */ swc1 $f4, 0x30($sp) -/* C81D74 80241BD4 46200020 */ cvt.s.d $f0, $f0 -/* C81D78 80241BD8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C81D7C 80241BDC AFA20010 */ sw $v0, 0x10($sp) -/* C81D80 80241BE0 8E040080 */ lw $a0, 0x80($s0) -/* C81D84 80241BE4 0C0372DF */ jal npc_raycast_down_sides -/* C81D88 80241BE8 27A70034 */ addiu $a3, $sp, 0x34 -/* C81D8C 80241BEC 1040000A */ beqz $v0, .L80241C18 -/* C81D90 80241BF0 00000000 */ nop -/* C81D94 80241BF4 860200A8 */ lh $v0, 0xa8($s0) -/* C81D98 80241BF8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C81D9C 80241BFC 44820000 */ mtc1 $v0, $f0 -/* C81DA0 80241C00 00000000 */ nop -/* C81DA4 80241C04 46800020 */ cvt.s.w $f0, $f0 -/* C81DA8 80241C08 4600103C */ c.lt.s $f2, $f0 -/* C81DAC 80241C0C 00000000 */ nop -/* C81DB0 80241C10 45030001 */ bc1tl .L80241C18 -/* C81DB4 80241C14 24110001 */ addiu $s1, $zero, 1 -.L80241C18: -/* C81DB8 80241C18 12200008 */ beqz $s1, .L80241C3C -/* C81DBC 80241C1C 00000000 */ nop -/* C81DC0 80241C20 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C81DC4 80241C24 3C013FF0 */ lui $at, 0x3ff0 -/* C81DC8 80241C28 44811800 */ mtc1 $at, $f3 -/* C81DCC 80241C2C 44801000 */ mtc1 $zero, $f2 -/* C81DD0 80241C30 46000021 */ cvt.d.s $f0, $f0 -/* C81DD4 80241C34 08090731 */ j .L80241CC4 -/* C81DD8 80241C38 46220000 */ add.d $f0, $f0, $f2 -.L80241C3C: -/* C81DDC 80241C3C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81DE0 80241C40 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C81DE4 80241C44 3C014018 */ lui $at, 0x4018 -/* C81DE8 80241C48 44811800 */ mtc1 $at, $f3 -/* C81DEC 80241C4C 44801000 */ mtc1 $zero, $f2 -/* C81DF0 80241C50 C440002C */ lwc1 $f0, 0x2c($v0) -/* C81DF4 80241C54 C604003C */ lwc1 $f4, 0x3c($s0) -/* C81DF8 80241C58 46000021 */ cvt.d.s $f0, $f0 -/* C81DFC 80241C5C 46220000 */ add.d $f0, $f0, $f2 -/* C81E00 80241C60 46002121 */ cvt.d.s $f4, $f4 -/* C81E04 80241C64 46202001 */ sub.d $f0, $f4, $f0 -/* C81E08 80241C68 462001A0 */ cvt.s.d $f6, $f0 -/* C81E0C 80241C6C 44800000 */ mtc1 $zero, $f0 -/* C81E10 80241C70 44800800 */ mtc1 $zero, $f1 -/* C81E14 80241C74 460030A1 */ cvt.d.s $f2, $f6 -/* C81E18 80241C78 4620103C */ c.lt.d $f2, $f0 -/* C81E1C 80241C7C 00000000 */ nop -/* C81E20 80241C80 45010009 */ bc1t .L80241CA8 -/* C81E24 80241C84 00000000 */ nop -/* C81E28 80241C88 3C014010 */ lui $at, 0x4010 -/* C81E2C 80241C8C 44810800 */ mtc1 $at, $f1 -/* C81E30 80241C90 44800000 */ mtc1 $zero, $f0 -/* C81E34 80241C94 00000000 */ nop -/* C81E38 80241C98 4622003C */ c.lt.d $f0, $f2 -/* C81E3C 80241C9C 00000000 */ nop -/* C81E40 80241CA0 4500000A */ bc1f .L80241CCC -/* C81E44 80241CA4 00000000 */ nop -.L80241CA8: -/* C81E48 80241CA8 3C018024 */ lui $at, %hi(D_802458A8_C85A48) -/* C81E4C 80241CAC D42258A8 */ ldc1 $f2, %lo(D_802458A8_C85A48)($at) -/* C81E50 80241CB0 46003187 */ neg.s $f6, $f6 -/* C81E54 80241CB4 46003021 */ cvt.d.s $f0, $f6 -/* C81E58 80241CB8 46220002 */ mul.d $f0, $f0, $f2 -/* C81E5C 80241CBC 00000000 */ nop -/* C81E60 80241CC0 46202000 */ add.d $f0, $f4, $f0 -.L80241CC4: -/* C81E64 80241CC4 46200020 */ cvt.s.d $f0, $f0 -/* C81E68 80241CC8 E600003C */ swc1 $f0, 0x3c($s0) -.L80241CCC: -/* C81E6C 80241CCC 8602008E */ lh $v0, 0x8e($s0) -/* C81E70 80241CD0 9603008E */ lhu $v1, 0x8e($s0) -/* C81E74 80241CD4 18400003 */ blez $v0, .L80241CE4 -/* C81E78 80241CD8 2462FFFF */ addiu $v0, $v1, -1 -/* C81E7C 80241CDC 0809073B */ j .L80241CEC -/* C81E80 80241CE0 A602008E */ sh $v0, 0x8e($s0) -.L80241CE4: -/* C81E84 80241CE4 2402000C */ addiu $v0, $zero, 0xc -/* C81E88 80241CE8 AE620070 */ sw $v0, 0x70($s3) -.L80241CEC: -/* C81E8C 80241CEC 8FBF0050 */ lw $ra, 0x50($sp) -/* C81E90 80241CF0 8FB3004C */ lw $s3, 0x4c($sp) -/* C81E94 80241CF4 8FB20048 */ lw $s2, 0x48($sp) -/* C81E98 80241CF8 8FB10044 */ lw $s1, 0x44($sp) -/* C81E9C 80241CFC 8FB00040 */ lw $s0, 0x40($sp) -/* C81EA0 80241D00 03E00008 */ jr $ra -/* C81EA4 80241D04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s deleted file mode 100644 index df544740de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802458B0_C85A50 -.word .L80241E74_C82014, .L80241E84_C82024, .L80241E9C_C8203C, .L80241EAC_C8204C, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241EC4_C82064, .L80241ED4_C82074, .L80241EEC_C8208C, .L80241EFC_C8209C, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F24_C820C4, .L80241F14_C820B4, 0, 0, 0 - -.section .text - -glabel func_80241D64_C81F04 -/* C81F04 80241D64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C81F08 80241D68 AFB40040 */ sw $s4, 0x40($sp) -/* C81F0C 80241D6C 0080A02D */ daddu $s4, $a0, $zero -/* C81F10 80241D70 AFBF0048 */ sw $ra, 0x48($sp) -/* C81F14 80241D74 AFB50044 */ sw $s5, 0x44($sp) -/* C81F18 80241D78 AFB3003C */ sw $s3, 0x3c($sp) -/* C81F1C 80241D7C AFB20038 */ sw $s2, 0x38($sp) -/* C81F20 80241D80 AFB10034 */ sw $s1, 0x34($sp) -/* C81F24 80241D84 AFB00030 */ sw $s0, 0x30($sp) -/* C81F28 80241D88 8E920148 */ lw $s2, 0x148($s4) -/* C81F2C 80241D8C 86440008 */ lh $a0, 8($s2) -/* C81F30 80241D90 8E90000C */ lw $s0, 0xc($s4) -/* C81F34 80241D94 0C00EABB */ jal get_npc_unsafe -/* C81F38 80241D98 00A0882D */ daddu $s1, $a1, $zero -/* C81F3C 80241D9C 0280202D */ daddu $a0, $s4, $zero -/* C81F40 80241DA0 8E050000 */ lw $a1, ($s0) -/* C81F44 80241DA4 0C0B1EAF */ jal evt_get_variable -/* C81F48 80241DA8 0040A82D */ daddu $s5, $v0, $zero -/* C81F4C 80241DAC AFA00010 */ sw $zero, 0x10($sp) -/* C81F50 80241DB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F54 80241DB4 8C630030 */ lw $v1, 0x30($v1) -/* C81F58 80241DB8 AFA30014 */ sw $v1, 0x14($sp) -/* C81F5C 80241DBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F60 80241DC0 8C63001C */ lw $v1, 0x1c($v1) -/* C81F64 80241DC4 AFA30018 */ sw $v1, 0x18($sp) -/* C81F68 80241DC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F6C 80241DCC 8C630024 */ lw $v1, 0x24($v1) -/* C81F70 80241DD0 AFA3001C */ sw $v1, 0x1c($sp) -/* C81F74 80241DD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F78 80241DD8 8C630028 */ lw $v1, 0x28($v1) -/* C81F7C 80241DDC 27B30010 */ addiu $s3, $sp, 0x10 -/* C81F80 80241DE0 AFA30020 */ sw $v1, 0x20($sp) -/* C81F84 80241DE4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F88 80241DE8 3C0142F0 */ lui $at, 0x42f0 -/* C81F8C 80241DEC 44810000 */ mtc1 $at, $f0 -/* C81F90 80241DF0 8C63002C */ lw $v1, 0x2c($v1) -/* C81F94 80241DF4 0040802D */ daddu $s0, $v0, $zero -/* C81F98 80241DF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C81F9C 80241DFC A7A0002C */ sh $zero, 0x2c($sp) -/* C81FA0 80241E00 12200007 */ beqz $s1, .L80241E20 -/* C81FA4 80241E04 AFA30024 */ sw $v1, 0x24($sp) -/* C81FA8 80241E08 02A0202D */ daddu $a0, $s5, $zero -/* C81FAC 80241E0C 0240282D */ daddu $a1, $s2, $zero -/* C81FB0 80241E10 0280302D */ daddu $a2, $s4, $zero -/* C81FB4 80241E14 0C090592 */ jal kzn_11_UnkFunc5 -/* C81FB8 80241E18 0200382D */ daddu $a3, $s0, $zero -/* C81FBC 80241E1C AE800070 */ sw $zero, 0x70($s4) -.L80241E20: -/* C81FC0 80241E20 2402FFFE */ addiu $v0, $zero, -2 -/* C81FC4 80241E24 A2A200AB */ sb $v0, 0xab($s5) -/* C81FC8 80241E28 8E4300B0 */ lw $v1, 0xb0($s2) -/* C81FCC 80241E2C 30620004 */ andi $v0, $v1, 4 -/* C81FD0 80241E30 10400007 */ beqz $v0, .L80241E50 -/* C81FD4 80241E34 00000000 */ nop -/* C81FD8 80241E38 824200B4 */ lb $v0, 0xb4($s2) -/* C81FDC 80241E3C 1440003A */ bnez $v0, .L80241F28 -/* C81FE0 80241E40 0000102D */ daddu $v0, $zero, $zero -/* C81FE4 80241E44 2402FFFB */ addiu $v0, $zero, -5 -/* C81FE8 80241E48 00621024 */ and $v0, $v1, $v0 -/* C81FEC 80241E4C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E50: -/* C81FF0 80241E50 8E830070 */ lw $v1, 0x70($s4) -/* C81FF4 80241E54 2C620015 */ sltiu $v0, $v1, 0x15 -/* C81FF8 80241E58 10400032 */ beqz $v0, .L80241F24_C820C4 -/* C81FFC 80241E5C 00031080 */ sll $v0, $v1, 2 -/* C82000 80241E60 3C018024 */ lui $at, %hi(jtbl_802458B0_C85A50) -/* C82004 80241E64 00220821 */ addu $at, $at, $v0 -/* C82008 80241E68 8C2258B0 */ lw $v0, %lo(jtbl_802458B0_C85A50)($at) -/* C8200C 80241E6C 00400008 */ jr $v0 -/* C82010 80241E70 00000000 */ nop -.L80241E74_C82014: -/* C82014 80241E74 0280202D */ daddu $a0, $s4, $zero -/* C82018 80241E78 0200282D */ daddu $a1, $s0, $zero -/* C8201C 80241E7C 0C090118 */ jal kzn_11_UnkNpcAIFunc23 -/* C82020 80241E80 0260302D */ daddu $a2, $s3, $zero -.L80241E84_C82024: -/* C82024 80241E84 0280202D */ daddu $a0, $s4, $zero -/* C82028 80241E88 0200282D */ daddu $a1, $s0, $zero -/* C8202C 80241E8C 0C090184 */ jal kzn_11_UnkNpcAIFunc35 -/* C82030 80241E90 0260302D */ daddu $a2, $s3, $zero -/* C82034 80241E94 080907CA */ j .L80241F28 -/* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero -.L80241E9C_C8203C: -/* C8203C 80241E9C 0280202D */ daddu $a0, $s4, $zero -/* C82040 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C82044 80241EA4 0C09030E */ jal kzn_11_UnkNpcAIFunc1 -/* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero -.L80241EAC_C8204C: -/* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero -/* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero -/* C82054 80241EB4 0C09033E */ jal kzn_11_UnkFunc4 -/* C82058 80241EB8 0260302D */ daddu $a2, $s3, $zero -/* C8205C 80241EBC 080907CA */ j .L80241F28 -/* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero -.L80241EC4_C82064: -/* C82064 80241EC4 0280202D */ daddu $a0, $s4, $zero -/* C82068 80241EC8 0200282D */ daddu $a1, $s0, $zero -/* C8206C 80241ECC 0C09040F */ jal kzn_11_UnkNpcAIFunc2 -/* C82070 80241ED0 0260302D */ daddu $a2, $s3, $zero -.L80241ED4_C82074: -/* C82074 80241ED4 0280202D */ daddu $a0, $s4, $zero -/* C82078 80241ED8 0200282D */ daddu $a1, $s0, $zero -/* C8207C 80241EDC 0C09042D */ jal func_802410B4_C81254 -/* C82080 80241EE0 0260302D */ daddu $a2, $s3, $zero -/* C82084 80241EE4 080907CA */ j .L80241F28 -/* C82088 80241EE8 0000102D */ daddu $v0, $zero, $zero -.L80241EEC_C8208C: -/* C8208C 80241EEC 0280202D */ daddu $a0, $s4, $zero -/* C82090 80241EF0 0200282D */ daddu $a1, $s0, $zero -/* C82094 80241EF4 0C090656 */ jal kzn_11_UnkNpcAIFunc13 -/* C82098 80241EF8 0260302D */ daddu $a2, $s3, $zero -.L80241EFC_C8209C: -/* C8209C 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* C820A0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* C820A4 80241F04 0C0906A2 */ jal func_80241A88_C81C28 -/* C820A8 80241F08 0260302D */ daddu $a2, $s3, $zero -/* C820AC 80241F0C 080907CA */ j .L80241F28 -/* C820B0 80241F10 0000102D */ daddu $v0, $zero, $zero -.L80241F14_C820B4: -/* C820B4 80241F14 0280202D */ daddu $a0, $s4, $zero -/* C820B8 80241F18 0200282D */ daddu $a1, $s0, $zero -/* C820BC 80241F1C 0C090742 */ jal kzn_11_UnkFunc45 -/* C820C0 80241F20 0260302D */ daddu $a2, $s3, $zero -.L80241F24_C820C4: -/* C820C4 80241F24 0000102D */ daddu $v0, $zero, $zero -.L80241F28: -/* C820C8 80241F28 8FBF0048 */ lw $ra, 0x48($sp) -/* C820CC 80241F2C 8FB50044 */ lw $s5, 0x44($sp) -/* C820D0 80241F30 8FB40040 */ lw $s4, 0x40($sp) -/* C820D4 80241F34 8FB3003C */ lw $s3, 0x3c($sp) -/* C820D8 80241F38 8FB20038 */ lw $s2, 0x38($sp) -/* C820DC 80241F3C 8FB10034 */ lw $s1, 0x34($sp) -/* C820E0 80241F40 8FB00030 */ lw $s0, 0x30($sp) -/* C820E4 80241F44 03E00008 */ jr $ra -/* C820E8 80241F48 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s deleted file mode 100644 index 0ec0f29e59..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF4_BAE634 -/* BAE634 80240CF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BAE638 80240CF8 AFB00010 */ sw $s0, 0x10($sp) -/* BAE63C 80240CFC 0080802D */ daddu $s0, $a0, $zero -/* BAE640 80240D00 AFBF0014 */ sw $ra, 0x14($sp) -/* BAE644 80240D04 8E020148 */ lw $v0, 0x148($s0) -/* BAE648 80240D08 0C00EABB */ jal get_npc_unsafe -/* BAE64C 80240D0C 84440008 */ lh $a0, 8($v0) -/* BAE650 80240D10 9443008E */ lhu $v1, 0x8e($v0) -/* BAE654 80240D14 C440003C */ lwc1 $f0, 0x3c($v0) -/* BAE658 80240D18 24640001 */ addiu $a0, $v1, 1 -/* BAE65C 80240D1C 00031C00 */ sll $v1, $v1, 0x10 -/* BAE660 80240D20 00031B83 */ sra $v1, $v1, 0xe -/* BAE664 80240D24 A444008E */ sh $a0, 0x8e($v0) -/* BAE668 80240D28 3C018024 */ lui $at, %hi(D_802443C0_BB1D00) -/* BAE66C 80240D2C 00230821 */ addu $at, $at, $v1 -/* BAE670 80240D30 C42243C0 */ lwc1 $f2, %lo(D_802443C0_BB1D00)($at) -/* BAE674 80240D34 8443008E */ lh $v1, 0x8e($v0) -/* BAE678 80240D38 46020000 */ add.s $f0, $f0, $f2 -/* BAE67C 80240D3C 28630005 */ slti $v1, $v1, 5 -/* BAE680 80240D40 14600003 */ bnez $v1, .L80240D50 -/* BAE684 80240D44 E440003C */ swc1 $f0, 0x3c($v0) -/* BAE688 80240D48 2402000C */ addiu $v0, $zero, 0xc -/* BAE68C 80240D4C AE020070 */ sw $v0, 0x70($s0) -.L80240D50: -/* BAE690 80240D50 8FBF0014 */ lw $ra, 0x14($sp) -/* BAE694 80240D54 8FB00010 */ lw $s0, 0x10($sp) -/* BAE698 80240D58 03E00008 */ jr $ra -/* BAE69C 80240D5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s deleted file mode 100644 index c87f011e79..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802452B8_BB2BF8 -.word .L802414B8_BAEDF8, .L802414C8_BAEE08, .L802414E0_BAEE20, .L802414F0_BAEE30, .L80241570_BAEEB0, .L80241570_BAEEB0, .L80241570_BAEEB0, .L80241570_BAEEB0, .L80241570_BAEEB0, .L80241570_BAEEB0, .L80241508_BAEE48, .L80241518_BAEE58, .L80241530_BAEE70, .L80241548_BAEE88, .L80241560_BAEEA0, 0 - -.section .text - -glabel func_802413AC_BAECEC -/* BAECEC 802413AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BAECF0 802413B0 AFB40040 */ sw $s4, 0x40($sp) -/* BAECF4 802413B4 0080A02D */ daddu $s4, $a0, $zero -/* BAECF8 802413B8 AFBF0048 */ sw $ra, 0x48($sp) -/* BAECFC 802413BC AFB50044 */ sw $s5, 0x44($sp) -/* BAED00 802413C0 AFB3003C */ sw $s3, 0x3c($sp) -/* BAED04 802413C4 AFB20038 */ sw $s2, 0x38($sp) -/* BAED08 802413C8 AFB10034 */ sw $s1, 0x34($sp) -/* BAED0C 802413CC AFB00030 */ sw $s0, 0x30($sp) -/* BAED10 802413D0 8E920148 */ lw $s2, 0x148($s4) -/* BAED14 802413D4 86440008 */ lh $a0, 8($s2) -/* BAED18 802413D8 8E90000C */ lw $s0, 0xc($s4) -/* BAED1C 802413DC 0C00EABB */ jal get_npc_unsafe -/* BAED20 802413E0 00A0882D */ daddu $s1, $a1, $zero -/* BAED24 802413E4 0280202D */ daddu $a0, $s4, $zero -/* BAED28 802413E8 8E050000 */ lw $a1, ($s0) -/* BAED2C 802413EC 0C0B1EAF */ jal evt_get_variable -/* BAED30 802413F0 0040A82D */ daddu $s5, $v0, $zero -/* BAED34 802413F4 AFA00010 */ sw $zero, 0x10($sp) -/* BAED38 802413F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED3C 802413FC 8C630030 */ lw $v1, 0x30($v1) -/* BAED40 80241400 AFA30014 */ sw $v1, 0x14($sp) -/* BAED44 80241404 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED48 80241408 8C63001C */ lw $v1, 0x1c($v1) -/* BAED4C 8024140C AFA30018 */ sw $v1, 0x18($sp) -/* BAED50 80241410 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED54 80241414 8C630024 */ lw $v1, 0x24($v1) -/* BAED58 80241418 AFA3001C */ sw $v1, 0x1c($sp) -/* BAED5C 8024141C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED60 80241420 8C630028 */ lw $v1, 0x28($v1) -/* BAED64 80241424 27B30010 */ addiu $s3, $sp, 0x10 -/* BAED68 80241428 AFA30020 */ sw $v1, 0x20($sp) -/* BAED6C 8024142C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED70 80241430 3C0142F0 */ lui $at, 0x42f0 -/* BAED74 80241434 44810000 */ mtc1 $at, $f0 -/* BAED78 80241438 8C63002C */ lw $v1, 0x2c($v1) -/* BAED7C 8024143C 0040802D */ daddu $s0, $v0, $zero -/* BAED80 80241440 E7A00028 */ swc1 $f0, 0x28($sp) -/* BAED84 80241444 A7A0002C */ sh $zero, 0x2c($sp) -/* BAED88 80241448 12200006 */ beqz $s1, .L80241464 -/* BAED8C 8024144C AFA30024 */ sw $v1, 0x24($sp) -/* BAED90 80241450 02A0202D */ daddu $a0, $s5, $zero -/* BAED94 80241454 0240282D */ daddu $a1, $s2, $zero -/* BAED98 80241458 0280302D */ daddu $a2, $s4, $zero -/* BAED9C 8024145C 0C0904A2 */ jal mim_08_UnkFunc5 -/* BAEDA0 80241460 0200382D */ daddu $a3, $s0, $zero -.L80241464: -/* BAEDA4 80241464 2402FFFE */ addiu $v0, $zero, -2 -/* BAEDA8 80241468 A2A200AB */ sb $v0, 0xab($s5) -/* BAEDAC 8024146C 8E4300B0 */ lw $v1, 0xb0($s2) -/* BAEDB0 80241470 30620004 */ andi $v0, $v1, 4 -/* BAEDB4 80241474 10400007 */ beqz $v0, .L80241494 -/* BAEDB8 80241478 00000000 */ nop -/* BAEDBC 8024147C 824200B4 */ lb $v0, 0xb4($s2) -/* BAEDC0 80241480 1440003C */ bnez $v0, .L80241574 -/* BAEDC4 80241484 0000102D */ daddu $v0, $zero, $zero -/* BAEDC8 80241488 2402FFFB */ addiu $v0, $zero, -5 -/* BAEDCC 8024148C 00621024 */ and $v0, $v1, $v0 -/* BAEDD0 80241490 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241494: -/* BAEDD4 80241494 8E830070 */ lw $v1, 0x70($s4) -/* BAEDD8 80241498 2C62000F */ sltiu $v0, $v1, 0xf -/* BAEDDC 8024149C 10400034 */ beqz $v0, .L80241570_BAEEB0 -/* BAEDE0 802414A0 00031080 */ sll $v0, $v1, 2 -/* BAEDE4 802414A4 3C018024 */ lui $at, %hi(jtbl_802452B8_BB2BF8) -/* BAEDE8 802414A8 00220821 */ addu $at, $at, $v0 -/* BAEDEC 802414AC 8C2252B8 */ lw $v0, %lo(jtbl_802452B8_BB2BF8)($at) -/* BAEDF0 802414B0 00400008 */ jr $v0 -/* BAEDF4 802414B4 00000000 */ nop -.L802414B8_BAEDF8: -/* BAEDF8 802414B8 0280202D */ daddu $a0, $s4, $zero -/* BAEDFC 802414BC 0200282D */ daddu $a1, $s0, $zero -/* BAEE00 802414C0 0C090028 */ jal mim_08_UnkNpcAIFunc23 -/* BAEE04 802414C4 0260302D */ daddu $a2, $s3, $zero -.L802414C8_BAEE08: -/* BAEE08 802414C8 0280202D */ daddu $a0, $s4, $zero -/* BAEE0C 802414CC 0200282D */ daddu $a1, $s0, $zero -/* BAEE10 802414D0 0C090094 */ jal mim_08_UnkNpcAIFunc35 -/* BAEE14 802414D4 0260302D */ daddu $a2, $s3, $zero -/* BAEE18 802414D8 0809055D */ j .L80241574 -/* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero -.L802414E0_BAEE20: -/* BAEE20 802414E0 0280202D */ daddu $a0, $s4, $zero -/* BAEE24 802414E4 0200282D */ daddu $a1, $s0, $zero -/* BAEE28 802414E8 0C09021E */ jal mim_08_UnkNpcAIFunc1 -/* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero -.L802414F0_BAEE30: -/* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero -/* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero -/* BAEE38 802414F8 0C09024E */ jal mim_08_UnkFunc4 -/* BAEE3C 802414FC 0260302D */ daddu $a2, $s3, $zero -/* BAEE40 80241500 0809055D */ j .L80241574 -/* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero -.L80241508_BAEE48: -/* BAEE48 80241508 0280202D */ daddu $a0, $s4, $zero -/* BAEE4C 8024150C 0200282D */ daddu $a1, $s0, $zero -/* BAEE50 80241510 0C09031F */ jal mim_08_UnkNpcAIFunc2 -/* BAEE54 80241514 0260302D */ daddu $a2, $s3, $zero -.L80241518_BAEE58: -/* BAEE58 80241518 0280202D */ daddu $a0, $s4, $zero -/* BAEE5C 8024151C 0200282D */ daddu $a1, $s0, $zero -/* BAEE60 80241520 0C09033D */ jal func_80240CF4_BAE634 -/* BAEE64 80241524 0260302D */ daddu $a2, $s3, $zero -/* BAEE68 80241528 0809055D */ j .L80241574 -/* BAEE6C 8024152C 0000102D */ daddu $v0, $zero, $zero -.L80241530_BAEE70: -/* BAEE70 80241530 0280202D */ daddu $a0, $s4, $zero -/* BAEE74 80241534 0200282D */ daddu $a1, $s0, $zero -/* BAEE78 80241538 0C090358 */ jal mim_08_UnkNpcAIFunc14 -/* BAEE7C 8024153C 0260302D */ daddu $a2, $s3, $zero -/* BAEE80 80241540 0809055D */ j .L80241574 -/* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero -.L80241548_BAEE88: -/* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero -/* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BAEE90 80241550 0C0903A5 */ jal mim_08_UnkNpcAIFunc3 -/* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero -/* BAEE98 80241558 0809055D */ j .L80241574 -/* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero -.L80241560_BAEEA0: -/* BAEEA0 80241560 0280202D */ daddu $a0, $s4, $zero -/* BAEEA4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BAEEA8 80241568 0C0903BE */ jal mim_08_UnkFunc6 -/* BAEEAC 8024156C 0260302D */ daddu $a2, $s3, $zero -.L80241570_BAEEB0: -/* BAEEB0 80241570 0000102D */ daddu $v0, $zero, $zero -.L80241574: -/* BAEEB4 80241574 8FBF0048 */ lw $ra, 0x48($sp) -/* BAEEB8 80241578 8FB50044 */ lw $s5, 0x44($sp) -/* BAEEBC 8024157C 8FB40040 */ lw $s4, 0x40($sp) -/* BAEEC0 80241580 8FB3003C */ lw $s3, 0x3c($sp) -/* BAEEC4 80241584 8FB20038 */ lw $s2, 0x38($sp) -/* BAEEC8 80241588 8FB10034 */ lw $s1, 0x34($sp) -/* BAEECC 8024158C 8FB00030 */ lw $s0, 0x30($sp) -/* BAEED0 80241590 03E00008 */ jr $ra -/* BAEED4 80241594 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s deleted file mode 100644 index 28f6c35a98..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241428_9F5E68 -/* 9F5E68 80241428 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9F5E6C 8024142C AFB00010 */ sw $s0, 0x10($sp) -/* 9F5E70 80241430 0080802D */ daddu $s0, $a0, $zero -/* 9F5E74 80241434 AFBF0014 */ sw $ra, 0x14($sp) -/* 9F5E78 80241438 8E020148 */ lw $v0, 0x148($s0) -/* 9F5E7C 8024143C 0C00EABB */ jal get_npc_unsafe -/* 9F5E80 80241440 84440008 */ lh $a0, 8($v0) -/* 9F5E84 80241444 9443008E */ lhu $v1, 0x8e($v0) -/* 9F5E88 80241448 C440003C */ lwc1 $f0, 0x3c($v0) -/* 9F5E8C 8024144C 24640001 */ addiu $a0, $v1, 1 -/* 9F5E90 80241450 00031C00 */ sll $v1, $v1, 0x10 -/* 9F5E94 80241454 00031B83 */ sra $v1, $v1, 0xe -/* 9F5E98 80241458 A444008E */ sh $a0, 0x8e($v0) -/* 9F5E9C 8024145C 3C018024 */ lui $at, %hi(D_80242888_9F72C8) -/* 9F5EA0 80241460 00230821 */ addu $at, $at, $v1 -/* 9F5EA4 80241464 C4222888 */ lwc1 $f2, %lo(D_80242888_9F72C8)($at) -/* 9F5EA8 80241468 8443008E */ lh $v1, 0x8e($v0) -/* 9F5EAC 8024146C 46020000 */ add.s $f0, $f0, $f2 -/* 9F5EB0 80241470 28630005 */ slti $v1, $v1, 5 -/* 9F5EB4 80241474 14600003 */ bnez $v1, .L80241484 -/* 9F5EB8 80241478 E440003C */ swc1 $f0, 0x3c($v0) -/* 9F5EBC 8024147C 2402000C */ addiu $v0, $zero, 0xc -/* 9F5EC0 80241480 AE020070 */ sw $v0, 0x70($s0) -.L80241484: -/* 9F5EC4 80241484 8FBF0014 */ lw $ra, 0x14($sp) -/* 9F5EC8 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* 9F5ECC 8024148C 03E00008 */ jr $ra -/* 9F5ED0 80241490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s deleted file mode 100644 index 09376980cc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245D68_9FA7A8 -.word .L80241BEC_9F662C, .L80241BFC_9F663C, .L80241C14_9F6654, .L80241C24_9F6664, .L80241CA4_9F66E4, .L80241CA4_9F66E4, .L80241CA4_9F66E4, .L80241CA4_9F66E4, .L80241CA4_9F66E4, .L80241CA4_9F66E4, .L80241C3C_9F667C, .L80241C4C_9F668C, .L80241C64_9F66A4, .L80241C7C_9F66BC, .L80241C94_9F66D4, 0, 0, 0 - -.section .text - -glabel func_80241AE0_9F6520 -/* 9F6520 80241AE0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9F6524 80241AE4 AFB40040 */ sw $s4, 0x40($sp) -/* 9F6528 80241AE8 0080A02D */ daddu $s4, $a0, $zero -/* 9F652C 80241AEC AFBF0048 */ sw $ra, 0x48($sp) -/* 9F6530 80241AF0 AFB50044 */ sw $s5, 0x44($sp) -/* 9F6534 80241AF4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9F6538 80241AF8 AFB20038 */ sw $s2, 0x38($sp) -/* 9F653C 80241AFC AFB10034 */ sw $s1, 0x34($sp) -/* 9F6540 80241B00 AFB00030 */ sw $s0, 0x30($sp) -/* 9F6544 80241B04 8E920148 */ lw $s2, 0x148($s4) -/* 9F6548 80241B08 86440008 */ lh $a0, 8($s2) -/* 9F654C 80241B0C 8E90000C */ lw $s0, 0xc($s4) -/* 9F6550 80241B10 0C00EABB */ jal get_npc_unsafe -/* 9F6554 80241B14 00A0882D */ daddu $s1, $a1, $zero -/* 9F6558 80241B18 0280202D */ daddu $a0, $s4, $zero -/* 9F655C 80241B1C 8E050000 */ lw $a1, ($s0) -/* 9F6560 80241B20 0C0B1EAF */ jal evt_get_variable -/* 9F6564 80241B24 0040A82D */ daddu $s5, $v0, $zero -/* 9F6568 80241B28 AFA00010 */ sw $zero, 0x10($sp) -/* 9F656C 80241B2C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F6570 80241B30 8C630030 */ lw $v1, 0x30($v1) -/* 9F6574 80241B34 AFA30014 */ sw $v1, 0x14($sp) -/* 9F6578 80241B38 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F657C 80241B3C 8C63001C */ lw $v1, 0x1c($v1) -/* 9F6580 80241B40 AFA30018 */ sw $v1, 0x18($sp) -/* 9F6584 80241B44 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F6588 80241B48 8C630024 */ lw $v1, 0x24($v1) -/* 9F658C 80241B4C AFA3001C */ sw $v1, 0x1c($sp) -/* 9F6590 80241B50 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F6594 80241B54 8C630028 */ lw $v1, 0x28($v1) -/* 9F6598 80241B58 27B30010 */ addiu $s3, $sp, 0x10 -/* 9F659C 80241B5C AFA30020 */ sw $v1, 0x20($sp) -/* 9F65A0 80241B60 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F65A4 80241B64 3C0142F0 */ lui $at, 0x42f0 -/* 9F65A8 80241B68 44810000 */ mtc1 $at, $f0 -/* 9F65AC 80241B6C 8C63002C */ lw $v1, 0x2c($v1) -/* 9F65B0 80241B70 0040802D */ daddu $s0, $v0, $zero -/* 9F65B4 80241B74 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F65B8 80241B78 A7A0002C */ sh $zero, 0x2c($sp) -/* 9F65BC 80241B7C 12200006 */ beqz $s1, .L80241B98 -/* 9F65C0 80241B80 AFA30024 */ sw $v1, 0x24($sp) -/* 9F65C4 80241B84 02A0202D */ daddu $a0, $s5, $zero -/* 9F65C8 80241B88 0240282D */ daddu $a1, $s2, $zero -/* 9F65CC 80241B8C 0280302D */ daddu $a2, $s4, $zero -/* 9F65D0 80241B90 0C09066F */ jal nok_11_UnkFunc5 -/* 9F65D4 80241B94 0200382D */ daddu $a3, $s0, $zero -.L80241B98: -/* 9F65D8 80241B98 2402FFFE */ addiu $v0, $zero, -2 -/* 9F65DC 80241B9C A2A200AB */ sb $v0, 0xab($s5) -/* 9F65E0 80241BA0 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9F65E4 80241BA4 30620004 */ andi $v0, $v1, 4 -/* 9F65E8 80241BA8 10400007 */ beqz $v0, .L80241BC8 -/* 9F65EC 80241BAC 00000000 */ nop -/* 9F65F0 80241BB0 824200B4 */ lb $v0, 0xb4($s2) -/* 9F65F4 80241BB4 1440003C */ bnez $v0, .L80241CA8 -/* 9F65F8 80241BB8 0000102D */ daddu $v0, $zero, $zero -/* 9F65FC 80241BBC 2402FFFB */ addiu $v0, $zero, -5 -/* 9F6600 80241BC0 00621024 */ and $v0, $v1, $v0 -/* 9F6604 80241BC4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241BC8: -/* 9F6608 80241BC8 8E830070 */ lw $v1, 0x70($s4) -/* 9F660C 80241BCC 2C62000F */ sltiu $v0, $v1, 0xf -/* 9F6610 80241BD0 10400034 */ beqz $v0, .L80241CA4_9F66E4 -/* 9F6614 80241BD4 00031080 */ sll $v0, $v1, 2 -/* 9F6618 80241BD8 3C018024 */ lui $at, %hi(jtbl_80245D68_9FA7A8) -/* 9F661C 80241BDC 00220821 */ addu $at, $at, $v0 -/* 9F6620 80241BE0 8C225D68 */ lw $v0, %lo(jtbl_80245D68_9FA7A8)($at) -/* 9F6624 80241BE4 00400008 */ jr $v0 -/* 9F6628 80241BE8 00000000 */ nop -.L80241BEC_9F662C: -/* 9F662C 80241BEC 0280202D */ daddu $a0, $s4, $zero -/* 9F6630 80241BF0 0200282D */ daddu $a1, $s0, $zero -/* 9F6634 80241BF4 0C0901F5 */ jal nok_11_UnkNpcAIFunc23 -/* 9F6638 80241BF8 0260302D */ daddu $a2, $s3, $zero -.L80241BFC_9F663C: -/* 9F663C 80241BFC 0280202D */ daddu $a0, $s4, $zero -/* 9F6640 80241C00 0200282D */ daddu $a1, $s0, $zero -/* 9F6644 80241C04 0C090261 */ jal nok_11_UnkNpcAIFunc35 -/* 9F6648 80241C08 0260302D */ daddu $a2, $s3, $zero -/* 9F664C 80241C0C 0809072A */ j .L80241CA8 -/* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero -.L80241C14_9F6654: -/* 9F6654 80241C14 0280202D */ daddu $a0, $s4, $zero -/* 9F6658 80241C18 0200282D */ daddu $a1, $s0, $zero -/* 9F665C 80241C1C 0C0903EB */ jal nok_11_UnkNpcAIFunc1 -/* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero -.L80241C24_9F6664: -/* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero -/* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero -/* 9F666C 80241C2C 0C09041B */ jal nok_11_UnkFunc4 -/* 9F6670 80241C30 0260302D */ daddu $a2, $s3, $zero -/* 9F6674 80241C34 0809072A */ j .L80241CA8 -/* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero -.L80241C3C_9F667C: -/* 9F667C 80241C3C 0280202D */ daddu $a0, $s4, $zero -/* 9F6680 80241C40 0200282D */ daddu $a1, $s0, $zero -/* 9F6684 80241C44 0C0904EC */ jal nok_11_UnkNpcAIFunc2 -/* 9F6688 80241C48 0260302D */ daddu $a2, $s3, $zero -.L80241C4C_9F668C: -/* 9F668C 80241C4C 0280202D */ daddu $a0, $s4, $zero -/* 9F6690 80241C50 0200282D */ daddu $a1, $s0, $zero -/* 9F6694 80241C54 0C09050A */ jal func_80241428_9F5E68 -/* 9F6698 80241C58 0260302D */ daddu $a2, $s3, $zero -/* 9F669C 80241C5C 0809072A */ j .L80241CA8 -/* 9F66A0 80241C60 0000102D */ daddu $v0, $zero, $zero -.L80241C64_9F66A4: -/* 9F66A4 80241C64 0280202D */ daddu $a0, $s4, $zero -/* 9F66A8 80241C68 0200282D */ daddu $a1, $s0, $zero -/* 9F66AC 80241C6C 0C090525 */ jal nok_11_UnkNpcAIFunc14 -/* 9F66B0 80241C70 0260302D */ daddu $a2, $s3, $zero -/* 9F66B4 80241C74 0809072A */ j .L80241CA8 -/* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero -.L80241C7C_9F66BC: -/* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero -/* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero -/* 9F66C4 80241C84 0C090572 */ jal nok_11_UnkNpcAIFunc3 -/* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero -/* 9F66CC 80241C8C 0809072A */ j .L80241CA8 -/* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero -.L80241C94_9F66D4: -/* 9F66D4 80241C94 0280202D */ daddu $a0, $s4, $zero -/* 9F66D8 80241C98 0200282D */ daddu $a1, $s0, $zero -/* 9F66DC 80241C9C 0C09058B */ jal nok_11_UnkFunc6 -/* 9F66E0 80241CA0 0260302D */ daddu $a2, $s3, $zero -.L80241CA4_9F66E4: -/* 9F66E4 80241CA4 0000102D */ daddu $v0, $zero, $zero -.L80241CA8: -/* 9F66E8 80241CA8 8FBF0048 */ lw $ra, 0x48($sp) -/* 9F66EC 80241CAC 8FB50044 */ lw $s5, 0x44($sp) -/* 9F66F0 80241CB0 8FB40040 */ lw $s4, 0x40($sp) -/* 9F66F4 80241CB4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9F66F8 80241CB8 8FB20038 */ lw $s2, 0x38($sp) -/* 9F66FC 80241CBC 8FB10034 */ lw $s1, 0x34($sp) -/* 9F6700 80241CC0 8FB00030 */ lw $s0, 0x30($sp) -/* 9F6704 80241CC4 03E00008 */ jr $ra -/* 9F6708 80241CC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s deleted file mode 100644 index d91c915e6c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245C70_A00460 -.word .L80241DE0_9FC5D0, .L80241DF8_9FC5E8, .L80241E10_9FC600, .L80241E20_9FC610, .L80241E38_9FC628, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241E50_9FC640, .L80241E60_9FC650, .L80241E78_9FC668, .L80241E90_9FC680, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EB0_9FC6A0, .L80241EA8_9FC698 - -.section .text - -glabel func_80241BD4_9FC3C4 -/* 9FC3C4 80241BD4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9FC3C8 80241BD8 AFB3005C */ sw $s3, 0x5c($sp) -/* 9FC3CC 80241BDC 0080982D */ daddu $s3, $a0, $zero -/* 9FC3D0 80241BE0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9FC3D4 80241BE4 AFB50064 */ sw $s5, 0x64($sp) -/* 9FC3D8 80241BE8 AFB40060 */ sw $s4, 0x60($sp) -/* 9FC3DC 80241BEC AFB20058 */ sw $s2, 0x58($sp) -/* 9FC3E0 80241BF0 AFB10054 */ sw $s1, 0x54($sp) -/* 9FC3E4 80241BF4 AFB00050 */ sw $s0, 0x50($sp) -/* 9FC3E8 80241BF8 8E710148 */ lw $s1, 0x148($s3) -/* 9FC3EC 80241BFC 86240008 */ lh $a0, 8($s1) -/* 9FC3F0 80241C00 0C00EABB */ jal get_npc_unsafe -/* 9FC3F4 80241C04 00A0802D */ daddu $s0, $a1, $zero -/* 9FC3F8 80241C08 8E63000C */ lw $v1, 0xc($s3) -/* 9FC3FC 80241C0C 0260202D */ daddu $a0, $s3, $zero -/* 9FC400 80241C10 8C650000 */ lw $a1, ($v1) -/* 9FC404 80241C14 0C0B1EAF */ jal evt_get_variable -/* 9FC408 80241C18 0040902D */ daddu $s2, $v0, $zero -/* 9FC40C 80241C1C AFA00028 */ sw $zero, 0x28($sp) -/* 9FC410 80241C20 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC414 80241C24 8C630094 */ lw $v1, 0x94($v1) -/* 9FC418 80241C28 AFA3002C */ sw $v1, 0x2c($sp) -/* 9FC41C 80241C2C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC420 80241C30 8C630080 */ lw $v1, 0x80($v1) -/* 9FC424 80241C34 AFA30030 */ sw $v1, 0x30($sp) -/* 9FC428 80241C38 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC42C 80241C3C 8C630088 */ lw $v1, 0x88($v1) -/* 9FC430 80241C40 AFA30034 */ sw $v1, 0x34($sp) -/* 9FC434 80241C44 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC438 80241C48 8C63008C */ lw $v1, 0x8c($v1) -/* 9FC43C 80241C4C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9FC440 80241C50 AFA30038 */ sw $v1, 0x38($sp) -/* 9FC444 80241C54 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC448 80241C58 3C0142C8 */ lui $at, 0x42c8 -/* 9FC44C 80241C5C 44810000 */ mtc1 $at, $f0 -/* 9FC450 80241C60 8C630090 */ lw $v1, 0x90($v1) -/* 9FC454 80241C64 0040A02D */ daddu $s4, $v0, $zero -/* 9FC458 80241C68 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9FC45C 80241C6C A7A00044 */ sh $zero, 0x44($sp) -/* 9FC460 80241C70 12000007 */ beqz $s0, .L80241C90 -/* 9FC464 80241C74 AFA3003C */ sw $v1, 0x3c($sp) -/* 9FC468 80241C78 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC46C 80241C7C 864300A8 */ lh $v1, 0xa8($s2) -/* 9FC470 80241C80 34420008 */ ori $v0, $v0, 8 -/* 9FC474 80241C84 AE230084 */ sw $v1, 0x84($s1) -/* 9FC478 80241C88 08090728 */ j .L80241CA0 -/* 9FC47C 80241C8C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241C90: -/* 9FC480 80241C90 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC484 80241C94 30420004 */ andi $v0, $v0, 4 -/* 9FC488 80241C98 10400048 */ beqz $v0, .L80241DBC -/* 9FC48C 80241C9C 00000000 */ nop -.L80241CA0: -/* 9FC490 80241CA0 A640008E */ sh $zero, 0x8e($s2) -/* 9FC494 80241CA4 AE600070 */ sw $zero, 0x70($s3) -/* 9FC498 80241CA8 8E2300CC */ lw $v1, 0xcc($s1) -/* 9FC49C 80241CAC 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9FC4A0 80241CB0 A2200007 */ sb $zero, 7($s1) -/* 9FC4A4 80241CB4 8E420000 */ lw $v0, ($s2) -/* 9FC4A8 80241CB8 8C630000 */ lw $v1, ($v1) -/* 9FC4AC 80241CBC 00441024 */ and $v0, $v0, $a0 -/* 9FC4B0 80241CC0 AE420000 */ sw $v0, ($s2) -/* 9FC4B4 80241CC4 AE430028 */ sw $v1, 0x28($s2) -/* 9FC4B8 80241CC8 96220086 */ lhu $v0, 0x86($s1) -/* 9FC4BC 80241CCC A64200A8 */ sh $v0, 0xa8($s2) -/* 9FC4C0 80241CD0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9FC4C4 80241CD4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9FC4C8 80241CD8 AE20008C */ sw $zero, 0x8c($s1) -/* 9FC4CC 80241CDC 8C420098 */ lw $v0, 0x98($v0) -/* 9FC4D0 80241CE0 14400006 */ bnez $v0, .L80241CFC -/* 9FC4D4 80241CE4 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9FC4D8 80241CE8 8E420000 */ lw $v0, ($s2) -/* 9FC4DC 80241CEC 2403FFF7 */ addiu $v1, $zero, -9 -/* 9FC4E0 80241CF0 34420200 */ ori $v0, $v0, 0x200 -/* 9FC4E4 80241CF4 08090742 */ j .L80241D08 -/* 9FC4E8 80241CF8 00431024 */ and $v0, $v0, $v1 -.L80241CFC: -/* 9FC4EC 80241CFC 8E420000 */ lw $v0, ($s2) -/* 9FC4F0 80241D00 00431024 */ and $v0, $v0, $v1 -/* 9FC4F4 80241D04 34420008 */ ori $v0, $v0, 8 -.L80241D08: -/* 9FC4F8 80241D08 AE420000 */ sw $v0, ($s2) -/* 9FC4FC 80241D0C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC500 80241D10 30420004 */ andi $v0, $v0, 4 -/* 9FC504 80241D14 1040001E */ beqz $v0, .L80241D90 -/* 9FC508 80241D18 24040002 */ addiu $a0, $zero, 2 -/* 9FC50C 80241D1C 0240282D */ daddu $a1, $s2, $zero -/* 9FC510 80241D20 0000302D */ daddu $a2, $zero, $zero -/* 9FC514 80241D24 24020063 */ addiu $v0, $zero, 0x63 -/* 9FC518 80241D28 AE620070 */ sw $v0, 0x70($s3) -/* 9FC51C 80241D2C AE600074 */ sw $zero, 0x74($s3) -/* 9FC520 80241D30 864300A8 */ lh $v1, 0xa8($s2) -/* 9FC524 80241D34 3C013F80 */ lui $at, 0x3f80 -/* 9FC528 80241D38 44810000 */ mtc1 $at, $f0 -/* 9FC52C 80241D3C 3C014000 */ lui $at, 0x4000 -/* 9FC530 80241D40 44811000 */ mtc1 $at, $f2 -/* 9FC534 80241D44 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FC538 80241D48 44812000 */ mtc1 $at, $f4 -/* 9FC53C 80241D4C 24020028 */ addiu $v0, $zero, 0x28 -/* 9FC540 80241D50 AFA2001C */ sw $v0, 0x1c($sp) -/* 9FC544 80241D54 44833000 */ mtc1 $v1, $f6 -/* 9FC548 80241D58 00000000 */ nop -/* 9FC54C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 -/* 9FC550 80241D60 44073000 */ mfc1 $a3, $f6 -/* 9FC554 80241D64 27A20048 */ addiu $v0, $sp, 0x48 -/* 9FC558 80241D68 AFA20020 */ sw $v0, 0x20($sp) -/* 9FC55C 80241D6C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FC560 80241D70 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FC564 80241D74 0C01BFA4 */ jal fx_emote -/* 9FC568 80241D78 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FC56C 80241D7C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC570 80241D80 2403FFFB */ addiu $v1, $zero, -5 -/* 9FC574 80241D84 00431024 */ and $v0, $v0, $v1 -/* 9FC578 80241D88 0809076F */ j .L80241DBC -/* 9FC57C 80241D8C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241D90: -/* 9FC580 80241D90 8E220000 */ lw $v0, ($s1) -/* 9FC584 80241D94 3C034000 */ lui $v1, 0x4000 -/* 9FC588 80241D98 00431024 */ and $v0, $v0, $v1 -/* 9FC58C 80241D9C 10400007 */ beqz $v0, .L80241DBC -/* 9FC590 80241DA0 3C03BFFF */ lui $v1, 0xbfff -/* 9FC594 80241DA4 2402000C */ addiu $v0, $zero, 0xc -/* 9FC598 80241DA8 AE620070 */ sw $v0, 0x70($s3) -/* 9FC59C 80241DAC 8E220000 */ lw $v0, ($s1) -/* 9FC5A0 80241DB0 3463FFFF */ ori $v1, $v1, 0xffff -/* 9FC5A4 80241DB4 00431024 */ and $v0, $v0, $v1 -/* 9FC5A8 80241DB8 AE220000 */ sw $v0, ($s1) -.L80241DBC: -/* 9FC5AC 80241DBC 8E630070 */ lw $v1, 0x70($s3) -/* 9FC5B0 80241DC0 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9FC5B4 80241DC4 1040003A */ beqz $v0, .L80241EB0_9FC6A0 -/* 9FC5B8 80241DC8 00031080 */ sll $v0, $v1, 2 -/* 9FC5BC 80241DCC 3C018024 */ lui $at, %hi(jtbl_80245C70_A00460) -/* 9FC5C0 80241DD0 00220821 */ addu $at, $at, $v0 -/* 9FC5C4 80241DD4 8C225C70 */ lw $v0, %lo(jtbl_80245C70_A00460)($at) -/* 9FC5C8 80241DD8 00400008 */ jr $v0 -/* 9FC5CC 80241DDC 00000000 */ nop -.L80241DE0_9FC5D0: -/* 9FC5D0 80241DE0 0260202D */ daddu $a0, $s3, $zero -/* 9FC5D4 80241DE4 0280282D */ daddu $a1, $s4, $zero -/* 9FC5D8 80241DE8 0C090351 */ jal nok_12_UnkNpcAIFunc24 -/* 9FC5DC 80241DEC 02A0302D */ daddu $a2, $s5, $zero -/* 9FC5E0 80241DF0 96220086 */ lhu $v0, 0x86($s1) -/* 9FC5E4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) -.L80241DF8_9FC5E8: -/* 9FC5E8 80241DF8 0260202D */ daddu $a0, $s3, $zero -/* 9FC5EC 80241DFC 0280282D */ daddu $a1, $s4, $zero -/* 9FC5F0 80241E00 0C0903A7 */ jal nok_12_UnkFunc13 -/* 9FC5F4 80241E04 02A0302D */ daddu $a2, $s5, $zero -/* 9FC5F8 80241E08 080907AC */ j .L80241EB0_9FC6A0 -/* 9FC5FC 80241E0C 00000000 */ nop -.L80241E10_9FC600: -/* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero -/* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero -/* 9FC608 80241E18 0C090451 */ jal nok_12_UnkNpcAIFunc1 -/* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero -.L80241E20_9FC610: -/* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero -/* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero -/* 9FC618 80241E28 0C090481 */ jal nok_12_UnkFunc14 -/* 9FC61C 80241E2C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC620 80241E30 080907AC */ j .L80241EB0_9FC6A0 -/* 9FC624 80241E34 00000000 */ nop -.L80241E38_9FC628: -/* 9FC628 80241E38 0260202D */ daddu $a0, $s3, $zero -/* 9FC62C 80241E3C 0280282D */ daddu $a1, $s4, $zero -/* 9FC630 80241E40 0C0904F0 */ jal nok_12_UnkNpcAIFunc25 -/* 9FC634 80241E44 02A0302D */ daddu $a2, $s5, $zero -/* 9FC638 80241E48 080907AC */ j .L80241EB0_9FC6A0 -/* 9FC63C 80241E4C 00000000 */ nop -.L80241E50_9FC640: -/* 9FC640 80241E50 0260202D */ daddu $a0, $s3, $zero -/* 9FC644 80241E54 0280282D */ daddu $a1, $s4, $zero -/* 9FC648 80241E58 0C09015C */ jal nok_12_set_script_owner_npc_anim -/* 9FC64C 80241E5C 02A0302D */ daddu $a2, $s5, $zero -.L80241E60_9FC650: -/* 9FC650 80241E60 0260202D */ daddu $a0, $s3, $zero -/* 9FC654 80241E64 0280282D */ daddu $a1, $s4, $zero -/* 9FC658 80241E68 0C09017B */ jal nok_12_UnkDistFunc -/* 9FC65C 80241E6C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC660 80241E70 080907AC */ j .L80241EB0_9FC6A0 -/* 9FC664 80241E74 00000000 */ nop -.L80241E78_9FC668: -/* 9FC668 80241E78 0260202D */ daddu $a0, $s3, $zero -/* 9FC66C 80241E7C 0280282D */ daddu $a1, $s4, $zero -/* 9FC670 80241E80 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 -/* 9FC674 80241E84 02A0302D */ daddu $a2, $s5, $zero -/* 9FC678 80241E88 080907AC */ j .L80241EB0_9FC6A0 -/* 9FC67C 80241E8C 00000000 */ nop -.L80241E90_9FC680: -/* 9FC680 80241E90 0260202D */ daddu $a0, $s3, $zero -/* 9FC684 80241E94 0280282D */ daddu $a1, $s4, $zero -/* 9FC688 80241E98 0C090221 */ jal nok_12_set_script_owner_npc_col_height -/* 9FC68C 80241E9C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC690 80241EA0 080907AC */ j .L80241EB0_9FC6A0 -/* 9FC694 80241EA4 00000000 */ nop -.L80241EA8_9FC698: -/* 9FC698 80241EA8 0C0129CF */ jal func_8004A73C -/* 9FC69C 80241EAC 0260202D */ daddu $a0, $s3, $zero -.L80241EB0_9FC6A0: -/* 9FC6A0 80241EB0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9FC6A4 80241EB4 8FB50064 */ lw $s5, 0x64($sp) -/* 9FC6A8 80241EB8 8FB40060 */ lw $s4, 0x60($sp) -/* 9FC6AC 80241EBC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9FC6B0 80241EC0 8FB20058 */ lw $s2, 0x58($sp) -/* 9FC6B4 80241EC4 8FB10054 */ lw $s1, 0x54($sp) -/* 9FC6B8 80241EC8 8FB00050 */ lw $s0, 0x50($sp) -/* 9FC6BC 80241ECC 0000102D */ daddu $v0, $zero, $zero -/* 9FC6C0 80241ED0 03E00008 */ jr $ra -/* 9FC6C4 80241ED4 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9FC6C8 80241ED8 00000000 */ nop -/* 9FC6CC 80241EDC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s deleted file mode 100644 index 5e42ddd20f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415E8_A03E28 -/* A03E28 802415E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A03E2C 802415EC AFB00010 */ sw $s0, 0x10($sp) -/* A03E30 802415F0 0080802D */ daddu $s0, $a0, $zero -/* A03E34 802415F4 AFBF0014 */ sw $ra, 0x14($sp) -/* A03E38 802415F8 8E020148 */ lw $v0, 0x148($s0) -/* A03E3C 802415FC 0C00EABB */ jal get_npc_unsafe -/* A03E40 80241600 84440008 */ lh $a0, 8($v0) -/* A03E44 80241604 9443008E */ lhu $v1, 0x8e($v0) -/* A03E48 80241608 C440003C */ lwc1 $f0, 0x3c($v0) -/* A03E4C 8024160C 24640001 */ addiu $a0, $v1, 1 -/* A03E50 80241610 00031C00 */ sll $v1, $v1, 0x10 -/* A03E54 80241614 00031B83 */ sra $v1, $v1, 0xe -/* A03E58 80241618 A444008E */ sh $a0, 0x8e($v0) -/* A03E5C 8024161C 3C018024 */ lui $at, %hi(D_80243A18_A06258) -/* A03E60 80241620 00230821 */ addu $at, $at, $v1 -/* A03E64 80241624 C4223A18 */ lwc1 $f2, %lo(D_80243A18_A06258)($at) -/* A03E68 80241628 8443008E */ lh $v1, 0x8e($v0) -/* A03E6C 8024162C 46020000 */ add.s $f0, $f0, $f2 -/* A03E70 80241630 28630005 */ slti $v1, $v1, 5 -/* A03E74 80241634 14600003 */ bnez $v1, .L80241644 -/* A03E78 80241638 E440003C */ swc1 $f0, 0x3c($v0) -/* A03E7C 8024163C 2402000C */ addiu $v0, $zero, 0xc -/* A03E80 80241640 AE020070 */ sw $v0, 0x70($s0) -.L80241644: -/* A03E84 80241644 8FBF0014 */ lw $ra, 0x14($sp) -/* A03E88 80241648 8FB00010 */ lw $s0, 0x10($sp) -/* A03E8C 8024164C 03E00008 */ jr $ra -/* A03E90 80241650 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s deleted file mode 100644 index 203425dffa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244638_A06E78 -.word .L80241DAC_A045EC, .L80241DBC_A045FC, .L80241DD4_A04614, .L80241DE4_A04624, .L80241E64_A046A4, .L80241E64_A046A4, .L80241E64_A046A4, .L80241E64_A046A4, .L80241E64_A046A4, .L80241E64_A046A4, .L80241DFC_A0463C, .L80241E0C_A0464C, .L80241E24_A04664, .L80241E3C_A0467C, .L80241E54_A04694, 0 - -.section .text - -glabel func_80241CA0_A044E0 -/* A044E0 80241CA0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A044E4 80241CA4 AFB40040 */ sw $s4, 0x40($sp) -/* A044E8 80241CA8 0080A02D */ daddu $s4, $a0, $zero -/* A044EC 80241CAC AFBF0048 */ sw $ra, 0x48($sp) -/* A044F0 80241CB0 AFB50044 */ sw $s5, 0x44($sp) -/* A044F4 80241CB4 AFB3003C */ sw $s3, 0x3c($sp) -/* A044F8 80241CB8 AFB20038 */ sw $s2, 0x38($sp) -/* A044FC 80241CBC AFB10034 */ sw $s1, 0x34($sp) -/* A04500 80241CC0 AFB00030 */ sw $s0, 0x30($sp) -/* A04504 80241CC4 8E920148 */ lw $s2, 0x148($s4) -/* A04508 80241CC8 86440008 */ lh $a0, 8($s2) -/* A0450C 80241CCC 8E90000C */ lw $s0, 0xc($s4) -/* A04510 80241CD0 0C00EABB */ jal get_npc_unsafe -/* A04514 80241CD4 00A0882D */ daddu $s1, $a1, $zero -/* A04518 80241CD8 0280202D */ daddu $a0, $s4, $zero -/* A0451C 80241CDC 8E050000 */ lw $a1, ($s0) -/* A04520 80241CE0 0C0B1EAF */ jal evt_get_variable -/* A04524 80241CE4 0040A82D */ daddu $s5, $v0, $zero -/* A04528 80241CE8 AFA00010 */ sw $zero, 0x10($sp) -/* A0452C 80241CEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04530 80241CF0 8C630030 */ lw $v1, 0x30($v1) -/* A04534 80241CF4 AFA30014 */ sw $v1, 0x14($sp) -/* A04538 80241CF8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A0453C 80241CFC 8C63001C */ lw $v1, 0x1c($v1) -/* A04540 80241D00 AFA30018 */ sw $v1, 0x18($sp) -/* A04544 80241D04 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04548 80241D08 8C630024 */ lw $v1, 0x24($v1) -/* A0454C 80241D0C AFA3001C */ sw $v1, 0x1c($sp) -/* A04550 80241D10 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04554 80241D14 8C630028 */ lw $v1, 0x28($v1) -/* A04558 80241D18 27B30010 */ addiu $s3, $sp, 0x10 -/* A0455C 80241D1C AFA30020 */ sw $v1, 0x20($sp) -/* A04560 80241D20 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04564 80241D24 3C0142F0 */ lui $at, 0x42f0 -/* A04568 80241D28 44810000 */ mtc1 $at, $f0 -/* A0456C 80241D2C 8C63002C */ lw $v1, 0x2c($v1) -/* A04570 80241D30 0040802D */ daddu $s0, $v0, $zero -/* A04574 80241D34 E7A00028 */ swc1 $f0, 0x28($sp) -/* A04578 80241D38 A7A0002C */ sh $zero, 0x2c($sp) -/* A0457C 80241D3C 12200006 */ beqz $s1, .L80241D58 -/* A04580 80241D40 AFA30024 */ sw $v1, 0x24($sp) -/* A04584 80241D44 02A0202D */ daddu $a0, $s5, $zero -/* A04588 80241D48 0240282D */ daddu $a1, $s2, $zero -/* A0458C 80241D4C 0280302D */ daddu $a2, $s4, $zero -/* A04590 80241D50 0C0906DF */ jal nok_14_UnkFunc5 -/* A04594 80241D54 0200382D */ daddu $a3, $s0, $zero -.L80241D58: -/* A04598 80241D58 2402FFFE */ addiu $v0, $zero, -2 -/* A0459C 80241D5C A2A200AB */ sb $v0, 0xab($s5) -/* A045A0 80241D60 8E4300B0 */ lw $v1, 0xb0($s2) -/* A045A4 80241D64 30620004 */ andi $v0, $v1, 4 -/* A045A8 80241D68 10400007 */ beqz $v0, .L80241D88 -/* A045AC 80241D6C 00000000 */ nop -/* A045B0 80241D70 824200B4 */ lb $v0, 0xb4($s2) -/* A045B4 80241D74 1440003C */ bnez $v0, .L80241E68 -/* A045B8 80241D78 0000102D */ daddu $v0, $zero, $zero -/* A045BC 80241D7C 2402FFFB */ addiu $v0, $zero, -5 -/* A045C0 80241D80 00621024 */ and $v0, $v1, $v0 -/* A045C4 80241D84 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241D88: -/* A045C8 80241D88 8E830070 */ lw $v1, 0x70($s4) -/* A045CC 80241D8C 2C62000F */ sltiu $v0, $v1, 0xf -/* A045D0 80241D90 10400034 */ beqz $v0, .L80241E64_A046A4 -/* A045D4 80241D94 00031080 */ sll $v0, $v1, 2 -/* A045D8 80241D98 3C018024 */ lui $at, %hi(jtbl_80244638_A06E78) -/* A045DC 80241D9C 00220821 */ addu $at, $at, $v0 -/* A045E0 80241DA0 8C224638 */ lw $v0, %lo(jtbl_80244638_A06E78)($at) -/* A045E4 80241DA4 00400008 */ jr $v0 -/* A045E8 80241DA8 00000000 */ nop -.L80241DAC_A045EC: -/* A045EC 80241DAC 0280202D */ daddu $a0, $s4, $zero -/* A045F0 80241DB0 0200282D */ daddu $a1, $s0, $zero -/* A045F4 80241DB4 0C090265 */ jal nok_14_UnkNpcAIFunc23 -/* A045F8 80241DB8 0260302D */ daddu $a2, $s3, $zero -.L80241DBC_A045FC: -/* A045FC 80241DBC 0280202D */ daddu $a0, $s4, $zero -/* A04600 80241DC0 0200282D */ daddu $a1, $s0, $zero -/* A04604 80241DC4 0C0902D1 */ jal nok_14_UnkNpcAIFunc35 -/* A04608 80241DC8 0260302D */ daddu $a2, $s3, $zero -/* A0460C 80241DCC 0809079A */ j .L80241E68 -/* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero -.L80241DD4_A04614: -/* A04614 80241DD4 0280202D */ daddu $a0, $s4, $zero -/* A04618 80241DD8 0200282D */ daddu $a1, $s0, $zero -/* A0461C 80241DDC 0C09045B */ jal nok_14_UnkNpcAIFunc1 -/* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero -.L80241DE4_A04624: -/* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero -/* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero -/* A0462C 80241DEC 0C09048B */ jal nok_14_UnkFunc4 -/* A04630 80241DF0 0260302D */ daddu $a2, $s3, $zero -/* A04634 80241DF4 0809079A */ j .L80241E68 -/* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero -.L80241DFC_A0463C: -/* A0463C 80241DFC 0280202D */ daddu $a0, $s4, $zero -/* A04640 80241E00 0200282D */ daddu $a1, $s0, $zero -/* A04644 80241E04 0C09055C */ jal nok_14_UnkNpcAIFunc2 -/* A04648 80241E08 0260302D */ daddu $a2, $s3, $zero -.L80241E0C_A0464C: -/* A0464C 80241E0C 0280202D */ daddu $a0, $s4, $zero -/* A04650 80241E10 0200282D */ daddu $a1, $s0, $zero -/* A04654 80241E14 0C09057A */ jal func_802415E8_A03E28 -/* A04658 80241E18 0260302D */ daddu $a2, $s3, $zero -/* A0465C 80241E1C 0809079A */ j .L80241E68 -/* A04660 80241E20 0000102D */ daddu $v0, $zero, $zero -.L80241E24_A04664: -/* A04664 80241E24 0280202D */ daddu $a0, $s4, $zero -/* A04668 80241E28 0200282D */ daddu $a1, $s0, $zero -/* A0466C 80241E2C 0C090595 */ jal nok_14_UnkNpcAIFunc14 -/* A04670 80241E30 0260302D */ daddu $a2, $s3, $zero -/* A04674 80241E34 0809079A */ j .L80241E68 -/* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero -.L80241E3C_A0467C: -/* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero -/* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero -/* A04684 80241E44 0C0905E2 */ jal nok_14_UnkNpcAIFunc3 -/* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero -/* A0468C 80241E4C 0809079A */ j .L80241E68 -/* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero -.L80241E54_A04694: -/* A04694 80241E54 0280202D */ daddu $a0, $s4, $zero -/* A04698 80241E58 0200282D */ daddu $a1, $s0, $zero -/* A0469C 80241E5C 0C0905FB */ jal nok_14_UnkFunc6 -/* A046A0 80241E60 0260302D */ daddu $a2, $s3, $zero -.L80241E64_A046A4: -/* A046A4 80241E64 0000102D */ daddu $v0, $zero, $zero -.L80241E68: -/* A046A8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) -/* A046AC 80241E6C 8FB50044 */ lw $s5, 0x44($sp) -/* A046B0 80241E70 8FB40040 */ lw $s4, 0x40($sp) -/* A046B4 80241E74 8FB3003C */ lw $s3, 0x3c($sp) -/* A046B8 80241E78 8FB20038 */ lw $s2, 0x38($sp) -/* A046BC 80241E7C 8FB10034 */ lw $s1, 0x34($sp) -/* A046C0 80241E80 8FB00030 */ lw $s0, 0x30($sp) -/* A046C4 80241E84 03E00008 */ jr $ra -/* A046C8 80241E88 27BD0050 */ addiu $sp, $sp, 0x50 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 index 92c7670d41..7dee796da0 100644 --- 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 @@ -98,7 +98,7 @@ glabel func_802421CC_A04A0C .L80242314_A04B54: /* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero /* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero -/* A04B5C 8024231C 0C09045B */ jal nok_14_UnkNpcAIFunc1 +/* A04B5C 8024231C 0C09045B */ jal nok_14_UnkNpcAIFunc1_copy /* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero .L80242324_A04B64: /* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero @@ -121,7 +121,7 @@ glabel func_802421CC_A04A0C .L80242364_A04BA4: /* A04BA4 80242364 0260202D */ daddu $a0, $s3, $zero /* A04BA8 80242368 0200282D */ daddu $a1, $s0, $zero -/* A04BAC 8024236C 0C09057A */ jal func_802415E8_A03E28 +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s deleted file mode 100644 index 982b76dd31..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241708_A08608 -/* A08608 80241708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A0860C 8024170C AFB00010 */ sw $s0, 0x10($sp) -/* A08610 80241710 0080802D */ daddu $s0, $a0, $zero -/* A08614 80241714 AFBF0014 */ sw $ra, 0x14($sp) -/* A08618 80241718 8E020148 */ lw $v0, 0x148($s0) -/* A0861C 8024171C 0C00EABB */ jal get_npc_unsafe -/* A08620 80241720 84440008 */ lh $a0, 8($v0) -/* A08624 80241724 9443008E */ lhu $v1, 0x8e($v0) -/* A08628 80241728 C440003C */ lwc1 $f0, 0x3c($v0) -/* A0862C 8024172C 24640001 */ addiu $a0, $v1, 1 -/* A08630 80241730 00031C00 */ sll $v1, $v1, 0x10 -/* A08634 80241734 00031B83 */ sra $v1, $v1, 0xe -/* A08638 80241738 A444008E */ sh $a0, 0x8e($v0) -/* A0863C 8024173C 3C018024 */ lui $at, %hi(D_80243D5C_A0AC5C) -/* A08640 80241740 00230821 */ addu $at, $at, $v1 -/* A08644 80241744 C4223D5C */ lwc1 $f2, %lo(D_80243D5C_A0AC5C)($at) -/* A08648 80241748 8443008E */ lh $v1, 0x8e($v0) -/* A0864C 8024174C 46020000 */ add.s $f0, $f0, $f2 -/* A08650 80241750 28630005 */ slti $v1, $v1, 5 -/* A08654 80241754 14600003 */ bnez $v1, .L80241764 -/* A08658 80241758 E440003C */ swc1 $f0, 0x3c($v0) -/* A0865C 8024175C 2402000C */ addiu $v0, $zero, 0xc -/* A08660 80241760 AE020070 */ sw $v0, 0x70($s0) -.L80241764: -/* A08664 80241764 8FBF0014 */ lw $ra, 0x14($sp) -/* A08668 80241768 8FB00010 */ lw $s0, 0x10($sp) -/* A0866C 8024176C 03E00008 */ jr $ra -/* A08670 80241770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s deleted file mode 100644 index 58dd4718c5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244D68_A0BC68 -.word .L80241ECC_A08DCC, .L80241EDC_A08DDC, .L80241EF4_A08DF4, .L80241F04_A08E04, .L80241F84_A08E84, .L80241F84_A08E84, .L80241F84_A08E84, .L80241F84_A08E84, .L80241F84_A08E84, .L80241F84_A08E84, .L80241F1C_A08E1C, .L80241F2C_A08E2C, .L80241F44_A08E44, .L80241F5C_A08E5C, .L80241F74_A08E74, 0 - -.section .text - -glabel func_80241DC0_A08CC0 -/* A08CC0 80241DC0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A08CC4 80241DC4 AFB40040 */ sw $s4, 0x40($sp) -/* A08CC8 80241DC8 0080A02D */ daddu $s4, $a0, $zero -/* A08CCC 80241DCC AFBF0048 */ sw $ra, 0x48($sp) -/* A08CD0 80241DD0 AFB50044 */ sw $s5, 0x44($sp) -/* A08CD4 80241DD4 AFB3003C */ sw $s3, 0x3c($sp) -/* A08CD8 80241DD8 AFB20038 */ sw $s2, 0x38($sp) -/* A08CDC 80241DDC AFB10034 */ sw $s1, 0x34($sp) -/* A08CE0 80241DE0 AFB00030 */ sw $s0, 0x30($sp) -/* A08CE4 80241DE4 8E920148 */ lw $s2, 0x148($s4) -/* A08CE8 80241DE8 86440008 */ lh $a0, 8($s2) -/* A08CEC 80241DEC 8E90000C */ lw $s0, 0xc($s4) -/* A08CF0 80241DF0 0C00EABB */ jal get_npc_unsafe -/* A08CF4 80241DF4 00A0882D */ daddu $s1, $a1, $zero -/* A08CF8 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* A08CFC 80241DFC 8E050000 */ lw $a1, ($s0) -/* A08D00 80241E00 0C0B1EAF */ jal evt_get_variable -/* A08D04 80241E04 0040A82D */ daddu $s5, $v0, $zero -/* A08D08 80241E08 AFA00010 */ sw $zero, 0x10($sp) -/* A08D0C 80241E0C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D10 80241E10 8C630030 */ lw $v1, 0x30($v1) -/* A08D14 80241E14 AFA30014 */ sw $v1, 0x14($sp) -/* A08D18 80241E18 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D1C 80241E1C 8C63001C */ lw $v1, 0x1c($v1) -/* A08D20 80241E20 AFA30018 */ sw $v1, 0x18($sp) -/* A08D24 80241E24 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D28 80241E28 8C630024 */ lw $v1, 0x24($v1) -/* A08D2C 80241E2C AFA3001C */ sw $v1, 0x1c($sp) -/* A08D30 80241E30 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D34 80241E34 8C630028 */ lw $v1, 0x28($v1) -/* A08D38 80241E38 27B30010 */ addiu $s3, $sp, 0x10 -/* A08D3C 80241E3C AFA30020 */ sw $v1, 0x20($sp) -/* A08D40 80241E40 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D44 80241E44 3C0142F0 */ lui $at, 0x42f0 -/* A08D48 80241E48 44810000 */ mtc1 $at, $f0 -/* A08D4C 80241E4C 8C63002C */ lw $v1, 0x2c($v1) -/* A08D50 80241E50 0040802D */ daddu $s0, $v0, $zero -/* A08D54 80241E54 E7A00028 */ swc1 $f0, 0x28($sp) -/* A08D58 80241E58 A7A0002C */ sh $zero, 0x2c($sp) -/* A08D5C 80241E5C 12200006 */ beqz $s1, .L80241E78 -/* A08D60 80241E60 AFA30024 */ sw $v1, 0x24($sp) -/* A08D64 80241E64 02A0202D */ daddu $a0, $s5, $zero -/* A08D68 80241E68 0240282D */ daddu $a1, $s2, $zero -/* A08D6C 80241E6C 0280302D */ daddu $a2, $s4, $zero -/* A08D70 80241E70 0C090727 */ jal nok_15_UnkFunc5 -/* A08D74 80241E74 0200382D */ daddu $a3, $s0, $zero -.L80241E78: -/* A08D78 80241E78 2402FFFE */ addiu $v0, $zero, -2 -/* A08D7C 80241E7C A2A200AB */ sb $v0, 0xab($s5) -/* A08D80 80241E80 8E4300B0 */ lw $v1, 0xb0($s2) -/* A08D84 80241E84 30620004 */ andi $v0, $v1, 4 -/* A08D88 80241E88 10400007 */ beqz $v0, .L80241EA8 -/* A08D8C 80241E8C 00000000 */ nop -/* A08D90 80241E90 824200B4 */ lb $v0, 0xb4($s2) -/* A08D94 80241E94 1440003C */ bnez $v0, .L80241F88 -/* A08D98 80241E98 0000102D */ daddu $v0, $zero, $zero -/* A08D9C 80241E9C 2402FFFB */ addiu $v0, $zero, -5 -/* A08DA0 80241EA0 00621024 */ and $v0, $v1, $v0 -/* A08DA4 80241EA4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241EA8: -/* A08DA8 80241EA8 8E830070 */ lw $v1, 0x70($s4) -/* A08DAC 80241EAC 2C62000F */ sltiu $v0, $v1, 0xf -/* A08DB0 80241EB0 10400034 */ beqz $v0, .L80241F84_A08E84 -/* A08DB4 80241EB4 00031080 */ sll $v0, $v1, 2 -/* A08DB8 80241EB8 3C018024 */ lui $at, %hi(jtbl_80244D68_A0BC68) -/* A08DBC 80241EBC 00220821 */ addu $at, $at, $v0 -/* A08DC0 80241EC0 8C224D68 */ lw $v0, %lo(jtbl_80244D68_A0BC68)($at) -/* A08DC4 80241EC4 00400008 */ jr $v0 -/* A08DC8 80241EC8 00000000 */ nop -.L80241ECC_A08DCC: -/* A08DCC 80241ECC 0280202D */ daddu $a0, $s4, $zero -/* A08DD0 80241ED0 0200282D */ daddu $a1, $s0, $zero -/* A08DD4 80241ED4 0C0902AD */ jal nok_15_UnkNpcAIFunc23 -/* A08DD8 80241ED8 0260302D */ daddu $a2, $s3, $zero -.L80241EDC_A08DDC: -/* A08DDC 80241EDC 0280202D */ daddu $a0, $s4, $zero -/* A08DE0 80241EE0 0200282D */ daddu $a1, $s0, $zero -/* A08DE4 80241EE4 0C090319 */ jal nok_15_UnkNpcAIFunc35 -/* A08DE8 80241EE8 0260302D */ daddu $a2, $s3, $zero -/* A08DEC 80241EEC 080907E2 */ j .L80241F88 -/* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero -.L80241EF4_A08DF4: -/* A08DF4 80241EF4 0280202D */ daddu $a0, $s4, $zero -/* A08DF8 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* A08DFC 80241EFC 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 -/* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero -.L80241F04_A08E04: -/* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero -/* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero -/* A08E0C 80241F0C 0C0904D3 */ jal nok_15_UnkFunc4 -/* A08E10 80241F10 0260302D */ daddu $a2, $s3, $zero -/* A08E14 80241F14 080907E2 */ j .L80241F88 -/* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero -.L80241F1C_A08E1C: -/* A08E1C 80241F1C 0280202D */ daddu $a0, $s4, $zero -/* A08E20 80241F20 0200282D */ daddu $a1, $s0, $zero -/* A08E24 80241F24 0C0905A4 */ jal nok_15_UnkNpcAIFunc2 -/* A08E28 80241F28 0260302D */ daddu $a2, $s3, $zero -.L80241F2C_A08E2C: -/* A08E2C 80241F2C 0280202D */ daddu $a0, $s4, $zero -/* A08E30 80241F30 0200282D */ daddu $a1, $s0, $zero -/* A08E34 80241F34 0C0905C2 */ jal func_80241708_A08608 -/* A08E38 80241F38 0260302D */ daddu $a2, $s3, $zero -/* A08E3C 80241F3C 080907E2 */ j .L80241F88 -/* A08E40 80241F40 0000102D */ daddu $v0, $zero, $zero -.L80241F44_A08E44: -/* A08E44 80241F44 0280202D */ daddu $a0, $s4, $zero -/* A08E48 80241F48 0200282D */ daddu $a1, $s0, $zero -/* A08E4C 80241F4C 0C0905DD */ jal nok_15_UnkNpcAIFunc14 -/* A08E50 80241F50 0260302D */ daddu $a2, $s3, $zero -/* A08E54 80241F54 080907E2 */ j .L80241F88 -/* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero -.L80241F5C_A08E5C: -/* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero -/* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero -/* A08E64 80241F64 0C09062A */ jal nok_15_UnkNpcAIFunc3 -/* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero -/* A08E6C 80241F6C 080907E2 */ j .L80241F88 -/* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero -.L80241F74_A08E74: -/* A08E74 80241F74 0280202D */ daddu $a0, $s4, $zero -/* A08E78 80241F78 0200282D */ daddu $a1, $s0, $zero -/* A08E7C 80241F7C 0C090643 */ jal nok_15_UnkFunc6 -/* A08E80 80241F80 0260302D */ daddu $a2, $s3, $zero -.L80241F84_A08E84: -/* A08E84 80241F84 0000102D */ daddu $v0, $zero, $zero -.L80241F88: -/* A08E88 80241F88 8FBF0048 */ lw $ra, 0x48($sp) -/* A08E8C 80241F8C 8FB50044 */ lw $s5, 0x44($sp) -/* A08E90 80241F90 8FB40040 */ lw $s4, 0x40($sp) -/* A08E94 80241F94 8FB3003C */ lw $s3, 0x3c($sp) -/* A08E98 80241F98 8FB20038 */ lw $s2, 0x38($sp) -/* A08E9C 80241F9C 8FB10034 */ lw $s1, 0x34($sp) -/* A08EA0 80241FA0 8FB00030 */ lw $s0, 0x30($sp) -/* A08EA4 80241FA4 03E00008 */ jr $ra -/* A08EA8 80241FA8 27BD0050 */ addiu $sp, $sp, 0x50 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 index e5c561e3cc..3b9d477e7e 100644 --- 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 @@ -98,7 +98,7 @@ glabel func_802422EC_A091EC .L80242434_A09334: /* A09334 80242434 0260202D */ daddu $a0, $s3, $zero /* A09338 80242438 0200282D */ daddu $a1, $s0, $zero -/* A0933C 8024243C 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 +/* A0933C 8024243C 0C0904A3 */ jal nok_15_UnkNpcAIFunc1_copy /* A09340 80242440 0280302D */ daddu $a2, $s4, $zero .L80242444_A09344: /* A09344 80242444 0260202D */ daddu $a0, $s3, $zero @@ -121,7 +121,7 @@ glabel func_802422EC_A091EC .L80242484_A09384: /* A09384 80242484 0260202D */ daddu $a0, $s3, $zero /* A09388 80242488 0200282D */ daddu $a1, $s0, $zero -/* A0938C 8024248C 0C0905C2 */ jal func_80241708_A08608 +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s deleted file mode 100644 index 3e510f0f41..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80247BB8_DA5088 -.double 180.0 - -dlabel D_80247BC0_DA5090 -.double 75.0 - -.section .text - -glabel func_80241948_D9EE18 -/* D9EE18 80241948 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D9EE1C 8024194C AFB10014 */ sw $s1, 0x14($sp) -/* D9EE20 80241950 0080882D */ daddu $s1, $a0, $zero -/* D9EE24 80241954 3C05800B */ lui $a1, %hi(gCameras) -/* D9EE28 80241958 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D9EE2C 8024195C AFBF0020 */ sw $ra, 0x20($sp) -/* D9EE30 80241960 AFB3001C */ sw $s3, 0x1c($sp) -/* D9EE34 80241964 AFB20018 */ sw $s2, 0x18($sp) -/* D9EE38 80241968 AFB00010 */ sw $s0, 0x10($sp) -/* D9EE3C 8024196C F7B40028 */ sdc1 $f20, 0x28($sp) -/* D9EE40 80241970 8E330148 */ lw $s3, 0x148($s1) -/* D9EE44 80241974 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* D9EE48 80241978 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* D9EE4C 8024197C 8E30000C */ lw $s0, 0xc($s1) -/* D9EE50 80241980 00031080 */ sll $v0, $v1, 2 -/* D9EE54 80241984 00431021 */ addu $v0, $v0, $v1 -/* D9EE58 80241988 00021080 */ sll $v0, $v0, 2 -/* D9EE5C 8024198C 00431023 */ subu $v0, $v0, $v1 -/* D9EE60 80241990 000218C0 */ sll $v1, $v0, 3 -/* D9EE64 80241994 00431021 */ addu $v0, $v0, $v1 -/* D9EE68 80241998 000210C0 */ sll $v0, $v0, 3 -/* D9EE6C 8024199C 86640008 */ lh $a0, 8($s3) -/* D9EE70 802419A0 0C00EABB */ jal get_npc_unsafe -/* D9EE74 802419A4 00459021 */ addu $s2, $v0, $a1 -/* D9EE78 802419A8 0220202D */ daddu $a0, $s1, $zero -/* D9EE7C 802419AC 8E050000 */ lw $a1, ($s0) -/* D9EE80 802419B0 0C0B1EAF */ jal evt_get_variable -/* D9EE84 802419B4 0040802D */ daddu $s0, $v0, $zero -/* D9EE88 802419B8 0260202D */ daddu $a0, $s3, $zero -/* D9EE8C 802419BC 8C460024 */ lw $a2, 0x24($v0) -/* D9EE90 802419C0 8C470028 */ lw $a3, 0x28($v0) -/* D9EE94 802419C4 0C0124FB */ jal func_800493EC -/* D9EE98 802419C8 0000282D */ daddu $a1, $zero, $zero -/* D9EE9C 802419CC 10400052 */ beqz $v0, .L80241B18 -/* D9EEA0 802419D0 2402FFFF */ addiu $v0, $zero, -1 -/* D9EEA4 802419D4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D9EEA8 802419D8 C60E000C */ lwc1 $f14, 0xc($s0) -/* D9EEAC 802419DC 3C014387 */ lui $at, 0x4387 -/* D9EEB0 802419E0 4481A000 */ mtc1 $at, $f20 -/* D9EEB4 802419E4 0C00A70A */ jal get_clamped_angle_diff -/* D9EEB8 802419E8 00000000 */ nop -/* D9EEBC 802419EC 0C00A6C9 */ jal clamp_angle -/* D9EEC0 802419F0 46000306 */ mov.s $f12, $f0 -/* D9EEC4 802419F4 3C018024 */ lui $at, %hi(D_80247BB8_DA5088) -/* D9EEC8 802419F8 D4227BB8 */ ldc1 $f2, %lo(D_80247BB8_DA5088)($at) -/* D9EECC 802419FC 46000021 */ cvt.d.s $f0, $f0 -/* D9EED0 80241A00 4622003C */ c.lt.d $f0, $f2 -/* D9EED4 80241A04 00000000 */ nop -/* D9EED8 80241A08 45000003 */ bc1f .L80241A18 -/* D9EEDC 80241A0C 00000000 */ nop -/* D9EEE0 80241A10 3C0142B4 */ lui $at, 0x42b4 -/* D9EEE4 80241A14 4481A000 */ mtc1 $at, $f20 -.L80241A18: -/* D9EEE8 80241A18 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* D9EEEC 80241A1C 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* D9EEF0 80241A20 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D9EEF4 80241A24 8E220000 */ lw $v0, ($s1) -/* D9EEF8 80241A28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D9EEFC 80241A2C 8C460028 */ lw $a2, 0x28($v0) -/* D9EF00 80241A30 0C00A720 */ jal atan2 -/* D9EF04 80241A34 8C470030 */ lw $a3, 0x30($v0) -/* D9EF08 80241A38 4600A306 */ mov.s $f12, $f20 -/* D9EF0C 80241A3C 0C00A70A */ jal get_clamped_angle_diff -/* D9EF10 80241A40 46000386 */ mov.s $f14, $f0 -/* D9EF14 80241A44 46000005 */ abs.s $f0, $f0 -/* D9EF18 80241A48 3C018024 */ lui $at, %hi(D_80247BC0_DA5090) -/* D9EF1C 80241A4C D4227BC0 */ ldc1 $f2, %lo(D_80247BC0_DA5090)($at) -/* D9EF20 80241A50 46000021 */ cvt.d.s $f0, $f0 -/* D9EF24 80241A54 4620103C */ c.lt.d $f2, $f0 -/* D9EF28 80241A58 00000000 */ nop -/* D9EF2C 80241A5C 4501002E */ bc1t .L80241B18 -/* D9EF30 80241A60 2402FFFF */ addiu $v0, $zero, -1 -/* D9EF34 80241A64 8E220000 */ lw $v0, ($s1) -/* D9EF38 80241A68 C600003C */ lwc1 $f0, 0x3c($s0) -/* D9EF3C 80241A6C C442002C */ lwc1 $f2, 0x2c($v0) -/* D9EF40 80241A70 860200A8 */ lh $v0, 0xa8($s0) -/* D9EF44 80241A74 46020001 */ sub.s $f0, $f0, $f2 -/* D9EF48 80241A78 44821000 */ mtc1 $v0, $f2 -/* D9EF4C 80241A7C 00000000 */ nop -/* D9EF50 80241A80 468010A1 */ cvt.d.w $f2, $f2 -/* D9EF54 80241A84 46221080 */ add.d $f2, $f2, $f2 -/* D9EF58 80241A88 46000005 */ abs.s $f0, $f0 -/* D9EF5C 80241A8C 46000021 */ cvt.d.s $f0, $f0 -/* D9EF60 80241A90 4620103E */ c.le.d $f2, $f0 -/* D9EF64 80241A94 00000000 */ nop -/* D9EF68 80241A98 4501001F */ bc1t .L80241B18 -/* D9EF6C 80241A9C 2402FFFF */ addiu $v0, $zero, -1 -/* D9EF70 80241AA0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* D9EF74 80241AA4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* D9EF78 80241AA8 24020009 */ addiu $v0, $zero, 9 -/* D9EF7C 80241AAC 10620019 */ beq $v1, $v0, .L80241B14 -/* D9EF80 80241AB0 24020007 */ addiu $v0, $zero, 7 -/* D9EF84 80241AB4 14620005 */ bne $v1, $v0, .L80241ACC -/* D9EF88 80241AB8 2402FFFF */ addiu $v0, $zero, -1 -/* D9EF8C 80241ABC 080906C6 */ j .L80241B18 -/* D9EF90 80241AC0 00000000 */ nop -.L80241AC4: -/* D9EF94 80241AC4 080906C6 */ j .L80241B18 -/* D9EF98 80241AC8 0240102D */ daddu $v0, $s2, $zero -.L80241ACC: -/* D9EF9C 80241ACC 8E620078 */ lw $v0, 0x78($s3) -/* D9EFA0 80241AD0 18400010 */ blez $v0, .L80241B14 -/* D9EFA4 80241AD4 0000882D */ daddu $s1, $zero, $zero -.L80241AD8: -/* D9EFA8 80241AD8 86620008 */ lh $v0, 8($s3) -/* D9EFAC 80241ADC 00511021 */ addu $v0, $v0, $s1 -/* D9EFB0 80241AE0 24520001 */ addiu $s2, $v0, 1 -/* D9EFB4 80241AE4 0C00FB3A */ jal get_enemy -/* D9EFB8 80241AE8 0240202D */ daddu $a0, $s2, $zero -/* D9EFBC 80241AEC 0240202D */ daddu $a0, $s2, $zero -/* D9EFC0 80241AF0 0C00EABB */ jal get_npc_unsafe -/* D9EFC4 80241AF4 0040802D */ daddu $s0, $v0, $zero -/* D9EFC8 80241AF8 8E02006C */ lw $v0, 0x6c($s0) -/* D9EFCC 80241AFC 1040FFF1 */ beqz $v0, .L80241AC4 -/* D9EFD0 80241B00 26310001 */ addiu $s1, $s1, 1 -/* D9EFD4 80241B04 8E620078 */ lw $v0, 0x78($s3) -/* D9EFD8 80241B08 0222102A */ slt $v0, $s1, $v0 -/* D9EFDC 80241B0C 1440FFF2 */ bnez $v0, .L80241AD8 -/* D9EFE0 80241B10 00000000 */ nop -.L80241B14: -/* D9EFE4 80241B14 2402FFFF */ addiu $v0, $zero, -1 -.L80241B18: -/* D9EFE8 80241B18 8FBF0020 */ lw $ra, 0x20($sp) -/* D9EFEC 80241B1C 8FB3001C */ lw $s3, 0x1c($sp) -/* D9EFF0 80241B20 8FB20018 */ lw $s2, 0x18($sp) -/* D9EFF4 80241B24 8FB10014 */ lw $s1, 0x14($sp) -/* D9EFF8 80241B28 8FB00010 */ lw $s0, 0x10($sp) -/* D9EFFC 80241B2C D7B40028 */ ldc1 $f20, 0x28($sp) -/* D9F000 80241B30 03E00008 */ jr $ra -/* D9F004 80241B34 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s deleted file mode 100644 index b1587e6caf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B38_D9F008 -/* D9F008 80241B38 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9F00C 80241B3C AFB20038 */ sw $s2, 0x38($sp) -/* D9F010 80241B40 0080902D */ daddu $s2, $a0, $zero -/* D9F014 80241B44 AFB00030 */ sw $s0, 0x30($sp) -/* D9F018 80241B48 AFBF003C */ sw $ra, 0x3c($sp) -/* D9F01C 80241B4C AFB10034 */ sw $s1, 0x34($sp) -/* D9F020 80241B50 F7B60048 */ sdc1 $f22, 0x48($sp) -/* D9F024 80241B54 F7B40040 */ sdc1 $f20, 0x40($sp) -/* D9F028 80241B58 8E510148 */ lw $s1, 0x148($s2) -/* D9F02C 80241B5C 4485A000 */ mtc1 $a1, $f20 -/* D9F030 80241B60 86240008 */ lh $a0, 8($s1) -/* D9F034 80241B64 4486B000 */ mtc1 $a2, $f22 -/* D9F038 80241B68 0C00EABB */ jal get_npc_unsafe -/* D9F03C 80241B6C 00E0802D */ daddu $s0, $a3, $zero -/* D9F040 80241B70 0200202D */ daddu $a0, $s0, $zero -/* D9F044 80241B74 0220282D */ daddu $a1, $s1, $zero -/* D9F048 80241B78 24030001 */ addiu $v1, $zero, 1 -/* D9F04C 80241B7C 4406A000 */ mfc1 $a2, $f20 -/* D9F050 80241B80 4407B000 */ mfc1 $a3, $f22 -/* D9F054 80241B84 0040802D */ daddu $s0, $v0, $zero -/* D9F058 80241B88 0C01242D */ jal func_800490B4 -/* D9F05C 80241B8C AFA30010 */ sw $v1, 0x10($sp) -/* D9F060 80241B90 1440001D */ bnez $v0, .L80241C08 -/* D9F064 80241B94 24040002 */ addiu $a0, $zero, 2 -/* D9F068 80241B98 0200282D */ daddu $a1, $s0, $zero -/* D9F06C 80241B9C 0000302D */ daddu $a2, $zero, $zero -/* D9F070 80241BA0 860300A8 */ lh $v1, 0xa8($s0) -/* D9F074 80241BA4 3C013F80 */ lui $at, 0x3f80 -/* D9F078 80241BA8 44810000 */ mtc1 $at, $f0 -/* D9F07C 80241BAC 3C014000 */ lui $at, 0x4000 -/* D9F080 80241BB0 44811000 */ mtc1 $at, $f2 -/* D9F084 80241BB4 3C01C1A0 */ lui $at, 0xc1a0 -/* D9F088 80241BB8 44812000 */ mtc1 $at, $f4 -/* D9F08C 80241BBC 2402000F */ addiu $v0, $zero, 0xf -/* D9F090 80241BC0 AFA2001C */ sw $v0, 0x1c($sp) -/* D9F094 80241BC4 44833000 */ mtc1 $v1, $f6 -/* D9F098 80241BC8 00000000 */ nop -/* D9F09C 80241BCC 468031A0 */ cvt.s.w $f6, $f6 -/* D9F0A0 80241BD0 44073000 */ mfc1 $a3, $f6 -/* D9F0A4 80241BD4 27A20028 */ addiu $v0, $sp, 0x28 -/* D9F0A8 80241BD8 AFA20020 */ sw $v0, 0x20($sp) -/* D9F0AC 80241BDC E7A00010 */ swc1 $f0, 0x10($sp) -/* D9F0B0 80241BE0 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9F0B4 80241BE4 0C01BFA4 */ jal fx_emote -/* D9F0B8 80241BE8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9F0BC 80241BEC 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F0C0 80241BF0 8C430000 */ lw $v1, ($v0) -/* D9F0C4 80241BF4 24020014 */ addiu $v0, $zero, 0x14 -/* D9F0C8 80241BF8 A602008E */ sh $v0, 0x8e($s0) -/* D9F0CC 80241BFC 24020021 */ addiu $v0, $zero, 0x21 -/* D9F0D0 80241C00 08090716 */ j .L80241C58 -/* D9F0D4 80241C04 AE030028 */ sw $v1, 0x28($s0) -.L80241C08: -/* D9F0D8 80241C08 0C090652 */ jal func_80241948_D9EE18 -/* D9F0DC 80241C0C 0240202D */ daddu $a0, $s2, $zero -/* D9F0E0 80241C10 0040202D */ daddu $a0, $v0, $zero -/* D9F0E4 80241C14 2402FFFF */ addiu $v0, $zero, -1 -/* D9F0E8 80241C18 10820010 */ beq $a0, $v0, .L80241C5C -/* D9F0EC 80241C1C 00000000 */ nop -/* D9F0F0 80241C20 0C00FB3A */ jal get_enemy -/* D9F0F4 80241C24 00000000 */ nop -/* D9F0F8 80241C28 8C42006C */ lw $v0, 0x6c($v0) -/* D9F0FC 80241C2C 1440000B */ bnez $v0, .L80241C5C -/* D9F100 80241C30 00000000 */ nop -/* D9F104 80241C34 8602008C */ lh $v0, 0x8c($s0) -/* D9F108 80241C38 14400008 */ bnez $v0, .L80241C5C -/* D9F10C 80241C3C 00000000 */ nop -/* D9F110 80241C40 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F114 80241C44 8C420020 */ lw $v0, 0x20($v0) -/* D9F118 80241C48 AE020028 */ sw $v0, 0x28($s0) -/* D9F11C 80241C4C 96220072 */ lhu $v0, 0x72($s1) -/* D9F120 80241C50 A602008E */ sh $v0, 0x8e($s0) -/* D9F124 80241C54 2402001E */ addiu $v0, $zero, 0x1e -.L80241C58: -/* D9F128 80241C58 AE420070 */ sw $v0, 0x70($s2) -.L80241C5C: -/* D9F12C 80241C5C 8FBF003C */ lw $ra, 0x3c($sp) -/* D9F130 80241C60 8FB20038 */ lw $s2, 0x38($sp) -/* D9F134 80241C64 8FB10034 */ lw $s1, 0x34($sp) -/* D9F138 80241C68 8FB00030 */ lw $s0, 0x30($sp) -/* D9F13C 80241C6C D7B60048 */ ldc1 $f22, 0x48($sp) -/* D9F140 80241C70 D7B40040 */ ldc1 $f20, 0x40($sp) -/* D9F144 80241C74 03E00008 */ jr $ra -/* D9F148 80241C78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s deleted file mode 100644 index 6e640e6db5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C7C_D9F14C -/* D9F14C 80241C7C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D9F150 80241C80 AFB20038 */ sw $s2, 0x38($sp) -/* D9F154 80241C84 0080902D */ daddu $s2, $a0, $zero -/* D9F158 80241C88 AFBF003C */ sw $ra, 0x3c($sp) -/* D9F15C 80241C8C AFB10034 */ sw $s1, 0x34($sp) -/* D9F160 80241C90 AFB00030 */ sw $s0, 0x30($sp) -/* D9F164 80241C94 8E510148 */ lw $s1, 0x148($s2) -/* D9F168 80241C98 0C00EABB */ jal get_npc_unsafe -/* D9F16C 80241C9C 86240008 */ lh $a0, 8($s1) -/* D9F170 80241CA0 0040802D */ daddu $s0, $v0, $zero -/* D9F174 80241CA4 9602008E */ lhu $v0, 0x8e($s0) -/* D9F178 80241CA8 2442FFFF */ addiu $v0, $v0, -1 -/* D9F17C 80241CAC A602008E */ sh $v0, 0x8e($s0) -/* D9F180 80241CB0 00021400 */ sll $v0, $v0, 0x10 -/* D9F184 80241CB4 1C40002B */ bgtz $v0, .L80241D64 -/* D9F188 80241CB8 00000000 */ nop -/* D9F18C 80241CBC 0C090652 */ jal func_80241948_D9EE18 -/* D9F190 80241CC0 0240202D */ daddu $a0, $s2, $zero -/* D9F194 80241CC4 0040202D */ daddu $a0, $v0, $zero -/* D9F198 80241CC8 0481001A */ bgez $a0, .L80241D34 -/* D9F19C 80241CCC 2402000F */ addiu $v0, $zero, 0xf -/* D9F1A0 80241CD0 24040002 */ addiu $a0, $zero, 2 -/* D9F1A4 80241CD4 860300A8 */ lh $v1, 0xa8($s0) -/* D9F1A8 80241CD8 AFA2001C */ sw $v0, 0x1c($sp) -/* D9F1AC 80241CDC 27A20028 */ addiu $v0, $sp, 0x28 -/* D9F1B0 80241CE0 0200282D */ daddu $a1, $s0, $zero -/* D9F1B4 80241CE4 3C013F80 */ lui $at, 0x3f80 -/* D9F1B8 80241CE8 44810000 */ mtc1 $at, $f0 -/* D9F1BC 80241CEC 3C014000 */ lui $at, 0x4000 -/* D9F1C0 80241CF0 44811000 */ mtc1 $at, $f2 -/* D9F1C4 80241CF4 3C01C1A0 */ lui $at, 0xc1a0 -/* D9F1C8 80241CF8 44812000 */ mtc1 $at, $f4 -/* D9F1CC 80241CFC 44833000 */ mtc1 $v1, $f6 -/* D9F1D0 80241D00 00000000 */ nop -/* D9F1D4 80241D04 468031A0 */ cvt.s.w $f6, $f6 -/* D9F1D8 80241D08 44073000 */ mfc1 $a3, $f6 -/* D9F1DC 80241D0C 0000302D */ daddu $a2, $zero, $zero -/* D9F1E0 80241D10 AFA20020 */ sw $v0, 0x20($sp) -/* D9F1E4 80241D14 E7A00010 */ swc1 $f0, 0x10($sp) -/* D9F1E8 80241D18 E7A20014 */ swc1 $f2, 0x14($sp) -/* D9F1EC 80241D1C 0C01BFA4 */ jal fx_emote -/* D9F1F0 80241D20 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9F1F4 80241D24 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F1F8 80241D28 8C420000 */ lw $v0, ($v0) -/* D9F1FC 80241D2C 08090755 */ j .L80241D54 -/* D9F200 80241D30 AE020028 */ sw $v0, 0x28($s0) -.L80241D34: -/* D9F204 80241D34 8E2200CC */ lw $v0, 0xcc($s1) -/* D9F208 80241D38 8C420024 */ lw $v0, 0x24($v0) -/* D9F20C 80241D3C 0C00FB3A */ jal get_enemy -/* D9F210 80241D40 AE020028 */ sw $v0, 0x28($s0) -/* D9F214 80241D44 86240008 */ lh $a0, 8($s1) -/* D9F218 80241D48 24030001 */ addiu $v1, $zero, 1 -/* D9F21C 80241D4C AC43006C */ sw $v1, 0x6c($v0) -/* D9F220 80241D50 AC44007C */ sw $a0, 0x7c($v0) -.L80241D54: -/* D9F224 80241D54 96220076 */ lhu $v0, 0x76($s1) -/* D9F228 80241D58 A602008E */ sh $v0, 0x8e($s0) -/* D9F22C 80241D5C 24020021 */ addiu $v0, $zero, 0x21 -/* D9F230 80241D60 AE420070 */ sw $v0, 0x70($s2) -.L80241D64: -/* D9F234 80241D64 8FBF003C */ lw $ra, 0x3c($sp) -/* D9F238 80241D68 8FB20038 */ lw $s2, 0x38($sp) -/* D9F23C 80241D6C 8FB10034 */ lw $s1, 0x34($sp) -/* D9F240 80241D70 8FB00030 */ lw $s0, 0x30($sp) -/* D9F244 80241D74 03E00008 */ jr $ra -/* D9F248 80241D78 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s deleted file mode 100644 index b465339e33..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247BE0_DA50B0 -.word .L802429CC_D9FE9C, .L802429DC_D9FEAC, .L802429F4_D9FEC4, .L80242A04_D9FED4, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242A1C_D9FEEC, .L80242A2C_D9FEFC, .L80242A44_D9FF14, .L80242ABC_D9FF8C, .L80242AD4_D9FFA4, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242AEC_D9FFBC, .L80242AFC_D9FFCC, .L80242B0C_D9FFDC, .L80242B1C_D9FFEC, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B34_DA0004, .L80242B2C_D9FFFC - -.section .text - -glabel func_8024283C_D9FD0C -/* D9FD0C 8024283C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9FD10 80242840 AFB3003C */ sw $s3, 0x3c($sp) -/* D9FD14 80242844 0080982D */ daddu $s3, $a0, $zero -/* D9FD18 80242848 AFBF0048 */ sw $ra, 0x48($sp) -/* D9FD1C 8024284C AFB50044 */ sw $s5, 0x44($sp) -/* D9FD20 80242850 AFB40040 */ sw $s4, 0x40($sp) -/* D9FD24 80242854 AFB20038 */ sw $s2, 0x38($sp) -/* D9FD28 80242858 AFB10034 */ sw $s1, 0x34($sp) -/* D9FD2C 8024285C AFB00030 */ sw $s0, 0x30($sp) -/* D9FD30 80242860 8E720148 */ lw $s2, 0x148($s3) -/* D9FD34 80242864 86440008 */ lh $a0, 8($s2) -/* D9FD38 80242868 8E70000C */ lw $s0, 0xc($s3) -/* D9FD3C 8024286C 0C00EABB */ jal get_npc_unsafe -/* D9FD40 80242870 00A0882D */ daddu $s1, $a1, $zero -/* D9FD44 80242874 0260202D */ daddu $a0, $s3, $zero -/* D9FD48 80242878 8E050000 */ lw $a1, ($s0) -/* D9FD4C 8024287C 0C0B1EAF */ jal evt_get_variable -/* D9FD50 80242880 0040A02D */ daddu $s4, $v0, $zero -/* D9FD54 80242884 AFA00010 */ sw $zero, 0x10($sp) -/* D9FD58 80242888 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD5C 8024288C 8C630030 */ lw $v1, 0x30($v1) -/* D9FD60 80242890 AFA30014 */ sw $v1, 0x14($sp) -/* D9FD64 80242894 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD68 80242898 8C63001C */ lw $v1, 0x1c($v1) -/* D9FD6C 8024289C AFA30018 */ sw $v1, 0x18($sp) -/* D9FD70 802428A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD74 802428A4 8C630024 */ lw $v1, 0x24($v1) -/* D9FD78 802428A8 AFA3001C */ sw $v1, 0x1c($sp) -/* D9FD7C 802428AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD80 802428B0 8C630028 */ lw $v1, 0x28($v1) -/* D9FD84 802428B4 27B50010 */ addiu $s5, $sp, 0x10 -/* D9FD88 802428B8 AFA30020 */ sw $v1, 0x20($sp) -/* D9FD8C 802428BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD90 802428C0 3C014220 */ lui $at, 0x4220 -/* D9FD94 802428C4 44810000 */ mtc1 $at, $f0 -/* D9FD98 802428C8 8C63002C */ lw $v1, 0x2c($v1) -/* D9FD9C 802428CC 0040802D */ daddu $s0, $v0, $zero -/* D9FDA0 802428D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D9FDA4 802428D4 A7A0002C */ sh $zero, 0x2c($sp) -/* D9FDA8 802428D8 16200005 */ bnez $s1, .L802428F0 -/* D9FDAC 802428DC AFA30024 */ sw $v1, 0x24($sp) -/* D9FDB0 802428E0 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FDB4 802428E4 30420004 */ andi $v0, $v0, 4 -/* D9FDB8 802428E8 1040002F */ beqz $v0, .L802429A8 -/* D9FDBC 802428EC 00000000 */ nop -.L802428F0: -/* D9FDC0 802428F0 2404F7FF */ addiu $a0, $zero, -0x801 -/* D9FDC4 802428F4 AE600070 */ sw $zero, 0x70($s3) -/* D9FDC8 802428F8 A680008E */ sh $zero, 0x8e($s4) -/* D9FDCC 802428FC 8E4200CC */ lw $v0, 0xcc($s2) -/* D9FDD0 80242900 8E830000 */ lw $v1, ($s4) -/* D9FDD4 80242904 8C420000 */ lw $v0, ($v0) -/* D9FDD8 80242908 00641824 */ and $v1, $v1, $a0 -/* D9FDDC 8024290C AE830000 */ sw $v1, ($s4) -/* D9FDE0 80242910 AE820028 */ sw $v0, 0x28($s4) -/* D9FDE4 80242914 8E4200D0 */ lw $v0, 0xd0($s2) -/* D9FDE8 80242918 8C420034 */ lw $v0, 0x34($v0) -/* D9FDEC 8024291C 54400005 */ bnel $v0, $zero, .L80242934 -/* D9FDF0 80242920 2402FDFF */ addiu $v0, $zero, -0x201 -/* D9FDF4 80242924 34620200 */ ori $v0, $v1, 0x200 -/* D9FDF8 80242928 2403FFF7 */ addiu $v1, $zero, -9 -/* D9FDFC 8024292C 08090A4F */ j .L8024293C -/* D9FE00 80242930 00431024 */ and $v0, $v0, $v1 -.L80242934: -/* D9FE04 80242934 00621024 */ and $v0, $v1, $v0 -/* D9FE08 80242938 34420008 */ ori $v0, $v0, 8 -.L8024293C: -/* D9FE0C 8024293C AE820000 */ sw $v0, ($s4) -/* D9FE10 80242940 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FE14 80242944 30420004 */ andi $v0, $v0, 4 -/* D9FE18 80242948 10400008 */ beqz $v0, .L8024296C -/* D9FE1C 8024294C 24020063 */ addiu $v0, $zero, 0x63 -/* D9FE20 80242950 AE620070 */ sw $v0, 0x70($s3) -/* D9FE24 80242954 AE600074 */ sw $zero, 0x74($s3) -/* D9FE28 80242958 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FE2C 8024295C 2403FFFB */ addiu $v1, $zero, -5 -/* D9FE30 80242960 00431024 */ and $v0, $v0, $v1 -/* D9FE34 80242964 08090A61 */ j .L80242984 -/* D9FE38 80242968 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024296C: -/* D9FE3C 8024296C 8E420000 */ lw $v0, ($s2) -/* D9FE40 80242970 3C034000 */ lui $v1, 0x4000 -/* D9FE44 80242974 00431024 */ and $v0, $v0, $v1 -/* D9FE48 80242978 10400002 */ beqz $v0, .L80242984 -/* D9FE4C 8024297C 2402000C */ addiu $v0, $zero, 0xc -/* D9FE50 80242980 AE620070 */ sw $v0, 0x70($s3) -.L80242984: -/* D9FE54 80242984 3C05BFFF */ lui $a1, 0xbfff -/* D9FE58 80242988 34A5FFFF */ ori $a1, $a1, 0xffff -/* D9FE5C 8024298C 2404FFFB */ addiu $a0, $zero, -5 -/* D9FE60 80242990 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FE64 80242994 8E430000 */ lw $v1, ($s2) -/* D9FE68 80242998 00441024 */ and $v0, $v0, $a0 -/* D9FE6C 8024299C 00651824 */ and $v1, $v1, $a1 -/* D9FE70 802429A0 AE4200B0 */ sw $v0, 0xb0($s2) -/* D9FE74 802429A4 AE430000 */ sw $v1, ($s2) -.L802429A8: -/* D9FE78 802429A8 8E630070 */ lw $v1, 0x70($s3) -/* D9FE7C 802429AC 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9FE80 802429B0 10400060 */ beqz $v0, .L80242B34_DA0004 -/* D9FE84 802429B4 00031080 */ sll $v0, $v1, 2 -/* D9FE88 802429B8 3C018024 */ lui $at, %hi(jtbl_80247BE0_DA50B0) -/* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 -/* D9FE90 802429C0 8C227BE0 */ lw $v0, %lo(jtbl_80247BE0_DA50B0)($at) -/* D9FE94 802429C4 00400008 */ jr $v0 -/* D9FE98 802429C8 00000000 */ nop -.L802429CC_D9FE9C: -/* D9FE9C 802429CC 0260202D */ daddu $a0, $s3, $zero -/* D9FEA0 802429D0 0200282D */ daddu $a1, $s0, $zero -/* D9FEA4 802429D4 0C012568 */ jal func_800495A0 -/* D9FEA8 802429D8 02A0302D */ daddu $a2, $s5, $zero -.L802429DC_D9FEAC: -/* D9FEAC 802429DC 0260202D */ daddu $a0, $s3, $zero -/* D9FEB0 802429E0 0200282D */ daddu $a1, $s0, $zero -/* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 -/* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero -/* D9FEBC 802429EC 08090ACD */ j .L80242B34_DA0004 -/* D9FEC0 802429F0 00000000 */ nop -.L802429F4_D9FEC4: -/* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero -/* D9FEC8 802429F8 0200282D */ daddu $a1, $s0, $zero -/* D9FECC 802429FC 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* D9FED0 80242A00 02A0302D */ daddu $a2, $s5, $zero -.L80242A04_D9FED4: -/* D9FED4 80242A04 0260202D */ daddu $a0, $s3, $zero -/* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero -/* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 -/* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero -/* D9FEE4 80242A14 08090ACD */ j .L80242B34_DA0004 -/* D9FEE8 80242A18 00000000 */ nop -.L80242A1C_D9FEEC: -/* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero -/* D9FEF0 80242A20 0200282D */ daddu $a1, $s0, $zero -/* D9FEF4 80242A24 0C01278F */ jal func_80049E3C -/* D9FEF8 80242A28 02A0302D */ daddu $a2, $s5, $zero -.L80242A2C_D9FEFC: -/* D9FEFC 80242A2C 0260202D */ daddu $a0, $s3, $zero -/* D9FF00 80242A30 0200282D */ daddu $a1, $s0, $zero -/* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC -/* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero -/* D9FF0C 80242A3C 08090ACD */ j .L80242B34_DA0004 -/* D9FF10 80242A40 00000000 */ nop -.L80242A44_D9FF14: -/* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9FF18 80242A48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9FF1C 80242A4C C68C0038 */ lwc1 $f12, 0x38($s4) -/* D9FF20 80242A50 C68E0040 */ lwc1 $f14, 0x40($s4) -/* D9FF24 80242A54 8C460028 */ lw $a2, 0x28($v0) -/* D9FF28 80242A58 0C00A7B5 */ jal dist2D -/* D9FF2C 80242A5C 8C470030 */ lw $a3, 0x30($v0) -/* D9FF30 80242A60 8E42006C */ lw $v0, 0x6c($s2) -/* D9FF34 80242A64 10400008 */ beqz $v0, .L80242A88 -/* D9FF38 80242A68 46000086 */ mov.s $f2, $f0 -/* D9FF3C 80242A6C 44820000 */ mtc1 $v0, $f0 -/* D9FF40 80242A70 00000000 */ nop -/* D9FF44 80242A74 46800020 */ cvt.s.w $f0, $f0 -/* D9FF48 80242A78 4602003C */ c.lt.s $f0, $f2 -/* D9FF4C 80242A7C 00000000 */ nop -/* D9FF50 80242A80 4500000B */ bc1f .L80242AB0 -/* D9FF54 80242A84 0260202D */ daddu $a0, $s3, $zero -.L80242A88: -/* D9FF58 80242A88 0260202D */ daddu $a0, $s3, $zero -/* D9FF5C 80242A8C 8E050024 */ lw $a1, 0x24($s0) -/* D9FF60 80242A90 8E060028 */ lw $a2, 0x28($s0) -/* D9FF64 80242A94 0C0906CE */ jal func_80241B38_D9F008 -/* D9FF68 80242A98 02A0382D */ daddu $a3, $s5, $zero -/* D9FF6C 80242A9C 8E630070 */ lw $v1, 0x70($s3) -/* D9FF70 80242AA0 2402000C */ addiu $v0, $zero, 0xc -/* D9FF74 80242AA4 14620023 */ bne $v1, $v0, .L80242B34_DA0004 -/* D9FF78 80242AA8 00000000 */ nop -/* D9FF7C 80242AAC 0260202D */ daddu $a0, $s3, $zero -.L80242AB0: -/* D9FF80 80242AB0 0200282D */ daddu $a1, $s0, $zero -/* D9FF84 80242AB4 0C0127DF */ jal func_80049F7C -/* D9FF88 80242AB8 02A0302D */ daddu $a2, $s5, $zero -.L80242ABC_D9FF8C: -/* D9FF8C 80242ABC 0260202D */ daddu $a0, $s3, $zero -/* D9FF90 80242AC0 0200282D */ daddu $a1, $s0, $zero -/* D9FF94 80242AC4 0C012849 */ jal func_8004A124 -/* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero -/* D9FF9C 80242ACC 08090ACD */ j .L80242B34_DA0004 -/* D9FFA0 80242AD0 00000000 */ nop -.L80242AD4_D9FFA4: -/* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero -/* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero -/* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 -/* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero -/* D9FFB4 80242AE4 08090ACD */ j .L80242B34_DA0004 -/* D9FFB8 80242AE8 00000000 */ nop -.L80242AEC_D9FFBC: -/* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C_D9F14C -/* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero -/* D9FFC4 80242AF4 08090ACD */ j .L80242B34_DA0004 -/* D9FFC8 80242AF8 00000000 */ nop -.L80242AFC_D9FFCC: -/* D9FFCC 80242AFC 0C09075F */ jal omo_02_UnkSetDurationFunc -/* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero -/* D9FFD4 80242B04 08090ACD */ j .L80242B34_DA0004 -/* D9FFD8 80242B08 00000000 */ nop -.L80242B0C_D9FFDC: -/* D9FFDC 80242B0C 0C090770 */ jal omo_02_UnkNpcAIFunc9 -/* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero -/* D9FFE4 80242B14 08090ACD */ j .L80242B34_DA0004 -/* D9FFE8 80242B18 00000000 */ nop -.L80242B1C_D9FFEC: -/* D9FFEC 80242B1C 0C090798 */ jal omo_02_UnkDurationCheck -/* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero -/* D9FFF4 80242B24 08090ACD */ j .L80242B34_DA0004 -/* D9FFF8 80242B28 00000000 */ nop -.L80242B2C_D9FFFC: -/* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C -/* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero -.L80242B34_DA0004: -/* DA0004 80242B34 8FBF0048 */ lw $ra, 0x48($sp) -/* DA0008 80242B38 8FB50044 */ lw $s5, 0x44($sp) -/* DA000C 80242B3C 8FB40040 */ lw $s4, 0x40($sp) -/* DA0010 80242B40 8FB3003C */ lw $s3, 0x3c($sp) -/* DA0014 80242B44 8FB20038 */ lw $s2, 0x38($sp) -/* DA0018 80242B48 8FB10034 */ lw $s1, 0x34($sp) -/* DA001C 80242B4C 8FB00030 */ lw $s0, 0x30($sp) -/* DA0020 80242B50 0000102D */ daddu $v0, $zero, $zero -/* DA0024 80242B54 03E00008 */ jr $ra -/* DA0028 80242B58 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s b/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s deleted file mode 100644 index 65568e0bcd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240104_DA5344.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240104_DA5344 -/* DA5344 80240104 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DA5348 80240108 AFB10014 */ sw $s1, 0x14($sp) -/* DA534C 8024010C 0080882D */ daddu $s1, $a0, $zero -/* DA5350 80240110 AFBF0018 */ sw $ra, 0x18($sp) -/* DA5354 80240114 AFB00010 */ sw $s0, 0x10($sp) -/* DA5358 80240118 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DA535C 8024011C 8E30000C */ lw $s0, 0xc($s1) -/* DA5360 80240120 8E050000 */ lw $a1, ($s0) -/* DA5364 80240124 0C0B210B */ jal evt_get_float_variable -/* DA5368 80240128 26100004 */ addiu $s0, $s0, 4 -/* DA536C 8024012C 8E050000 */ lw $a1, ($s0) -/* DA5370 80240130 26100004 */ addiu $s0, $s0, 4 -/* DA5374 80240134 0220202D */ daddu $a0, $s1, $zero -/* DA5378 80240138 0C0B210B */ jal evt_get_float_variable -/* DA537C 8024013C 46000506 */ mov.s $f20, $f0 -/* DA5380 80240140 4614003C */ c.lt.s $f0, $f20 -/* DA5384 80240144 00000000 */ nop -/* DA5388 80240148 45000004 */ bc1f .L8024015C -/* DA538C 8024014C 0220202D */ daddu $a0, $s1, $zero -/* DA5390 80240150 8E050000 */ lw $a1, ($s0) -/* DA5394 80240154 08090059 */ j .L80240164 -/* DA5398 80240158 24060001 */ addiu $a2, $zero, 1 -.L8024015C: -/* DA539C 8024015C 8E050000 */ lw $a1, ($s0) -/* DA53A0 80240160 0000302D */ daddu $a2, $zero, $zero -.L80240164: -/* DA53A4 80240164 0C0B2026 */ jal evt_set_variable -/* DA53A8 80240168 00000000 */ nop -/* DA53AC 8024016C 8FBF0018 */ lw $ra, 0x18($sp) -/* DA53B0 80240170 8FB10014 */ lw $s1, 0x14($sp) -/* DA53B4 80240174 8FB00010 */ lw $s0, 0x10($sp) -/* DA53B8 80240178 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DA53BC 8024017C 24020002 */ addiu $v0, $zero, 2 -/* DA53C0 80240180 03E00008 */ jr $ra -/* DA53C4 80240184 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188_DA53C8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188_DA53C8.s deleted file mode 100644 index 8f59d63c4f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188_DA53C8.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240188_DA53C8 -/* DA53C8 80240188 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DA53CC 8024018C AFB20018 */ sw $s2, 0x18($sp) -/* DA53D0 80240190 0080902D */ daddu $s2, $a0, $zero -/* DA53D4 80240194 AFBF001C */ sw $ra, 0x1c($sp) -/* DA53D8 80240198 AFB10014 */ sw $s1, 0x14($sp) -/* DA53DC 8024019C AFB00010 */ sw $s0, 0x10($sp) -/* DA53E0 802401A0 8E50000C */ lw $s0, 0xc($s2) -/* DA53E4 802401A4 8E050000 */ lw $a1, ($s0) -/* DA53E8 802401A8 0C0B1EAF */ jal evt_get_variable -/* DA53EC 802401AC 26100004 */ addiu $s0, $s0, 4 -/* DA53F0 802401B0 8E050000 */ lw $a1, ($s0) -/* DA53F4 802401B4 26100004 */ addiu $s0, $s0, 4 -/* DA53F8 802401B8 0240202D */ daddu $a0, $s2, $zero -/* DA53FC 802401BC 0C0B1EAF */ jal evt_get_variable -/* DA5400 802401C0 0040882D */ daddu $s1, $v0, $zero -/* DA5404 802401C4 0240202D */ daddu $a0, $s2, $zero -/* DA5408 802401C8 8E050000 */ lw $a1, ($s0) -/* DA540C 802401CC 0C0B1EAF */ jal evt_get_variable -/* DA5410 802401D0 0040802D */ daddu $s0, $v0, $zero -/* DA5414 802401D4 02020018 */ mult $s0, $v0 -/* DA5418 802401D8 24020002 */ addiu $v0, $zero, 2 -/* DA541C 802401DC 8E430138 */ lw $v1, 0x138($s2) -/* DA5420 802401E0 00003012 */ mflo $a2 -/* DA5424 802401E4 02268821 */ addu $s1, $s1, $a2 -/* DA5428 802401E8 00518804 */ sllv $s1, $s1, $v0 -/* DA542C 802401EC 00711821 */ addu $v1, $v1, $s1 -/* DA5430 802401F0 AE430138 */ sw $v1, 0x138($s2) -/* DA5434 802401F4 8FBF001C */ lw $ra, 0x1c($sp) -/* DA5438 802401F8 8FB20018 */ lw $s2, 0x18($sp) -/* DA543C 802401FC 8FB10014 */ lw $s1, 0x14($sp) -/* DA5440 80240200 8FB00010 */ lw $s0, 0x10($sp) -/* DA5444 80240204 03E00008 */ jr $ra -/* DA5448 80240208 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C_DA544C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C_DA544C.s deleted file mode 100644 index 547427beaa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C_DA544C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024020C_DA544C -/* DA544C 8024020C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DA5450 80240210 AFB10014 */ sw $s1, 0x14($sp) -/* DA5454 80240214 0080882D */ daddu $s1, $a0, $zero -/* DA5458 80240218 AFBF0018 */ sw $ra, 0x18($sp) -/* DA545C 8024021C AFB00010 */ sw $s0, 0x10($sp) -/* DA5460 80240220 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DA5464 80240224 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DA5468 80240228 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DA546C 8024022C 8E30000C */ lw $s0, 0xc($s1) -/* DA5470 80240230 8E050000 */ lw $a1, ($s0) -/* DA5474 80240234 0C0B210B */ jal evt_get_float_variable -/* DA5478 80240238 26100004 */ addiu $s0, $s0, 4 -/* DA547C 8024023C 8E050000 */ lw $a1, ($s0) -/* DA5480 80240240 26100004 */ addiu $s0, $s0, 4 -/* DA5484 80240244 0220202D */ daddu $a0, $s1, $zero -/* DA5488 80240248 0C0B210B */ jal evt_get_float_variable -/* DA548C 8024024C 46000606 */ mov.s $f24, $f0 -/* DA5490 80240250 8E050000 */ lw $a1, ($s0) -/* DA5494 80240254 26100004 */ addiu $s0, $s0, 4 -/* DA5498 80240258 0220202D */ daddu $a0, $s1, $zero -/* DA549C 8024025C 0C0B210B */ jal evt_get_float_variable -/* DA54A0 80240260 46000586 */ mov.s $f22, $f0 -/* DA54A4 80240264 0220202D */ daddu $a0, $s1, $zero -/* DA54A8 80240268 8E050000 */ lw $a1, ($s0) -/* DA54AC 8024026C 0C0B210B */ jal evt_get_float_variable -/* DA54B0 80240270 46000506 */ mov.s $f20, $f0 -/* DA54B4 80240274 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DA54B8 80240278 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DA54BC 8024027C E4580028 */ swc1 $f24, 0x28($v0) -/* DA54C0 80240280 E456002C */ swc1 $f22, 0x2c($v0) -/* DA54C4 80240284 E4540030 */ swc1 $f20, 0x30($v0) -/* DA54C8 80240288 E4400080 */ swc1 $f0, 0x80($v0) -/* DA54CC 8024028C 8FBF0018 */ lw $ra, 0x18($sp) -/* DA54D0 80240290 8FB10014 */ lw $s1, 0x14($sp) -/* DA54D4 80240294 8FB00010 */ lw $s0, 0x10($sp) -/* DA54D8 80240298 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DA54DC 8024029C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DA54E0 802402A0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DA54E4 802402A4 24020002 */ addiu $v0, $zero, 2 -/* DA54E8 802402A8 03E00008 */ jr $ra -/* DA54EC 802402AC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802402B0_DA54F0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802402B0_DA54F0.s deleted file mode 100644 index 5a93501187..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_802402B0_DA54F0.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B0_DA54F0 -/* DA54F0 802402B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DA54F4 802402B4 AFB10014 */ sw $s1, 0x14($sp) -/* DA54F8 802402B8 0080882D */ daddu $s1, $a0, $zero -/* DA54FC 802402BC AFBF001C */ sw $ra, 0x1c($sp) -/* DA5500 802402C0 AFB20018 */ sw $s2, 0x18($sp) -/* DA5504 802402C4 AFB00010 */ sw $s0, 0x10($sp) -/* DA5508 802402C8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DA550C 802402CC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DA5510 802402D0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DA5514 802402D4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DA5518 802402D8 8E30000C */ lw $s0, 0xc($s1) -/* DA551C 802402DC 8E050000 */ lw $a1, ($s0) -/* DA5520 802402E0 0C0B1EAF */ jal evt_get_variable -/* DA5524 802402E4 26100004 */ addiu $s0, $s0, 4 -/* DA5528 802402E8 8E050000 */ lw $a1, ($s0) -/* DA552C 802402EC 26100004 */ addiu $s0, $s0, 4 -/* DA5530 802402F0 0220202D */ daddu $a0, $s1, $zero -/* DA5534 802402F4 0C0B210B */ jal evt_get_float_variable -/* DA5538 802402F8 0040902D */ daddu $s2, $v0, $zero -/* DA553C 802402FC 8E050000 */ lw $a1, ($s0) -/* DA5540 80240300 26100004 */ addiu $s0, $s0, 4 -/* DA5544 80240304 0220202D */ daddu $a0, $s1, $zero -/* DA5548 80240308 0C0B210B */ jal evt_get_float_variable -/* DA554C 8024030C 46000686 */ mov.s $f26, $f0 -/* DA5550 80240310 8E050000 */ lw $a1, ($s0) -/* DA5554 80240314 26100004 */ addiu $s0, $s0, 4 -/* DA5558 80240318 0220202D */ daddu $a0, $s1, $zero -/* DA555C 8024031C 0C0B210B */ jal evt_get_float_variable -/* DA5560 80240320 46000606 */ mov.s $f24, $f0 -/* DA5564 80240324 0220202D */ daddu $a0, $s1, $zero -/* DA5568 80240328 8E050000 */ lw $a1, ($s0) -/* DA556C 8024032C 0C0B210B */ jal evt_get_float_variable -/* DA5570 80240330 46000506 */ mov.s $f20, $f0 -/* DA5574 80240334 0240202D */ daddu $a0, $s2, $zero -/* DA5578 80240338 0C00EAD2 */ jal get_npc_safe -/* DA557C 8024033C 46000586 */ mov.s $f22, $f0 -/* DA5580 80240340 0040202D */ daddu $a0, $v0, $zero -/* DA5584 80240344 E49A0038 */ swc1 $f26, 0x38($a0) -/* DA5588 80240348 4600D006 */ mov.s $f0, $f26 -/* DA558C 8024034C E498003C */ swc1 $f24, 0x3c($a0) -/* DA5590 80240350 4600C086 */ mov.s $f2, $f24 -/* DA5594 80240354 E4940040 */ swc1 $f20, 0x40($a0) -/* DA5598 80240358 4600A106 */ mov.s $f4, $f20 -/* DA559C 8024035C 8C830000 */ lw $v1, ($a0) -/* DA55A0 80240360 3C050001 */ lui $a1, 1 -/* DA55A4 80240364 E496000C */ swc1 $f22, 0xc($a0) -/* DA55A8 80240368 E480006C */ swc1 $f0, 0x6c($a0) -/* DA55AC 8024036C E4820070 */ swc1 $f2, 0x70($a0) -/* DA55B0 80240370 E4840074 */ swc1 $f4, 0x74($a0) -/* DA55B4 80240374 00651825 */ or $v1, $v1, $a1 -/* DA55B8 80240378 AC830000 */ sw $v1, ($a0) -/* DA55BC 8024037C 8FBF001C */ lw $ra, 0x1c($sp) -/* DA55C0 80240380 8FB20018 */ lw $s2, 0x18($sp) -/* DA55C4 80240384 8FB10014 */ lw $s1, 0x14($sp) -/* DA55C8 80240388 8FB00010 */ lw $s0, 0x10($sp) -/* DA55CC 8024038C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DA55D0 80240390 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DA55D4 80240394 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DA55D8 80240398 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DA55DC 8024039C 24020002 */ addiu $v0, $zero, 2 -/* DA55E0 802403A0 03E00008 */ jr $ra -/* DA55E4 802403A4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538_DA5778.s b/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538_DA5778.s deleted file mode 100644 index 1105d70da8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538_DA5778.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240538_DA5778 -/* DA5778 80240538 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DA577C 8024053C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DA5780 80240540 8C620000 */ lw $v0, ($v1) -/* DA5784 80240544 AC800084 */ sw $zero, 0x84($a0) -/* DA5788 80240548 8C420010 */ lw $v0, 0x10($v0) -/* DA578C 8024054C 30428000 */ andi $v0, $v0, 0x8000 -/* DA5790 80240550 10400002 */ beqz $v0, .L8024055C -/* DA5794 80240554 24020001 */ addiu $v0, $zero, 1 -/* DA5798 80240558 AC820084 */ sw $v0, 0x84($a0) -.L8024055C: -/* DA579C 8024055C 8C620000 */ lw $v0, ($v1) -/* DA57A0 80240560 8C420010 */ lw $v0, 0x10($v0) -/* DA57A4 80240564 30424000 */ andi $v0, $v0, 0x4000 -/* DA57A8 80240568 10400002 */ beqz $v0, .L80240574 -/* DA57AC 8024056C 24020001 */ addiu $v0, $zero, 1 -/* DA57B0 80240570 AC820084 */ sw $v0, 0x84($a0) -.L80240574: -/* DA57B4 80240574 03E00008 */ jr $ra -/* DA57B8 80240578 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s deleted file mode 100644 index c07adbdafc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF4_DAE3F4 -/* DAE3F4 80240FF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DAE3F8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* DAE3FC 80240FFC 0080802D */ daddu $s0, $a0, $zero -/* DAE400 80241000 AFBF0014 */ sw $ra, 0x14($sp) -/* DAE404 80241004 8E020148 */ lw $v0, 0x148($s0) -/* DAE408 80241008 0C00EABB */ jal get_npc_unsafe -/* DAE40C 8024100C 84440008 */ lh $a0, 8($v0) -/* DAE410 80241010 9443008E */ lhu $v1, 0x8e($v0) -/* DAE414 80241014 C440003C */ lwc1 $f0, 0x3c($v0) -/* DAE418 80241018 24640001 */ addiu $a0, $v1, 1 -/* DAE41C 8024101C 00031C00 */ sll $v1, $v1, 0x10 -/* DAE420 80241020 00031B83 */ sra $v1, $v1, 0xe -/* DAE424 80241024 A444008E */ sh $a0, 0x8e($v0) -/* DAE428 80241028 3C018024 */ lui $at, %hi(D_80242EF0_DB02F0) -/* DAE42C 8024102C 00230821 */ addu $at, $at, $v1 -/* DAE430 80241030 C4222EF0 */ lwc1 $f2, %lo(D_80242EF0_DB02F0)($at) -/* DAE434 80241034 8443008E */ lh $v1, 0x8e($v0) -/* DAE438 80241038 46020000 */ add.s $f0, $f0, $f2 -/* DAE43C 8024103C 28630005 */ slti $v1, $v1, 5 -/* DAE440 80241040 14600003 */ bnez $v1, .L80241050 -/* DAE444 80241044 E440003C */ swc1 $f0, 0x3c($v0) -/* DAE448 80241048 2402000C */ addiu $v0, $zero, 0xc -/* DAE44C 8024104C AE020070 */ sw $v0, 0x70($s0) -.L80241050: -/* DAE450 80241050 8FBF0014 */ lw $ra, 0x14($sp) -/* DAE454 80241054 8FB00010 */ lw $s0, 0x10($sp) -/* DAE458 80241058 03E00008 */ jr $ra -/* DAE45C 8024105C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s deleted file mode 100644 index 27729a8706..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244CC8_DB20C8 -.word .L802417B8_DAEBB8, .L802417C8_DAEBC8, .L802417E0_DAEBE0, .L802417F0_DAEBF0, .L80241870_DAEC70, .L80241870_DAEC70, .L80241870_DAEC70, .L80241870_DAEC70, .L80241870_DAEC70, .L80241870_DAEC70, .L80241808_DAEC08, .L80241818_DAEC18, .L80241830_DAEC30, .L80241848_DAEC48, .L80241860_DAEC60, 0 - -.section .text - -glabel func_802416AC_DAEAAC -/* DAEAAC 802416AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DAEAB0 802416B0 AFB40040 */ sw $s4, 0x40($sp) -/* DAEAB4 802416B4 0080A02D */ daddu $s4, $a0, $zero -/* DAEAB8 802416B8 AFBF0048 */ sw $ra, 0x48($sp) -/* DAEABC 802416BC AFB50044 */ sw $s5, 0x44($sp) -/* DAEAC0 802416C0 AFB3003C */ sw $s3, 0x3c($sp) -/* DAEAC4 802416C4 AFB20038 */ sw $s2, 0x38($sp) -/* DAEAC8 802416C8 AFB10034 */ sw $s1, 0x34($sp) -/* DAEACC 802416CC AFB00030 */ sw $s0, 0x30($sp) -/* DAEAD0 802416D0 8E920148 */ lw $s2, 0x148($s4) -/* DAEAD4 802416D4 86440008 */ lh $a0, 8($s2) -/* DAEAD8 802416D8 8E90000C */ lw $s0, 0xc($s4) -/* DAEADC 802416DC 0C00EABB */ jal get_npc_unsafe -/* DAEAE0 802416E0 00A0882D */ daddu $s1, $a1, $zero -/* DAEAE4 802416E4 0280202D */ daddu $a0, $s4, $zero -/* DAEAE8 802416E8 8E050000 */ lw $a1, ($s0) -/* DAEAEC 802416EC 0C0B1EAF */ jal evt_get_variable -/* DAEAF0 802416F0 0040A82D */ daddu $s5, $v0, $zero -/* DAEAF4 802416F4 AFA00010 */ sw $zero, 0x10($sp) -/* DAEAF8 802416F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEAFC 802416FC 8C630030 */ lw $v1, 0x30($v1) -/* DAEB00 80241700 AFA30014 */ sw $v1, 0x14($sp) -/* DAEB04 80241704 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB08 80241708 8C63001C */ lw $v1, 0x1c($v1) -/* DAEB0C 8024170C AFA30018 */ sw $v1, 0x18($sp) -/* DAEB10 80241710 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB14 80241714 8C630024 */ lw $v1, 0x24($v1) -/* DAEB18 80241718 AFA3001C */ sw $v1, 0x1c($sp) -/* DAEB1C 8024171C 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB20 80241720 8C630028 */ lw $v1, 0x28($v1) -/* DAEB24 80241724 27B30010 */ addiu $s3, $sp, 0x10 -/* DAEB28 80241728 AFA30020 */ sw $v1, 0x20($sp) -/* DAEB2C 8024172C 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB30 80241730 3C0142F0 */ lui $at, 0x42f0 -/* DAEB34 80241734 44810000 */ mtc1 $at, $f0 -/* DAEB38 80241738 8C63002C */ lw $v1, 0x2c($v1) -/* DAEB3C 8024173C 0040802D */ daddu $s0, $v0, $zero -/* DAEB40 80241740 E7A00028 */ swc1 $f0, 0x28($sp) -/* DAEB44 80241744 A7A0002C */ sh $zero, 0x2c($sp) -/* DAEB48 80241748 12200006 */ beqz $s1, .L80241764 -/* DAEB4C 8024174C AFA30024 */ sw $v1, 0x24($sp) -/* DAEB50 80241750 02A0202D */ daddu $a0, $s5, $zero -/* DAEB54 80241754 0240282D */ daddu $a1, $s2, $zero -/* DAEB58 80241758 0280302D */ daddu $a2, $s4, $zero -/* DAEB5C 8024175C 0C090562 */ jal omo_04_UnkFunc5 -/* DAEB60 80241760 0200382D */ daddu $a3, $s0, $zero -.L80241764: -/* DAEB64 80241764 2402FFFE */ addiu $v0, $zero, -2 -/* DAEB68 80241768 A2A200AB */ sb $v0, 0xab($s5) -/* DAEB6C 8024176C 8E4300B0 */ lw $v1, 0xb0($s2) -/* DAEB70 80241770 30620004 */ andi $v0, $v1, 4 -/* DAEB74 80241774 10400007 */ beqz $v0, .L80241794 -/* DAEB78 80241778 00000000 */ nop -/* DAEB7C 8024177C 824200B4 */ lb $v0, 0xb4($s2) -/* DAEB80 80241780 1440003C */ bnez $v0, .L80241874 -/* DAEB84 80241784 0000102D */ daddu $v0, $zero, $zero -/* DAEB88 80241788 2402FFFB */ addiu $v0, $zero, -5 -/* DAEB8C 8024178C 00621024 */ and $v0, $v1, $v0 -/* DAEB90 80241790 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241794: -/* DAEB94 80241794 8E830070 */ lw $v1, 0x70($s4) -/* DAEB98 80241798 2C62000F */ sltiu $v0, $v1, 0xf -/* DAEB9C 8024179C 10400034 */ beqz $v0, .L80241870_DAEC70 -/* DAEBA0 802417A0 00031080 */ sll $v0, $v1, 2 -/* DAEBA4 802417A4 3C018024 */ lui $at, %hi(jtbl_80244CC8_DB20C8) -/* DAEBA8 802417A8 00220821 */ addu $at, $at, $v0 -/* DAEBAC 802417AC 8C224CC8 */ lw $v0, %lo(jtbl_80244CC8_DB20C8)($at) -/* DAEBB0 802417B0 00400008 */ jr $v0 -/* DAEBB4 802417B4 00000000 */ nop -.L802417B8_DAEBB8: -/* DAEBB8 802417B8 0280202D */ daddu $a0, $s4, $zero -/* DAEBBC 802417BC 0200282D */ daddu $a1, $s0, $zero -/* DAEBC0 802417C0 0C0900E8 */ jal omo_04_UnkNpcAIFunc23 -/* DAEBC4 802417C4 0260302D */ daddu $a2, $s3, $zero -.L802417C8_DAEBC8: -/* DAEBC8 802417C8 0280202D */ daddu $a0, $s4, $zero -/* DAEBCC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* DAEBD0 802417D0 0C090154 */ jal omo_04_UnkNpcAIFunc35 -/* DAEBD4 802417D4 0260302D */ daddu $a2, $s3, $zero -/* DAEBD8 802417D8 0809061D */ j .L80241874 -/* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero -.L802417E0_DAEBE0: -/* DAEBE0 802417E0 0280202D */ daddu $a0, $s4, $zero -/* DAEBE4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* DAEBE8 802417E8 0C0902DE */ jal omo_04_UnkNpcAIFunc1 -/* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero -.L802417F0_DAEBF0: -/* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero -/* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero -/* DAEBF8 802417F8 0C09030E */ jal omo_04_UnkFunc4 -/* DAEBFC 802417FC 0260302D */ daddu $a2, $s3, $zero -/* DAEC00 80241800 0809061D */ j .L80241874 -/* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero -.L80241808_DAEC08: -/* DAEC08 80241808 0280202D */ daddu $a0, $s4, $zero -/* DAEC0C 8024180C 0200282D */ daddu $a1, $s0, $zero -/* DAEC10 80241810 0C0903DF */ jal omo_04_UnkNpcAIFunc2 -/* DAEC14 80241814 0260302D */ daddu $a2, $s3, $zero -.L80241818_DAEC18: -/* DAEC18 80241818 0280202D */ daddu $a0, $s4, $zero -/* DAEC1C 8024181C 0200282D */ daddu $a1, $s0, $zero -/* DAEC20 80241820 0C0903FD */ jal func_80240FF4_DAE3F4 -/* DAEC24 80241824 0260302D */ daddu $a2, $s3, $zero -/* DAEC28 80241828 0809061D */ j .L80241874 -/* DAEC2C 8024182C 0000102D */ daddu $v0, $zero, $zero -.L80241830_DAEC30: -/* DAEC30 80241830 0280202D */ daddu $a0, $s4, $zero -/* DAEC34 80241834 0200282D */ daddu $a1, $s0, $zero -/* DAEC38 80241838 0C090418 */ jal omo_04_UnkNpcAIFunc14 -/* DAEC3C 8024183C 0260302D */ daddu $a2, $s3, $zero -/* DAEC40 80241840 0809061D */ j .L80241874 -/* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero -.L80241848_DAEC48: -/* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero -/* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero -/* DAEC50 80241850 0C090465 */ jal omo_04_UnkNpcAIFunc3 -/* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero -/* DAEC58 80241858 0809061D */ j .L80241874 -/* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero -.L80241860_DAEC60: -/* DAEC60 80241860 0280202D */ daddu $a0, $s4, $zero -/* DAEC64 80241864 0200282D */ daddu $a1, $s0, $zero -/* DAEC68 80241868 0C09047E */ jal omo_04_UnkFunc6 -/* DAEC6C 8024186C 0260302D */ daddu $a2, $s3, $zero -.L80241870_DAEC70: -/* DAEC70 80241870 0000102D */ daddu $v0, $zero, $zero -.L80241874: -/* DAEC74 80241874 8FBF0048 */ lw $ra, 0x48($sp) -/* DAEC78 80241878 8FB50044 */ lw $s5, 0x44($sp) -/* DAEC7C 8024187C 8FB40040 */ lw $s4, 0x40($sp) -/* DAEC80 80241880 8FB3003C */ lw $s3, 0x3c($sp) -/* DAEC84 80241884 8FB20038 */ lw $s2, 0x38($sp) -/* DAEC88 80241888 8FB10034 */ lw $s1, 0x34($sp) -/* DAEC8C 8024188C 8FB00030 */ lw $s0, 0x30($sp) -/* DAEC90 80241890 03E00008 */ jr $ra -/* DAEC94 80241894 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s deleted file mode 100644 index 9aa92cdee2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416A8_DB3968 -/* DB3968 802416A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB396C 802416AC AFB00010 */ sw $s0, 0x10($sp) -/* DB3970 802416B0 0080802D */ daddu $s0, $a0, $zero -/* DB3974 802416B4 AFBF0014 */ sw $ra, 0x14($sp) -/* DB3978 802416B8 8E020148 */ lw $v0, 0x148($s0) -/* DB397C 802416BC 0C00EABB */ jal get_npc_unsafe -/* DB3980 802416C0 84440008 */ lh $a0, 8($v0) -/* DB3984 802416C4 9443008E */ lhu $v1, 0x8e($v0) -/* DB3988 802416C8 C440003C */ lwc1 $f0, 0x3c($v0) -/* DB398C 802416CC 24640001 */ addiu $a0, $v1, 1 -/* DB3990 802416D0 00031C00 */ sll $v1, $v1, 0x10 -/* DB3994 802416D4 00031B83 */ sra $v1, $v1, 0xe -/* DB3998 802416D8 A444008E */ sh $a0, 0x8e($v0) -/* DB399C 802416DC 3C018024 */ lui $at, %hi(D_80242F88_DB5248) -/* DB39A0 802416E0 00230821 */ addu $at, $at, $v1 -/* DB39A4 802416E4 C4222F88 */ lwc1 $f2, %lo(D_80242F88_DB5248)($at) -/* DB39A8 802416E8 8443008E */ lh $v1, 0x8e($v0) -/* DB39AC 802416EC 46020000 */ add.s $f0, $f0, $f2 -/* DB39B0 802416F0 28630005 */ slti $v1, $v1, 5 -/* DB39B4 802416F4 14600003 */ bnez $v1, .L80241704 -/* DB39B8 802416F8 E440003C */ swc1 $f0, 0x3c($v0) -/* DB39BC 802416FC 2402000C */ addiu $v0, $zero, 0xc -/* DB39C0 80241700 AE020070 */ sw $v0, 0x70($s0) -.L80241704: -/* DB39C4 80241704 8FBF0014 */ lw $ra, 0x14($sp) -/* DB39C8 80241708 8FB00010 */ lw $s0, 0x10($sp) -/* DB39CC 8024170C 03E00008 */ jr $ra -/* DB39D0 80241710 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s deleted file mode 100644 index cf175735fc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80245608_DB78C8 -.word .L80241E6C_DB412C, .L80241E7C_DB413C, .L80241E94_DB4154, .L80241EA4_DB4164, .L80241F24_DB41E4, .L80241F24_DB41E4, .L80241F24_DB41E4, .L80241F24_DB41E4, .L80241F24_DB41E4, .L80241F24_DB41E4, .L80241EBC_DB417C, .L80241ECC_DB418C, .L80241EE4_DB41A4, .L80241EFC_DB41BC, .L80241F14_DB41D4, 0 - -.section .text - -glabel func_80241D60_DB4020 -/* DB4020 80241D60 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DB4024 80241D64 AFB40040 */ sw $s4, 0x40($sp) -/* DB4028 80241D68 0080A02D */ daddu $s4, $a0, $zero -/* DB402C 80241D6C AFBF0048 */ sw $ra, 0x48($sp) -/* DB4030 80241D70 AFB50044 */ sw $s5, 0x44($sp) -/* DB4034 80241D74 AFB3003C */ sw $s3, 0x3c($sp) -/* DB4038 80241D78 AFB20038 */ sw $s2, 0x38($sp) -/* DB403C 80241D7C AFB10034 */ sw $s1, 0x34($sp) -/* DB4040 80241D80 AFB00030 */ sw $s0, 0x30($sp) -/* DB4044 80241D84 8E920148 */ lw $s2, 0x148($s4) -/* DB4048 80241D88 86440008 */ lh $a0, 8($s2) -/* DB404C 80241D8C 8E90000C */ lw $s0, 0xc($s4) -/* DB4050 80241D90 0C00EABB */ jal get_npc_unsafe -/* DB4054 80241D94 00A0882D */ daddu $s1, $a1, $zero -/* DB4058 80241D98 0280202D */ daddu $a0, $s4, $zero -/* DB405C 80241D9C 8E050000 */ lw $a1, ($s0) -/* DB4060 80241DA0 0C0B1EAF */ jal evt_get_variable -/* DB4064 80241DA4 0040A82D */ daddu $s5, $v0, $zero -/* DB4068 80241DA8 AFA00010 */ sw $zero, 0x10($sp) -/* DB406C 80241DAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB4070 80241DB0 8C630030 */ lw $v1, 0x30($v1) -/* DB4074 80241DB4 AFA30014 */ sw $v1, 0x14($sp) -/* DB4078 80241DB8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB407C 80241DBC 8C63001C */ lw $v1, 0x1c($v1) -/* DB4080 80241DC0 AFA30018 */ sw $v1, 0x18($sp) -/* DB4084 80241DC4 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB4088 80241DC8 8C630024 */ lw $v1, 0x24($v1) -/* DB408C 80241DCC AFA3001C */ sw $v1, 0x1c($sp) -/* DB4090 80241DD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB4094 80241DD4 8C630028 */ lw $v1, 0x28($v1) -/* DB4098 80241DD8 27B30010 */ addiu $s3, $sp, 0x10 -/* DB409C 80241DDC AFA30020 */ sw $v1, 0x20($sp) -/* DB40A0 80241DE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DB40A4 80241DE4 3C0142F0 */ lui $at, 0x42f0 -/* DB40A8 80241DE8 44810000 */ mtc1 $at, $f0 -/* DB40AC 80241DEC 8C63002C */ lw $v1, 0x2c($v1) -/* DB40B0 80241DF0 0040802D */ daddu $s0, $v0, $zero -/* DB40B4 80241DF4 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB40B8 80241DF8 A7A0002C */ sh $zero, 0x2c($sp) -/* DB40BC 80241DFC 12200006 */ beqz $s1, .L80241E18 -/* DB40C0 80241E00 AFA30024 */ sw $v1, 0x24($sp) -/* DB40C4 80241E04 02A0202D */ daddu $a0, $s5, $zero -/* DB40C8 80241E08 0240282D */ daddu $a1, $s2, $zero -/* DB40CC 80241E0C 0280302D */ daddu $a2, $s4, $zero -/* DB40D0 80241E10 0C09070F */ jal omo_05_UnkFunc5 -/* DB40D4 80241E14 0200382D */ daddu $a3, $s0, $zero -.L80241E18: -/* DB40D8 80241E18 2402FFFE */ addiu $v0, $zero, -2 -/* DB40DC 80241E1C A2A200AB */ sb $v0, 0xab($s5) -/* DB40E0 80241E20 8E4300B0 */ lw $v1, 0xb0($s2) -/* DB40E4 80241E24 30620004 */ andi $v0, $v1, 4 -/* DB40E8 80241E28 10400007 */ beqz $v0, .L80241E48 -/* DB40EC 80241E2C 00000000 */ nop -/* DB40F0 80241E30 824200B4 */ lb $v0, 0xb4($s2) -/* DB40F4 80241E34 1440003C */ bnez $v0, .L80241F28 -/* DB40F8 80241E38 0000102D */ daddu $v0, $zero, $zero -/* DB40FC 80241E3C 2402FFFB */ addiu $v0, $zero, -5 -/* DB4100 80241E40 00621024 */ and $v0, $v1, $v0 -/* DB4104 80241E44 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E48: -/* DB4108 80241E48 8E830070 */ lw $v1, 0x70($s4) -/* DB410C 80241E4C 2C62000F */ sltiu $v0, $v1, 0xf -/* DB4110 80241E50 10400034 */ beqz $v0, .L80241F24_DB41E4 -/* DB4114 80241E54 00031080 */ sll $v0, $v1, 2 -/* DB4118 80241E58 3C018024 */ lui $at, %hi(jtbl_80245608_DB78C8) -/* DB411C 80241E5C 00220821 */ addu $at, $at, $v0 -/* DB4120 80241E60 8C225608 */ lw $v0, %lo(jtbl_80245608_DB78C8)($at) -/* DB4124 80241E64 00400008 */ jr $v0 -/* DB4128 80241E68 00000000 */ nop -.L80241E6C_DB412C: -/* DB412C 80241E6C 0280202D */ daddu $a0, $s4, $zero -/* DB4130 80241E70 0200282D */ daddu $a1, $s0, $zero -/* DB4134 80241E74 0C090295 */ jal omo_05_UnkNpcAIFunc23 -/* DB4138 80241E78 0260302D */ daddu $a2, $s3, $zero -.L80241E7C_DB413C: -/* DB413C 80241E7C 0280202D */ daddu $a0, $s4, $zero -/* DB4140 80241E80 0200282D */ daddu $a1, $s0, $zero -/* DB4144 80241E84 0C090301 */ jal omo_05_UnkNpcAIFunc35 -/* DB4148 80241E88 0260302D */ daddu $a2, $s3, $zero -/* DB414C 80241E8C 080907CA */ j .L80241F28 -/* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero -.L80241E94_DB4154: -/* DB4154 80241E94 0280202D */ daddu $a0, $s4, $zero -/* DB4158 80241E98 0200282D */ daddu $a1, $s0, $zero -/* DB415C 80241E9C 0C09048B */ jal omo_05_UnkNpcAIFunc1 -/* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero -.L80241EA4_DB4164: -/* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero -/* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero -/* DB416C 80241EAC 0C0904BB */ jal omo_05_UnkFunc4 -/* DB4170 80241EB0 0260302D */ daddu $a2, $s3, $zero -/* DB4174 80241EB4 080907CA */ j .L80241F28 -/* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero -.L80241EBC_DB417C: -/* DB417C 80241EBC 0280202D */ daddu $a0, $s4, $zero -/* DB4180 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* DB4184 80241EC4 0C09058C */ jal omo_05_UnkNpcAIFunc2 -/* DB4188 80241EC8 0260302D */ daddu $a2, $s3, $zero -.L80241ECC_DB418C: -/* DB418C 80241ECC 0280202D */ daddu $a0, $s4, $zero -/* DB4190 80241ED0 0200282D */ daddu $a1, $s0, $zero -/* DB4194 80241ED4 0C0905AA */ jal func_802416A8_DB3968 -/* DB4198 80241ED8 0260302D */ daddu $a2, $s3, $zero -/* DB419C 80241EDC 080907CA */ j .L80241F28 -/* DB41A0 80241EE0 0000102D */ daddu $v0, $zero, $zero -.L80241EE4_DB41A4: -/* DB41A4 80241EE4 0280202D */ daddu $a0, $s4, $zero -/* DB41A8 80241EE8 0200282D */ daddu $a1, $s0, $zero -/* DB41AC 80241EEC 0C0905C5 */ jal omo_05_UnkNpcAIFunc14 -/* DB41B0 80241EF0 0260302D */ daddu $a2, $s3, $zero -/* DB41B4 80241EF4 080907CA */ j .L80241F28 -/* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero -.L80241EFC_DB41BC: -/* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* DB41C4 80241F04 0C090612 */ jal omo_05_UnkNpcAIFunc3 -/* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero -/* DB41CC 80241F0C 080907CA */ j .L80241F28 -/* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero -.L80241F14_DB41D4: -/* DB41D4 80241F14 0280202D */ daddu $a0, $s4, $zero -/* DB41D8 80241F18 0200282D */ daddu $a1, $s0, $zero -/* DB41DC 80241F1C 0C09062B */ jal omo_05_UnkFunc6 -/* DB41E0 80241F20 0260302D */ daddu $a2, $s3, $zero -.L80241F24_DB41E4: -/* DB41E4 80241F24 0000102D */ daddu $v0, $zero, $zero -.L80241F28: -/* DB41E8 80241F28 8FBF0048 */ lw $ra, 0x48($sp) -/* DB41EC 80241F2C 8FB50044 */ lw $s5, 0x44($sp) -/* DB41F0 80241F30 8FB40040 */ lw $s4, 0x40($sp) -/* DB41F4 80241F34 8FB3003C */ lw $s3, 0x3c($sp) -/* DB41F8 80241F38 8FB20038 */ lw $s2, 0x38($sp) -/* DB41FC 80241F3C 8FB10034 */ lw $s1, 0x34($sp) -/* DB4200 80241F40 8FB00030 */ lw $s0, 0x30($sp) -/* DB4204 80241F44 03E00008 */ jr $ra -/* DB4208 80241F48 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s deleted file mode 100644 index ec1d422520..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802400E4_DB79F4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DB79F4 -/* DB79F4 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DB79F8 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DB79FC 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DB7A00 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DB7A04 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DB7A08 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DB7A0C 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DB7A10 80240100 8E050000 */ lw $a1, ($s0) -/* DB7A14 80240104 0C0B210B */ jal evt_get_float_variable -/* DB7A18 80240108 26100004 */ addiu $s0, $s0, 4 -/* DB7A1C 8024010C 8E050000 */ lw $a1, ($s0) -/* DB7A20 80240110 26100004 */ addiu $s0, $s0, 4 -/* DB7A24 80240114 0220202D */ daddu $a0, $s1, $zero -/* DB7A28 80240118 0C0B210B */ jal evt_get_float_variable -/* DB7A2C 8024011C 46000506 */ mov.s $f20, $f0 -/* DB7A30 80240120 4614003C */ c.lt.s $f0, $f20 -/* DB7A34 80240124 00000000 */ nop -/* DB7A38 80240128 45000004 */ bc1f .L8024013C -/* DB7A3C 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DB7A40 80240130 8E050000 */ lw $a1, ($s0) -/* DB7A44 80240134 08090051 */ j .L80240144 -/* DB7A48 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DB7A4C 8024013C 8E050000 */ lw $a1, ($s0) -/* DB7A50 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DB7A54 80240144 0C0B2026 */ jal evt_set_variable -/* DB7A58 80240148 00000000 */ nop -/* DB7A5C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DB7A60 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DB7A64 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DB7A68 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DB7A6C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DB7A70 80240160 03E00008 */ jr $ra -/* DB7A74 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168_DB7A78.s b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168_DB7A78.s deleted file mode 100644 index fb496dff18..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168_DB7A78.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DB7A78 -/* DB7A78 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB7A7C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DB7A80 80240170 0080902D */ daddu $s2, $a0, $zero -/* DB7A84 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DB7A88 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DB7A8C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DB7A90 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DB7A94 80240184 8E050000 */ lw $a1, ($s0) -/* DB7A98 80240188 0C0B1EAF */ jal evt_get_variable -/* DB7A9C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DB7AA0 80240190 8E050000 */ lw $a1, ($s0) -/* DB7AA4 80240194 26100004 */ addiu $s0, $s0, 4 -/* DB7AA8 80240198 0240202D */ daddu $a0, $s2, $zero -/* DB7AAC 8024019C 0C0B1EAF */ jal evt_get_variable -/* DB7AB0 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DB7AB4 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DB7AB8 802401A8 8E050000 */ lw $a1, ($s0) -/* DB7ABC 802401AC 0C0B1EAF */ jal evt_get_variable -/* DB7AC0 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DB7AC4 802401B4 02020018 */ mult $s0, $v0 -/* DB7AC8 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DB7ACC 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DB7AD0 802401C0 00003012 */ mflo $a2 -/* DB7AD4 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DB7AD8 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DB7ADC 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DB7AE0 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DB7AE4 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DB7AE8 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DB7AEC 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DB7AF0 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DB7AF4 802401E4 03E00008 */ jr $ra -/* DB7AF8 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC_DB7AFC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC_DB7AFC.s deleted file mode 100644 index f8ce0d8b47..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC_DB7AFC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DB7AFC -/* DB7AFC 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DB7B00 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DB7B04 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DB7B08 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DB7B0C 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DB7B10 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DB7B14 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DB7B18 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DB7B1C 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DB7B20 80240210 8E050000 */ lw $a1, ($s0) -/* DB7B24 80240214 0C0B210B */ jal evt_get_float_variable -/* DB7B28 80240218 26100004 */ addiu $s0, $s0, 4 -/* DB7B2C 8024021C 8E050000 */ lw $a1, ($s0) -/* DB7B30 80240220 26100004 */ addiu $s0, $s0, 4 -/* DB7B34 80240224 0220202D */ daddu $a0, $s1, $zero -/* DB7B38 80240228 0C0B210B */ jal evt_get_float_variable -/* DB7B3C 8024022C 46000606 */ mov.s $f24, $f0 -/* DB7B40 80240230 8E050000 */ lw $a1, ($s0) -/* DB7B44 80240234 26100004 */ addiu $s0, $s0, 4 -/* DB7B48 80240238 0220202D */ daddu $a0, $s1, $zero -/* DB7B4C 8024023C 0C0B210B */ jal evt_get_float_variable -/* DB7B50 80240240 46000586 */ mov.s $f22, $f0 -/* DB7B54 80240244 0220202D */ daddu $a0, $s1, $zero -/* DB7B58 80240248 8E050000 */ lw $a1, ($s0) -/* DB7B5C 8024024C 0C0B210B */ jal evt_get_float_variable -/* DB7B60 80240250 46000506 */ mov.s $f20, $f0 -/* DB7B64 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DB7B68 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DB7B6C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DB7B70 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DB7B74 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DB7B78 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DB7B7C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DB7B80 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DB7B84 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DB7B88 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DB7B8C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DB7B90 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DB7B94 80240284 24020002 */ addiu $v0, $zero, 2 -/* DB7B98 80240288 03E00008 */ jr $ra -/* DB7B9C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240290_DB7BA0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240290_DB7BA0.s deleted file mode 100644 index 0f3ea3688f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240290_DB7BA0.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DB7BA0 -/* DB7BA0 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DB7BA4 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DB7BA8 80240298 0080882D */ daddu $s1, $a0, $zero -/* DB7BAC 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DB7BB0 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DB7BB4 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DB7BB8 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DB7BBC 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DB7BC0 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DB7BC4 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DB7BC8 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DB7BCC 802402BC 8E050000 */ lw $a1, ($s0) -/* DB7BD0 802402C0 0C0B1EAF */ jal evt_get_variable -/* DB7BD4 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DB7BD8 802402C8 8E050000 */ lw $a1, ($s0) -/* DB7BDC 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DB7BE0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DB7BE4 802402D4 0C0B210B */ jal evt_get_float_variable -/* DB7BE8 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DB7BEC 802402DC 8E050000 */ lw $a1, ($s0) -/* DB7BF0 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DB7BF4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DB7BF8 802402E8 0C0B210B */ jal evt_get_float_variable -/* DB7BFC 802402EC 46000686 */ mov.s $f26, $f0 -/* DB7C00 802402F0 8E050000 */ lw $a1, ($s0) -/* DB7C04 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DB7C08 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DB7C0C 802402FC 0C0B210B */ jal evt_get_float_variable -/* DB7C10 80240300 46000606 */ mov.s $f24, $f0 -/* DB7C14 80240304 0220202D */ daddu $a0, $s1, $zero -/* DB7C18 80240308 8E050000 */ lw $a1, ($s0) -/* DB7C1C 8024030C 0C0B210B */ jal evt_get_float_variable -/* DB7C20 80240310 46000506 */ mov.s $f20, $f0 -/* DB7C24 80240314 0240202D */ daddu $a0, $s2, $zero -/* DB7C28 80240318 0C00EAD2 */ jal get_npc_safe -/* DB7C2C 8024031C 46000586 */ mov.s $f22, $f0 -/* DB7C30 80240320 0040202D */ daddu $a0, $v0, $zero -/* DB7C34 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DB7C38 80240328 4600D006 */ mov.s $f0, $f26 -/* DB7C3C 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DB7C40 80240330 4600C086 */ mov.s $f2, $f24 -/* DB7C44 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DB7C48 80240338 4600A106 */ mov.s $f4, $f20 -/* DB7C4C 8024033C 8C830000 */ lw $v1, ($a0) -/* DB7C50 80240340 3C050001 */ lui $a1, 1 -/* DB7C54 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DB7C58 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DB7C5C 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DB7C60 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DB7C64 80240354 00651825 */ or $v1, $v1, $a1 -/* DB7C68 80240358 AC830000 */ sw $v1, ($a0) -/* DB7C6C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DB7C70 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DB7C74 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DB7C78 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DB7C7C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DB7C80 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DB7C84 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DB7C88 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DB7C8C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DB7C90 80240380 03E00008 */ jr $ra -/* DB7C94 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240518_DB7E28.s b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240518_DB7E28.s deleted file mode 100644 index 973249b01f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240518_DB7E28.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DB7E28 -/* DB7E28 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DB7E2C 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DB7E30 80240520 8C620000 */ lw $v0, ($v1) -/* DB7E34 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DB7E38 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DB7E3C 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DB7E40 80240530 10400002 */ beqz $v0, .L8024053C -/* DB7E44 80240534 24020001 */ addiu $v0, $zero, 1 -/* DB7E48 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DB7E4C 8024053C 8C620000 */ lw $v0, ($v1) -/* DB7E50 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DB7E54 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DB7E58 80240548 10400002 */ beqz $v0, .L80240554 -/* DB7E5C 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DB7E60 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DB7E64 80240554 03E00008 */ jr $ra -/* DB7E68 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s deleted file mode 100644 index 6ff31ab2de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425CC_DBF87C -/* DBF87C 802425CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DBF880 802425D0 AFB00010 */ sw $s0, 0x10($sp) -/* DBF884 802425D4 0080802D */ daddu $s0, $a0, $zero -/* DBF888 802425D8 AFBF0014 */ sw $ra, 0x14($sp) -/* DBF88C 802425DC 8E020148 */ lw $v0, 0x148($s0) -/* DBF890 802425E0 0C00EABB */ jal get_npc_unsafe -/* DBF894 802425E4 84440008 */ lh $a0, 8($v0) -/* DBF898 802425E8 9443008E */ lhu $v1, 0x8e($v0) -/* DBF89C 802425EC C440003C */ lwc1 $f0, 0x3c($v0) -/* DBF8A0 802425F0 24640001 */ addiu $a0, $v1, 1 -/* DBF8A4 802425F4 00031C00 */ sll $v1, $v1, 0x10 -/* DBF8A8 802425F8 00031B83 */ sra $v1, $v1, 0xe -/* DBF8AC 802425FC A444008E */ sh $a0, 0x8e($v0) -/* DBF8B0 80242600 3C018024 */ lui $at, %hi(D_80243A14_DC0CC4) -/* DBF8B4 80242604 00230821 */ addu $at, $at, $v1 -/* DBF8B8 80242608 C4223A14 */ lwc1 $f2, %lo(D_80243A14_DC0CC4)($at) -/* DBF8BC 8024260C 8443008E */ lh $v1, 0x8e($v0) -/* DBF8C0 80242610 46020000 */ add.s $f0, $f0, $f2 -/* DBF8C4 80242614 28630005 */ slti $v1, $v1, 5 -/* DBF8C8 80242618 14600003 */ bnez $v1, .L80242628 -/* DBF8CC 8024261C E440003C */ swc1 $f0, 0x3c($v0) -/* DBF8D0 80242620 2402000C */ addiu $v0, $zero, 0xc -/* DBF8D4 80242624 AE020070 */ sw $v0, 0x70($s0) -.L80242628: -/* DBF8D8 80242628 8FBF0014 */ lw $ra, 0x14($sp) -/* DBF8DC 8024262C 8FB00010 */ lw $s0, 0x10($sp) -/* DBF8E0 80242630 03E00008 */ jr $ra -/* DBF8E4 80242634 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s deleted file mode 100644 index f56d88d9eb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802470C8_DC4378 -.word .L80242D90_DC0040, .L80242DA0_DC0050, .L80242DB8_DC0068, .L80242DC8_DC0078, .L80242E48_DC00F8, .L80242E48_DC00F8, .L80242E48_DC00F8, .L80242E48_DC00F8, .L80242E48_DC00F8, .L80242E48_DC00F8, .L80242DE0_DC0090, .L80242DF0_DC00A0, .L80242E08_DC00B8, .L80242E20_DC00D0, .L80242E38_DC00E8, 0, 0, 0 - -.section .text - -glabel func_80242C84_DBFF34 -/* DBFF34 80242C84 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DBFF38 80242C88 AFB40040 */ sw $s4, 0x40($sp) -/* DBFF3C 80242C8C 0080A02D */ daddu $s4, $a0, $zero -/* DBFF40 80242C90 AFBF0048 */ sw $ra, 0x48($sp) -/* DBFF44 80242C94 AFB50044 */ sw $s5, 0x44($sp) -/* DBFF48 80242C98 AFB3003C */ sw $s3, 0x3c($sp) -/* DBFF4C 80242C9C AFB20038 */ sw $s2, 0x38($sp) -/* DBFF50 80242CA0 AFB10034 */ sw $s1, 0x34($sp) -/* DBFF54 80242CA4 AFB00030 */ sw $s0, 0x30($sp) -/* DBFF58 80242CA8 8E920148 */ lw $s2, 0x148($s4) -/* DBFF5C 80242CAC 86440008 */ lh $a0, 8($s2) -/* DBFF60 80242CB0 8E90000C */ lw $s0, 0xc($s4) -/* DBFF64 80242CB4 0C00EABB */ jal get_npc_unsafe -/* DBFF68 80242CB8 00A0882D */ daddu $s1, $a1, $zero -/* DBFF6C 80242CBC 0280202D */ daddu $a0, $s4, $zero -/* DBFF70 80242CC0 8E050000 */ lw $a1, ($s0) -/* DBFF74 80242CC4 0C0B1EAF */ jal evt_get_variable -/* DBFF78 80242CC8 0040A82D */ daddu $s5, $v0, $zero -/* DBFF7C 80242CCC AFA00010 */ sw $zero, 0x10($sp) -/* DBFF80 80242CD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFF84 80242CD4 8C630030 */ lw $v1, 0x30($v1) -/* DBFF88 80242CD8 AFA30014 */ sw $v1, 0x14($sp) -/* DBFF8C 80242CDC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFF90 80242CE0 8C63001C */ lw $v1, 0x1c($v1) -/* DBFF94 80242CE4 AFA30018 */ sw $v1, 0x18($sp) -/* DBFF98 80242CE8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFF9C 80242CEC 8C630024 */ lw $v1, 0x24($v1) -/* DBFFA0 80242CF0 AFA3001C */ sw $v1, 0x1c($sp) -/* DBFFA4 80242CF4 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFFA8 80242CF8 8C630028 */ lw $v1, 0x28($v1) -/* DBFFAC 80242CFC 27B30010 */ addiu $s3, $sp, 0x10 -/* DBFFB0 80242D00 AFA30020 */ sw $v1, 0x20($sp) -/* DBFFB4 80242D04 8E4300D0 */ lw $v1, 0xd0($s2) -/* DBFFB8 80242D08 3C0142F0 */ lui $at, 0x42f0 -/* DBFFBC 80242D0C 44810000 */ mtc1 $at, $f0 -/* DBFFC0 80242D10 8C63002C */ lw $v1, 0x2c($v1) -/* DBFFC4 80242D14 0040802D */ daddu $s0, $v0, $zero -/* DBFFC8 80242D18 E7A00028 */ swc1 $f0, 0x28($sp) -/* DBFFCC 80242D1C A7A0002C */ sh $zero, 0x2c($sp) -/* DBFFD0 80242D20 12200006 */ beqz $s1, .L80242D3C -/* DBFFD4 80242D24 AFA30024 */ sw $v1, 0x24($sp) -/* DBFFD8 80242D28 02A0202D */ daddu $a0, $s5, $zero -/* DBFFDC 80242D2C 0240282D */ daddu $a1, $s2, $zero -/* DBFFE0 80242D30 0280302D */ daddu $a2, $s4, $zero -/* DBFFE4 80242D34 0C090AD8 */ jal omo_07_UnkFunc5 -/* DBFFE8 80242D38 0200382D */ daddu $a3, $s0, $zero -.L80242D3C: -/* DBFFEC 80242D3C 2402FFFE */ addiu $v0, $zero, -2 -/* DBFFF0 80242D40 A2A200AB */ sb $v0, 0xab($s5) -/* DBFFF4 80242D44 8E4300B0 */ lw $v1, 0xb0($s2) -/* DBFFF8 80242D48 30620004 */ andi $v0, $v1, 4 -/* DBFFFC 80242D4C 10400007 */ beqz $v0, .L80242D6C -/* DC0000 80242D50 00000000 */ nop -/* DC0004 80242D54 824200B4 */ lb $v0, 0xb4($s2) -/* DC0008 80242D58 1440003C */ bnez $v0, .L80242E4C -/* DC000C 80242D5C 0000102D */ daddu $v0, $zero, $zero -/* DC0010 80242D60 2402FFFB */ addiu $v0, $zero, -5 -/* DC0014 80242D64 00621024 */ and $v0, $v1, $v0 -/* DC0018 80242D68 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242D6C: -/* DC001C 80242D6C 8E830070 */ lw $v1, 0x70($s4) -/* DC0020 80242D70 2C62000F */ sltiu $v0, $v1, 0xf -/* DC0024 80242D74 10400034 */ beqz $v0, .L80242E48_DC00F8 -/* DC0028 80242D78 00031080 */ sll $v0, $v1, 2 -/* DC002C 80242D7C 3C018024 */ lui $at, %hi(jtbl_802470C8_DC4378) -/* DC0030 80242D80 00220821 */ addu $at, $at, $v0 -/* DC0034 80242D84 8C2270C8 */ lw $v0, %lo(jtbl_802470C8_DC4378)($at) -/* DC0038 80242D88 00400008 */ jr $v0 -/* DC003C 80242D8C 00000000 */ nop -.L80242D90_DC0040: -/* DC0040 80242D90 0280202D */ daddu $a0, $s4, $zero -/* DC0044 80242D94 0200282D */ daddu $a1, $s0, $zero -/* DC0048 80242D98 0C09065E */ jal omo_07_UnkNpcAIFunc23 -/* DC004C 80242D9C 0260302D */ daddu $a2, $s3, $zero -.L80242DA0_DC0050: -/* DC0050 80242DA0 0280202D */ daddu $a0, $s4, $zero -/* DC0054 80242DA4 0200282D */ daddu $a1, $s0, $zero -/* DC0058 80242DA8 0C0906CA */ jal omo_07_UnkNpcAIFunc35 -/* DC005C 80242DAC 0260302D */ daddu $a2, $s3, $zero -/* DC0060 80242DB0 08090B93 */ j .L80242E4C -/* DC0064 80242DB4 0000102D */ daddu $v0, $zero, $zero -.L80242DB8_DC0068: -/* DC0068 80242DB8 0280202D */ daddu $a0, $s4, $zero -/* DC006C 80242DBC 0200282D */ daddu $a1, $s0, $zero -/* DC0070 80242DC0 0C090854 */ jal dup_omo_07_UnkNpcAIFunc1 -/* DC0074 80242DC4 0260302D */ daddu $a2, $s3, $zero -.L80242DC8_DC0078: -/* DC0078 80242DC8 0280202D */ daddu $a0, $s4, $zero -/* DC007C 80242DCC 0200282D */ daddu $a1, $s0, $zero -/* DC0080 80242DD0 0C090884 */ jal omo_07_UnkFunc4 -/* DC0084 80242DD4 0260302D */ daddu $a2, $s3, $zero -/* DC0088 80242DD8 08090B93 */ j .L80242E4C -/* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero -.L80242DE0_DC0090: -/* DC0090 80242DE0 0280202D */ daddu $a0, $s4, $zero -/* DC0094 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* DC0098 80242DE8 0C090955 */ jal omo_07_UnkNpcAIFunc2 -/* DC009C 80242DEC 0260302D */ daddu $a2, $s3, $zero -.L80242DF0_DC00A0: -/* DC00A0 80242DF0 0280202D */ daddu $a0, $s4, $zero -/* DC00A4 80242DF4 0200282D */ daddu $a1, $s0, $zero -/* DC00A8 80242DF8 0C090973 */ jal func_802425CC_DBF87C -/* DC00AC 80242DFC 0260302D */ daddu $a2, $s3, $zero -/* DC00B0 80242E00 08090B93 */ j .L80242E4C -/* DC00B4 80242E04 0000102D */ daddu $v0, $zero, $zero -.L80242E08_DC00B8: -/* DC00B8 80242E08 0280202D */ daddu $a0, $s4, $zero -/* DC00BC 80242E0C 0200282D */ daddu $a1, $s0, $zero -/* DC00C0 80242E10 0C09098E */ jal omo_07_UnkNpcAIFunc14 -/* DC00C4 80242E14 0260302D */ daddu $a2, $s3, $zero -/* DC00C8 80242E18 08090B93 */ j .L80242E4C -/* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero -.L80242E20_DC00D0: -/* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero -/* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero -/* DC00D8 80242E28 0C0909DB */ jal omo_07_UnkNpcAIFunc3 -/* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero -/* DC00E0 80242E30 08090B93 */ j .L80242E4C -/* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero -.L80242E38_DC00E8: -/* DC00E8 80242E38 0280202D */ daddu $a0, $s4, $zero -/* DC00EC 80242E3C 0200282D */ daddu $a1, $s0, $zero -/* DC00F0 80242E40 0C0909F4 */ jal omo_07_UnkFunc6 -/* DC00F4 80242E44 0260302D */ daddu $a2, $s3, $zero -.L80242E48_DC00F8: -/* DC00F8 80242E48 0000102D */ daddu $v0, $zero, $zero -.L80242E4C: -/* DC00FC 80242E4C 8FBF0048 */ lw $ra, 0x48($sp) -/* DC0100 80242E50 8FB50044 */ lw $s5, 0x44($sp) -/* DC0104 80242E54 8FB40040 */ lw $s4, 0x40($sp) -/* DC0108 80242E58 8FB3003C */ lw $s3, 0x3c($sp) -/* DC010C 80242E5C 8FB20038 */ lw $s2, 0x38($sp) -/* DC0110 80242E60 8FB10034 */ lw $s1, 0x34($sp) -/* DC0114 80242E64 8FB00030 */ lw $s0, 0x30($sp) -/* DC0118 80242E68 03E00008 */ jr $ra -/* DC011C 80242E6C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s deleted file mode 100644 index 846c12120b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802400E4_DC44B4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DC44B4 -/* DC44B4 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DC44B8 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DC44BC 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DC44C0 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DC44C4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DC44C8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC44CC 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DC44D0 80240100 8E050000 */ lw $a1, ($s0) -/* DC44D4 80240104 0C0B210B */ jal evt_get_float_variable -/* DC44D8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DC44DC 8024010C 8E050000 */ lw $a1, ($s0) -/* DC44E0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DC44E4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DC44E8 80240118 0C0B210B */ jal evt_get_float_variable -/* DC44EC 8024011C 46000506 */ mov.s $f20, $f0 -/* DC44F0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DC44F4 80240124 00000000 */ nop -/* DC44F8 80240128 45000004 */ bc1f .L8024013C -/* DC44FC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DC4500 80240130 8E050000 */ lw $a1, ($s0) -/* DC4504 80240134 08090051 */ j .L80240144 -/* DC4508 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DC450C 8024013C 8E050000 */ lw $a1, ($s0) -/* DC4510 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DC4514 80240144 0C0B2026 */ jal evt_set_variable -/* DC4518 80240148 00000000 */ nop -/* DC451C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4520 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DC4524 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DC4528 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC452C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DC4530 80240160 03E00008 */ jr $ra -/* DC4534 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240168_DC4538.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240168_DC4538.s deleted file mode 100644 index 855642a221..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240168_DC4538.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DC4538 -/* DC4538 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC453C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DC4540 80240170 0080902D */ daddu $s2, $a0, $zero -/* DC4544 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DC4548 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DC454C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DC4550 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DC4554 80240184 8E050000 */ lw $a1, ($s0) -/* DC4558 80240188 0C0B1EAF */ jal evt_get_variable -/* DC455C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DC4560 80240190 8E050000 */ lw $a1, ($s0) -/* DC4564 80240194 26100004 */ addiu $s0, $s0, 4 -/* DC4568 80240198 0240202D */ daddu $a0, $s2, $zero -/* DC456C 8024019C 0C0B1EAF */ jal evt_get_variable -/* DC4570 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DC4574 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DC4578 802401A8 8E050000 */ lw $a1, ($s0) -/* DC457C 802401AC 0C0B1EAF */ jal evt_get_variable -/* DC4580 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DC4584 802401B4 02020018 */ mult $s0, $v0 -/* DC4588 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DC458C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DC4590 802401C0 00003012 */ mflo $a2 -/* DC4594 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DC4598 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DC459C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DC45A0 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DC45A4 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DC45A8 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DC45AC 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DC45B0 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DC45B4 802401E4 03E00008 */ jr $ra -/* DC45B8 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802401EC_DC45BC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802401EC_DC45BC.s deleted file mode 100644 index 46af586908..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_802401EC_DC45BC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DC45BC -/* DC45BC 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DC45C0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DC45C4 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DC45C8 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DC45CC 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DC45D0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DC45D4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DC45D8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC45DC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DC45E0 80240210 8E050000 */ lw $a1, ($s0) -/* DC45E4 80240214 0C0B210B */ jal evt_get_float_variable -/* DC45E8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DC45EC 8024021C 8E050000 */ lw $a1, ($s0) -/* DC45F0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DC45F4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DC45F8 80240228 0C0B210B */ jal evt_get_float_variable -/* DC45FC 8024022C 46000606 */ mov.s $f24, $f0 -/* DC4600 80240230 8E050000 */ lw $a1, ($s0) -/* DC4604 80240234 26100004 */ addiu $s0, $s0, 4 -/* DC4608 80240238 0220202D */ daddu $a0, $s1, $zero -/* DC460C 8024023C 0C0B210B */ jal evt_get_float_variable -/* DC4610 80240240 46000586 */ mov.s $f22, $f0 -/* DC4614 80240244 0220202D */ daddu $a0, $s1, $zero -/* DC4618 80240248 8E050000 */ lw $a1, ($s0) -/* DC461C 8024024C 0C0B210B */ jal evt_get_float_variable -/* DC4620 80240250 46000506 */ mov.s $f20, $f0 -/* DC4624 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DC4628 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DC462C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DC4630 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DC4634 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DC4638 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DC463C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DC4640 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DC4644 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DC4648 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DC464C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DC4650 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC4654 80240284 24020002 */ addiu $v0, $zero, 2 -/* DC4658 80240288 03E00008 */ jr $ra -/* DC465C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240290_DC4660.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240290_DC4660.s deleted file mode 100644 index 578e899e77..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240290_DC4660.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DC4660 -/* DC4660 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DC4664 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DC4668 80240298 0080882D */ daddu $s1, $a0, $zero -/* DC466C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DC4670 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DC4674 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DC4678 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DC467C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DC4680 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DC4684 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC4688 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DC468C 802402BC 8E050000 */ lw $a1, ($s0) -/* DC4690 802402C0 0C0B1EAF */ jal evt_get_variable -/* DC4694 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DC4698 802402C8 8E050000 */ lw $a1, ($s0) -/* DC469C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DC46A0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DC46A4 802402D4 0C0B210B */ jal evt_get_float_variable -/* DC46A8 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DC46AC 802402DC 8E050000 */ lw $a1, ($s0) -/* DC46B0 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DC46B4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DC46B8 802402E8 0C0B210B */ jal evt_get_float_variable -/* DC46BC 802402EC 46000686 */ mov.s $f26, $f0 -/* DC46C0 802402F0 8E050000 */ lw $a1, ($s0) -/* DC46C4 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DC46C8 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DC46CC 802402FC 0C0B210B */ jal evt_get_float_variable -/* DC46D0 80240300 46000606 */ mov.s $f24, $f0 -/* DC46D4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DC46D8 80240308 8E050000 */ lw $a1, ($s0) -/* DC46DC 8024030C 0C0B210B */ jal evt_get_float_variable -/* DC46E0 80240310 46000506 */ mov.s $f20, $f0 -/* DC46E4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DC46E8 80240318 0C00EAD2 */ jal get_npc_safe -/* DC46EC 8024031C 46000586 */ mov.s $f22, $f0 -/* DC46F0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DC46F4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DC46F8 80240328 4600D006 */ mov.s $f0, $f26 -/* DC46FC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DC4700 80240330 4600C086 */ mov.s $f2, $f24 -/* DC4704 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DC4708 80240338 4600A106 */ mov.s $f4, $f20 -/* DC470C 8024033C 8C830000 */ lw $v1, ($a0) -/* DC4710 80240340 3C050001 */ lui $a1, 1 -/* DC4714 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DC4718 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DC471C 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DC4720 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DC4724 80240354 00651825 */ or $v1, $v1, $a1 -/* DC4728 80240358 AC830000 */ sw $v1, ($a0) -/* DC472C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DC4730 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DC4734 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DC4738 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DC473C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DC4740 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DC4744 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DC4748 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC474C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DC4750 80240380 03E00008 */ jr $ra -/* DC4754 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240518_DC48E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240518_DC48E8.s deleted file mode 100644 index 6674da5a2a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240518_DC48E8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DC48E8 -/* DC48E8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DC48EC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DC48F0 80240520 8C620000 */ lw $v0, ($v1) -/* DC48F4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DC48F8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DC48FC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DC4900 80240530 10400002 */ beqz $v0, .L8024053C -/* DC4904 80240534 24020001 */ addiu $v0, $zero, 1 -/* DC4908 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DC490C 8024053C 8C620000 */ lw $v0, ($v1) -/* DC4910 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DC4914 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DC4918 80240548 10400002 */ beqz $v0, .L80240554 -/* DC491C 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DC4920 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DC4924 80240554 03E00008 */ jr $ra -/* DC4928 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s deleted file mode 100644 index 0e958a4eb2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024AB10_DD77E0 -.double 180.0 - -dlabel D_8024AB18_DD77E8 -.double 75.0 - -.section .text - -glabel func_80242358_DCF028 -/* DCF028 80242358 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCF02C 8024235C AFB10014 */ sw $s1, 0x14($sp) -/* DCF030 80242360 0080882D */ daddu $s1, $a0, $zero -/* DCF034 80242364 3C05800B */ lui $a1, %hi(gCameras) -/* DCF038 80242368 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* DCF03C 8024236C AFBF0020 */ sw $ra, 0x20($sp) -/* DCF040 80242370 AFB3001C */ sw $s3, 0x1c($sp) -/* DCF044 80242374 AFB20018 */ sw $s2, 0x18($sp) -/* DCF048 80242378 AFB00010 */ sw $s0, 0x10($sp) -/* DCF04C 8024237C F7B40028 */ sdc1 $f20, 0x28($sp) -/* DCF050 80242380 8E330148 */ lw $s3, 0x148($s1) -/* DCF054 80242384 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* DCF058 80242388 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* DCF05C 8024238C 8E30000C */ lw $s0, 0xc($s1) -/* DCF060 80242390 00031080 */ sll $v0, $v1, 2 -/* DCF064 80242394 00431021 */ addu $v0, $v0, $v1 -/* DCF068 80242398 00021080 */ sll $v0, $v0, 2 -/* DCF06C 8024239C 00431023 */ subu $v0, $v0, $v1 -/* DCF070 802423A0 000218C0 */ sll $v1, $v0, 3 -/* DCF074 802423A4 00431021 */ addu $v0, $v0, $v1 -/* DCF078 802423A8 000210C0 */ sll $v0, $v0, 3 -/* DCF07C 802423AC 86640008 */ lh $a0, 8($s3) -/* DCF080 802423B0 0C00EABB */ jal get_npc_unsafe -/* DCF084 802423B4 00459021 */ addu $s2, $v0, $a1 -/* DCF088 802423B8 0220202D */ daddu $a0, $s1, $zero -/* DCF08C 802423BC 8E050000 */ lw $a1, ($s0) -/* DCF090 802423C0 0C0B1EAF */ jal evt_get_variable -/* DCF094 802423C4 0040802D */ daddu $s0, $v0, $zero -/* DCF098 802423C8 0260202D */ daddu $a0, $s3, $zero -/* DCF09C 802423CC 8C460024 */ lw $a2, 0x24($v0) -/* DCF0A0 802423D0 8C470028 */ lw $a3, 0x28($v0) -/* DCF0A4 802423D4 0C0124FB */ jal func_800493EC -/* DCF0A8 802423D8 0000282D */ daddu $a1, $zero, $zero -/* DCF0AC 802423DC 10400052 */ beqz $v0, .L80242528 -/* DCF0B0 802423E0 2402FFFF */ addiu $v0, $zero, -1 -/* DCF0B4 802423E4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* DCF0B8 802423E8 C60E000C */ lwc1 $f14, 0xc($s0) -/* DCF0BC 802423EC 3C014387 */ lui $at, 0x4387 -/* DCF0C0 802423F0 4481A000 */ mtc1 $at, $f20 -/* DCF0C4 802423F4 0C00A70A */ jal get_clamped_angle_diff -/* DCF0C8 802423F8 00000000 */ nop -/* DCF0CC 802423FC 0C00A6C9 */ jal clamp_angle -/* DCF0D0 80242400 46000306 */ mov.s $f12, $f0 -/* DCF0D4 80242404 3C018025 */ lui $at, %hi(D_8024AB10_DD77E0) -/* DCF0D8 80242408 D422AB10 */ ldc1 $f2, %lo(D_8024AB10_DD77E0)($at) -/* DCF0DC 8024240C 46000021 */ cvt.d.s $f0, $f0 -/* DCF0E0 80242410 4622003C */ c.lt.d $f0, $f2 -/* DCF0E4 80242414 00000000 */ nop -/* DCF0E8 80242418 45000003 */ bc1f .L80242428 -/* DCF0EC 8024241C 00000000 */ nop -/* DCF0F0 80242420 3C0142B4 */ lui $at, 0x42b4 -/* DCF0F4 80242424 4481A000 */ mtc1 $at, $f20 -.L80242428: -/* DCF0F8 80242428 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* DCF0FC 8024242C 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* DCF100 80242430 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCF104 80242434 8E220000 */ lw $v0, ($s1) -/* DCF108 80242438 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCF10C 8024243C 8C460028 */ lw $a2, 0x28($v0) -/* DCF110 80242440 0C00A720 */ jal atan2 -/* DCF114 80242444 8C470030 */ lw $a3, 0x30($v0) -/* DCF118 80242448 4600A306 */ mov.s $f12, $f20 -/* DCF11C 8024244C 0C00A70A */ jal get_clamped_angle_diff -/* DCF120 80242450 46000386 */ mov.s $f14, $f0 -/* DCF124 80242454 46000005 */ abs.s $f0, $f0 -/* DCF128 80242458 3C018025 */ lui $at, %hi(D_8024AB18_DD77E8) -/* DCF12C 8024245C D422AB18 */ ldc1 $f2, %lo(D_8024AB18_DD77E8)($at) -/* DCF130 80242460 46000021 */ cvt.d.s $f0, $f0 -/* DCF134 80242464 4620103C */ c.lt.d $f2, $f0 -/* DCF138 80242468 00000000 */ nop -/* DCF13C 8024246C 4501002E */ bc1t .L80242528 -/* DCF140 80242470 2402FFFF */ addiu $v0, $zero, -1 -/* DCF144 80242474 8E220000 */ lw $v0, ($s1) -/* DCF148 80242478 C600003C */ lwc1 $f0, 0x3c($s0) -/* DCF14C 8024247C C442002C */ lwc1 $f2, 0x2c($v0) -/* DCF150 80242480 860200A8 */ lh $v0, 0xa8($s0) -/* DCF154 80242484 46020001 */ sub.s $f0, $f0, $f2 -/* DCF158 80242488 44821000 */ mtc1 $v0, $f2 -/* DCF15C 8024248C 00000000 */ nop -/* DCF160 80242490 468010A1 */ cvt.d.w $f2, $f2 -/* DCF164 80242494 46221080 */ add.d $f2, $f2, $f2 -/* DCF168 80242498 46000005 */ abs.s $f0, $f0 -/* DCF16C 8024249C 46000021 */ cvt.d.s $f0, $f0 -/* DCF170 802424A0 4620103E */ c.le.d $f2, $f0 -/* DCF174 802424A4 00000000 */ nop -/* DCF178 802424A8 4501001F */ bc1t .L80242528 -/* DCF17C 802424AC 2402FFFF */ addiu $v0, $zero, -1 -/* DCF180 802424B0 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* DCF184 802424B4 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* DCF188 802424B8 24020009 */ addiu $v0, $zero, 9 -/* DCF18C 802424BC 10620019 */ beq $v1, $v0, .L80242524 -/* DCF190 802424C0 24020007 */ addiu $v0, $zero, 7 -/* DCF194 802424C4 14620005 */ bne $v1, $v0, .L802424DC -/* DCF198 802424C8 2402FFFF */ addiu $v0, $zero, -1 -/* DCF19C 802424CC 0809094A */ j .L80242528 -/* DCF1A0 802424D0 00000000 */ nop -.L802424D4: -/* DCF1A4 802424D4 0809094A */ j .L80242528 -/* DCF1A8 802424D8 0240102D */ daddu $v0, $s2, $zero -.L802424DC: -/* DCF1AC 802424DC 8E620078 */ lw $v0, 0x78($s3) -/* DCF1B0 802424E0 18400010 */ blez $v0, .L80242524 -/* DCF1B4 802424E4 0000882D */ daddu $s1, $zero, $zero -.L802424E8: -/* DCF1B8 802424E8 86620008 */ lh $v0, 8($s3) -/* DCF1BC 802424EC 00511021 */ addu $v0, $v0, $s1 -/* DCF1C0 802424F0 24520001 */ addiu $s2, $v0, 1 -/* DCF1C4 802424F4 0C00FB3A */ jal get_enemy -/* DCF1C8 802424F8 0240202D */ daddu $a0, $s2, $zero -/* DCF1CC 802424FC 0240202D */ daddu $a0, $s2, $zero -/* DCF1D0 80242500 0C00EABB */ jal get_npc_unsafe -/* DCF1D4 80242504 0040802D */ daddu $s0, $v0, $zero -/* DCF1D8 80242508 8E02006C */ lw $v0, 0x6c($s0) -/* DCF1DC 8024250C 1040FFF1 */ beqz $v0, .L802424D4 -/* DCF1E0 80242510 26310001 */ addiu $s1, $s1, 1 -/* DCF1E4 80242514 8E620078 */ lw $v0, 0x78($s3) -/* DCF1E8 80242518 0222102A */ slt $v0, $s1, $v0 -/* DCF1EC 8024251C 1440FFF2 */ bnez $v0, .L802424E8 -/* DCF1F0 80242520 00000000 */ nop -.L80242524: -/* DCF1F4 80242524 2402FFFF */ addiu $v0, $zero, -1 -.L80242528: -/* DCF1F8 80242528 8FBF0020 */ lw $ra, 0x20($sp) -/* DCF1FC 8024252C 8FB3001C */ lw $s3, 0x1c($sp) -/* DCF200 80242530 8FB20018 */ lw $s2, 0x18($sp) -/* DCF204 80242534 8FB10014 */ lw $s1, 0x14($sp) -/* DCF208 80242538 8FB00010 */ lw $s0, 0x10($sp) -/* DCF20C 8024253C D7B40028 */ ldc1 $f20, 0x28($sp) -/* DCF210 80242540 03E00008 */ jr $ra -/* DCF214 80242544 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s deleted file mode 100644 index a2dd37526f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242548_DCF218 -/* DCF218 80242548 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DCF21C 8024254C AFB20038 */ sw $s2, 0x38($sp) -/* DCF220 80242550 0080902D */ daddu $s2, $a0, $zero -/* DCF224 80242554 AFB00030 */ sw $s0, 0x30($sp) -/* DCF228 80242558 AFBF003C */ sw $ra, 0x3c($sp) -/* DCF22C 8024255C AFB10034 */ sw $s1, 0x34($sp) -/* DCF230 80242560 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DCF234 80242564 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DCF238 80242568 8E510148 */ lw $s1, 0x148($s2) -/* DCF23C 8024256C 4485A000 */ mtc1 $a1, $f20 -/* DCF240 80242570 86240008 */ lh $a0, 8($s1) -/* DCF244 80242574 4486B000 */ mtc1 $a2, $f22 -/* DCF248 80242578 0C00EABB */ jal get_npc_unsafe -/* DCF24C 8024257C 00E0802D */ daddu $s0, $a3, $zero -/* DCF250 80242580 0200202D */ daddu $a0, $s0, $zero -/* DCF254 80242584 0220282D */ daddu $a1, $s1, $zero -/* DCF258 80242588 24030001 */ addiu $v1, $zero, 1 -/* DCF25C 8024258C 4406A000 */ mfc1 $a2, $f20 -/* DCF260 80242590 4407B000 */ mfc1 $a3, $f22 -/* DCF264 80242594 0040802D */ daddu $s0, $v0, $zero -/* DCF268 80242598 0C01242D */ jal func_800490B4 -/* DCF26C 8024259C AFA30010 */ sw $v1, 0x10($sp) -/* DCF270 802425A0 1440001D */ bnez $v0, .L80242618 -/* DCF274 802425A4 24040002 */ addiu $a0, $zero, 2 -/* DCF278 802425A8 0200282D */ daddu $a1, $s0, $zero -/* DCF27C 802425AC 0000302D */ daddu $a2, $zero, $zero -/* DCF280 802425B0 860300A8 */ lh $v1, 0xa8($s0) -/* DCF284 802425B4 3C013F80 */ lui $at, 0x3f80 -/* DCF288 802425B8 44810000 */ mtc1 $at, $f0 -/* DCF28C 802425BC 3C014000 */ lui $at, 0x4000 -/* DCF290 802425C0 44811000 */ mtc1 $at, $f2 -/* DCF294 802425C4 3C01C1A0 */ lui $at, 0xc1a0 -/* DCF298 802425C8 44812000 */ mtc1 $at, $f4 -/* DCF29C 802425CC 2402000F */ addiu $v0, $zero, 0xf -/* DCF2A0 802425D0 AFA2001C */ sw $v0, 0x1c($sp) -/* DCF2A4 802425D4 44833000 */ mtc1 $v1, $f6 -/* DCF2A8 802425D8 00000000 */ nop -/* DCF2AC 802425DC 468031A0 */ cvt.s.w $f6, $f6 -/* DCF2B0 802425E0 44073000 */ mfc1 $a3, $f6 -/* DCF2B4 802425E4 27A20028 */ addiu $v0, $sp, 0x28 -/* DCF2B8 802425E8 AFA20020 */ sw $v0, 0x20($sp) -/* DCF2BC 802425EC E7A00010 */ swc1 $f0, 0x10($sp) -/* DCF2C0 802425F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCF2C4 802425F4 0C01BFA4 */ jal fx_emote -/* DCF2C8 802425F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* DCF2CC 802425FC 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF2D0 80242600 8C430000 */ lw $v1, ($v0) -/* DCF2D4 80242604 24020014 */ addiu $v0, $zero, 0x14 -/* DCF2D8 80242608 A602008E */ sh $v0, 0x8e($s0) -/* DCF2DC 8024260C 24020021 */ addiu $v0, $zero, 0x21 -/* DCF2E0 80242610 0809099A */ j .L80242668 -/* DCF2E4 80242614 AE030028 */ sw $v1, 0x28($s0) -.L80242618: -/* DCF2E8 80242618 0C0908D6 */ jal func_80242358_DCF028 -/* DCF2EC 8024261C 0240202D */ daddu $a0, $s2, $zero -/* DCF2F0 80242620 0040202D */ daddu $a0, $v0, $zero -/* DCF2F4 80242624 2402FFFF */ addiu $v0, $zero, -1 -/* DCF2F8 80242628 10820010 */ beq $a0, $v0, .L8024266C -/* DCF2FC 8024262C 00000000 */ nop -/* DCF300 80242630 0C00FB3A */ jal get_enemy -/* DCF304 80242634 00000000 */ nop -/* DCF308 80242638 8C42006C */ lw $v0, 0x6c($v0) -/* DCF30C 8024263C 1440000B */ bnez $v0, .L8024266C -/* DCF310 80242640 00000000 */ nop -/* DCF314 80242644 8602008C */ lh $v0, 0x8c($s0) -/* DCF318 80242648 14400008 */ bnez $v0, .L8024266C -/* DCF31C 8024264C 00000000 */ nop -/* DCF320 80242650 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF324 80242654 8C420020 */ lw $v0, 0x20($v0) -/* DCF328 80242658 AE020028 */ sw $v0, 0x28($s0) -/* DCF32C 8024265C 96220072 */ lhu $v0, 0x72($s1) -/* DCF330 80242660 A602008E */ sh $v0, 0x8e($s0) -/* DCF334 80242664 2402001E */ addiu $v0, $zero, 0x1e -.L80242668: -/* DCF338 80242668 AE420070 */ sw $v0, 0x70($s2) -.L8024266C: -/* DCF33C 8024266C 8FBF003C */ lw $ra, 0x3c($sp) -/* DCF340 80242670 8FB20038 */ lw $s2, 0x38($sp) -/* DCF344 80242674 8FB10034 */ lw $s1, 0x34($sp) -/* DCF348 80242678 8FB00030 */ lw $s0, 0x30($sp) -/* DCF34C 8024267C D7B60048 */ ldc1 $f22, 0x48($sp) -/* DCF350 80242680 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DCF354 80242684 03E00008 */ jr $ra -/* DCF358 80242688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s deleted file mode 100644 index a8162eb654..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024268C_DCF35C -/* DCF35C 8024268C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DCF360 80242690 AFB20038 */ sw $s2, 0x38($sp) -/* DCF364 80242694 0080902D */ daddu $s2, $a0, $zero -/* DCF368 80242698 AFBF003C */ sw $ra, 0x3c($sp) -/* DCF36C 8024269C AFB10034 */ sw $s1, 0x34($sp) -/* DCF370 802426A0 AFB00030 */ sw $s0, 0x30($sp) -/* DCF374 802426A4 8E510148 */ lw $s1, 0x148($s2) -/* DCF378 802426A8 0C00EABB */ jal get_npc_unsafe -/* DCF37C 802426AC 86240008 */ lh $a0, 8($s1) -/* DCF380 802426B0 0040802D */ daddu $s0, $v0, $zero -/* DCF384 802426B4 9602008E */ lhu $v0, 0x8e($s0) -/* DCF388 802426B8 2442FFFF */ addiu $v0, $v0, -1 -/* DCF38C 802426BC A602008E */ sh $v0, 0x8e($s0) -/* DCF390 802426C0 00021400 */ sll $v0, $v0, 0x10 -/* DCF394 802426C4 1C40002B */ bgtz $v0, .L80242774 -/* DCF398 802426C8 00000000 */ nop -/* DCF39C 802426CC 0C0908D6 */ jal func_80242358_DCF028 -/* DCF3A0 802426D0 0240202D */ daddu $a0, $s2, $zero -/* DCF3A4 802426D4 0040202D */ daddu $a0, $v0, $zero -/* DCF3A8 802426D8 0481001A */ bgez $a0, .L80242744 -/* DCF3AC 802426DC 2402000F */ addiu $v0, $zero, 0xf -/* DCF3B0 802426E0 24040002 */ addiu $a0, $zero, 2 -/* DCF3B4 802426E4 860300A8 */ lh $v1, 0xa8($s0) -/* DCF3B8 802426E8 AFA2001C */ sw $v0, 0x1c($sp) -/* DCF3BC 802426EC 27A20028 */ addiu $v0, $sp, 0x28 -/* DCF3C0 802426F0 0200282D */ daddu $a1, $s0, $zero -/* DCF3C4 802426F4 3C013F80 */ lui $at, 0x3f80 -/* DCF3C8 802426F8 44810000 */ mtc1 $at, $f0 -/* DCF3CC 802426FC 3C014000 */ lui $at, 0x4000 -/* DCF3D0 80242700 44811000 */ mtc1 $at, $f2 -/* DCF3D4 80242704 3C01C1A0 */ lui $at, 0xc1a0 -/* DCF3D8 80242708 44812000 */ mtc1 $at, $f4 -/* DCF3DC 8024270C 44833000 */ mtc1 $v1, $f6 -/* DCF3E0 80242710 00000000 */ nop -/* DCF3E4 80242714 468031A0 */ cvt.s.w $f6, $f6 -/* DCF3E8 80242718 44073000 */ mfc1 $a3, $f6 -/* DCF3EC 8024271C 0000302D */ daddu $a2, $zero, $zero -/* DCF3F0 80242720 AFA20020 */ sw $v0, 0x20($sp) -/* DCF3F4 80242724 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCF3F8 80242728 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCF3FC 8024272C 0C01BFA4 */ jal fx_emote -/* DCF400 80242730 E7A40018 */ swc1 $f4, 0x18($sp) -/* DCF404 80242734 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF408 80242738 8C420000 */ lw $v0, ($v0) -/* DCF40C 8024273C 080909D9 */ j .L80242764 -/* DCF410 80242740 AE020028 */ sw $v0, 0x28($s0) -.L80242744: -/* DCF414 80242744 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF418 80242748 8C420024 */ lw $v0, 0x24($v0) -/* DCF41C 8024274C 0C00FB3A */ jal get_enemy -/* DCF420 80242750 AE020028 */ sw $v0, 0x28($s0) -/* DCF424 80242754 86240008 */ lh $a0, 8($s1) -/* DCF428 80242758 24030001 */ addiu $v1, $zero, 1 -/* DCF42C 8024275C AC43006C */ sw $v1, 0x6c($v0) -/* DCF430 80242760 AC44007C */ sw $a0, 0x7c($v0) -.L80242764: -/* DCF434 80242764 96220076 */ lhu $v0, 0x76($s1) -/* DCF438 80242768 A602008E */ sh $v0, 0x8e($s0) -/* DCF43C 8024276C 24020021 */ addiu $v0, $zero, 0x21 -/* DCF440 80242770 AE420070 */ sw $v0, 0x70($s2) -.L80242774: -/* DCF444 80242774 8FBF003C */ lw $ra, 0x3c($sp) -/* DCF448 80242778 8FB20038 */ lw $s2, 0x38($sp) -/* DCF44C 8024277C 8FB10034 */ lw $s1, 0x34($sp) -/* DCF450 80242780 8FB00030 */ lw $s0, 0x30($sp) -/* DCF454 80242784 03E00008 */ jr $ra -/* DCF458 80242788 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s deleted file mode 100644 index 7c6b78d9cf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8024AB38_DD7808 -.word .L802433DC_DD00AC, .L802433EC_DD00BC, .L80243404_DD00D4, .L80243414_DD00E4, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L8024342C_DD00FC, .L8024343C_DD010C, .L80243454_DD0124, .L802434CC_DD019C, .L802434E4_DD01B4, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L802434FC_DD01CC, .L8024350C_DD01DC, .L8024351C_DD01EC, .L8024352C_DD01FC, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L80243544_DD0214, .L8024353C_DD020C, 0, 0 - -.section .text - -glabel func_8024324C_DCFF1C -/* DCFF1C 8024324C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DCFF20 80243250 AFB3003C */ sw $s3, 0x3c($sp) -/* DCFF24 80243254 0080982D */ daddu $s3, $a0, $zero -/* DCFF28 80243258 AFBF0048 */ sw $ra, 0x48($sp) -/* DCFF2C 8024325C AFB50044 */ sw $s5, 0x44($sp) -/* DCFF30 80243260 AFB40040 */ sw $s4, 0x40($sp) -/* DCFF34 80243264 AFB20038 */ sw $s2, 0x38($sp) -/* DCFF38 80243268 AFB10034 */ sw $s1, 0x34($sp) -/* DCFF3C 8024326C AFB00030 */ sw $s0, 0x30($sp) -/* DCFF40 80243270 8E720148 */ lw $s2, 0x148($s3) -/* DCFF44 80243274 86440008 */ lh $a0, 8($s2) -/* DCFF48 80243278 8E70000C */ lw $s0, 0xc($s3) -/* DCFF4C 8024327C 0C00EABB */ jal get_npc_unsafe -/* DCFF50 80243280 00A0882D */ daddu $s1, $a1, $zero -/* DCFF54 80243284 0260202D */ daddu $a0, $s3, $zero -/* DCFF58 80243288 8E050000 */ lw $a1, ($s0) -/* DCFF5C 8024328C 0C0B1EAF */ jal evt_get_variable -/* DCFF60 80243290 0040A02D */ daddu $s4, $v0, $zero -/* DCFF64 80243294 AFA00010 */ sw $zero, 0x10($sp) -/* DCFF68 80243298 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF6C 8024329C 8C630030 */ lw $v1, 0x30($v1) -/* DCFF70 802432A0 AFA30014 */ sw $v1, 0x14($sp) -/* DCFF74 802432A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF78 802432A8 8C63001C */ lw $v1, 0x1c($v1) -/* DCFF7C 802432AC AFA30018 */ sw $v1, 0x18($sp) -/* DCFF80 802432B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF84 802432B4 8C630024 */ lw $v1, 0x24($v1) -/* DCFF88 802432B8 AFA3001C */ sw $v1, 0x1c($sp) -/* DCFF8C 802432BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF90 802432C0 8C630028 */ lw $v1, 0x28($v1) -/* DCFF94 802432C4 27B50010 */ addiu $s5, $sp, 0x10 -/* DCFF98 802432C8 AFA30020 */ sw $v1, 0x20($sp) -/* DCFF9C 802432CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFFA0 802432D0 3C014220 */ lui $at, 0x4220 -/* DCFFA4 802432D4 44810000 */ mtc1 $at, $f0 -/* DCFFA8 802432D8 8C63002C */ lw $v1, 0x2c($v1) -/* DCFFAC 802432DC 0040802D */ daddu $s0, $v0, $zero -/* DCFFB0 802432E0 E7A00028 */ swc1 $f0, 0x28($sp) -/* DCFFB4 802432E4 A7A0002C */ sh $zero, 0x2c($sp) -/* DCFFB8 802432E8 16200005 */ bnez $s1, .L80243300 -/* DCFFBC 802432EC AFA30024 */ sw $v1, 0x24($sp) -/* DCFFC0 802432F0 8E4200B0 */ lw $v0, 0xb0($s2) -/* DCFFC4 802432F4 30420004 */ andi $v0, $v0, 4 -/* DCFFC8 802432F8 1040002F */ beqz $v0, .L802433B8 -/* DCFFCC 802432FC 00000000 */ nop -.L80243300: -/* DCFFD0 80243300 2404F7FF */ addiu $a0, $zero, -0x801 -/* DCFFD4 80243304 AE600070 */ sw $zero, 0x70($s3) -/* DCFFD8 80243308 A680008E */ sh $zero, 0x8e($s4) -/* DCFFDC 8024330C 8E4200CC */ lw $v0, 0xcc($s2) -/* DCFFE0 80243310 8E830000 */ lw $v1, ($s4) -/* DCFFE4 80243314 8C420000 */ lw $v0, ($v0) -/* DCFFE8 80243318 00641824 */ and $v1, $v1, $a0 -/* DCFFEC 8024331C AE830000 */ sw $v1, ($s4) -/* DCFFF0 80243320 AE820028 */ sw $v0, 0x28($s4) -/* DCFFF4 80243324 8E4200D0 */ lw $v0, 0xd0($s2) -/* DCFFF8 80243328 8C420034 */ lw $v0, 0x34($v0) -/* DCFFFC 8024332C 54400005 */ bnel $v0, $zero, .L80243344 -/* DD0000 80243330 2402FDFF */ addiu $v0, $zero, -0x201 -/* DD0004 80243334 34620200 */ ori $v0, $v1, 0x200 -/* DD0008 80243338 2403FFF7 */ addiu $v1, $zero, -9 -/* DD000C 8024333C 08090CD3 */ j .L8024334C -/* DD0010 80243340 00431024 */ and $v0, $v0, $v1 -.L80243344: -/* DD0014 80243344 00621024 */ and $v0, $v1, $v0 -/* DD0018 80243348 34420008 */ ori $v0, $v0, 8 -.L8024334C: -/* DD001C 8024334C AE820000 */ sw $v0, ($s4) -/* DD0020 80243350 8E4200B0 */ lw $v0, 0xb0($s2) -/* DD0024 80243354 30420004 */ andi $v0, $v0, 4 -/* DD0028 80243358 10400008 */ beqz $v0, .L8024337C -/* DD002C 8024335C 24020063 */ addiu $v0, $zero, 0x63 -/* DD0030 80243360 AE620070 */ sw $v0, 0x70($s3) -/* DD0034 80243364 AE600074 */ sw $zero, 0x74($s3) -/* DD0038 80243368 8E4200B0 */ lw $v0, 0xb0($s2) -/* DD003C 8024336C 2403FFFB */ addiu $v1, $zero, -5 -/* DD0040 80243370 00431024 */ and $v0, $v0, $v1 -/* DD0044 80243374 08090CE5 */ j .L80243394 -/* DD0048 80243378 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024337C: -/* DD004C 8024337C 8E420000 */ lw $v0, ($s2) -/* DD0050 80243380 3C034000 */ lui $v1, 0x4000 -/* DD0054 80243384 00431024 */ and $v0, $v0, $v1 -/* DD0058 80243388 10400002 */ beqz $v0, .L80243394 -/* DD005C 8024338C 2402000C */ addiu $v0, $zero, 0xc -/* DD0060 80243390 AE620070 */ sw $v0, 0x70($s3) -.L80243394: -/* DD0064 80243394 3C05BFFF */ lui $a1, 0xbfff -/* DD0068 80243398 34A5FFFF */ ori $a1, $a1, 0xffff -/* DD006C 8024339C 2404FFFB */ addiu $a0, $zero, -5 -/* DD0070 802433A0 8E4200B0 */ lw $v0, 0xb0($s2) -/* DD0074 802433A4 8E430000 */ lw $v1, ($s2) -/* DD0078 802433A8 00441024 */ and $v0, $v0, $a0 -/* DD007C 802433AC 00651824 */ and $v1, $v1, $a1 -/* DD0080 802433B0 AE4200B0 */ sw $v0, 0xb0($s2) -/* DD0084 802433B4 AE430000 */ sw $v1, ($s2) -.L802433B8: -/* DD0088 802433B8 8E630070 */ lw $v1, 0x70($s3) -/* DD008C 802433BC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DD0090 802433C0 10400060 */ beqz $v0, .L80243544_DD0214 -/* DD0094 802433C4 00031080 */ sll $v0, $v1, 2 -/* DD0098 802433C8 3C018025 */ lui $at, %hi(jtbl_8024AB38_DD7808) -/* DD009C 802433CC 00220821 */ addu $at, $at, $v0 -/* DD00A0 802433D0 8C22AB38 */ lw $v0, %lo(jtbl_8024AB38_DD7808)($at) -/* DD00A4 802433D4 00400008 */ jr $v0 -/* DD00A8 802433D8 00000000 */ nop -.L802433DC_DD00AC: -/* DD00AC 802433DC 0260202D */ daddu $a0, $s3, $zero -/* DD00B0 802433E0 0200282D */ daddu $a1, $s0, $zero -/* DD00B4 802433E4 0C012568 */ jal func_800495A0 -/* DD00B8 802433E8 02A0302D */ daddu $a2, $s5, $zero -.L802433EC_DD00BC: -/* DD00BC 802433EC 0260202D */ daddu $a0, $s3, $zero -/* DD00C0 802433F0 0200282D */ daddu $a1, $s0, $zero -/* DD00C4 802433F4 0C0125AE */ jal func_800496B8 -/* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero -/* DD00CC 802433FC 08090D51 */ j .L80243544_DD0214 -/* DD00D0 80243400 00000000 */ nop -.L80243404_DD00D4: -/* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero -/* DD00D8 80243408 0200282D */ daddu $a1, $s0, $zero -/* DD00DC 8024340C 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DD00E0 80243410 02A0302D */ daddu $a2, $s5, $zero -.L80243414_DD00E4: -/* DD00E4 80243414 0260202D */ daddu $a0, $s3, $zero -/* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero -/* DD00EC 8024341C 0C012701 */ jal func_80049C04 -/* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero -/* DD00F4 80243424 08090D51 */ j .L80243544_DD0214 -/* DD00F8 80243428 00000000 */ nop -.L8024342C_DD00FC: -/* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero -/* DD0100 80243430 0200282D */ daddu $a1, $s0, $zero -/* DD0104 80243434 0C01278F */ jal func_80049E3C -/* DD0108 80243438 02A0302D */ daddu $a2, $s5, $zero -.L8024343C_DD010C: -/* DD010C 8024343C 0260202D */ daddu $a0, $s3, $zero -/* DD0110 80243440 0200282D */ daddu $a1, $s0, $zero -/* DD0114 80243444 0C0127B3 */ jal func_80049ECC -/* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero -/* DD011C 8024344C 08090D51 */ j .L80243544_DD0214 -/* DD0120 80243450 00000000 */ nop -.L80243454_DD0124: -/* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DD0128 80243458 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DD012C 8024345C C68C0038 */ lwc1 $f12, 0x38($s4) -/* DD0130 80243460 C68E0040 */ lwc1 $f14, 0x40($s4) -/* DD0134 80243464 8C460028 */ lw $a2, 0x28($v0) -/* DD0138 80243468 0C00A7B5 */ jal dist2D -/* DD013C 8024346C 8C470030 */ lw $a3, 0x30($v0) -/* DD0140 80243470 8E42006C */ lw $v0, 0x6c($s2) -/* DD0144 80243474 10400008 */ beqz $v0, .L80243498 -/* DD0148 80243478 46000086 */ mov.s $f2, $f0 -/* DD014C 8024347C 44820000 */ mtc1 $v0, $f0 -/* DD0150 80243480 00000000 */ nop -/* DD0154 80243484 46800020 */ cvt.s.w $f0, $f0 -/* DD0158 80243488 4602003C */ c.lt.s $f0, $f2 -/* DD015C 8024348C 00000000 */ nop -/* DD0160 80243490 4500000B */ bc1f .L802434C0 -/* DD0164 80243494 0260202D */ daddu $a0, $s3, $zero -.L80243498: -/* DD0168 80243498 0260202D */ daddu $a0, $s3, $zero -/* DD016C 8024349C 8E050024 */ lw $a1, 0x24($s0) -/* DD0170 802434A0 8E060028 */ lw $a2, 0x28($s0) -/* DD0174 802434A4 0C090952 */ jal func_80242548_DCF218 -/* DD0178 802434A8 02A0382D */ daddu $a3, $s5, $zero -/* DD017C 802434AC 8E630070 */ lw $v1, 0x70($s3) -/* DD0180 802434B0 2402000C */ addiu $v0, $zero, 0xc -/* DD0184 802434B4 14620023 */ bne $v1, $v0, .L80243544_DD0214 -/* DD0188 802434B8 00000000 */ nop -/* DD018C 802434BC 0260202D */ daddu $a0, $s3, $zero -.L802434C0: -/* DD0190 802434C0 0200282D */ daddu $a1, $s0, $zero -/* DD0194 802434C4 0C0127DF */ jal func_80049F7C -/* DD0198 802434C8 02A0302D */ daddu $a2, $s5, $zero -.L802434CC_DD019C: -/* DD019C 802434CC 0260202D */ daddu $a0, $s3, $zero -/* DD01A0 802434D0 0200282D */ daddu $a1, $s0, $zero -/* DD01A4 802434D4 0C012849 */ jal func_8004A124 -/* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero -/* DD01AC 802434DC 08090D51 */ j .L80243544_DD0214 -/* DD01B0 802434E0 00000000 */ nop -.L802434E4_DD01B4: -/* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero -/* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero -/* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 -/* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero -/* DD01C4 802434F4 08090D51 */ j .L80243544_DD0214 -/* DD01C8 802434F8 00000000 */ nop -.L802434FC_DD01CC: -/* DD01CC 802434FC 0C0909A3 */ jal func_8024268C_DCF35C -/* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero -/* DD01D4 80243504 08090D51 */ j .L80243544_DD0214 -/* DD01D8 80243508 00000000 */ nop -.L8024350C_DD01DC: -/* DD01DC 8024350C 0C0909E3 */ jal omo_09_UnkSetDurationFunc -/* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero -/* DD01E4 80243514 08090D51 */ j .L80243544_DD0214 -/* DD01E8 80243518 00000000 */ nop -.L8024351C_DD01EC: -/* DD01EC 8024351C 0C0909F4 */ jal omo_09_UnkNpcAIFunc9 -/* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero -/* DD01F4 80243524 08090D51 */ j .L80243544_DD0214 -/* DD01F8 80243528 00000000 */ nop -.L8024352C_DD01FC: -/* DD01FC 8024352C 0C090A1C */ jal omo_09_UnkDurationCheck -/* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero -/* DD0204 80243534 08090D51 */ j .L80243544_DD0214 -/* DD0208 80243538 00000000 */ nop -.L8024353C_DD020C: -/* DD020C 8024353C 0C0129CF */ jal func_8004A73C -/* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero -.L80243544_DD0214: -/* DD0214 80243544 8FBF0048 */ lw $ra, 0x48($sp) -/* DD0218 80243548 8FB50044 */ lw $s5, 0x44($sp) -/* DD021C 8024354C 8FB40040 */ lw $s4, 0x40($sp) -/* DD0220 80243550 8FB3003C */ lw $s3, 0x3c($sp) -/* DD0224 80243554 8FB20038 */ lw $s2, 0x38($sp) -/* DD0228 80243558 8FB10034 */ lw $s1, 0x34($sp) -/* DD022C 8024355C 8FB00030 */ lw $s0, 0x30($sp) -/* DD0230 80243560 0000102D */ daddu $v0, $zero, $zero -/* DD0234 80243564 03E00008 */ jr $ra -/* DD0238 80243568 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s b/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s deleted file mode 100644 index 75e48f1ae6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802400E4_DD7A94.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DD7A94 -/* DD7A94 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DD7A98 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DD7A9C 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DD7AA0 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DD7AA4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DD7AA8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD7AAC 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DD7AB0 80240100 8E050000 */ lw $a1, ($s0) -/* DD7AB4 80240104 0C0B210B */ jal evt_get_float_variable -/* DD7AB8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DD7ABC 8024010C 8E050000 */ lw $a1, ($s0) -/* DD7AC0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DD7AC4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DD7AC8 80240118 0C0B210B */ jal evt_get_float_variable -/* DD7ACC 8024011C 46000506 */ mov.s $f20, $f0 -/* DD7AD0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DD7AD4 80240124 00000000 */ nop -/* DD7AD8 80240128 45000004 */ bc1f .L8024013C -/* DD7ADC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DD7AE0 80240130 8E050000 */ lw $a1, ($s0) -/* DD7AE4 80240134 08090051 */ j .L80240144 -/* DD7AE8 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DD7AEC 8024013C 8E050000 */ lw $a1, ($s0) -/* DD7AF0 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DD7AF4 80240144 0C0B2026 */ jal evt_set_variable -/* DD7AF8 80240148 00000000 */ nop -/* DD7AFC 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DD7B00 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DD7B04 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DD7B08 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD7B0C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DD7B10 80240160 03E00008 */ jr $ra -/* DD7B14 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240168_DD7B18.s b/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240168_DD7B18.s deleted file mode 100644 index aa6272260d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240168_DD7B18.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DD7B18 -/* DD7B18 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DD7B1C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DD7B20 80240170 0080902D */ daddu $s2, $a0, $zero -/* DD7B24 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DD7B28 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DD7B2C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DD7B30 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DD7B34 80240184 8E050000 */ lw $a1, ($s0) -/* DD7B38 80240188 0C0B1EAF */ jal evt_get_variable -/* DD7B3C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DD7B40 80240190 8E050000 */ lw $a1, ($s0) -/* DD7B44 80240194 26100004 */ addiu $s0, $s0, 4 -/* DD7B48 80240198 0240202D */ daddu $a0, $s2, $zero -/* DD7B4C 8024019C 0C0B1EAF */ jal evt_get_variable -/* DD7B50 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DD7B54 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DD7B58 802401A8 8E050000 */ lw $a1, ($s0) -/* DD7B5C 802401AC 0C0B1EAF */ jal evt_get_variable -/* DD7B60 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DD7B64 802401B4 02020018 */ mult $s0, $v0 -/* DD7B68 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DD7B6C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DD7B70 802401C0 00003012 */ mflo $a2 -/* DD7B74 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DD7B78 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DD7B7C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DD7B80 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DD7B84 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DD7B88 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DD7B8C 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DD7B90 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DD7B94 802401E4 03E00008 */ jr $ra -/* DD7B98 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802401EC_DD7B9C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802401EC_DD7B9C.s deleted file mode 100644 index 6149377160..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_802401EC_DD7B9C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DD7B9C -/* DD7B9C 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DD7BA0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DD7BA4 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DD7BA8 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DD7BAC 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DD7BB0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DD7BB4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DD7BB8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD7BBC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DD7BC0 80240210 8E050000 */ lw $a1, ($s0) -/* DD7BC4 80240214 0C0B210B */ jal evt_get_float_variable -/* DD7BC8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DD7BCC 8024021C 8E050000 */ lw $a1, ($s0) -/* DD7BD0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DD7BD4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DD7BD8 80240228 0C0B210B */ jal evt_get_float_variable -/* DD7BDC 8024022C 46000606 */ mov.s $f24, $f0 -/* DD7BE0 80240230 8E050000 */ lw $a1, ($s0) -/* DD7BE4 80240234 26100004 */ addiu $s0, $s0, 4 -/* DD7BE8 80240238 0220202D */ daddu $a0, $s1, $zero -/* DD7BEC 8024023C 0C0B210B */ jal evt_get_float_variable -/* DD7BF0 80240240 46000586 */ mov.s $f22, $f0 -/* DD7BF4 80240244 0220202D */ daddu $a0, $s1, $zero -/* DD7BF8 80240248 8E050000 */ lw $a1, ($s0) -/* DD7BFC 8024024C 0C0B210B */ jal evt_get_float_variable -/* DD7C00 80240250 46000506 */ mov.s $f20, $f0 -/* DD7C04 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DD7C08 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DD7C0C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DD7C10 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DD7C14 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DD7C18 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DD7C1C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DD7C20 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DD7C24 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DD7C28 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DD7C2C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DD7C30 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD7C34 80240284 24020002 */ addiu $v0, $zero, 2 -/* DD7C38 80240288 03E00008 */ jr $ra -/* DD7C3C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240290_DD7C40.s b/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240290_DD7C40.s deleted file mode 100644 index 58759b32a1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240290_DD7C40.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DD7C40 -/* DD7C40 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DD7C44 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DD7C48 80240298 0080882D */ daddu $s1, $a0, $zero -/* DD7C4C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DD7C50 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DD7C54 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DD7C58 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DD7C5C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DD7C60 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DD7C64 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD7C68 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DD7C6C 802402BC 8E050000 */ lw $a1, ($s0) -/* DD7C70 802402C0 0C0B1EAF */ jal evt_get_variable -/* DD7C74 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DD7C78 802402C8 8E050000 */ lw $a1, ($s0) -/* DD7C7C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DD7C80 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DD7C84 802402D4 0C0B210B */ jal evt_get_float_variable -/* DD7C88 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DD7C8C 802402DC 8E050000 */ lw $a1, ($s0) -/* DD7C90 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DD7C94 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DD7C98 802402E8 0C0B210B */ jal evt_get_float_variable -/* DD7C9C 802402EC 46000686 */ mov.s $f26, $f0 -/* DD7CA0 802402F0 8E050000 */ lw $a1, ($s0) -/* DD7CA4 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DD7CA8 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DD7CAC 802402FC 0C0B210B */ jal evt_get_float_variable -/* DD7CB0 80240300 46000606 */ mov.s $f24, $f0 -/* DD7CB4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DD7CB8 80240308 8E050000 */ lw $a1, ($s0) -/* DD7CBC 8024030C 0C0B210B */ jal evt_get_float_variable -/* DD7CC0 80240310 46000506 */ mov.s $f20, $f0 -/* DD7CC4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DD7CC8 80240318 0C00EAD2 */ jal get_npc_safe -/* DD7CCC 8024031C 46000586 */ mov.s $f22, $f0 -/* DD7CD0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DD7CD4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DD7CD8 80240328 4600D006 */ mov.s $f0, $f26 -/* DD7CDC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DD7CE0 80240330 4600C086 */ mov.s $f2, $f24 -/* DD7CE4 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DD7CE8 80240338 4600A106 */ mov.s $f4, $f20 -/* DD7CEC 8024033C 8C830000 */ lw $v1, ($a0) -/* DD7CF0 80240340 3C050001 */ lui $a1, 1 -/* DD7CF4 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DD7CF8 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DD7CFC 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DD7D00 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DD7D04 80240354 00651825 */ or $v1, $v1, $a1 -/* DD7D08 80240358 AC830000 */ sw $v1, ($a0) -/* DD7D0C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DD7D10 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DD7D14 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DD7D18 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DD7D1C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DD7D20 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DD7D24 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DD7D28 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD7D2C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DD7D30 80240380 03E00008 */ jr $ra -/* DD7D34 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240518_DD7EC8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240518_DD7EC8.s deleted file mode 100644 index d3eb9dac2a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240518_DD7EC8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DD7EC8 -/* DD7EC8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DD7ECC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DD7ED0 80240520 8C620000 */ lw $v0, ($v1) -/* DD7ED4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DD7ED8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DD7EDC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DD7EE0 80240530 10400002 */ beqz $v0, .L8024053C -/* DD7EE4 80240534 24020001 */ addiu $v0, $zero, 1 -/* DD7EE8 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DD7EEC 8024053C 8C620000 */ lw $v0, ($v1) -/* DD7EF0 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DD7EF4 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DD7EF8 80240548 10400002 */ beqz $v0, .L80240554 -/* DD7EFC 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DD7F00 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DD7F04 80240554 03E00008 */ jr $ra -/* DD7F08 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s deleted file mode 100644 index db8d4a9e38..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D90_DDD5C0 -/* DDD5C0 80240D90 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* DDD5C4 80240D94 AFB60040 */ sw $s6, 0x40($sp) -/* DDD5C8 80240D98 0080B02D */ daddu $s6, $a0, $zero -/* DDD5CC 80240D9C AFB00028 */ sw $s0, 0x28($sp) -/* DDD5D0 80240DA0 00A0802D */ daddu $s0, $a1, $zero -/* DDD5D4 80240DA4 AFBF0044 */ sw $ra, 0x44($sp) -/* DDD5D8 80240DA8 AFB5003C */ sw $s5, 0x3c($sp) -/* DDD5DC 80240DAC AFB40038 */ sw $s4, 0x38($sp) -/* DDD5E0 80240DB0 AFB30034 */ sw $s3, 0x34($sp) -/* DDD5E4 80240DB4 AFB20030 */ sw $s2, 0x30($sp) -/* DDD5E8 80240DB8 AFB1002C */ sw $s1, 0x2c($sp) -/* DDD5EC 80240DBC F7B80058 */ sdc1 $f24, 0x58($sp) -/* DDD5F0 80240DC0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* DDD5F4 80240DC4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DDD5F8 80240DC8 8ED3000C */ lw $s3, 0xc($s6) -/* DDD5FC 80240DCC 0C00EAD2 */ jal get_npc_safe -/* DDD600 80240DD0 2404FFFC */ addiu $a0, $zero, -4 -/* DDD604 80240DD4 27A50018 */ addiu $a1, $sp, 0x18 -/* DDD608 80240DD8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* DDD60C 80240DDC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* DDD610 80240DE0 27A6001C */ addiu $a2, $sp, 0x1c -/* DDD614 80240DE4 00041880 */ sll $v1, $a0, 2 -/* DDD618 80240DE8 00641821 */ addu $v1, $v1, $a0 -/* DDD61C 80240DEC 00031880 */ sll $v1, $v1, 2 -/* DDD620 80240DF0 00641823 */ subu $v1, $v1, $a0 -/* DDD624 80240DF4 000320C0 */ sll $a0, $v1, 3 -/* DDD628 80240DF8 00641821 */ addu $v1, $v1, $a0 -/* DDD62C 80240DFC 000318C0 */ sll $v1, $v1, 3 -/* DDD630 80240E00 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* DDD634 80240E04 00230821 */ addu $at, $at, $v1 -/* DDD638 80240E08 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* DDD63C 80240E0C 0C00A88D */ jal sin_cos_deg -/* DDD640 80240E10 0040A82D */ daddu $s5, $v0, $zero -/* DDD644 80240E14 1200005D */ beqz $s0, .L80240F8C -/* DDD648 80240E18 00000000 */ nop -/* DDD64C 80240E1C 0C00AB0A */ jal general_heap_malloc -/* DDD650 80240E20 24040068 */ addiu $a0, $zero, 0x68 -/* DDD654 80240E24 0040902D */ daddu $s2, $v0, $zero -/* DDD658 80240E28 02C0202D */ daddu $a0, $s6, $zero -/* DDD65C 80240E2C 0000882D */ daddu $s1, $zero, $zero -/* DDD660 80240E30 2414FFFF */ addiu $s4, $zero, -1 -/* DDD664 80240E34 AED20060 */ sw $s2, 0x60($s6) -/* DDD668 80240E38 8E650000 */ lw $a1, ($s3) -/* DDD66C 80240E3C 3C014148 */ lui $at, 0x4148 -/* DDD670 80240E40 4481C000 */ mtc1 $at, $f24 -/* DDD674 80240E44 3C013F80 */ lui $at, 0x3f80 -/* DDD678 80240E48 4481B000 */ mtc1 $at, $f22 -/* DDD67C 80240E4C 4480A000 */ mtc1 $zero, $f20 -/* DDD680 80240E50 0C0B1EAF */ jal evt_get_variable -/* DDD684 80240E54 0240802D */ daddu $s0, $s2, $zero -/* DDD688 80240E58 0C04417A */ jal get_entity_by_index -/* DDD68C 80240E5C 0040202D */ daddu $a0, $v0, $zero -/* DDD690 80240E60 AE42005C */ sw $v0, 0x5c($s2) -.L80240E64: -/* DDD694 80240E64 8E42005C */ lw $v0, 0x5c($s2) -/* DDD698 80240E68 C440004C */ lwc1 $f0, 0x4c($v0) -/* DDD69C 80240E6C 0000202D */ daddu $a0, $zero, $zero -/* DDD6A0 80240E70 E7B60010 */ swc1 $f22, 0x10($sp) -/* DDD6A4 80240E74 AFB40014 */ sw $s4, 0x14($sp) -/* DDD6A8 80240E78 46180000 */ add.s $f0, $f0, $f24 -/* DDD6AC 80240E7C 8C450048 */ lw $a1, 0x48($v0) -/* DDD6B0 80240E80 8C470050 */ lw $a3, 0x50($v0) -/* DDD6B4 80240E84 44060000 */ mfc1 $a2, $f0 -/* DDD6B8 80240E88 0C01C5BC */ jal fx_motion_blur_flame -/* DDD6BC 80240E8C 26310001 */ addiu $s1, $s1, 1 -/* DDD6C0 80240E90 AE020008 */ sw $v0, 8($s0) -/* DDD6C4 80240E94 E614002C */ swc1 $f20, 0x2c($s0) -/* DDD6C8 80240E98 E6140020 */ swc1 $f20, 0x20($s0) -/* DDD6CC 80240E9C E6140014 */ swc1 $f20, 0x14($s0) -/* DDD6D0 80240EA0 E6140050 */ swc1 $f20, 0x50($s0) -/* DDD6D4 80240EA4 E6140044 */ swc1 $f20, 0x44($s0) -/* DDD6D8 80240EA8 E6140038 */ swc1 $f20, 0x38($s0) -/* DDD6DC 80240EAC 2A220003 */ slti $v0, $s1, 3 -/* DDD6E0 80240EB0 1440FFEC */ bnez $v0, .L80240E64 -/* DDD6E4 80240EB4 26100004 */ addiu $s0, $s0, 4 -/* DDD6E8 80240EB8 0000882D */ daddu $s1, $zero, $zero -/* DDD6EC 80240EBC 0240802D */ daddu $s0, $s2, $zero -/* DDD6F0 80240EC0 3C148024 */ lui $s4, %hi(D_80241E98_DDE6C8) -/* DDD6F4 80240EC4 26941E98 */ addiu $s4, $s4, %lo(D_80241E98_DDE6C8) -/* DDD6F8 80240EC8 3C014248 */ lui $at, 0x4248 -/* DDD6FC 80240ECC 4481A000 */ mtc1 $at, $f20 -/* DDD700 80240ED0 24130044 */ addiu $s3, $zero, 0x44 -/* DDD704 80240ED4 AE400000 */ sw $zero, ($s2) -/* DDD708 80240ED8 AE400004 */ sw $zero, 4($s2) -/* DDD70C 80240EDC AE400060 */ sw $zero, 0x60($s2) -/* DDD710 80240EE0 AE400064 */ sw $zero, 0x64($s2) -.L80240EE4: -/* DDD714 80240EE4 27A40020 */ addiu $a0, $sp, 0x20 -/* DDD718 80240EE8 4406A000 */ mfc1 $a2, $f20 -/* DDD71C 80240EEC 8E870000 */ lw $a3, ($s4) -/* DDD720 80240EF0 02532821 */ addu $a1, $s2, $s3 -/* DDD724 80240EF4 0C00A7E7 */ jal add_vec2D_polar -/* DDD728 80240EF8 AFA00020 */ sw $zero, 0x20($sp) -/* DDD72C 80240EFC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* DDD730 80240F00 C7A40020 */ lwc1 $f4, 0x20($sp) -/* DDD734 80240F04 46041082 */ mul.s $f2, $f2, $f4 -/* DDD738 80240F08 00000000 */ nop -/* DDD73C 80240F0C C7A00018 */ lwc1 $f0, 0x18($sp) -/* DDD740 80240F10 46040002 */ mul.s $f0, $f0, $f4 -/* DDD744 80240F14 00000000 */ nop -/* DDD748 80240F18 E6020038 */ swc1 $f2, 0x38($s0) -/* DDD74C 80240F1C E6000050 */ swc1 $f0, 0x50($s0) -/* DDD750 80240F20 8E42005C */ lw $v0, 0x5c($s2) -/* DDD754 80240F24 C6000038 */ lwc1 $f0, 0x38($s0) -/* DDD758 80240F28 C4420048 */ lwc1 $f2, 0x48($v0) -/* DDD75C 80240F2C 46001080 */ add.s $f2, $f2, $f0 -/* DDD760 80240F30 C6A00038 */ lwc1 $f0, 0x38($s5) -/* DDD764 80240F34 46020001 */ sub.s $f0, $f0, $f2 -/* DDD768 80240F38 E6000038 */ swc1 $f0, 0x38($s0) -/* DDD76C 80240F3C 8E42005C */ lw $v0, 0x5c($s2) -/* DDD770 80240F40 C6000044 */ lwc1 $f0, 0x44($s0) -/* DDD774 80240F44 C442004C */ lwc1 $f2, 0x4c($v0) -/* DDD778 80240F48 46001080 */ add.s $f2, $f2, $f0 -/* DDD77C 80240F4C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* DDD780 80240F50 46020001 */ sub.s $f0, $f0, $f2 -/* DDD784 80240F54 E6000044 */ swc1 $f0, 0x44($s0) -/* DDD788 80240F58 8E42005C */ lw $v0, 0x5c($s2) -/* DDD78C 80240F5C C6000050 */ lwc1 $f0, 0x50($s0) -/* DDD790 80240F60 C4420050 */ lwc1 $f2, 0x50($v0) -/* DDD794 80240F64 26940004 */ addiu $s4, $s4, 4 -/* DDD798 80240F68 46001080 */ add.s $f2, $f2, $f0 -/* DDD79C 80240F6C C6A00040 */ lwc1 $f0, 0x40($s5) -/* DDD7A0 80240F70 26730004 */ addiu $s3, $s3, 4 -/* DDD7A4 80240F74 46020001 */ sub.s $f0, $f0, $f2 -/* DDD7A8 80240F78 26310001 */ addiu $s1, $s1, 1 -/* DDD7AC 80240F7C 2A220003 */ slti $v0, $s1, 3 -/* DDD7B0 80240F80 E6000050 */ swc1 $f0, 0x50($s0) -/* DDD7B4 80240F84 1440FFD7 */ bnez $v0, .L80240EE4 -/* DDD7B8 80240F88 26100004 */ addiu $s0, $s0, 4 -.L80240F8C: -/* DDD7BC 80240F8C 8ED20060 */ lw $s2, 0x60($s6) -/* DDD7C0 80240F90 8E430000 */ lw $v1, ($s2) -/* DDD7C4 80240F94 24020001 */ addiu $v0, $zero, 1 -/* DDD7C8 80240F98 10620038 */ beq $v1, $v0, .L8024107C -/* DDD7CC 80240F9C 28620002 */ slti $v0, $v1, 2 -/* DDD7D0 80240FA0 50400005 */ beql $v0, $zero, .L80240FB8 -/* DDD7D4 80240FA4 24020002 */ addiu $v0, $zero, 2 -/* DDD7D8 80240FA8 10600007 */ beqz $v1, .L80240FC8 -/* DDD7DC 80240FAC 24040005 */ addiu $a0, $zero, 5 -/* DDD7E0 80240FB0 08090458 */ j .L80241160 -/* DDD7E4 80240FB4 00000000 */ nop -.L80240FB8: -/* DDD7E8 80240FB8 10620058 */ beq $v1, $v0, .L8024111C -/* DDD7EC 80240FBC 00000000 */ nop -/* DDD7F0 80240FC0 08090458 */ j .L80241160 -/* DDD7F4 80240FC4 00000000 */ nop -.L80240FC8: -/* DDD7F8 80240FC8 0000882D */ daddu $s1, $zero, $zero -/* DDD7FC 80240FCC 3C148024 */ lui $s4, %hi(D_80241E98_DDE6C8) -/* DDD800 80240FD0 26941E98 */ addiu $s4, $s4, %lo(D_80241E98_DDE6C8) -/* DDD804 80240FD4 24130020 */ addiu $s3, $zero, 0x20 -/* DDD808 80240FD8 3C064248 */ lui $a2, 0x4248 -/* DDD80C 80240FDC 44800000 */ mtc1 $zero, $f0 -/* DDD810 80240FE0 24020014 */ addiu $v0, $zero, 0x14 -/* DDD814 80240FE4 AFA20010 */ sw $v0, 0x10($sp) -/* DDD818 80240FE8 44050000 */ mfc1 $a1, $f0 -/* DDD81C 80240FEC 8E470060 */ lw $a3, 0x60($s2) -/* DDD820 80240FF0 4485B000 */ mtc1 $a1, $f22 -/* DDD824 80240FF4 0C00A8ED */ jal update_lerp -/* DDD828 80240FF8 0240802D */ daddu $s0, $s2, $zero -/* DDD82C 80240FFC 46000506 */ mov.s $f20, $f0 -.L80241000: -/* DDD830 80241000 4406A000 */ mfc1 $a2, $f20 -/* DDD834 80241004 27A40020 */ addiu $a0, $sp, 0x20 -/* DDD838 80241008 E6160020 */ swc1 $f22, 0x20($s0) -/* DDD83C 8024100C 8E870000 */ lw $a3, ($s4) -/* DDD840 80241010 02532821 */ addu $a1, $s2, $s3 -/* DDD844 80241014 0C00A7E7 */ jal add_vec2D_polar -/* DDD848 80241018 E7B60020 */ swc1 $f22, 0x20($sp) -/* DDD84C 8024101C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* DDD850 80241020 C7A00020 */ lwc1 $f0, 0x20($sp) -/* DDD854 80241024 46002102 */ mul.s $f4, $f4, $f0 -/* DDD858 80241028 00000000 */ nop -/* DDD85C 8024102C C7A20018 */ lwc1 $f2, 0x18($sp) -/* DDD860 80241030 26940004 */ addiu $s4, $s4, 4 -/* DDD864 80241034 46001082 */ mul.s $f2, $f2, $f0 -/* DDD868 80241038 00000000 */ nop -/* DDD86C 8024103C 26730004 */ addiu $s3, $s3, 4 -/* DDD870 80241040 26310001 */ addiu $s1, $s1, 1 -/* DDD874 80241044 2A220003 */ slti $v0, $s1, 3 -/* DDD878 80241048 E6040014 */ swc1 $f4, 0x14($s0) -/* DDD87C 8024104C E602002C */ swc1 $f2, 0x2c($s0) -/* DDD880 80241050 1440FFEB */ bnez $v0, .L80241000 -/* DDD884 80241054 26100004 */ addiu $s0, $s0, 4 -/* DDD888 80241058 8E420060 */ lw $v0, 0x60($s2) -/* DDD88C 8024105C 24420001 */ addiu $v0, $v0, 1 -/* DDD890 80241060 AE420060 */ sw $v0, 0x60($s2) -/* DDD894 80241064 28420015 */ slti $v0, $v0, 0x15 -/* DDD898 80241068 1440003D */ bnez $v0, .L80241160 -/* DDD89C 8024106C 24020001 */ addiu $v0, $zero, 1 -/* DDD8A0 80241070 AE420000 */ sw $v0, ($s2) -/* DDD8A4 80241074 08090458 */ j .L80241160 -/* DDD8A8 80241078 AE400060 */ sw $zero, 0x60($s2) -.L8024107C: -/* DDD8AC 8024107C 0000882D */ daddu $s1, $zero, $zero -/* DDD8B0 80241080 3C148024 */ lui $s4, %hi(D_80241E98_DDE6C8) -/* DDD8B4 80241084 26941E98 */ addiu $s4, $s4, %lo(D_80241E98_DDE6C8) -/* DDD8B8 80241088 24130020 */ addiu $s3, $zero, 0x20 -/* DDD8BC 8024108C 0240802D */ daddu $s0, $s2, $zero -/* DDD8C0 80241090 3C014248 */ lui $at, 0x4248 -/* DDD8C4 80241094 4481A000 */ mtc1 $at, $f20 -/* DDD8C8 80241098 4480B000 */ mtc1 $zero, $f22 -.L8024109C: -/* DDD8CC 8024109C 4406A000 */ mfc1 $a2, $f20 -/* DDD8D0 802410A0 27A40020 */ addiu $a0, $sp, 0x20 -/* DDD8D4 802410A4 E6160020 */ swc1 $f22, 0x20($s0) -/* DDD8D8 802410A8 8E870000 */ lw $a3, ($s4) -/* DDD8DC 802410AC 02532821 */ addu $a1, $s2, $s3 -/* DDD8E0 802410B0 0C00A7E7 */ jal add_vec2D_polar -/* DDD8E4 802410B4 E7B60020 */ swc1 $f22, 0x20($sp) -/* DDD8E8 802410B8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* DDD8EC 802410BC C7A00020 */ lwc1 $f0, 0x20($sp) -/* DDD8F0 802410C0 46002102 */ mul.s $f4, $f4, $f0 -/* DDD8F4 802410C4 00000000 */ nop -/* DDD8F8 802410C8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* DDD8FC 802410CC 26940004 */ addiu $s4, $s4, 4 -/* DDD900 802410D0 46001082 */ mul.s $f2, $f2, $f0 -/* DDD904 802410D4 00000000 */ nop -/* DDD908 802410D8 26730004 */ addiu $s3, $s3, 4 -/* DDD90C 802410DC 26310001 */ addiu $s1, $s1, 1 -/* DDD910 802410E0 2A220003 */ slti $v0, $s1, 3 -/* DDD914 802410E4 E6040014 */ swc1 $f4, 0x14($s0) -/* DDD918 802410E8 E602002C */ swc1 $f2, 0x2c($s0) -/* DDD91C 802410EC 1440FFEB */ bnez $v0, .L8024109C -/* DDD920 802410F0 26100004 */ addiu $s0, $s0, 4 -/* DDD924 802410F4 8E420060 */ lw $v0, 0x60($s2) -/* DDD928 802410F8 24420001 */ addiu $v0, $v0, 1 -/* DDD92C 802410FC AE420060 */ sw $v0, 0x60($s2) -/* DDD930 80241100 28420010 */ slti $v0, $v0, 0x10 -/* DDD934 80241104 14400016 */ bnez $v0, .L80241160 -/* DDD938 80241108 2402000F */ addiu $v0, $zero, 0xf -/* DDD93C 8024110C AE420060 */ sw $v0, 0x60($s2) -/* DDD940 80241110 24020002 */ addiu $v0, $zero, 2 -/* DDD944 80241114 08090458 */ j .L80241160 -/* DDD948 80241118 AE420000 */ sw $v0, ($s2) -.L8024111C: -/* DDD94C 8024111C 8E420060 */ lw $v0, 0x60($s2) -/* DDD950 80241120 24420001 */ addiu $v0, $v0, 1 -/* DDD954 80241124 AE420060 */ sw $v0, 0x60($s2) -/* DDD958 80241128 2842001F */ slti $v0, $v0, 0x1f -/* DDD95C 8024112C 1440000C */ bnez $v0, .L80241160 -/* DDD960 80241130 0000882D */ daddu $s1, $zero, $zero -/* DDD964 80241134 0240282D */ daddu $a1, $s2, $zero -.L80241138: -/* DDD968 80241138 8CA20008 */ lw $v0, 8($a1) -/* DDD96C 8024113C 8C430000 */ lw $v1, ($v0) -/* DDD970 80241140 26310001 */ addiu $s1, $s1, 1 -/* DDD974 80241144 34630010 */ ori $v1, $v1, 0x10 -/* DDD978 80241148 AC430000 */ sw $v1, ($v0) -/* DDD97C 8024114C 2A220003 */ slti $v0, $s1, 3 -/* DDD980 80241150 1440FFF9 */ bnez $v0, .L80241138 -/* DDD984 80241154 24A50004 */ addiu $a1, $a1, 4 -/* DDD988 80241158 080904A5 */ j .L80241294 -/* DDD98C 8024115C 24020002 */ addiu $v0, $zero, 2 -.L80241160: -/* DDD990 80241160 8E430004 */ lw $v1, 4($s2) -/* DDD994 80241164 10600005 */ beqz $v1, .L8024117C -/* DDD998 80241168 24020001 */ addiu $v0, $zero, 1 -/* DDD99C 8024116C 1062000B */ beq $v1, $v0, .L8024119C -/* DDD9A0 80241170 0000882D */ daddu $s1, $zero, $zero -/* DDD9A4 80241174 08090494 */ j .L80241250 -/* DDD9A8 80241178 0240282D */ daddu $a1, $s2, $zero -.L8024117C: -/* DDD9AC 8024117C 8E420064 */ lw $v0, 0x64($s2) -/* DDD9B0 80241180 24420001 */ addiu $v0, $v0, 1 -/* DDD9B4 80241184 AE420064 */ sw $v0, 0x64($s2) -/* DDD9B8 80241188 28420010 */ slti $v0, $v0, 0x10 -/* DDD9BC 8024118C 1440002F */ bnez $v0, .L8024124C -/* DDD9C0 80241190 0000882D */ daddu $s1, $zero, $zero -/* DDD9C4 80241194 08090490 */ j .L80241240 -/* DDD9C8 80241198 24020001 */ addiu $v0, $zero, 1 -.L8024119C: -/* DDD9CC 8024119C 4480A000 */ mtc1 $zero, $f20 -/* DDD9D0 802411A0 24130014 */ addiu $s3, $zero, 0x14 -/* DDD9D4 802411A4 0240802D */ daddu $s0, $s2, $zero -.L802411A8: -/* DDD9D8 802411A8 4405A000 */ mfc1 $a1, $f20 -/* DDD9DC 802411AC AFB30010 */ sw $s3, 0x10($sp) -/* DDD9E0 802411B0 8E060038 */ lw $a2, 0x38($s0) -/* DDD9E4 802411B4 8E470064 */ lw $a3, 0x64($s2) -/* DDD9E8 802411B8 0C00A8ED */ jal update_lerp -/* DDD9EC 802411BC 24040001 */ addiu $a0, $zero, 1 -/* DDD9F0 802411C0 C6020014 */ lwc1 $f2, 0x14($s0) -/* DDD9F4 802411C4 46001080 */ add.s $f2, $f2, $f0 -/* DDD9F8 802411C8 4405A000 */ mfc1 $a1, $f20 -/* DDD9FC 802411CC E6020014 */ swc1 $f2, 0x14($s0) -/* DDDA00 802411D0 AFB30010 */ sw $s3, 0x10($sp) -/* DDDA04 802411D4 8E060044 */ lw $a2, 0x44($s0) -/* DDDA08 802411D8 8E470064 */ lw $a3, 0x64($s2) -/* DDDA0C 802411DC 0C00A8ED */ jal update_lerp -/* DDDA10 802411E0 24040001 */ addiu $a0, $zero, 1 -/* DDDA14 802411E4 C6020020 */ lwc1 $f2, 0x20($s0) -/* DDDA18 802411E8 46001080 */ add.s $f2, $f2, $f0 -/* DDDA1C 802411EC 4405A000 */ mfc1 $a1, $f20 -/* DDDA20 802411F0 E6020020 */ swc1 $f2, 0x20($s0) -/* DDDA24 802411F4 AFB30010 */ sw $s3, 0x10($sp) -/* DDDA28 802411F8 8E060050 */ lw $a2, 0x50($s0) -/* DDDA2C 802411FC 8E470064 */ lw $a3, 0x64($s2) -/* DDDA30 80241200 0C00A8ED */ jal update_lerp -/* DDDA34 80241204 24040001 */ addiu $a0, $zero, 1 -/* DDDA38 80241208 C602002C */ lwc1 $f2, 0x2c($s0) -/* DDDA3C 8024120C 46001080 */ add.s $f2, $f2, $f0 -/* DDDA40 80241210 26310001 */ addiu $s1, $s1, 1 -/* DDDA44 80241214 2A220003 */ slti $v0, $s1, 3 -/* DDDA48 80241218 E602002C */ swc1 $f2, 0x2c($s0) -/* DDDA4C 8024121C 1440FFE2 */ bnez $v0, .L802411A8 -/* DDDA50 80241220 26100004 */ addiu $s0, $s0, 4 -/* DDDA54 80241224 8E420064 */ lw $v0, 0x64($s2) -/* DDDA58 80241228 24420001 */ addiu $v0, $v0, 1 -/* DDDA5C 8024122C AE420064 */ sw $v0, 0x64($s2) -/* DDDA60 80241230 28420015 */ slti $v0, $v0, 0x15 -/* DDDA64 80241234 14400005 */ bnez $v0, .L8024124C -/* DDDA68 80241238 0000882D */ daddu $s1, $zero, $zero -/* DDDA6C 8024123C 24020002 */ addiu $v0, $zero, 2 -.L80241240: -/* DDDA70 80241240 AE420004 */ sw $v0, 4($s2) -/* DDDA74 80241244 AE400064 */ sw $zero, 0x64($s2) -/* DDDA78 80241248 0000882D */ daddu $s1, $zero, $zero -.L8024124C: -/* DDDA7C 8024124C 0240282D */ daddu $a1, $s2, $zero -.L80241250: -/* DDDA80 80241250 8CA20008 */ lw $v0, 8($a1) -/* DDDA84 80241254 C4A00014 */ lwc1 $f0, 0x14($a1) -/* DDDA88 80241258 8C42000C */ lw $v0, 0xc($v0) -/* DDDA8C 8024125C E4400010 */ swc1 $f0, 0x10($v0) -/* DDDA90 80241260 8CA20008 */ lw $v0, 8($a1) -/* DDDA94 80241264 C4A00020 */ lwc1 $f0, 0x20($a1) -/* DDDA98 80241268 8C42000C */ lw $v0, 0xc($v0) -/* DDDA9C 8024126C 26310001 */ addiu $s1, $s1, 1 -/* DDDAA0 80241270 E4400014 */ swc1 $f0, 0x14($v0) -/* DDDAA4 80241274 8CA20008 */ lw $v0, 8($a1) -/* DDDAA8 80241278 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* DDDAAC 8024127C 8C42000C */ lw $v0, 0xc($v0) -/* DDDAB0 80241280 E4400018 */ swc1 $f0, 0x18($v0) -/* DDDAB4 80241284 2A220003 */ slti $v0, $s1, 3 -/* DDDAB8 80241288 1440FFF1 */ bnez $v0, .L80241250 -/* DDDABC 8024128C 24A50004 */ addiu $a1, $a1, 4 -/* DDDAC0 80241290 0000102D */ daddu $v0, $zero, $zero -.L80241294: -/* DDDAC4 80241294 8FBF0044 */ lw $ra, 0x44($sp) -/* DDDAC8 80241298 8FB60040 */ lw $s6, 0x40($sp) -/* DDDACC 8024129C 8FB5003C */ lw $s5, 0x3c($sp) -/* DDDAD0 802412A0 8FB40038 */ lw $s4, 0x38($sp) -/* DDDAD4 802412A4 8FB30034 */ lw $s3, 0x34($sp) -/* DDDAD8 802412A8 8FB20030 */ lw $s2, 0x30($sp) -/* DDDADC 802412AC 8FB1002C */ lw $s1, 0x2c($sp) -/* DDDAE0 802412B0 8FB00028 */ lw $s0, 0x28($sp) -/* DDDAE4 802412B4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* DDDAE8 802412B8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* DDDAEC 802412BC D7B40048 */ ldc1 $f20, 0x48($sp) -/* DDDAF0 802412C0 03E00008 */ jr $ra -/* DDDAF4 802412C4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s deleted file mode 100644 index 1df02a657c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802400E4_DEBFB4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DEBFB4 -/* DEBFB4 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DEBFB8 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DEBFBC 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DEBFC0 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DEBFC4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DEBFC8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEBFCC 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DEBFD0 80240100 8E050000 */ lw $a1, ($s0) -/* DEBFD4 80240104 0C0B210B */ jal evt_get_float_variable -/* DEBFD8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DEBFDC 8024010C 8E050000 */ lw $a1, ($s0) -/* DEBFE0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DEBFE4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DEBFE8 80240118 0C0B210B */ jal evt_get_float_variable -/* DEBFEC 8024011C 46000506 */ mov.s $f20, $f0 -/* DEBFF0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DEBFF4 80240124 00000000 */ nop -/* DEBFF8 80240128 45000004 */ bc1f .L8024013C -/* DEBFFC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DEC000 80240130 8E050000 */ lw $a1, ($s0) -/* DEC004 80240134 08090051 */ j .L80240144 -/* DEC008 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DEC00C 8024013C 8E050000 */ lw $a1, ($s0) -/* DEC010 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DEC014 80240144 0C0B2026 */ jal evt_set_variable -/* DEC018 80240148 00000000 */ nop -/* DEC01C 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEC020 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DEC024 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DEC028 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEC02C 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DEC030 80240160 03E00008 */ jr $ra -/* DEC034 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240168_DEC038.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240168_DEC038.s deleted file mode 100644 index 2fe0fa941c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240168_DEC038.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DEC038 -/* DEC038 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEC03C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DEC040 80240170 0080902D */ daddu $s2, $a0, $zero -/* DEC044 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DEC048 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DEC04C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DEC050 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DEC054 80240184 8E050000 */ lw $a1, ($s0) -/* DEC058 80240188 0C0B1EAF */ jal evt_get_variable -/* DEC05C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DEC060 80240190 8E050000 */ lw $a1, ($s0) -/* DEC064 80240194 26100004 */ addiu $s0, $s0, 4 -/* DEC068 80240198 0240202D */ daddu $a0, $s2, $zero -/* DEC06C 8024019C 0C0B1EAF */ jal evt_get_variable -/* DEC070 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DEC074 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DEC078 802401A8 8E050000 */ lw $a1, ($s0) -/* DEC07C 802401AC 0C0B1EAF */ jal evt_get_variable -/* DEC080 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DEC084 802401B4 02020018 */ mult $s0, $v0 -/* DEC088 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DEC08C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DEC090 802401C0 00003012 */ mflo $a2 -/* DEC094 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DEC098 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DEC09C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DEC0A0 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DEC0A4 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DEC0A8 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DEC0AC 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DEC0B0 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DEC0B4 802401E4 03E00008 */ jr $ra -/* DEC0B8 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802401EC_DEC0BC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802401EC_DEC0BC.s deleted file mode 100644 index 9aa6300f42..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_802401EC_DEC0BC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DEC0BC -/* DEC0BC 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEC0C0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DEC0C4 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DEC0C8 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DEC0CC 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DEC0D0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEC0D4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEC0D8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEC0DC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DEC0E0 80240210 8E050000 */ lw $a1, ($s0) -/* DEC0E4 80240214 0C0B210B */ jal evt_get_float_variable -/* DEC0E8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DEC0EC 8024021C 8E050000 */ lw $a1, ($s0) -/* DEC0F0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DEC0F4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DEC0F8 80240228 0C0B210B */ jal evt_get_float_variable -/* DEC0FC 8024022C 46000606 */ mov.s $f24, $f0 -/* DEC100 80240230 8E050000 */ lw $a1, ($s0) -/* DEC104 80240234 26100004 */ addiu $s0, $s0, 4 -/* DEC108 80240238 0220202D */ daddu $a0, $s1, $zero -/* DEC10C 8024023C 0C0B210B */ jal evt_get_float_variable -/* DEC110 80240240 46000586 */ mov.s $f22, $f0 -/* DEC114 80240244 0220202D */ daddu $a0, $s1, $zero -/* DEC118 80240248 8E050000 */ lw $a1, ($s0) -/* DEC11C 8024024C 0C0B210B */ jal evt_get_float_variable -/* DEC120 80240250 46000506 */ mov.s $f20, $f0 -/* DEC124 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DEC128 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DEC12C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DEC130 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DEC134 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DEC138 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DEC13C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEC140 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DEC144 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DEC148 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEC14C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEC150 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEC154 80240284 24020002 */ addiu $v0, $zero, 2 -/* DEC158 80240288 03E00008 */ jr $ra -/* DEC15C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240290_DEC160.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240290_DEC160.s deleted file mode 100644 index 66897868c0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240290_DEC160.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DEC160 -/* DEC160 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DEC164 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DEC168 80240298 0080882D */ daddu $s1, $a0, $zero -/* DEC16C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DEC170 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DEC174 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DEC178 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DEC17C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEC180 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEC184 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEC188 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DEC18C 802402BC 8E050000 */ lw $a1, ($s0) -/* DEC190 802402C0 0C0B1EAF */ jal evt_get_variable -/* DEC194 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DEC198 802402C8 8E050000 */ lw $a1, ($s0) -/* DEC19C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DEC1A0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DEC1A4 802402D4 0C0B210B */ jal evt_get_float_variable -/* DEC1A8 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DEC1AC 802402DC 8E050000 */ lw $a1, ($s0) -/* DEC1B0 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DEC1B4 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DEC1B8 802402E8 0C0B210B */ jal evt_get_float_variable -/* DEC1BC 802402EC 46000686 */ mov.s $f26, $f0 -/* DEC1C0 802402F0 8E050000 */ lw $a1, ($s0) -/* DEC1C4 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DEC1C8 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DEC1CC 802402FC 0C0B210B */ jal evt_get_float_variable -/* DEC1D0 80240300 46000606 */ mov.s $f24, $f0 -/* DEC1D4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DEC1D8 80240308 8E050000 */ lw $a1, ($s0) -/* DEC1DC 8024030C 0C0B210B */ jal evt_get_float_variable -/* DEC1E0 80240310 46000506 */ mov.s $f20, $f0 -/* DEC1E4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DEC1E8 80240318 0C00EAD2 */ jal get_npc_safe -/* DEC1EC 8024031C 46000586 */ mov.s $f22, $f0 -/* DEC1F0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DEC1F4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DEC1F8 80240328 4600D006 */ mov.s $f0, $f26 -/* DEC1FC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DEC200 80240330 4600C086 */ mov.s $f2, $f24 -/* DEC204 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DEC208 80240338 4600A106 */ mov.s $f4, $f20 -/* DEC20C 8024033C 8C830000 */ lw $v1, ($a0) -/* DEC210 80240340 3C050001 */ lui $a1, 1 -/* DEC214 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DEC218 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DEC21C 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DEC220 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DEC224 80240354 00651825 */ or $v1, $v1, $a1 -/* DEC228 80240358 AC830000 */ sw $v1, ($a0) -/* DEC22C 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DEC230 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DEC234 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DEC238 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DEC23C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DEC240 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEC244 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEC248 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEC24C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DEC250 80240380 03E00008 */ jr $ra -/* DEC254 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240518_DEC3E8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240518_DEC3E8.s deleted file mode 100644 index 6a2b39fcb9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240518_DEC3E8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DEC3E8 -/* DEC3E8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DEC3EC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DEC3F0 80240520 8C620000 */ lw $v0, ($v1) -/* DEC3F4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DEC3F8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DEC3FC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DEC400 80240530 10400002 */ beqz $v0, .L8024053C -/* DEC404 80240534 24020001 */ addiu $v0, $zero, 1 -/* DEC408 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DEC40C 8024053C 8C620000 */ lw $v0, ($v1) -/* DEC410 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DEC414 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DEC418 80240548 10400002 */ beqz $v0, .L80240554 -/* DEC41C 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DEC420 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DEC424 80240554 03E00008 */ jr $ra -/* DEC428 80240558 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s deleted file mode 100644 index 936f7f2d20..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802400E4_DEEF84.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4_DEEF84 -/* DEEF84 802400E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DEEF88 802400E8 AFB10014 */ sw $s1, 0x14($sp) -/* DEEF8C 802400EC 0080882D */ daddu $s1, $a0, $zero -/* DEEF90 802400F0 AFBF0018 */ sw $ra, 0x18($sp) -/* DEEF94 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* DEEF98 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEEF9C 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* DEEFA0 80240100 8E050000 */ lw $a1, ($s0) -/* DEEFA4 80240104 0C0B210B */ jal evt_get_float_variable -/* DEEFA8 80240108 26100004 */ addiu $s0, $s0, 4 -/* DEEFAC 8024010C 8E050000 */ lw $a1, ($s0) -/* DEEFB0 80240110 26100004 */ addiu $s0, $s0, 4 -/* DEEFB4 80240114 0220202D */ daddu $a0, $s1, $zero -/* DEEFB8 80240118 0C0B210B */ jal evt_get_float_variable -/* DEEFBC 8024011C 46000506 */ mov.s $f20, $f0 -/* DEEFC0 80240120 4614003C */ c.lt.s $f0, $f20 -/* DEEFC4 80240124 00000000 */ nop -/* DEEFC8 80240128 45000004 */ bc1f .L8024013C -/* DEEFCC 8024012C 0220202D */ daddu $a0, $s1, $zero -/* DEEFD0 80240130 8E050000 */ lw $a1, ($s0) -/* DEEFD4 80240134 08090051 */ j .L80240144 -/* DEEFD8 80240138 24060001 */ addiu $a2, $zero, 1 -.L8024013C: -/* DEEFDC 8024013C 8E050000 */ lw $a1, ($s0) -/* DEEFE0 80240140 0000302D */ daddu $a2, $zero, $zero -.L80240144: -/* DEEFE4 80240144 0C0B2026 */ jal evt_set_variable -/* DEEFE8 80240148 00000000 */ nop -/* DEEFEC 8024014C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEEFF0 80240150 8FB10014 */ lw $s1, 0x14($sp) -/* DEEFF4 80240154 8FB00010 */ lw $s0, 0x10($sp) -/* DEEFF8 80240158 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEEFFC 8024015C 24020002 */ addiu $v0, $zero, 2 -/* DEF000 80240160 03E00008 */ jr $ra -/* DEF004 80240164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240168_DEF008.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240168_DEF008.s deleted file mode 100644 index 9310f7c4c5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240168_DEF008.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168_DEF008 -/* DEF008 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DEF00C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DEF010 80240170 0080902D */ daddu $s2, $a0, $zero -/* DEF014 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DEF018 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DEF01C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DEF020 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DEF024 80240184 8E050000 */ lw $a1, ($s0) -/* DEF028 80240188 0C0B1EAF */ jal evt_get_variable -/* DEF02C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DEF030 80240190 8E050000 */ lw $a1, ($s0) -/* DEF034 80240194 26100004 */ addiu $s0, $s0, 4 -/* DEF038 80240198 0240202D */ daddu $a0, $s2, $zero -/* DEF03C 8024019C 0C0B1EAF */ jal evt_get_variable -/* DEF040 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DEF044 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DEF048 802401A8 8E050000 */ lw $a1, ($s0) -/* DEF04C 802401AC 0C0B1EAF */ jal evt_get_variable -/* DEF050 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DEF054 802401B4 02020018 */ mult $s0, $v0 -/* DEF058 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DEF05C 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DEF060 802401C0 00003012 */ mflo $a2 -/* DEF064 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DEF068 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DEF06C 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DEF070 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DEF074 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DEF078 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DEF07C 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DEF080 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DEF084 802401E4 03E00008 */ jr $ra -/* DEF088 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802401EC_DEF08C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802401EC_DEF08C.s deleted file mode 100644 index 971d5cdc28..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_802401EC_DEF08C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC_DEF08C -/* DEF08C 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEF090 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DEF094 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DEF098 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DEF09C 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DEF0A0 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEF0A4 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEF0A8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEF0AC 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DEF0B0 80240210 8E050000 */ lw $a1, ($s0) -/* DEF0B4 80240214 0C0B210B */ jal evt_get_float_variable -/* DEF0B8 80240218 26100004 */ addiu $s0, $s0, 4 -/* DEF0BC 8024021C 8E050000 */ lw $a1, ($s0) -/* DEF0C0 80240220 26100004 */ addiu $s0, $s0, 4 -/* DEF0C4 80240224 0220202D */ daddu $a0, $s1, $zero -/* DEF0C8 80240228 0C0B210B */ jal evt_get_float_variable -/* DEF0CC 8024022C 46000606 */ mov.s $f24, $f0 -/* DEF0D0 80240230 8E050000 */ lw $a1, ($s0) -/* DEF0D4 80240234 26100004 */ addiu $s0, $s0, 4 -/* DEF0D8 80240238 0220202D */ daddu $a0, $s1, $zero -/* DEF0DC 8024023C 0C0B210B */ jal evt_get_float_variable -/* DEF0E0 80240240 46000586 */ mov.s $f22, $f0 -/* DEF0E4 80240244 0220202D */ daddu $a0, $s1, $zero -/* DEF0E8 80240248 8E050000 */ lw $a1, ($s0) -/* DEF0EC 8024024C 0C0B210B */ jal evt_get_float_variable -/* DEF0F0 80240250 46000506 */ mov.s $f20, $f0 -/* DEF0F4 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DEF0F8 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DEF0FC 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DEF100 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DEF104 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DEF108 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DEF10C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DEF110 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DEF114 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DEF118 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEF11C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEF120 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEF124 80240284 24020002 */ addiu $v0, $zero, 2 -/* DEF128 80240288 03E00008 */ jr $ra -/* DEF12C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240290_DEF130.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240290_DEF130.s deleted file mode 100644 index deaa9ebc53..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240290_DEF130.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290_DEF130 -/* DEF130 80240290 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DEF134 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* DEF138 80240298 0080882D */ daddu $s1, $a0, $zero -/* DEF13C 8024029C AFBF001C */ sw $ra, 0x1c($sp) -/* DEF140 802402A0 AFB20018 */ sw $s2, 0x18($sp) -/* DEF144 802402A4 AFB00010 */ sw $s0, 0x10($sp) -/* DEF148 802402A8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* DEF14C 802402AC F7B80030 */ sdc1 $f24, 0x30($sp) -/* DEF150 802402B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DEF154 802402B4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DEF158 802402B8 8E30000C */ lw $s0, 0xc($s1) -/* DEF15C 802402BC 8E050000 */ lw $a1, ($s0) -/* DEF160 802402C0 0C0B1EAF */ jal evt_get_variable -/* DEF164 802402C4 26100004 */ addiu $s0, $s0, 4 -/* DEF168 802402C8 8E050000 */ lw $a1, ($s0) -/* DEF16C 802402CC 26100004 */ addiu $s0, $s0, 4 -/* DEF170 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DEF174 802402D4 0C0B210B */ jal evt_get_float_variable -/* DEF178 802402D8 0040902D */ daddu $s2, $v0, $zero -/* DEF17C 802402DC 8E050000 */ lw $a1, ($s0) -/* DEF180 802402E0 26100004 */ addiu $s0, $s0, 4 -/* DEF184 802402E4 0220202D */ daddu $a0, $s1, $zero -/* DEF188 802402E8 0C0B210B */ jal evt_get_float_variable -/* DEF18C 802402EC 46000686 */ mov.s $f26, $f0 -/* DEF190 802402F0 8E050000 */ lw $a1, ($s0) -/* DEF194 802402F4 26100004 */ addiu $s0, $s0, 4 -/* DEF198 802402F8 0220202D */ daddu $a0, $s1, $zero -/* DEF19C 802402FC 0C0B210B */ jal evt_get_float_variable -/* DEF1A0 80240300 46000606 */ mov.s $f24, $f0 -/* DEF1A4 80240304 0220202D */ daddu $a0, $s1, $zero -/* DEF1A8 80240308 8E050000 */ lw $a1, ($s0) -/* DEF1AC 8024030C 0C0B210B */ jal evt_get_float_variable -/* DEF1B0 80240310 46000506 */ mov.s $f20, $f0 -/* DEF1B4 80240314 0240202D */ daddu $a0, $s2, $zero -/* DEF1B8 80240318 0C00EAD2 */ jal get_npc_safe -/* DEF1BC 8024031C 46000586 */ mov.s $f22, $f0 -/* DEF1C0 80240320 0040202D */ daddu $a0, $v0, $zero -/* DEF1C4 80240324 E49A0038 */ swc1 $f26, 0x38($a0) -/* DEF1C8 80240328 4600D006 */ mov.s $f0, $f26 -/* DEF1CC 8024032C E498003C */ swc1 $f24, 0x3c($a0) -/* DEF1D0 80240330 4600C086 */ mov.s $f2, $f24 -/* DEF1D4 80240334 E4940040 */ swc1 $f20, 0x40($a0) -/* DEF1D8 80240338 4600A106 */ mov.s $f4, $f20 -/* DEF1DC 8024033C 8C830000 */ lw $v1, ($a0) -/* DEF1E0 80240340 3C050001 */ lui $a1, 1 -/* DEF1E4 80240344 E496000C */ swc1 $f22, 0xc($a0) -/* DEF1E8 80240348 E480006C */ swc1 $f0, 0x6c($a0) -/* DEF1EC 8024034C E4820070 */ swc1 $f2, 0x70($a0) -/* DEF1F0 80240350 E4840074 */ swc1 $f4, 0x74($a0) -/* DEF1F4 80240354 00651825 */ or $v1, $v1, $a1 -/* DEF1F8 80240358 AC830000 */ sw $v1, ($a0) -/* DEF1FC 8024035C 8FBF001C */ lw $ra, 0x1c($sp) -/* DEF200 80240360 8FB20018 */ lw $s2, 0x18($sp) -/* DEF204 80240364 8FB10014 */ lw $s1, 0x14($sp) -/* DEF208 80240368 8FB00010 */ lw $s0, 0x10($sp) -/* DEF20C 8024036C D7BA0038 */ ldc1 $f26, 0x38($sp) -/* DEF210 80240370 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DEF214 80240374 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DEF218 80240378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DEF21C 8024037C 24020002 */ addiu $v0, $zero, 2 -/* DEF220 80240380 03E00008 */ jr $ra -/* DEF224 80240384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s deleted file mode 100644 index 9b76d3a1b0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240518_DEF3B8.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518_DEF3B8 -/* DEF3B8 80240518 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DEF3BC 8024051C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DEF3C0 80240520 8C620000 */ lw $v0, ($v1) -/* DEF3C4 80240524 AC800084 */ sw $zero, 0x84($a0) -/* DEF3C8 80240528 8C420010 */ lw $v0, 0x10($v0) -/* DEF3CC 8024052C 30428000 */ andi $v0, $v0, 0x8000 -/* DEF3D0 80240530 10400002 */ beqz $v0, .L8024053C -/* DEF3D4 80240534 24020001 */ addiu $v0, $zero, 1 -/* DEF3D8 80240538 AC820084 */ sw $v0, 0x84($a0) -.L8024053C: -/* DEF3DC 8024053C 8C620000 */ lw $v0, ($v1) -/* DEF3E0 80240540 8C420010 */ lw $v0, 0x10($v0) -/* DEF3E4 80240544 30424000 */ andi $v0, $v0, 0x4000 -/* DEF3E8 80240548 10400002 */ beqz $v0, .L80240554 -/* DEF3EC 8024054C 24020001 */ addiu $v0, $zero, 1 -/* DEF3F0 80240550 AC820084 */ sw $v0, 0x84($a0) -.L80240554: -/* DEF3F4 80240554 03E00008 */ jr $ra -/* DEF3F8 80240558 24020002 */ addiu $v0, $zero, 2 -/* DEF3FC 8024055C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s deleted file mode 100644 index 4d85bfcbb7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C08_DF0AA8 -/* DF0AA8 80241C08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF0AAC 80241C0C AFB00010 */ sw $s0, 0x10($sp) -/* DF0AB0 80241C10 0080802D */ daddu $s0, $a0, $zero -/* DF0AB4 80241C14 AFBF0014 */ sw $ra, 0x14($sp) -/* DF0AB8 80241C18 8E020148 */ lw $v0, 0x148($s0) -/* DF0ABC 80241C1C 0C00EABB */ jal get_npc_unsafe -/* DF0AC0 80241C20 84440008 */ lh $a0, 8($v0) -/* DF0AC4 80241C24 9443008E */ lhu $v1, 0x8e($v0) -/* DF0AC8 80241C28 C440003C */ lwc1 $f0, 0x3c($v0) -/* DF0ACC 80241C2C 24640001 */ addiu $a0, $v1, 1 -/* DF0AD0 80241C30 00031C00 */ sll $v1, $v1, 0x10 -/* DF0AD4 80241C34 00031B83 */ sra $v1, $v1, 0xe -/* DF0AD8 80241C38 A444008E */ sh $a0, 0x8e($v0) -/* DF0ADC 80241C3C 3C018024 */ lui $at, %hi(D_80246184_DF5024) -/* DF0AE0 80241C40 00230821 */ addu $at, $at, $v1 -/* DF0AE4 80241C44 C4226184 */ lwc1 $f2, %lo(D_80246184_DF5024)($at) -/* DF0AE8 80241C48 8443008E */ lh $v1, 0x8e($v0) -/* DF0AEC 80241C4C 46020000 */ add.s $f0, $f0, $f2 -/* DF0AF0 80241C50 28630005 */ slti $v1, $v1, 5 -/* DF0AF4 80241C54 14600003 */ bnez $v1, .L80241C64 -/* DF0AF8 80241C58 E440003C */ swc1 $f0, 0x3c($v0) -/* DF0AFC 80241C5C 2402000C */ addiu $v0, $zero, 0xc -/* DF0B00 80241C60 AE020070 */ sw $v0, 0x70($s0) -.L80241C64: -/* DF0B04 80241C64 8FBF0014 */ lw $ra, 0x14($sp) -/* DF0B08 80241C68 8FB00010 */ lw $s0, 0x10($sp) -/* DF0B0C 80241C6C 03E00008 */ jr $ra -/* DF0B10 80241C70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s deleted file mode 100644 index 8a0d354810..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247968_DF6808 -.word .L802423CC_DF126C, .L802423DC_DF127C, .L802423F4_DF1294, .L80242404_DF12A4, .L80242484_DF1324, .L80242484_DF1324, .L80242484_DF1324, .L80242484_DF1324, .L80242484_DF1324, .L80242484_DF1324, .L8024241C_DF12BC, .L8024242C_DF12CC, .L80242444_DF12E4, .L8024245C_DF12FC, .L80242474_DF1314, 0 - -.section .text - -glabel func_802422C0_DF1160 -/* DF1160 802422C0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF1164 802422C4 AFB40040 */ sw $s4, 0x40($sp) -/* DF1168 802422C8 0080A02D */ daddu $s4, $a0, $zero -/* DF116C 802422CC AFBF0048 */ sw $ra, 0x48($sp) -/* DF1170 802422D0 AFB50044 */ sw $s5, 0x44($sp) -/* DF1174 802422D4 AFB3003C */ sw $s3, 0x3c($sp) -/* DF1178 802422D8 AFB20038 */ sw $s2, 0x38($sp) -/* DF117C 802422DC AFB10034 */ sw $s1, 0x34($sp) -/* DF1180 802422E0 AFB00030 */ sw $s0, 0x30($sp) -/* DF1184 802422E4 8E920148 */ lw $s2, 0x148($s4) -/* DF1188 802422E8 86440008 */ lh $a0, 8($s2) -/* DF118C 802422EC 8E90000C */ lw $s0, 0xc($s4) -/* DF1190 802422F0 0C00EABB */ jal get_npc_unsafe -/* DF1194 802422F4 00A0882D */ daddu $s1, $a1, $zero -/* DF1198 802422F8 0280202D */ daddu $a0, $s4, $zero -/* DF119C 802422FC 8E050000 */ lw $a1, ($s0) -/* DF11A0 80242300 0C0B1EAF */ jal evt_get_variable -/* DF11A4 80242304 0040A82D */ daddu $s5, $v0, $zero -/* DF11A8 80242308 AFA00010 */ sw $zero, 0x10($sp) -/* DF11AC 8024230C 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11B0 80242310 8C630030 */ lw $v1, 0x30($v1) -/* DF11B4 80242314 AFA30014 */ sw $v1, 0x14($sp) -/* DF11B8 80242318 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11BC 8024231C 8C63001C */ lw $v1, 0x1c($v1) -/* DF11C0 80242320 AFA30018 */ sw $v1, 0x18($sp) -/* DF11C4 80242324 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11C8 80242328 8C630024 */ lw $v1, 0x24($v1) -/* DF11CC 8024232C AFA3001C */ sw $v1, 0x1c($sp) -/* DF11D0 80242330 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11D4 80242334 8C630028 */ lw $v1, 0x28($v1) -/* DF11D8 80242338 27B30010 */ addiu $s3, $sp, 0x10 -/* DF11DC 8024233C AFA30020 */ sw $v1, 0x20($sp) -/* DF11E0 80242340 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF11E4 80242344 3C0142F0 */ lui $at, 0x42f0 -/* DF11E8 80242348 44810000 */ mtc1 $at, $f0 -/* DF11EC 8024234C 8C63002C */ lw $v1, 0x2c($v1) -/* DF11F0 80242350 0040802D */ daddu $s0, $v0, $zero -/* DF11F4 80242354 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF11F8 80242358 A7A0002C */ sh $zero, 0x2c($sp) -/* DF11FC 8024235C 12200006 */ beqz $s1, .L80242378 -/* DF1200 80242360 AFA30024 */ sw $v1, 0x24($sp) -/* DF1204 80242364 02A0202D */ daddu $a0, $s5, $zero -/* DF1208 80242368 0240282D */ daddu $a1, $s2, $zero -/* DF120C 8024236C 0280302D */ daddu $a2, $s4, $zero -/* DF1210 80242370 0C090867 */ jal omo_17_UnkFunc5 -/* DF1214 80242374 0200382D */ daddu $a3, $s0, $zero -.L80242378: -/* DF1218 80242378 2402FFFE */ addiu $v0, $zero, -2 -/* DF121C 8024237C A2A200AB */ sb $v0, 0xab($s5) -/* DF1220 80242380 8E4300B0 */ lw $v1, 0xb0($s2) -/* DF1224 80242384 30620004 */ andi $v0, $v1, 4 -/* DF1228 80242388 10400007 */ beqz $v0, .L802423A8 -/* DF122C 8024238C 00000000 */ nop -/* DF1230 80242390 824200B4 */ lb $v0, 0xb4($s2) -/* DF1234 80242394 1440003C */ bnez $v0, .L80242488 -/* DF1238 80242398 0000102D */ daddu $v0, $zero, $zero -/* DF123C 8024239C 2402FFFB */ addiu $v0, $zero, -5 -/* DF1240 802423A0 00621024 */ and $v0, $v1, $v0 -/* DF1244 802423A4 AE4200B0 */ sw $v0, 0xb0($s2) -.L802423A8: -/* DF1248 802423A8 8E830070 */ lw $v1, 0x70($s4) -/* DF124C 802423AC 2C62000F */ sltiu $v0, $v1, 0xf -/* DF1250 802423B0 10400034 */ beqz $v0, .L80242484_DF1324 -/* DF1254 802423B4 00031080 */ sll $v0, $v1, 2 -/* DF1258 802423B8 3C018024 */ lui $at, %hi(jtbl_80247968_DF6808) -/* DF125C 802423BC 00220821 */ addu $at, $at, $v0 -/* DF1260 802423C0 8C227968 */ lw $v0, %lo(jtbl_80247968_DF6808)($at) -/* DF1264 802423C4 00400008 */ jr $v0 -/* DF1268 802423C8 00000000 */ nop -.L802423CC_DF126C: -/* DF126C 802423CC 0280202D */ daddu $a0, $s4, $zero -/* DF1270 802423D0 0200282D */ daddu $a1, $s0, $zero -/* DF1274 802423D4 0C0903ED */ jal omo_17_UnkNpcAIFunc23 -/* DF1278 802423D8 0260302D */ daddu $a2, $s3, $zero -.L802423DC_DF127C: -/* DF127C 802423DC 0280202D */ daddu $a0, $s4, $zero -/* DF1280 802423E0 0200282D */ daddu $a1, $s0, $zero -/* DF1284 802423E4 0C090459 */ jal omo_17_UnkNpcAIFunc35 -/* DF1288 802423E8 0260302D */ daddu $a2, $s3, $zero -/* DF128C 802423EC 08090922 */ j .L80242488 -/* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero -.L802423F4_DF1294: -/* DF1294 802423F4 0280202D */ daddu $a0, $s4, $zero -/* DF1298 802423F8 0200282D */ daddu $a1, $s0, $zero -/* DF129C 802423FC 0C0905E3 */ jal omo_17_UnkNpcAIFunc1 -/* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero -.L80242404_DF12A4: -/* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero -/* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero -/* DF12AC 8024240C 0C090613 */ jal omo_17_UnkFunc4 -/* DF12B0 80242410 0260302D */ daddu $a2, $s3, $zero -/* DF12B4 80242414 08090922 */ j .L80242488 -/* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero -.L8024241C_DF12BC: -/* DF12BC 8024241C 0280202D */ daddu $a0, $s4, $zero -/* DF12C0 80242420 0200282D */ daddu $a1, $s0, $zero -/* DF12C4 80242424 0C0906E4 */ jal omo_17_UnkNpcAIFunc2 -/* DF12C8 80242428 0260302D */ daddu $a2, $s3, $zero -.L8024242C_DF12CC: -/* DF12CC 8024242C 0280202D */ daddu $a0, $s4, $zero -/* DF12D0 80242430 0200282D */ daddu $a1, $s0, $zero -/* DF12D4 80242434 0C090702 */ jal func_80241C08_DF0AA8 -/* DF12D8 80242438 0260302D */ daddu $a2, $s3, $zero -/* DF12DC 8024243C 08090922 */ j .L80242488 -/* DF12E0 80242440 0000102D */ daddu $v0, $zero, $zero -.L80242444_DF12E4: -/* DF12E4 80242444 0280202D */ daddu $a0, $s4, $zero -/* DF12E8 80242448 0200282D */ daddu $a1, $s0, $zero -/* DF12EC 8024244C 0C09071D */ jal omo_17_UnkNpcAIFunc14 -/* DF12F0 80242450 0260302D */ daddu $a2, $s3, $zero -/* DF12F4 80242454 08090922 */ j .L80242488 -/* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero -.L8024245C_DF12FC: -/* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero -/* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero -/* DF1304 80242464 0C09076A */ jal omo_17_UnkNpcAIFunc3 -/* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero -/* DF130C 8024246C 08090922 */ j .L80242488 -/* DF1310 80242470 0000102D */ daddu $v0, $zero, $zero -.L80242474_DF1314: -/* DF1314 80242474 0280202D */ daddu $a0, $s4, $zero -/* DF1318 80242478 0200282D */ daddu $a1, $s0, $zero -/* DF131C 8024247C 0C090783 */ jal omo_17_UnkFunc6 -/* DF1320 80242480 0260302D */ daddu $a2, $s3, $zero -.L80242484_DF1324: -/* DF1324 80242484 0000102D */ daddu $v0, $zero, $zero -.L80242488: -/* DF1328 80242488 8FBF0048 */ lw $ra, 0x48($sp) -/* DF132C 8024248C 8FB50044 */ lw $s5, 0x44($sp) -/* DF1330 80242490 8FB40040 */ lw $s4, 0x40($sp) -/* DF1334 80242494 8FB3003C */ lw $s3, 0x3c($sp) -/* DF1338 80242498 8FB20038 */ lw $s2, 0x38($sp) -/* DF133C 8024249C 8FB10034 */ lw $s1, 0x34($sp) -/* DF1340 802424A0 8FB00030 */ lw $s0, 0x30($sp) -/* DF1344 802424A4 03E00008 */ jr $ra -/* DF1348 802424A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s deleted file mode 100644 index bc29ef2dd5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802479A8_DF6848 -.double 180.0 - -dlabel D_802479B0_DF6850 -.double 75.0 - -.section .text - -glabel func_802424AC_DF134C -/* DF134C 802424AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DF1350 802424B0 AFB10014 */ sw $s1, 0x14($sp) -/* DF1354 802424B4 0080882D */ daddu $s1, $a0, $zero -/* DF1358 802424B8 3C05800B */ lui $a1, %hi(gCameras) -/* DF135C 802424BC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* DF1360 802424C0 AFBF0020 */ sw $ra, 0x20($sp) -/* DF1364 802424C4 AFB3001C */ sw $s3, 0x1c($sp) -/* DF1368 802424C8 AFB20018 */ sw $s2, 0x18($sp) -/* DF136C 802424CC AFB00010 */ sw $s0, 0x10($sp) -/* DF1370 802424D0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* DF1374 802424D4 8E330148 */ lw $s3, 0x148($s1) -/* DF1378 802424D8 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* DF137C 802424DC 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* DF1380 802424E0 8E30000C */ lw $s0, 0xc($s1) -/* DF1384 802424E4 00031080 */ sll $v0, $v1, 2 -/* DF1388 802424E8 00431021 */ addu $v0, $v0, $v1 -/* DF138C 802424EC 00021080 */ sll $v0, $v0, 2 -/* DF1390 802424F0 00431023 */ subu $v0, $v0, $v1 -/* DF1394 802424F4 000218C0 */ sll $v1, $v0, 3 -/* DF1398 802424F8 00431021 */ addu $v0, $v0, $v1 -/* DF139C 802424FC 000210C0 */ sll $v0, $v0, 3 -/* DF13A0 80242500 86640008 */ lh $a0, 8($s3) -/* DF13A4 80242504 0C00EABB */ jal get_npc_unsafe -/* DF13A8 80242508 00459021 */ addu $s2, $v0, $a1 -/* DF13AC 8024250C 0220202D */ daddu $a0, $s1, $zero -/* DF13B0 80242510 8E050000 */ lw $a1, ($s0) -/* DF13B4 80242514 0C0B1EAF */ jal evt_get_variable -/* DF13B8 80242518 0040802D */ daddu $s0, $v0, $zero -/* DF13BC 8024251C 0260202D */ daddu $a0, $s3, $zero -/* DF13C0 80242520 8C460024 */ lw $a2, 0x24($v0) -/* DF13C4 80242524 8C470028 */ lw $a3, 0x28($v0) -/* DF13C8 80242528 0C0124FB */ jal func_800493EC -/* DF13CC 8024252C 0000282D */ daddu $a1, $zero, $zero -/* DF13D0 80242530 10400052 */ beqz $v0, .L8024267C -/* DF13D4 80242534 2402FFFF */ addiu $v0, $zero, -1 -/* DF13D8 80242538 C64C006C */ lwc1 $f12, 0x6c($s2) -/* DF13DC 8024253C C60E000C */ lwc1 $f14, 0xc($s0) -/* DF13E0 80242540 3C014387 */ lui $at, 0x4387 -/* DF13E4 80242544 4481A000 */ mtc1 $at, $f20 -/* DF13E8 80242548 0C00A70A */ jal get_clamped_angle_diff -/* DF13EC 8024254C 00000000 */ nop -/* DF13F0 80242550 0C00A6C9 */ jal clamp_angle -/* DF13F4 80242554 46000306 */ mov.s $f12, $f0 -/* DF13F8 80242558 3C018024 */ lui $at, %hi(D_802479A8_DF6848) -/* DF13FC 8024255C D42279A8 */ ldc1 $f2, %lo(D_802479A8_DF6848)($at) -/* DF1400 80242560 46000021 */ cvt.d.s $f0, $f0 -/* DF1404 80242564 4622003C */ c.lt.d $f0, $f2 -/* DF1408 80242568 00000000 */ nop -/* DF140C 8024256C 45000003 */ bc1f .L8024257C -/* DF1410 80242570 00000000 */ nop -/* DF1414 80242574 3C0142B4 */ lui $at, 0x42b4 -/* DF1418 80242578 4481A000 */ mtc1 $at, $f20 -.L8024257C: -/* DF141C 8024257C 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* DF1420 80242580 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* DF1424 80242584 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF1428 80242588 8E220000 */ lw $v0, ($s1) -/* DF142C 8024258C C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF1430 80242590 8C460028 */ lw $a2, 0x28($v0) -/* DF1434 80242594 0C00A720 */ jal atan2 -/* DF1438 80242598 8C470030 */ lw $a3, 0x30($v0) -/* DF143C 8024259C 4600A306 */ mov.s $f12, $f20 -/* DF1440 802425A0 0C00A70A */ jal get_clamped_angle_diff -/* DF1444 802425A4 46000386 */ mov.s $f14, $f0 -/* DF1448 802425A8 46000005 */ abs.s $f0, $f0 -/* DF144C 802425AC 3C018024 */ lui $at, %hi(D_802479B0_DF6850) -/* DF1450 802425B0 D42279B0 */ ldc1 $f2, %lo(D_802479B0_DF6850)($at) -/* DF1454 802425B4 46000021 */ cvt.d.s $f0, $f0 -/* DF1458 802425B8 4620103C */ c.lt.d $f2, $f0 -/* DF145C 802425BC 00000000 */ nop -/* DF1460 802425C0 4501002E */ bc1t .L8024267C -/* DF1464 802425C4 2402FFFF */ addiu $v0, $zero, -1 -/* DF1468 802425C8 8E220000 */ lw $v0, ($s1) -/* DF146C 802425CC C600003C */ lwc1 $f0, 0x3c($s0) -/* DF1470 802425D0 C442002C */ lwc1 $f2, 0x2c($v0) -/* DF1474 802425D4 860200A8 */ lh $v0, 0xa8($s0) -/* DF1478 802425D8 46020001 */ sub.s $f0, $f0, $f2 -/* DF147C 802425DC 44821000 */ mtc1 $v0, $f2 -/* DF1480 802425E0 00000000 */ nop -/* DF1484 802425E4 468010A1 */ cvt.d.w $f2, $f2 -/* DF1488 802425E8 46221080 */ add.d $f2, $f2, $f2 -/* DF148C 802425EC 46000005 */ abs.s $f0, $f0 -/* DF1490 802425F0 46000021 */ cvt.d.s $f0, $f0 -/* DF1494 802425F4 4620103E */ c.le.d $f2, $f0 -/* DF1498 802425F8 00000000 */ nop -/* DF149C 802425FC 4501001F */ bc1t .L8024267C -/* DF14A0 80242600 2402FFFF */ addiu $v0, $zero, -1 -/* DF14A4 80242604 3C038011 */ lui $v1, %hi(gPartnerActionStatus+0x3) -/* DF14A8 80242608 8063EBB3 */ lb $v1, %lo(gPartnerActionStatus+0x3)($v1) -/* DF14AC 8024260C 24020009 */ addiu $v0, $zero, 9 -/* DF14B0 80242610 10620019 */ beq $v1, $v0, .L80242678 -/* DF14B4 80242614 24020007 */ addiu $v0, $zero, 7 -/* DF14B8 80242618 14620005 */ bne $v1, $v0, .L80242630 -/* DF14BC 8024261C 2402FFFF */ addiu $v0, $zero, -1 -/* DF14C0 80242620 0809099F */ j .L8024267C -/* DF14C4 80242624 00000000 */ nop -.L80242628: -/* DF14C8 80242628 0809099F */ j .L8024267C -/* DF14CC 8024262C 0240102D */ daddu $v0, $s2, $zero -.L80242630: -/* DF14D0 80242630 8E620078 */ lw $v0, 0x78($s3) -/* DF14D4 80242634 18400010 */ blez $v0, .L80242678 -/* DF14D8 80242638 0000882D */ daddu $s1, $zero, $zero -.L8024263C: -/* DF14DC 8024263C 86620008 */ lh $v0, 8($s3) -/* DF14E0 80242640 00511021 */ addu $v0, $v0, $s1 -/* DF14E4 80242644 24520001 */ addiu $s2, $v0, 1 -/* DF14E8 80242648 0C00FB3A */ jal get_enemy -/* DF14EC 8024264C 0240202D */ daddu $a0, $s2, $zero -/* DF14F0 80242650 0240202D */ daddu $a0, $s2, $zero -/* DF14F4 80242654 0C00EABB */ jal get_npc_unsafe -/* DF14F8 80242658 0040802D */ daddu $s0, $v0, $zero -/* DF14FC 8024265C 8E02006C */ lw $v0, 0x6c($s0) -/* DF1500 80242660 1040FFF1 */ beqz $v0, .L80242628 -/* DF1504 80242664 26310001 */ addiu $s1, $s1, 1 -/* DF1508 80242668 8E620078 */ lw $v0, 0x78($s3) -/* DF150C 8024266C 0222102A */ slt $v0, $s1, $v0 -/* DF1510 80242670 1440FFF2 */ bnez $v0, .L8024263C -/* DF1514 80242674 00000000 */ nop -.L80242678: -/* DF1518 80242678 2402FFFF */ addiu $v0, $zero, -1 -.L8024267C: -/* DF151C 8024267C 8FBF0020 */ lw $ra, 0x20($sp) -/* DF1520 80242680 8FB3001C */ lw $s3, 0x1c($sp) -/* DF1524 80242684 8FB20018 */ lw $s2, 0x18($sp) -/* DF1528 80242688 8FB10014 */ lw $s1, 0x14($sp) -/* DF152C 8024268C 8FB00010 */ lw $s0, 0x10($sp) -/* DF1530 80242690 D7B40028 */ ldc1 $f20, 0x28($sp) -/* DF1534 80242694 03E00008 */ jr $ra -/* DF1538 80242698 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s deleted file mode 100644 index a8cc31be61..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024269C_DF153C -/* DF153C 8024269C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF1540 802426A0 AFB20038 */ sw $s2, 0x38($sp) -/* DF1544 802426A4 0080902D */ daddu $s2, $a0, $zero -/* DF1548 802426A8 AFB00030 */ sw $s0, 0x30($sp) -/* DF154C 802426AC AFBF003C */ sw $ra, 0x3c($sp) -/* DF1550 802426B0 AFB10034 */ sw $s1, 0x34($sp) -/* DF1554 802426B4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DF1558 802426B8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DF155C 802426BC 8E510148 */ lw $s1, 0x148($s2) -/* DF1560 802426C0 4485A000 */ mtc1 $a1, $f20 -/* DF1564 802426C4 86240008 */ lh $a0, 8($s1) -/* DF1568 802426C8 4486B000 */ mtc1 $a2, $f22 -/* DF156C 802426CC 0C00EABB */ jal get_npc_unsafe -/* DF1570 802426D0 00E0802D */ daddu $s0, $a3, $zero -/* DF1574 802426D4 0200202D */ daddu $a0, $s0, $zero -/* DF1578 802426D8 0220282D */ daddu $a1, $s1, $zero -/* DF157C 802426DC 24030001 */ addiu $v1, $zero, 1 -/* DF1580 802426E0 4406A000 */ mfc1 $a2, $f20 -/* DF1584 802426E4 4407B000 */ mfc1 $a3, $f22 -/* DF1588 802426E8 0040802D */ daddu $s0, $v0, $zero -/* DF158C 802426EC 0C01242D */ jal func_800490B4 -/* DF1590 802426F0 AFA30010 */ sw $v1, 0x10($sp) -/* DF1594 802426F4 1440001D */ bnez $v0, .L8024276C -/* DF1598 802426F8 24040002 */ addiu $a0, $zero, 2 -/* DF159C 802426FC 0200282D */ daddu $a1, $s0, $zero -/* DF15A0 80242700 0000302D */ daddu $a2, $zero, $zero -/* DF15A4 80242704 860300A8 */ lh $v1, 0xa8($s0) -/* DF15A8 80242708 3C013F80 */ lui $at, 0x3f80 -/* DF15AC 8024270C 44810000 */ mtc1 $at, $f0 -/* DF15B0 80242710 3C014000 */ lui $at, 0x4000 -/* DF15B4 80242714 44811000 */ mtc1 $at, $f2 -/* DF15B8 80242718 3C01C1A0 */ lui $at, 0xc1a0 -/* DF15BC 8024271C 44812000 */ mtc1 $at, $f4 -/* DF15C0 80242720 2402000F */ addiu $v0, $zero, 0xf -/* DF15C4 80242724 AFA2001C */ sw $v0, 0x1c($sp) -/* DF15C8 80242728 44833000 */ mtc1 $v1, $f6 -/* DF15CC 8024272C 00000000 */ nop -/* DF15D0 80242730 468031A0 */ cvt.s.w $f6, $f6 -/* DF15D4 80242734 44073000 */ mfc1 $a3, $f6 -/* DF15D8 80242738 27A20028 */ addiu $v0, $sp, 0x28 -/* DF15DC 8024273C AFA20020 */ sw $v0, 0x20($sp) -/* DF15E0 80242740 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF15E4 80242744 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF15E8 80242748 0C01BFA4 */ jal fx_emote -/* DF15EC 8024274C E7A40018 */ swc1 $f4, 0x18($sp) -/* DF15F0 80242750 8E2200CC */ lw $v0, 0xcc($s1) -/* DF15F4 80242754 8C430000 */ lw $v1, ($v0) -/* DF15F8 80242758 24020014 */ addiu $v0, $zero, 0x14 -/* DF15FC 8024275C A602008E */ sh $v0, 0x8e($s0) -/* DF1600 80242760 24020021 */ addiu $v0, $zero, 0x21 -/* DF1604 80242764 080909EF */ j .L802427BC -/* DF1608 80242768 AE030028 */ sw $v1, 0x28($s0) -.L8024276C: -/* DF160C 8024276C 0C09092B */ jal func_802424AC_DF134C -/* DF1610 80242770 0240202D */ daddu $a0, $s2, $zero -/* DF1614 80242774 0040202D */ daddu $a0, $v0, $zero -/* DF1618 80242778 2402FFFF */ addiu $v0, $zero, -1 -/* DF161C 8024277C 10820010 */ beq $a0, $v0, .L802427C0 -/* DF1620 80242780 00000000 */ nop -/* DF1624 80242784 0C00FB3A */ jal get_enemy -/* DF1628 80242788 00000000 */ nop -/* DF162C 8024278C 8C42006C */ lw $v0, 0x6c($v0) -/* DF1630 80242790 1440000B */ bnez $v0, .L802427C0 -/* DF1634 80242794 00000000 */ nop -/* DF1638 80242798 8602008C */ lh $v0, 0x8c($s0) -/* DF163C 8024279C 14400008 */ bnez $v0, .L802427C0 -/* DF1640 802427A0 00000000 */ nop -/* DF1644 802427A4 8E2200CC */ lw $v0, 0xcc($s1) -/* DF1648 802427A8 8C420020 */ lw $v0, 0x20($v0) -/* DF164C 802427AC AE020028 */ sw $v0, 0x28($s0) -/* DF1650 802427B0 96220072 */ lhu $v0, 0x72($s1) -/* DF1654 802427B4 A602008E */ sh $v0, 0x8e($s0) -/* DF1658 802427B8 2402001E */ addiu $v0, $zero, 0x1e -.L802427BC: -/* DF165C 802427BC AE420070 */ sw $v0, 0x70($s2) -.L802427C0: -/* DF1660 802427C0 8FBF003C */ lw $ra, 0x3c($sp) -/* DF1664 802427C4 8FB20038 */ lw $s2, 0x38($sp) -/* DF1668 802427C8 8FB10034 */ lw $s1, 0x34($sp) -/* DF166C 802427CC 8FB00030 */ lw $s0, 0x30($sp) -/* DF1670 802427D0 D7B60048 */ ldc1 $f22, 0x48($sp) -/* DF1674 802427D4 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DF1678 802427D8 03E00008 */ jr $ra -/* DF167C 802427DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s deleted file mode 100644 index e58ea5fc51..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427E0_DF1680 -/* DF1680 802427E0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DF1684 802427E4 AFB20038 */ sw $s2, 0x38($sp) -/* DF1688 802427E8 0080902D */ daddu $s2, $a0, $zero -/* DF168C 802427EC AFBF003C */ sw $ra, 0x3c($sp) -/* DF1690 802427F0 AFB10034 */ sw $s1, 0x34($sp) -/* DF1694 802427F4 AFB00030 */ sw $s0, 0x30($sp) -/* DF1698 802427F8 8E510148 */ lw $s1, 0x148($s2) -/* DF169C 802427FC 0C00EABB */ jal get_npc_unsafe -/* DF16A0 80242800 86240008 */ lh $a0, 8($s1) -/* DF16A4 80242804 0040802D */ daddu $s0, $v0, $zero -/* DF16A8 80242808 9602008E */ lhu $v0, 0x8e($s0) -/* DF16AC 8024280C 2442FFFF */ addiu $v0, $v0, -1 -/* DF16B0 80242810 A602008E */ sh $v0, 0x8e($s0) -/* DF16B4 80242814 00021400 */ sll $v0, $v0, 0x10 -/* DF16B8 80242818 1C40002B */ bgtz $v0, .L802428C8 -/* DF16BC 8024281C 00000000 */ nop -/* DF16C0 80242820 0C09092B */ jal func_802424AC_DF134C -/* DF16C4 80242824 0240202D */ daddu $a0, $s2, $zero -/* DF16C8 80242828 0040202D */ daddu $a0, $v0, $zero -/* DF16CC 8024282C 0481001A */ bgez $a0, .L80242898 -/* DF16D0 80242830 2402000F */ addiu $v0, $zero, 0xf -/* DF16D4 80242834 24040002 */ addiu $a0, $zero, 2 -/* DF16D8 80242838 860300A8 */ lh $v1, 0xa8($s0) -/* DF16DC 8024283C AFA2001C */ sw $v0, 0x1c($sp) -/* DF16E0 80242840 27A20028 */ addiu $v0, $sp, 0x28 -/* DF16E4 80242844 0200282D */ daddu $a1, $s0, $zero -/* DF16E8 80242848 3C013F80 */ lui $at, 0x3f80 -/* DF16EC 8024284C 44810000 */ mtc1 $at, $f0 -/* DF16F0 80242850 3C014000 */ lui $at, 0x4000 -/* DF16F4 80242854 44811000 */ mtc1 $at, $f2 -/* DF16F8 80242858 3C01C1A0 */ lui $at, 0xc1a0 -/* DF16FC 8024285C 44812000 */ mtc1 $at, $f4 -/* DF1700 80242860 44833000 */ mtc1 $v1, $f6 -/* DF1704 80242864 00000000 */ nop -/* DF1708 80242868 468031A0 */ cvt.s.w $f6, $f6 -/* DF170C 8024286C 44073000 */ mfc1 $a3, $f6 -/* DF1710 80242870 0000302D */ daddu $a2, $zero, $zero -/* DF1714 80242874 AFA20020 */ sw $v0, 0x20($sp) -/* DF1718 80242878 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF171C 8024287C E7A20014 */ swc1 $f2, 0x14($sp) -/* DF1720 80242880 0C01BFA4 */ jal fx_emote -/* DF1724 80242884 E7A40018 */ swc1 $f4, 0x18($sp) -/* DF1728 80242888 8E2200CC */ lw $v0, 0xcc($s1) -/* DF172C 8024288C 8C420000 */ lw $v0, ($v0) -/* DF1730 80242890 08090A2E */ j .L802428B8 -/* DF1734 80242894 AE020028 */ sw $v0, 0x28($s0) -.L80242898: -/* DF1738 80242898 8E2200CC */ lw $v0, 0xcc($s1) -/* DF173C 8024289C 8C420024 */ lw $v0, 0x24($v0) -/* DF1740 802428A0 0C00FB3A */ jal get_enemy -/* DF1744 802428A4 AE020028 */ sw $v0, 0x28($s0) -/* DF1748 802428A8 86240008 */ lh $a0, 8($s1) -/* DF174C 802428AC 24030001 */ addiu $v1, $zero, 1 -/* DF1750 802428B0 AC43006C */ sw $v1, 0x6c($v0) -/* DF1754 802428B4 AC44007C */ sw $a0, 0x7c($v0) -.L802428B8: -/* DF1758 802428B8 96220076 */ lhu $v0, 0x76($s1) -/* DF175C 802428BC A602008E */ sh $v0, 0x8e($s0) -/* DF1760 802428C0 24020021 */ addiu $v0, $zero, 0x21 -/* DF1764 802428C4 AE420070 */ sw $v0, 0x70($s2) -.L802428C8: -/* DF1768 802428C8 8FBF003C */ lw $ra, 0x3c($sp) -/* DF176C 802428CC 8FB20038 */ lw $s2, 0x38($sp) -/* DF1770 802428D0 8FB10034 */ lw $s1, 0x34($sp) -/* DF1774 802428D4 8FB00030 */ lw $s0, 0x30($sp) -/* DF1778 802428D8 03E00008 */ jr $ra -/* DF177C 802428DC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s deleted file mode 100644 index 82fa5a7419..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802479D0_DF6870 -.word .L80243530_DF23D0, .L80243540_DF23E0, .L80243558_DF23F8, .L80243568_DF2408, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243580_DF2420, .L80243590_DF2430, .L802435A8_DF2448, .L80243620_DF24C0, .L80243638_DF24D8, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243650_DF24F0, .L80243660_DF2500, .L80243670_DF2510, .L80243680_DF2520, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243698_DF2538, .L80243690_DF2530 - -.section .text - -glabel func_802433A0_DF2240 -/* DF2240 802433A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF2244 802433A4 AFB3003C */ sw $s3, 0x3c($sp) -/* DF2248 802433A8 0080982D */ daddu $s3, $a0, $zero -/* DF224C 802433AC AFBF0048 */ sw $ra, 0x48($sp) -/* DF2250 802433B0 AFB50044 */ sw $s5, 0x44($sp) -/* DF2254 802433B4 AFB40040 */ sw $s4, 0x40($sp) -/* DF2258 802433B8 AFB20038 */ sw $s2, 0x38($sp) -/* DF225C 802433BC AFB10034 */ sw $s1, 0x34($sp) -/* DF2260 802433C0 AFB00030 */ sw $s0, 0x30($sp) -/* DF2264 802433C4 8E720148 */ lw $s2, 0x148($s3) -/* DF2268 802433C8 86440008 */ lh $a0, 8($s2) -/* DF226C 802433CC 8E70000C */ lw $s0, 0xc($s3) -/* DF2270 802433D0 0C00EABB */ jal get_npc_unsafe -/* DF2274 802433D4 00A0882D */ daddu $s1, $a1, $zero -/* DF2278 802433D8 0260202D */ daddu $a0, $s3, $zero -/* DF227C 802433DC 8E050000 */ lw $a1, ($s0) -/* DF2280 802433E0 0C0B1EAF */ jal evt_get_variable -/* DF2284 802433E4 0040A02D */ daddu $s4, $v0, $zero -/* DF2288 802433E8 AFA00010 */ sw $zero, 0x10($sp) -/* DF228C 802433EC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF2290 802433F0 8C630030 */ lw $v1, 0x30($v1) -/* DF2294 802433F4 AFA30014 */ sw $v1, 0x14($sp) -/* DF2298 802433F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF229C 802433FC 8C63001C */ lw $v1, 0x1c($v1) -/* DF22A0 80243400 AFA30018 */ sw $v1, 0x18($sp) -/* DF22A4 80243404 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF22A8 80243408 8C630024 */ lw $v1, 0x24($v1) -/* DF22AC 8024340C AFA3001C */ sw $v1, 0x1c($sp) -/* DF22B0 80243410 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF22B4 80243414 8C630028 */ lw $v1, 0x28($v1) -/* DF22B8 80243418 27B50010 */ addiu $s5, $sp, 0x10 -/* DF22BC 8024341C AFA30020 */ sw $v1, 0x20($sp) -/* DF22C0 80243420 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF22C4 80243424 3C014220 */ lui $at, 0x4220 -/* DF22C8 80243428 44810000 */ mtc1 $at, $f0 -/* DF22CC 8024342C 8C63002C */ lw $v1, 0x2c($v1) -/* DF22D0 80243430 0040802D */ daddu $s0, $v0, $zero -/* DF22D4 80243434 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF22D8 80243438 A7A0002C */ sh $zero, 0x2c($sp) -/* DF22DC 8024343C 16200005 */ bnez $s1, .L80243454 -/* DF22E0 80243440 AFA30024 */ sw $v1, 0x24($sp) -/* DF22E4 80243444 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF22E8 80243448 30420004 */ andi $v0, $v0, 4 -/* DF22EC 8024344C 1040002F */ beqz $v0, .L8024350C -/* DF22F0 80243450 00000000 */ nop -.L80243454: -/* DF22F4 80243454 2404F7FF */ addiu $a0, $zero, -0x801 -/* DF22F8 80243458 AE600070 */ sw $zero, 0x70($s3) -/* DF22FC 8024345C A680008E */ sh $zero, 0x8e($s4) -/* DF2300 80243460 8E4200CC */ lw $v0, 0xcc($s2) -/* DF2304 80243464 8E830000 */ lw $v1, ($s4) -/* DF2308 80243468 8C420000 */ lw $v0, ($v0) -/* DF230C 8024346C 00641824 */ and $v1, $v1, $a0 -/* DF2310 80243470 AE830000 */ sw $v1, ($s4) -/* DF2314 80243474 AE820028 */ sw $v0, 0x28($s4) -/* DF2318 80243478 8E4200D0 */ lw $v0, 0xd0($s2) -/* DF231C 8024347C 8C420034 */ lw $v0, 0x34($v0) -/* DF2320 80243480 54400005 */ bnel $v0, $zero, .L80243498 -/* DF2324 80243484 2402FDFF */ addiu $v0, $zero, -0x201 -/* DF2328 80243488 34620200 */ ori $v0, $v1, 0x200 -/* DF232C 8024348C 2403FFF7 */ addiu $v1, $zero, -9 -/* DF2330 80243490 08090D28 */ j .L802434A0 -/* DF2334 80243494 00431024 */ and $v0, $v0, $v1 -.L80243498: -/* DF2338 80243498 00621024 */ and $v0, $v1, $v0 -/* DF233C 8024349C 34420008 */ ori $v0, $v0, 8 -.L802434A0: -/* DF2340 802434A0 AE820000 */ sw $v0, ($s4) -/* DF2344 802434A4 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF2348 802434A8 30420004 */ andi $v0, $v0, 4 -/* DF234C 802434AC 10400008 */ beqz $v0, .L802434D0 -/* DF2350 802434B0 24020063 */ addiu $v0, $zero, 0x63 -/* DF2354 802434B4 AE620070 */ sw $v0, 0x70($s3) -/* DF2358 802434B8 AE600074 */ sw $zero, 0x74($s3) -/* DF235C 802434BC 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF2360 802434C0 2403FFFB */ addiu $v1, $zero, -5 -/* DF2364 802434C4 00431024 */ and $v0, $v0, $v1 -/* DF2368 802434C8 08090D3A */ j .L802434E8 -/* DF236C 802434CC AE4200B0 */ sw $v0, 0xb0($s2) -.L802434D0: -/* DF2370 802434D0 8E420000 */ lw $v0, ($s2) -/* DF2374 802434D4 3C034000 */ lui $v1, 0x4000 -/* DF2378 802434D8 00431024 */ and $v0, $v0, $v1 -/* DF237C 802434DC 10400002 */ beqz $v0, .L802434E8 -/* DF2380 802434E0 2402000C */ addiu $v0, $zero, 0xc -/* DF2384 802434E4 AE620070 */ sw $v0, 0x70($s3) -.L802434E8: -/* DF2388 802434E8 3C05BFFF */ lui $a1, 0xbfff -/* DF238C 802434EC 34A5FFFF */ ori $a1, $a1, 0xffff -/* DF2390 802434F0 2404FFFB */ addiu $a0, $zero, -5 -/* DF2394 802434F4 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF2398 802434F8 8E430000 */ lw $v1, ($s2) -/* DF239C 802434FC 00441024 */ and $v0, $v0, $a0 -/* DF23A0 80243500 00651824 */ and $v1, $v1, $a1 -/* DF23A4 80243504 AE4200B0 */ sw $v0, 0xb0($s2) -/* DF23A8 80243508 AE430000 */ sw $v1, ($s2) -.L8024350C: -/* DF23AC 8024350C 8E630070 */ lw $v1, 0x70($s3) -/* DF23B0 80243510 2C620064 */ sltiu $v0, $v1, 0x64 -/* DF23B4 80243514 10400060 */ beqz $v0, .L80243698_DF2538 -/* DF23B8 80243518 00031080 */ sll $v0, $v1, 2 -/* DF23BC 8024351C 3C018024 */ lui $at, %hi(jtbl_802479D0_DF6870) -/* DF23C0 80243520 00220821 */ addu $at, $at, $v0 -/* DF23C4 80243524 8C2279D0 */ lw $v0, %lo(jtbl_802479D0_DF6870)($at) -/* DF23C8 80243528 00400008 */ jr $v0 -/* DF23CC 8024352C 00000000 */ nop -.L80243530_DF23D0: -/* DF23D0 80243530 0260202D */ daddu $a0, $s3, $zero -/* DF23D4 80243534 0200282D */ daddu $a1, $s0, $zero -/* DF23D8 80243538 0C012568 */ jal func_800495A0 -/* DF23DC 8024353C 02A0302D */ daddu $a2, $s5, $zero -.L80243540_DF23E0: -/* DF23E0 80243540 0260202D */ daddu $a0, $s3, $zero -/* DF23E4 80243544 0200282D */ daddu $a1, $s0, $zero -/* DF23E8 80243548 0C0125AE */ jal func_800496B8 -/* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero -/* DF23F0 80243550 08090DA6 */ j .L80243698_DF2538 -/* DF23F4 80243554 00000000 */ nop -.L80243558_DF23F8: -/* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero -/* DF23FC 8024355C 0200282D */ daddu $a1, $s0, $zero -/* DF2400 80243560 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* DF2404 80243564 02A0302D */ daddu $a2, $s5, $zero -.L80243568_DF2408: -/* DF2408 80243568 0260202D */ daddu $a0, $s3, $zero -/* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero -/* DF2410 80243570 0C012701 */ jal func_80049C04 -/* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero -/* DF2418 80243578 08090DA6 */ j .L80243698_DF2538 -/* DF241C 8024357C 00000000 */ nop -.L80243580_DF2420: -/* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero -/* DF2424 80243584 0200282D */ daddu $a1, $s0, $zero -/* DF2428 80243588 0C01278F */ jal func_80049E3C -/* DF242C 8024358C 02A0302D */ daddu $a2, $s5, $zero -.L80243590_DF2430: -/* DF2430 80243590 0260202D */ daddu $a0, $s3, $zero -/* DF2434 80243594 0200282D */ daddu $a1, $s0, $zero -/* DF2438 80243598 0C0127B3 */ jal func_80049ECC -/* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero -/* DF2440 802435A0 08090DA6 */ j .L80243698_DF2538 -/* DF2444 802435A4 00000000 */ nop -.L802435A8_DF2448: -/* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF244C 802435AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF2450 802435B0 C68C0038 */ lwc1 $f12, 0x38($s4) -/* DF2454 802435B4 C68E0040 */ lwc1 $f14, 0x40($s4) -/* DF2458 802435B8 8C460028 */ lw $a2, 0x28($v0) -/* DF245C 802435BC 0C00A7B5 */ jal dist2D -/* DF2460 802435C0 8C470030 */ lw $a3, 0x30($v0) -/* DF2464 802435C4 8E42006C */ lw $v0, 0x6c($s2) -/* DF2468 802435C8 10400008 */ beqz $v0, .L802435EC -/* DF246C 802435CC 46000086 */ mov.s $f2, $f0 -/* DF2470 802435D0 44820000 */ mtc1 $v0, $f0 -/* DF2474 802435D4 00000000 */ nop -/* DF2478 802435D8 46800020 */ cvt.s.w $f0, $f0 -/* DF247C 802435DC 4602003C */ c.lt.s $f0, $f2 -/* DF2480 802435E0 00000000 */ nop -/* DF2484 802435E4 4500000B */ bc1f .L80243614 -/* DF2488 802435E8 0260202D */ daddu $a0, $s3, $zero -.L802435EC: -/* DF248C 802435EC 0260202D */ daddu $a0, $s3, $zero -/* DF2490 802435F0 8E050024 */ lw $a1, 0x24($s0) -/* DF2494 802435F4 8E060028 */ lw $a2, 0x28($s0) -/* DF2498 802435F8 0C0909A7 */ jal func_8024269C_DF153C -/* DF249C 802435FC 02A0382D */ daddu $a3, $s5, $zero -/* DF24A0 80243600 8E630070 */ lw $v1, 0x70($s3) -/* DF24A4 80243604 2402000C */ addiu $v0, $zero, 0xc -/* DF24A8 80243608 14620023 */ bne $v1, $v0, .L80243698_DF2538 -/* DF24AC 8024360C 00000000 */ nop -/* DF24B0 80243610 0260202D */ daddu $a0, $s3, $zero -.L80243614: -/* DF24B4 80243614 0200282D */ daddu $a1, $s0, $zero -/* DF24B8 80243618 0C0127DF */ jal func_80049F7C -/* DF24BC 8024361C 02A0302D */ daddu $a2, $s5, $zero -.L80243620_DF24C0: -/* DF24C0 80243620 0260202D */ daddu $a0, $s3, $zero -/* DF24C4 80243624 0200282D */ daddu $a1, $s0, $zero -/* DF24C8 80243628 0C012849 */ jal func_8004A124 -/* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero -/* DF24D0 80243630 08090DA6 */ j .L80243698_DF2538 -/* DF24D4 80243634 00000000 */ nop -.L80243638_DF24D8: -/* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero -/* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero -/* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 -/* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero -/* DF24E8 80243648 08090DA6 */ j .L80243698_DF2538 -/* DF24EC 8024364C 00000000 */ nop -.L80243650_DF24F0: -/* DF24F0 80243650 0C0909F8 */ jal func_802427E0_DF1680 -/* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero -/* DF24F8 80243658 08090DA6 */ j .L80243698_DF2538 -/* DF24FC 8024365C 00000000 */ nop -.L80243660_DF2500: -/* DF2500 80243660 0C090A38 */ jal omo_17_UnkSetDurationFunc -/* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero -/* DF2508 80243668 08090DA6 */ j .L80243698_DF2538 -/* DF250C 8024366C 00000000 */ nop -.L80243670_DF2510: -/* DF2510 80243670 0C090A49 */ jal omo_17_UnkNpcAIFunc9 -/* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero -/* DF2518 80243678 08090DA6 */ j .L80243698_DF2538 -/* DF251C 8024367C 00000000 */ nop -.L80243680_DF2520: -/* DF2520 80243680 0C090A71 */ jal omo_17_UnkDurationCheck -/* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero -/* DF2528 80243688 08090DA6 */ j .L80243698_DF2538 -/* DF252C 8024368C 00000000 */ nop -.L80243690_DF2530: -/* DF2530 80243690 0C0129CF */ jal func_8004A73C -/* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero -.L80243698_DF2538: -/* DF2538 80243698 8FBF0048 */ lw $ra, 0x48($sp) -/* DF253C 8024369C 8FB50044 */ lw $s5, 0x44($sp) -/* DF2540 802436A0 8FB40040 */ lw $s4, 0x40($sp) -/* DF2544 802436A4 8FB3003C */ lw $s3, 0x3c($sp) -/* DF2548 802436A8 8FB20038 */ lw $s2, 0x38($sp) -/* DF254C 802436AC 8FB10034 */ lw $s1, 0x34($sp) -/* DF2550 802436B0 8FB00030 */ lw $s0, 0x30($sp) -/* DF2554 802436B4 0000102D */ daddu $v0, $zero, $zero -/* DF2558 802436B8 03E00008 */ jr $ra -/* DF255C 802436BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s index 74f23ff052..6467a06008 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s @@ -13,8 +13,8 @@ glabel func_80241274_D65854 /* D65874 80241294 8C620000 */ lw $v0, ($v1) /* D65878 80241298 5040000A */ beql $v0, $zero, .L802412C4 /* D6587C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D65880 802412A0 3C058024 */ lui $a1, %hi(D_802438E8_A4BEA8) -/* D65884 802412A4 24A538E8 */ addiu $a1, $a1, %lo(D_802438E8_A4BEA8) +/* D65880 802412A0 3C058024 */ lui $a1, %hi(pra_13_802438E8) +/* D65884 802412A4 24A538E8 */ addiu $a1, $a1, %lo(pra_13_802438E8) .L802412A8: /* D65888 802412A8 24630004 */ addiu $v1, $v1, 4 /* D6588C 802412AC 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_80241274_D65854 /* D6589C 802412BC 24A50004 */ addiu $a1, $a1, 4 /* D658A0 802412C0 00041080 */ sll $v0, $a0, 2 .L802412C4: -/* D658A4 802412C4 3C018024 */ lui $at, %hi(D_802438E8_A4BEA8) +/* D658A4 802412C4 3C018024 */ lui $at, %hi(pra_13_802438E8) /* D658A8 802412C8 00220821 */ addu $at, $at, $v0 -/* D658AC 802412CC AC2038E8 */ sw $zero, %lo(D_802438E8_A4BEA8)($at) +/* D658AC 802412CC AC2038E8 */ sw $zero, %lo(pra_13_802438E8)($at) /* D658B0 802412D0 080904C0 */ j .L80241300 /* D658B4 802412D4 00000000 */ nop .L802412D8: -/* D658B8 802412D8 3C038024 */ lui $v1, %hi(D_802438E8_A4BEA8) -/* D658BC 802412DC 246338E8 */ addiu $v1, $v1, %lo(D_802438E8_A4BEA8) +/* D658B8 802412D8 3C038024 */ lui $v1, %hi(pra_13_802438E8) +/* D658BC 802412DC 246338E8 */ addiu $v1, $v1, %lo(pra_13_802438E8) /* D658C0 802412E0 0060282D */ daddu $a1, $v1, $zero .L802412E4: /* D658C4 802412E4 24820080 */ addiu $v0, $a0, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s index d355a8d14e..f6fbd370a2 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s @@ -13,8 +13,8 @@ glabel func_80241274_D6FC24 /* D6FC44 80241294 8C620000 */ lw $v0, ($v1) /* D6FC48 80241298 5040000A */ beql $v0, $zero, .L802412C4 /* D6FC4C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D6FC50 802412A0 3C058024 */ lui $a1, %hi(D_80247BB8_DA5088) -/* D6FC54 802412A4 24A57BB8 */ addiu $a1, $a1, %lo(D_80247BB8_DA5088) +/* D6FC50 802412A0 3C058024 */ lui $a1, %hi(D_80247BB8_pra_19) +/* D6FC54 802412A4 24A57BB8 */ addiu $a1, $a1, %lo(D_80247BB8_pra_19) .L802412A8: /* D6FC58 802412A8 24630004 */ addiu $v1, $v1, 4 /* D6FC5C 802412AC 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_80241274_D6FC24 /* D6FC6C 802412BC 24A50004 */ addiu $a1, $a1, 4 /* D6FC70 802412C0 00041080 */ sll $v0, $a0, 2 .L802412C4: -/* D6FC74 802412C4 3C018024 */ lui $at, %hi(D_80247BB8_DA5088) +/* D6FC74 802412C4 3C018024 */ lui $at, %hi(D_80247BB8_pra_19) /* D6FC78 802412C8 00220821 */ addu $at, $at, $v0 -/* D6FC7C 802412CC AC207BB8 */ sw $zero, %lo(D_80247BB8_DA5088)($at) +/* D6FC7C 802412CC AC207BB8 */ sw $zero, %lo(D_80247BB8_pra_19)($at) /* D6FC80 802412D0 080904C0 */ j .L80241300 /* D6FC84 802412D4 00000000 */ nop .L802412D8: -/* D6FC88 802412D8 3C038024 */ lui $v1, %hi(D_80247BB8_DA5088) -/* D6FC8C 802412DC 24637BB8 */ addiu $v1, $v1, %lo(D_80247BB8_DA5088) +/* D6FC88 802412D8 3C038024 */ lui $v1, %hi(D_80247BB8_pra_19) +/* D6FC8C 802412DC 24637BB8 */ addiu $v1, $v1, %lo(D_80247BB8_pra_19) /* D6FC90 802412E0 0060282D */ daddu $a1, $v1, $zero .L802412E4: /* D6FC94 802412E4 24820080 */ addiu $v0, $a0, 0x80 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s deleted file mode 100644 index aeab035b91..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A4_D21034 -/* D21034 802411A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21038 802411A8 AFB00010 */ sw $s0, 0x10($sp) -/* D2103C 802411AC 0080802D */ daddu $s0, $a0, $zero -/* D21040 802411B0 AFBF0014 */ sw $ra, 0x14($sp) -/* D21044 802411B4 8E020148 */ lw $v0, 0x148($s0) -/* D21048 802411B8 0C00EABB */ jal get_npc_unsafe -/* D2104C 802411BC 84440008 */ lh $a0, 8($v0) -/* D21050 802411C0 9443008E */ lhu $v1, 0x8e($v0) -/* D21054 802411C4 C440003C */ lwc1 $f0, 0x3c($v0) -/* D21058 802411C8 24640001 */ addiu $a0, $v1, 1 -/* D2105C 802411CC 00031C00 */ sll $v1, $v1, 0x10 -/* D21060 802411D0 00031B83 */ sra $v1, $v1, 0xe -/* D21064 802411D4 A444008E */ sh $a0, 0x8e($v0) -/* D21068 802411D8 3C018024 */ lui $at, %hi(D_802441B8_D24048) -/* D2106C 802411DC 00230821 */ addu $at, $at, $v1 -/* D21070 802411E0 C42241B8 */ lwc1 $f2, %lo(D_802441B8_D24048)($at) -/* D21074 802411E4 8443008E */ lh $v1, 0x8e($v0) -/* D21078 802411E8 46020000 */ add.s $f0, $f0, $f2 -/* D2107C 802411EC 28630005 */ slti $v1, $v1, 5 -/* D21080 802411F0 14600003 */ bnez $v1, .L80241200 -/* D21084 802411F4 E440003C */ swc1 $f0, 0x3c($v0) -/* D21088 802411F8 2402000C */ addiu $v0, $zero, 0xc -/* D2108C 802411FC AE020070 */ sw $v0, 0x70($s0) -.L80241200: -/* D21090 80241200 8FBF0014 */ lw $ra, 0x14($sp) -/* D21094 80241204 8FB00010 */ lw $s0, 0x10($sp) -/* D21098 80241208 03E00008 */ jr $ra -/* D2109C 8024120C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s deleted file mode 100644 index dd75df88ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8024BE58_D2BCE8 -.word .L80241968_D217F8, .L80241978_D21808, .L80241990_D21820, .L802419A0_D21830, .L80241A20_D218B0, .L80241A20_D218B0, .L80241A20_D218B0, .L80241A20_D218B0, .L80241A20_D218B0, .L80241A20_D218B0, .L802419B8_D21848, .L802419C8_D21858, .L802419E0_D21870, .L802419F8_D21888, .L80241A10_D218A0, 0, 0, 0 - -.section .text - -glabel func_8024185C_D216EC -/* D216EC 8024185C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D216F0 80241860 AFB40040 */ sw $s4, 0x40($sp) -/* D216F4 80241864 0080A02D */ daddu $s4, $a0, $zero -/* D216F8 80241868 AFBF0048 */ sw $ra, 0x48($sp) -/* D216FC 8024186C AFB50044 */ sw $s5, 0x44($sp) -/* D21700 80241870 AFB3003C */ sw $s3, 0x3c($sp) -/* D21704 80241874 AFB20038 */ sw $s2, 0x38($sp) -/* D21708 80241878 AFB10034 */ sw $s1, 0x34($sp) -/* D2170C 8024187C AFB00030 */ sw $s0, 0x30($sp) -/* D21710 80241880 8E920148 */ lw $s2, 0x148($s4) -/* D21714 80241884 86440008 */ lh $a0, 8($s2) -/* D21718 80241888 8E90000C */ lw $s0, 0xc($s4) -/* D2171C 8024188C 0C00EABB */ jal get_npc_unsafe -/* D21720 80241890 00A0882D */ daddu $s1, $a1, $zero -/* D21724 80241894 0280202D */ daddu $a0, $s4, $zero -/* D21728 80241898 8E050000 */ lw $a1, ($s0) -/* D2172C 8024189C 0C0B1EAF */ jal evt_get_variable -/* D21730 802418A0 0040A82D */ daddu $s5, $v0, $zero -/* D21734 802418A4 AFA00010 */ sw $zero, 0x10($sp) -/* D21738 802418A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* D2173C 802418AC 8C630030 */ lw $v1, 0x30($v1) -/* D21740 802418B0 AFA30014 */ sw $v1, 0x14($sp) -/* D21744 802418B4 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21748 802418B8 8C63001C */ lw $v1, 0x1c($v1) -/* D2174C 802418BC AFA30018 */ sw $v1, 0x18($sp) -/* D21750 802418C0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21754 802418C4 8C630024 */ lw $v1, 0x24($v1) -/* D21758 802418C8 AFA3001C */ sw $v1, 0x1c($sp) -/* D2175C 802418CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21760 802418D0 8C630028 */ lw $v1, 0x28($v1) -/* D21764 802418D4 27B30010 */ addiu $s3, $sp, 0x10 -/* D21768 802418D8 AFA30020 */ sw $v1, 0x20($sp) -/* D2176C 802418DC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21770 802418E0 3C0142F0 */ lui $at, 0x42f0 -/* D21774 802418E4 44810000 */ mtc1 $at, $f0 -/* D21778 802418E8 8C63002C */ lw $v1, 0x2c($v1) -/* D2177C 802418EC 0040802D */ daddu $s0, $v0, $zero -/* D21780 802418F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D21784 802418F4 A7A0002C */ sh $zero, 0x2c($sp) -/* D21788 802418F8 12200006 */ beqz $s1, .L80241914 -/* D2178C 802418FC AFA30024 */ sw $v1, 0x24($sp) -/* D21790 80241900 02A0202D */ daddu $a0, $s5, $zero -/* D21794 80241904 0240282D */ daddu $a1, $s2, $zero -/* D21798 80241908 0280302D */ daddu $a2, $s4, $zero -/* D2179C 8024190C 0C0905CE */ jal sam_06_UnkFunc5 -/* D217A0 80241910 0200382D */ daddu $a3, $s0, $zero -.L80241914: -/* D217A4 80241914 2402FFFE */ addiu $v0, $zero, -2 -/* D217A8 80241918 A2A200AB */ sb $v0, 0xab($s5) -/* D217AC 8024191C 8E4300B0 */ lw $v1, 0xb0($s2) -/* D217B0 80241920 30620004 */ andi $v0, $v1, 4 -/* D217B4 80241924 10400007 */ beqz $v0, .L80241944 -/* D217B8 80241928 00000000 */ nop -/* D217BC 8024192C 824200B4 */ lb $v0, 0xb4($s2) -/* D217C0 80241930 1440003C */ bnez $v0, .L80241A24 -/* D217C4 80241934 0000102D */ daddu $v0, $zero, $zero -/* D217C8 80241938 2402FFFB */ addiu $v0, $zero, -5 -/* D217CC 8024193C 00621024 */ and $v0, $v1, $v0 -/* D217D0 80241940 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241944: -/* D217D4 80241944 8E830070 */ lw $v1, 0x70($s4) -/* D217D8 80241948 2C62000F */ sltiu $v0, $v1, 0xf -/* D217DC 8024194C 10400034 */ beqz $v0, .L80241A20_D218B0 -/* D217E0 80241950 00031080 */ sll $v0, $v1, 2 -/* D217E4 80241954 3C018025 */ lui $at, %hi(jtbl_8024BE58_D2BCE8) -/* D217E8 80241958 00220821 */ addu $at, $at, $v0 -/* D217EC 8024195C 8C22BE58 */ lw $v0, %lo(jtbl_8024BE58_D2BCE8)($at) -/* D217F0 80241960 00400008 */ jr $v0 -/* D217F4 80241964 00000000 */ nop -.L80241968_D217F8: -/* D217F8 80241968 0280202D */ daddu $a0, $s4, $zero -/* D217FC 8024196C 0200282D */ daddu $a1, $s0, $zero -/* D21800 80241970 0C090154 */ jal sam_06_UnkNpcAIFunc23 -/* D21804 80241974 0260302D */ daddu $a2, $s3, $zero -.L80241978_D21808: -/* D21808 80241978 0280202D */ daddu $a0, $s4, $zero -/* D2180C 8024197C 0200282D */ daddu $a1, $s0, $zero -/* D21810 80241980 0C0901C0 */ jal sam_06_UnkNpcAIFunc35 -/* D21814 80241984 0260302D */ daddu $a2, $s3, $zero -/* D21818 80241988 08090689 */ j .L80241A24 -/* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero -.L80241990_D21820: -/* D21820 80241990 0280202D */ daddu $a0, $s4, $zero -/* D21824 80241994 0200282D */ daddu $a1, $s0, $zero -/* D21828 80241998 0C09034A */ jal sam_06_UnkNpcAIFunc1 -/* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero -.L802419A0_D21830: -/* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero -/* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero -/* D21838 802419A8 0C09037A */ jal sam_06_UnkFunc4 -/* D2183C 802419AC 0260302D */ daddu $a2, $s3, $zero -/* D21840 802419B0 08090689 */ j .L80241A24 -/* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero -.L802419B8_D21848: -/* D21848 802419B8 0280202D */ daddu $a0, $s4, $zero -/* D2184C 802419BC 0200282D */ daddu $a1, $s0, $zero -/* D21850 802419C0 0C09044B */ jal sam_06_UnkNpcAIFunc2 -/* D21854 802419C4 0260302D */ daddu $a2, $s3, $zero -.L802419C8_D21858: -/* D21858 802419C8 0280202D */ daddu $a0, $s4, $zero -/* D2185C 802419CC 0200282D */ daddu $a1, $s0, $zero -/* D21860 802419D0 0C090469 */ jal func_802411A4_D21034 -/* D21864 802419D4 0260302D */ daddu $a2, $s3, $zero -/* D21868 802419D8 08090689 */ j .L80241A24 -/* D2186C 802419DC 0000102D */ daddu $v0, $zero, $zero -.L802419E0_D21870: -/* D21870 802419E0 0280202D */ daddu $a0, $s4, $zero -/* D21874 802419E4 0200282D */ daddu $a1, $s0, $zero -/* D21878 802419E8 0C090484 */ jal sam_06_UnkNpcAIFunc14 -/* D2187C 802419EC 0260302D */ daddu $a2, $s3, $zero -/* D21880 802419F0 08090689 */ j .L80241A24 -/* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero -.L802419F8_D21888: -/* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero -/* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero -/* D21890 80241A00 0C0904D1 */ jal sam_06_UnkNpcAIFunc3 -/* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero -/* D21898 80241A08 08090689 */ j .L80241A24 -/* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero -.L80241A10_D218A0: -/* D218A0 80241A10 0280202D */ daddu $a0, $s4, $zero -/* D218A4 80241A14 0200282D */ daddu $a1, $s0, $zero -/* D218A8 80241A18 0C0904EA */ jal sam_06_UnkFunc6 -/* D218AC 80241A1C 0260302D */ daddu $a2, $s3, $zero -.L80241A20_D218B0: -/* D218B0 80241A20 0000102D */ daddu $v0, $zero, $zero -.L80241A24: -/* D218B4 80241A24 8FBF0048 */ lw $ra, 0x48($sp) -/* D218B8 80241A28 8FB50044 */ lw $s5, 0x44($sp) -/* D218BC 80241A2C 8FB40040 */ lw $s4, 0x40($sp) -/* D218C0 80241A30 8FB3003C */ lw $s3, 0x3c($sp) -/* D218C4 80241A34 8FB20038 */ lw $s2, 0x38($sp) -/* D218C8 80241A38 8FB10034 */ lw $s1, 0x34($sp) -/* D218CC 80241A3C 8FB00030 */ lw $s0, 0x30($sp) -/* D218D0 80241A40 03E00008 */ jr $ra -/* D218D4 80241A44 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s deleted file mode 100644 index 27fb585297..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600_D30280 -/* D30280 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* D30284 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* D30288 80240608 0080B02D */ daddu $s6, $a0, $zero -/* D3028C 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* D30290 80240610 00A0802D */ daddu $s0, $a1, $zero -/* D30294 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* D30298 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* D3029C 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* D302A0 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* D302A4 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* D302A8 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* D302AC 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* D302B0 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* D302B4 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* D302B8 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* D302BC 8024063C 0C00EAD2 */ jal get_npc_safe -/* D302C0 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* D302C4 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* D302C8 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* D302CC 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* D302D0 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* D302D4 80240654 00041880 */ sll $v1, $a0, 2 -/* D302D8 80240658 00641821 */ addu $v1, $v1, $a0 -/* D302DC 8024065C 00031880 */ sll $v1, $v1, 2 -/* D302E0 80240660 00641823 */ subu $v1, $v1, $a0 -/* D302E4 80240664 000320C0 */ sll $a0, $v1, 3 -/* D302E8 80240668 00641821 */ addu $v1, $v1, $a0 -/* D302EC 8024066C 000318C0 */ sll $v1, $v1, 3 -/* D302F0 80240670 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* D302F4 80240674 00230821 */ addu $at, $at, $v1 -/* D302F8 80240678 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* D302FC 8024067C 0C00A88D */ jal sin_cos_deg -/* D30300 80240680 0040A82D */ daddu $s5, $v0, $zero -/* D30304 80240684 1200005D */ beqz $s0, .L802407FC -/* D30308 80240688 00000000 */ nop -/* D3030C 8024068C 0C00AB0A */ jal general_heap_malloc -/* D30310 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* D30314 80240694 0040902D */ daddu $s2, $v0, $zero -/* D30318 80240698 02C0202D */ daddu $a0, $s6, $zero -/* D3031C 8024069C 0000882D */ daddu $s1, $zero, $zero -/* D30320 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* D30324 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* D30328 802406A8 8E650000 */ lw $a1, ($s3) -/* D3032C 802406AC 3C014148 */ lui $at, 0x4148 -/* D30330 802406B0 4481C000 */ mtc1 $at, $f24 -/* D30334 802406B4 3C013F80 */ lui $at, 0x3f80 -/* D30338 802406B8 4481B000 */ mtc1 $at, $f22 -/* D3033C 802406BC 4480A000 */ mtc1 $zero, $f20 -/* D30340 802406C0 0C0B1EAF */ jal evt_get_variable -/* D30344 802406C4 0240802D */ daddu $s0, $s2, $zero -/* D30348 802406C8 0C04417A */ jal get_entity_by_index -/* D3034C 802406CC 0040202D */ daddu $a0, $v0, $zero -/* D30350 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* D30354 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* D30358 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* D3035C 802406DC 0000202D */ daddu $a0, $zero, $zero -/* D30360 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* D30364 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* D30368 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* D3036C 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* D30370 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* D30374 802406F4 44060000 */ mfc1 $a2, $f0 -/* D30378 802406F8 0C01C5BC */ jal fx_motion_blur_flame -/* D3037C 802406FC 26310001 */ addiu $s1, $s1, 1 -/* D30380 80240700 AE020008 */ sw $v0, 8($s0) -/* D30384 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* D30388 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* D3038C 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* D30390 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* D30394 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* D30398 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* D3039C 8024071C 2A220003 */ slti $v0, $s1, 3 -/* D303A0 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* D303A4 80240724 26100004 */ addiu $s0, $s0, 4 -/* D303A8 80240728 0000882D */ daddu $s1, $zero, $zero -/* D303AC 8024072C 0240802D */ daddu $s0, $s2, $zero -/* D303B0 80240730 3C148024 */ lui $s4, %hi(D_80241B38_D317B8) -/* D303B4 80240734 26941B38 */ addiu $s4, $s4, %lo(D_80241B38_D317B8) -/* D303B8 80240738 3C014248 */ lui $at, 0x4248 -/* D303BC 8024073C 4481A000 */ mtc1 $at, $f20 -/* D303C0 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* D303C4 80240744 AE400000 */ sw $zero, ($s2) -/* D303C8 80240748 AE400004 */ sw $zero, 4($s2) -/* D303CC 8024074C AE400060 */ sw $zero, 0x60($s2) -/* D303D0 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* D303D4 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* D303D8 80240758 4406A000 */ mfc1 $a2, $f20 -/* D303DC 8024075C 8E870000 */ lw $a3, ($s4) -/* D303E0 80240760 02532821 */ addu $a1, $s2, $s3 -/* D303E4 80240764 0C00A7E7 */ jal add_vec2D_polar -/* D303E8 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* D303EC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* D303F0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* D303F4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* D303F8 80240778 00000000 */ nop -/* D303FC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* D30400 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* D30404 80240784 00000000 */ nop -/* D30408 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* D3040C 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* D30410 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* D30414 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* D30418 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* D3041C 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* D30420 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* D30424 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* D30428 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* D3042C 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* D30430 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* D30434 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* D30438 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* D3043C 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* D30440 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* D30444 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* D30448 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* D3044C 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* D30450 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* D30454 802407D4 26940004 */ addiu $s4, $s4, 4 -/* D30458 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* D3045C 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* D30460 802407E0 26730004 */ addiu $s3, $s3, 4 -/* D30464 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* D30468 802407E8 26310001 */ addiu $s1, $s1, 1 -/* D3046C 802407EC 2A220003 */ slti $v0, $s1, 3 -/* D30470 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* D30474 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* D30478 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* D3047C 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* D30480 80240800 8E430000 */ lw $v1, ($s2) -/* D30484 80240804 24020001 */ addiu $v0, $zero, 1 -/* D30488 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* D3048C 8024080C 28620002 */ slti $v0, $v1, 2 -/* D30490 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* D30494 80240814 24020002 */ addiu $v0, $zero, 2 -/* D30498 80240818 10600007 */ beqz $v1, .L80240838 -/* D3049C 8024081C 24040005 */ addiu $a0, $zero, 5 -/* D304A0 80240820 08090274 */ j .L802409D0 -/* D304A4 80240824 00000000 */ nop -.L80240828: -/* D304A8 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* D304AC 8024082C 00000000 */ nop -/* D304B0 80240830 08090274 */ j .L802409D0 -/* D304B4 80240834 00000000 */ nop -.L80240838: -/* D304B8 80240838 0000882D */ daddu $s1, $zero, $zero -/* D304BC 8024083C 3C148024 */ lui $s4, %hi(D_80241B38_D317B8) -/* D304C0 80240840 26941B38 */ addiu $s4, $s4, %lo(D_80241B38_D317B8) -/* D304C4 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* D304C8 80240848 3C064248 */ lui $a2, 0x4248 -/* D304CC 8024084C 44800000 */ mtc1 $zero, $f0 -/* D304D0 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* D304D4 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* D304D8 80240858 44050000 */ mfc1 $a1, $f0 -/* D304DC 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* D304E0 80240860 4485B000 */ mtc1 $a1, $f22 -/* D304E4 80240864 0C00A8ED */ jal update_lerp -/* D304E8 80240868 0240802D */ daddu $s0, $s2, $zero -/* D304EC 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* D304F0 80240870 4406A000 */ mfc1 $a2, $f20 -/* D304F4 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* D304F8 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* D304FC 8024087C 8E870000 */ lw $a3, ($s4) -/* D30500 80240880 02532821 */ addu $a1, $s2, $s3 -/* D30504 80240884 0C00A7E7 */ jal add_vec2D_polar -/* D30508 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* D3050C 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* D30510 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* D30514 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* D30518 80240898 00000000 */ nop -/* D3051C 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* D30520 802408A0 26940004 */ addiu $s4, $s4, 4 -/* D30524 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* D30528 802408A8 00000000 */ nop -/* D3052C 802408AC 26730004 */ addiu $s3, $s3, 4 -/* D30530 802408B0 26310001 */ addiu $s1, $s1, 1 -/* D30534 802408B4 2A220003 */ slti $v0, $s1, 3 -/* D30538 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* D3053C 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* D30540 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* D30544 802408C4 26100004 */ addiu $s0, $s0, 4 -/* D30548 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* D3054C 802408CC 24420001 */ addiu $v0, $v0, 1 -/* D30550 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* D30554 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* D30558 802408D8 1440003D */ bnez $v0, .L802409D0 -/* D3055C 802408DC 24020001 */ addiu $v0, $zero, 1 -/* D30560 802408E0 AE420000 */ sw $v0, ($s2) -/* D30564 802408E4 08090274 */ j .L802409D0 -/* D30568 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* D3056C 802408EC 0000882D */ daddu $s1, $zero, $zero -/* D30570 802408F0 3C148024 */ lui $s4, %hi(D_80241B38_D317B8) -/* D30574 802408F4 26941B38 */ addiu $s4, $s4, %lo(D_80241B38_D317B8) -/* D30578 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* D3057C 802408FC 0240802D */ daddu $s0, $s2, $zero -/* D30580 80240900 3C014248 */ lui $at, 0x4248 -/* D30584 80240904 4481A000 */ mtc1 $at, $f20 -/* D30588 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* D3058C 8024090C 4406A000 */ mfc1 $a2, $f20 -/* D30590 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* D30594 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* D30598 80240918 8E870000 */ lw $a3, ($s4) -/* D3059C 8024091C 02532821 */ addu $a1, $s2, $s3 -/* D305A0 80240920 0C00A7E7 */ jal add_vec2D_polar -/* D305A4 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* D305A8 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* D305AC 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* D305B0 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* D305B4 80240934 00000000 */ nop -/* D305B8 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* D305BC 8024093C 26940004 */ addiu $s4, $s4, 4 -/* D305C0 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* D305C4 80240944 00000000 */ nop -/* D305C8 80240948 26730004 */ addiu $s3, $s3, 4 -/* D305CC 8024094C 26310001 */ addiu $s1, $s1, 1 -/* D305D0 80240950 2A220003 */ slti $v0, $s1, 3 -/* D305D4 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* D305D8 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* D305DC 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* D305E0 80240960 26100004 */ addiu $s0, $s0, 4 -/* D305E4 80240964 8E420060 */ lw $v0, 0x60($s2) -/* D305E8 80240968 24420001 */ addiu $v0, $v0, 1 -/* D305EC 8024096C AE420060 */ sw $v0, 0x60($s2) -/* D305F0 80240970 28420010 */ slti $v0, $v0, 0x10 -/* D305F4 80240974 14400016 */ bnez $v0, .L802409D0 -/* D305F8 80240978 2402000F */ addiu $v0, $zero, 0xf -/* D305FC 8024097C AE420060 */ sw $v0, 0x60($s2) -/* D30600 80240980 24020002 */ addiu $v0, $zero, 2 -/* D30604 80240984 08090274 */ j .L802409D0 -/* D30608 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* D3060C 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* D30610 80240990 24420001 */ addiu $v0, $v0, 1 -/* D30614 80240994 AE420060 */ sw $v0, 0x60($s2) -/* D30618 80240998 2842001F */ slti $v0, $v0, 0x1f -/* D3061C 8024099C 1440000C */ bnez $v0, .L802409D0 -/* D30620 802409A0 0000882D */ daddu $s1, $zero, $zero -/* D30624 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* D30628 802409A8 8CA20008 */ lw $v0, 8($a1) -/* D3062C 802409AC 8C430000 */ lw $v1, ($v0) -/* D30630 802409B0 26310001 */ addiu $s1, $s1, 1 -/* D30634 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* D30638 802409B8 AC430000 */ sw $v1, ($v0) -/* D3063C 802409BC 2A220003 */ slti $v0, $s1, 3 -/* D30640 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* D30644 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* D30648 802409C8 080902C1 */ j .L80240B04 -/* D3064C 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* D30650 802409D0 8E430004 */ lw $v1, 4($s2) -/* D30654 802409D4 10600005 */ beqz $v1, .L802409EC -/* D30658 802409D8 24020001 */ addiu $v0, $zero, 1 -/* D3065C 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* D30660 802409E0 0000882D */ daddu $s1, $zero, $zero -/* D30664 802409E4 080902B0 */ j .L80240AC0 -/* D30668 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* D3066C 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* D30670 802409F0 24420001 */ addiu $v0, $v0, 1 -/* D30674 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* D30678 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* D3067C 802409FC 1440002F */ bnez $v0, .L80240ABC -/* D30680 80240A00 0000882D */ daddu $s1, $zero, $zero -/* D30684 80240A04 080902AC */ j .L80240AB0 -/* D30688 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* D3068C 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* D30690 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* D30694 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* D30698 80240A18 4405A000 */ mfc1 $a1, $f20 -/* D3069C 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* D306A0 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* D306A4 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* D306A8 80240A28 0C00A8ED */ jal update_lerp -/* D306AC 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* D306B0 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* D306B4 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* D306B8 80240A38 4405A000 */ mfc1 $a1, $f20 -/* D306BC 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* D306C0 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* D306C4 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* D306C8 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* D306CC 80240A4C 0C00A8ED */ jal update_lerp -/* D306D0 80240A50 24040001 */ addiu $a0, $zero, 1 -/* D306D4 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* D306D8 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* D306DC 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* D306E0 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* D306E4 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* D306E8 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* D306EC 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* D306F0 80240A70 0C00A8ED */ jal update_lerp -/* D306F4 80240A74 24040001 */ addiu $a0, $zero, 1 -/* D306F8 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* D306FC 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* D30700 80240A80 26310001 */ addiu $s1, $s1, 1 -/* D30704 80240A84 2A220003 */ slti $v0, $s1, 3 -/* D30708 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* D3070C 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* D30710 80240A90 26100004 */ addiu $s0, $s0, 4 -/* D30714 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* D30718 80240A98 24420001 */ addiu $v0, $v0, 1 -/* D3071C 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* D30720 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* D30724 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* D30728 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* D3072C 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* D30730 80240AB0 AE420004 */ sw $v0, 4($s2) -/* D30734 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* D30738 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* D3073C 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* D30740 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* D30744 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* D30748 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* D3074C 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* D30750 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* D30754 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* D30758 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* D3075C 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* D30760 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* D30764 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* D30768 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* D3076C 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* D30770 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* D30774 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* D30778 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* D3077C 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* D30780 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* D30784 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* D30788 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* D3078C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* D30790 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* D30794 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* D30798 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* D3079C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* D307A0 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* D307A4 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* D307A8 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* D307AC 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* D307B0 80240B30 03E00008 */ jr $ra -/* D307B4 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s deleted file mode 100644 index 04c766529a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_954640 -/* 954640 80240680 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 954644 80240684 AFB60040 */ sw $s6, 0x40($sp) -/* 954648 80240688 0080B02D */ daddu $s6, $a0, $zero -/* 95464C 8024068C AFB00028 */ sw $s0, 0x28($sp) -/* 954650 80240690 00A0802D */ daddu $s0, $a1, $zero -/* 954654 80240694 AFBF0044 */ sw $ra, 0x44($sp) -/* 954658 80240698 AFB5003C */ sw $s5, 0x3c($sp) -/* 95465C 8024069C AFB40038 */ sw $s4, 0x38($sp) -/* 954660 802406A0 AFB30034 */ sw $s3, 0x34($sp) -/* 954664 802406A4 AFB20030 */ sw $s2, 0x30($sp) -/* 954668 802406A8 AFB1002C */ sw $s1, 0x2c($sp) -/* 95466C 802406AC F7B80058 */ sdc1 $f24, 0x58($sp) -/* 954670 802406B0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 954674 802406B4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 954678 802406B8 8ED3000C */ lw $s3, 0xc($s6) -/* 95467C 802406BC 0C00EAD2 */ jal get_npc_safe -/* 954680 802406C0 2404FFFC */ addiu $a0, $zero, -4 -/* 954684 802406C4 27A50018 */ addiu $a1, $sp, 0x18 -/* 954688 802406C8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 95468C 802406CC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 954690 802406D0 27A6001C */ addiu $a2, $sp, 0x1c -/* 954694 802406D4 00041880 */ sll $v1, $a0, 2 -/* 954698 802406D8 00641821 */ addu $v1, $v1, $a0 -/* 95469C 802406DC 00031880 */ sll $v1, $v1, 2 -/* 9546A0 802406E0 00641823 */ subu $v1, $v1, $a0 -/* 9546A4 802406E4 000320C0 */ sll $a0, $v1, 3 -/* 9546A8 802406E8 00641821 */ addu $v1, $v1, $a0 -/* 9546AC 802406EC 000318C0 */ sll $v1, $v1, 3 -/* 9546B0 802406F0 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 9546B4 802406F4 00230821 */ addu $at, $at, $v1 -/* 9546B8 802406F8 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 9546BC 802406FC 0C00A88D */ jal sin_cos_deg -/* 9546C0 80240700 0040A82D */ daddu $s5, $v0, $zero -/* 9546C4 80240704 1200005D */ beqz $s0, .L8024087C -/* 9546C8 80240708 00000000 */ nop -/* 9546CC 8024070C 0C00AB0A */ jal general_heap_malloc -/* 9546D0 80240710 24040068 */ addiu $a0, $zero, 0x68 -/* 9546D4 80240714 0040902D */ daddu $s2, $v0, $zero -/* 9546D8 80240718 02C0202D */ daddu $a0, $s6, $zero -/* 9546DC 8024071C 0000882D */ daddu $s1, $zero, $zero -/* 9546E0 80240720 2414FFFF */ addiu $s4, $zero, -1 -/* 9546E4 80240724 AED20060 */ sw $s2, 0x60($s6) -/* 9546E8 80240728 8E650000 */ lw $a1, ($s3) -/* 9546EC 8024072C 3C014148 */ lui $at, 0x4148 -/* 9546F0 80240730 4481C000 */ mtc1 $at, $f24 -/* 9546F4 80240734 3C013F80 */ lui $at, 0x3f80 -/* 9546F8 80240738 4481B000 */ mtc1 $at, $f22 -/* 9546FC 8024073C 4480A000 */ mtc1 $zero, $f20 -/* 954700 80240740 0C0B1EAF */ jal evt_get_variable -/* 954704 80240744 0240802D */ daddu $s0, $s2, $zero -/* 954708 80240748 0C04417A */ jal get_entity_by_index -/* 95470C 8024074C 0040202D */ daddu $a0, $v0, $zero -/* 954710 80240750 AE42005C */ sw $v0, 0x5c($s2) -.L80240754: -/* 954714 80240754 8E42005C */ lw $v0, 0x5c($s2) -/* 954718 80240758 C440004C */ lwc1 $f0, 0x4c($v0) -/* 95471C 8024075C 0000202D */ daddu $a0, $zero, $zero -/* 954720 80240760 E7B60010 */ swc1 $f22, 0x10($sp) -/* 954724 80240764 AFB40014 */ sw $s4, 0x14($sp) -/* 954728 80240768 46180000 */ add.s $f0, $f0, $f24 -/* 95472C 8024076C 8C450048 */ lw $a1, 0x48($v0) -/* 954730 80240770 8C470050 */ lw $a3, 0x50($v0) -/* 954734 80240774 44060000 */ mfc1 $a2, $f0 -/* 954738 80240778 0C01C5BC */ jal fx_motion_blur_flame -/* 95473C 8024077C 26310001 */ addiu $s1, $s1, 1 -/* 954740 80240780 AE020008 */ sw $v0, 8($s0) -/* 954744 80240784 E614002C */ swc1 $f20, 0x2c($s0) -/* 954748 80240788 E6140020 */ swc1 $f20, 0x20($s0) -/* 95474C 8024078C E6140014 */ swc1 $f20, 0x14($s0) -/* 954750 80240790 E6140050 */ swc1 $f20, 0x50($s0) -/* 954754 80240794 E6140044 */ swc1 $f20, 0x44($s0) -/* 954758 80240798 E6140038 */ swc1 $f20, 0x38($s0) -/* 95475C 8024079C 2A220003 */ slti $v0, $s1, 3 -/* 954760 802407A0 1440FFEC */ bnez $v0, .L80240754 -/* 954764 802407A4 26100004 */ addiu $s0, $s0, 4 -/* 954768 802407A8 0000882D */ daddu $s1, $zero, $zero -/* 95476C 802407AC 0240802D */ daddu $s0, $s2, $zero -/* 954770 802407B0 3C148024 */ lui $s4, %hi(D_80241488_955448) -/* 954774 802407B4 26941488 */ addiu $s4, $s4, %lo(D_80241488_955448) -/* 954778 802407B8 3C014248 */ lui $at, 0x4248 -/* 95477C 802407BC 4481A000 */ mtc1 $at, $f20 -/* 954780 802407C0 24130044 */ addiu $s3, $zero, 0x44 -/* 954784 802407C4 AE400000 */ sw $zero, ($s2) -/* 954788 802407C8 AE400004 */ sw $zero, 4($s2) -/* 95478C 802407CC AE400060 */ sw $zero, 0x60($s2) -/* 954790 802407D0 AE400064 */ sw $zero, 0x64($s2) -.L802407D4: -/* 954794 802407D4 27A40020 */ addiu $a0, $sp, 0x20 -/* 954798 802407D8 4406A000 */ mfc1 $a2, $f20 -/* 95479C 802407DC 8E870000 */ lw $a3, ($s4) -/* 9547A0 802407E0 02532821 */ addu $a1, $s2, $s3 -/* 9547A4 802407E4 0C00A7E7 */ jal add_vec2D_polar -/* 9547A8 802407E8 AFA00020 */ sw $zero, 0x20($sp) -/* 9547AC 802407EC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 9547B0 802407F0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 9547B4 802407F4 46041082 */ mul.s $f2, $f2, $f4 -/* 9547B8 802407F8 00000000 */ nop -/* 9547BC 802407FC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 9547C0 80240800 46040002 */ mul.s $f0, $f0, $f4 -/* 9547C4 80240804 00000000 */ nop -/* 9547C8 80240808 E6020038 */ swc1 $f2, 0x38($s0) -/* 9547CC 8024080C E6000050 */ swc1 $f0, 0x50($s0) -/* 9547D0 80240810 8E42005C */ lw $v0, 0x5c($s2) -/* 9547D4 80240814 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9547D8 80240818 C4420048 */ lwc1 $f2, 0x48($v0) -/* 9547DC 8024081C 46001080 */ add.s $f2, $f2, $f0 -/* 9547E0 80240820 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 9547E4 80240824 46020001 */ sub.s $f0, $f0, $f2 -/* 9547E8 80240828 E6000038 */ swc1 $f0, 0x38($s0) -/* 9547EC 8024082C 8E42005C */ lw $v0, 0x5c($s2) -/* 9547F0 80240830 C6000044 */ lwc1 $f0, 0x44($s0) -/* 9547F4 80240834 C442004C */ lwc1 $f2, 0x4c($v0) -/* 9547F8 80240838 46001080 */ add.s $f2, $f2, $f0 -/* 9547FC 8024083C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 954800 80240840 46020001 */ sub.s $f0, $f0, $f2 -/* 954804 80240844 E6000044 */ swc1 $f0, 0x44($s0) -/* 954808 80240848 8E42005C */ lw $v0, 0x5c($s2) -/* 95480C 8024084C C6000050 */ lwc1 $f0, 0x50($s0) -/* 954810 80240850 C4420050 */ lwc1 $f2, 0x50($v0) -/* 954814 80240854 26940004 */ addiu $s4, $s4, 4 -/* 954818 80240858 46001080 */ add.s $f2, $f2, $f0 -/* 95481C 8024085C C6A00040 */ lwc1 $f0, 0x40($s5) -/* 954820 80240860 26730004 */ addiu $s3, $s3, 4 -/* 954824 80240864 46020001 */ sub.s $f0, $f0, $f2 -/* 954828 80240868 26310001 */ addiu $s1, $s1, 1 -/* 95482C 8024086C 2A220003 */ slti $v0, $s1, 3 -/* 954830 80240870 E6000050 */ swc1 $f0, 0x50($s0) -/* 954834 80240874 1440FFD7 */ bnez $v0, .L802407D4 -/* 954838 80240878 26100004 */ addiu $s0, $s0, 4 -.L8024087C: -/* 95483C 8024087C 8ED20060 */ lw $s2, 0x60($s6) -/* 954840 80240880 8E430000 */ lw $v1, ($s2) -/* 954844 80240884 24020001 */ addiu $v0, $zero, 1 -/* 954848 80240888 10620038 */ beq $v1, $v0, .L8024096C -/* 95484C 8024088C 28620002 */ slti $v0, $v1, 2 -/* 954850 80240890 50400005 */ beql $v0, $zero, .L802408A8 -/* 954854 80240894 24020002 */ addiu $v0, $zero, 2 -/* 954858 80240898 10600007 */ beqz $v1, .L802408B8 -/* 95485C 8024089C 24040005 */ addiu $a0, $zero, 5 -/* 954860 802408A0 08090294 */ j .L80240A50 -/* 954864 802408A4 00000000 */ nop -.L802408A8: -/* 954868 802408A8 10620058 */ beq $v1, $v0, .L80240A0C -/* 95486C 802408AC 00000000 */ nop -/* 954870 802408B0 08090294 */ j .L80240A50 -/* 954874 802408B4 00000000 */ nop -.L802408B8: -/* 954878 802408B8 0000882D */ daddu $s1, $zero, $zero -/* 95487C 802408BC 3C148024 */ lui $s4, %hi(D_80241488_955448) -/* 954880 802408C0 26941488 */ addiu $s4, $s4, %lo(D_80241488_955448) -/* 954884 802408C4 24130020 */ addiu $s3, $zero, 0x20 -/* 954888 802408C8 3C064248 */ lui $a2, 0x4248 -/* 95488C 802408CC 44800000 */ mtc1 $zero, $f0 -/* 954890 802408D0 24020014 */ addiu $v0, $zero, 0x14 -/* 954894 802408D4 AFA20010 */ sw $v0, 0x10($sp) -/* 954898 802408D8 44050000 */ mfc1 $a1, $f0 -/* 95489C 802408DC 8E470060 */ lw $a3, 0x60($s2) -/* 9548A0 802408E0 4485B000 */ mtc1 $a1, $f22 -/* 9548A4 802408E4 0C00A8ED */ jal update_lerp -/* 9548A8 802408E8 0240802D */ daddu $s0, $s2, $zero -/* 9548AC 802408EC 46000506 */ mov.s $f20, $f0 -.L802408F0: -/* 9548B0 802408F0 4406A000 */ mfc1 $a2, $f20 -/* 9548B4 802408F4 27A40020 */ addiu $a0, $sp, 0x20 -/* 9548B8 802408F8 E6160020 */ swc1 $f22, 0x20($s0) -/* 9548BC 802408FC 8E870000 */ lw $a3, ($s4) -/* 9548C0 80240900 02532821 */ addu $a1, $s2, $s3 -/* 9548C4 80240904 0C00A7E7 */ jal add_vec2D_polar -/* 9548C8 80240908 E7B60020 */ swc1 $f22, 0x20($sp) -/* 9548CC 8024090C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 9548D0 80240910 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 9548D4 80240914 46002102 */ mul.s $f4, $f4, $f0 -/* 9548D8 80240918 00000000 */ nop -/* 9548DC 8024091C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 9548E0 80240920 26940004 */ addiu $s4, $s4, 4 -/* 9548E4 80240924 46001082 */ mul.s $f2, $f2, $f0 -/* 9548E8 80240928 00000000 */ nop -/* 9548EC 8024092C 26730004 */ addiu $s3, $s3, 4 -/* 9548F0 80240930 26310001 */ addiu $s1, $s1, 1 -/* 9548F4 80240934 2A220003 */ slti $v0, $s1, 3 -/* 9548F8 80240938 E6040014 */ swc1 $f4, 0x14($s0) -/* 9548FC 8024093C E602002C */ swc1 $f2, 0x2c($s0) -/* 954900 80240940 1440FFEB */ bnez $v0, .L802408F0 -/* 954904 80240944 26100004 */ addiu $s0, $s0, 4 -/* 954908 80240948 8E420060 */ lw $v0, 0x60($s2) -/* 95490C 8024094C 24420001 */ addiu $v0, $v0, 1 -/* 954910 80240950 AE420060 */ sw $v0, 0x60($s2) -/* 954914 80240954 28420015 */ slti $v0, $v0, 0x15 -/* 954918 80240958 1440003D */ bnez $v0, .L80240A50 -/* 95491C 8024095C 24020001 */ addiu $v0, $zero, 1 -/* 954920 80240960 AE420000 */ sw $v0, ($s2) -/* 954924 80240964 08090294 */ j .L80240A50 -/* 954928 80240968 AE400060 */ sw $zero, 0x60($s2) -.L8024096C: -/* 95492C 8024096C 0000882D */ daddu $s1, $zero, $zero -/* 954930 80240970 3C148024 */ lui $s4, %hi(D_80241488_955448) -/* 954934 80240974 26941488 */ addiu $s4, $s4, %lo(D_80241488_955448) -/* 954938 80240978 24130020 */ addiu $s3, $zero, 0x20 -/* 95493C 8024097C 0240802D */ daddu $s0, $s2, $zero -/* 954940 80240980 3C014248 */ lui $at, 0x4248 -/* 954944 80240984 4481A000 */ mtc1 $at, $f20 -/* 954948 80240988 4480B000 */ mtc1 $zero, $f22 -.L8024098C: -/* 95494C 8024098C 4406A000 */ mfc1 $a2, $f20 -/* 954950 80240990 27A40020 */ addiu $a0, $sp, 0x20 -/* 954954 80240994 E6160020 */ swc1 $f22, 0x20($s0) -/* 954958 80240998 8E870000 */ lw $a3, ($s4) -/* 95495C 8024099C 02532821 */ addu $a1, $s2, $s3 -/* 954960 802409A0 0C00A7E7 */ jal add_vec2D_polar -/* 954964 802409A4 E7B60020 */ swc1 $f22, 0x20($sp) -/* 954968 802409A8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 95496C 802409AC C7A00020 */ lwc1 $f0, 0x20($sp) -/* 954970 802409B0 46002102 */ mul.s $f4, $f4, $f0 -/* 954974 802409B4 00000000 */ nop -/* 954978 802409B8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 95497C 802409BC 26940004 */ addiu $s4, $s4, 4 -/* 954980 802409C0 46001082 */ mul.s $f2, $f2, $f0 -/* 954984 802409C4 00000000 */ nop -/* 954988 802409C8 26730004 */ addiu $s3, $s3, 4 -/* 95498C 802409CC 26310001 */ addiu $s1, $s1, 1 -/* 954990 802409D0 2A220003 */ slti $v0, $s1, 3 -/* 954994 802409D4 E6040014 */ swc1 $f4, 0x14($s0) -/* 954998 802409D8 E602002C */ swc1 $f2, 0x2c($s0) -/* 95499C 802409DC 1440FFEB */ bnez $v0, .L8024098C -/* 9549A0 802409E0 26100004 */ addiu $s0, $s0, 4 -/* 9549A4 802409E4 8E420060 */ lw $v0, 0x60($s2) -/* 9549A8 802409E8 24420001 */ addiu $v0, $v0, 1 -/* 9549AC 802409EC AE420060 */ sw $v0, 0x60($s2) -/* 9549B0 802409F0 28420010 */ slti $v0, $v0, 0x10 -/* 9549B4 802409F4 14400016 */ bnez $v0, .L80240A50 -/* 9549B8 802409F8 2402000F */ addiu $v0, $zero, 0xf -/* 9549BC 802409FC AE420060 */ sw $v0, 0x60($s2) -/* 9549C0 80240A00 24020002 */ addiu $v0, $zero, 2 -/* 9549C4 80240A04 08090294 */ j .L80240A50 -/* 9549C8 80240A08 AE420000 */ sw $v0, ($s2) -.L80240A0C: -/* 9549CC 80240A0C 8E420060 */ lw $v0, 0x60($s2) -/* 9549D0 80240A10 24420001 */ addiu $v0, $v0, 1 -/* 9549D4 80240A14 AE420060 */ sw $v0, 0x60($s2) -/* 9549D8 80240A18 2842001F */ slti $v0, $v0, 0x1f -/* 9549DC 80240A1C 1440000C */ bnez $v0, .L80240A50 -/* 9549E0 80240A20 0000882D */ daddu $s1, $zero, $zero -/* 9549E4 80240A24 0240282D */ daddu $a1, $s2, $zero -.L80240A28: -/* 9549E8 80240A28 8CA20008 */ lw $v0, 8($a1) -/* 9549EC 80240A2C 8C430000 */ lw $v1, ($v0) -/* 9549F0 80240A30 26310001 */ addiu $s1, $s1, 1 -/* 9549F4 80240A34 34630010 */ ori $v1, $v1, 0x10 -/* 9549F8 80240A38 AC430000 */ sw $v1, ($v0) -/* 9549FC 80240A3C 2A220003 */ slti $v0, $s1, 3 -/* 954A00 80240A40 1440FFF9 */ bnez $v0, .L80240A28 -/* 954A04 80240A44 24A50004 */ addiu $a1, $a1, 4 -/* 954A08 80240A48 080902E1 */ j .L80240B84 -/* 954A0C 80240A4C 24020002 */ addiu $v0, $zero, 2 -.L80240A50: -/* 954A10 80240A50 8E430004 */ lw $v1, 4($s2) -/* 954A14 80240A54 10600005 */ beqz $v1, .L80240A6C -/* 954A18 80240A58 24020001 */ addiu $v0, $zero, 1 -/* 954A1C 80240A5C 1062000B */ beq $v1, $v0, .L80240A8C -/* 954A20 80240A60 0000882D */ daddu $s1, $zero, $zero -/* 954A24 80240A64 080902D0 */ j .L80240B40 -/* 954A28 80240A68 0240282D */ daddu $a1, $s2, $zero -.L80240A6C: -/* 954A2C 80240A6C 8E420064 */ lw $v0, 0x64($s2) -/* 954A30 80240A70 24420001 */ addiu $v0, $v0, 1 -/* 954A34 80240A74 AE420064 */ sw $v0, 0x64($s2) -/* 954A38 80240A78 28420010 */ slti $v0, $v0, 0x10 -/* 954A3C 80240A7C 1440002F */ bnez $v0, .L80240B3C -/* 954A40 80240A80 0000882D */ daddu $s1, $zero, $zero -/* 954A44 80240A84 080902CC */ j .L80240B30 -/* 954A48 80240A88 24020001 */ addiu $v0, $zero, 1 -.L80240A8C: -/* 954A4C 80240A8C 4480A000 */ mtc1 $zero, $f20 -/* 954A50 80240A90 24130014 */ addiu $s3, $zero, 0x14 -/* 954A54 80240A94 0240802D */ daddu $s0, $s2, $zero -.L80240A98: -/* 954A58 80240A98 4405A000 */ mfc1 $a1, $f20 -/* 954A5C 80240A9C AFB30010 */ sw $s3, 0x10($sp) -/* 954A60 80240AA0 8E060038 */ lw $a2, 0x38($s0) -/* 954A64 80240AA4 8E470064 */ lw $a3, 0x64($s2) -/* 954A68 80240AA8 0C00A8ED */ jal update_lerp -/* 954A6C 80240AAC 24040001 */ addiu $a0, $zero, 1 -/* 954A70 80240AB0 C6020014 */ lwc1 $f2, 0x14($s0) -/* 954A74 80240AB4 46001080 */ add.s $f2, $f2, $f0 -/* 954A78 80240AB8 4405A000 */ mfc1 $a1, $f20 -/* 954A7C 80240ABC E6020014 */ swc1 $f2, 0x14($s0) -/* 954A80 80240AC0 AFB30010 */ sw $s3, 0x10($sp) -/* 954A84 80240AC4 8E060044 */ lw $a2, 0x44($s0) -/* 954A88 80240AC8 8E470064 */ lw $a3, 0x64($s2) -/* 954A8C 80240ACC 0C00A8ED */ jal update_lerp -/* 954A90 80240AD0 24040001 */ addiu $a0, $zero, 1 -/* 954A94 80240AD4 C6020020 */ lwc1 $f2, 0x20($s0) -/* 954A98 80240AD8 46001080 */ add.s $f2, $f2, $f0 -/* 954A9C 80240ADC 4405A000 */ mfc1 $a1, $f20 -/* 954AA0 80240AE0 E6020020 */ swc1 $f2, 0x20($s0) -/* 954AA4 80240AE4 AFB30010 */ sw $s3, 0x10($sp) -/* 954AA8 80240AE8 8E060050 */ lw $a2, 0x50($s0) -/* 954AAC 80240AEC 8E470064 */ lw $a3, 0x64($s2) -/* 954AB0 80240AF0 0C00A8ED */ jal update_lerp -/* 954AB4 80240AF4 24040001 */ addiu $a0, $zero, 1 -/* 954AB8 80240AF8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 954ABC 80240AFC 46001080 */ add.s $f2, $f2, $f0 -/* 954AC0 80240B00 26310001 */ addiu $s1, $s1, 1 -/* 954AC4 80240B04 2A220003 */ slti $v0, $s1, 3 -/* 954AC8 80240B08 E602002C */ swc1 $f2, 0x2c($s0) -/* 954ACC 80240B0C 1440FFE2 */ bnez $v0, .L80240A98 -/* 954AD0 80240B10 26100004 */ addiu $s0, $s0, 4 -/* 954AD4 80240B14 8E420064 */ lw $v0, 0x64($s2) -/* 954AD8 80240B18 24420001 */ addiu $v0, $v0, 1 -/* 954ADC 80240B1C AE420064 */ sw $v0, 0x64($s2) -/* 954AE0 80240B20 28420015 */ slti $v0, $v0, 0x15 -/* 954AE4 80240B24 14400005 */ bnez $v0, .L80240B3C -/* 954AE8 80240B28 0000882D */ daddu $s1, $zero, $zero -/* 954AEC 80240B2C 24020002 */ addiu $v0, $zero, 2 -.L80240B30: -/* 954AF0 80240B30 AE420004 */ sw $v0, 4($s2) -/* 954AF4 80240B34 AE400064 */ sw $zero, 0x64($s2) -/* 954AF8 80240B38 0000882D */ daddu $s1, $zero, $zero -.L80240B3C: -/* 954AFC 80240B3C 0240282D */ daddu $a1, $s2, $zero -.L80240B40: -/* 954B00 80240B40 8CA20008 */ lw $v0, 8($a1) -/* 954B04 80240B44 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 954B08 80240B48 8C42000C */ lw $v0, 0xc($v0) -/* 954B0C 80240B4C E4400010 */ swc1 $f0, 0x10($v0) -/* 954B10 80240B50 8CA20008 */ lw $v0, 8($a1) -/* 954B14 80240B54 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 954B18 80240B58 8C42000C */ lw $v0, 0xc($v0) -/* 954B1C 80240B5C 26310001 */ addiu $s1, $s1, 1 -/* 954B20 80240B60 E4400014 */ swc1 $f0, 0x14($v0) -/* 954B24 80240B64 8CA20008 */ lw $v0, 8($a1) -/* 954B28 80240B68 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 954B2C 80240B6C 8C42000C */ lw $v0, 0xc($v0) -/* 954B30 80240B70 E4400018 */ swc1 $f0, 0x18($v0) -/* 954B34 80240B74 2A220003 */ slti $v0, $s1, 3 -/* 954B38 80240B78 1440FFF1 */ bnez $v0, .L80240B40 -/* 954B3C 80240B7C 24A50004 */ addiu $a1, $a1, 4 -/* 954B40 80240B80 0000102D */ daddu $v0, $zero, $zero -.L80240B84: -/* 954B44 80240B84 8FBF0044 */ lw $ra, 0x44($sp) -/* 954B48 80240B88 8FB60040 */ lw $s6, 0x40($sp) -/* 954B4C 80240B8C 8FB5003C */ lw $s5, 0x3c($sp) -/* 954B50 80240B90 8FB40038 */ lw $s4, 0x38($sp) -/* 954B54 80240B94 8FB30034 */ lw $s3, 0x34($sp) -/* 954B58 80240B98 8FB20030 */ lw $s2, 0x30($sp) -/* 954B5C 80240B9C 8FB1002C */ lw $s1, 0x2c($sp) -/* 954B60 80240BA0 8FB00028 */ lw $s0, 0x28($sp) -/* 954B64 80240BA4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 954B68 80240BA8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 954B6C 80240BAC D7B40048 */ ldc1 $f20, 0x48($sp) -/* 954B70 80240BB0 03E00008 */ jr $ra -/* 954B74 80240BB4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s deleted file mode 100644 index f1e142fb9e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E0_87A4C0 -/* 87A4C0 802408E0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 87A4C4 802408E4 AFB60040 */ sw $s6, 0x40($sp) -/* 87A4C8 802408E8 0080B02D */ daddu $s6, $a0, $zero -/* 87A4CC 802408EC AFB00028 */ sw $s0, 0x28($sp) -/* 87A4D0 802408F0 00A0802D */ daddu $s0, $a1, $zero -/* 87A4D4 802408F4 AFBF0044 */ sw $ra, 0x44($sp) -/* 87A4D8 802408F8 AFB5003C */ sw $s5, 0x3c($sp) -/* 87A4DC 802408FC AFB40038 */ sw $s4, 0x38($sp) -/* 87A4E0 80240900 AFB30034 */ sw $s3, 0x34($sp) -/* 87A4E4 80240904 AFB20030 */ sw $s2, 0x30($sp) -/* 87A4E8 80240908 AFB1002C */ sw $s1, 0x2c($sp) -/* 87A4EC 8024090C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 87A4F0 80240910 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 87A4F4 80240914 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 87A4F8 80240918 8ED3000C */ lw $s3, 0xc($s6) -/* 87A4FC 8024091C 0C00EAD2 */ jal get_npc_safe -/* 87A500 80240920 2404FFFC */ addiu $a0, $zero, -4 -/* 87A504 80240924 27A50018 */ addiu $a1, $sp, 0x18 -/* 87A508 80240928 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 87A50C 8024092C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 87A510 80240930 27A6001C */ addiu $a2, $sp, 0x1c -/* 87A514 80240934 00041880 */ sll $v1, $a0, 2 -/* 87A518 80240938 00641821 */ addu $v1, $v1, $a0 -/* 87A51C 8024093C 00031880 */ sll $v1, $v1, 2 -/* 87A520 80240940 00641823 */ subu $v1, $v1, $a0 -/* 87A524 80240944 000320C0 */ sll $a0, $v1, 3 -/* 87A528 80240948 00641821 */ addu $v1, $v1, $a0 -/* 87A52C 8024094C 000318C0 */ sll $v1, $v1, 3 -/* 87A530 80240950 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 87A534 80240954 00230821 */ addu $at, $at, $v1 -/* 87A538 80240958 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 87A53C 8024095C 0C00A88D */ jal sin_cos_deg -/* 87A540 80240960 0040A82D */ daddu $s5, $v0, $zero -/* 87A544 80240964 1200005D */ beqz $s0, .L80240ADC -/* 87A548 80240968 00000000 */ nop -/* 87A54C 8024096C 0C00AB0A */ jal general_heap_malloc -/* 87A550 80240970 24040068 */ addiu $a0, $zero, 0x68 -/* 87A554 80240974 0040902D */ daddu $s2, $v0, $zero -/* 87A558 80240978 02C0202D */ daddu $a0, $s6, $zero -/* 87A55C 8024097C 0000882D */ daddu $s1, $zero, $zero -/* 87A560 80240980 2414FFFF */ addiu $s4, $zero, -1 -/* 87A564 80240984 AED20060 */ sw $s2, 0x60($s6) -/* 87A568 80240988 8E650000 */ lw $a1, ($s3) -/* 87A56C 8024098C 3C014148 */ lui $at, 0x4148 -/* 87A570 80240990 4481C000 */ mtc1 $at, $f24 -/* 87A574 80240994 3C013F80 */ lui $at, 0x3f80 -/* 87A578 80240998 4481B000 */ mtc1 $at, $f22 -/* 87A57C 8024099C 4480A000 */ mtc1 $zero, $f20 -/* 87A580 802409A0 0C0B1EAF */ jal evt_get_variable -/* 87A584 802409A4 0240802D */ daddu $s0, $s2, $zero -/* 87A588 802409A8 0C04417A */ jal get_entity_by_index -/* 87A58C 802409AC 0040202D */ daddu $a0, $v0, $zero -/* 87A590 802409B0 AE42005C */ sw $v0, 0x5c($s2) -.L802409B4: -/* 87A594 802409B4 8E42005C */ lw $v0, 0x5c($s2) -/* 87A598 802409B8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 87A59C 802409BC 0000202D */ daddu $a0, $zero, $zero -/* 87A5A0 802409C0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 87A5A4 802409C4 AFB40014 */ sw $s4, 0x14($sp) -/* 87A5A8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 87A5AC 802409CC 8C450048 */ lw $a1, 0x48($v0) -/* 87A5B0 802409D0 8C470050 */ lw $a3, 0x50($v0) -/* 87A5B4 802409D4 44060000 */ mfc1 $a2, $f0 -/* 87A5B8 802409D8 0C01C5BC */ jal fx_motion_blur_flame -/* 87A5BC 802409DC 26310001 */ addiu $s1, $s1, 1 -/* 87A5C0 802409E0 AE020008 */ sw $v0, 8($s0) -/* 87A5C4 802409E4 E614002C */ swc1 $f20, 0x2c($s0) -/* 87A5C8 802409E8 E6140020 */ swc1 $f20, 0x20($s0) -/* 87A5CC 802409EC E6140014 */ swc1 $f20, 0x14($s0) -/* 87A5D0 802409F0 E6140050 */ swc1 $f20, 0x50($s0) -/* 87A5D4 802409F4 E6140044 */ swc1 $f20, 0x44($s0) -/* 87A5D8 802409F8 E6140038 */ swc1 $f20, 0x38($s0) -/* 87A5DC 802409FC 2A220003 */ slti $v0, $s1, 3 -/* 87A5E0 80240A00 1440FFEC */ bnez $v0, .L802409B4 -/* 87A5E4 80240A04 26100004 */ addiu $s0, $s0, 4 -/* 87A5E8 80240A08 0000882D */ daddu $s1, $zero, $zero -/* 87A5EC 80240A0C 0240802D */ daddu $s0, $s2, $zero -/* 87A5F0 80240A10 3C148024 */ lui $s4, %hi(D_80243A48_87D628) -/* 87A5F4 80240A14 26943A48 */ addiu $s4, $s4, %lo(D_80243A48_87D628) -/* 87A5F8 80240A18 3C014248 */ lui $at, 0x4248 -/* 87A5FC 80240A1C 4481A000 */ mtc1 $at, $f20 -/* 87A600 80240A20 24130044 */ addiu $s3, $zero, 0x44 -/* 87A604 80240A24 AE400000 */ sw $zero, ($s2) -/* 87A608 80240A28 AE400004 */ sw $zero, 4($s2) -/* 87A60C 80240A2C AE400060 */ sw $zero, 0x60($s2) -/* 87A610 80240A30 AE400064 */ sw $zero, 0x64($s2) -.L80240A34: -/* 87A614 80240A34 27A40020 */ addiu $a0, $sp, 0x20 -/* 87A618 80240A38 4406A000 */ mfc1 $a2, $f20 -/* 87A61C 80240A3C 8E870000 */ lw $a3, ($s4) -/* 87A620 80240A40 02532821 */ addu $a1, $s2, $s3 -/* 87A624 80240A44 0C00A7E7 */ jal add_vec2D_polar -/* 87A628 80240A48 AFA00020 */ sw $zero, 0x20($sp) -/* 87A62C 80240A4C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 87A630 80240A50 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 87A634 80240A54 46041082 */ mul.s $f2, $f2, $f4 -/* 87A638 80240A58 00000000 */ nop -/* 87A63C 80240A5C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 87A640 80240A60 46040002 */ mul.s $f0, $f0, $f4 -/* 87A644 80240A64 00000000 */ nop -/* 87A648 80240A68 E6020038 */ swc1 $f2, 0x38($s0) -/* 87A64C 80240A6C E6000050 */ swc1 $f0, 0x50($s0) -/* 87A650 80240A70 8E42005C */ lw $v0, 0x5c($s2) -/* 87A654 80240A74 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87A658 80240A78 C4420048 */ lwc1 $f2, 0x48($v0) -/* 87A65C 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* 87A660 80240A80 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 87A664 80240A84 46020001 */ sub.s $f0, $f0, $f2 -/* 87A668 80240A88 E6000038 */ swc1 $f0, 0x38($s0) -/* 87A66C 80240A8C 8E42005C */ lw $v0, 0x5c($s2) -/* 87A670 80240A90 C6000044 */ lwc1 $f0, 0x44($s0) -/* 87A674 80240A94 C442004C */ lwc1 $f2, 0x4c($v0) -/* 87A678 80240A98 46001080 */ add.s $f2, $f2, $f0 -/* 87A67C 80240A9C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 87A680 80240AA0 46020001 */ sub.s $f0, $f0, $f2 -/* 87A684 80240AA4 E6000044 */ swc1 $f0, 0x44($s0) -/* 87A688 80240AA8 8E42005C */ lw $v0, 0x5c($s2) -/* 87A68C 80240AAC C6000050 */ lwc1 $f0, 0x50($s0) -/* 87A690 80240AB0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 87A694 80240AB4 26940004 */ addiu $s4, $s4, 4 -/* 87A698 80240AB8 46001080 */ add.s $f2, $f2, $f0 -/* 87A69C 80240ABC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 87A6A0 80240AC0 26730004 */ addiu $s3, $s3, 4 -/* 87A6A4 80240AC4 46020001 */ sub.s $f0, $f0, $f2 -/* 87A6A8 80240AC8 26310001 */ addiu $s1, $s1, 1 -/* 87A6AC 80240ACC 2A220003 */ slti $v0, $s1, 3 -/* 87A6B0 80240AD0 E6000050 */ swc1 $f0, 0x50($s0) -/* 87A6B4 80240AD4 1440FFD7 */ bnez $v0, .L80240A34 -/* 87A6B8 80240AD8 26100004 */ addiu $s0, $s0, 4 -.L80240ADC: -/* 87A6BC 80240ADC 8ED20060 */ lw $s2, 0x60($s6) -/* 87A6C0 80240AE0 8E430000 */ lw $v1, ($s2) -/* 87A6C4 80240AE4 24020001 */ addiu $v0, $zero, 1 -/* 87A6C8 80240AE8 10620038 */ beq $v1, $v0, .L80240BCC -/* 87A6CC 80240AEC 28620002 */ slti $v0, $v1, 2 -/* 87A6D0 80240AF0 50400005 */ beql $v0, $zero, .L80240B08 -/* 87A6D4 80240AF4 24020002 */ addiu $v0, $zero, 2 -/* 87A6D8 80240AF8 10600007 */ beqz $v1, .L80240B18 -/* 87A6DC 80240AFC 24040005 */ addiu $a0, $zero, 5 -/* 87A6E0 80240B00 0809032C */ j .L80240CB0 -/* 87A6E4 80240B04 00000000 */ nop -.L80240B08: -/* 87A6E8 80240B08 10620058 */ beq $v1, $v0, .L80240C6C -/* 87A6EC 80240B0C 00000000 */ nop -/* 87A6F0 80240B10 0809032C */ j .L80240CB0 -/* 87A6F4 80240B14 00000000 */ nop -.L80240B18: -/* 87A6F8 80240B18 0000882D */ daddu $s1, $zero, $zero -/* 87A6FC 80240B1C 3C148024 */ lui $s4, %hi(D_80243A48_87D628) -/* 87A700 80240B20 26943A48 */ addiu $s4, $s4, %lo(D_80243A48_87D628) -/* 87A704 80240B24 24130020 */ addiu $s3, $zero, 0x20 -/* 87A708 80240B28 3C064248 */ lui $a2, 0x4248 -/* 87A70C 80240B2C 44800000 */ mtc1 $zero, $f0 -/* 87A710 80240B30 24020014 */ addiu $v0, $zero, 0x14 -/* 87A714 80240B34 AFA20010 */ sw $v0, 0x10($sp) -/* 87A718 80240B38 44050000 */ mfc1 $a1, $f0 -/* 87A71C 80240B3C 8E470060 */ lw $a3, 0x60($s2) -/* 87A720 80240B40 4485B000 */ mtc1 $a1, $f22 -/* 87A724 80240B44 0C00A8ED */ jal update_lerp -/* 87A728 80240B48 0240802D */ daddu $s0, $s2, $zero -/* 87A72C 80240B4C 46000506 */ mov.s $f20, $f0 -.L80240B50: -/* 87A730 80240B50 4406A000 */ mfc1 $a2, $f20 -/* 87A734 80240B54 27A40020 */ addiu $a0, $sp, 0x20 -/* 87A738 80240B58 E6160020 */ swc1 $f22, 0x20($s0) -/* 87A73C 80240B5C 8E870000 */ lw $a3, ($s4) -/* 87A740 80240B60 02532821 */ addu $a1, $s2, $s3 -/* 87A744 80240B64 0C00A7E7 */ jal add_vec2D_polar -/* 87A748 80240B68 E7B60020 */ swc1 $f22, 0x20($sp) -/* 87A74C 80240B6C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 87A750 80240B70 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 87A754 80240B74 46002102 */ mul.s $f4, $f4, $f0 -/* 87A758 80240B78 00000000 */ nop -/* 87A75C 80240B7C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 87A760 80240B80 26940004 */ addiu $s4, $s4, 4 -/* 87A764 80240B84 46001082 */ mul.s $f2, $f2, $f0 -/* 87A768 80240B88 00000000 */ nop -/* 87A76C 80240B8C 26730004 */ addiu $s3, $s3, 4 -/* 87A770 80240B90 26310001 */ addiu $s1, $s1, 1 -/* 87A774 80240B94 2A220003 */ slti $v0, $s1, 3 -/* 87A778 80240B98 E6040014 */ swc1 $f4, 0x14($s0) -/* 87A77C 80240B9C E602002C */ swc1 $f2, 0x2c($s0) -/* 87A780 80240BA0 1440FFEB */ bnez $v0, .L80240B50 -/* 87A784 80240BA4 26100004 */ addiu $s0, $s0, 4 -/* 87A788 80240BA8 8E420060 */ lw $v0, 0x60($s2) -/* 87A78C 80240BAC 24420001 */ addiu $v0, $v0, 1 -/* 87A790 80240BB0 AE420060 */ sw $v0, 0x60($s2) -/* 87A794 80240BB4 28420015 */ slti $v0, $v0, 0x15 -/* 87A798 80240BB8 1440003D */ bnez $v0, .L80240CB0 -/* 87A79C 80240BBC 24020001 */ addiu $v0, $zero, 1 -/* 87A7A0 80240BC0 AE420000 */ sw $v0, ($s2) -/* 87A7A4 80240BC4 0809032C */ j .L80240CB0 -/* 87A7A8 80240BC8 AE400060 */ sw $zero, 0x60($s2) -.L80240BCC: -/* 87A7AC 80240BCC 0000882D */ daddu $s1, $zero, $zero -/* 87A7B0 80240BD0 3C148024 */ lui $s4, %hi(D_80243A48_87D628) -/* 87A7B4 80240BD4 26943A48 */ addiu $s4, $s4, %lo(D_80243A48_87D628) -/* 87A7B8 80240BD8 24130020 */ addiu $s3, $zero, 0x20 -/* 87A7BC 80240BDC 0240802D */ daddu $s0, $s2, $zero -/* 87A7C0 80240BE0 3C014248 */ lui $at, 0x4248 -/* 87A7C4 80240BE4 4481A000 */ mtc1 $at, $f20 -/* 87A7C8 80240BE8 4480B000 */ mtc1 $zero, $f22 -.L80240BEC: -/* 87A7CC 80240BEC 4406A000 */ mfc1 $a2, $f20 -/* 87A7D0 80240BF0 27A40020 */ addiu $a0, $sp, 0x20 -/* 87A7D4 80240BF4 E6160020 */ swc1 $f22, 0x20($s0) -/* 87A7D8 80240BF8 8E870000 */ lw $a3, ($s4) -/* 87A7DC 80240BFC 02532821 */ addu $a1, $s2, $s3 -/* 87A7E0 80240C00 0C00A7E7 */ jal add_vec2D_polar -/* 87A7E4 80240C04 E7B60020 */ swc1 $f22, 0x20($sp) -/* 87A7E8 80240C08 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 87A7EC 80240C0C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 87A7F0 80240C10 46002102 */ mul.s $f4, $f4, $f0 -/* 87A7F4 80240C14 00000000 */ nop -/* 87A7F8 80240C18 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 87A7FC 80240C1C 26940004 */ addiu $s4, $s4, 4 -/* 87A800 80240C20 46001082 */ mul.s $f2, $f2, $f0 -/* 87A804 80240C24 00000000 */ nop -/* 87A808 80240C28 26730004 */ addiu $s3, $s3, 4 -/* 87A80C 80240C2C 26310001 */ addiu $s1, $s1, 1 -/* 87A810 80240C30 2A220003 */ slti $v0, $s1, 3 -/* 87A814 80240C34 E6040014 */ swc1 $f4, 0x14($s0) -/* 87A818 80240C38 E602002C */ swc1 $f2, 0x2c($s0) -/* 87A81C 80240C3C 1440FFEB */ bnez $v0, .L80240BEC -/* 87A820 80240C40 26100004 */ addiu $s0, $s0, 4 -/* 87A824 80240C44 8E420060 */ lw $v0, 0x60($s2) -/* 87A828 80240C48 24420001 */ addiu $v0, $v0, 1 -/* 87A82C 80240C4C AE420060 */ sw $v0, 0x60($s2) -/* 87A830 80240C50 28420010 */ slti $v0, $v0, 0x10 -/* 87A834 80240C54 14400016 */ bnez $v0, .L80240CB0 -/* 87A838 80240C58 2402000F */ addiu $v0, $zero, 0xf -/* 87A83C 80240C5C AE420060 */ sw $v0, 0x60($s2) -/* 87A840 80240C60 24020002 */ addiu $v0, $zero, 2 -/* 87A844 80240C64 0809032C */ j .L80240CB0 -/* 87A848 80240C68 AE420000 */ sw $v0, ($s2) -.L80240C6C: -/* 87A84C 80240C6C 8E420060 */ lw $v0, 0x60($s2) -/* 87A850 80240C70 24420001 */ addiu $v0, $v0, 1 -/* 87A854 80240C74 AE420060 */ sw $v0, 0x60($s2) -/* 87A858 80240C78 2842001F */ slti $v0, $v0, 0x1f -/* 87A85C 80240C7C 1440000C */ bnez $v0, .L80240CB0 -/* 87A860 80240C80 0000882D */ daddu $s1, $zero, $zero -/* 87A864 80240C84 0240282D */ daddu $a1, $s2, $zero -.L80240C88: -/* 87A868 80240C88 8CA20008 */ lw $v0, 8($a1) -/* 87A86C 80240C8C 8C430000 */ lw $v1, ($v0) -/* 87A870 80240C90 26310001 */ addiu $s1, $s1, 1 -/* 87A874 80240C94 34630010 */ ori $v1, $v1, 0x10 -/* 87A878 80240C98 AC430000 */ sw $v1, ($v0) -/* 87A87C 80240C9C 2A220003 */ slti $v0, $s1, 3 -/* 87A880 80240CA0 1440FFF9 */ bnez $v0, .L80240C88 -/* 87A884 80240CA4 24A50004 */ addiu $a1, $a1, 4 -/* 87A888 80240CA8 08090379 */ j .L80240DE4 -/* 87A88C 80240CAC 24020002 */ addiu $v0, $zero, 2 -.L80240CB0: -/* 87A890 80240CB0 8E430004 */ lw $v1, 4($s2) -/* 87A894 80240CB4 10600005 */ beqz $v1, .L80240CCC -/* 87A898 80240CB8 24020001 */ addiu $v0, $zero, 1 -/* 87A89C 80240CBC 1062000B */ beq $v1, $v0, .L80240CEC -/* 87A8A0 80240CC0 0000882D */ daddu $s1, $zero, $zero -/* 87A8A4 80240CC4 08090368 */ j .L80240DA0 -/* 87A8A8 80240CC8 0240282D */ daddu $a1, $s2, $zero -.L80240CCC: -/* 87A8AC 80240CCC 8E420064 */ lw $v0, 0x64($s2) -/* 87A8B0 80240CD0 24420001 */ addiu $v0, $v0, 1 -/* 87A8B4 80240CD4 AE420064 */ sw $v0, 0x64($s2) -/* 87A8B8 80240CD8 28420010 */ slti $v0, $v0, 0x10 -/* 87A8BC 80240CDC 1440002F */ bnez $v0, .L80240D9C -/* 87A8C0 80240CE0 0000882D */ daddu $s1, $zero, $zero -/* 87A8C4 80240CE4 08090364 */ j .L80240D90 -/* 87A8C8 80240CE8 24020001 */ addiu $v0, $zero, 1 -.L80240CEC: -/* 87A8CC 80240CEC 4480A000 */ mtc1 $zero, $f20 -/* 87A8D0 80240CF0 24130014 */ addiu $s3, $zero, 0x14 -/* 87A8D4 80240CF4 0240802D */ daddu $s0, $s2, $zero -.L80240CF8: -/* 87A8D8 80240CF8 4405A000 */ mfc1 $a1, $f20 -/* 87A8DC 80240CFC AFB30010 */ sw $s3, 0x10($sp) -/* 87A8E0 80240D00 8E060038 */ lw $a2, 0x38($s0) -/* 87A8E4 80240D04 8E470064 */ lw $a3, 0x64($s2) -/* 87A8E8 80240D08 0C00A8ED */ jal update_lerp -/* 87A8EC 80240D0C 24040001 */ addiu $a0, $zero, 1 -/* 87A8F0 80240D10 C6020014 */ lwc1 $f2, 0x14($s0) -/* 87A8F4 80240D14 46001080 */ add.s $f2, $f2, $f0 -/* 87A8F8 80240D18 4405A000 */ mfc1 $a1, $f20 -/* 87A8FC 80240D1C E6020014 */ swc1 $f2, 0x14($s0) -/* 87A900 80240D20 AFB30010 */ sw $s3, 0x10($sp) -/* 87A904 80240D24 8E060044 */ lw $a2, 0x44($s0) -/* 87A908 80240D28 8E470064 */ lw $a3, 0x64($s2) -/* 87A90C 80240D2C 0C00A8ED */ jal update_lerp -/* 87A910 80240D30 24040001 */ addiu $a0, $zero, 1 -/* 87A914 80240D34 C6020020 */ lwc1 $f2, 0x20($s0) -/* 87A918 80240D38 46001080 */ add.s $f2, $f2, $f0 -/* 87A91C 80240D3C 4405A000 */ mfc1 $a1, $f20 -/* 87A920 80240D40 E6020020 */ swc1 $f2, 0x20($s0) -/* 87A924 80240D44 AFB30010 */ sw $s3, 0x10($sp) -/* 87A928 80240D48 8E060050 */ lw $a2, 0x50($s0) -/* 87A92C 80240D4C 8E470064 */ lw $a3, 0x64($s2) -/* 87A930 80240D50 0C00A8ED */ jal update_lerp -/* 87A934 80240D54 24040001 */ addiu $a0, $zero, 1 -/* 87A938 80240D58 C602002C */ lwc1 $f2, 0x2c($s0) -/* 87A93C 80240D5C 46001080 */ add.s $f2, $f2, $f0 -/* 87A940 80240D60 26310001 */ addiu $s1, $s1, 1 -/* 87A944 80240D64 2A220003 */ slti $v0, $s1, 3 -/* 87A948 80240D68 E602002C */ swc1 $f2, 0x2c($s0) -/* 87A94C 80240D6C 1440FFE2 */ bnez $v0, .L80240CF8 -/* 87A950 80240D70 26100004 */ addiu $s0, $s0, 4 -/* 87A954 80240D74 8E420064 */ lw $v0, 0x64($s2) -/* 87A958 80240D78 24420001 */ addiu $v0, $v0, 1 -/* 87A95C 80240D7C AE420064 */ sw $v0, 0x64($s2) -/* 87A960 80240D80 28420015 */ slti $v0, $v0, 0x15 -/* 87A964 80240D84 14400005 */ bnez $v0, .L80240D9C -/* 87A968 80240D88 0000882D */ daddu $s1, $zero, $zero -/* 87A96C 80240D8C 24020002 */ addiu $v0, $zero, 2 -.L80240D90: -/* 87A970 80240D90 AE420004 */ sw $v0, 4($s2) -/* 87A974 80240D94 AE400064 */ sw $zero, 0x64($s2) -/* 87A978 80240D98 0000882D */ daddu $s1, $zero, $zero -.L80240D9C: -/* 87A97C 80240D9C 0240282D */ daddu $a1, $s2, $zero -.L80240DA0: -/* 87A980 80240DA0 8CA20008 */ lw $v0, 8($a1) -/* 87A984 80240DA4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 87A988 80240DA8 8C42000C */ lw $v0, 0xc($v0) -/* 87A98C 80240DAC E4400010 */ swc1 $f0, 0x10($v0) -/* 87A990 80240DB0 8CA20008 */ lw $v0, 8($a1) -/* 87A994 80240DB4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 87A998 80240DB8 8C42000C */ lw $v0, 0xc($v0) -/* 87A99C 80240DBC 26310001 */ addiu $s1, $s1, 1 -/* 87A9A0 80240DC0 E4400014 */ swc1 $f0, 0x14($v0) -/* 87A9A4 80240DC4 8CA20008 */ lw $v0, 8($a1) -/* 87A9A8 80240DC8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 87A9AC 80240DCC 8C42000C */ lw $v0, 0xc($v0) -/* 87A9B0 80240DD0 E4400018 */ swc1 $f0, 0x18($v0) -/* 87A9B4 80240DD4 2A220003 */ slti $v0, $s1, 3 -/* 87A9B8 80240DD8 1440FFF1 */ bnez $v0, .L80240DA0 -/* 87A9BC 80240DDC 24A50004 */ addiu $a1, $a1, 4 -/* 87A9C0 80240DE0 0000102D */ daddu $v0, $zero, $zero -.L80240DE4: -/* 87A9C4 80240DE4 8FBF0044 */ lw $ra, 0x44($sp) -/* 87A9C8 80240DE8 8FB60040 */ lw $s6, 0x40($sp) -/* 87A9CC 80240DEC 8FB5003C */ lw $s5, 0x3c($sp) -/* 87A9D0 80240DF0 8FB40038 */ lw $s4, 0x38($sp) -/* 87A9D4 80240DF4 8FB30034 */ lw $s3, 0x34($sp) -/* 87A9D8 80240DF8 8FB20030 */ lw $s2, 0x30($sp) -/* 87A9DC 80240DFC 8FB1002C */ lw $s1, 0x2c($sp) -/* 87A9E0 80240E00 8FB00028 */ lw $s0, 0x28($sp) -/* 87A9E4 80240E04 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 87A9E8 80240E08 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 87A9EC 80240E0C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 87A9F0 80240E10 03E00008 */ jr $ra -/* 87A9F4 80240E14 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s deleted file mode 100644 index 909eb7c4a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242044_87BC24 -/* 87BC24 80242044 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87BC28 80242048 AFB00010 */ sw $s0, 0x10($sp) -/* 87BC2C 8024204C 0080802D */ daddu $s0, $a0, $zero -/* 87BC30 80242050 AFBF0014 */ sw $ra, 0x14($sp) -/* 87BC34 80242054 8E020148 */ lw $v0, 0x148($s0) -/* 87BC38 80242058 0C00EABB */ jal get_npc_unsafe -/* 87BC3C 8024205C 84440008 */ lh $a0, 8($v0) -/* 87BC40 80242060 9443008E */ lhu $v1, 0x8e($v0) -/* 87BC44 80242064 C440003C */ lwc1 $f0, 0x3c($v0) -/* 87BC48 80242068 24640001 */ addiu $a0, $v1, 1 -/* 87BC4C 8024206C 00031C00 */ sll $v1, $v1, 0x10 -/* 87BC50 80242070 00031B83 */ sra $v1, $v1, 0xe -/* 87BC54 80242074 A444008E */ sh $a0, 0x8e($v0) -/* 87BC58 80242078 3C018024 */ lui $at, %hi(D_80244CB0_87E890) -/* 87BC5C 8024207C 00230821 */ addu $at, $at, $v1 -/* 87BC60 80242080 C4224CB0 */ lwc1 $f2, %lo(D_80244CB0_87E890)($at) -/* 87BC64 80242084 8443008E */ lh $v1, 0x8e($v0) -/* 87BC68 80242088 46020000 */ add.s $f0, $f0, $f2 -/* 87BC6C 8024208C 28630005 */ slti $v1, $v1, 5 -/* 87BC70 80242090 14600003 */ bnez $v1, .L802420A0 -/* 87BC74 80242094 E440003C */ swc1 $f0, 0x3c($v0) -/* 87BC78 80242098 2402000C */ addiu $v0, $zero, 0xc -/* 87BC7C 8024209C AE020070 */ sw $v0, 0x70($s0) -.L802420A0: -/* 87BC80 802420A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 87BC84 802420A4 8FB00010 */ lw $s0, 0x10($sp) -/* 87BC88 802420A8 03E00008 */ jr $ra -/* 87BC8C 802420AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s deleted file mode 100644 index 70e18a60f5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802451C8_87EDA8 -.word .L80242808_87C3E8, .L80242818_87C3F8, .L80242830_87C410, .L80242840_87C420, .L802428C0_87C4A0, .L802428C0_87C4A0, .L802428C0_87C4A0, .L802428C0_87C4A0, .L802428C0_87C4A0, .L802428C0_87C4A0, .L80242858_87C438, .L80242868_87C448, .L80242880_87C460, .L80242898_87C478, .L802428B0_87C490, 0, 0, 0 - -.section .text - -glabel func_802426FC_87C2DC -/* 87C2DC 802426FC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 87C2E0 80242700 AFB40040 */ sw $s4, 0x40($sp) -/* 87C2E4 80242704 0080A02D */ daddu $s4, $a0, $zero -/* 87C2E8 80242708 AFBF0048 */ sw $ra, 0x48($sp) -/* 87C2EC 8024270C AFB50044 */ sw $s5, 0x44($sp) -/* 87C2F0 80242710 AFB3003C */ sw $s3, 0x3c($sp) -/* 87C2F4 80242714 AFB20038 */ sw $s2, 0x38($sp) -/* 87C2F8 80242718 AFB10034 */ sw $s1, 0x34($sp) -/* 87C2FC 8024271C AFB00030 */ sw $s0, 0x30($sp) -/* 87C300 80242720 8E920148 */ lw $s2, 0x148($s4) -/* 87C304 80242724 86440008 */ lh $a0, 8($s2) -/* 87C308 80242728 8E90000C */ lw $s0, 0xc($s4) -/* 87C30C 8024272C 0C00EABB */ jal get_npc_unsafe -/* 87C310 80242730 00A0882D */ daddu $s1, $a1, $zero -/* 87C314 80242734 0280202D */ daddu $a0, $s4, $zero -/* 87C318 80242738 8E050000 */ lw $a1, ($s0) -/* 87C31C 8024273C 0C0B1EAF */ jal evt_get_variable -/* 87C320 80242740 0040A82D */ daddu $s5, $v0, $zero -/* 87C324 80242744 AFA00010 */ sw $zero, 0x10($sp) -/* 87C328 80242748 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C32C 8024274C 8C630030 */ lw $v1, 0x30($v1) -/* 87C330 80242750 AFA30014 */ sw $v1, 0x14($sp) -/* 87C334 80242754 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C338 80242758 8C63001C */ lw $v1, 0x1c($v1) -/* 87C33C 8024275C AFA30018 */ sw $v1, 0x18($sp) -/* 87C340 80242760 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C344 80242764 8C630024 */ lw $v1, 0x24($v1) -/* 87C348 80242768 AFA3001C */ sw $v1, 0x1c($sp) -/* 87C34C 8024276C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C350 80242770 8C630028 */ lw $v1, 0x28($v1) -/* 87C354 80242774 27B30010 */ addiu $s3, $sp, 0x10 -/* 87C358 80242778 AFA30020 */ sw $v1, 0x20($sp) -/* 87C35C 8024277C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C360 80242780 3C0142F0 */ lui $at, 0x42f0 -/* 87C364 80242784 44810000 */ mtc1 $at, $f0 -/* 87C368 80242788 8C63002C */ lw $v1, 0x2c($v1) -/* 87C36C 8024278C 0040802D */ daddu $s0, $v0, $zero -/* 87C370 80242790 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87C374 80242794 A7A0002C */ sh $zero, 0x2c($sp) -/* 87C378 80242798 12200006 */ beqz $s1, .L802427B4 -/* 87C37C 8024279C AFA30024 */ sw $v1, 0x24($sp) -/* 87C380 802427A0 02A0202D */ daddu $a0, $s5, $zero -/* 87C384 802427A4 0240282D */ daddu $a1, $s2, $zero -/* 87C388 802427A8 0280302D */ daddu $a2, $s4, $zero -/* 87C38C 802427AC 0C090976 */ jal tik_07_UnkFunc5 -/* 87C390 802427B0 0200382D */ daddu $a3, $s0, $zero -.L802427B4: -/* 87C394 802427B4 2402FFFE */ addiu $v0, $zero, -2 -/* 87C398 802427B8 A2A200AB */ sb $v0, 0xab($s5) -/* 87C39C 802427BC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 87C3A0 802427C0 30620004 */ andi $v0, $v1, 4 -/* 87C3A4 802427C4 10400007 */ beqz $v0, .L802427E4 -/* 87C3A8 802427C8 00000000 */ nop -/* 87C3AC 802427CC 824200B4 */ lb $v0, 0xb4($s2) -/* 87C3B0 802427D0 1440003C */ bnez $v0, .L802428C4 -/* 87C3B4 802427D4 0000102D */ daddu $v0, $zero, $zero -/* 87C3B8 802427D8 2402FFFB */ addiu $v0, $zero, -5 -/* 87C3BC 802427DC 00621024 */ and $v0, $v1, $v0 -/* 87C3C0 802427E0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802427E4: -/* 87C3C4 802427E4 8E830070 */ lw $v1, 0x70($s4) -/* 87C3C8 802427E8 2C62000F */ sltiu $v0, $v1, 0xf -/* 87C3CC 802427EC 10400034 */ beqz $v0, .L802428C0_87C4A0 -/* 87C3D0 802427F0 00031080 */ sll $v0, $v1, 2 -/* 87C3D4 802427F4 3C018024 */ lui $at, %hi(jtbl_802451C8_87EDA8) -/* 87C3D8 802427F8 00220821 */ addu $at, $at, $v0 -/* 87C3DC 802427FC 8C2251C8 */ lw $v0, %lo(jtbl_802451C8_87EDA8)($at) -/* 87C3E0 80242800 00400008 */ jr $v0 -/* 87C3E4 80242804 00000000 */ nop -.L80242808_87C3E8: -/* 87C3E8 80242808 0280202D */ daddu $a0, $s4, $zero -/* 87C3EC 8024280C 0200282D */ daddu $a1, $s0, $zero -/* 87C3F0 80242810 0C0904FC */ jal tik_07_UnkNpcAIFunc23 -/* 87C3F4 80242814 0260302D */ daddu $a2, $s3, $zero -.L80242818_87C3F8: -/* 87C3F8 80242818 0280202D */ daddu $a0, $s4, $zero -/* 87C3FC 8024281C 0200282D */ daddu $a1, $s0, $zero -/* 87C400 80242820 0C090568 */ jal tik_07_UnkNpcAIFunc35 -/* 87C404 80242824 0260302D */ daddu $a2, $s3, $zero -/* 87C408 80242828 08090A31 */ j .L802428C4 -/* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero -.L80242830_87C410: -/* 87C410 80242830 0280202D */ daddu $a0, $s4, $zero -/* 87C414 80242834 0200282D */ daddu $a1, $s0, $zero -/* 87C418 80242838 0C0906F2 */ jal tik_07_UnkNpcAIFunc1 -/* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero -.L80242840_87C420: -/* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero -/* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero -/* 87C428 80242848 0C090722 */ jal tik_07_UnkFunc4 -/* 87C42C 8024284C 0260302D */ daddu $a2, $s3, $zero -/* 87C430 80242850 08090A31 */ j .L802428C4 -/* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero -.L80242858_87C438: -/* 87C438 80242858 0280202D */ daddu $a0, $s4, $zero -/* 87C43C 8024285C 0200282D */ daddu $a1, $s0, $zero -/* 87C440 80242860 0C0907F3 */ jal tik_07_UnkNpcAIFunc2 -/* 87C444 80242864 0260302D */ daddu $a2, $s3, $zero -.L80242868_87C448: -/* 87C448 80242868 0280202D */ daddu $a0, $s4, $zero -/* 87C44C 8024286C 0200282D */ daddu $a1, $s0, $zero -/* 87C450 80242870 0C090811 */ jal func_80242044_87BC24 -/* 87C454 80242874 0260302D */ daddu $a2, $s3, $zero -/* 87C458 80242878 08090A31 */ j .L802428C4 -/* 87C45C 8024287C 0000102D */ daddu $v0, $zero, $zero -.L80242880_87C460: -/* 87C460 80242880 0280202D */ daddu $a0, $s4, $zero -/* 87C464 80242884 0200282D */ daddu $a1, $s0, $zero -/* 87C468 80242888 0C09082C */ jal tik_07_UnkNpcAIFunc14 -/* 87C46C 8024288C 0260302D */ daddu $a2, $s3, $zero -/* 87C470 80242890 08090A31 */ j .L802428C4 -/* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero -.L80242898_87C478: -/* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero -/* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero -/* 87C480 802428A0 0C090879 */ jal tik_07_UnkNpcAIFunc3 -/* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero -/* 87C488 802428A8 08090A31 */ j .L802428C4 -/* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero -.L802428B0_87C490: -/* 87C490 802428B0 0280202D */ daddu $a0, $s4, $zero -/* 87C494 802428B4 0200282D */ daddu $a1, $s0, $zero -/* 87C498 802428B8 0C090892 */ jal tik_07_UnkFunc6 -/* 87C49C 802428BC 0260302D */ daddu $a2, $s3, $zero -.L802428C0_87C4A0: -/* 87C4A0 802428C0 0000102D */ daddu $v0, $zero, $zero -.L802428C4: -/* 87C4A4 802428C4 8FBF0048 */ lw $ra, 0x48($sp) -/* 87C4A8 802428C8 8FB50044 */ lw $s5, 0x44($sp) -/* 87C4AC 802428CC 8FB40040 */ lw $s4, 0x40($sp) -/* 87C4B0 802428D0 8FB3003C */ lw $s3, 0x3c($sp) -/* 87C4B4 802428D4 8FB20038 */ lw $s2, 0x38($sp) -/* 87C4B8 802428D8 8FB10034 */ lw $s1, 0x34($sp) -/* 87C4BC 802428DC 8FB00030 */ lw $s0, 0x30($sp) -/* 87C4C0 802428E0 03E00008 */ jr $ra -/* 87C4C4 802428E4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 87C4C8 802428E8 00000000 */ nop -/* 87C4CC 802428EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s deleted file mode 100644 index f7741a413d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C80_887040 -/* 887040 80240C80 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 887044 80240C84 AFB60040 */ sw $s6, 0x40($sp) -/* 887048 80240C88 0080B02D */ daddu $s6, $a0, $zero -/* 88704C 80240C8C AFB00028 */ sw $s0, 0x28($sp) -/* 887050 80240C90 00A0802D */ daddu $s0, $a1, $zero -/* 887054 80240C94 AFBF0044 */ sw $ra, 0x44($sp) -/* 887058 80240C98 AFB5003C */ sw $s5, 0x3c($sp) -/* 88705C 80240C9C AFB40038 */ sw $s4, 0x38($sp) -/* 887060 80240CA0 AFB30034 */ sw $s3, 0x34($sp) -/* 887064 80240CA4 AFB20030 */ sw $s2, 0x30($sp) -/* 887068 80240CA8 AFB1002C */ sw $s1, 0x2c($sp) -/* 88706C 80240CAC F7B80058 */ sdc1 $f24, 0x58($sp) -/* 887070 80240CB0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 887074 80240CB4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 887078 80240CB8 8ED3000C */ lw $s3, 0xc($s6) -/* 88707C 80240CBC 0C00EAD2 */ jal get_npc_safe -/* 887080 80240CC0 2404FFFC */ addiu $a0, $zero, -4 -/* 887084 80240CC4 27A50018 */ addiu $a1, $sp, 0x18 -/* 887088 80240CC8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 88708C 80240CCC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 887090 80240CD0 27A6001C */ addiu $a2, $sp, 0x1c -/* 887094 80240CD4 00041880 */ sll $v1, $a0, 2 -/* 887098 80240CD8 00641821 */ addu $v1, $v1, $a0 -/* 88709C 80240CDC 00031880 */ sll $v1, $v1, 2 -/* 8870A0 80240CE0 00641823 */ subu $v1, $v1, $a0 -/* 8870A4 80240CE4 000320C0 */ sll $a0, $v1, 3 -/* 8870A8 80240CE8 00641821 */ addu $v1, $v1, $a0 -/* 8870AC 80240CEC 000318C0 */ sll $v1, $v1, 3 -/* 8870B0 80240CF0 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 8870B4 80240CF4 00230821 */ addu $at, $at, $v1 -/* 8870B8 80240CF8 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 8870BC 80240CFC 0C00A88D */ jal sin_cos_deg -/* 8870C0 80240D00 0040A82D */ daddu $s5, $v0, $zero -/* 8870C4 80240D04 1200005D */ beqz $s0, .L80240E7C -/* 8870C8 80240D08 00000000 */ nop -/* 8870CC 80240D0C 0C00AB0A */ jal general_heap_malloc -/* 8870D0 80240D10 24040068 */ addiu $a0, $zero, 0x68 -/* 8870D4 80240D14 0040902D */ daddu $s2, $v0, $zero -/* 8870D8 80240D18 02C0202D */ daddu $a0, $s6, $zero -/* 8870DC 80240D1C 0000882D */ daddu $s1, $zero, $zero -/* 8870E0 80240D20 2414FFFF */ addiu $s4, $zero, -1 -/* 8870E4 80240D24 AED20060 */ sw $s2, 0x60($s6) -/* 8870E8 80240D28 8E650000 */ lw $a1, ($s3) -/* 8870EC 80240D2C 3C014148 */ lui $at, 0x4148 -/* 8870F0 80240D30 4481C000 */ mtc1 $at, $f24 -/* 8870F4 80240D34 3C013F80 */ lui $at, 0x3f80 -/* 8870F8 80240D38 4481B000 */ mtc1 $at, $f22 -/* 8870FC 80240D3C 4480A000 */ mtc1 $zero, $f20 -/* 887100 80240D40 0C0B1EAF */ jal evt_get_variable -/* 887104 80240D44 0240802D */ daddu $s0, $s2, $zero -/* 887108 80240D48 0C04417A */ jal get_entity_by_index -/* 88710C 80240D4C 0040202D */ daddu $a0, $v0, $zero -/* 887110 80240D50 AE42005C */ sw $v0, 0x5c($s2) -.L80240D54: -/* 887114 80240D54 8E42005C */ lw $v0, 0x5c($s2) -/* 887118 80240D58 C440004C */ lwc1 $f0, 0x4c($v0) -/* 88711C 80240D5C 0000202D */ daddu $a0, $zero, $zero -/* 887120 80240D60 E7B60010 */ swc1 $f22, 0x10($sp) -/* 887124 80240D64 AFB40014 */ sw $s4, 0x14($sp) -/* 887128 80240D68 46180000 */ add.s $f0, $f0, $f24 -/* 88712C 80240D6C 8C450048 */ lw $a1, 0x48($v0) -/* 887130 80240D70 8C470050 */ lw $a3, 0x50($v0) -/* 887134 80240D74 44060000 */ mfc1 $a2, $f0 -/* 887138 80240D78 0C01C5BC */ jal fx_motion_blur_flame -/* 88713C 80240D7C 26310001 */ addiu $s1, $s1, 1 -/* 887140 80240D80 AE020008 */ sw $v0, 8($s0) -/* 887144 80240D84 E614002C */ swc1 $f20, 0x2c($s0) -/* 887148 80240D88 E6140020 */ swc1 $f20, 0x20($s0) -/* 88714C 80240D8C E6140014 */ swc1 $f20, 0x14($s0) -/* 887150 80240D90 E6140050 */ swc1 $f20, 0x50($s0) -/* 887154 80240D94 E6140044 */ swc1 $f20, 0x44($s0) -/* 887158 80240D98 E6140038 */ swc1 $f20, 0x38($s0) -/* 88715C 80240D9C 2A220003 */ slti $v0, $s1, 3 -/* 887160 80240DA0 1440FFEC */ bnez $v0, .L80240D54 -/* 887164 80240DA4 26100004 */ addiu $s0, $s0, 4 -/* 887168 80240DA8 0000882D */ daddu $s1, $zero, $zero -/* 88716C 80240DAC 0240802D */ daddu $s0, $s2, $zero -/* 887170 80240DB0 3C148024 */ lui $s4, %hi(D_80242088_888448) -/* 887174 80240DB4 26942088 */ addiu $s4, $s4, %lo(D_80242088_888448) -/* 887178 80240DB8 3C014248 */ lui $at, 0x4248 -/* 88717C 80240DBC 4481A000 */ mtc1 $at, $f20 -/* 887180 80240DC0 24130044 */ addiu $s3, $zero, 0x44 -/* 887184 80240DC4 AE400000 */ sw $zero, ($s2) -/* 887188 80240DC8 AE400004 */ sw $zero, 4($s2) -/* 88718C 80240DCC AE400060 */ sw $zero, 0x60($s2) -/* 887190 80240DD0 AE400064 */ sw $zero, 0x64($s2) -.L80240DD4: -/* 887194 80240DD4 27A40020 */ addiu $a0, $sp, 0x20 -/* 887198 80240DD8 4406A000 */ mfc1 $a2, $f20 -/* 88719C 80240DDC 8E870000 */ lw $a3, ($s4) -/* 8871A0 80240DE0 02532821 */ addu $a1, $s2, $s3 -/* 8871A4 80240DE4 0C00A7E7 */ jal add_vec2D_polar -/* 8871A8 80240DE8 AFA00020 */ sw $zero, 0x20($sp) -/* 8871AC 80240DEC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 8871B0 80240DF0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 8871B4 80240DF4 46041082 */ mul.s $f2, $f2, $f4 -/* 8871B8 80240DF8 00000000 */ nop -/* 8871BC 80240DFC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 8871C0 80240E00 46040002 */ mul.s $f0, $f0, $f4 -/* 8871C4 80240E04 00000000 */ nop -/* 8871C8 80240E08 E6020038 */ swc1 $f2, 0x38($s0) -/* 8871CC 80240E0C E6000050 */ swc1 $f0, 0x50($s0) -/* 8871D0 80240E10 8E42005C */ lw $v0, 0x5c($s2) -/* 8871D4 80240E14 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8871D8 80240E18 C4420048 */ lwc1 $f2, 0x48($v0) -/* 8871DC 80240E1C 46001080 */ add.s $f2, $f2, $f0 -/* 8871E0 80240E20 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 8871E4 80240E24 46020001 */ sub.s $f0, $f0, $f2 -/* 8871E8 80240E28 E6000038 */ swc1 $f0, 0x38($s0) -/* 8871EC 80240E2C 8E42005C */ lw $v0, 0x5c($s2) -/* 8871F0 80240E30 C6000044 */ lwc1 $f0, 0x44($s0) -/* 8871F4 80240E34 C442004C */ lwc1 $f2, 0x4c($v0) -/* 8871F8 80240E38 46001080 */ add.s $f2, $f2, $f0 -/* 8871FC 80240E3C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 887200 80240E40 46020001 */ sub.s $f0, $f0, $f2 -/* 887204 80240E44 E6000044 */ swc1 $f0, 0x44($s0) -/* 887208 80240E48 8E42005C */ lw $v0, 0x5c($s2) -/* 88720C 80240E4C C6000050 */ lwc1 $f0, 0x50($s0) -/* 887210 80240E50 C4420050 */ lwc1 $f2, 0x50($v0) -/* 887214 80240E54 26940004 */ addiu $s4, $s4, 4 -/* 887218 80240E58 46001080 */ add.s $f2, $f2, $f0 -/* 88721C 80240E5C C6A00040 */ lwc1 $f0, 0x40($s5) -/* 887220 80240E60 26730004 */ addiu $s3, $s3, 4 -/* 887224 80240E64 46020001 */ sub.s $f0, $f0, $f2 -/* 887228 80240E68 26310001 */ addiu $s1, $s1, 1 -/* 88722C 80240E6C 2A220003 */ slti $v0, $s1, 3 -/* 887230 80240E70 E6000050 */ swc1 $f0, 0x50($s0) -/* 887234 80240E74 1440FFD7 */ bnez $v0, .L80240DD4 -/* 887238 80240E78 26100004 */ addiu $s0, $s0, 4 -.L80240E7C: -/* 88723C 80240E7C 8ED20060 */ lw $s2, 0x60($s6) -/* 887240 80240E80 8E430000 */ lw $v1, ($s2) -/* 887244 80240E84 24020001 */ addiu $v0, $zero, 1 -/* 887248 80240E88 10620038 */ beq $v1, $v0, .L80240F6C -/* 88724C 80240E8C 28620002 */ slti $v0, $v1, 2 -/* 887250 80240E90 50400005 */ beql $v0, $zero, .L80240EA8 -/* 887254 80240E94 24020002 */ addiu $v0, $zero, 2 -/* 887258 80240E98 10600007 */ beqz $v1, .L80240EB8 -/* 88725C 80240E9C 24040005 */ addiu $a0, $zero, 5 -/* 887260 80240EA0 08090414 */ j .L80241050 -/* 887264 80240EA4 00000000 */ nop -.L80240EA8: -/* 887268 80240EA8 10620058 */ beq $v1, $v0, .L8024100C -/* 88726C 80240EAC 00000000 */ nop -/* 887270 80240EB0 08090414 */ j .L80241050 -/* 887274 80240EB4 00000000 */ nop -.L80240EB8: -/* 887278 80240EB8 0000882D */ daddu $s1, $zero, $zero -/* 88727C 80240EBC 3C148024 */ lui $s4, %hi(D_80242088_888448) -/* 887280 80240EC0 26942088 */ addiu $s4, $s4, %lo(D_80242088_888448) -/* 887284 80240EC4 24130020 */ addiu $s3, $zero, 0x20 -/* 887288 80240EC8 3C064248 */ lui $a2, 0x4248 -/* 88728C 80240ECC 44800000 */ mtc1 $zero, $f0 -/* 887290 80240ED0 24020014 */ addiu $v0, $zero, 0x14 -/* 887294 80240ED4 AFA20010 */ sw $v0, 0x10($sp) -/* 887298 80240ED8 44050000 */ mfc1 $a1, $f0 -/* 88729C 80240EDC 8E470060 */ lw $a3, 0x60($s2) -/* 8872A0 80240EE0 4485B000 */ mtc1 $a1, $f22 -/* 8872A4 80240EE4 0C00A8ED */ jal update_lerp -/* 8872A8 80240EE8 0240802D */ daddu $s0, $s2, $zero -/* 8872AC 80240EEC 46000506 */ mov.s $f20, $f0 -.L80240EF0: -/* 8872B0 80240EF0 4406A000 */ mfc1 $a2, $f20 -/* 8872B4 80240EF4 27A40020 */ addiu $a0, $sp, 0x20 -/* 8872B8 80240EF8 E6160020 */ swc1 $f22, 0x20($s0) -/* 8872BC 80240EFC 8E870000 */ lw $a3, ($s4) -/* 8872C0 80240F00 02532821 */ addu $a1, $s2, $s3 -/* 8872C4 80240F04 0C00A7E7 */ jal add_vec2D_polar -/* 8872C8 80240F08 E7B60020 */ swc1 $f22, 0x20($sp) -/* 8872CC 80240F0C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8872D0 80240F10 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 8872D4 80240F14 46002102 */ mul.s $f4, $f4, $f0 -/* 8872D8 80240F18 00000000 */ nop -/* 8872DC 80240F1C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 8872E0 80240F20 26940004 */ addiu $s4, $s4, 4 -/* 8872E4 80240F24 46001082 */ mul.s $f2, $f2, $f0 -/* 8872E8 80240F28 00000000 */ nop -/* 8872EC 80240F2C 26730004 */ addiu $s3, $s3, 4 -/* 8872F0 80240F30 26310001 */ addiu $s1, $s1, 1 -/* 8872F4 80240F34 2A220003 */ slti $v0, $s1, 3 -/* 8872F8 80240F38 E6040014 */ swc1 $f4, 0x14($s0) -/* 8872FC 80240F3C E602002C */ swc1 $f2, 0x2c($s0) -/* 887300 80240F40 1440FFEB */ bnez $v0, .L80240EF0 -/* 887304 80240F44 26100004 */ addiu $s0, $s0, 4 -/* 887308 80240F48 8E420060 */ lw $v0, 0x60($s2) -/* 88730C 80240F4C 24420001 */ addiu $v0, $v0, 1 -/* 887310 80240F50 AE420060 */ sw $v0, 0x60($s2) -/* 887314 80240F54 28420015 */ slti $v0, $v0, 0x15 -/* 887318 80240F58 1440003D */ bnez $v0, .L80241050 -/* 88731C 80240F5C 24020001 */ addiu $v0, $zero, 1 -/* 887320 80240F60 AE420000 */ sw $v0, ($s2) -/* 887324 80240F64 08090414 */ j .L80241050 -/* 887328 80240F68 AE400060 */ sw $zero, 0x60($s2) -.L80240F6C: -/* 88732C 80240F6C 0000882D */ daddu $s1, $zero, $zero -/* 887330 80240F70 3C148024 */ lui $s4, %hi(D_80242088_888448) -/* 887334 80240F74 26942088 */ addiu $s4, $s4, %lo(D_80242088_888448) -/* 887338 80240F78 24130020 */ addiu $s3, $zero, 0x20 -/* 88733C 80240F7C 0240802D */ daddu $s0, $s2, $zero -/* 887340 80240F80 3C014248 */ lui $at, 0x4248 -/* 887344 80240F84 4481A000 */ mtc1 $at, $f20 -/* 887348 80240F88 4480B000 */ mtc1 $zero, $f22 -.L80240F8C: -/* 88734C 80240F8C 4406A000 */ mfc1 $a2, $f20 -/* 887350 80240F90 27A40020 */ addiu $a0, $sp, 0x20 -/* 887354 80240F94 E6160020 */ swc1 $f22, 0x20($s0) -/* 887358 80240F98 8E870000 */ lw $a3, ($s4) -/* 88735C 80240F9C 02532821 */ addu $a1, $s2, $s3 -/* 887360 80240FA0 0C00A7E7 */ jal add_vec2D_polar -/* 887364 80240FA4 E7B60020 */ swc1 $f22, 0x20($sp) -/* 887368 80240FA8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 88736C 80240FAC C7A00020 */ lwc1 $f0, 0x20($sp) -/* 887370 80240FB0 46002102 */ mul.s $f4, $f4, $f0 -/* 887374 80240FB4 00000000 */ nop -/* 887378 80240FB8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 88737C 80240FBC 26940004 */ addiu $s4, $s4, 4 -/* 887380 80240FC0 46001082 */ mul.s $f2, $f2, $f0 -/* 887384 80240FC4 00000000 */ nop -/* 887388 80240FC8 26730004 */ addiu $s3, $s3, 4 -/* 88738C 80240FCC 26310001 */ addiu $s1, $s1, 1 -/* 887390 80240FD0 2A220003 */ slti $v0, $s1, 3 -/* 887394 80240FD4 E6040014 */ swc1 $f4, 0x14($s0) -/* 887398 80240FD8 E602002C */ swc1 $f2, 0x2c($s0) -/* 88739C 80240FDC 1440FFEB */ bnez $v0, .L80240F8C -/* 8873A0 80240FE0 26100004 */ addiu $s0, $s0, 4 -/* 8873A4 80240FE4 8E420060 */ lw $v0, 0x60($s2) -/* 8873A8 80240FE8 24420001 */ addiu $v0, $v0, 1 -/* 8873AC 80240FEC AE420060 */ sw $v0, 0x60($s2) -/* 8873B0 80240FF0 28420010 */ slti $v0, $v0, 0x10 -/* 8873B4 80240FF4 14400016 */ bnez $v0, .L80241050 -/* 8873B8 80240FF8 2402000F */ addiu $v0, $zero, 0xf -/* 8873BC 80240FFC AE420060 */ sw $v0, 0x60($s2) -/* 8873C0 80241000 24020002 */ addiu $v0, $zero, 2 -/* 8873C4 80241004 08090414 */ j .L80241050 -/* 8873C8 80241008 AE420000 */ sw $v0, ($s2) -.L8024100C: -/* 8873CC 8024100C 8E420060 */ lw $v0, 0x60($s2) -/* 8873D0 80241010 24420001 */ addiu $v0, $v0, 1 -/* 8873D4 80241014 AE420060 */ sw $v0, 0x60($s2) -/* 8873D8 80241018 2842001F */ slti $v0, $v0, 0x1f -/* 8873DC 8024101C 1440000C */ bnez $v0, .L80241050 -/* 8873E0 80241020 0000882D */ daddu $s1, $zero, $zero -/* 8873E4 80241024 0240282D */ daddu $a1, $s2, $zero -.L80241028: -/* 8873E8 80241028 8CA20008 */ lw $v0, 8($a1) -/* 8873EC 8024102C 8C430000 */ lw $v1, ($v0) -/* 8873F0 80241030 26310001 */ addiu $s1, $s1, 1 -/* 8873F4 80241034 34630010 */ ori $v1, $v1, 0x10 -/* 8873F8 80241038 AC430000 */ sw $v1, ($v0) -/* 8873FC 8024103C 2A220003 */ slti $v0, $s1, 3 -/* 887400 80241040 1440FFF9 */ bnez $v0, .L80241028 -/* 887404 80241044 24A50004 */ addiu $a1, $a1, 4 -/* 887408 80241048 08090461 */ j .L80241184 -/* 88740C 8024104C 24020002 */ addiu $v0, $zero, 2 -.L80241050: -/* 887410 80241050 8E430004 */ lw $v1, 4($s2) -/* 887414 80241054 10600005 */ beqz $v1, .L8024106C -/* 887418 80241058 24020001 */ addiu $v0, $zero, 1 -/* 88741C 8024105C 1062000B */ beq $v1, $v0, .L8024108C -/* 887420 80241060 0000882D */ daddu $s1, $zero, $zero -/* 887424 80241064 08090450 */ j .L80241140 -/* 887428 80241068 0240282D */ daddu $a1, $s2, $zero -.L8024106C: -/* 88742C 8024106C 8E420064 */ lw $v0, 0x64($s2) -/* 887430 80241070 24420001 */ addiu $v0, $v0, 1 -/* 887434 80241074 AE420064 */ sw $v0, 0x64($s2) -/* 887438 80241078 28420010 */ slti $v0, $v0, 0x10 -/* 88743C 8024107C 1440002F */ bnez $v0, .L8024113C -/* 887440 80241080 0000882D */ daddu $s1, $zero, $zero -/* 887444 80241084 0809044C */ j .L80241130 -/* 887448 80241088 24020001 */ addiu $v0, $zero, 1 -.L8024108C: -/* 88744C 8024108C 4480A000 */ mtc1 $zero, $f20 -/* 887450 80241090 24130014 */ addiu $s3, $zero, 0x14 -/* 887454 80241094 0240802D */ daddu $s0, $s2, $zero -.L80241098: -/* 887458 80241098 4405A000 */ mfc1 $a1, $f20 -/* 88745C 8024109C AFB30010 */ sw $s3, 0x10($sp) -/* 887460 802410A0 8E060038 */ lw $a2, 0x38($s0) -/* 887464 802410A4 8E470064 */ lw $a3, 0x64($s2) -/* 887468 802410A8 0C00A8ED */ jal update_lerp -/* 88746C 802410AC 24040001 */ addiu $a0, $zero, 1 -/* 887470 802410B0 C6020014 */ lwc1 $f2, 0x14($s0) -/* 887474 802410B4 46001080 */ add.s $f2, $f2, $f0 -/* 887478 802410B8 4405A000 */ mfc1 $a1, $f20 -/* 88747C 802410BC E6020014 */ swc1 $f2, 0x14($s0) -/* 887480 802410C0 AFB30010 */ sw $s3, 0x10($sp) -/* 887484 802410C4 8E060044 */ lw $a2, 0x44($s0) -/* 887488 802410C8 8E470064 */ lw $a3, 0x64($s2) -/* 88748C 802410CC 0C00A8ED */ jal update_lerp -/* 887490 802410D0 24040001 */ addiu $a0, $zero, 1 -/* 887494 802410D4 C6020020 */ lwc1 $f2, 0x20($s0) -/* 887498 802410D8 46001080 */ add.s $f2, $f2, $f0 -/* 88749C 802410DC 4405A000 */ mfc1 $a1, $f20 -/* 8874A0 802410E0 E6020020 */ swc1 $f2, 0x20($s0) -/* 8874A4 802410E4 AFB30010 */ sw $s3, 0x10($sp) -/* 8874A8 802410E8 8E060050 */ lw $a2, 0x50($s0) -/* 8874AC 802410EC 8E470064 */ lw $a3, 0x64($s2) -/* 8874B0 802410F0 0C00A8ED */ jal update_lerp -/* 8874B4 802410F4 24040001 */ addiu $a0, $zero, 1 -/* 8874B8 802410F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 8874BC 802410FC 46001080 */ add.s $f2, $f2, $f0 -/* 8874C0 80241100 26310001 */ addiu $s1, $s1, 1 -/* 8874C4 80241104 2A220003 */ slti $v0, $s1, 3 -/* 8874C8 80241108 E602002C */ swc1 $f2, 0x2c($s0) -/* 8874CC 8024110C 1440FFE2 */ bnez $v0, .L80241098 -/* 8874D0 80241110 26100004 */ addiu $s0, $s0, 4 -/* 8874D4 80241114 8E420064 */ lw $v0, 0x64($s2) -/* 8874D8 80241118 24420001 */ addiu $v0, $v0, 1 -/* 8874DC 8024111C AE420064 */ sw $v0, 0x64($s2) -/* 8874E0 80241120 28420015 */ slti $v0, $v0, 0x15 -/* 8874E4 80241124 14400005 */ bnez $v0, .L8024113C -/* 8874E8 80241128 0000882D */ daddu $s1, $zero, $zero -/* 8874EC 8024112C 24020002 */ addiu $v0, $zero, 2 -.L80241130: -/* 8874F0 80241130 AE420004 */ sw $v0, 4($s2) -/* 8874F4 80241134 AE400064 */ sw $zero, 0x64($s2) -/* 8874F8 80241138 0000882D */ daddu $s1, $zero, $zero -.L8024113C: -/* 8874FC 8024113C 0240282D */ daddu $a1, $s2, $zero -.L80241140: -/* 887500 80241140 8CA20008 */ lw $v0, 8($a1) -/* 887504 80241144 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 887508 80241148 8C42000C */ lw $v0, 0xc($v0) -/* 88750C 8024114C E4400010 */ swc1 $f0, 0x10($v0) -/* 887510 80241150 8CA20008 */ lw $v0, 8($a1) -/* 887514 80241154 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 887518 80241158 8C42000C */ lw $v0, 0xc($v0) -/* 88751C 8024115C 26310001 */ addiu $s1, $s1, 1 -/* 887520 80241160 E4400014 */ swc1 $f0, 0x14($v0) -/* 887524 80241164 8CA20008 */ lw $v0, 8($a1) -/* 887528 80241168 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 88752C 8024116C 8C42000C */ lw $v0, 0xc($v0) -/* 887530 80241170 E4400018 */ swc1 $f0, 0x18($v0) -/* 887534 80241174 2A220003 */ slti $v0, $s1, 3 -/* 887538 80241178 1440FFF1 */ bnez $v0, .L80241140 -/* 88753C 8024117C 24A50004 */ addiu $a1, $a1, 4 -/* 887540 80241180 0000102D */ daddu $v0, $zero, $zero -.L80241184: -/* 887544 80241184 8FBF0044 */ lw $ra, 0x44($sp) -/* 887548 80241188 8FB60040 */ lw $s6, 0x40($sp) -/* 88754C 8024118C 8FB5003C */ lw $s5, 0x3c($sp) -/* 887550 80241190 8FB40038 */ lw $s4, 0x38($sp) -/* 887554 80241194 8FB30034 */ lw $s3, 0x34($sp) -/* 887558 80241198 8FB20030 */ lw $s2, 0x30($sp) -/* 88755C 8024119C 8FB1002C */ lw $s1, 0x2c($sp) -/* 887560 802411A0 8FB00028 */ lw $s0, 0x28($sp) -/* 887564 802411A4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 887568 802411A8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 88756C 802411AC D7B40048 */ ldc1 $f20, 0x48($sp) -/* 887570 802411B0 03E00008 */ jr $ra -/* 887574 802411B4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s deleted file mode 100644 index 5e39e0aa41..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024121C_889DEC -/* 889DEC 8024121C 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 889DF0 80241220 AFB60040 */ sw $s6, 0x40($sp) -/* 889DF4 80241224 0080B02D */ daddu $s6, $a0, $zero -/* 889DF8 80241228 AFB00028 */ sw $s0, 0x28($sp) -/* 889DFC 8024122C 00A0802D */ daddu $s0, $a1, $zero -/* 889E00 80241230 AFBF0044 */ sw $ra, 0x44($sp) -/* 889E04 80241234 AFB5003C */ sw $s5, 0x3c($sp) -/* 889E08 80241238 AFB40038 */ sw $s4, 0x38($sp) -/* 889E0C 8024123C AFB30034 */ sw $s3, 0x34($sp) -/* 889E10 80241240 AFB20030 */ sw $s2, 0x30($sp) -/* 889E14 80241244 AFB1002C */ sw $s1, 0x2c($sp) -/* 889E18 80241248 F7B80058 */ sdc1 $f24, 0x58($sp) -/* 889E1C 8024124C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 889E20 80241250 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 889E24 80241254 8ED3000C */ lw $s3, 0xc($s6) -/* 889E28 80241258 0C00EAD2 */ jal get_npc_safe -/* 889E2C 8024125C 2404FFFC */ addiu $a0, $zero, -4 -/* 889E30 80241260 27A50018 */ addiu $a1, $sp, 0x18 -/* 889E34 80241264 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 889E38 80241268 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 889E3C 8024126C 27A6001C */ addiu $a2, $sp, 0x1c -/* 889E40 80241270 00041880 */ sll $v1, $a0, 2 -/* 889E44 80241274 00641821 */ addu $v1, $v1, $a0 -/* 889E48 80241278 00031880 */ sll $v1, $v1, 2 -/* 889E4C 8024127C 00641823 */ subu $v1, $v1, $a0 -/* 889E50 80241280 000320C0 */ sll $a0, $v1, 3 -/* 889E54 80241284 00641821 */ addu $v1, $v1, $a0 -/* 889E58 80241288 000318C0 */ sll $v1, $v1, 3 -/* 889E5C 8024128C 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 889E60 80241290 00230821 */ addu $at, $at, $v1 -/* 889E64 80241294 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 889E68 80241298 0C00A88D */ jal sin_cos_deg -/* 889E6C 8024129C 0040A82D */ daddu $s5, $v0, $zero -/* 889E70 802412A0 1200005D */ beqz $s0, .L80241418 -/* 889E74 802412A4 00000000 */ nop -/* 889E78 802412A8 0C00AB0A */ jal general_heap_malloc -/* 889E7C 802412AC 24040068 */ addiu $a0, $zero, 0x68 -/* 889E80 802412B0 0040902D */ daddu $s2, $v0, $zero -/* 889E84 802412B4 02C0202D */ daddu $a0, $s6, $zero -/* 889E88 802412B8 0000882D */ daddu $s1, $zero, $zero -/* 889E8C 802412BC 2414FFFF */ addiu $s4, $zero, -1 -/* 889E90 802412C0 AED20060 */ sw $s2, 0x60($s6) -/* 889E94 802412C4 8E650000 */ lw $a1, ($s3) -/* 889E98 802412C8 3C014148 */ lui $at, 0x4148 -/* 889E9C 802412CC 4481C000 */ mtc1 $at, $f24 -/* 889EA0 802412D0 3C013F80 */ lui $at, 0x3f80 -/* 889EA4 802412D4 4481B000 */ mtc1 $at, $f22 -/* 889EA8 802412D8 4480A000 */ mtc1 $zero, $f20 -/* 889EAC 802412DC 0C0B1EAF */ jal evt_get_variable -/* 889EB0 802412E0 0240802D */ daddu $s0, $s2, $zero -/* 889EB4 802412E4 0C04417A */ jal get_entity_by_index -/* 889EB8 802412E8 0040202D */ daddu $a0, $v0, $zero -/* 889EBC 802412EC AE42005C */ sw $v0, 0x5c($s2) -.L802412F0: -/* 889EC0 802412F0 8E42005C */ lw $v0, 0x5c($s2) -/* 889EC4 802412F4 C440004C */ lwc1 $f0, 0x4c($v0) -/* 889EC8 802412F8 0000202D */ daddu $a0, $zero, $zero -/* 889ECC 802412FC E7B60010 */ swc1 $f22, 0x10($sp) -/* 889ED0 80241300 AFB40014 */ sw $s4, 0x14($sp) -/* 889ED4 80241304 46180000 */ add.s $f0, $f0, $f24 -/* 889ED8 80241308 8C450048 */ lw $a1, 0x48($v0) -/* 889EDC 8024130C 8C470050 */ lw $a3, 0x50($v0) -/* 889EE0 80241310 44060000 */ mfc1 $a2, $f0 -/* 889EE4 80241314 0C01C5BC */ jal fx_motion_blur_flame -/* 889EE8 80241318 26310001 */ addiu $s1, $s1, 1 -/* 889EEC 8024131C AE020008 */ sw $v0, 8($s0) -/* 889EF0 80241320 E614002C */ swc1 $f20, 0x2c($s0) -/* 889EF4 80241324 E6140020 */ swc1 $f20, 0x20($s0) -/* 889EF8 80241328 E6140014 */ swc1 $f20, 0x14($s0) -/* 889EFC 8024132C E6140050 */ swc1 $f20, 0x50($s0) -/* 889F00 80241330 E6140044 */ swc1 $f20, 0x44($s0) -/* 889F04 80241334 E6140038 */ swc1 $f20, 0x38($s0) -/* 889F08 80241338 2A220003 */ slti $v0, $s1, 3 -/* 889F0C 8024133C 1440FFEC */ bnez $v0, .L802412F0 -/* 889F10 80241340 26100004 */ addiu $s0, $s0, 4 -/* 889F14 80241344 0000882D */ daddu $s1, $zero, $zero -/* 889F18 80241348 0240802D */ daddu $s0, $s2, $zero -/* 889F1C 8024134C 3C148024 */ lui $s4, %hi(D_80243D04_88C8D4) -/* 889F20 80241350 26943D04 */ addiu $s4, $s4, %lo(D_80243D04_88C8D4) -/* 889F24 80241354 3C014248 */ lui $at, 0x4248 -/* 889F28 80241358 4481A000 */ mtc1 $at, $f20 -/* 889F2C 8024135C 24130044 */ addiu $s3, $zero, 0x44 -/* 889F30 80241360 AE400000 */ sw $zero, ($s2) -/* 889F34 80241364 AE400004 */ sw $zero, 4($s2) -/* 889F38 80241368 AE400060 */ sw $zero, 0x60($s2) -/* 889F3C 8024136C AE400064 */ sw $zero, 0x64($s2) -.L80241370: -/* 889F40 80241370 27A40020 */ addiu $a0, $sp, 0x20 -/* 889F44 80241374 4406A000 */ mfc1 $a2, $f20 -/* 889F48 80241378 8E870000 */ lw $a3, ($s4) -/* 889F4C 8024137C 02532821 */ addu $a1, $s2, $s3 -/* 889F50 80241380 0C00A7E7 */ jal add_vec2D_polar -/* 889F54 80241384 AFA00020 */ sw $zero, 0x20($sp) -/* 889F58 80241388 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 889F5C 8024138C C7A40020 */ lwc1 $f4, 0x20($sp) -/* 889F60 80241390 46041082 */ mul.s $f2, $f2, $f4 -/* 889F64 80241394 00000000 */ nop -/* 889F68 80241398 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 889F6C 8024139C 46040002 */ mul.s $f0, $f0, $f4 -/* 889F70 802413A0 00000000 */ nop -/* 889F74 802413A4 E6020038 */ swc1 $f2, 0x38($s0) -/* 889F78 802413A8 E6000050 */ swc1 $f0, 0x50($s0) -/* 889F7C 802413AC 8E42005C */ lw $v0, 0x5c($s2) -/* 889F80 802413B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 889F84 802413B4 C4420048 */ lwc1 $f2, 0x48($v0) -/* 889F88 802413B8 46001080 */ add.s $f2, $f2, $f0 -/* 889F8C 802413BC C6A00038 */ lwc1 $f0, 0x38($s5) -/* 889F90 802413C0 46020001 */ sub.s $f0, $f0, $f2 -/* 889F94 802413C4 E6000038 */ swc1 $f0, 0x38($s0) -/* 889F98 802413C8 8E42005C */ lw $v0, 0x5c($s2) -/* 889F9C 802413CC C6000044 */ lwc1 $f0, 0x44($s0) -/* 889FA0 802413D0 C442004C */ lwc1 $f2, 0x4c($v0) -/* 889FA4 802413D4 46001080 */ add.s $f2, $f2, $f0 -/* 889FA8 802413D8 C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 889FAC 802413DC 46020001 */ sub.s $f0, $f0, $f2 -/* 889FB0 802413E0 E6000044 */ swc1 $f0, 0x44($s0) -/* 889FB4 802413E4 8E42005C */ lw $v0, 0x5c($s2) -/* 889FB8 802413E8 C6000050 */ lwc1 $f0, 0x50($s0) -/* 889FBC 802413EC C4420050 */ lwc1 $f2, 0x50($v0) -/* 889FC0 802413F0 26940004 */ addiu $s4, $s4, 4 -/* 889FC4 802413F4 46001080 */ add.s $f2, $f2, $f0 -/* 889FC8 802413F8 C6A00040 */ lwc1 $f0, 0x40($s5) -/* 889FCC 802413FC 26730004 */ addiu $s3, $s3, 4 -/* 889FD0 80241400 46020001 */ sub.s $f0, $f0, $f2 -/* 889FD4 80241404 26310001 */ addiu $s1, $s1, 1 -/* 889FD8 80241408 2A220003 */ slti $v0, $s1, 3 -/* 889FDC 8024140C E6000050 */ swc1 $f0, 0x50($s0) -/* 889FE0 80241410 1440FFD7 */ bnez $v0, .L80241370 -/* 889FE4 80241414 26100004 */ addiu $s0, $s0, 4 -.L80241418: -/* 889FE8 80241418 8ED20060 */ lw $s2, 0x60($s6) -/* 889FEC 8024141C 8E430000 */ lw $v1, ($s2) -/* 889FF0 80241420 24020001 */ addiu $v0, $zero, 1 -/* 889FF4 80241424 10620038 */ beq $v1, $v0, .L80241508 -/* 889FF8 80241428 28620002 */ slti $v0, $v1, 2 -/* 889FFC 8024142C 50400005 */ beql $v0, $zero, .L80241444 -/* 88A000 80241430 24020002 */ addiu $v0, $zero, 2 -/* 88A004 80241434 10600007 */ beqz $v1, .L80241454 -/* 88A008 80241438 24040005 */ addiu $a0, $zero, 5 -/* 88A00C 8024143C 0809057B */ j .L802415EC -/* 88A010 80241440 00000000 */ nop -.L80241444: -/* 88A014 80241444 10620058 */ beq $v1, $v0, .L802415A8 -/* 88A018 80241448 00000000 */ nop -/* 88A01C 8024144C 0809057B */ j .L802415EC -/* 88A020 80241450 00000000 */ nop -.L80241454: -/* 88A024 80241454 0000882D */ daddu $s1, $zero, $zero -/* 88A028 80241458 3C148024 */ lui $s4, %hi(D_80243D04_88C8D4) -/* 88A02C 8024145C 26943D04 */ addiu $s4, $s4, %lo(D_80243D04_88C8D4) -/* 88A030 80241460 24130020 */ addiu $s3, $zero, 0x20 -/* 88A034 80241464 3C064248 */ lui $a2, 0x4248 -/* 88A038 80241468 44800000 */ mtc1 $zero, $f0 -/* 88A03C 8024146C 24020014 */ addiu $v0, $zero, 0x14 -/* 88A040 80241470 AFA20010 */ sw $v0, 0x10($sp) -/* 88A044 80241474 44050000 */ mfc1 $a1, $f0 -/* 88A048 80241478 8E470060 */ lw $a3, 0x60($s2) -/* 88A04C 8024147C 4485B000 */ mtc1 $a1, $f22 -/* 88A050 80241480 0C00A8ED */ jal update_lerp -/* 88A054 80241484 0240802D */ daddu $s0, $s2, $zero -/* 88A058 80241488 46000506 */ mov.s $f20, $f0 -.L8024148C: -/* 88A05C 8024148C 4406A000 */ mfc1 $a2, $f20 -/* 88A060 80241490 27A40020 */ addiu $a0, $sp, 0x20 -/* 88A064 80241494 E6160020 */ swc1 $f22, 0x20($s0) -/* 88A068 80241498 8E870000 */ lw $a3, ($s4) -/* 88A06C 8024149C 02532821 */ addu $a1, $s2, $s3 -/* 88A070 802414A0 0C00A7E7 */ jal add_vec2D_polar -/* 88A074 802414A4 E7B60020 */ swc1 $f22, 0x20($sp) -/* 88A078 802414A8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 88A07C 802414AC C7A00020 */ lwc1 $f0, 0x20($sp) -/* 88A080 802414B0 46002102 */ mul.s $f4, $f4, $f0 -/* 88A084 802414B4 00000000 */ nop -/* 88A088 802414B8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 88A08C 802414BC 26940004 */ addiu $s4, $s4, 4 -/* 88A090 802414C0 46001082 */ mul.s $f2, $f2, $f0 -/* 88A094 802414C4 00000000 */ nop -/* 88A098 802414C8 26730004 */ addiu $s3, $s3, 4 -/* 88A09C 802414CC 26310001 */ addiu $s1, $s1, 1 -/* 88A0A0 802414D0 2A220003 */ slti $v0, $s1, 3 -/* 88A0A4 802414D4 E6040014 */ swc1 $f4, 0x14($s0) -/* 88A0A8 802414D8 E602002C */ swc1 $f2, 0x2c($s0) -/* 88A0AC 802414DC 1440FFEB */ bnez $v0, .L8024148C -/* 88A0B0 802414E0 26100004 */ addiu $s0, $s0, 4 -/* 88A0B4 802414E4 8E420060 */ lw $v0, 0x60($s2) -/* 88A0B8 802414E8 24420001 */ addiu $v0, $v0, 1 -/* 88A0BC 802414EC AE420060 */ sw $v0, 0x60($s2) -/* 88A0C0 802414F0 28420015 */ slti $v0, $v0, 0x15 -/* 88A0C4 802414F4 1440003D */ bnez $v0, .L802415EC -/* 88A0C8 802414F8 24020001 */ addiu $v0, $zero, 1 -/* 88A0CC 802414FC AE420000 */ sw $v0, ($s2) -/* 88A0D0 80241500 0809057B */ j .L802415EC -/* 88A0D4 80241504 AE400060 */ sw $zero, 0x60($s2) -.L80241508: -/* 88A0D8 80241508 0000882D */ daddu $s1, $zero, $zero -/* 88A0DC 8024150C 3C148024 */ lui $s4, %hi(D_80243D04_88C8D4) -/* 88A0E0 80241510 26943D04 */ addiu $s4, $s4, %lo(D_80243D04_88C8D4) -/* 88A0E4 80241514 24130020 */ addiu $s3, $zero, 0x20 -/* 88A0E8 80241518 0240802D */ daddu $s0, $s2, $zero -/* 88A0EC 8024151C 3C014248 */ lui $at, 0x4248 -/* 88A0F0 80241520 4481A000 */ mtc1 $at, $f20 -/* 88A0F4 80241524 4480B000 */ mtc1 $zero, $f22 -.L80241528: -/* 88A0F8 80241528 4406A000 */ mfc1 $a2, $f20 -/* 88A0FC 8024152C 27A40020 */ addiu $a0, $sp, 0x20 -/* 88A100 80241530 E6160020 */ swc1 $f22, 0x20($s0) -/* 88A104 80241534 8E870000 */ lw $a3, ($s4) -/* 88A108 80241538 02532821 */ addu $a1, $s2, $s3 -/* 88A10C 8024153C 0C00A7E7 */ jal add_vec2D_polar -/* 88A110 80241540 E7B60020 */ swc1 $f22, 0x20($sp) -/* 88A114 80241544 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 88A118 80241548 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 88A11C 8024154C 46002102 */ mul.s $f4, $f4, $f0 -/* 88A120 80241550 00000000 */ nop -/* 88A124 80241554 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 88A128 80241558 26940004 */ addiu $s4, $s4, 4 -/* 88A12C 8024155C 46001082 */ mul.s $f2, $f2, $f0 -/* 88A130 80241560 00000000 */ nop -/* 88A134 80241564 26730004 */ addiu $s3, $s3, 4 -/* 88A138 80241568 26310001 */ addiu $s1, $s1, 1 -/* 88A13C 8024156C 2A220003 */ slti $v0, $s1, 3 -/* 88A140 80241570 E6040014 */ swc1 $f4, 0x14($s0) -/* 88A144 80241574 E602002C */ swc1 $f2, 0x2c($s0) -/* 88A148 80241578 1440FFEB */ bnez $v0, .L80241528 -/* 88A14C 8024157C 26100004 */ addiu $s0, $s0, 4 -/* 88A150 80241580 8E420060 */ lw $v0, 0x60($s2) -/* 88A154 80241584 24420001 */ addiu $v0, $v0, 1 -/* 88A158 80241588 AE420060 */ sw $v0, 0x60($s2) -/* 88A15C 8024158C 28420010 */ slti $v0, $v0, 0x10 -/* 88A160 80241590 14400016 */ bnez $v0, .L802415EC -/* 88A164 80241594 2402000F */ addiu $v0, $zero, 0xf -/* 88A168 80241598 AE420060 */ sw $v0, 0x60($s2) -/* 88A16C 8024159C 24020002 */ addiu $v0, $zero, 2 -/* 88A170 802415A0 0809057B */ j .L802415EC -/* 88A174 802415A4 AE420000 */ sw $v0, ($s2) -.L802415A8: -/* 88A178 802415A8 8E420060 */ lw $v0, 0x60($s2) -/* 88A17C 802415AC 24420001 */ addiu $v0, $v0, 1 -/* 88A180 802415B0 AE420060 */ sw $v0, 0x60($s2) -/* 88A184 802415B4 2842001F */ slti $v0, $v0, 0x1f -/* 88A188 802415B8 1440000C */ bnez $v0, .L802415EC -/* 88A18C 802415BC 0000882D */ daddu $s1, $zero, $zero -/* 88A190 802415C0 0240282D */ daddu $a1, $s2, $zero -.L802415C4: -/* 88A194 802415C4 8CA20008 */ lw $v0, 8($a1) -/* 88A198 802415C8 8C430000 */ lw $v1, ($v0) -/* 88A19C 802415CC 26310001 */ addiu $s1, $s1, 1 -/* 88A1A0 802415D0 34630010 */ ori $v1, $v1, 0x10 -/* 88A1A4 802415D4 AC430000 */ sw $v1, ($v0) -/* 88A1A8 802415D8 2A220003 */ slti $v0, $s1, 3 -/* 88A1AC 802415DC 1440FFF9 */ bnez $v0, .L802415C4 -/* 88A1B0 802415E0 24A50004 */ addiu $a1, $a1, 4 -/* 88A1B4 802415E4 080905C8 */ j .L80241720 -/* 88A1B8 802415E8 24020002 */ addiu $v0, $zero, 2 -.L802415EC: -/* 88A1BC 802415EC 8E430004 */ lw $v1, 4($s2) -/* 88A1C0 802415F0 10600005 */ beqz $v1, .L80241608 -/* 88A1C4 802415F4 24020001 */ addiu $v0, $zero, 1 -/* 88A1C8 802415F8 1062000B */ beq $v1, $v0, .L80241628 -/* 88A1CC 802415FC 0000882D */ daddu $s1, $zero, $zero -/* 88A1D0 80241600 080905B7 */ j .L802416DC -/* 88A1D4 80241604 0240282D */ daddu $a1, $s2, $zero -.L80241608: -/* 88A1D8 80241608 8E420064 */ lw $v0, 0x64($s2) -/* 88A1DC 8024160C 24420001 */ addiu $v0, $v0, 1 -/* 88A1E0 80241610 AE420064 */ sw $v0, 0x64($s2) -/* 88A1E4 80241614 28420010 */ slti $v0, $v0, 0x10 -/* 88A1E8 80241618 1440002F */ bnez $v0, .L802416D8 -/* 88A1EC 8024161C 0000882D */ daddu $s1, $zero, $zero -/* 88A1F0 80241620 080905B3 */ j .L802416CC -/* 88A1F4 80241624 24020001 */ addiu $v0, $zero, 1 -.L80241628: -/* 88A1F8 80241628 4480A000 */ mtc1 $zero, $f20 -/* 88A1FC 8024162C 24130014 */ addiu $s3, $zero, 0x14 -/* 88A200 80241630 0240802D */ daddu $s0, $s2, $zero -.L80241634: -/* 88A204 80241634 4405A000 */ mfc1 $a1, $f20 -/* 88A208 80241638 AFB30010 */ sw $s3, 0x10($sp) -/* 88A20C 8024163C 8E060038 */ lw $a2, 0x38($s0) -/* 88A210 80241640 8E470064 */ lw $a3, 0x64($s2) -/* 88A214 80241644 0C00A8ED */ jal update_lerp -/* 88A218 80241648 24040001 */ addiu $a0, $zero, 1 -/* 88A21C 8024164C C6020014 */ lwc1 $f2, 0x14($s0) -/* 88A220 80241650 46001080 */ add.s $f2, $f2, $f0 -/* 88A224 80241654 4405A000 */ mfc1 $a1, $f20 -/* 88A228 80241658 E6020014 */ swc1 $f2, 0x14($s0) -/* 88A22C 8024165C AFB30010 */ sw $s3, 0x10($sp) -/* 88A230 80241660 8E060044 */ lw $a2, 0x44($s0) -/* 88A234 80241664 8E470064 */ lw $a3, 0x64($s2) -/* 88A238 80241668 0C00A8ED */ jal update_lerp -/* 88A23C 8024166C 24040001 */ addiu $a0, $zero, 1 -/* 88A240 80241670 C6020020 */ lwc1 $f2, 0x20($s0) -/* 88A244 80241674 46001080 */ add.s $f2, $f2, $f0 -/* 88A248 80241678 4405A000 */ mfc1 $a1, $f20 -/* 88A24C 8024167C E6020020 */ swc1 $f2, 0x20($s0) -/* 88A250 80241680 AFB30010 */ sw $s3, 0x10($sp) -/* 88A254 80241684 8E060050 */ lw $a2, 0x50($s0) -/* 88A258 80241688 8E470064 */ lw $a3, 0x64($s2) -/* 88A25C 8024168C 0C00A8ED */ jal update_lerp -/* 88A260 80241690 24040001 */ addiu $a0, $zero, 1 -/* 88A264 80241694 C602002C */ lwc1 $f2, 0x2c($s0) -/* 88A268 80241698 46001080 */ add.s $f2, $f2, $f0 -/* 88A26C 8024169C 26310001 */ addiu $s1, $s1, 1 -/* 88A270 802416A0 2A220003 */ slti $v0, $s1, 3 -/* 88A274 802416A4 E602002C */ swc1 $f2, 0x2c($s0) -/* 88A278 802416A8 1440FFE2 */ bnez $v0, .L80241634 -/* 88A27C 802416AC 26100004 */ addiu $s0, $s0, 4 -/* 88A280 802416B0 8E420064 */ lw $v0, 0x64($s2) -/* 88A284 802416B4 24420001 */ addiu $v0, $v0, 1 -/* 88A288 802416B8 AE420064 */ sw $v0, 0x64($s2) -/* 88A28C 802416BC 28420015 */ slti $v0, $v0, 0x15 -/* 88A290 802416C0 14400005 */ bnez $v0, .L802416D8 -/* 88A294 802416C4 0000882D */ daddu $s1, $zero, $zero -/* 88A298 802416C8 24020002 */ addiu $v0, $zero, 2 -.L802416CC: -/* 88A29C 802416CC AE420004 */ sw $v0, 4($s2) -/* 88A2A0 802416D0 AE400064 */ sw $zero, 0x64($s2) -/* 88A2A4 802416D4 0000882D */ daddu $s1, $zero, $zero -.L802416D8: -/* 88A2A8 802416D8 0240282D */ daddu $a1, $s2, $zero -.L802416DC: -/* 88A2AC 802416DC 8CA20008 */ lw $v0, 8($a1) -/* 88A2B0 802416E0 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 88A2B4 802416E4 8C42000C */ lw $v0, 0xc($v0) -/* 88A2B8 802416E8 E4400010 */ swc1 $f0, 0x10($v0) -/* 88A2BC 802416EC 8CA20008 */ lw $v0, 8($a1) -/* 88A2C0 802416F0 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 88A2C4 802416F4 8C42000C */ lw $v0, 0xc($v0) -/* 88A2C8 802416F8 26310001 */ addiu $s1, $s1, 1 -/* 88A2CC 802416FC E4400014 */ swc1 $f0, 0x14($v0) -/* 88A2D0 80241700 8CA20008 */ lw $v0, 8($a1) -/* 88A2D4 80241704 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 88A2D8 80241708 8C42000C */ lw $v0, 0xc($v0) -/* 88A2DC 8024170C E4400018 */ swc1 $f0, 0x18($v0) -/* 88A2E0 80241710 2A220003 */ slti $v0, $s1, 3 -/* 88A2E4 80241714 1440FFF1 */ bnez $v0, .L802416DC -/* 88A2E8 80241718 24A50004 */ addiu $a1, $a1, 4 -/* 88A2EC 8024171C 0000102D */ daddu $v0, $zero, $zero -.L80241720: -/* 88A2F0 80241720 8FBF0044 */ lw $ra, 0x44($sp) -/* 88A2F4 80241724 8FB60040 */ lw $s6, 0x40($sp) -/* 88A2F8 80241728 8FB5003C */ lw $s5, 0x3c($sp) -/* 88A2FC 8024172C 8FB40038 */ lw $s4, 0x38($sp) -/* 88A300 80241730 8FB30034 */ lw $s3, 0x34($sp) -/* 88A304 80241734 8FB20030 */ lw $s2, 0x30($sp) -/* 88A308 80241738 8FB1002C */ lw $s1, 0x2c($sp) -/* 88A30C 8024173C 8FB00028 */ lw $s0, 0x28($sp) -/* 88A310 80241740 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 88A314 80241744 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 88A318 80241748 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 88A31C 8024174C 03E00008 */ jr $ra -/* 88A320 80241750 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s deleted file mode 100644 index b5a40f2cd5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240630_893050 -/* 893050 80240630 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 893054 80240634 AFB60040 */ sw $s6, 0x40($sp) -/* 893058 80240638 0080B02D */ daddu $s6, $a0, $zero -/* 89305C 8024063C AFB00028 */ sw $s0, 0x28($sp) -/* 893060 80240640 00A0802D */ daddu $s0, $a1, $zero -/* 893064 80240644 AFBF0044 */ sw $ra, 0x44($sp) -/* 893068 80240648 AFB5003C */ sw $s5, 0x3c($sp) -/* 89306C 8024064C AFB40038 */ sw $s4, 0x38($sp) -/* 893070 80240650 AFB30034 */ sw $s3, 0x34($sp) -/* 893074 80240654 AFB20030 */ sw $s2, 0x30($sp) -/* 893078 80240658 AFB1002C */ sw $s1, 0x2c($sp) -/* 89307C 8024065C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 893080 80240660 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 893084 80240664 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 893088 80240668 8ED3000C */ lw $s3, 0xc($s6) -/* 89308C 8024066C 0C00EAD2 */ jal get_npc_safe -/* 893090 80240670 2404FFFC */ addiu $a0, $zero, -4 -/* 893094 80240674 27A50018 */ addiu $a1, $sp, 0x18 -/* 893098 80240678 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 89309C 8024067C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 8930A0 80240680 27A6001C */ addiu $a2, $sp, 0x1c -/* 8930A4 80240684 00041880 */ sll $v1, $a0, 2 -/* 8930A8 80240688 00641821 */ addu $v1, $v1, $a0 -/* 8930AC 8024068C 00031880 */ sll $v1, $v1, 2 -/* 8930B0 80240690 00641823 */ subu $v1, $v1, $a0 -/* 8930B4 80240694 000320C0 */ sll $a0, $v1, 3 -/* 8930B8 80240698 00641821 */ addu $v1, $v1, $a0 -/* 8930BC 8024069C 000318C0 */ sll $v1, $v1, 3 -/* 8930C0 802406A0 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 8930C4 802406A4 00230821 */ addu $at, $at, $v1 -/* 8930C8 802406A8 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 8930CC 802406AC 0C00A88D */ jal sin_cos_deg -/* 8930D0 802406B0 0040A82D */ daddu $s5, $v0, $zero -/* 8930D4 802406B4 1200005D */ beqz $s0, .L8024082C -/* 8930D8 802406B8 00000000 */ nop -/* 8930DC 802406BC 0C00AB0A */ jal general_heap_malloc -/* 8930E0 802406C0 24040068 */ addiu $a0, $zero, 0x68 -/* 8930E4 802406C4 0040902D */ daddu $s2, $v0, $zero -/* 8930E8 802406C8 02C0202D */ daddu $a0, $s6, $zero -/* 8930EC 802406CC 0000882D */ daddu $s1, $zero, $zero -/* 8930F0 802406D0 2414FFFF */ addiu $s4, $zero, -1 -/* 8930F4 802406D4 AED20060 */ sw $s2, 0x60($s6) -/* 8930F8 802406D8 8E650000 */ lw $a1, ($s3) -/* 8930FC 802406DC 3C014148 */ lui $at, 0x4148 -/* 893100 802406E0 4481C000 */ mtc1 $at, $f24 -/* 893104 802406E4 3C013F80 */ lui $at, 0x3f80 -/* 893108 802406E8 4481B000 */ mtc1 $at, $f22 -/* 89310C 802406EC 4480A000 */ mtc1 $zero, $f20 -/* 893110 802406F0 0C0B1EAF */ jal evt_get_variable -/* 893114 802406F4 0240802D */ daddu $s0, $s2, $zero -/* 893118 802406F8 0C04417A */ jal get_entity_by_index -/* 89311C 802406FC 0040202D */ daddu $a0, $v0, $zero -/* 893120 80240700 AE42005C */ sw $v0, 0x5c($s2) -.L80240704: -/* 893124 80240704 8E42005C */ lw $v0, 0x5c($s2) -/* 893128 80240708 C440004C */ lwc1 $f0, 0x4c($v0) -/* 89312C 8024070C 0000202D */ daddu $a0, $zero, $zero -/* 893130 80240710 E7B60010 */ swc1 $f22, 0x10($sp) -/* 893134 80240714 AFB40014 */ sw $s4, 0x14($sp) -/* 893138 80240718 46180000 */ add.s $f0, $f0, $f24 -/* 89313C 8024071C 8C450048 */ lw $a1, 0x48($v0) -/* 893140 80240720 8C470050 */ lw $a3, 0x50($v0) -/* 893144 80240724 44060000 */ mfc1 $a2, $f0 -/* 893148 80240728 0C01C5BC */ jal fx_motion_blur_flame -/* 89314C 8024072C 26310001 */ addiu $s1, $s1, 1 -/* 893150 80240730 AE020008 */ sw $v0, 8($s0) -/* 893154 80240734 E614002C */ swc1 $f20, 0x2c($s0) -/* 893158 80240738 E6140020 */ swc1 $f20, 0x20($s0) -/* 89315C 8024073C E6140014 */ swc1 $f20, 0x14($s0) -/* 893160 80240740 E6140050 */ swc1 $f20, 0x50($s0) -/* 893164 80240744 E6140044 */ swc1 $f20, 0x44($s0) -/* 893168 80240748 E6140038 */ swc1 $f20, 0x38($s0) -/* 89316C 8024074C 2A220003 */ slti $v0, $s1, 3 -/* 893170 80240750 1440FFEC */ bnez $v0, .L80240704 -/* 893174 80240754 26100004 */ addiu $s0, $s0, 4 -/* 893178 80240758 0000882D */ daddu $s1, $zero, $zero -/* 89317C 8024075C 0240802D */ daddu $s0, $s2, $zero -/* 893180 80240760 3C148024 */ lui $s4, %hi(D_80241478_893E98) -/* 893184 80240764 26941478 */ addiu $s4, $s4, %lo(D_80241478_893E98) -/* 893188 80240768 3C014248 */ lui $at, 0x4248 -/* 89318C 8024076C 4481A000 */ mtc1 $at, $f20 -/* 893190 80240770 24130044 */ addiu $s3, $zero, 0x44 -/* 893194 80240774 AE400000 */ sw $zero, ($s2) -/* 893198 80240778 AE400004 */ sw $zero, 4($s2) -/* 89319C 8024077C AE400060 */ sw $zero, 0x60($s2) -/* 8931A0 80240780 AE400064 */ sw $zero, 0x64($s2) -.L80240784: -/* 8931A4 80240784 27A40020 */ addiu $a0, $sp, 0x20 -/* 8931A8 80240788 4406A000 */ mfc1 $a2, $f20 -/* 8931AC 8024078C 8E870000 */ lw $a3, ($s4) -/* 8931B0 80240790 02532821 */ addu $a1, $s2, $s3 -/* 8931B4 80240794 0C00A7E7 */ jal add_vec2D_polar -/* 8931B8 80240798 AFA00020 */ sw $zero, 0x20($sp) -/* 8931BC 8024079C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 8931C0 802407A0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 8931C4 802407A4 46041082 */ mul.s $f2, $f2, $f4 -/* 8931C8 802407A8 00000000 */ nop -/* 8931CC 802407AC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 8931D0 802407B0 46040002 */ mul.s $f0, $f0, $f4 -/* 8931D4 802407B4 00000000 */ nop -/* 8931D8 802407B8 E6020038 */ swc1 $f2, 0x38($s0) -/* 8931DC 802407BC E6000050 */ swc1 $f0, 0x50($s0) -/* 8931E0 802407C0 8E42005C */ lw $v0, 0x5c($s2) -/* 8931E4 802407C4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8931E8 802407C8 C4420048 */ lwc1 $f2, 0x48($v0) -/* 8931EC 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* 8931F0 802407D0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 8931F4 802407D4 46020001 */ sub.s $f0, $f0, $f2 -/* 8931F8 802407D8 E6000038 */ swc1 $f0, 0x38($s0) -/* 8931FC 802407DC 8E42005C */ lw $v0, 0x5c($s2) -/* 893200 802407E0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 893204 802407E4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 893208 802407E8 46001080 */ add.s $f2, $f2, $f0 -/* 89320C 802407EC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 893210 802407F0 46020001 */ sub.s $f0, $f0, $f2 -/* 893214 802407F4 E6000044 */ swc1 $f0, 0x44($s0) -/* 893218 802407F8 8E42005C */ lw $v0, 0x5c($s2) -/* 89321C 802407FC C6000050 */ lwc1 $f0, 0x50($s0) -/* 893220 80240800 C4420050 */ lwc1 $f2, 0x50($v0) -/* 893224 80240804 26940004 */ addiu $s4, $s4, 4 -/* 893228 80240808 46001080 */ add.s $f2, $f2, $f0 -/* 89322C 8024080C C6A00040 */ lwc1 $f0, 0x40($s5) -/* 893230 80240810 26730004 */ addiu $s3, $s3, 4 -/* 893234 80240814 46020001 */ sub.s $f0, $f0, $f2 -/* 893238 80240818 26310001 */ addiu $s1, $s1, 1 -/* 89323C 8024081C 2A220003 */ slti $v0, $s1, 3 -/* 893240 80240820 E6000050 */ swc1 $f0, 0x50($s0) -/* 893244 80240824 1440FFD7 */ bnez $v0, .L80240784 -/* 893248 80240828 26100004 */ addiu $s0, $s0, 4 -.L8024082C: -/* 89324C 8024082C 8ED20060 */ lw $s2, 0x60($s6) -/* 893250 80240830 8E430000 */ lw $v1, ($s2) -/* 893254 80240834 24020001 */ addiu $v0, $zero, 1 -/* 893258 80240838 10620038 */ beq $v1, $v0, .L8024091C -/* 89325C 8024083C 28620002 */ slti $v0, $v1, 2 -/* 893260 80240840 50400005 */ beql $v0, $zero, .L80240858 -/* 893264 80240844 24020002 */ addiu $v0, $zero, 2 -/* 893268 80240848 10600007 */ beqz $v1, .L80240868 -/* 89326C 8024084C 24040005 */ addiu $a0, $zero, 5 -/* 893270 80240850 08090280 */ j .L80240A00 -/* 893274 80240854 00000000 */ nop -.L80240858: -/* 893278 80240858 10620058 */ beq $v1, $v0, .L802409BC -/* 89327C 8024085C 00000000 */ nop -/* 893280 80240860 08090280 */ j .L80240A00 -/* 893284 80240864 00000000 */ nop -.L80240868: -/* 893288 80240868 0000882D */ daddu $s1, $zero, $zero -/* 89328C 8024086C 3C148024 */ lui $s4, %hi(D_80241478_893E98) -/* 893290 80240870 26941478 */ addiu $s4, $s4, %lo(D_80241478_893E98) -/* 893294 80240874 24130020 */ addiu $s3, $zero, 0x20 -/* 893298 80240878 3C064248 */ lui $a2, 0x4248 -/* 89329C 8024087C 44800000 */ mtc1 $zero, $f0 -/* 8932A0 80240880 24020014 */ addiu $v0, $zero, 0x14 -/* 8932A4 80240884 AFA20010 */ sw $v0, 0x10($sp) -/* 8932A8 80240888 44050000 */ mfc1 $a1, $f0 -/* 8932AC 8024088C 8E470060 */ lw $a3, 0x60($s2) -/* 8932B0 80240890 4485B000 */ mtc1 $a1, $f22 -/* 8932B4 80240894 0C00A8ED */ jal update_lerp -/* 8932B8 80240898 0240802D */ daddu $s0, $s2, $zero -/* 8932BC 8024089C 46000506 */ mov.s $f20, $f0 -.L802408A0: -/* 8932C0 802408A0 4406A000 */ mfc1 $a2, $f20 -/* 8932C4 802408A4 27A40020 */ addiu $a0, $sp, 0x20 -/* 8932C8 802408A8 E6160020 */ swc1 $f22, 0x20($s0) -/* 8932CC 802408AC 8E870000 */ lw $a3, ($s4) -/* 8932D0 802408B0 02532821 */ addu $a1, $s2, $s3 -/* 8932D4 802408B4 0C00A7E7 */ jal add_vec2D_polar -/* 8932D8 802408B8 E7B60020 */ swc1 $f22, 0x20($sp) -/* 8932DC 802408BC C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8932E0 802408C0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 8932E4 802408C4 46002102 */ mul.s $f4, $f4, $f0 -/* 8932E8 802408C8 00000000 */ nop -/* 8932EC 802408CC C7A20018 */ lwc1 $f2, 0x18($sp) -/* 8932F0 802408D0 26940004 */ addiu $s4, $s4, 4 -/* 8932F4 802408D4 46001082 */ mul.s $f2, $f2, $f0 -/* 8932F8 802408D8 00000000 */ nop -/* 8932FC 802408DC 26730004 */ addiu $s3, $s3, 4 -/* 893300 802408E0 26310001 */ addiu $s1, $s1, 1 -/* 893304 802408E4 2A220003 */ slti $v0, $s1, 3 -/* 893308 802408E8 E6040014 */ swc1 $f4, 0x14($s0) -/* 89330C 802408EC E602002C */ swc1 $f2, 0x2c($s0) -/* 893310 802408F0 1440FFEB */ bnez $v0, .L802408A0 -/* 893314 802408F4 26100004 */ addiu $s0, $s0, 4 -/* 893318 802408F8 8E420060 */ lw $v0, 0x60($s2) -/* 89331C 802408FC 24420001 */ addiu $v0, $v0, 1 -/* 893320 80240900 AE420060 */ sw $v0, 0x60($s2) -/* 893324 80240904 28420015 */ slti $v0, $v0, 0x15 -/* 893328 80240908 1440003D */ bnez $v0, .L80240A00 -/* 89332C 8024090C 24020001 */ addiu $v0, $zero, 1 -/* 893330 80240910 AE420000 */ sw $v0, ($s2) -/* 893334 80240914 08090280 */ j .L80240A00 -/* 893338 80240918 AE400060 */ sw $zero, 0x60($s2) -.L8024091C: -/* 89333C 8024091C 0000882D */ daddu $s1, $zero, $zero -/* 893340 80240920 3C148024 */ lui $s4, %hi(D_80241478_893E98) -/* 893344 80240924 26941478 */ addiu $s4, $s4, %lo(D_80241478_893E98) -/* 893348 80240928 24130020 */ addiu $s3, $zero, 0x20 -/* 89334C 8024092C 0240802D */ daddu $s0, $s2, $zero -/* 893350 80240930 3C014248 */ lui $at, 0x4248 -/* 893354 80240934 4481A000 */ mtc1 $at, $f20 -/* 893358 80240938 4480B000 */ mtc1 $zero, $f22 -.L8024093C: -/* 89335C 8024093C 4406A000 */ mfc1 $a2, $f20 -/* 893360 80240940 27A40020 */ addiu $a0, $sp, 0x20 -/* 893364 80240944 E6160020 */ swc1 $f22, 0x20($s0) -/* 893368 80240948 8E870000 */ lw $a3, ($s4) -/* 89336C 8024094C 02532821 */ addu $a1, $s2, $s3 -/* 893370 80240950 0C00A7E7 */ jal add_vec2D_polar -/* 893374 80240954 E7B60020 */ swc1 $f22, 0x20($sp) -/* 893378 80240958 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 89337C 8024095C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 893380 80240960 46002102 */ mul.s $f4, $f4, $f0 -/* 893384 80240964 00000000 */ nop -/* 893388 80240968 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 89338C 8024096C 26940004 */ addiu $s4, $s4, 4 -/* 893390 80240970 46001082 */ mul.s $f2, $f2, $f0 -/* 893394 80240974 00000000 */ nop -/* 893398 80240978 26730004 */ addiu $s3, $s3, 4 -/* 89339C 8024097C 26310001 */ addiu $s1, $s1, 1 -/* 8933A0 80240980 2A220003 */ slti $v0, $s1, 3 -/* 8933A4 80240984 E6040014 */ swc1 $f4, 0x14($s0) -/* 8933A8 80240988 E602002C */ swc1 $f2, 0x2c($s0) -/* 8933AC 8024098C 1440FFEB */ bnez $v0, .L8024093C -/* 8933B0 80240990 26100004 */ addiu $s0, $s0, 4 -/* 8933B4 80240994 8E420060 */ lw $v0, 0x60($s2) -/* 8933B8 80240998 24420001 */ addiu $v0, $v0, 1 -/* 8933BC 8024099C AE420060 */ sw $v0, 0x60($s2) -/* 8933C0 802409A0 28420010 */ slti $v0, $v0, 0x10 -/* 8933C4 802409A4 14400016 */ bnez $v0, .L80240A00 -/* 8933C8 802409A8 2402000F */ addiu $v0, $zero, 0xf -/* 8933CC 802409AC AE420060 */ sw $v0, 0x60($s2) -/* 8933D0 802409B0 24020002 */ addiu $v0, $zero, 2 -/* 8933D4 802409B4 08090280 */ j .L80240A00 -/* 8933D8 802409B8 AE420000 */ sw $v0, ($s2) -.L802409BC: -/* 8933DC 802409BC 8E420060 */ lw $v0, 0x60($s2) -/* 8933E0 802409C0 24420001 */ addiu $v0, $v0, 1 -/* 8933E4 802409C4 AE420060 */ sw $v0, 0x60($s2) -/* 8933E8 802409C8 2842001F */ slti $v0, $v0, 0x1f -/* 8933EC 802409CC 1440000C */ bnez $v0, .L80240A00 -/* 8933F0 802409D0 0000882D */ daddu $s1, $zero, $zero -/* 8933F4 802409D4 0240282D */ daddu $a1, $s2, $zero -.L802409D8: -/* 8933F8 802409D8 8CA20008 */ lw $v0, 8($a1) -/* 8933FC 802409DC 8C430000 */ lw $v1, ($v0) -/* 893400 802409E0 26310001 */ addiu $s1, $s1, 1 -/* 893404 802409E4 34630010 */ ori $v1, $v1, 0x10 -/* 893408 802409E8 AC430000 */ sw $v1, ($v0) -/* 89340C 802409EC 2A220003 */ slti $v0, $s1, 3 -/* 893410 802409F0 1440FFF9 */ bnez $v0, .L802409D8 -/* 893414 802409F4 24A50004 */ addiu $a1, $a1, 4 -/* 893418 802409F8 080902CD */ j .L80240B34 -/* 89341C 802409FC 24020002 */ addiu $v0, $zero, 2 -.L80240A00: -/* 893420 80240A00 8E430004 */ lw $v1, 4($s2) -/* 893424 80240A04 10600005 */ beqz $v1, .L80240A1C -/* 893428 80240A08 24020001 */ addiu $v0, $zero, 1 -/* 89342C 80240A0C 1062000B */ beq $v1, $v0, .L80240A3C -/* 893430 80240A10 0000882D */ daddu $s1, $zero, $zero -/* 893434 80240A14 080902BC */ j .L80240AF0 -/* 893438 80240A18 0240282D */ daddu $a1, $s2, $zero -.L80240A1C: -/* 89343C 80240A1C 8E420064 */ lw $v0, 0x64($s2) -/* 893440 80240A20 24420001 */ addiu $v0, $v0, 1 -/* 893444 80240A24 AE420064 */ sw $v0, 0x64($s2) -/* 893448 80240A28 28420010 */ slti $v0, $v0, 0x10 -/* 89344C 80240A2C 1440002F */ bnez $v0, .L80240AEC -/* 893450 80240A30 0000882D */ daddu $s1, $zero, $zero -/* 893454 80240A34 080902B8 */ j .L80240AE0 -/* 893458 80240A38 24020001 */ addiu $v0, $zero, 1 -.L80240A3C: -/* 89345C 80240A3C 4480A000 */ mtc1 $zero, $f20 -/* 893460 80240A40 24130014 */ addiu $s3, $zero, 0x14 -/* 893464 80240A44 0240802D */ daddu $s0, $s2, $zero -.L80240A48: -/* 893468 80240A48 4405A000 */ mfc1 $a1, $f20 -/* 89346C 80240A4C AFB30010 */ sw $s3, 0x10($sp) -/* 893470 80240A50 8E060038 */ lw $a2, 0x38($s0) -/* 893474 80240A54 8E470064 */ lw $a3, 0x64($s2) -/* 893478 80240A58 0C00A8ED */ jal update_lerp -/* 89347C 80240A5C 24040001 */ addiu $a0, $zero, 1 -/* 893480 80240A60 C6020014 */ lwc1 $f2, 0x14($s0) -/* 893484 80240A64 46001080 */ add.s $f2, $f2, $f0 -/* 893488 80240A68 4405A000 */ mfc1 $a1, $f20 -/* 89348C 80240A6C E6020014 */ swc1 $f2, 0x14($s0) -/* 893490 80240A70 AFB30010 */ sw $s3, 0x10($sp) -/* 893494 80240A74 8E060044 */ lw $a2, 0x44($s0) -/* 893498 80240A78 8E470064 */ lw $a3, 0x64($s2) -/* 89349C 80240A7C 0C00A8ED */ jal update_lerp -/* 8934A0 80240A80 24040001 */ addiu $a0, $zero, 1 -/* 8934A4 80240A84 C6020020 */ lwc1 $f2, 0x20($s0) -/* 8934A8 80240A88 46001080 */ add.s $f2, $f2, $f0 -/* 8934AC 80240A8C 4405A000 */ mfc1 $a1, $f20 -/* 8934B0 80240A90 E6020020 */ swc1 $f2, 0x20($s0) -/* 8934B4 80240A94 AFB30010 */ sw $s3, 0x10($sp) -/* 8934B8 80240A98 8E060050 */ lw $a2, 0x50($s0) -/* 8934BC 80240A9C 8E470064 */ lw $a3, 0x64($s2) -/* 8934C0 80240AA0 0C00A8ED */ jal update_lerp -/* 8934C4 80240AA4 24040001 */ addiu $a0, $zero, 1 -/* 8934C8 80240AA8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 8934CC 80240AAC 46001080 */ add.s $f2, $f2, $f0 -/* 8934D0 80240AB0 26310001 */ addiu $s1, $s1, 1 -/* 8934D4 80240AB4 2A220003 */ slti $v0, $s1, 3 -/* 8934D8 80240AB8 E602002C */ swc1 $f2, 0x2c($s0) -/* 8934DC 80240ABC 1440FFE2 */ bnez $v0, .L80240A48 -/* 8934E0 80240AC0 26100004 */ addiu $s0, $s0, 4 -/* 8934E4 80240AC4 8E420064 */ lw $v0, 0x64($s2) -/* 8934E8 80240AC8 24420001 */ addiu $v0, $v0, 1 -/* 8934EC 80240ACC AE420064 */ sw $v0, 0x64($s2) -/* 8934F0 80240AD0 28420015 */ slti $v0, $v0, 0x15 -/* 8934F4 80240AD4 14400005 */ bnez $v0, .L80240AEC -/* 8934F8 80240AD8 0000882D */ daddu $s1, $zero, $zero -/* 8934FC 80240ADC 24020002 */ addiu $v0, $zero, 2 -.L80240AE0: -/* 893500 80240AE0 AE420004 */ sw $v0, 4($s2) -/* 893504 80240AE4 AE400064 */ sw $zero, 0x64($s2) -/* 893508 80240AE8 0000882D */ daddu $s1, $zero, $zero -.L80240AEC: -/* 89350C 80240AEC 0240282D */ daddu $a1, $s2, $zero -.L80240AF0: -/* 893510 80240AF0 8CA20008 */ lw $v0, 8($a1) -/* 893514 80240AF4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 893518 80240AF8 8C42000C */ lw $v0, 0xc($v0) -/* 89351C 80240AFC E4400010 */ swc1 $f0, 0x10($v0) -/* 893520 80240B00 8CA20008 */ lw $v0, 8($a1) -/* 893524 80240B04 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 893528 80240B08 8C42000C */ lw $v0, 0xc($v0) -/* 89352C 80240B0C 26310001 */ addiu $s1, $s1, 1 -/* 893530 80240B10 E4400014 */ swc1 $f0, 0x14($v0) -/* 893534 80240B14 8CA20008 */ lw $v0, 8($a1) -/* 893538 80240B18 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 89353C 80240B1C 8C42000C */ lw $v0, 0xc($v0) -/* 893540 80240B20 E4400018 */ swc1 $f0, 0x18($v0) -/* 893544 80240B24 2A220003 */ slti $v0, $s1, 3 -/* 893548 80240B28 1440FFF1 */ bnez $v0, .L80240AF0 -/* 89354C 80240B2C 24A50004 */ addiu $a1, $a1, 4 -/* 893550 80240B30 0000102D */ daddu $v0, $zero, $zero -.L80240B34: -/* 893554 80240B34 8FBF0044 */ lw $ra, 0x44($sp) -/* 893558 80240B38 8FB60040 */ lw $s6, 0x40($sp) -/* 89355C 80240B3C 8FB5003C */ lw $s5, 0x3c($sp) -/* 893560 80240B40 8FB40038 */ lw $s4, 0x38($sp) -/* 893564 80240B44 8FB30034 */ lw $s3, 0x34($sp) -/* 893568 80240B48 8FB20030 */ lw $s2, 0x30($sp) -/* 89356C 80240B4C 8FB1002C */ lw $s1, 0x2c($sp) -/* 893570 80240B50 8FB00028 */ lw $s0, 0x28($sp) -/* 893574 80240B54 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 893578 80240B58 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 89357C 80240B5C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 893580 80240B60 03E00008 */ jr $ra -/* 893584 80240B64 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s deleted file mode 100644 index 3af7c7b449..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF0_8981D0 -/* 8981D0 80240BF0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 8981D4 80240BF4 AFB60040 */ sw $s6, 0x40($sp) -/* 8981D8 80240BF8 0080B02D */ daddu $s6, $a0, $zero -/* 8981DC 80240BFC AFB00028 */ sw $s0, 0x28($sp) -/* 8981E0 80240C00 00A0802D */ daddu $s0, $a1, $zero -/* 8981E4 80240C04 AFBF0044 */ sw $ra, 0x44($sp) -/* 8981E8 80240C08 AFB5003C */ sw $s5, 0x3c($sp) -/* 8981EC 80240C0C AFB40038 */ sw $s4, 0x38($sp) -/* 8981F0 80240C10 AFB30034 */ sw $s3, 0x34($sp) -/* 8981F4 80240C14 AFB20030 */ sw $s2, 0x30($sp) -/* 8981F8 80240C18 AFB1002C */ sw $s1, 0x2c($sp) -/* 8981FC 80240C1C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 898200 80240C20 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 898204 80240C24 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 898208 80240C28 8ED3000C */ lw $s3, 0xc($s6) -/* 89820C 80240C2C 0C00EAD2 */ jal get_npc_safe -/* 898210 80240C30 2404FFFC */ addiu $a0, $zero, -4 -/* 898214 80240C34 27A50018 */ addiu $a1, $sp, 0x18 -/* 898218 80240C38 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 89821C 80240C3C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 898220 80240C40 27A6001C */ addiu $a2, $sp, 0x1c -/* 898224 80240C44 00041880 */ sll $v1, $a0, 2 -/* 898228 80240C48 00641821 */ addu $v1, $v1, $a0 -/* 89822C 80240C4C 00031880 */ sll $v1, $v1, 2 -/* 898230 80240C50 00641823 */ subu $v1, $v1, $a0 -/* 898234 80240C54 000320C0 */ sll $a0, $v1, 3 -/* 898238 80240C58 00641821 */ addu $v1, $v1, $a0 -/* 89823C 80240C5C 000318C0 */ sll $v1, $v1, 3 -/* 898240 80240C60 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 898244 80240C64 00230821 */ addu $at, $at, $v1 -/* 898248 80240C68 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* 89824C 80240C6C 0C00A88D */ jal sin_cos_deg -/* 898250 80240C70 0040A82D */ daddu $s5, $v0, $zero -/* 898254 80240C74 1200005D */ beqz $s0, .L80240DEC -/* 898258 80240C78 00000000 */ nop -/* 89825C 80240C7C 0C00AB0A */ jal general_heap_malloc -/* 898260 80240C80 24040068 */ addiu $a0, $zero, 0x68 -/* 898264 80240C84 0040902D */ daddu $s2, $v0, $zero -/* 898268 80240C88 02C0202D */ daddu $a0, $s6, $zero -/* 89826C 80240C8C 0000882D */ daddu $s1, $zero, $zero -/* 898270 80240C90 2414FFFF */ addiu $s4, $zero, -1 -/* 898274 80240C94 AED20060 */ sw $s2, 0x60($s6) -/* 898278 80240C98 8E650000 */ lw $a1, ($s3) -/* 89827C 80240C9C 3C014148 */ lui $at, 0x4148 -/* 898280 80240CA0 4481C000 */ mtc1 $at, $f24 -/* 898284 80240CA4 3C013F80 */ lui $at, 0x3f80 -/* 898288 80240CA8 4481B000 */ mtc1 $at, $f22 -/* 89828C 80240CAC 4480A000 */ mtc1 $zero, $f20 -/* 898290 80240CB0 0C0B1EAF */ jal evt_get_variable -/* 898294 80240CB4 0240802D */ daddu $s0, $s2, $zero -/* 898298 80240CB8 0C04417A */ jal get_entity_by_index -/* 89829C 80240CBC 0040202D */ daddu $a0, $v0, $zero -/* 8982A0 80240CC0 AE42005C */ sw $v0, 0x5c($s2) -.L80240CC4: -/* 8982A4 80240CC4 8E42005C */ lw $v0, 0x5c($s2) -/* 8982A8 80240CC8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 8982AC 80240CCC 0000202D */ daddu $a0, $zero, $zero -/* 8982B0 80240CD0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 8982B4 80240CD4 AFB40014 */ sw $s4, 0x14($sp) -/* 8982B8 80240CD8 46180000 */ add.s $f0, $f0, $f24 -/* 8982BC 80240CDC 8C450048 */ lw $a1, 0x48($v0) -/* 8982C0 80240CE0 8C470050 */ lw $a3, 0x50($v0) -/* 8982C4 80240CE4 44060000 */ mfc1 $a2, $f0 -/* 8982C8 80240CE8 0C01C5BC */ jal fx_motion_blur_flame -/* 8982CC 80240CEC 26310001 */ addiu $s1, $s1, 1 -/* 8982D0 80240CF0 AE020008 */ sw $v0, 8($s0) -/* 8982D4 80240CF4 E614002C */ swc1 $f20, 0x2c($s0) -/* 8982D8 80240CF8 E6140020 */ swc1 $f20, 0x20($s0) -/* 8982DC 80240CFC E6140014 */ swc1 $f20, 0x14($s0) -/* 8982E0 80240D00 E6140050 */ swc1 $f20, 0x50($s0) -/* 8982E4 80240D04 E6140044 */ swc1 $f20, 0x44($s0) -/* 8982E8 80240D08 E6140038 */ swc1 $f20, 0x38($s0) -/* 8982EC 80240D0C 2A220003 */ slti $v0, $s1, 3 -/* 8982F0 80240D10 1440FFEC */ bnez $v0, .L80240CC4 -/* 8982F4 80240D14 26100004 */ addiu $s0, $s0, 4 -/* 8982F8 80240D18 0000882D */ daddu $s1, $zero, $zero -/* 8982FC 80240D1C 0240802D */ daddu $s0, $s2, $zero -/* 898300 80240D20 3C148024 */ lui $s4, %hi(D_80242708_899CE8) -/* 898304 80240D24 26942708 */ addiu $s4, $s4, %lo(D_80242708_899CE8) -/* 898308 80240D28 3C014248 */ lui $at, 0x4248 -/* 89830C 80240D2C 4481A000 */ mtc1 $at, $f20 -/* 898310 80240D30 24130044 */ addiu $s3, $zero, 0x44 -/* 898314 80240D34 AE400000 */ sw $zero, ($s2) -/* 898318 80240D38 AE400004 */ sw $zero, 4($s2) -/* 89831C 80240D3C AE400060 */ sw $zero, 0x60($s2) -/* 898320 80240D40 AE400064 */ sw $zero, 0x64($s2) -.L80240D44: -/* 898324 80240D44 27A40020 */ addiu $a0, $sp, 0x20 -/* 898328 80240D48 4406A000 */ mfc1 $a2, $f20 -/* 89832C 80240D4C 8E870000 */ lw $a3, ($s4) -/* 898330 80240D50 02532821 */ addu $a1, $s2, $s3 -/* 898334 80240D54 0C00A7E7 */ jal add_vec2D_polar -/* 898338 80240D58 AFA00020 */ sw $zero, 0x20($sp) -/* 89833C 80240D5C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 898340 80240D60 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 898344 80240D64 46041082 */ mul.s $f2, $f2, $f4 -/* 898348 80240D68 00000000 */ nop -/* 89834C 80240D6C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 898350 80240D70 46040002 */ mul.s $f0, $f0, $f4 -/* 898354 80240D74 00000000 */ nop -/* 898358 80240D78 E6020038 */ swc1 $f2, 0x38($s0) -/* 89835C 80240D7C E6000050 */ swc1 $f0, 0x50($s0) -/* 898360 80240D80 8E42005C */ lw $v0, 0x5c($s2) -/* 898364 80240D84 C6000038 */ lwc1 $f0, 0x38($s0) -/* 898368 80240D88 C4420048 */ lwc1 $f2, 0x48($v0) -/* 89836C 80240D8C 46001080 */ add.s $f2, $f2, $f0 -/* 898370 80240D90 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 898374 80240D94 46020001 */ sub.s $f0, $f0, $f2 -/* 898378 80240D98 E6000038 */ swc1 $f0, 0x38($s0) -/* 89837C 80240D9C 8E42005C */ lw $v0, 0x5c($s2) -/* 898380 80240DA0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 898384 80240DA4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 898388 80240DA8 46001080 */ add.s $f2, $f2, $f0 -/* 89838C 80240DAC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 898390 80240DB0 46020001 */ sub.s $f0, $f0, $f2 -/* 898394 80240DB4 E6000044 */ swc1 $f0, 0x44($s0) -/* 898398 80240DB8 8E42005C */ lw $v0, 0x5c($s2) -/* 89839C 80240DBC C6000050 */ lwc1 $f0, 0x50($s0) -/* 8983A0 80240DC0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 8983A4 80240DC4 26940004 */ addiu $s4, $s4, 4 -/* 8983A8 80240DC8 46001080 */ add.s $f2, $f2, $f0 -/* 8983AC 80240DCC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 8983B0 80240DD0 26730004 */ addiu $s3, $s3, 4 -/* 8983B4 80240DD4 46020001 */ sub.s $f0, $f0, $f2 -/* 8983B8 80240DD8 26310001 */ addiu $s1, $s1, 1 -/* 8983BC 80240DDC 2A220003 */ slti $v0, $s1, 3 -/* 8983C0 80240DE0 E6000050 */ swc1 $f0, 0x50($s0) -/* 8983C4 80240DE4 1440FFD7 */ bnez $v0, .L80240D44 -/* 8983C8 80240DE8 26100004 */ addiu $s0, $s0, 4 -.L80240DEC: -/* 8983CC 80240DEC 8ED20060 */ lw $s2, 0x60($s6) -/* 8983D0 80240DF0 8E430000 */ lw $v1, ($s2) -/* 8983D4 80240DF4 24020001 */ addiu $v0, $zero, 1 -/* 8983D8 80240DF8 10620038 */ beq $v1, $v0, .L80240EDC -/* 8983DC 80240DFC 28620002 */ slti $v0, $v1, 2 -/* 8983E0 80240E00 50400005 */ beql $v0, $zero, .L80240E18 -/* 8983E4 80240E04 24020002 */ addiu $v0, $zero, 2 -/* 8983E8 80240E08 10600007 */ beqz $v1, .L80240E28 -/* 8983EC 80240E0C 24040005 */ addiu $a0, $zero, 5 -/* 8983F0 80240E10 080903F0 */ j .L80240FC0 -/* 8983F4 80240E14 00000000 */ nop -.L80240E18: -/* 8983F8 80240E18 10620058 */ beq $v1, $v0, .L80240F7C -/* 8983FC 80240E1C 00000000 */ nop -/* 898400 80240E20 080903F0 */ j .L80240FC0 -/* 898404 80240E24 00000000 */ nop -.L80240E28: -/* 898408 80240E28 0000882D */ daddu $s1, $zero, $zero -/* 89840C 80240E2C 3C148024 */ lui $s4, %hi(D_80242708_899CE8) -/* 898410 80240E30 26942708 */ addiu $s4, $s4, %lo(D_80242708_899CE8) -/* 898414 80240E34 24130020 */ addiu $s3, $zero, 0x20 -/* 898418 80240E38 3C064248 */ lui $a2, 0x4248 -/* 89841C 80240E3C 44800000 */ mtc1 $zero, $f0 -/* 898420 80240E40 24020014 */ addiu $v0, $zero, 0x14 -/* 898424 80240E44 AFA20010 */ sw $v0, 0x10($sp) -/* 898428 80240E48 44050000 */ mfc1 $a1, $f0 -/* 89842C 80240E4C 8E470060 */ lw $a3, 0x60($s2) -/* 898430 80240E50 4485B000 */ mtc1 $a1, $f22 -/* 898434 80240E54 0C00A8ED */ jal update_lerp -/* 898438 80240E58 0240802D */ daddu $s0, $s2, $zero -/* 89843C 80240E5C 46000506 */ mov.s $f20, $f0 -.L80240E60: -/* 898440 80240E60 4406A000 */ mfc1 $a2, $f20 -/* 898444 80240E64 27A40020 */ addiu $a0, $sp, 0x20 -/* 898448 80240E68 E6160020 */ swc1 $f22, 0x20($s0) -/* 89844C 80240E6C 8E870000 */ lw $a3, ($s4) -/* 898450 80240E70 02532821 */ addu $a1, $s2, $s3 -/* 898454 80240E74 0C00A7E7 */ jal add_vec2D_polar -/* 898458 80240E78 E7B60020 */ swc1 $f22, 0x20($sp) -/* 89845C 80240E7C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 898460 80240E80 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 898464 80240E84 46002102 */ mul.s $f4, $f4, $f0 -/* 898468 80240E88 00000000 */ nop -/* 89846C 80240E8C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 898470 80240E90 26940004 */ addiu $s4, $s4, 4 -/* 898474 80240E94 46001082 */ mul.s $f2, $f2, $f0 -/* 898478 80240E98 00000000 */ nop -/* 89847C 80240E9C 26730004 */ addiu $s3, $s3, 4 -/* 898480 80240EA0 26310001 */ addiu $s1, $s1, 1 -/* 898484 80240EA4 2A220003 */ slti $v0, $s1, 3 -/* 898488 80240EA8 E6040014 */ swc1 $f4, 0x14($s0) -/* 89848C 80240EAC E602002C */ swc1 $f2, 0x2c($s0) -/* 898490 80240EB0 1440FFEB */ bnez $v0, .L80240E60 -/* 898494 80240EB4 26100004 */ addiu $s0, $s0, 4 -/* 898498 80240EB8 8E420060 */ lw $v0, 0x60($s2) -/* 89849C 80240EBC 24420001 */ addiu $v0, $v0, 1 -/* 8984A0 80240EC0 AE420060 */ sw $v0, 0x60($s2) -/* 8984A4 80240EC4 28420015 */ slti $v0, $v0, 0x15 -/* 8984A8 80240EC8 1440003D */ bnez $v0, .L80240FC0 -/* 8984AC 80240ECC 24020001 */ addiu $v0, $zero, 1 -/* 8984B0 80240ED0 AE420000 */ sw $v0, ($s2) -/* 8984B4 80240ED4 080903F0 */ j .L80240FC0 -/* 8984B8 80240ED8 AE400060 */ sw $zero, 0x60($s2) -.L80240EDC: -/* 8984BC 80240EDC 0000882D */ daddu $s1, $zero, $zero -/* 8984C0 80240EE0 3C148024 */ lui $s4, %hi(D_80242708_899CE8) -/* 8984C4 80240EE4 26942708 */ addiu $s4, $s4, %lo(D_80242708_899CE8) -/* 8984C8 80240EE8 24130020 */ addiu $s3, $zero, 0x20 -/* 8984CC 80240EEC 0240802D */ daddu $s0, $s2, $zero -/* 8984D0 80240EF0 3C014248 */ lui $at, 0x4248 -/* 8984D4 80240EF4 4481A000 */ mtc1 $at, $f20 -/* 8984D8 80240EF8 4480B000 */ mtc1 $zero, $f22 -.L80240EFC: -/* 8984DC 80240EFC 4406A000 */ mfc1 $a2, $f20 -/* 8984E0 80240F00 27A40020 */ addiu $a0, $sp, 0x20 -/* 8984E4 80240F04 E6160020 */ swc1 $f22, 0x20($s0) -/* 8984E8 80240F08 8E870000 */ lw $a3, ($s4) -/* 8984EC 80240F0C 02532821 */ addu $a1, $s2, $s3 -/* 8984F0 80240F10 0C00A7E7 */ jal add_vec2D_polar -/* 8984F4 80240F14 E7B60020 */ swc1 $f22, 0x20($sp) -/* 8984F8 80240F18 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8984FC 80240F1C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 898500 80240F20 46002102 */ mul.s $f4, $f4, $f0 -/* 898504 80240F24 00000000 */ nop -/* 898508 80240F28 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 89850C 80240F2C 26940004 */ addiu $s4, $s4, 4 -/* 898510 80240F30 46001082 */ mul.s $f2, $f2, $f0 -/* 898514 80240F34 00000000 */ nop -/* 898518 80240F38 26730004 */ addiu $s3, $s3, 4 -/* 89851C 80240F3C 26310001 */ addiu $s1, $s1, 1 -/* 898520 80240F40 2A220003 */ slti $v0, $s1, 3 -/* 898524 80240F44 E6040014 */ swc1 $f4, 0x14($s0) -/* 898528 80240F48 E602002C */ swc1 $f2, 0x2c($s0) -/* 89852C 80240F4C 1440FFEB */ bnez $v0, .L80240EFC -/* 898530 80240F50 26100004 */ addiu $s0, $s0, 4 -/* 898534 80240F54 8E420060 */ lw $v0, 0x60($s2) -/* 898538 80240F58 24420001 */ addiu $v0, $v0, 1 -/* 89853C 80240F5C AE420060 */ sw $v0, 0x60($s2) -/* 898540 80240F60 28420010 */ slti $v0, $v0, 0x10 -/* 898544 80240F64 14400016 */ bnez $v0, .L80240FC0 -/* 898548 80240F68 2402000F */ addiu $v0, $zero, 0xf -/* 89854C 80240F6C AE420060 */ sw $v0, 0x60($s2) -/* 898550 80240F70 24020002 */ addiu $v0, $zero, 2 -/* 898554 80240F74 080903F0 */ j .L80240FC0 -/* 898558 80240F78 AE420000 */ sw $v0, ($s2) -.L80240F7C: -/* 89855C 80240F7C 8E420060 */ lw $v0, 0x60($s2) -/* 898560 80240F80 24420001 */ addiu $v0, $v0, 1 -/* 898564 80240F84 AE420060 */ sw $v0, 0x60($s2) -/* 898568 80240F88 2842001F */ slti $v0, $v0, 0x1f -/* 89856C 80240F8C 1440000C */ bnez $v0, .L80240FC0 -/* 898570 80240F90 0000882D */ daddu $s1, $zero, $zero -/* 898574 80240F94 0240282D */ daddu $a1, $s2, $zero -.L80240F98: -/* 898578 80240F98 8CA20008 */ lw $v0, 8($a1) -/* 89857C 80240F9C 8C430000 */ lw $v1, ($v0) -/* 898580 80240FA0 26310001 */ addiu $s1, $s1, 1 -/* 898584 80240FA4 34630010 */ ori $v1, $v1, 0x10 -/* 898588 80240FA8 AC430000 */ sw $v1, ($v0) -/* 89858C 80240FAC 2A220003 */ slti $v0, $s1, 3 -/* 898590 80240FB0 1440FFF9 */ bnez $v0, .L80240F98 -/* 898594 80240FB4 24A50004 */ addiu $a1, $a1, 4 -/* 898598 80240FB8 0809043D */ j .L802410F4 -/* 89859C 80240FBC 24020002 */ addiu $v0, $zero, 2 -.L80240FC0: -/* 8985A0 80240FC0 8E430004 */ lw $v1, 4($s2) -/* 8985A4 80240FC4 10600005 */ beqz $v1, .L80240FDC -/* 8985A8 80240FC8 24020001 */ addiu $v0, $zero, 1 -/* 8985AC 80240FCC 1062000B */ beq $v1, $v0, .L80240FFC -/* 8985B0 80240FD0 0000882D */ daddu $s1, $zero, $zero -/* 8985B4 80240FD4 0809042C */ j .L802410B0 -/* 8985B8 80240FD8 0240282D */ daddu $a1, $s2, $zero -.L80240FDC: -/* 8985BC 80240FDC 8E420064 */ lw $v0, 0x64($s2) -/* 8985C0 80240FE0 24420001 */ addiu $v0, $v0, 1 -/* 8985C4 80240FE4 AE420064 */ sw $v0, 0x64($s2) -/* 8985C8 80240FE8 28420010 */ slti $v0, $v0, 0x10 -/* 8985CC 80240FEC 1440002F */ bnez $v0, .L802410AC -/* 8985D0 80240FF0 0000882D */ daddu $s1, $zero, $zero -/* 8985D4 80240FF4 08090428 */ j .L802410A0 -/* 8985D8 80240FF8 24020001 */ addiu $v0, $zero, 1 -.L80240FFC: -/* 8985DC 80240FFC 4480A000 */ mtc1 $zero, $f20 -/* 8985E0 80241000 24130014 */ addiu $s3, $zero, 0x14 -/* 8985E4 80241004 0240802D */ daddu $s0, $s2, $zero -.L80241008: -/* 8985E8 80241008 4405A000 */ mfc1 $a1, $f20 -/* 8985EC 8024100C AFB30010 */ sw $s3, 0x10($sp) -/* 8985F0 80241010 8E060038 */ lw $a2, 0x38($s0) -/* 8985F4 80241014 8E470064 */ lw $a3, 0x64($s2) -/* 8985F8 80241018 0C00A8ED */ jal update_lerp -/* 8985FC 8024101C 24040001 */ addiu $a0, $zero, 1 -/* 898600 80241020 C6020014 */ lwc1 $f2, 0x14($s0) -/* 898604 80241024 46001080 */ add.s $f2, $f2, $f0 -/* 898608 80241028 4405A000 */ mfc1 $a1, $f20 -/* 89860C 8024102C E6020014 */ swc1 $f2, 0x14($s0) -/* 898610 80241030 AFB30010 */ sw $s3, 0x10($sp) -/* 898614 80241034 8E060044 */ lw $a2, 0x44($s0) -/* 898618 80241038 8E470064 */ lw $a3, 0x64($s2) -/* 89861C 8024103C 0C00A8ED */ jal update_lerp -/* 898620 80241040 24040001 */ addiu $a0, $zero, 1 -/* 898624 80241044 C6020020 */ lwc1 $f2, 0x20($s0) -/* 898628 80241048 46001080 */ add.s $f2, $f2, $f0 -/* 89862C 8024104C 4405A000 */ mfc1 $a1, $f20 -/* 898630 80241050 E6020020 */ swc1 $f2, 0x20($s0) -/* 898634 80241054 AFB30010 */ sw $s3, 0x10($sp) -/* 898638 80241058 8E060050 */ lw $a2, 0x50($s0) -/* 89863C 8024105C 8E470064 */ lw $a3, 0x64($s2) -/* 898640 80241060 0C00A8ED */ jal update_lerp -/* 898644 80241064 24040001 */ addiu $a0, $zero, 1 -/* 898648 80241068 C602002C */ lwc1 $f2, 0x2c($s0) -/* 89864C 8024106C 46001080 */ add.s $f2, $f2, $f0 -/* 898650 80241070 26310001 */ addiu $s1, $s1, 1 -/* 898654 80241074 2A220003 */ slti $v0, $s1, 3 -/* 898658 80241078 E602002C */ swc1 $f2, 0x2c($s0) -/* 89865C 8024107C 1440FFE2 */ bnez $v0, .L80241008 -/* 898660 80241080 26100004 */ addiu $s0, $s0, 4 -/* 898664 80241084 8E420064 */ lw $v0, 0x64($s2) -/* 898668 80241088 24420001 */ addiu $v0, $v0, 1 -/* 89866C 8024108C AE420064 */ sw $v0, 0x64($s2) -/* 898670 80241090 28420015 */ slti $v0, $v0, 0x15 -/* 898674 80241094 14400005 */ bnez $v0, .L802410AC -/* 898678 80241098 0000882D */ daddu $s1, $zero, $zero -/* 89867C 8024109C 24020002 */ addiu $v0, $zero, 2 -.L802410A0: -/* 898680 802410A0 AE420004 */ sw $v0, 4($s2) -/* 898684 802410A4 AE400064 */ sw $zero, 0x64($s2) -/* 898688 802410A8 0000882D */ daddu $s1, $zero, $zero -.L802410AC: -/* 89868C 802410AC 0240282D */ daddu $a1, $s2, $zero -.L802410B0: -/* 898690 802410B0 8CA20008 */ lw $v0, 8($a1) -/* 898694 802410B4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 898698 802410B8 8C42000C */ lw $v0, 0xc($v0) -/* 89869C 802410BC E4400010 */ swc1 $f0, 0x10($v0) -/* 8986A0 802410C0 8CA20008 */ lw $v0, 8($a1) -/* 8986A4 802410C4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 8986A8 802410C8 8C42000C */ lw $v0, 0xc($v0) -/* 8986AC 802410CC 26310001 */ addiu $s1, $s1, 1 -/* 8986B0 802410D0 E4400014 */ swc1 $f0, 0x14($v0) -/* 8986B4 802410D4 8CA20008 */ lw $v0, 8($a1) -/* 8986B8 802410D8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 8986BC 802410DC 8C42000C */ lw $v0, 0xc($v0) -/* 8986C0 802410E0 E4400018 */ swc1 $f0, 0x18($v0) -/* 8986C4 802410E4 2A220003 */ slti $v0, $s1, 3 -/* 8986C8 802410E8 1440FFF1 */ bnez $v0, .L802410B0 -/* 8986CC 802410EC 24A50004 */ addiu $a1, $a1, 4 -/* 8986D0 802410F0 0000102D */ daddu $v0, $zero, $zero -.L802410F4: -/* 8986D4 802410F4 8FBF0044 */ lw $ra, 0x44($sp) -/* 8986D8 802410F8 8FB60040 */ lw $s6, 0x40($sp) -/* 8986DC 802410FC 8FB5003C */ lw $s5, 0x3c($sp) -/* 8986E0 80241100 8FB40038 */ lw $s4, 0x38($sp) -/* 8986E4 80241104 8FB30034 */ lw $s3, 0x34($sp) -/* 8986E8 80241108 8FB20030 */ lw $s2, 0x30($sp) -/* 8986EC 8024110C 8FB1002C */ lw $s1, 0x2c($sp) -/* 8986F0 80241110 8FB00028 */ lw $s0, 0x28($sp) -/* 8986F4 80241114 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 8986F8 80241118 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 8986FC 8024111C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 898700 80241120 03E00008 */ jr $ra -/* 898704 80241124 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s deleted file mode 100644 index 584a688777..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802434E0_9A44C0 -.word .L80241950_9A2930, .L80241968_9A2948, .L80241980_9A2960, .L80241990_9A2970, .L802419A8_9A2988, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L802419C0_9A29A0, .L802419D0_9A29B0, .L802419E8_9A29C8, .L80241A00_9A29E0, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A20_9A2A00, .L80241A18_9A29F8 - -.section .text - -glabel func_80241744_9A2724 -/* 9A2724 80241744 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A2728 80241748 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A272C 8024174C 0080982D */ daddu $s3, $a0, $zero -/* 9A2730 80241750 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A2734 80241754 AFB50064 */ sw $s5, 0x64($sp) -/* 9A2738 80241758 AFB40060 */ sw $s4, 0x60($sp) -/* 9A273C 8024175C AFB20058 */ sw $s2, 0x58($sp) -/* 9A2740 80241760 AFB10054 */ sw $s1, 0x54($sp) -/* 9A2744 80241764 AFB00050 */ sw $s0, 0x50($sp) -/* 9A2748 80241768 8E710148 */ lw $s1, 0x148($s3) -/* 9A274C 8024176C 86240008 */ lh $a0, 8($s1) -/* 9A2750 80241770 0C00EABB */ jal get_npc_unsafe -/* 9A2754 80241774 00A0802D */ daddu $s0, $a1, $zero -/* 9A2758 80241778 8E63000C */ lw $v1, 0xc($s3) -/* 9A275C 8024177C 0260202D */ daddu $a0, $s3, $zero -/* 9A2760 80241780 8C650000 */ lw $a1, ($v1) -/* 9A2764 80241784 0C0B1EAF */ jal evt_get_variable -/* 9A2768 80241788 0040902D */ daddu $s2, $v0, $zero -/* 9A276C 8024178C AFA00028 */ sw $zero, 0x28($sp) -/* 9A2770 80241790 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2774 80241794 8C630094 */ lw $v1, 0x94($v1) -/* 9A2778 80241798 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A277C 8024179C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2780 802417A0 8C630080 */ lw $v1, 0x80($v1) -/* 9A2784 802417A4 AFA30030 */ sw $v1, 0x30($sp) -/* 9A2788 802417A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A278C 802417AC 8C630088 */ lw $v1, 0x88($v1) -/* 9A2790 802417B0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A2794 802417B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2798 802417B8 8C63008C */ lw $v1, 0x8c($v1) -/* 9A279C 802417BC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A27A0 802417C0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A27A4 802417C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A27A8 802417C8 3C0142C8 */ lui $at, 0x42c8 -/* 9A27AC 802417CC 44810000 */ mtc1 $at, $f0 -/* 9A27B0 802417D0 8C630090 */ lw $v1, 0x90($v1) -/* 9A27B4 802417D4 0040A02D */ daddu $s4, $v0, $zero -/* 9A27B8 802417D8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A27BC 802417DC A7A00044 */ sh $zero, 0x44($sp) -/* 9A27C0 802417E0 12000007 */ beqz $s0, .L80241800 -/* 9A27C4 802417E4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A27C8 802417E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A27CC 802417EC 864300A8 */ lh $v1, 0xa8($s2) -/* 9A27D0 802417F0 34420008 */ ori $v0, $v0, 8 -/* 9A27D4 802417F4 AE230084 */ sw $v1, 0x84($s1) -/* 9A27D8 802417F8 08090604 */ j .L80241810 -/* 9A27DC 802417FC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241800: -/* 9A27E0 80241800 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A27E4 80241804 30420004 */ andi $v0, $v0, 4 -/* 9A27E8 80241808 10400048 */ beqz $v0, .L8024192C -/* 9A27EC 8024180C 00000000 */ nop -.L80241810: -/* 9A27F0 80241810 A640008E */ sh $zero, 0x8e($s2) -/* 9A27F4 80241814 AE600070 */ sw $zero, 0x70($s3) -/* 9A27F8 80241818 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A27FC 8024181C 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A2800 80241820 A2200007 */ sb $zero, 7($s1) -/* 9A2804 80241824 8E420000 */ lw $v0, ($s2) -/* 9A2808 80241828 8C630000 */ lw $v1, ($v1) -/* 9A280C 8024182C 00441024 */ and $v0, $v0, $a0 -/* 9A2810 80241830 AE420000 */ sw $v0, ($s2) -/* 9A2814 80241834 AE430028 */ sw $v1, 0x28($s2) -/* 9A2818 80241838 96220086 */ lhu $v0, 0x86($s1) -/* 9A281C 8024183C A64200A8 */ sh $v0, 0xa8($s2) -/* 9A2820 80241840 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A2824 80241844 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A2828 80241848 AE20008C */ sw $zero, 0x8c($s1) -/* 9A282C 8024184C 8C420098 */ lw $v0, 0x98($v0) -/* 9A2830 80241850 14400006 */ bnez $v0, .L8024186C -/* 9A2834 80241854 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A2838 80241858 8E420000 */ lw $v0, ($s2) -/* 9A283C 8024185C 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A2840 80241860 34420200 */ ori $v0, $v0, 0x200 -/* 9A2844 80241864 0809061E */ j .L80241878 -/* 9A2848 80241868 00431024 */ and $v0, $v0, $v1 -.L8024186C: -/* 9A284C 8024186C 8E420000 */ lw $v0, ($s2) -/* 9A2850 80241870 00431024 */ and $v0, $v0, $v1 -/* 9A2854 80241874 34420008 */ ori $v0, $v0, 8 -.L80241878: -/* 9A2858 80241878 AE420000 */ sw $v0, ($s2) -/* 9A285C 8024187C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A2860 80241880 30420004 */ andi $v0, $v0, 4 -/* 9A2864 80241884 1040001E */ beqz $v0, .L80241900 -/* 9A2868 80241888 24040002 */ addiu $a0, $zero, 2 -/* 9A286C 8024188C 0240282D */ daddu $a1, $s2, $zero -/* 9A2870 80241890 0000302D */ daddu $a2, $zero, $zero -/* 9A2874 80241894 24020063 */ addiu $v0, $zero, 0x63 -/* 9A2878 80241898 AE620070 */ sw $v0, 0x70($s3) -/* 9A287C 8024189C AE600074 */ sw $zero, 0x74($s3) -/* 9A2880 802418A0 864300A8 */ lh $v1, 0xa8($s2) -/* 9A2884 802418A4 3C013F80 */ lui $at, 0x3f80 -/* 9A2888 802418A8 44810000 */ mtc1 $at, $f0 -/* 9A288C 802418AC 3C014000 */ lui $at, 0x4000 -/* 9A2890 802418B0 44811000 */ mtc1 $at, $f2 -/* 9A2894 802418B4 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A2898 802418B8 44812000 */ mtc1 $at, $f4 -/* 9A289C 802418BC 24020028 */ addiu $v0, $zero, 0x28 -/* 9A28A0 802418C0 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A28A4 802418C4 44833000 */ mtc1 $v1, $f6 -/* 9A28A8 802418C8 00000000 */ nop -/* 9A28AC 802418CC 468031A0 */ cvt.s.w $f6, $f6 -/* 9A28B0 802418D0 44073000 */ mfc1 $a3, $f6 -/* 9A28B4 802418D4 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A28B8 802418D8 AFA20020 */ sw $v0, 0x20($sp) -/* 9A28BC 802418DC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A28C0 802418E0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A28C4 802418E4 0C01BFA4 */ jal fx_emote -/* 9A28C8 802418E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A28CC 802418EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A28D0 802418F0 2403FFFB */ addiu $v1, $zero, -5 -/* 9A28D4 802418F4 00431024 */ and $v0, $v0, $v1 -/* 9A28D8 802418F8 0809064B */ j .L8024192C -/* 9A28DC 802418FC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241900: -/* 9A28E0 80241900 8E220000 */ lw $v0, ($s1) -/* 9A28E4 80241904 3C034000 */ lui $v1, 0x4000 -/* 9A28E8 80241908 00431024 */ and $v0, $v0, $v1 -/* 9A28EC 8024190C 10400007 */ beqz $v0, .L8024192C -/* 9A28F0 80241910 3C03BFFF */ lui $v1, 0xbfff -/* 9A28F4 80241914 2402000C */ addiu $v0, $zero, 0xc -/* 9A28F8 80241918 AE620070 */ sw $v0, 0x70($s3) -/* 9A28FC 8024191C 8E220000 */ lw $v0, ($s1) -/* 9A2900 80241920 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A2904 80241924 00431024 */ and $v0, $v0, $v1 -/* 9A2908 80241928 AE220000 */ sw $v0, ($s1) -.L8024192C: -/* 9A290C 8024192C 8E630070 */ lw $v1, 0x70($s3) -/* 9A2910 80241930 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9A2914 80241934 1040003A */ beqz $v0, .L80241A20_9A2A00 -/* 9A2918 80241938 00031080 */ sll $v0, $v1, 2 -/* 9A291C 8024193C 3C018024 */ lui $at, %hi(jtbl_802434E0_9A44C0) -/* 9A2920 80241940 00220821 */ addu $at, $at, $v0 -/* 9A2924 80241944 8C2234E0 */ lw $v0, %lo(jtbl_802434E0_9A44C0)($at) -/* 9A2928 80241948 00400008 */ jr $v0 -/* 9A292C 8024194C 00000000 */ nop -.L80241950_9A2930: -/* 9A2930 80241950 0260202D */ daddu $a0, $s3, $zero -/* 9A2934 80241954 0280282D */ daddu $a1, $s4, $zero -/* 9A2938 80241958 0C09022D */ jal trd_02_UnkNpcAIFunc24 -/* 9A293C 8024195C 02A0302D */ daddu $a2, $s5, $zero -/* 9A2940 80241960 96220086 */ lhu $v0, 0x86($s1) -/* 9A2944 80241964 A64200A8 */ sh $v0, 0xa8($s2) -.L80241968_9A2948: -/* 9A2948 80241968 0260202D */ daddu $a0, $s3, $zero -/* 9A294C 8024196C 0280282D */ daddu $a1, $s4, $zero -/* 9A2950 80241970 0C090283 */ jal trd_02_UnkFunc13 -/* 9A2954 80241974 02A0302D */ daddu $a2, $s5, $zero -/* 9A2958 80241978 08090688 */ j .L80241A20_9A2A00 -/* 9A295C 8024197C 00000000 */ nop -.L80241980_9A2960: -/* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero -/* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero -/* 9A2968 80241988 0C09032D */ jal trd_02_UnkNpcAIFunc1 -/* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero -.L80241990_9A2970: -/* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero -/* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero -/* 9A2978 80241998 0C09035D */ jal trd_02_UnkFunc14 -/* 9A297C 8024199C 02A0302D */ daddu $a2, $s5, $zero -/* 9A2980 802419A0 08090688 */ j .L80241A20_9A2A00 -/* 9A2984 802419A4 00000000 */ nop -.L802419A8_9A2988: -/* 9A2988 802419A8 0260202D */ daddu $a0, $s3, $zero -/* 9A298C 802419AC 0280282D */ daddu $a1, $s4, $zero -/* 9A2990 802419B0 0C0903CC */ jal trd_02_UnkNpcAIFunc25 -/* 9A2994 802419B4 02A0302D */ daddu $a2, $s5, $zero -/* 9A2998 802419B8 08090688 */ j .L80241A20_9A2A00 -/* 9A299C 802419BC 00000000 */ nop -.L802419C0_9A29A0: -/* 9A29A0 802419C0 0260202D */ daddu $a0, $s3, $zero -/* 9A29A4 802419C4 0280282D */ daddu $a1, $s4, $zero -/* 9A29A8 802419C8 0C090038 */ jal trd_02_set_script_owner_npc_anim -/* 9A29AC 802419CC 02A0302D */ daddu $a2, $s5, $zero -.L802419D0_9A29B0: -/* 9A29B0 802419D0 0260202D */ daddu $a0, $s3, $zero -/* 9A29B4 802419D4 0280282D */ daddu $a1, $s4, $zero -/* 9A29B8 802419D8 0C090057 */ jal trd_02_UnkDistFunc -/* 9A29BC 802419DC 02A0302D */ daddu $a2, $s5, $zero -/* 9A29C0 802419E0 08090688 */ j .L80241A20_9A2A00 -/* 9A29C4 802419E4 00000000 */ nop -.L802419E8_9A29C8: -/* 9A29C8 802419E8 0260202D */ daddu $a0, $s3, $zero -/* 9A29CC 802419EC 0280282D */ daddu $a1, $s4, $zero -/* 9A29D0 802419F0 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 -/* 9A29D4 802419F4 02A0302D */ daddu $a2, $s5, $zero -/* 9A29D8 802419F8 08090688 */ j .L80241A20_9A2A00 -/* 9A29DC 802419FC 00000000 */ nop -.L80241A00_9A29E0: -/* 9A29E0 80241A00 0260202D */ daddu $a0, $s3, $zero -/* 9A29E4 80241A04 0280282D */ daddu $a1, $s4, $zero -/* 9A29E8 80241A08 0C0900FD */ jal trd_02_set_script_owner_npc_col_height -/* 9A29EC 80241A0C 02A0302D */ daddu $a2, $s5, $zero -/* 9A29F0 80241A10 08090688 */ j .L80241A20_9A2A00 -/* 9A29F4 80241A14 00000000 */ nop -.L80241A18_9A29F8: -/* 9A29F8 80241A18 0C0129CF */ jal func_8004A73C -/* 9A29FC 80241A1C 0260202D */ daddu $a0, $s3, $zero -.L80241A20_9A2A00: -/* 9A2A00 80241A20 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A2A04 80241A24 8FB50064 */ lw $s5, 0x64($sp) -/* 9A2A08 80241A28 8FB40060 */ lw $s4, 0x60($sp) -/* 9A2A0C 80241A2C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A2A10 80241A30 8FB20058 */ lw $s2, 0x58($sp) -/* 9A2A14 80241A34 8FB10054 */ lw $s1, 0x54($sp) -/* 9A2A18 80241A38 8FB00050 */ lw $s0, 0x50($sp) -/* 9A2A1C 80241A3C 0000102D */ daddu $v0, $zero, $zero -/* 9A2A20 80241A40 03E00008 */ jr $ra -/* 9A2A24 80241A44 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A2A28 80241A48 00000000 */ nop -/* 9A2A2C 80241A4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s deleted file mode 100644 index b4f37e7bf6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ /dev/null @@ -1,221 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802460E0_9AE4D0 -.word .L80241D20_9AA110, .L80241D38_9AA128, .L80241D50_9AA140, .L80241D60_9AA150, .L80241D78_9AA168, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241D90_9AA180, .L80241DA0_9AA190, .L80241DB8_9AA1A8, .L80241DD0_9AA1C0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DF0_9AA1E0, .L80241DE8_9AA1D8 - -.section .text - -glabel func_80241B14_9A9F04 -/* 9A9F04 80241B14 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A9F08 80241B18 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A9F0C 80241B1C 0080982D */ daddu $s3, $a0, $zero -/* 9A9F10 80241B20 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A9F14 80241B24 AFB50064 */ sw $s5, 0x64($sp) -/* 9A9F18 80241B28 AFB40060 */ sw $s4, 0x60($sp) -/* 9A9F1C 80241B2C AFB20058 */ sw $s2, 0x58($sp) -/* 9A9F20 80241B30 AFB10054 */ sw $s1, 0x54($sp) -/* 9A9F24 80241B34 AFB00050 */ sw $s0, 0x50($sp) -/* 9A9F28 80241B38 8E710148 */ lw $s1, 0x148($s3) -/* 9A9F2C 80241B3C 86240008 */ lh $a0, 8($s1) -/* 9A9F30 80241B40 0C00EABB */ jal get_npc_unsafe -/* 9A9F34 80241B44 00A0802D */ daddu $s0, $a1, $zero -/* 9A9F38 80241B48 8E63000C */ lw $v1, 0xc($s3) -/* 9A9F3C 80241B4C 0260202D */ daddu $a0, $s3, $zero -/* 9A9F40 80241B50 8C650000 */ lw $a1, ($v1) -/* 9A9F44 80241B54 0C0B1EAF */ jal evt_get_variable -/* 9A9F48 80241B58 0040902D */ daddu $s2, $v0, $zero -/* 9A9F4C 80241B5C AFA00028 */ sw $zero, 0x28($sp) -/* 9A9F50 80241B60 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F54 80241B64 8C630094 */ lw $v1, 0x94($v1) -/* 9A9F58 80241B68 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A9F5C 80241B6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F60 80241B70 8C630080 */ lw $v1, 0x80($v1) -/* 9A9F64 80241B74 AFA30030 */ sw $v1, 0x30($sp) -/* 9A9F68 80241B78 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F6C 80241B7C 8C630088 */ lw $v1, 0x88($v1) -/* 9A9F70 80241B80 AFA30034 */ sw $v1, 0x34($sp) -/* 9A9F74 80241B84 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F78 80241B88 8C63008C */ lw $v1, 0x8c($v1) -/* 9A9F7C 80241B8C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A9F80 80241B90 AFA30038 */ sw $v1, 0x38($sp) -/* 9A9F84 80241B94 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9F88 80241B98 3C0142C8 */ lui $at, 0x42c8 -/* 9A9F8C 80241B9C 44810000 */ mtc1 $at, $f0 -/* 9A9F90 80241BA0 8C630090 */ lw $v1, 0x90($v1) -/* 9A9F94 80241BA4 0040A02D */ daddu $s4, $v0, $zero -/* 9A9F98 80241BA8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A9F9C 80241BAC A7A00044 */ sh $zero, 0x44($sp) -/* 9A9FA0 80241BB0 12000007 */ beqz $s0, .L80241BD0 -/* 9A9FA4 80241BB4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A9FA8 80241BB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A9FAC 80241BBC 864300A8 */ lh $v1, 0xa8($s2) -/* 9A9FB0 80241BC0 34420008 */ ori $v0, $v0, 8 -/* 9A9FB4 80241BC4 AE230084 */ sw $v1, 0x84($s1) -/* 9A9FB8 80241BC8 080906F8 */ j .L80241BE0 -/* 9A9FBC 80241BCC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241BD0: -/* 9A9FC0 80241BD0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A9FC4 80241BD4 30420004 */ andi $v0, $v0, 4 -/* 9A9FC8 80241BD8 10400048 */ beqz $v0, .L80241CFC -/* 9A9FCC 80241BDC 00000000 */ nop -.L80241BE0: -/* 9A9FD0 80241BE0 A640008E */ sh $zero, 0x8e($s2) -/* 9A9FD4 80241BE4 AE600070 */ sw $zero, 0x70($s3) -/* 9A9FD8 80241BE8 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A9FDC 80241BEC 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A9FE0 80241BF0 A2200007 */ sb $zero, 7($s1) -/* 9A9FE4 80241BF4 8E420000 */ lw $v0, ($s2) -/* 9A9FE8 80241BF8 8C630000 */ lw $v1, ($v1) -/* 9A9FEC 80241BFC 00441024 */ and $v0, $v0, $a0 -/* 9A9FF0 80241C00 AE420000 */ sw $v0, ($s2) -/* 9A9FF4 80241C04 AE430028 */ sw $v1, 0x28($s2) -/* 9A9FF8 80241C08 96220086 */ lhu $v0, 0x86($s1) -/* 9A9FFC 80241C0C A64200A8 */ sh $v0, 0xa8($s2) -/* 9AA000 80241C10 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA004 80241C14 A22000B5 */ sb $zero, 0xb5($s1) -/* 9AA008 80241C18 AE20008C */ sw $zero, 0x8c($s1) -/* 9AA00C 80241C1C 8C420098 */ lw $v0, 0x98($v0) -/* 9AA010 80241C20 14400006 */ bnez $v0, .L80241C3C -/* 9AA014 80241C24 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9AA018 80241C28 8E420000 */ lw $v0, ($s2) -/* 9AA01C 80241C2C 2403FFF7 */ addiu $v1, $zero, -9 -/* 9AA020 80241C30 34420200 */ ori $v0, $v0, 0x200 -/* 9AA024 80241C34 08090712 */ j .L80241C48 -/* 9AA028 80241C38 00431024 */ and $v0, $v0, $v1 -.L80241C3C: -/* 9AA02C 80241C3C 8E420000 */ lw $v0, ($s2) -/* 9AA030 80241C40 00431024 */ and $v0, $v0, $v1 -/* 9AA034 80241C44 34420008 */ ori $v0, $v0, 8 -.L80241C48: -/* 9AA038 80241C48 AE420000 */ sw $v0, ($s2) -/* 9AA03C 80241C4C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9AA040 80241C50 30420004 */ andi $v0, $v0, 4 -/* 9AA044 80241C54 1040001E */ beqz $v0, .L80241CD0 -/* 9AA048 80241C58 24040002 */ addiu $a0, $zero, 2 -/* 9AA04C 80241C5C 0240282D */ daddu $a1, $s2, $zero -/* 9AA050 80241C60 0000302D */ daddu $a2, $zero, $zero -/* 9AA054 80241C64 24020063 */ addiu $v0, $zero, 0x63 -/* 9AA058 80241C68 AE620070 */ sw $v0, 0x70($s3) -/* 9AA05C 80241C6C AE600074 */ sw $zero, 0x74($s3) -/* 9AA060 80241C70 864300A8 */ lh $v1, 0xa8($s2) -/* 9AA064 80241C74 3C013F80 */ lui $at, 0x3f80 -/* 9AA068 80241C78 44810000 */ mtc1 $at, $f0 -/* 9AA06C 80241C7C 3C014000 */ lui $at, 0x4000 -/* 9AA070 80241C80 44811000 */ mtc1 $at, $f2 -/* 9AA074 80241C84 3C01C1A0 */ lui $at, 0xc1a0 -/* 9AA078 80241C88 44812000 */ mtc1 $at, $f4 -/* 9AA07C 80241C8C 24020028 */ addiu $v0, $zero, 0x28 -/* 9AA080 80241C90 AFA2001C */ sw $v0, 0x1c($sp) -/* 9AA084 80241C94 44833000 */ mtc1 $v1, $f6 -/* 9AA088 80241C98 00000000 */ nop -/* 9AA08C 80241C9C 468031A0 */ cvt.s.w $f6, $f6 -/* 9AA090 80241CA0 44073000 */ mfc1 $a3, $f6 -/* 9AA094 80241CA4 27A20048 */ addiu $v0, $sp, 0x48 -/* 9AA098 80241CA8 AFA20020 */ sw $v0, 0x20($sp) -/* 9AA09C 80241CAC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA0A0 80241CB0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9AA0A4 80241CB4 0C01BFA4 */ jal fx_emote -/* 9AA0A8 80241CB8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9AA0AC 80241CBC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9AA0B0 80241CC0 2403FFFB */ addiu $v1, $zero, -5 -/* 9AA0B4 80241CC4 00431024 */ and $v0, $v0, $v1 -/* 9AA0B8 80241CC8 0809073F */ j .L80241CFC -/* 9AA0BC 80241CCC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241CD0: -/* 9AA0C0 80241CD0 8E220000 */ lw $v0, ($s1) -/* 9AA0C4 80241CD4 3C034000 */ lui $v1, 0x4000 -/* 9AA0C8 80241CD8 00431024 */ and $v0, $v0, $v1 -/* 9AA0CC 80241CDC 10400007 */ beqz $v0, .L80241CFC -/* 9AA0D0 80241CE0 3C03BFFF */ lui $v1, 0xbfff -/* 9AA0D4 80241CE4 2402000C */ addiu $v0, $zero, 0xc -/* 9AA0D8 80241CE8 AE620070 */ sw $v0, 0x70($s3) -/* 9AA0DC 80241CEC 8E220000 */ lw $v0, ($s1) -/* 9AA0E0 80241CF0 3463FFFF */ ori $v1, $v1, 0xffff -/* 9AA0E4 80241CF4 00431024 */ and $v0, $v0, $v1 -/* 9AA0E8 80241CF8 AE220000 */ sw $v0, ($s1) -.L80241CFC: -/* 9AA0EC 80241CFC 8E630070 */ lw $v1, 0x70($s3) -/* 9AA0F0 80241D00 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9AA0F4 80241D04 1040003A */ beqz $v0, .L80241DF0_9AA1E0 -/* 9AA0F8 80241D08 00031080 */ sll $v0, $v1, 2 -/* 9AA0FC 80241D0C 3C018024 */ lui $at, %hi(jtbl_802460E0_9AE4D0) -/* 9AA100 80241D10 00220821 */ addu $at, $at, $v0 -/* 9AA104 80241D14 8C2260E0 */ lw $v0, %lo(jtbl_802460E0_9AE4D0)($at) -/* 9AA108 80241D18 00400008 */ jr $v0 -/* 9AA10C 80241D1C 00000000 */ nop -.L80241D20_9AA110: -/* 9AA110 80241D20 0260202D */ daddu $a0, $s3, $zero -/* 9AA114 80241D24 0280282D */ daddu $a1, $s4, $zero -/* 9AA118 80241D28 0C090321 */ jal trd_04_UnkNpcAIFunc24 -/* 9AA11C 80241D2C 02A0302D */ daddu $a2, $s5, $zero -/* 9AA120 80241D30 96220086 */ lhu $v0, 0x86($s1) -/* 9AA124 80241D34 A64200A8 */ sh $v0, 0xa8($s2) -.L80241D38_9AA128: -/* 9AA128 80241D38 0260202D */ daddu $a0, $s3, $zero -/* 9AA12C 80241D3C 0280282D */ daddu $a1, $s4, $zero -/* 9AA130 80241D40 0C090377 */ jal trd_04_UnkFunc13 -/* 9AA134 80241D44 02A0302D */ daddu $a2, $s5, $zero -/* 9AA138 80241D48 0809077C */ j .L80241DF0_9AA1E0 -/* 9AA13C 80241D4C 00000000 */ nop -.L80241D50_9AA140: -/* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero -/* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero -/* 9AA148 80241D58 0C090421 */ jal trd_04_UnkNpcAIFunc1 -/* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero -.L80241D60_9AA150: -/* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero -/* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero -/* 9AA158 80241D68 0C090451 */ jal trd_04_UnkFunc14 -/* 9AA15C 80241D6C 02A0302D */ daddu $a2, $s5, $zero -/* 9AA160 80241D70 0809077C */ j .L80241DF0_9AA1E0 -/* 9AA164 80241D74 00000000 */ nop -.L80241D78_9AA168: -/* 9AA168 80241D78 0260202D */ daddu $a0, $s3, $zero -/* 9AA16C 80241D7C 0280282D */ daddu $a1, $s4, $zero -/* 9AA170 80241D80 0C0904C0 */ jal trd_04_UnkNpcAIFunc25 -/* 9AA174 80241D84 02A0302D */ daddu $a2, $s5, $zero -/* 9AA178 80241D88 0809077C */ j .L80241DF0_9AA1E0 -/* 9AA17C 80241D8C 00000000 */ nop -.L80241D90_9AA180: -/* 9AA180 80241D90 0260202D */ daddu $a0, $s3, $zero -/* 9AA184 80241D94 0280282D */ daddu $a1, $s4, $zero -/* 9AA188 80241D98 0C09012C */ jal trd_04_set_script_owner_npc_anim -/* 9AA18C 80241D9C 02A0302D */ daddu $a2, $s5, $zero -.L80241DA0_9AA190: -/* 9AA190 80241DA0 0260202D */ daddu $a0, $s3, $zero -/* 9AA194 80241DA4 0280282D */ daddu $a1, $s4, $zero -/* 9AA198 80241DA8 0C09014B */ jal trd_04_UnkDistFunc -/* 9AA19C 80241DAC 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1A0 80241DB0 0809077C */ j .L80241DF0_9AA1E0 -/* 9AA1A4 80241DB4 00000000 */ nop -.L80241DB8_9AA1A8: -/* 9AA1A8 80241DB8 0260202D */ daddu $a0, $s3, $zero -/* 9AA1AC 80241DBC 0280282D */ daddu $a1, $s4, $zero -/* 9AA1B0 80241DC0 0C090198 */ jal trd_04_UnkNpcAIFunc12 -/* 9AA1B4 80241DC4 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1B8 80241DC8 0809077C */ j .L80241DF0_9AA1E0 -/* 9AA1BC 80241DCC 00000000 */ nop -.L80241DD0_9AA1C0: -/* 9AA1C0 80241DD0 0260202D */ daddu $a0, $s3, $zero -/* 9AA1C4 80241DD4 0280282D */ daddu $a1, $s4, $zero -/* 9AA1C8 80241DD8 0C0901F1 */ jal trd_04_set_script_owner_npc_col_height -/* 9AA1CC 80241DDC 02A0302D */ daddu $a2, $s5, $zero -/* 9AA1D0 80241DE0 0809077C */ j .L80241DF0_9AA1E0 -/* 9AA1D4 80241DE4 00000000 */ nop -.L80241DE8_9AA1D8: -/* 9AA1D8 80241DE8 0C0129CF */ jal func_8004A73C -/* 9AA1DC 80241DEC 0260202D */ daddu $a0, $s3, $zero -.L80241DF0_9AA1E0: -/* 9AA1E0 80241DF0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9AA1E4 80241DF4 8FB50064 */ lw $s5, 0x64($sp) -/* 9AA1E8 80241DF8 8FB40060 */ lw $s4, 0x60($sp) -/* 9AA1EC 80241DFC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9AA1F0 80241E00 8FB20058 */ lw $s2, 0x58($sp) -/* 9AA1F4 80241E04 8FB10054 */ lw $s1, 0x54($sp) -/* 9AA1F8 80241E08 8FB00050 */ lw $s0, 0x50($sp) -/* 9AA1FC 80241E0C 0000102D */ daddu $v0, $zero, $zero -/* 9AA200 80241E10 03E00008 */ jr $ra -/* 9AA204 80241E14 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s deleted file mode 100644 index 721b2b1052..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A6C_9AAE5C -/* 9AAE5C 80242A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AAE60 80242A70 AFB00010 */ sw $s0, 0x10($sp) -/* 9AAE64 80242A74 0080802D */ daddu $s0, $a0, $zero -/* 9AAE68 80242A78 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AAE6C 80242A7C 8E020148 */ lw $v0, 0x148($s0) -/* 9AAE70 80242A80 0C00EABB */ jal get_npc_unsafe -/* 9AAE74 80242A84 84440008 */ lh $a0, 8($v0) -/* 9AAE78 80242A88 9443008E */ lhu $v1, 0x8e($v0) -/* 9AAE7C 80242A8C C440003C */ lwc1 $f0, 0x3c($v0) -/* 9AAE80 80242A90 24640001 */ addiu $a0, $v1, 1 -/* 9AAE84 80242A94 00031C00 */ sll $v1, $v1, 0x10 -/* 9AAE88 80242A98 00031B83 */ sra $v1, $v1, 0xe -/* 9AAE8C 80242A9C A444008E */ sh $a0, 0x8e($v0) -/* 9AAE90 80242AA0 3C018024 */ lui $at, %hi(D_802456F4_9ADAE4) -/* 9AAE94 80242AA4 00230821 */ addu $at, $at, $v1 -/* 9AAE98 80242AA8 C42256F4 */ lwc1 $f2, %lo(D_802456F4_9ADAE4)($at) -/* 9AAE9C 80242AAC 8443008E */ lh $v1, 0x8e($v0) -/* 9AAEA0 80242AB0 46020000 */ add.s $f0, $f0, $f2 -/* 9AAEA4 80242AB4 28630005 */ slti $v1, $v1, 5 -/* 9AAEA8 80242AB8 14600003 */ bnez $v1, .L80242AC8 -/* 9AAEAC 80242ABC E440003C */ swc1 $f0, 0x3c($v0) -/* 9AAEB0 80242AC0 2402000C */ addiu $v0, $zero, 0xc -/* 9AAEB4 80242AC4 AE020070 */ sw $v0, 0x70($s0) -.L80242AC8: -/* 9AAEB8 80242AC8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AAEBC 80242ACC 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAEC0 80242AD0 03E00008 */ jr $ra -/* 9AAEC4 80242AD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s deleted file mode 100644 index fa20dacbd1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80246288_9AE678 -.word .L80243230_9AB620, .L80243240_9AB630, .L80243258_9AB648, .L80243268_9AB658, .L802432E8_9AB6D8, .L802432E8_9AB6D8, .L802432E8_9AB6D8, .L802432E8_9AB6D8, .L802432E8_9AB6D8, .L802432E8_9AB6D8, .L80243280_9AB670, .L80243290_9AB680, .L802432A8_9AB698, .L802432C0_9AB6B0, .L802432D8_9AB6C8, 0 - -.section .text - -glabel func_80243124_9AB514 -/* 9AB514 80243124 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9AB518 80243128 AFB40040 */ sw $s4, 0x40($sp) -/* 9AB51C 8024312C 0080A02D */ daddu $s4, $a0, $zero -/* 9AB520 80243130 AFBF0048 */ sw $ra, 0x48($sp) -/* 9AB524 80243134 AFB50044 */ sw $s5, 0x44($sp) -/* 9AB528 80243138 AFB3003C */ sw $s3, 0x3c($sp) -/* 9AB52C 8024313C AFB20038 */ sw $s2, 0x38($sp) -/* 9AB530 80243140 AFB10034 */ sw $s1, 0x34($sp) -/* 9AB534 80243144 AFB00030 */ sw $s0, 0x30($sp) -/* 9AB538 80243148 8E920148 */ lw $s2, 0x148($s4) -/* 9AB53C 8024314C 86440008 */ lh $a0, 8($s2) -/* 9AB540 80243150 8E90000C */ lw $s0, 0xc($s4) -/* 9AB544 80243154 0C00EABB */ jal get_npc_unsafe -/* 9AB548 80243158 00A0882D */ daddu $s1, $a1, $zero -/* 9AB54C 8024315C 0280202D */ daddu $a0, $s4, $zero -/* 9AB550 80243160 8E050000 */ lw $a1, ($s0) -/* 9AB554 80243164 0C0B1EAF */ jal evt_get_variable -/* 9AB558 80243168 0040A82D */ daddu $s5, $v0, $zero -/* 9AB55C 8024316C AFA00010 */ sw $zero, 0x10($sp) -/* 9AB560 80243170 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB564 80243174 8C630030 */ lw $v1, 0x30($v1) -/* 9AB568 80243178 AFA30014 */ sw $v1, 0x14($sp) -/* 9AB56C 8024317C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB570 80243180 8C63001C */ lw $v1, 0x1c($v1) -/* 9AB574 80243184 AFA30018 */ sw $v1, 0x18($sp) -/* 9AB578 80243188 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB57C 8024318C 8C630024 */ lw $v1, 0x24($v1) -/* 9AB580 80243190 AFA3001C */ sw $v1, 0x1c($sp) -/* 9AB584 80243194 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB588 80243198 8C630028 */ lw $v1, 0x28($v1) -/* 9AB58C 8024319C 27B30010 */ addiu $s3, $sp, 0x10 -/* 9AB590 802431A0 AFA30020 */ sw $v1, 0x20($sp) -/* 9AB594 802431A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB598 802431A8 3C0142F0 */ lui $at, 0x42f0 -/* 9AB59C 802431AC 44810000 */ mtc1 $at, $f0 -/* 9AB5A0 802431B0 8C63002C */ lw $v1, 0x2c($v1) -/* 9AB5A4 802431B4 0040802D */ daddu $s0, $v0, $zero -/* 9AB5A8 802431B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AB5AC 802431BC A7A0002C */ sh $zero, 0x2c($sp) -/* 9AB5B0 802431C0 12200006 */ beqz $s1, .L802431DC -/* 9AB5B4 802431C4 AFA30024 */ sw $v1, 0x24($sp) -/* 9AB5B8 802431C8 02A0202D */ daddu $a0, $s5, $zero -/* 9AB5BC 802431CC 0240282D */ daddu $a1, $s2, $zero -/* 9AB5C0 802431D0 0280302D */ daddu $a2, $s4, $zero -/* 9AB5C4 802431D4 0C090C00 */ jal trd_04_UnkFunc5 -/* 9AB5C8 802431D8 0200382D */ daddu $a3, $s0, $zero -.L802431DC: -/* 9AB5CC 802431DC 2402FFFE */ addiu $v0, $zero, -2 -/* 9AB5D0 802431E0 A2A200AB */ sb $v0, 0xab($s5) -/* 9AB5D4 802431E4 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9AB5D8 802431E8 30620004 */ andi $v0, $v1, 4 -/* 9AB5DC 802431EC 10400007 */ beqz $v0, .L8024320C -/* 9AB5E0 802431F0 00000000 */ nop -/* 9AB5E4 802431F4 824200B4 */ lb $v0, 0xb4($s2) -/* 9AB5E8 802431F8 1440003C */ bnez $v0, .L802432EC -/* 9AB5EC 802431FC 0000102D */ daddu $v0, $zero, $zero -/* 9AB5F0 80243200 2402FFFB */ addiu $v0, $zero, -5 -/* 9AB5F4 80243204 00621024 */ and $v0, $v1, $v0 -/* 9AB5F8 80243208 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024320C: -/* 9AB5FC 8024320C 8E830070 */ lw $v1, 0x70($s4) -/* 9AB600 80243210 2C62000F */ sltiu $v0, $v1, 0xf -/* 9AB604 80243214 10400034 */ beqz $v0, .L802432E8_9AB6D8 -/* 9AB608 80243218 00031080 */ sll $v0, $v1, 2 -/* 9AB60C 8024321C 3C018024 */ lui $at, %hi(jtbl_80246288_9AE678) -/* 9AB610 80243220 00220821 */ addu $at, $at, $v0 -/* 9AB614 80243224 8C226288 */ lw $v0, %lo(jtbl_80246288_9AE678)($at) -/* 9AB618 80243228 00400008 */ jr $v0 -/* 9AB61C 8024322C 00000000 */ nop -.L80243230_9AB620: -/* 9AB620 80243230 0280202D */ daddu $a0, $s4, $zero -/* 9AB624 80243234 0200282D */ daddu $a1, $s0, $zero -/* 9AB628 80243238 0C090786 */ jal trd_04_UnkNpcAIFunc23 -/* 9AB62C 8024323C 0260302D */ daddu $a2, $s3, $zero -.L80243240_9AB630: -/* 9AB630 80243240 0280202D */ daddu $a0, $s4, $zero -/* 9AB634 80243244 0200282D */ daddu $a1, $s0, $zero -/* 9AB638 80243248 0C0907F2 */ jal trd_04_UnkNpcAIFunc35 -/* 9AB63C 8024324C 0260302D */ daddu $a2, $s3, $zero -/* 9AB640 80243250 08090CBB */ j .L802432EC -/* 9AB644 80243254 0000102D */ daddu $v0, $zero, $zero -.L80243258_9AB648: -/* 9AB648 80243258 0280202D */ daddu $a0, $s4, $zero -/* 9AB64C 8024325C 0200282D */ daddu $a1, $s0, $zero -/* 9AB650 80243260 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 -/* 9AB654 80243264 0260302D */ daddu $a2, $s3, $zero -.L80243268_9AB658: -/* 9AB658 80243268 0280202D */ daddu $a0, $s4, $zero -/* 9AB65C 8024326C 0200282D */ daddu $a1, $s0, $zero -/* 9AB660 80243270 0C0909AC */ jal trd_04_UnkFunc4 -/* 9AB664 80243274 0260302D */ daddu $a2, $s3, $zero -/* 9AB668 80243278 08090CBB */ j .L802432EC -/* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero -.L80243280_9AB670: -/* 9AB670 80243280 0280202D */ daddu $a0, $s4, $zero -/* 9AB674 80243284 0200282D */ daddu $a1, $s0, $zero -/* 9AB678 80243288 0C090A7D */ jal trd_04_UnkNpcAIFunc2 -/* 9AB67C 8024328C 0260302D */ daddu $a2, $s3, $zero -.L80243290_9AB680: -/* 9AB680 80243290 0280202D */ daddu $a0, $s4, $zero -/* 9AB684 80243294 0200282D */ daddu $a1, $s0, $zero -/* 9AB688 80243298 0C090A9B */ jal func_80242A6C_9AAE5C -/* 9AB68C 8024329C 0260302D */ daddu $a2, $s3, $zero -/* 9AB690 802432A0 08090CBB */ j .L802432EC -/* 9AB694 802432A4 0000102D */ daddu $v0, $zero, $zero -.L802432A8_9AB698: -/* 9AB698 802432A8 0280202D */ daddu $a0, $s4, $zero -/* 9AB69C 802432AC 0200282D */ daddu $a1, $s0, $zero -/* 9AB6A0 802432B0 0C090AB6 */ jal trd_04_UnkNpcAIFunc14 -/* 9AB6A4 802432B4 0260302D */ daddu $a2, $s3, $zero -/* 9AB6A8 802432B8 08090CBB */ j .L802432EC -/* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero -.L802432C0_9AB6B0: -/* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero -/* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero -/* 9AB6B8 802432C8 0C090B03 */ jal trd_04_UnkNpcAIFunc3 -/* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero -/* 9AB6C0 802432D0 08090CBB */ j .L802432EC -/* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero -.L802432D8_9AB6C8: -/* 9AB6C8 802432D8 0280202D */ daddu $a0, $s4, $zero -/* 9AB6CC 802432DC 0200282D */ daddu $a1, $s0, $zero -/* 9AB6D0 802432E0 0C090B1C */ jal trd_04_UnkFunc6 -/* 9AB6D4 802432E4 0260302D */ daddu $a2, $s3, $zero -.L802432E8_9AB6D8: -/* 9AB6D8 802432E8 0000102D */ daddu $v0, $zero, $zero -.L802432EC: -/* 9AB6DC 802432EC 8FBF0048 */ lw $ra, 0x48($sp) -/* 9AB6E0 802432F0 8FB50044 */ lw $s5, 0x44($sp) -/* 9AB6E4 802432F4 8FB40040 */ lw $s4, 0x40($sp) -/* 9AB6E8 802432F8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9AB6EC 802432FC 8FB20038 */ lw $s2, 0x38($sp) -/* 9AB6F0 80243300 8FB10034 */ lw $s1, 0x34($sp) -/* 9AB6F4 80243304 8FB00030 */ lw $s0, 0x30($sp) -/* 9AB6F8 80243308 03E00008 */ jr $ra -/* 9AB6FC 8024330C 27BD0050 */ addiu $sp, $sp, 0x50 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 index 1568cb15b7..64ec268dbc 100644 --- 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 @@ -98,7 +98,7 @@ glabel func_80243650_9ABA40 .L80243798_9ABB88: /* 9ABB88 80243798 0260202D */ daddu $a0, $s3, $zero /* 9ABB8C 8024379C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB90 802437A0 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 +/* 9ABB90 802437A0 0C09097C */ jal trd_04_UnkNpcAIFunc1_copy /* 9ABB94 802437A4 0280302D */ daddu $a2, $s4, $zero .L802437A8_9ABB98: /* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero @@ -121,7 +121,7 @@ glabel func_80243650_9ABA40 .L802437E8_9ABBD8: /* 9ABBD8 802437E8 0260202D */ daddu $a0, $s3, $zero /* 9ABBDC 802437EC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBE0 802437F0 0C090A9B */ jal func_80242A6C_9AAE5C +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s deleted file mode 100644 index 1fa95c56ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241738_9B80B8 -/* 9B80B8 80241738 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B80BC 8024173C AFB00010 */ sw $s0, 0x10($sp) -/* 9B80C0 80241740 0080802D */ daddu $s0, $a0, $zero -/* 9B80C4 80241744 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B80C8 80241748 8E020148 */ lw $v0, 0x148($s0) -/* 9B80CC 8024174C 0C00EABB */ jal get_npc_unsafe -/* 9B80D0 80241750 84440008 */ lh $a0, 8($v0) -/* 9B80D4 80241754 9443008E */ lhu $v1, 0x8e($v0) -/* 9B80D8 80241758 C440003C */ lwc1 $f0, 0x3c($v0) -/* 9B80DC 8024175C 24640001 */ addiu $a0, $v1, 1 -/* 9B80E0 80241760 00031C00 */ sll $v1, $v1, 0x10 -/* 9B80E4 80241764 00031B83 */ sra $v1, $v1, 0xe -/* 9B80E8 80241768 A444008E */ sh $a0, 0x8e($v0) -/* 9B80EC 8024176C 3C018024 */ lui $at, %hi(D_80242EAC_9B982C) -/* 9B80F0 80241770 00230821 */ addu $at, $at, $v1 -/* 9B80F4 80241774 C4222EAC */ lwc1 $f2, %lo(D_80242EAC_9B982C)($at) -/* 9B80F8 80241778 8443008E */ lh $v1, 0x8e($v0) -/* 9B80FC 8024177C 46020000 */ add.s $f0, $f0, $f2 -/* 9B8100 80241780 28630005 */ slti $v1, $v1, 5 -/* 9B8104 80241784 14600003 */ bnez $v1, .L80241794 -/* 9B8108 80241788 E440003C */ swc1 $f0, 0x3c($v0) -/* 9B810C 8024178C 2402000C */ addiu $v0, $zero, 0xc -/* 9B8110 80241790 AE020070 */ sw $v0, 0x70($s0) -.L80241794: -/* 9B8114 80241794 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B8118 80241798 8FB00010 */ lw $s0, 0x10($sp) -/* 9B811C 8024179C 03E00008 */ jr $ra -/* 9B8120 802417A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s deleted file mode 100644 index abd1fc4f34..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244898_9BB218 -.word .L80241EFC_9B887C, .L80241F0C_9B888C, .L80241F24_9B88A4, .L80241F34_9B88B4, .L80241FB4_9B8934, .L80241FB4_9B8934, .L80241FB4_9B8934, .L80241FB4_9B8934, .L80241FB4_9B8934, .L80241FB4_9B8934, .L80241F4C_9B88CC, .L80241F5C_9B88DC, .L80241F74_9B88F4, .L80241F8C_9B890C, .L80241FA4_9B8924, 0 - -.section .text - -glabel func_80241DF0_9B8770 -/* 9B8770 80241DF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B8774 80241DF4 AFB40040 */ sw $s4, 0x40($sp) -/* 9B8778 80241DF8 0080A02D */ daddu $s4, $a0, $zero -/* 9B877C 80241DFC AFBF0048 */ sw $ra, 0x48($sp) -/* 9B8780 80241E00 AFB50044 */ sw $s5, 0x44($sp) -/* 9B8784 80241E04 AFB3003C */ sw $s3, 0x3c($sp) -/* 9B8788 80241E08 AFB20038 */ sw $s2, 0x38($sp) -/* 9B878C 80241E0C AFB10034 */ sw $s1, 0x34($sp) -/* 9B8790 80241E10 AFB00030 */ sw $s0, 0x30($sp) -/* 9B8794 80241E14 8E920148 */ lw $s2, 0x148($s4) -/* 9B8798 80241E18 86440008 */ lh $a0, 8($s2) -/* 9B879C 80241E1C 8E90000C */ lw $s0, 0xc($s4) -/* 9B87A0 80241E20 0C00EABB */ jal get_npc_unsafe -/* 9B87A4 80241E24 00A0882D */ daddu $s1, $a1, $zero -/* 9B87A8 80241E28 0280202D */ daddu $a0, $s4, $zero -/* 9B87AC 80241E2C 8E050000 */ lw $a1, ($s0) -/* 9B87B0 80241E30 0C0B1EAF */ jal evt_get_variable -/* 9B87B4 80241E34 0040A82D */ daddu $s5, $v0, $zero -/* 9B87B8 80241E38 AFA00010 */ sw $zero, 0x10($sp) -/* 9B87BC 80241E3C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87C0 80241E40 8C630030 */ lw $v1, 0x30($v1) -/* 9B87C4 80241E44 AFA30014 */ sw $v1, 0x14($sp) -/* 9B87C8 80241E48 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87CC 80241E4C 8C63001C */ lw $v1, 0x1c($v1) -/* 9B87D0 80241E50 AFA30018 */ sw $v1, 0x18($sp) -/* 9B87D4 80241E54 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87D8 80241E58 8C630024 */ lw $v1, 0x24($v1) -/* 9B87DC 80241E5C AFA3001C */ sw $v1, 0x1c($sp) -/* 9B87E0 80241E60 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87E4 80241E64 8C630028 */ lw $v1, 0x28($v1) -/* 9B87E8 80241E68 27B30010 */ addiu $s3, $sp, 0x10 -/* 9B87EC 80241E6C AFA30020 */ sw $v1, 0x20($sp) -/* 9B87F0 80241E70 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87F4 80241E74 3C0142F0 */ lui $at, 0x42f0 -/* 9B87F8 80241E78 44810000 */ mtc1 $at, $f0 -/* 9B87FC 80241E7C 8C63002C */ lw $v1, 0x2c($v1) -/* 9B8800 80241E80 0040802D */ daddu $s0, $v0, $zero -/* 9B8804 80241E84 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B8808 80241E88 A7A0002C */ sh $zero, 0x2c($sp) -/* 9B880C 80241E8C 12200006 */ beqz $s1, .L80241EA8 -/* 9B8810 80241E90 AFA30024 */ sw $v1, 0x24($sp) -/* 9B8814 80241E94 02A0202D */ daddu $a0, $s5, $zero -/* 9B8818 80241E98 0240282D */ daddu $a1, $s2, $zero -/* 9B881C 80241E9C 0280302D */ daddu $a2, $s4, $zero -/* 9B8820 80241EA0 0C090733 */ jal trd_07_UnkFunc5 -/* 9B8824 80241EA4 0200382D */ daddu $a3, $s0, $zero -.L80241EA8: -/* 9B8828 80241EA8 2402FFFE */ addiu $v0, $zero, -2 -/* 9B882C 80241EAC A2A200AB */ sb $v0, 0xab($s5) -/* 9B8830 80241EB0 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9B8834 80241EB4 30620004 */ andi $v0, $v1, 4 -/* 9B8838 80241EB8 10400007 */ beqz $v0, .L80241ED8 -/* 9B883C 80241EBC 00000000 */ nop -/* 9B8840 80241EC0 824200B4 */ lb $v0, 0xb4($s2) -/* 9B8844 80241EC4 1440003C */ bnez $v0, .L80241FB8 -/* 9B8848 80241EC8 0000102D */ daddu $v0, $zero, $zero -/* 9B884C 80241ECC 2402FFFB */ addiu $v0, $zero, -5 -/* 9B8850 80241ED0 00621024 */ and $v0, $v1, $v0 -/* 9B8854 80241ED4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241ED8: -/* 9B8858 80241ED8 8E830070 */ lw $v1, 0x70($s4) -/* 9B885C 80241EDC 2C62000F */ sltiu $v0, $v1, 0xf -/* 9B8860 80241EE0 10400034 */ beqz $v0, .L80241FB4_9B8934 -/* 9B8864 80241EE4 00031080 */ sll $v0, $v1, 2 -/* 9B8868 80241EE8 3C018024 */ lui $at, %hi(jtbl_80244898_9BB218) -/* 9B886C 80241EEC 00220821 */ addu $at, $at, $v0 -/* 9B8870 80241EF0 8C224898 */ lw $v0, %lo(jtbl_80244898_9BB218)($at) -/* 9B8874 80241EF4 00400008 */ jr $v0 -/* 9B8878 80241EF8 00000000 */ nop -.L80241EFC_9B887C: -/* 9B887C 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* 9B8880 80241F00 0200282D */ daddu $a1, $s0, $zero -/* 9B8884 80241F04 0C0902B9 */ jal trd_07_UnkNpcAIFunc23 -/* 9B8888 80241F08 0260302D */ daddu $a2, $s3, $zero -.L80241F0C_9B888C: -/* 9B888C 80241F0C 0280202D */ daddu $a0, $s4, $zero -/* 9B8890 80241F10 0200282D */ daddu $a1, $s0, $zero -/* 9B8894 80241F14 0C090325 */ jal trd_07_UnkNpcAIFunc35 -/* 9B8898 80241F18 0260302D */ daddu $a2, $s3, $zero -/* 9B889C 80241F1C 080907EE */ j .L80241FB8 -/* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero -.L80241F24_9B88A4: -/* 9B88A4 80241F24 0280202D */ daddu $a0, $s4, $zero -/* 9B88A8 80241F28 0200282D */ daddu $a1, $s0, $zero -/* 9B88AC 80241F2C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 -/* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero -.L80241F34_9B88B4: -/* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero -/* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero -/* 9B88BC 80241F3C 0C0904DF */ jal trd_07_UnkFunc4 -/* 9B88C0 80241F40 0260302D */ daddu $a2, $s3, $zero -/* 9B88C4 80241F44 080907EE */ j .L80241FB8 -/* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero -.L80241F4C_9B88CC: -/* 9B88CC 80241F4C 0280202D */ daddu $a0, $s4, $zero -/* 9B88D0 80241F50 0200282D */ daddu $a1, $s0, $zero -/* 9B88D4 80241F54 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 -/* 9B88D8 80241F58 0260302D */ daddu $a2, $s3, $zero -.L80241F5C_9B88DC: -/* 9B88DC 80241F5C 0280202D */ daddu $a0, $s4, $zero -/* 9B88E0 80241F60 0200282D */ daddu $a1, $s0, $zero -/* 9B88E4 80241F64 0C0905CE */ jal func_80241738_9B80B8 -/* 9B88E8 80241F68 0260302D */ daddu $a2, $s3, $zero -/* 9B88EC 80241F6C 080907EE */ j .L80241FB8 -/* 9B88F0 80241F70 0000102D */ daddu $v0, $zero, $zero -.L80241F74_9B88F4: -/* 9B88F4 80241F74 0280202D */ daddu $a0, $s4, $zero -/* 9B88F8 80241F78 0200282D */ daddu $a1, $s0, $zero -/* 9B88FC 80241F7C 0C0905E9 */ jal trd_07_UnkNpcAIFunc14 -/* 9B8900 80241F80 0260302D */ daddu $a2, $s3, $zero -/* 9B8904 80241F84 080907EE */ j .L80241FB8 -/* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero -.L80241F8C_9B890C: -/* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero -/* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero -/* 9B8914 80241F94 0C090636 */ jal trd_07_UnkNpcAIFunc3 -/* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero -/* 9B891C 80241F9C 080907EE */ j .L80241FB8 -/* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero -.L80241FA4_9B8924: -/* 9B8924 80241FA4 0280202D */ daddu $a0, $s4, $zero -/* 9B8928 80241FA8 0200282D */ daddu $a1, $s0, $zero -/* 9B892C 80241FAC 0C09064F */ jal trd_07_UnkFunc6 -/* 9B8930 80241FB0 0260302D */ daddu $a2, $s3, $zero -.L80241FB4_9B8934: -/* 9B8934 80241FB4 0000102D */ daddu $v0, $zero, $zero -.L80241FB8: -/* 9B8938 80241FB8 8FBF0048 */ lw $ra, 0x48($sp) -/* 9B893C 80241FBC 8FB50044 */ lw $s5, 0x44($sp) -/* 9B8940 80241FC0 8FB40040 */ lw $s4, 0x40($sp) -/* 9B8944 80241FC4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9B8948 80241FC8 8FB20038 */ lw $s2, 0x38($sp) -/* 9B894C 80241FCC 8FB10034 */ lw $s1, 0x34($sp) -/* 9B8950 80241FD0 8FB00030 */ lw $s0, 0x30($sp) -/* 9B8954 80241FD4 03E00008 */ jr $ra -/* 9B8958 80241FD8 27BD0050 */ addiu $sp, $sp, 0x50 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 index 4583ccd7e9..d85d31268b 100644 --- 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 @@ -98,7 +98,7 @@ glabel func_8024231C_9B8C9C .L80242464_9B8DE4: /* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero /* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero -/* 9B8DEC 8024246C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 +/* 9B8DEC 8024246C 0C0904AF */ jal trd_07_UnkNpcAIFunc1_copy /* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero .L80242474_9B8DF4: /* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero @@ -121,7 +121,7 @@ glabel func_8024231C_9B8C9C .L802424B4_9B8E34: /* 9B8E34 802424B4 0260202D */ daddu $a0, $s3, $zero /* 9B8E38 802424B8 0200282D */ daddu $a1, $s0, $zero -/* 9B8E3C 802424BC 0C0905CE */ jal func_80241738_9B80B8 +/* 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 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 6db7d54940..63adcd42dd 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -4242,6 +4242,7 @@ segments: - [0x6253E0, c] - [0x625750, c] - [0x626A30, data] + - [0x63CE70] - dir: battle/area_sam2 type: code start: 0x63D1E0 @@ -4286,6 +4287,7 @@ segments: - [0x66B5B0, c] - [0x66B920, c] - [0x66BC90, data] + - [0x684750] - dir: battle/area_kpa type: code start: 0x684A30 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index db4ac916d2..5b208b80a8 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -9232,9 +9232,9 @@ func_802426FC_87C2DC = 0x802426FC; // type:func rom:0x87C2DC D_802439F0_87D5D0 = 0x802439F0; // type:data rom:0x87D5D0 D_802439F8_87D5D8 = 0x802439F8; // type:data rom:0x87D5D8 D_80243A08_87D5E8 = 0x80243A08; // type:data rom:0x87D5E8 -D_80243A48_87D628 = 0x80243A48; // type:data rom:0x87D628 +tik_07_bigFuncFloats = 0x80243A48; // type:data rom:0x87D628 D_802449B0_87E590 = 0x802449B0; // type:data rom:0x87E590 -D_80244CB0_87E890 = 0x80244CB0; // type:data rom:0x87E890 +tik_07_sixFloats = 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 @@ -9292,7 +9292,7 @@ tik_10_UnkFunc40 = 0x80241388; // type:func rom:0x887748 D_80242030_8883F0 = 0x80242030; // type:data rom:0x8883F0 D_80242038_8883F8 = 0x80242038; // type:data rom:0x8883F8 D_80242048_888408 = 0x80242048; // type:data rom:0x888408 -D_80242088_888448 = 0x80242088; // type:data rom:0x888448 +tik_10_bigFuncFloats = 0x80242088; // type:data rom:0x888448 tik_12_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x888BD0 tik_12_GetCurrentFloor = 0x80240020; // type:func rom:0x888BF0 tik_12_UnkFunc25 = 0x80240034; // type:func rom:0x888C04 @@ -9336,7 +9336,7 @@ D_80243C40_88C810 = 0x80243C40; // type:data rom:0x88C810 D_80243CAC_88C87C = 0x80243CAC; // type:data rom:0x88C87C D_80243CB4_88C884 = 0x80243CB4; // type:data rom:0x88C884 D_80243CC4_88C894 = 0x80243CC4; // type:data rom:0x88C894 -D_80243D04_88C8D4 = 0x80243D04; // type:data rom:0x88C8D4 +tik_12_bigFuncFloats = 0x80243D04; // type:data rom:0x88C8D4 D_802449D0_88D5A0 = 0x802449D0; // type:data rom:0x88D5A0 tik_14_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x88D600 tik_14_GetCurrentFloor = 0x80240020; // type:func rom:0x88D620 @@ -9393,7 +9393,7 @@ tik_17_UnkTexturePanFunc2 = 0x80241174; // type:func rom:0x893B94 D_80241420_893E40 = 0x80241420; // type:data rom:0x893E40 D_80241428_893E48 = 0x80241428; // type:data rom:0x893E48 D_80241438_893E58 = 0x80241438; // type:data rom:0x893E58 -D_80241478_893E98 = 0x80241478; // type:data rom:0x893E98 +tik_17_bigFuncFloats = 0x80241478; // type:data rom:0x893E98 tik_18_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8956E0 tik_18_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x895804 tik_18_UnkPosFunc2 = 0x80240310; // type:func rom:0x8959F0 @@ -9427,7 +9427,7 @@ tik_19_UnkFunc40 = 0x802412F8; // type:func rom:0x8988D8 D_802426B0_899C90 = 0x802426B0; // type:data rom:0x899C90 D_802426B8_899C98 = 0x802426B8; // type:data rom:0x899C98 D_802426C8_899CA8 = 0x802426C8; // type:data rom:0x899CA8 -D_80242708_899CE8 = 0x80242708; // type:data rom:0x899CE8 +tik_19_bigFuncFloats = 0x80242708; // type:data rom:0x899CE8 tik_20_UnkTexturePanFunc = 0x80240000; // type:func rom:0x89A350 tik_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x89A474 tik_20_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x89A65C @@ -9703,7 +9703,7 @@ func_8024130C_8CF37C = 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 -D_80241B2C_8CFB9C = 0x80241B2C; // type:data rom:0x8CFB9C +kmr_05_sixFloats = 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 @@ -9726,7 +9726,7 @@ 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 -D_802420BC_8D35CC = 0x802420BC; // type:data rom:0x8D35CC +kmr_06_sixFloats = 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 @@ -9756,7 +9756,7 @@ kmr_09_UnkFunc6 = 0x80240E58; // type:func rom:0x8D6C58 kmr_09_UnkFunc5 = 0x802411E8; // type:func rom:0x8D6FE8 func_8024130C_8D710C = 0x8024130C; // type:func rom:0x8D710C func_802414F8_8D72F8 = 0x802414F8; // type:func rom:0x8D72F8 -D_8024186C_8D766C = 0x8024186C; // type:data rom:0x8D766C +kmr_09_sixFloats = 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 @@ -10126,7 +10126,7 @@ D_80241DD0_920340 = 0x80241DD0; // type:data rom:0x920340 D_80245A60_923FD0 = 0x80245A60; // type:data rom:0x923FD0 D_80245A68_923FD8 = 0x80245A68; // type:data rom:0x923FD8 D_80245A78_923FE8 = 0x80245A78; // type:data rom:0x923FE8 -D_80245AB8_924028 = 0x80245AB8; // type:data rom:0x924028 +iwa_10_bigFuncFloats = 0x80245AB8; // type:data rom:0x924028 D_8024626C_9247DC = 0x8024626C; // type:data rom:0x9247DC D_80246270_9247E0 = 0x80246270; // type:data rom:0x9247E0 D_80248470_9269E0 = 0x80248470; // type:data rom:0x9269E0 @@ -10346,7 +10346,7 @@ sbk_56_TransformFoliage = 0x80240E30; // type:func rom:0x954DF0 D_80241430_9553F0 = 0x80241430; // type:data rom:0x9553F0 D_80241438_9553F8 = 0x80241438; // type:data rom:0x9553F8 D_80241448_955408 = 0x80241448; // type:data rom:0x955408 -D_80241488_955448 = 0x80241488; // type:data rom:0x955448 +sbk_56_bigFuncFloats = 0x80241488; // type:data rom:0x955448 sbk_60_SpawnSunEffect = 0x80240000; // type:func rom:0x9569F0 sbk_60_SetNpcB5_3 = 0x80240040; // type:func rom:0x956A30 sbk_61_SpawnSunEffect = 0x80240000; // type:func rom:0x956F90 @@ -10877,7 +10877,7 @@ func_80240D38_989898 = 0x80240D38; // type:func rom:0x989898 D_80241100_989C60 = 0x80241100; // type:data rom:0x989C60 D_80241108_989C68 = 0x80241108; // type:data rom:0x989C68 D_80241118_989C78 = 0x80241118; // type:data rom:0x989C78 -D_80241158_989CB8 = 0x80241158; // type:data rom:0x989CB8 +isk_10_bigFuncFloats = 0x80241158; // type:data rom:0x989CB8 D_80241EA0_98AA00 = 0x80241EA0; // type:data rom:0x98AA00 D_80241EA8_98AA08 = 0x80241EA8; // type:data rom:0x98AA08 func_80240000_98AA10 = 0x80240000; // type:func rom:0x98AA10 @@ -11048,7 +11048,7 @@ 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 -D_802456F4_9ADAE4 = 0x802456F4; // type:data rom:0x9ADAE4 +trd_04_sixFloats = 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 @@ -11105,7 +11105,7 @@ func_8024231C_9B8C9C = 0x8024231C; // type:func rom:0x9B8C9C func_8024256C_9B8EEC = 0x8024256C; // type:func rom:0x9B8EEC func_80242600_9B8F80 = 0x80242600; // type:func rom:0x9B8F80 func_802427FC_9B917C = 0x802427FC; // type:func rom:0x9B917C -D_80242EAC_9B982C = 0x80242EAC; // type:data rom:0x9B982C +trd_07_sixFloats = 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 @@ -11370,7 +11370,7 @@ 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 -D_80242888_9F72C8 = 0x80242888; // type:data rom:0x9F72C8 +nok_11_sixFloats = 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 @@ -11444,7 +11444,7 @@ 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 -D_80243A18_A06258 = 0x80243A18; // type:data rom:0xA06258 +nok_14_sixFloats = 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 @@ -11478,7 +11478,7 @@ nok_15_UnkDurationCheck = 0x802422A8; // type:func rom:0xA091A8 func_802422EC_A091EC = 0x802422EC; // type:func rom:0xA091EC nok_15_foliage_setup_shear_mtx = 0x80242540; // type:func rom:0xA09440 nok_15_TransformFoliage = 0x802425B0; // type:func rom:0xA094B0 -D_80243D5C_A0AC5C = 0x80243D5C; // type:data rom:0xA0AC5C +nok_15_sixFloats = 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 @@ -11560,7 +11560,7 @@ 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 -D_80244490_A1A6B0 = 0x80244490; // type:data rom:0xA1A6B0 +hos_02_sixFloats = 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 @@ -11638,7 +11638,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 -D_802457F4_A208F4 = 0x802457F4; // type:data rom:0xA208F4 +hos_03_sixFloats = 0x802457F4; // type:data rom:0xA208F4 D_8024801C_A2311C = 0x8024801C; // type:data rom:0xA2311C D_80248080_A23180 = 0x80248080; // type:data rom:0xA23180 D_802480C0_A231C0 = 0x802480C0; // type:data rom:0xA231C0 @@ -13065,7 +13065,7 @@ dup_jan_08_TransformFoliage = 0x80242260; // type:func rom:0xB60510 D_80243E00_B620B0 = 0x80243E00; // type:data rom:0xB620B0 D_80243E08_B620B8 = 0x80243E08; // type:data rom:0xB620B8 D_80243E18_B620C8 = 0x80243E18; // type:data rom:0xB620C8 -D_80243E58_B62108 = 0x80243E58; // type:data rom:0xB62108 +jan_08_bigFuncFloats = 0x80243E58; // type:data rom:0xB62108 D_802474B0_B65760 = 0x802474B0; // type:data rom:0xB65760 D_802474D8_B65788 = 0x802474D8; // type:data rom:0xB65788 jan_09_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0xB65AB0 @@ -13374,7 +13374,7 @@ 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 -D_802443C0_BB1D00 = 0x802443C0; // type:data rom:0xBB1D00 +mim_08_sixFloats = 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 @@ -13860,7 +13860,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_D_80243BC0_BF09B0 = 0x80243BC0; // type:data rom:0xBF09B0 +arn_07_sixFloats = 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 @@ -14157,7 +14157,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_D_80244CD0_C02550 = 0x80244CD0; // type:data rom:0xC02550 +dgb_01_sixFloats = 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 @@ -14988,7 +14988,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_D_80243560_C39A90 = 0x80243560; // type:data rom:0xC39A90 +dgb_04_sixFloats = 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 @@ -15000,7 +15000,7 @@ dgb_04_npcGroupList_80243D18 = 0x80243D18; // type:data rom:0xC3A248 dgb_04_D_80243D30_C3A260 = 0x80243D30; // type:data rom:0xC3A260 dgb_04_D_80243D38_C3A268 = 0x80243D38; // type:data rom:0xC3A268 dgb_04_D_80243D48_C3A278 = 0x80243D48; // type:data rom:0xC3A278 -dgb_04_D_80243D88_C3A2B8 = 0x80243D88; // type:data rom:0xC3A2B8 +dgb_04_bigFuncFloats = 0x80243D88; // type:data rom:0xC3A2B8 dgb_04_80243D94 = 0x80243D94; // type:data rom:0xC3A2C4 dgb_04_80243EF8 = 0x80243EF8; // type:data rom:0xC3A428 dgb_04_makeEntities = 0x80244378; // type:data rom:0xC3A8A8 @@ -15169,7 +15169,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_D_80244460_C44210 = 0x80244460; // type:data rom:0xC44210 +dgb_08_sixFloats = 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 @@ -15273,7 +15273,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_D_80244358_C4AF38 = 0x80244358; // type:data rom:0xC4AF38 +dgb_09_sixFloats = 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 @@ -15555,7 +15555,7 @@ kzn_02_UnkYawFunc = 0x80242528; // type:func rom:0xC5CC68 func_802426B4_C5CDF4 = 0x802426B4; // type:func rom:0xC5CDF4 func_802426F8_C5CE38 = 0x802426F8; // type:func rom:0xC5CE38 func_80242730_C5CE70 = 0x80242730; // type:func rom:0xC5CE70 -D_80244900_C5F040 = 0x80244900; // type:data rom:0xC5F040 +kzn_02_sixFloats = 0x80244900; // type:data rom:0xC5F040 D_80244A10_C5F150 = 0x80244A10; // type:data rom:0xC5F150 D_80244A74_C5F1B4 = 0x80244A74; // type:data rom:0xC5F1B4 D_80244A78_C5F1B8 = 0x80244A78; // type:data rom:0xC5F1B8 @@ -15644,7 +15644,7 @@ func_80241644_C69774 = 0x80241644; // type:func rom:0xC69774 D_80241C40_C69D70 = 0x80241C40; // type:data rom:0xC69D70 D_80241C48_C69D78 = 0x80241C48; // type:data rom:0xC69D78 D_80241C58_C69D88 = 0x80241C58; // type:data rom:0xC69D88 -D_80241C98_C69DC8 = 0x80241C98; // type:data rom:0xC69DC8 +kzn_04_bigFuncFloats = 0x80241C98; // type:data rom:0xC69DC8 D_802422F0_C6A420 = 0x802422F0; // type:data rom:0xC6A420 D_8024231C_C6A44C = 0x8024231C; // type:data rom:0xC6A44C kzn_05_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC6C0D0 @@ -15682,7 +15682,7 @@ kzn_07_UnkFunc45 = 0x802420C8; // type:func rom:0xC703F8 func_80242124_C70454 = 0x80242124; // type:func rom:0xC70454 D_802423E0_C70710 = 0x802423E0; // type:data rom:0xC70710 D_80242930_C70C60 = 0x80242930; // type:data rom:0xC70C60 -D_80242B90_C70EC0 = 0x80242B90; // type:data rom:0xC70EC0 +kzn_07_sixFloats = 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 @@ -15730,7 +15730,7 @@ func_80243C90_C75110 = 0x80243C90; // type:func rom:0xC75110 func_80243EE0_C75360 = 0x80243EE0; // type:func rom:0xC75360 D_80244170_C755F0 = 0x80244170; // type:data rom:0xC755F0 D_80244BB0_C76030 = 0x80244BB0; // type:data rom:0xC76030 -D_80244DA0_C76220 = 0x80244DA0; // type:data rom:0xC76220 +kzn_08_sixFloats = 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 @@ -15802,7 +15802,7 @@ func_802439D8_C7A6B8 = 0x802439D8; // type:func rom:0xC7A6B8 D_80243D00_C7A9E0 = 0x80243D00; // type:data rom:0xC7A9E0 D_80243D08_C7A9E8 = 0x80243D08; // type:data rom:0xC7A9E8 D_80243D18_C7A9F8 = 0x80243D18; // type:data rom:0xC7A9F8 -D_80243D58_C7AA38 = 0x80243D58; // type:data rom:0xC7AA38 +kzn_09_bigFuncFloats = 0x80243D58; // type:data rom:0xC7AA38 D_80245250_C7BF30 = 0x80245250; // type:data rom:0xC7BF30 D_802452B4_C7BF94 = 0x802452B4; // type:data rom:0xC7BF94 D_802452B8_C7BF98 = 0x802452B8; // type:data rom:0xC7BF98 @@ -15850,7 +15850,7 @@ kzn_11_UnkFunc45 = 0x80241D08; // type:func rom:0xC81EA8 func_80241D64_C81F04 = 0x80241D64; // type:func rom:0xC81F04 func_80241F4C_C820EC = 0x80241F4C; // type:func rom:0xC820EC func_80242540_C826E0 = 0x80242540; // type:func rom:0xC826E0 -D_802436D0_C83870 = 0x802436D0; // type:data rom:0xC83870 +kzn_11_sixFloats = 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 @@ -16228,7 +16228,7 @@ flo_08_80241F40 = 0x80241F40; // type:data rom:0xCB0C80 flo_08_D_80241FB0_CB0CF0 = 0x80241FB0; // type:data rom:0xCB0CF0 flo_08_D_80241FB8_CB0CF8 = 0x80241FB8; // type:data rom:0xCB0CF8 flo_08_D_80241FC8_CB0D08 = 0x80241FC8; // type:data rom:0xCB0D08 -flo_08_D_80242008_CB0D48 = 0x80242008; // type:data rom:0xCB0D48 +flo_08_bigFuncFloats = 0x80242008; // type:data rom:0xCB0D48 flo_08_80242014 = 0x80242014; // type:data rom:0xCB0D54 flo_08_80242178 = 0x80242178; // type:data rom:0xCB0EB8 flo_08_makeEntities = 0x802425F8; // type:data rom:0xCB1338 @@ -16322,7 +16322,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_D_8024362C_CB862C = 0x8024362C; // type:data rom:0xCB862C +flo_09_sixFloats = 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 @@ -16526,7 +16526,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_D_8024412C_CC793C = 0x8024412C; // type:data rom:0xCC793C +flo_13_sixFloats = 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 @@ -16617,7 +16617,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_D_802444C0_CCF7D0 = 0x802444C0; // type:data rom:0xCCF7D0 +flo_14_sixFloats = 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 @@ -16716,14 +16716,14 @@ flo_16_8024346C = 0x8024346C; // type:data rom:0xCD529C flo_16_D_80243700_CD5530 = 0x80243700; // type:data rom:0xCD5530 flo_16_D_80243708_CD5538 = 0x80243708; // type:data rom:0xCD5538 flo_16_D_80243718_CD5548 = 0x80243718; // type:data rom:0xCD5548 -flo_16_D_80243758_CD5588 = 0x80243758; // type:data rom:0xCD5588 +flo_16_bigFuncFloats = 0x80243758; // type:data rom:0xCD5588 flo_16_80243764 = 0x80243764; // type:data rom:0xCD5594 flo_16_802438C8 = 0x802438C8; // type:data rom:0xCD56F8 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_D_80244010_CD5E40 = 0x80244010; // type:data rom:0xCD5E40 +flo_16_sixFloats = 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 @@ -16773,7 +16773,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_D_8024440C_CDB6EC = 0x8024440C; // type:data rom:0xCDB6EC +flo_17_sixFloats = 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 @@ -17090,7 +17090,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_D_8024291C_CF54EC = 0x8024291C; // type:data rom:0xCF54EC +flo_25_sixFloats = 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 @@ -17311,7 +17311,7 @@ sam_06_UnkYawFunc = 0x8024233C; // type:func rom:0xD221CC func_802424C8_D22358 = 0x802424C8; // type:func rom:0xD22358 func_8024250C_D2239C = 0x8024250C; // type:func rom:0xD2239C func_80242538_D223C8 = 0x80242538; // type:func rom:0xD223C8 -D_802441B8_D24048 = 0x802441B8; // type:data rom:0xD24048 +sam_06_sixFloats = 0x802441B8; // type:data rom:0xD24048 D_802443D0_D24260 = 0x802443D0; // type:data rom:0xD24260 D_80244434_D242C4 = 0x80244434; // type:data rom:0xD242C4 D_80244438_D242C8 = 0x80244438; // type:data rom:0xD242C8 @@ -17377,7 +17377,7 @@ func_8024174C_D313CC = 0x8024174C; // type:func rom:0xD313CC D_80241AE0_D31760 = 0x80241AE0; // type:data rom:0xD31760 D_80241AE8_D31768 = 0x80241AE8; // type:data rom:0xD31768 D_80241AF8_D31778 = 0x80241AF8; // type:data rom:0xD31778 -D_80241B38_D317B8 = 0x80241B38; // type:data rom:0xD317B8 +sam_08_bigFuncFloats = 0x80241B38; // type:data rom:0xD317B8 D_802464D0_D36150 = 0x802464D0; // type:data rom:0xD36150 func_80240000_D362F0 = 0x80240000; // type:func rom:0xD362F0 sam_09_GetItemName = 0x802400B4; // type:func rom:0xD363A4 @@ -18080,7 +18080,7 @@ D_80247878_DA4D48 = 0x80247878; // type:data rom:0xDA4D48 D_80247A10_DA4EE0 = 0x80247A10; // type:data rom:0xDA4EE0 D_80247A18_DA4EE8 = 0x80247A18; // type:data rom:0xDA4EE8 D_80247A20_DA4EF0 = 0x80247A20; // type:data rom:0xDA4EF0 -D_80247BB8_DA5088 = 0x80247BB8; // type:data rom:0xDA5088 +D_80247BB8_pra_19 = 0x80247BB8; // type:data rom:0xDA5088 D_80247BC0_DA5090 = 0x80247BC0; // type:data rom:0xDA5090 D_80247BC8_DA5098 = 0x80247BC8; // type:data rom:0xDA5098 D_80247BD0_DA50A0 = 0x80247BD0; // type:data rom:0xDA50A0 @@ -18123,7 +18123,7 @@ omo_04_SetCamera0Flag1000 = 0x80241E04; // type:func rom:0xDAF204 omo_04_UnsetCamera0Flag1000 = 0x80241E20; // type:func rom:0xDAF220 func_80241E40_DAF240 = 0x80241E40; // type:func rom:0xDAF240 D_80242630_DAFA30 = 0x80242630; // type:data rom:0xDAFA30 -D_80242EF0_DB02F0 = 0x80242EF0; // type:data rom:0xDB02F0 +omo_04_sixFloats = 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 @@ -18156,7 +18156,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 -D_80242F88_DB5248 = 0x80242F88; // type:data rom:0xDB5248 +omo_05_sixFloats = 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 @@ -18225,7 +18225,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 -D_80243A14_DC0CC4 = 0x80243A14; // type:data rom:0xDC0CC4 +omo_07_sixFloats = 0x80243A14; // type:data rom:0xDC0CC4 D_80245E00_DC30B0 = 0x80245E00; // type:data rom:0xDC30B0 D_80246BD0_DC3E80 = 0x80246BD0; // type:data rom:0xDC3E80 D_80246BD8_DC3E88 = 0x80246BD8; // type:data rom:0xDC3E88 @@ -18341,7 +18341,7 @@ omo_11_UnkFunc20 = 0x80240C10; // type:func rom:0xDDD440 omo_11_UnkFunc39 = 0x80240CA0; // type:func rom:0xDDD4D0 omo_11_UnkFunc21 = 0x80240CD4; // type:func rom:0xDDD504 omo_11_UnkFunc22 = 0x80240D38; // type:func rom:0xDDD568 -func_80240D90_DDD5C0 = 0x80240D90; // type:func rom:0xDDD5C0 +omo_11_bigFuncFloats = 0x80240D90; // type:func rom:0xDDD5C0 omo_11_UnkFunc23 = 0x802412C8; // type:func rom:0xDDDAF8 omo_11_UnkPartnerPosFunc = 0x80241408; // type:func rom:0xDDDC38 omo_11_UnkPartnerPosFunc2 = 0x80241450; // type:func rom:0xDDDC80 @@ -18352,7 +18352,7 @@ D_80241778_DDDFA8 = 0x80241778; // type:data rom:0xDDDFA8 D_80241E40_DDE670 = 0x80241E40; // type:data rom:0xDDE670 D_80241E48_DDE678 = 0x80241E48; // type:data rom:0xDDE678 D_80241E58_DDE688 = 0x80241E58; // type:data rom:0xDDE688 -D_80241E98_DDE6C8 = 0x80241E98; // type:data rom:0xDDE6C8 +omo_11_bigFuncFloats = 0x80241E98; // type:data rom:0xDDE6C8 omo_12_UnkFunc41 = 0x80240000; // type:func rom:0xDDF310 func_80240184_DDF494 = 0x80240184; // type:func rom:0xDDF494 omo_12_SetCamera0Flag1000 = 0x802402DC; // type:func rom:0xDDF5EC @@ -18446,7 +18446,7 @@ func_80242F44_DF1DE4 = 0x80242F44; // type:func rom:0xDF1DE4 func_802433A0_DF2240 = 0x802433A0; // type:func rom:0xDF2240 omo_17_SetNpcB5_3 = 0x802436C0; // type:func rom:0xDF2560 omo_17_GetEncounterEnemyIsOwner = 0x802436D4; // type:func rom:0xDF2574 -D_80246184_DF5024 = 0x80246184; // type:data rom:0xDF5024 +omo_17_sixFloats = 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 @@ -19101,7 +19101,7 @@ ECBB70_UnkFunc43 = 0x80241E70; // type:func rom:0xECBB70 D_80241FE0_ECBCE0 = 0x80241FE0; // type:data rom:0xECBCE0 D_80241FE8_ECBCE8 = 0x80241FE8; // type:data rom:0xECBCE8 D_80241FF8_ECBCF8 = 0x80241FF8; // type:data rom:0xECBCF8 -D_80242038_ECBD38 = 0x80242038; // type:data rom:0xECBD38 +EC9D00_bigFuncFloats = 0x80242038; // type:data rom:0xECBD38 D_802430B8_ECCDB8 = 0x802430B8; // type:data rom:0xECCDB8 D_802430BC_ECCDBC = 0x802430BC; // type:data rom:0xECCDBC ECFFF0_DeadUnkFunc1 = 0x80240000; // type:func rom:0xECFFF0 @@ -19119,7 +19119,7 @@ ED0310_UnkNpcAIFunc3 = 0x80241114; // type:func rom:0xED1104 ED0310_UnkFunc6 = 0x80241178; // type:func rom:0xED1168 ED0310_UnkFunc5 = 0x80241508; // type:func rom:0xED14F8 func_8024162C_ED161C = 0x8024162C; // type:func rom:0xED161C -D_8024365C_ED364C = 0x8024365C; // type:data rom:0xED364C +sixFloats = 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 @@ -19185,7 +19185,7 @@ 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 -D_802441DC_EE2B9C = 0x802441DC; // type:data rom:0xEE2B9C +sixFloats = 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 @@ -19222,7 +19222,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 -D_802444F0_EEAAA0 = 0x802444F0; // type:data rom:0xEEAAA0 +N(sixFloats) = 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 @@ -19275,8 +19275,8 @@ func_802429A0_EEFAA0 = 0x802429A0; // type:func rom:0xEEFAA0 D_80243760_EF0860 = 0x80243760; // type:data rom:0xEF0860 D_80243768_EF0868 = 0x80243768; // type:data rom:0xEF0868 D_80243778_EF0878 = 0x80243778; // type:data rom:0xEF0878 -D_802437B8_EF08B8 = 0x802437B8; // type:data rom:0xEF08B8 -D_80244070_EF1170 = 0x80244070; // type:data rom:0xEF1170 +EED1E0_bigFuncFloats = 0x802437B8; // type:data rom:0xEF08B8 +N(sixFloats) = 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 @@ -19304,7 +19304,7 @@ 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 func_8024299C_EF4FAC = 0x8024299C; // type:func rom:0xEF4FAC -D_802444BC_EF6ACC = 0x802444BC; // type:data rom:0xEF6ACC +N(sixFloats) = 0x802444BC; // type:data rom:0xEF6ACC D_802453B0_EF79C0 = 0x802453B0; // type:data rom:0xEF79C0 D_802453B8_EF79C8 = 0x802453B8; // type:data rom:0xEF79C8 D_802453C0_EF79D0 = 0x802453C0; // type:data rom:0xEF79D0 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index a698b9f020..ce41f7c730 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -267,9 +267,11 @@ func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; dead_get_npc_safe = 0x8003E534; dead_heap_malloc = 0x8002BFD4; +dead_general_heap_malloc = 0x8002BF18; func_8002C01C = 0x8002C01C; dead_sin_deg = 0x8002B5DC; dead_cos_deg = 0x8002B640; +dead_sin_cos_deg = 0x8002B524; dead_subtract_hp = 0x800F1EF8; dead_sfx_adjust_env_sound_pos = 0x8015704C; dead_fx_star_spirits_energy = 0x80077C30; @@ -336,6 +338,7 @@ dead_gPartnerActionStatus2 = 0x80117160; dead_gPlayerData = 0x80117840; dead_gCollisionStatus = 0x80169B12; dead_gOverrideFlags = 0x800A15A8; +dead_fx_motion_blur_flame = 0x80076970; D_800A1530 = 0x800A1530; D_800A15A4 = 0x800A15A4; D_800A15C4 = 0x800A15C4; @@ -366,6 +369,7 @@ D_80246568_C8C018 = 0x80246568; D_8024B9A8_B8FB28 = 0x8024B9A8; sam_02_8024B9B0 = 0x8024B9B0; sbk_34_802427E0 = 0x802427E0; +pra_13_802438E8 = 0x802438E8; D_8038F800 = 0x8038F800; D_803B5000 = 0x803B5000; D_802EF0D0 = 0x802EF0D0; @@ -1185,5 +1189,10 @@ gSpriteHeapPtr = 0x8034F800; heap_battleHead = 0x803DA800; D_80248380_kzn_19 = 0x80248380; D_8024854C_kzn_19 = 0x8024854C; +D_80247BB8_pra_19 = 0x80247BB8; +D_802312E0_battle_area_omo2 = 0x802312E0; +D_802312F8_battle_area_omo2 = 0x802312F8; +some_80241FBC = 0x80241FBC; +D_80246558_kkj_19 = 0x80246558; D_80077A40 = 0x80077A40;