From b198250cde30a26dd0c979af4e2d4434de66ec03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Fa=C3=9Fbender?= <31699028+Brotenko@users.noreply.github.com> Date: Sun, 29 Aug 2021 18:51:56 +0200 Subject: [PATCH] Rename every function that is a part of evt_funcs.h to have the evt_ prefix (#408) * rename every function that is part of evt_funcs.h to have the evtt_ prefix. * remove old .s files * fix symbol_addrs error * add evt_ 'prefix' to the dead functions in dead-h --- include/dead.h | 8 +- include/evt.h | 2 +- include/evt_funcs.h | 226 ++++++++ include/functions.h | 10 +- include/si_funcs.h | 18 +- src/111f0_len_860.c | 2 +- src/1776B0.c | 64 +- src/17D6A0.c | 2 +- src/17FEB0.c | 20 +- src/181810.c | 70 +-- src/18F340.c | 34 +- src/196AA0.c | 40 +- src/197F40.c | 548 +++++++++--------- src/19FAF0.c | 16 +- src/1A5830.c | 194 +++---- src/1AC760.c | 20 +- src/1AF120.c | 8 +- src/1a1f0_len_5390.c | 12 +- src/3251D0.c | 28 +- src/7fd10_len_b40.c | 2 +- src/80850_len_3060.c | 2 +- src/EA6FD0.c | 2 +- src/EF2650.c | 2 +- src/a5dd0_len_114e0.c | 6 +- src/battle/action_cmd/air_lift.c | 2 +- src/battle/action_cmd/flee.c | 8 +- src/battle/action_cmd/hammer.c | 6 +- src/battle/action_cmd/jump.c | 4 +- src/battle/action_cmd/power_shock.c | 8 +- src/battle/action_cmd/squirt.c | 6 +- src/battle/action_cmd/stop_leech.c | 6 +- src/battle/action_cmd/tidal_wave.c | 6 +- src/battle/action_cmd/water_block.c | 6 +- src/battle/action_cmd/whirlwind.c | 2 +- src/battle/area_arn/4FF010.c | 2 +- src/battle/area_flo/5B14B0.c | 12 +- src/battle/area_iwa/4D01F0.c | 2 +- .../area_kmr_part_1/actor/anglestuff.inc.c | 14 +- src/battle/area_kmr_part_2/439A90.c | 6 +- src/battle/area_kmr_part_3/447D50.c | 6 +- src/battle/area_omo/512E50.c | 4 +- src/battle/battle.c | 2 +- src/battle/item/dried_shroom.c | 8 +- src/battle/item/egg_missile.c | 6 +- src/battle/item/electro_pop.c | 18 +- src/battle/item/fire_flower.c | 6 +- src/battle/item/food.c | 26 +- src/battle/item/insecticide_herb.c | 6 +- src/battle/item/life_shroom.c | 18 +- src/battle/item/mushroom.c | 26 +- src/battle/item/mystery.c | 6 +- src/battle/item/shooting_star.c | 6 +- src/battle/item/snowman_doll.c | 6 +- src/battle/item/strange_cake.c | 16 +- src/battle/item/super_soda.c | 18 +- src/battle/item/tasty_tonic.c | 2 +- src/battle/item/ultra_shroom.c | 8 +- src/battle/item/unknown_item.c | 8 +- src/battle/move/d_down_jump/781920.c | 6 +- src/battle/move/d_down_pound/74AD90.c | 6 +- src/battle/move/hammer_charge_0/74F130.c | 14 +- src/battle/move/hammer_charge_1/7595B0.c | 6 +- src/battle/move/hammer_charge_2/75E5D0.c | 6 +- src/battle/move/jump_charge_0/74D570.c | 14 +- src/battle/move/jump_charge_1/75C980.c | 6 +- src/battle/move/jump_charge_2/761920.c | 6 +- src/battle/partner/bombette.c | 12 +- src/battle/partner/bow.c | 4 +- src/battle/partner/goombario.c | 8 +- src/battle/partner/sushie.c | 6 +- src/battle/partner/watt.c | 20 +- src/battle/star/refresh/78B600.c | 16 +- src/battle/star/smooch/791D90.c | 8 +- src/battle/star/star_storm/78E7D0.c | 6 +- src/common/AddFP.inc.c | 2 +- src/common/AddHP.inc.c | 2 +- src/common/BattleAreaAngleStuff.inc.c | 14 +- src/common/DeadUnkFloatFunc.inc.c | 16 +- src/common/DeadUnkFloatFuncAbs.inc.c | 16 +- src/common/Dist3D.inc.c | 14 +- src/common/FreeIcon.inc.c | 2 +- src/common/GetBootsHammerLevel.inc.c | 4 +- src/common/GetItemEntityPosition.inc.c | 8 +- src/common/GetJumpHammerCharge.inc.c | 4 +- src/common/GetLastEventType.inc.c | 2 +- src/common/GetSelectedMoveID.inc.c | 2 +- src/common/IsSaveVar123.inc.c | 2 +- src/common/MashActionCommandInit.inc.c | 8 +- src/common/MediGuySpriteRotationFunc.inc.c | 10 +- src/common/SetBackgroundAlpha.inc.c | 2 +- src/common/ShrinkActor.inc.c | 14 +- src/common/StarPower.inc.c | 24 +- src/common/StartRumbleWithParams.inc.c | 2 +- src/common/UnkAngleFunc2.inc.c | 10 +- src/common/UnkBattleFunc1.inc.c | 8 +- src/common/UnkBattleFunc2.inc.c | 16 +- src/common/UnkBattleFunc5.inc.c | 6 +- src/common/UnkFloatFunc.inc.c | 16 +- src/common/UnkFloatFunc2.inc.c | 8 +- src/common/UnkStarFunc.inc.c | 2 +- src/dc470_len_14c0.c | 2 +- src/encounter_api.c | 110 ++-- src/evt/cam_api.c | 272 ++++----- src/evt/demo_api.c | 18 +- src/evt/evt.c | 306 +++++----- src/evt/f8f60_len_1560.c | 108 ++-- src/evt/fa4c0_len_3bf0.c | 176 +++--- src/evt/fx_api.c | 120 ++-- src/evt/map_api.c | 190 +++--- src/evt/msg_api.c | 28 +- src/evt/npc_api.c | 228 ++++---- src/evt/player_api.c | 262 ++++----- src/evt/script_list.c | 2 +- src/fio.c | 16 +- src/state_demo.c | 4 +- src/world/area_arn/arn_02/events.c | 4 +- src/world/area_arn/arn_03/events.c | 10 +- src/world/area_arn/arn_04/events.c | 8 +- src/world/area_arn/arn_05/events.c | 4 +- src/world/area_arn/arn_07/BECDF0.c | 34 +- src/world/area_arn/arn_07/BED5F0.c | 4 +- src/world/area_arn/arn_07/events.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 6 +- src/world/area_dgb/dgb_02/C2EBA0.c | 4 +- src/world/area_dgb/dgb_03/C31730.c | 8 +- src/world/area_dgb/dgb_04/C36530.c | 12 +- src/world/area_dgb/dgb_05/C3AA10.c | 4 +- src/world/area_dgb/dgb_07/C3DBF0.c | 4 +- src/world/area_dgb/dgb_08/C3FDB0.c | 8 +- src/world/area_dgb/dgb_09/C46BE0.c | 8 +- src/world/area_dgb/dgb_11/C4D3E0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 4 +- src/world/area_dgb/dgb_16/C52540.c | 4 +- src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 58 +- src/world/area_dro/dro_02/9694C0.c | 118 ++-- src/world/area_end/end_00/DF6A20.c | 12 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_flo/flo_00/C9EE30.c | 12 +- src/world/area_flo/flo_08/CAED40.c | 4 +- src/world/area_flo/flo_08/CAFAC0.c | 18 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_10/CB9200.c | 2 +- src/world/area_flo/flo_12/CC0E70.c | 6 +- src/world/area_flo/flo_13/CC3850.c | 10 +- src/world/area_flo/flo_14/CCB310.c | 12 +- src/world/area_flo/flo_14/CCBE20.c | 8 +- src/world/area_flo/flo_14/CCD670.c | 2 +- src/world/area_flo/flo_16/CD1F10.c | 4 +- src/world/area_flo/flo_16/CD2C80.c | 4 +- src/world/area_flo/flo_17/CD7320.c | 2 +- src/world/area_flo/flo_17/CD7350.c | 8 +- src/world/area_flo/flo_19/CE36F0.c | 28 +- src/world/area_flo/flo_21/CE6700.c | 34 +- src/world/area_flo/flo_23/CEE2A0.c | 18 +- src/world/area_flo/flo_25/CF2C10.c | 20 +- src/world/area_hos/hos_02/A17210.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 36 +- src/world/area_hos/hos_04/A27AA0.c | 2 +- src/world/area_hos/hos_05/A2EC30.c | 2 +- src/world/area_hos/hos_06/A397F0.c | 6 +- src/world/area_hos/hos_06/A3A230.c | 6 +- src/world/area_isk/isk_10/988B60.c | 4 +- src/world/area_isk/isk_16/9951F0.c | 34 +- src/world/area_iwa/iwa_10/91E6D0.c | 4 +- src/world/area_iwa/iwa_10/91F5A0.c | 6 +- src/world/area_jan/jan_00/B20540.c | 6 +- src/world/area_jan/jan_02/B2C8A0.c | 42 +- src/world/area_jan/jan_03/B34BD0.c | 44 +- src/world/area_jan/jan_06/B52B40.c | 6 +- src/world/area_jan/jan_08/B5E910.c | 4 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kkj/kkj_18/AF2FE0.c | 8 +- src/world/area_kkj/kkj_19/AF7C00.c | 8 +- src/world/area_kmr/kmr_00/8ABF90.c | 14 +- src/world/area_kmr/kmr_02/8B0070.c | 40 +- src/world/area_kmr/kmr_06/8D2A10.c | 12 +- src/world/area_kmr/kmr_07/8D3DC0.c | 4 +- src/world/area_kmr/kmr_09/8D5E00.c | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 2 +- src/world/area_kpa/kpa_12/A54CA0.c | 2 +- src/world/area_kpa/kpa_13/A56270.c | 2 +- src/world/area_kpa/kpa_14/A57830.c | 2 +- src/world/area_kpa/kpa_81/A78510.c | 8 +- src/world/area_kpa/kpa_82/A7A550.c | 8 +- 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 | 10 +- src/world/area_kzn/kzn_03/C61020.c | 6 +- src/world/area_kzn/kzn_04/C68440.c | 4 +- src/world/area_kzn/kzn_07/C6EA50.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 4 +- src/world/area_kzn/kzn_09/C76CE0.c | 4 +- src/world/area_kzn/kzn_09/C77D00.c | 6 +- src/world/area_kzn/kzn_10/C7E4B0.c | 6 +- src/world/area_kzn/kzn_11/C80600.c | 4 +- src/world/area_kzn/kzn_17/C85DC0.c | 6 +- src/world/area_kzn/kzn_17/C887B0.c | 6 +- src/world/area_kzn/kzn_19/C8DBB0.c | 40 +- src/world/area_kzn/kzn_20/C96240.c | 6 +- src/world/area_mac/mac_00/7EAD10.c | 2 +- src/world/area_mac/mac_00/7EB340.c | 44 +- src/world/area_mac/mac_00/7ED280.c | 8 +- src/world/area_mac/mac_01/800880.c | 8 +- src/world/area_mac/mac_01/8017D0.c | 42 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 44 +- src/world/area_mac/mac_03/831B20.c | 40 +- src/world/area_mac/mac_04/843030.c | 40 +- src/world/area_mac/mac_05/852170.c | 44 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_02/B97C70.c | 6 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 40 +- src/world/area_nok/nok_02/9D7020.c | 6 +- src/world/area_nok/nok_02/9D7AA0.c | 42 +- src/world/area_nok/nok_02/9DA8F0.c | 8 +- src/world/area_nok/nok_11/9F4A40.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_obk/obk_01/BBD980.c | 6 +- src/world/area_obk/obk_03/BC43F0.c | 6 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 8 +- src/world/area_omo/omo_07/DBD2B0.c | 4 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_11/DDCFC0.c | 4 +- src/world/area_omo/omo_13/DE2710.c | 6 +- src/world/area_omo/omo_15/DE8770.c | 34 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_osr/osr_01/AB0350.c | 6 +- src/world/area_pra/pra_01/D4D060.c | 8 +- src/world/area_pra/pra_02/D50010.c | 8 +- src/world/area_pra/pra_09/D588B0.c | 8 +- src/world/area_pra/pra_13/D64600.c | 10 +- src/world/area_pra/pra_19/D6E9D0.c | 8 +- src/world/area_pra/pra_31/D7ED80.c | 8 +- src/world/area_pra/pra_32/D86A20.c | 34 +- src/world/area_pra/pra_35/D8D270.c | 4 +- src/world/area_sam/sam_01/CF7E80.c | 42 +- src/world/area_sam/sam_02/D05F60.c | 34 +- src/world/area_sam/sam_04/D138E0.c | 8 +- src/world/area_sam/sam_06/D203E0.c | 10 +- src/world/area_sam/sam_08/D2FC80.c | 4 +- src/world/area_sam/sam_11/D3ADA0.c | 34 +- src/world/area_sbk/sbk_02/92A9A0.c | 6 +- src/world/area_sbk/sbk_30/93F5B0.c | 8 +- src/world/area_sbk/sbk_34/945F10.c | 6 +- src/world/area_sbk/sbk_56/953FC0.c | 4 +- src/world/area_tik/tik_07/879BE0.c | 4 +- src/world/area_tik/tik_10/8866D0.c | 4 +- src/world/area_tik/tik_12/8891C0.c | 4 +- src/world/area_tik/tik_17/892A50.c | 4 +- src/world/area_tik/tik_19/897BD0.c | 4 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_03/9A4650.c | 4 +- src/world/area_trd/trd_04/9A88A0.c | 4 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/area_trd/trd_10/9C2910.c | 34 +- src/world/area_tst/tst_04/B1B570.c | 4 +- src/world/common/AddPlayerHandsOffset.inc.c | 12 +- src/world/common/AwaitScriptComplete.inc.c | 2 +- src/world/common/Bandit_DropCoin.inc.c | 6 +- src/world/common/CamSetFOV.inc.c | 4 +- src/world/common/CheckItemFlags40.inc.c | 2 +- src/world/common/DeadFoliage.inc.c | 10 +- src/world/common/DeadGetItemName.inc.c | 4 +- src/world/common/GetCamVfov.inc.c | 4 +- .../common/GetEncounterEnemyIsOwner.inc.c | 2 +- src/world/common/GetEntityPosition.inc.c | 8 +- src/world/common/GetEntryPos.inc.c | 10 +- src/world/common/GetFloorCollider.inc.c | 2 +- src/world/common/GetGameStatus75.inc.c | 2 +- src/world/common/GetItemName.inc.c | 4 +- src/world/common/GetNpcCollisionHeight.inc.c | 4 +- src/world/common/GetPartnerCall800EB168.inc.c | 4 +- src/world/common/PlayFX3D.inc.c | 16 +- src/world/common/SetCamVfov.inc.c | 4 +- src/world/common/SetEntityPosition.inc.c | 8 +- src/world/common/SetManyVars.inc.c | 20 +- src/world/common/SomeXYZFunc2.inc.c | 8 +- src/world/common/SwitchToPartner.inc.c | 2 +- src/world/common/UnkCameraFunc.inc.c | 14 +- src/world/common/UnkFunc11.inc.c | 2 +- src/world/common/UnkFunc18.inc.c | 4 +- src/world/common/UnkFunc20.inc.c | 4 +- src/world/common/UnkFunc21.inc.c | 2 +- src/world/common/UnkFunc23.inc.c | 4 +- src/world/common/UnkFunc26.inc.c | 20 +- src/world/common/UnkFunc27.inc.c | 6 +- src/world/common/UnkFunc32.inc.c | 4 +- src/world/common/UnkFunc35.inc.c | 6 +- src/world/common/UnkFunc39.inc.c | 2 +- src/world/common/UnkFunc41.inc.c | 4 +- src/world/common/UnkMoveFunc2.inc.c | 8 +- src/world/common/UnkMoveFunc3.inc.c | 8 +- src/world/common/UnkMusicFunc.inc.c | 4 +- src/world/common/UnkNpcAIFunc27.inc.c | 2 +- src/world/common/UnkNpcAIFunc28.inc.c | 2 +- src/world/common/UnkPartnerFuncs.inc.c | 6 +- src/world/common/UnkPositionFunc.inc.c | 8 +- src/world/common/UnkYawFunc.inc.c | 12 +- src/world/common/foliage.inc.c | 10 +- src/world/script_api/7E0E80.c | 4 +- src/world/script_api/7E2AA0.c | 6 +- src/world/script_api/7E3700.c | 4 +- src/world/script_api/7E4690.c | 2 +- tools/ignored_funcs.txt | 8 +- .../167570/filemenu_yesno_handle_input.s | 2 +- .../196AA0/SetCommandAutoSuccess.s | 2 +- .../nonmatchings/197F40/ChooseNextTarget.s | 2 +- .../nonmatchings/197F40/GetActorAttackBoost.s | 2 +- .../197F40/GetActorDefenseBoost.s | 2 +- ver/us/asm/nonmatchings/197F40/GetBattleVar.s | 2 +- .../nonmatchings/197F40/GetDistanceToGoal.s | 2 +- .../asm/nonmatchings/197F40/GetOwnerTarget.s | 4 +- .../asm/nonmatchings/197F40/GetStatusFlags.s | 2 +- .../asm/nonmatchings/197F40/func_8026E558.s | 2 +- .../asm/nonmatchings/197F40/func_8026E914.s | 4 +- .../19FAF0/CancelablePlayerRunToGoal.s | 2 +- .../nonmatchings/19FAF0/PlayerDamageEnemy.s | 2 +- .../19FAF0/PlayerPowerBounceEnemy.s | 2 +- .../asm/nonmatchings/19FAF0/PlayerTestEnemy.s | 2 +- .../asm/nonmatchings/1A5830/JumpWithBounce.s | 2 +- .../nonmatchings/1AC760/PartnerAfflictEnemy.s | 2 +- .../nonmatchings/1AC760/PartnerDamageEnemy.s | 2 +- .../1AC760/PartnerPowerBounceEnemy.s | 2 +- .../nonmatchings/1AC760/PartnerTestEnemy.s | 2 +- .../362a0_len_2f70/func_8005DB00.s | 2 +- .../C50A0/update_item_entity_temp.s | 2 +- .../EA0C10/func_8024097C_EA127C.s | 2 +- .../EA0C10/func_80241AE0_EA23E0.s | 2 +- .../EA0C10/func_802420FC_EA29FC.s | 2 +- .../EA0C10/func_80242794_EA3094.s | 4 +- .../EA0C10/func_802427F0_EA30F0.s | 12 +- .../EA0C10/func_802429C0_EA32C0.s | 2 +- .../EA0C10/func_80242A14_EA3314.s | 2 +- .../EA0C10/func_80242A4C_EA334C.s | 2 +- .../EA0C10/func_80242AE8_EA33E8.s | 20 +- .../EA0C10/func_80242BD8_EA34D8.s | 12 +- .../EA36E0/func_80242F64_EA3864.s | 2 +- .../EA36E0/func_802430E4_EA39E4.s | 6 +- .../EA7320/func_80240388_EA7358.s | 2 +- .../EA8AE0/func_80240358_EA8E38.s | 22 +- .../EA8AE0/func_802408C8_EA93A8.s | 2 +- .../EA8AE0/func_80240908_EA93E8.s | 10 +- .../EA8AE0/func_80240B00_EA95E0.s | 6 +- .../EA8AE0/func_80240BD4_EA96B4.s | 12 +- .../EA8AE0/func_80240CD8_EA97B8.s | 12 +- .../EA8AE0/func_80240DA4_EA9884.s | 12 +- .../EA8AE0/func_80240E2C_EA990C.s | 4 +- .../EA8AE0/func_8024140C_EA9EEC.s | 2 +- .../EA8AE0/func_80241580_EAA060.s | 4 +- .../EA8AE0/func_802415DC_EAA0BC.s | 12 +- .../EA8AE0/func_802417AC_EAA28C.s | 2 +- .../EA8AE0/func_80241800_EAA2E0.s | 2 +- .../EA8AE0/func_80241838_EAA318.s | 2 +- .../EA8AE0/func_802418D4_EAA3B4.s | 20 +- .../EA8AE0/func_802419C4_EAA4A4.s | 12 +- .../EA8AE0/func_80241BC0_EAA6A0.s | 4 +- .../EB1170/func_80240428_EB1288.s | 4 +- .../EB1170/func_80240484_EB12E4.s | 12 +- .../EB1170/func_80240654_EB14B4.s | 2 +- .../EB1170/func_802406A8_EB1508.s | 2 +- .../EB1170/func_802406E0_EB1540.s | 2 +- .../EB1170/func_8024077C_EB15DC.s | 20 +- .../EB1170/func_8024086C_EB16CC.s | 12 +- .../EB1170/func_80240A8C_EB18EC.s | 2 +- .../EB5130/func_8024030C_EB543C.s | 2 +- .../EB5470/func_80240340_EB5470.s | 2 +- .../EB7540/func_80240310_EB7540.s | 8 +- .../EB7540/func_802403D8_EB7608.s | 8 +- .../EB7540/func_80240478_EB76A8.s | 6 +- .../EB8E90/func_80240BD4_EB9A24.s | 2 +- .../EB9D90/func_80240F40_EB9D90.s | 4 +- .../EB9D90/func_80240FB0_EB9E00.s | 6 +- .../EB9D90/func_802410E4_EB9F34.s | 6 +- .../EB9D90/func_8024121C_EBA06C.s | 16 +- .../EC9D00/func_8024003C_EC9D3C.s | 2 +- .../EC9D00/func_80240068_EC9D68.s | 4 +- .../EC9D00/func_8024041C_ECA11C.s | 2 +- .../EC9D00/func_80240480_ECA180.s | 4 +- .../EC9D00/func_80240510_ECA210.s | 2 +- .../EC9D00/func_80240544_ECA244.s | 2 +- .../EC9D00/func_80240600_ECA300.s | 2 +- .../EC9D00/func_80240B38_ECA838.s | 4 +- .../ECAA80/func_8024150C_ECB20C.s | 2 +- .../ECAA80/func_80241770_ECB470.s | 4 +- .../ECAA80/func_802417CC_ECB4CC.s | 12 +- .../ECAA80/func_8024199C_ECB69C.s | 2 +- .../ECAA80/func_802419F0_ECB6F0.s | 2 +- .../ECAA80/func_80241A28_ECB728.s | 2 +- .../ECAA80/func_80241AC4_ECB7C4.s | 8 +- .../ECAA80/func_80241B88_ECB888.s | 2 +- .../ED0310/func_8024162C_ED161C.s | 2 +- .../ED4220/func_80240000_ED4220.s | 2 +- .../ED8E20/func_802400F0_ED8F10.s | 10 +- .../ED8E20/func_80240274_ED9094.s | 8 +- .../EDC020/func_80240394_EDC374.s | 4 +- .../EDC020/func_802403F0_EDC3D0.s | 12 +- .../EDC020/func_802405C0_EDC5A0.s | 2 +- .../EDC020/func_80240614_EDC5F4.s | 2 +- .../EDC020/func_8024064C_EDC62C.s | 2 +- .../EDEA00/func_80240040_EDEA00.s | 4 +- .../EDEA00/func_802414D0_EDFE90.s | 2 +- .../EDEA00/func_80241DE4_EE07A4.s | 2 +- .../EDEA00/func_80242684_EE1044.s | 2 +- .../EDEA00/func_80242AF0_EE14B0.s | 2 +- .../EDEA00/func_80243470_EE1E30.s | 2 +- .../EE65B0/func_802403D4_EE6984.s | 2 +- .../EE65B0/func_8024042C_EE69DC.s | 2 +- .../EE65B0/func_8024046C_EE6A1C.s | 6 +- .../EE65B0/func_802407D4_EE6D84.s | 2 +- .../EE70C0/func_80241E1C_EE83CC.s | 2 +- .../EE70C0/func_80242034_EE85E4.s | 4 +- .../EE70C0/func_80242090_EE8640.s | 12 +- .../EE70C0/func_80242260_EE8810.s | 2 +- .../EE70C0/func_802422B4_EE8864.s | 2 +- .../EE70C0/func_802422EC_EE889C.s | 2 +- .../EE8940/func_80242390_EE8940.s | 2 +- .../EED1E0/func_8024011C_EED21C.s | 2 +- .../EED1E0/func_80240148_EED248.s | 4 +- .../EED1E0/func_802404FC_EED5FC.s | 2 +- .../EED1E0/func_80240560_EED660.s | 4 +- .../EED1E0/func_802405F0_EED6F0.s | 2 +- .../EED1E0/func_80240624_EED724.s | 2 +- .../EED1E0/func_802406E0_EED7E0.s | 2 +- .../EED1E0/func_80240C18_EEDD18.s | 4 +- .../EEDF50/func_8024215C_EEF25C.s | 2 +- .../EEDF50/func_80242780_EEF880.s | 2 +- .../EF2680/func_8024137C_EF398C.s | 2 +- .../EF2680/func_80241C90_EF42A0.s | 2 +- .../EF2680/func_80242530_EF4B40.s | 2 +- .../EF2680/func_8024299C_EF4FAC.s | 2 +- .../EFEB00/func_802404D0_EFEFD0.s | 4 +- .../EFEB00/func_80240540_EFF040.s | 6 +- .../EFEB00/func_80240660_EFF160.s | 6 +- .../EFEB00/func_802407B0_EFF2B0.s | 16 +- .../a5dd0_len_114e0/AssignBlockFlag.s | 2 +- .../a5dd0_len_114e0/AssignCrateFlag.s | 2 +- .../a5dd0_len_114e0/AssignPanelFlag.s | 2 +- .../area_arn/4FF0D0/func_80218680_4FF0D0.s | 2 +- .../area_dig/6DE1F0/func_80218430_6DE1F0.s | 6 +- .../area_flo/5B1A10/func_80218808_5B1CB8.s | 2 +- .../area_flo/5B1D80/func_80218B78_5B2028.s | 2 +- .../area_flo/5B20F0/func_80218EE8_5B2398.s | 2 +- .../area_flo/5B20F0/func_80219358_5B2808.s | 2 +- .../area_flo2/5CE690/func_802182A4_5CE934.s | 18 +- .../area_flo2/5CE690/func_80218440_5CEAD0.s | 2 +- .../area_flo2/5CE690/func_80218774_5CEE04.s | 14 +- .../area_flo2/5CE690/func_80218924_5CEFB4.s | 2 +- .../area_flo2/5CE690/func_802189FC_5CF08C.s | 6 +- .../area_flo2/5CE690/func_80218AA0_5CF130.s | 10 +- .../area_flo2/5CE690/func_80218B60_5CF1F0.s | 6 +- .../area_hos/47F0D0/func_802183F8_47F4A8.s | 2 +- .../area_jan2/584940/func_802180CC_584A0C.s | 2 +- .../area_jan2/584B90/func_802184F8_584E38.s | 2 +- .../area_kgr/56E2A0/func_802180CC_56E36C.s | 8 +- .../area_kgr/56E2A0/func_802182E4_56E584.s | 8 +- .../area_kgr/56E2A0/func_802184F8_56E798.s | 2 +- .../area_kpa/684C30/func_80218638_685068.s | 2 +- .../area_kpa2/69F320/func_802186D0_69F8D0.s | 4 +- .../area_kpa2/69F320/func_80218AA4_69FCA4.s | 2 +- .../area_kpa2/69F320/func_80219444_6A0644.s | 4 +- .../area_kpa2/69F320/func_80219818_6A0A18.s | 2 +- .../area_kpa2/69F320/func_80219CD4_6A0ED4.s | 2 +- .../area_kpa2/69F320/func_80219D44_6A0F44.s | 8 +- .../area_kpa2/69F320/func_80219FFC_6A11FC.s | 8 +- .../area_kpa2/69F320/func_8021A1B8_6A13B8.s | 2 +- .../area_kpa2/69F320/func_8021A804_6A1A04.s | 4 +- .../area_kpa2/69F320/func_8021ABD8_6A1DD8.s | 2 +- .../area_kpa2/69F320/func_8021B08C_6A228C.s | 2 +- .../area_kpa2/69F320/func_8021B0FC_6A22FC.s | 8 +- .../area_kpa2/69F320/func_8021B3B4_6A25B4.s | 8 +- .../area_kpa2/69F320/func_8021B570_6A2770.s | 2 +- .../area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s | 2 +- .../area_kpa2/6A2B50/func_8021C14C_6A334C.s | 4 +- .../area_kpa2/6A2B50/func_8021C520_6A3720.s | 2 +- .../area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s | 2 +- .../area_kpa2/6A2B50/func_8021CA44_6A3C44.s | 8 +- .../area_kpa2/6A2B50/func_8021CC5C_6A3E5C.s | 6 +- .../area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s | 8 +- .../area_kpa2/6A2B50/func_8021CEB8_6A40B8.s | 2 +- .../area_kpa3/6BBC60/func_80218B60_6BC6F0.s | 2 +- .../area_kpa3/6BBC60/func_80219588_6BD118.s | 4 +- .../area_kpa4/6CC1C0/func_80218588_6CC5F8.s | 2 +- .../area_kzn/58C2F0/func_802181FC_58C4EC.s | 2 +- .../area_kzn/58C740/func_8021851C_58C80C.s | 4 +- .../area_kzn/58C920/func_802188D8_58CBC8.s | 2 +- .../area_kzn/58CC90/func_80218C48_58CF38.s | 2 +- .../area_kzn2/59E6E0/func_80218058_59E738.s | 6 +- .../area_kzn2/59E6E0/func_80218B38_59F218.s | 2 +- .../area_kzn2/59E6E0/func_80218B90_59F270.s | 2 +- .../area_kzn2/59E6E0/func_80218BE8_59F2C8.s | 4 +- .../area_kzn2/59F420/func_80218D40_59F420.s | 2 +- .../area_kzn2/59F4D0/func_80218DF0_59F4D0.s | 2 +- .../area_mac/464560/func_80218D90_465220.s | 2 +- .../area_mac/464560/func_802197B8_465C48.s | 4 +- .../area_mim/4F7D50/func_8021823C_4F7E1C.s | 4 +- .../area_nok/48DCF0/func_80218C74_48DE14.s | 8 +- .../area_omo/512C90/func_8021878C_512D5C.s | 2 +- .../area_omo/512E50/func_80218880_512E50.s | 8 +- .../area_omo/512E50/func_80218B38_513108.s | 8 +- .../area_omo2_1/543570/func_80231000_543570.s | 4 +- .../area_pra/649050/func_802185A8_6493B8.s | 2 +- .../area_pra/649480/func_80218918_649728.s | 2 +- .../area_pra/6497F0/func_80218C88_649A98.s | 2 +- .../area_pra/649B60/func_80218FF8_649E08.s | 2 +- .../area_pra/649ED0/func_80219368_64A178.s | 2 +- .../area_pra2/660750/func_802181E8_660938.s | 2 +- .../area_pra2/660750/func_802183A4_660AF4.s | 2 +- .../area_pra3/669D80/func_80218A90_66A810.s | 2 +- .../area_pra3/669D80/func_802194B8_66B238.s | 4 +- .../area_pra3/66B5B0/func_80219AD8_66B858.s | 2 +- .../area_pra3/66B920/func_80219E48_66BBC8.s | 2 +- .../area_sam/623BA0/func_80218A90_624630.s | 2 +- .../area_sam/623BA0/func_802194B8_625058.s | 4 +- .../area_sam/623BA0/func_802196BC_62525C.s | 2 +- .../area_sam/6253E0/func_80219AE8_625688.s | 2 +- .../area_sam2/63D9F0/func_80218AB8_63DC98.s | 2 +- .../area_sbk/4DA6B0/func_802180D0_4DA6B0.s | 6 +- .../area_tik2/608CB0/func_80218258_608D08.s | 6 +- .../area_tik2/608CB0/func_80218404_608EB4.s | 2 +- .../area_tik2/608CB0/func_802186D8_609188.s | 6 +- .../4B15D0/func_802185B0_4B17A0.s | 38 +- .../4B1D90/func_80218D70_4B1F60.s | 38 +- .../4B2550/func_80219530_4B2720.s | 38 +- .../4B2D10/func_80219CF0_4B2EE0.s | 38 +- .../asm/nonmatchings/evt/cam_api/AdjustCam.s | 10 +- .../evt/cam_api/GetAnimatedNodePosition.s | 6 +- .../evt/cam_api/GetAnimatedNodeRotation.s | 6 +- .../cam_api/GetAnimatedPositionByTreeIndex.s | 6 +- .../cam_api/GetAnimatedRotationByTreeIndex.s | 6 +- .../asm/nonmatchings/evt/cam_api/ResetCam.s | 2 +- .../evt/cam_api/SetCamProperties.s | 14 +- .../asm/nonmatchings/evt/cam_api/ShakeCam.s | 2 +- .../evt/cam_api/UseSettingsFrom.s | 6 +- .../asm/nonmatchings/evt/fx_api/PlayEffect.s | 36 +- .../asm/nonmatchings/evt/fx_api/ShowEmote.s | 10 +- .../nonmatchings/evt/fx_api/ShowSleepBubble.s | 12 +- .../nonmatchings/evt/fx_api/func_802D7690.s | 10 +- .../nonmatchings/evt/fx_api/func_802D7E08.s | 10 +- ...at_variable.s => evt_get_float_variable.s} | 12 +- .../si/{get_variable.s => evt_get_variable.s} | 18 +- .../evt/si/evt_handle_print_debug_var.s | 12 +- ...at_variable.s => evt_set_float_variable.s} | 10 +- .../si/{set_variable.s => evt_set_variable.s} | 4 +- .../9694C0/dro_02_func_8024240C_96B5CC.s | 18 +- .../end_00/DF9300/func_80242A30_DF9430.s | 6 +- .../end_01/E05390/func_80242754_E07AB4.s | 2 +- .../hos_00/A0BD40/func_80240050_A0BD40.s | 16 +- .../hos_00/A0C4E0/func_8024091C_A0C60C.s | 6 +- .../hos_01/A10880/func_80240000_A10880.s | 16 +- .../hos_03/A1BDB0/func_802425E0_A1D6E0.s | 8 +- .../hos_05/A2A240/func_80240634_A2A874.s | 2 +- .../hos_05/A2AAC0/func_80240DA0_A2AFE0.s | 2 +- .../hos_05/A2AAC0/func_80240E50_A2B090.s | 6 +- .../hos_05/A2AAC0/func_802428C8_A2CB08.s | 22 +- .../hos_06/A397F0/func_80240654_A39B34.s | 2 +- .../hos_06/A397F0/func_80240A68_A39F48.s | 2 +- .../hos_06/A397F0/func_80240A94_A39F74.s | 2 +- .../hos_06/A3A230/func_80240F7C_A3A45C.s | 2 +- .../hos_06/A3A230/func_802411F0_A3A6D0.s | 4 +- .../hos_06/A3A230/func_8024126C_A3A74C.s | 2 +- .../hos_06/A3A230/func_802414E4_A3A9C4.s | 2 +- .../hos_06/A3A230/func_80241668_A3AB48.s | 2 +- .../hos_06/A3A230/func_802417EC_A3ACCC.s | 2 +- .../hos_06/A3B4B0/func_8024228C_A3B76C.s | 2 +- .../hos_06/A3B4B0/func_802424CC_A3B9AC.s | 2 +- .../hos_10/A3FEB0/func_80240B44_A40284.s | 2 +- .../isk_05/97DAD0/func_80241C5C_97F72C.s | 6 +- .../isk_05/97DAD0/func_80241D44_97F814.s | 6 +- .../isk_10/988B60/func_80240D38_989898.s | 2 +- .../isk_11/98AA10/func_80240000_98AA10.s | 6 +- .../isk_11/98AAC0/func_802400B0_98AAC0.s | 2 +- .../isk_13/98F7E0/func_80241BA8_991388.s | 2 +- .../isk_13/98F7E0/func_80241D38_991518.s | 6 +- .../isk_13/98F7E0/func_80241E34_991614.s | 6 +- .../isk_13/98F7E0/func_80241EF8_9916D8.s | 8 +- .../isk_14/992730/func_80241BEC_99431C.s | 6 +- .../isk_14/992730/func_80241CA0_9943D0.s | 6 +- .../isk_16/9951F0/func_8024004C_99523C.s | 18 +- .../isk_16/9951F0/func_802405FC_9957EC.s | 8 +- .../iwa_01/90F6B0/func_80240398_90FA48.s | 2 +- .../iwa_01/90FBD0/func_80240FB8_910668.s | 2 +- .../iwa_03/918BB0/func_802402BC_918E6C.s | 2 +- .../iwa_04/91B8E0/func_80240000_91B8E0.s | 2 +- .../iwa_10/91F5A0/func_802413E0_91F950.s | 2 +- .../iwa_11/926A10/func_802401B0_926BA0.s | 2 +- .../iwa_11/926A10/func_80240208_926BF8.s | 2 +- .../jan_00/B20540/func_80240738_B20C78.s | 2 +- .../jan_00/B20540/func_80240B4C_B2108C.s | 6 +- .../jan_00/B216E0/func_802411EC_B2172C.s | 6 +- .../jan_00/B216E0/func_802416F8_B21C38.s | 10 +- .../jan_00/B216E0/func_80241868_B21DA8.s | 6 +- .../jan_02/B2C8A0/func_802414EC_B2D95C.s | 2 +- .../jan_02/B2C8A0/func_80241750_B2DBC0.s | 8 +- .../jan_03/B34BD0/func_802419D8_B365A8.s | 2 +- .../jan_03/B34BD0/func_80241CD8_B368A8.s | 8 +- .../jan_03/B34BD0/func_80242F1C_B37AEC.s | 2 +- .../jan_05/B4ADC0/func_80240350_B4ADC0.s | 2 +- .../jan_05/B4AF10/func_80240738_B4B1A8.s | 2 +- .../jan_06/B52BE0/func_802403B0_B52BE0.s | 2 +- .../jan_08/B5E5C0/func_802405A8_B5E858.s | 2 +- .../jan_09/B660A0/func_80240888_B66338.s | 2 +- .../jan_10/B6D4C0/func_80241130_B6D4C0.s | 2 +- .../jan_12/B730B0/func_80240000_B730B0.s | 8 +- .../jan_12/B730B0/func_802400F8_B731A8.s | 6 +- .../jan_12/B730B0/func_802401CC_B7327C.s | 2 +- .../jan_14/B7A050/func_80240000_B7A050.s | 8 +- .../jan_14/B7A050/func_802400F8_B7A148.s | 6 +- .../jan_14/B7A050/func_802401CC_B7A21C.s | 2 +- .../jan_22/B851A0/func_80241668_B857E8.s | 2 +- .../kkj_10/ACAB20/func_80240034_ACAB54.s | 2 +- .../kkj_10/ACABD0/func_802400B0_ACABD0.s | 2 +- .../kkj_10/ACABD0/func_8024036C_ACAE8C.s | 2 +- .../kkj_10/ACABD0/func_80240644_ACB164.s | 2 +- .../kkj_10/ACABD0/func_80240728_ACB248.s | 6 +- .../kkj_10/ACB3C0/func_802408A0_ACB3C0.s | 2 +- .../kkj_10/ACB3C0/func_80240B5C_ACB67C.s | 2 +- .../kkj_10/ACB3C0/func_80240E34_ACB954.s | 2 +- .../kkj_10/ACB3C0/func_80240F18_ACBA38.s | 2 +- .../kkj_10/ACB3C0/func_80240F60_ACBA80.s | 6 +- .../kkj_11/ACE140/func_80240034_ACE174.s | 2 +- .../kkj_11/ACE1F0/func_802400B0_ACE1F0.s | 2 +- .../kkj_11/ACE1F0/func_8024036C_ACE4AC.s | 2 +- .../kkj_11/ACE1F0/func_80240644_ACE784.s | 2 +- .../kkj_11/ACE1F0/func_80240728_ACE868.s | 6 +- .../kkj_11/ACE9E0/func_802408A0_ACE9E0.s | 2 +- .../kkj_11/ACE9E0/func_80240B5C_ACEC9C.s | 2 +- .../kkj_11/ACE9E0/func_80240E34_ACEF74.s | 2 +- .../kkj_11/ACE9E0/func_80240F18_ACF058.s | 2 +- .../kkj_11/ACE9E0/func_80240F60_ACF0A0.s | 6 +- .../kkj_12/AD4090/func_80240034_AD40C4.s | 2 +- .../kkj_12/AD4100/func_80240070_AD4100.s | 2 +- .../kkj_12/AD4100/func_8024032C_AD43BC.s | 2 +- .../kkj_12/AD4100/func_80240604_AD4694.s | 2 +- .../kkj_12/AD4100/func_802406E8_AD4778.s | 2 +- .../kkj_12/AD4100/func_80240730_AD47C0.s | 6 +- .../kkj_14/ADAEF0/func_802403A0_ADB240.s | 2 +- .../kkj_16/AED410/func_80240028_AED438.s | 2 +- .../kkj_16/AED410/func_80240060_AED470.s | 2 +- .../kkj_16/AED410/func_8024031C_AED72C.s | 2 +- .../kkj_16/AED410/func_802405F4_AEDA04.s | 2 +- .../kkj_16/AED410/func_802406D8_AEDAE8.s | 6 +- .../kkj_16/AEDC60/func_80240850_AEDC60.s | 2 +- .../kkj_16/AEDC60/func_80240B0C_AEDF1C.s | 2 +- .../kkj_16/AEDC60/func_80240DE4_AEE1F4.s | 2 +- .../kkj_16/AEDC60/func_80240EC8_AEE2D8.s | 2 +- .../kkj_16/AEDC60/func_80240F10_AEE320.s | 6 +- .../kkj_17/AF1C60/func_802402BC_AF1F1C.s | 2 +- .../kkj_17/AF1C60/func_80240500_AF2160.s | 2 +- .../kkj_18/AF2FE0/func_8024056C_AF320C.s | 2 +- .../kkj_18/AF2FE0/func_80240730_AF33D0.s | 2 +- .../kkj_19/AF7C00/func_802404DC_AF7E2C.s | 2 +- .../kkj_19/AF7C00/func_802406C4_AF8014.s | 2 +- .../kkj_19/AF7C00/func_80240B8C_AF84DC.s | 2 +- .../kkj_20/AFDE00/func_802405BC_AFE0FC.s | 2 +- .../kkj_23/B028A0/func_80240048_B028C8.s | 2 +- .../kkj_23/B028A0/func_802400E0_B02960.s | 2 +- .../kkj_23/B028A0/func_8024039C_B02C1C.s | 2 +- .../kkj_23/B028A0/func_80240674_B02EF4.s | 2 +- .../kkj_23/B028A0/func_80240758_B02FD8.s | 2 +- .../kkj_23/B028A0/func_802407A0_B03020.s | 6 +- .../kkj_25/B06A80/func_80240264_B06C64.s | 6 +- .../kkj_25/B06D10/func_802406EC_B070EC.s | 2 +- .../kkj_25/B06D10/func_80240800_B07200.s | 2 +- .../kkj_25/B06D10/func_8024086C_B0726C.s | 6 +- .../kkj_25/B06D10/func_8024092C_B0732C.s | 6 +- .../kkj_25/B06D10/func_802409EC_B073EC.s | 6 +- .../kmr_02/8B0070/func_802404CC_8B053C.s | 8 +- .../kmr_02/8B0070/func_8024226C_8B22DC.s | 2 +- .../kmr_02/8B0070/func_8024280C_8B287C.s | 2 +- .../kmr_06/8D2A10/func_802417E0_8D2CF0.s | 6 +- .../kmr_06/8D2A10/func_80241950_8D2E60.s | 6 +- .../kmr_06/8D2A10/func_802419EC_8D2EFC.s | 4 +- .../kmr_06/8D2A10/func_80241A68_8D2F78.s | 6 +- .../kmr_06/8D2A10/func_80241C78_8D3188.s | 2 +- .../kmr_11/8DA3A0/func_802402A0_8DA3A0.s | 6 +- .../kmr_11/8DA3A0/func_80240344_8DA444.s | 2 +- .../kmr_20/8EBE50/func_802406C8_8EC4E8.s | 2 +- .../kmr_20/8ED5A0/func_80241CF0_8EDB10.s | 2 +- .../kmr_20/8EDFC0/func_80242B04_8EE924.s | 2 +- .../kmr_22/8FF8B0/func_80240240_8FF8B0.s | 6 +- .../kmr_22/8FF8B0/func_80240B4C_9001BC.s | 2 +- .../kmr_23/907A40/func_80240040_907A70.s | 8 +- .../kmr_23/907A40/func_80240274_907CA4.s | 2 +- .../kmr_23/907A40/func_80240300_907D30.s | 2 +- .../kmr_23/907A40/func_80240494_907EC4.s | 2 +- .../kpa_03/A4A410/func_80241E50_A4A410.s | 4 +- .../kpa_09/A4F0A0/func_80240B38_A4FB38.s | 2 +- .../kpa_102/A93A50/func_80240DA8_A944E8.s | 2 +- .../kpa_111/A99590/func_80240C08_A9A198.s | 2 +- .../kpa_115/A9ED40/func_80240C08_A9F948.s | 2 +- .../kpa_50/A609D0/func_80240A98_A61468.s | 2 +- .../kpa_52/A671E0/func_80240B78_A67C78.s | 2 +- .../kpa_53/A6ACA0/func_80240050_A6ACF0.s | 2 +- .../kpa_81/A78510/func_8024027C_A7873C.s | 2 +- .../kpa_82/A7A550/func_8024027C_A7A77C.s | 2 +- .../kzn_02/C5AA50/func_802403B0_C5AAF0.s | 2 +- .../kzn_02/C5AC20/func_80242310_C5CA50.s | 2 +- .../kzn_03/C61020/func_802428E0_C635F0.s | 2 +- .../kzn_03/C63A10/func_80242D38_C63A48.s | 2 +- .../kzn_06/C6CD10/func_802403F0_C6CD10.s | 4 +- .../kzn_07/C6E330/func_80240000_C6E330.s | 4 +- .../kzn_08/C71480/func_80240000_C71480.s | 4 +- .../kzn_09/C77D00/func_802435F0_C7A2D0.s | 2 +- .../kzn_17/C85DC0/func_802428E0_C88390.s | 2 +- .../kzn_19/C8DBB0/func_80240358_C8DF08.s | 18 +- .../kzn_19/C8DBB0/func_80240908_C8E4B8.s | 8 +- .../kzn_19/C8DBB0/func_80240B00_C8E6B0.s | 6 +- .../kzn_19/C8DBB0/func_8024140C_C8EFBC.s | 2 +- .../kzn_19/C8DBB0/func_802417AC_C8F35C.s | 2 +- .../kzn_20/C96240/func_80240654_C96584.s | 2 +- .../kzn_23/C9C610/func_80240478_C9C778.s | 6 +- .../mac_00/7EB340/func_8024076C_7EB47C.s | 8 +- .../mac_00/7EB340/func_802418F0_7EC600.s | 2 +- .../mac_00/7EB340/func_80241DA0_7ECAB0.s | 2 +- .../mac_00/7EB340/func_80241E04_7ECB14.s | 2 +- .../mac_00/7EB340/func_80241E80_7ECB90.s | 4 +- .../mac_00/7ED280/func_80243744_7EE454.s | 2 +- .../mac_01/800880/func_802400C8_800948.s | 6 +- .../mac_01/801700/func_80240ED8_801758.s | 2 +- .../mac_01/8017D0/func_8024204C_8028CC.s | 8 +- .../mac_01/8017D0/func_80243380_803C00.s | 2 +- .../mac_01/8017D0/func_80243494_803D14.s | 2 +- .../mac_01/8017D0/func_80243500_803D80.s | 6 +- .../mac_01/8017D0/func_802435C0_803E40.s | 6 +- .../mac_01/8017D0/func_80243680_803F00.s | 6 +- .../mac_01/8017D0/func_80243CD4_804554.s | 2 +- .../mac_01/8017D0/func_8024522C_805AAC.s | 2 +- .../mac_02/823BF0/func_802418FC_824BBC.s | 8 +- .../mac_02/823BF0/func_80242A80_825D40.s | 2 +- .../mac_02/823BF0/func_80242C44_825F04.s | 4 +- .../mac_02/823BF0/func_80242DBC_82607C.s | 4 +- .../mac_02/823BF0/func_80242F60_826220.s | 2 +- .../mac_02/823BF0/func_80243040_826300.s | 2 +- .../mac_02/823BF0/func_80243088_826348.s | 2 +- .../mac_03/831B20/func_802405EC_831DEC.s | 8 +- .../mac_03/831B20/func_80241770_832F70.s | 2 +- .../mac_03/833740/func_8024206C_83386C.s | 2 +- .../mac_03/833740/func_802421E8_8339E8.s | 2 +- .../mac_03/833740/func_802424A0_833CA0.s | 8 +- .../mac_03/833740/func_80242694_833E94.s | 4 +- .../mac_03/833740/func_802427D0_833FD0.s | 6 +- .../mac_04/843030/func_8024059C_84316C.s | 8 +- .../mac_04/843030/func_80241720_8442F0.s | 2 +- .../mac_04/843030/func_802418AC_84447C.s | 2 +- .../mac_04/843030/func_802419E4_8445B4.s | 6 +- .../mac_04/843030/func_80241BB8_844788.s | 2 +- .../mac_04/844860/func_80241C90_844860.s | 2 +- .../mac_04/844860/func_80241DAC_84497C.s | 2 +- .../mac_05/852170/func_8024030C_85247C.s | 10 +- .../mac_05/852170/func_8024145C_8535CC.s | 8 +- .../mac_05/852170/func_802425E0_854750.s | 2 +- .../mac_05/852170/func_80242A90_854C00.s | 6 +- .../mac_05/852170/func_802430B4_855224.s | 2 +- .../mac_05/852170/func_80243254_8553C4.s | 4 +- .../mac_05/855560/func_8024343C_8555AC.s | 6 +- .../mac_05/855560/func_80243948_855AB8.s | 10 +- .../mac_05/855560/func_80243AB8_855C28.s | 6 +- .../mac_05/855560/func_80243CD4_855E44.s | 6 +- .../mac_06/864B40/func_8024030C_864E4C.s | 10 +- .../mac_06/865000/func_8024050C_86504C.s | 6 +- .../mac_06/865000/func_80240A18_865558.s | 10 +- .../mac_06/865000/func_80240B88_8656C8.s | 6 +- .../mac_06/865000/func_80240DA4_8658E4.s | 6 +- .../mac_06/8659C0/func_802412AC_865DEC.s | 6 +- .../mac_06/8659C0/func_80241388_865EC8.s | 28 +- .../mgm_00/E0E7A0/func_80241170_E0F910.s | 2 +- .../mgm_00/E0F980/func_802416F8_E0FE98.s | 2 +- .../mgm_01/E12760/func_80240000_E12760.s | 8 +- .../mgm_01/E12930/func_8024045C_E12BBC.s | 8 +- .../mgm_01/E12930/func_802406C4_E12E24.s | 2 +- .../mgm_01/E12930/func_8024084C_E12FAC.s | 2 +- .../mgm_01/E12930/func_80240AAC_E1320C.s | 2 +- .../mgm_01/E12930/func_80240DB8_E13518.s | 8 +- .../mgm_01/E12930/func_80240ECC_E1362C.s | 10 +- .../mgm_01/E12930/func_802416CC_E13E2C.s | 2 +- .../mgm_02/E15D80/func_80240644_E163C4.s | 8 +- .../mgm_02/E15D80/func_80241DCC_E17B4C.s | 2 +- .../mgm_02/E15D80/func_80242314_E18094.s | 2 +- .../mim_01/B934B0/func_802403F0_B93830.s | 6 +- .../mim_02/B97C70/func_802410B0_B98CB0.s | 2 +- .../mim_03/B9B480/func_80240420_B9B8A0.s | 6 +- .../mim_06/BA47F0/func_802403F0_BA4B70.s | 6 +- .../mim_06/BA47F0/func_802404F8_BA4C78.s | 2 +- .../nok_01/9C53E0/func_80240EA4_9C6284.s | 8 +- .../nok_01/9C53E0/func_80242028_9C7408.s | 2 +- .../nok_01/9C53E0/func_8024243C_9C781C.s | 2 +- .../nok_02/9D7020/func_80240624_9D7644.s | 2 +- .../nok_02/9D7770/func_80240750_9D7770.s | 8 +- .../nok_02/9D7AA0/func_80241A4C_9D8A6C.s | 8 +- .../nok_02/9D7AA0/func_80242BD0_9D9BF0.s | 2 +- .../nok_02/9DA8F0/func_80243BEC_9DAC0C.s | 2 +- .../nok_02/9DA8F0/func_80243F10_9DAF30.s | 2 +- .../nok_02/9DA8F0/func_80244078_9DB098.s | 4 +- .../nok_02/9DA8F0/func_80244288_9DB2A8.s | 2 +- .../nok_04/9EDBF0/func_80240574_9EE164.s | 6 +- .../nok_04/9EDBF0/func_80240630_9EE220.s | 2 +- .../nok_13/A01420/func_80241360_A01960.s | 2 +- .../obk_01/BBD1A0/func_80240038_BBD1D8.s | 2 +- .../obk_01/BBD980/func_80240B24_BBDCC4.s | 2 +- .../obk_03/BC43F0/func_802404B4_BC4734.s | 2 +- .../obk_04/BC7EB0/func_802402F4_BC8154.s | 4 +- .../obk_04/BC7EB0/func_80240A58_BC88B8.s | 2 +- .../obk_07/BCF0F0/func_80240500_BCF0F0.s | 2 +- .../obk_07/BCF0F0/func_80240A6C_BCF65C.s | 2 +- .../obk_07/BCF0F0/func_8024146C_BD005C.s | 2 +- .../obk_07/BCF0F0/func_802414B4_BD00A4.s | 4 +- .../obk_07/BCF0F0/func_80241518_BD0108.s | 4 +- .../obk_07/BCF0F0/func_8024157C_BD016C.s | 2 +- .../obk_07/BCF0F0/func_802415B8_BD01A8.s | 2 +- .../obk_07/BCF0F0/func_802415F4_BD01E4.s | 2 +- .../obk_07/BCF0F0/func_80241630_BD0220.s | 4 +- .../obk_07/BCF0F0/func_80241674_BD0264.s | 4 +- .../obk_07/BCF0F0/func_802416F8_BD02E8.s | 4 +- .../obk_08/BD3870/func_802403DC_BD3C4C.s | 2 +- .../obk_08/BD3870/func_802404F0_BD3D60.s | 2 +- .../obk_08/BD3870/func_8024055C_BD3DCC.s | 6 +- .../obk_08/BD3870/func_8024061C_BD3E8C.s | 6 +- .../obk_08/BD3870/func_802406DC_BD3F4C.s | 6 +- .../obk_08/BD4110/func_80240AF0_BD4360.s | 2 +- .../obk_08/BD4A90/func_80241300_BD4B70.s | 4 +- .../omo_02/D9D510/func_802423E0_D9F8B0.s | 2 +- .../omo_03/DA5260/func_8024003C_DA527C.s | 10 +- .../omo_03/DA5260/func_80240104_DA5344.s | 6 +- .../omo_03/DA5260/func_8024020C_DA544C.s | 8 +- .../omo_03/DA5260/func_802402B0_DA54F0.s | 8 +- .../omo_05/DB22C0/func_80242178_DB4438.s | 2 +- .../omo_06/DB7910/func_8024001C_DB792C.s | 10 +- .../omo_06/DB7910/func_802400E4_DB79F4.s | 6 +- .../omo_06/DB7910/func_802401EC_DB7AFC.s | 8 +- .../omo_06/DB7910/func_80240290_DB7BA0.s | 8 +- .../omo_07/DBD2B0/func_80242EA8_DC0158.s | 2 +- .../omo_08/DC43D0/func_8024001C_DC43EC.s | 10 +- .../omo_08/DC43D0/func_802400E4_DC44B4.s | 6 +- .../omo_08/DC43D0/func_802401EC_DC45BC.s | 8 +- .../omo_08/DC43D0/func_80240290_DC4660.s | 8 +- .../omo_09/DCD6B0/func_80242DF0_DCFAC0.s | 2 +- .../omo_10/DD79B0/func_8024001C_DD79CC.s | 10 +- .../omo_10/DD79B0/func_802400E4_DD7A94.s | 6 +- .../omo_10/DD79B0/func_802401EC_DD7B9C.s | 8 +- .../omo_10/DD79B0/func_80240290_DD7C40.s | 8 +- .../omo_13/DE2710/func_80240F00_DE3390.s | 2 +- .../omo_14/DE5810/func_802403FC_DE5AAC.s | 4 +- .../omo_15/DE8770/func_8024004C_DE87BC.s | 18 +- .../omo_15/DE8770/func_802405FC_DE8D6C.s | 8 +- .../omo_16/DEBED0/func_8024001C_DEBEEC.s | 10 +- .../omo_16/DEBED0/func_802400E4_DEBFB4.s | 6 +- .../omo_16/DEBED0/func_802401EC_DEC0BC.s | 8 +- .../omo_16/DEBED0/func_80240290_DEC160.s | 8 +- .../omo_16/DEBED0/func_8024055C_DEC42C.s | 2 +- .../omo_17/DEEEA0/func_8024001C_DEEEBC.s | 10 +- .../omo_17/DEEEA0/func_802400E4_DEEF84.s | 6 +- .../omo_17/DEEEA0/func_802401EC_DEF08C.s | 8 +- .../omo_17/DEEEA0/func_80240290_DEF130.s | 8 +- .../omo_17/DEF400/func_80242F44_DF1DE4.s | 2 +- .../osr_01/AB0350/func_802406A4_AB0694.s | 2 +- .../osr_02/AB2190/func_80240020_AB2190.s | 2 +- .../osr_02/AB2290/func_80240120_AB2290.s | 2 +- .../osr_03/AB62B0/func_80240020_AB62B0.s | 2 +- .../osr_03/AB62B0/func_80240290_AB6520.s | 2 +- .../osr_04/AB92B0/func_80240050_AB9300.s | 2 +- .../pra_01/D4D060/func_802411AC_D4E1EC.s | 2 +- .../pra_02/D50010/func_8024114C_D5113C.s | 2 +- .../pra_02/D50010/func_802414A8_D51498.s | 8 +- .../pra_03/D53CD0/func_80240138_D53DE8.s | 4 +- .../pra_04/D546B0/func_80240138_D547C8.s | 4 +- .../pra_09/D588B0/func_8024114C_D599DC.s | 2 +- .../pra_13/D64600/func_8024114C_D6572C.s | 2 +- .../pra_19/D6E9D0/func_8024114C_D6FAFC.s | 2 +- .../pra_21/D77F40/func_802400AC_D77FCC.s | 4 +- .../pra_22/D788A0/func_8024025C_D78ADC.s | 4 +- .../pra_31/D7ED80/func_8024024C_D7EFAC.s | 2 +- .../pra_31/D7F270/func_80240510_D7F270.s | 10 +- .../pra_31/D7F270/func_80240818_D7F578.s | 2 +- .../pra_31/D7F270/func_80240E70_D7FBD0.s | 6 +- .../pra_31/D7F270/func_80240F2C_D7FC8C.s | 6 +- .../pra_32/D86A20/func_8024006C_D86A6C.s | 18 +- .../pra_32/D86A20/func_8024061C_D8701C.s | 8 +- .../sam_01/CF7E80/func_8024053C_CF80AC.s | 2 +- .../sam_01/CF7E80/func_8024083C_CF83AC.s | 8 +- .../sam_02/D05F60/func_80240C68_D06398.s | 8 +- .../sam_04/D13810/func_80240240_D13810.s | 10 +- .../sam_04/D138E0/func_8024053C_D13B0C.s | 2 +- .../sam_06/D203E0/func_80241D8C_D21C1C.s | 2 +- .../sam_09/D362F0/func_80240158_D36448.s | 12 +- .../sam_09/D362F0/func_80240264_D36554.s | 6 +- .../sam_11/D3A930/func_80240754_D3AD24.s | 4 +- .../sam_11/D3ADA0/func_8024090C_D3AEDC.s | 8 +- .../sam_11/D3ADA0/func_80242074_D3C644.s | 2 +- .../sam_12/D4BAB0/func_80240090_D4BAB0.s | 2 +- .../sam_12/D4BAB0/func_802400C0_D4BAE0.s | 6 +- .../sam_12/D4BAB0/func_80240238_D4BC58.s | 12 +- .../sbk_02/92A9A0/func_8024091C_92ABCC.s | 2 +- .../sbk_30/93F5B0/func_80241120_9406D0.s | 2 +- .../sbk_34/945F10/func_80240384_946254.s | 2 +- .../tik_09/882BF0/func_80241204_8833C4.s | 2 +- .../tik_15/890190/func_80240AD0_890670.s | 2 +- .../trd_05/9AE700/func_80240508_9AEC08.s | 6 +- .../trd_05/9AE700/func_802405FC_9AECFC.s | 6 +- .../trd_06/9B1AA0/func_80240854_9B1FE4.s | 6 +- .../trd_06/9B1AA0/func_8024093C_9B20CC.s | 6 +- .../trd_07/9B6C90/func_8024256C_9B8EEC.s | 2 +- .../trd_07/9B6C90/func_80242600_9B8F80.s | 6 +- .../trd_09/9BD660/func_80240000_9BD660.s | 2 +- .../trd_10/9C2910/func_8024004C_9C295C.s | 18 +- .../trd_10/9C2910/func_802405FC_9C2F0C.s | 8 +- .../7E0E80/ShowShopPurchaseDialog.s | 2 +- .../world/script_api/7E2AA0/func_80282594.s | 2 +- .../script_api/7E3700/GetGridIndexFromPos.s | 4 +- .../world/script_api/7E3700/GetPushBlock.s | 4 +- .../world/script_api/7E3700/func_80283240.s | 2 +- .../world/script_api/7E4690/GetEntryCoords.s | 8 +- ver/us/symbol_addrs.txt | 26 +- ver/us/undefined_syms.txt | 8 +- 920 files changed, 4503 insertions(+), 4277 deletions(-) create mode 100644 include/evt_funcs.h rename ver/us/asm/nonmatchings/evt/si/{get_float_variable.s => evt_get_float_variable.s} (96%) rename ver/us/asm/nonmatchings/evt/si/{get_variable.s => evt_get_variable.s} (96%) rename ver/us/asm/nonmatchings/evt/si/{set_float_variable.s => evt_set_float_variable.s} (96%) rename ver/us/asm/nonmatchings/evt/si/{set_variable.s => evt_set_variable.s} (99%) diff --git a/include/dead.h b/include/dead.h index 8da782ae1c..035d3d9088 100644 --- a/include/dead.h +++ b/include/dead.h @@ -2,11 +2,11 @@ #define _DEAD_H_ #define gCameras dead_gCameras -#define get_variable dead_get_variable -#define set_variable dead_set_variable -#define get_float_variable dead_get_float_variable +#define evt_get_variable dead_evt_get_variable +#define evt_set_variable dead_evt_set_variable +#define evt_get_float_variable dead_evt_get_float_variable #define cos_rad dead_cos_rad -#define set_float_variable dead_set_float_variable +#define evt_set_float_variable dead_evt_set_float_variable #define playFX_11 dead_playFX_11 #define gPlayerStatusPtr dead_gPlayerStatusPtr #define set_main_pan_u dead_set_main_pan_u diff --git a/include/evt.h b/include/evt.h index 4d598587e7..55a43fbc3c 100644 --- a/include/evt.h +++ b/include/evt.h @@ -114,7 +114,7 @@ enum { #define EVT_SAVE_VAR(v) ((v - 170000000)) #define EVT_ARRAY(v) ((v - 190000000)) #define EVT_ARRAY_FLAG(v) ((v - 210000000)) -#define EVT_FIXED(v) (((v * 1024.0f) + -230000000)) // See float_to_fixed_var +#define EVT_FIXED(v) (((v * 1024.0f) + -230000000)) // See evt_float_to_fixed_var #define EVT_LIMIT -250000000 // TODO better name #define MAKE_ENTITY_END 0x80000000 diff --git a/include/evt_funcs.h b/include/evt_funcs.h new file mode 100644 index 0000000000..d353091d05 --- /dev/null +++ b/include/evt_funcs.h @@ -0,0 +1,226 @@ +#ifndef _EVT_FUNCS_H_ +#define _EVT_FUNCS_H_ + +f32 evt_fixed_var_to_float(Bytecode scriptVar); + +Bytecode evt_float_to_fixed_var(f32 value); + +ApiStatus evt_handle_return(Evt* script); + +ApiStatus evt_handle_label(Evt* script); + +ApiStatus evt_handle_goto(Evt* script); + +ApiStatus evt_handle_loop(Evt* script); + +ApiStatus evt_handle_end_loop(Evt* script); + +ApiStatus evt_handle_break_loop(Evt* script); + +ApiStatus evt_handle_wait(Evt* script); + +ApiStatus evt_handle_wait_seconds(Evt* script); + +ApiStatus evt_handle_if_equal(Evt* script); + +ApiStatus evt_handle_if_not_equal(Evt* script); + +ApiStatus evt_handle_if_less(Evt* script); + +ApiStatus evt_handle_if_greater(Evt* script); + +ApiStatus evt_handle_if_less_equal(Evt* script); + +ApiStatus evt_handle_if_greater_equal(Evt* script); + +ApiStatus evt_handle_if_AND(Evt* script); + +ApiStatus evt_handle_if_not_AND(Evt* script); + +ApiStatus evt_handle_else(Evt* script); + +ApiStatus evt_handle_end_if(Evt* script); + +ApiStatus evt_handle_switch(Evt* script); + +ApiStatus evt_handle_switch_const(Evt* script); + +ApiStatus evt_handle_case_equal(Evt* script); + +ApiStatus evt_handle_case_not_equal(Evt* script); + +ApiStatus evt_handle_case_less(Evt* script); + +ApiStatus evt_handle_case_less_equal(Evt* script); + +ApiStatus evt_handle_case_greater(Evt* script); + +ApiStatus evt_handle_case_greater_equal(Evt* script); + +ApiStatus evt_handle_case_range(Evt* script); + +ApiStatus evt_handle_case_default(Evt* script); + +ApiStatus evt_handle_case_AND(Evt* script); + +ApiStatus evt_handle_case_equal_OR(Evt* script); + +ApiStatus evt_handle_case_equal_AND(Evt* script); + +ApiStatus evt_handle_end_case_group(Evt* script); + +ApiStatus evt_handle_break_case(Evt* script); + +ApiStatus evt_handle_end_switch(Evt* script); + +ApiStatus evt_handle_set_var(Evt* script); + +ApiStatus evt_handle_set_const(Evt* script); + +ApiStatus evt_handle_set_float(Evt* script); + +ApiStatus evt_handle_add(Evt* script); + +ApiStatus evt_handle_subtract(Evt* script); + +ApiStatus evt_handle_multiply(Evt* script); + +ApiStatus evt_handle_divide(Evt* script); + +ApiStatus evt_handle_mod(Evt* script); + +ApiStatus evt_handle_addF(Evt* script); + +ApiStatus evt_handle_subtractF(Evt* script); + +ApiStatus evt_handle_multiplyF(Evt* script); + +ApiStatus evt_handle_divideF(Evt* script); + +ApiStatus evt_handle_set_int_buffer_ptr(Evt* script); + +ApiStatus evt_handle_set_float_buffer_ptr(Evt* script); + +ApiStatus evt_handle_get_1_word(Evt* script); + +ApiStatus evt_handle_get_2_word(Evt* script); + +ApiStatus evt_handle_get_3_word(Evt* script); + +ApiStatus evt_handle_get_4_word(Evt* script); + +ApiStatus evt_handle_get_Nth_word(Evt* script); + +ApiStatus evt_handle_get_1_float(Evt* script); + +ApiStatus evt_handle_get_2_float(Evt* script); + +ApiStatus evt_handle_get_3_float(Evt* script); + +ApiStatus evt_handle_get_4_float(Evt* script); + +ApiStatus evt_handle_get_Nth_float(Evt* script); + +ApiStatus evt_handle_set_array(Evt* script); + +ApiStatus evt_handle_set_flag_array(Evt* script); + +ApiStatus evt_handle_allocate_array(Evt* script); + +ApiStatus evt_handle_AND(Evt* script); + +ApiStatus evt_handle_AND_const(Evt* script); + +ApiStatus evt_handle_OR(Evt* script); + +ApiStatus evt_handle_OR_const(Evt* script); + +ApiStatus evt_handle_call(Evt* script); + +ApiStatus evt_handle_exec1(Evt* script); + +ApiStatus evt_handle_exec1_get_id(Evt* script); + +ApiStatus evt_handle_exec_wait(Evt* script); + +ApiStatus evt_handle_jump(Evt* script); + +s32 evt_bound_script_trigger_handler(Trigger* trigger); + +ApiStatus evt_handle_bind(Evt* script); + +ApiStatus DeleteTrigger(Evt* script, s32 ievt_nitialCall); + +ApiStatus evt_handle_unbind(Evt* script); + +ApiStatus evt_handle_kill(Evt* script); + +ApiStatus evt_handle_set_priority(Evt* script); + +ApiStatus evt_handle_set_timescale(Evt* script); + +ApiStatus evt_handle_set_group(Evt* script); + +ApiStatus evt_handle_suspend_all(Evt* script); + +ApiStatus evt_handle_resume_all(Evt* script); + +ApiStatus evt_handle_suspend_others(Evt* script); + +ApiStatus evt_handle_resume_others(Evt* script); + +ApiStatus evt_handle_suspend(Evt* script); + +ApiStatus evt_handle_resume(Evt* script); + +ApiStatus evt_handle_does_script_exist(Evt* script); + +void evt_standard_trigger_executor(Trigger* trigger); + +ApiStatus evt_handle_bind_lock(Evt* script); + +ApiStatus evt_handle_thread(Evt* script); + +ApiStatus evt_handle_end_thread(Evt* script); + +ApiStatus evt_handle_child_thread(Evt* script); + +ApiStatus evt_handle_end_child_thread(Evt* script); + +ApiStatus func_802C6E14(Evt* script); + +ApiStatus evt_handle_print_debug_var(Evt* script); + +ApiStatus func_802C739C(Evt* script); + +ApiStatus func_802C73B0(Evt* script); + +s32 func_802C73B8(Evt* script); + +s32 evt_execute_next_command(Evt *script); + +s32 evt_get_variable(Evt* script, Bytecode var); + +s32 evt_get_variable_index(Evt* script, s32 var); + +s32 evt_get_variable_index_alt(s32 var); + +s32 evt_set_variable(Evt* script, Bytecode var, s32 value); + +f32 evt_get_float_variable(Evt* script, Bytecode var); + +f32 evt_set_float_variable(Evt* script, Bytecode var, s32 value); + +Bytecode* evt_find_label(Evt* script, s32 arg1); + +Bytecode* evt_skip_if(Evt* script); + +Bytecode* evt_skip_else(Evt* script); + +Bytecode* evt_goto_end_case(Evt* script); + +Bytecode* evt_goto_next_case(Evt* script); + +Bytecode* evt_goto_end_loop(Evt* script); + +#endif diff --git a/include/functions.h b/include/functions.h index f6ea8c820b..16f6c95eea 100644 --- a/include/functions.h +++ b/include/functions.h @@ -157,7 +157,7 @@ void get_collider_center(s32 colliderID, f32* x, f32* y, f32* z); s32 is_trigger_bound(Trigger*, EvtSource* script); Trigger* create_trigger(TriggerDefinition* def); -s32 _bound_script_trigger_handler(Trigger* trigger); +s32 evt_bound_script_trigger_handler(Trigger* trigger); Trigger* get_trigger_by_id(s32 triggerID); Actor* get_actor(ActorID actorID); @@ -170,10 +170,10 @@ void ai_enemy_play_sound(Npc* npc, s32 arg1, s32 arg2); s32 player_test_move_without_slipping(PlayerStatus*, f32*, f32*, f32*, s32, f32, s32*); -s32 get_variable(Evt* script, Bytecode var); -s32 set_variable(Evt* script, Bytecode var, s32 value); -f32 get_float_variable(Evt* script, Bytecode var); -f32 set_float_variable(Evt* script, Bytecode var, f32 value); +s32 evt_get_variable(Evt* script, Bytecode var); +s32 evt_set_variable(Evt* script, Bytecode var, s32 value); +f32 evt_get_float_variable(Evt* script, Bytecode var); +f32 evt_set_float_variable(Evt* script, Bytecode var, f32 value); void set_script_timescale(Evt* script, f32 timescale); f32 sin_deg(f32 x); f32 cos_deg(f32 x); diff --git a/include/si_funcs.h b/include/si_funcs.h index cb2e72223d..cdeb66e076 100644 --- a/include/si_funcs.h +++ b/include/si_funcs.h @@ -1,9 +1,9 @@ #ifndef _EVT_FUNCS_H_ #define _EVT_FUNCS_H_ -f32 fixed_var_to_float(Bytecode scriptVar); +f32 evt_fixed_var_to_float(Bytecode scriptVar); -Bytecode float_to_fixed_var(f32 value); +Bytecode evt_float_to_fixed_var(f32 value); ApiStatus evt_handle_return(Evt* script); @@ -145,7 +145,7 @@ ApiStatus evt_handle_exec_wait(Evt* script); ApiStatus evt_handle_jump(Evt* script); -s32 _bound_script_trigger_handler(Trigger* trigger); +s32 evt_bound_script_trigger_handler(Trigger* trigger); ApiStatus evt_handle_bind(Evt* script); @@ -199,17 +199,17 @@ s32 func_802C73B8(Evt* script); s32 evt_execute_next_command(Evt *script); -s32 get_variable(Evt* script, Bytecode var); +s32 evt_get_variable(Evt* script, Bytecode var); -s32 get_variable_index(Evt* script, s32 var); +s32 evt_get_variable_index(Evt* script, s32 var); -s32 get_variable_index_alt(s32 var); +s32 evt_get_variable_index_alt(s32 var); -s32 set_variable(Evt* script, Bytecode var, s32 value); +s32 evt_set_variable(Evt* script, Bytecode var, s32 value); -f32 get_float_variable(Evt* script, Bytecode var); +f32 evt_get_float_variable(Evt* script, Bytecode var); -f32 set_float_variable(Evt* script, Bytecode var, s32 value); +f32 evt_set_float_variable(Evt* script, Bytecode var, s32 value); Bytecode* evt_find_label(Evt* script, s32 arg1); diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index e5ae2dc161..7a23eb355e 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -28,7 +28,7 @@ void init_enter_world_shared(void) { gOverrideFlags |= 0x8; - set_variable(NULL, EVT_SAVE_VAR(1), gGameStatusPtr->unk_A9); + evt_set_variable(NULL, EVT_SAVE_VAR(1), gGameStatusPtr->unk_A9); timeFreezeMode = 0; } diff --git a/src/1776B0.c b/src/1776B0.c index e42a1379ac..a40664317d 100644 --- a/src/1776B0.c +++ b/src/1776B0.c @@ -249,7 +249,7 @@ ApiStatus UseBattleCamPreset(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - preset = get_variable(script, *args++); + preset = evt_get_variable(script, *args++); D_8029F2A4 = 0; btl_cam_use_preset(preset); @@ -264,7 +264,7 @@ ApiStatus func_8024E664(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - preset = get_variable(script, *args++); + preset = evt_get_variable(script, *args++); D_8029F2A4 = 1; btl_cam_use_preset(preset); @@ -284,7 +284,7 @@ ApiStatus func_8024E6B4(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - func_8024E40C(get_variable(script, *args++)); + func_8024E40C(evt_get_variable(script, *args++)); script->functionTemp[0] = 1; break; case 1: @@ -306,8 +306,8 @@ ApiStatus func_8024E748(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - mode = get_variable(script, *args++); - val = get_variable(script, *args++); + mode = evt_get_variable(script, *args++); + val = evt_get_variable(script, *args++); switch (mode) { case 1: @@ -346,14 +346,14 @@ ApiStatus func_8024E820(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - camera->unk_1C = get_variable(script, *args++); - camera->unk_1E = get_variable(script, *args++); - camera->unk_20 = get_variable(script, *args++); - camera->unk_22 = get_variable(script, *args++); - camera->unk_24 = get_variable(script, *args++); - camera->unk_26 = get_variable(script, *args++) * 256; - camera->unk_28 = get_variable(script, *args++); - camera->zoomPercent = get_variable(script, *args++); + camera->unk_1C = evt_get_variable(script, *args++); + camera->unk_1E = evt_get_variable(script, *args++); + camera->unk_20 = evt_get_variable(script, *args++); + camera->unk_22 = evt_get_variable(script, *args++); + camera->unk_24 = evt_get_variable(script, *args++); + camera->unk_26 = evt_get_variable(script, *args++) * 256; + camera->unk_28 = evt_get_variable(script, *args++); + camera->zoomPercent = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -365,9 +365,9 @@ ApiStatus SetBattleCamTarget(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F270 = get_variable(script, *args++); - D_8029F274 = get_variable(script, *args++); - D_8029F278 = get_variable(script, *args++); + D_8029F270 = evt_get_variable(script, *args++); + D_8029F274 = evt_get_variable(script, *args++); + D_8029F278 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -379,9 +379,9 @@ ApiStatus func_8024E9B0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - camera->unk_54 = get_variable(script, *args++); - camera->unk_58 = get_variable(script, *args++); - camera->unk_5C = get_variable(script, *args++); + camera->unk_54 = evt_get_variable(script, *args++); + camera->unk_58 = evt_get_variable(script, *args++); + camera->unk_5C = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -393,7 +393,7 @@ ApiStatus SetBattleCamOffsetZ(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F286 = get_variable(script, *args++); + D_8029F286 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -404,7 +404,7 @@ ApiStatus AddBattleCamOffsetZ(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F286 += get_variable(script, *args++); + D_8029F286 += evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -415,7 +415,7 @@ ApiStatus SetBattleCamYaw(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F282 = get_variable(script, *args++); + D_8029F282 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -427,7 +427,7 @@ ApiStatus BattleCamTargetActor(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - actorID = get_variable(script, *args++); + actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -446,13 +446,13 @@ ApiStatus func_8024EB84(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - actorID = get_variable(script, *args++); + actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - func_8024E45C(actorID, get_variable(script, *args++)); + func_8024E45C(actorID, evt_get_variable(script, *args++)); return ApiStatus_DONE2; } @@ -465,7 +465,7 @@ ApiStatus MoveBattleCamOver(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F29E = get_variable(script, *args++); + D_8029F29E = evt_get_variable(script, *args++); D_80280CE4 = 0; if (battleStatus->camMovementScript != NULL) { @@ -482,7 +482,7 @@ ApiStatus SetBattleCamZoom(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F280 = get_variable(script, *args++); + D_8029F280 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -493,7 +493,7 @@ ApiStatus AddBattleCamZoom(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F280 += get_variable(script, *args++); + D_8029F280 += evt_get_variable(script, *args++); return ApiStatus_DONE2; } @@ -504,14 +504,14 @@ ApiStatus func_8024ECF8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - D_8029F2A2 = get_variable(script, *args++); - D_8029F2A3 = get_variable(script, *args++); - D_8029F2A5 = get_variable(script, *args++); + D_8029F2A2 = evt_get_variable(script, *args++); + D_8029F2A3 = evt_get_variable(script, *args++); + D_8029F2A5 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus FreezeBattleCam(Evt* script, s32 isInitialCall) { - D_80280CE0 = get_variable(script, *script->ptrReadPos); + D_80280CE0 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/17D6A0.c b/src/17D6A0.c index f69137230c..32fec065fc 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -60,7 +60,7 @@ ApiStatus IsMessageBoxDisplayed(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 outVar = *args++; - set_variable(script, outVar, btl_is_popup_displayed()); + evt_set_variable(script, outVar, btl_is_popup_displayed()); return ApiStatus_DONE2; } diff --git a/src/17FEB0.c b/src/17FEB0.c index 2448af9a89..7277f9eadf 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -51,7 +51,7 @@ ApiStatus ItemDamageEnemy(Evt* script, s32 isInitialCall) { battleStatus->currentAttackElement = *args++; battleStatus->currentAttackEventSuppression = 0; battleStatus->currentAttackStatus = *args++; - battleStatus->currentAttackDamage = get_variable(script, *args++); + battleStatus->currentAttackDamage = evt_get_variable(script, *args++); a5 = *args++; if ((a5 & 0x30) == 0x30) { @@ -98,7 +98,7 @@ ApiStatus ItemDamageEnemy(Evt* script, s32 isInitialCall) { return ApiStatus_FINISH; } - set_variable(script, itemDamageOut, itemDamage); + evt_set_variable(script, itemDamageOut, itemDamage); if (!does_script_exist_by_ref(script)) { return ApiStatus_FINISH; } @@ -118,8 +118,8 @@ ApiStatus ItemAfflictEnemy(Evt* script, s32 isInitialCall) { battleStatus->currentAttackElement = *args++; battleStatus->currentAttackEventSuppression = 0; battleStatus->currentAttackStatus = *args++; - battleStatus->currentAttackStatus |= get_variable(script, *args++); - battleStatus->currentAttackDamage = get_variable(script, *args++); + battleStatus->currentAttackStatus |= evt_get_variable(script, *args++); + battleStatus->currentAttackDamage = evt_get_variable(script, *args++); a5 = *args++; if ((a5 & 0x30) == 0x30) { @@ -166,7 +166,7 @@ ApiStatus ItemAfflictEnemy(Evt* script, s32 isInitialCall) { return ApiStatus_FINISH; } - set_variable(script, itemDamageOut, itemDamage); + evt_set_variable(script, itemDamageOut, itemDamage); if (!does_script_exist_by_ref(script)) { return ApiStatus_FINISH; } @@ -185,8 +185,8 @@ ApiStatus func_80252B3C(Evt* script, s32 isInitialCall) { battleStatus->currentAttackElement = *args++; battleStatus->currentAttackEventSuppression = 0; - battleStatus->currentAttackStatus = get_variable(script, *args++); - battleStatus->currentAttackDamage = get_variable(script, *args++); + battleStatus->currentAttackStatus = evt_get_variable(script, *args++); + battleStatus->currentAttackDamage = evt_get_variable(script, *args++); a5 = *args++; if ((a5 & 0x30) == 0x30) { @@ -233,7 +233,7 @@ ApiStatus func_80252B3C(Evt* script, s32 isInitialCall) { return ApiStatus_FINISH; } - set_variable(script, itemDamageOut, itemDamage); + evt_set_variable(script, itemDamageOut, itemDamage); if (!does_script_exist_by_ref(script)) { return ApiStatus_FINISH; } @@ -253,7 +253,7 @@ ApiStatus ItemCheckHit(Evt* script, s32 isInitialCall) { battleStatus->currentAttackElement = *args++; battleStatus->currentAttackEventSuppression = 0; battleStatus->currentAttackStatus = *args++; - battleStatus->currentAttackDamage = get_variable(script, *args++); + battleStatus->currentAttackDamage = evt_get_variable(script, *args++); a5 = *args++; if ((a5 & 0x30) == 0x30) { @@ -300,7 +300,7 @@ ApiStatus ItemCheckHit(Evt* script, s32 isInitialCall) { return ApiStatus_FINISH; } - set_variable(script, itemDamageOut, itemDamage); + evt_set_variable(script, itemDamageOut, itemDamage); return ApiStatus_DONE2; } diff --git a/src/181810.c b/src/181810.c index 81fde0fb6b..f1ae42ff8d 100644 --- a/src/181810.c +++ b/src/181810.c @@ -25,11 +25,11 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) { s32 stringID2; if (isInitialCall) { - stringID = get_variable(script, *args++); - actorID = get_variable(script, *args++); - partIndex = get_variable(script, *args++); - gSpeakingActorTalkAnim = get_variable(script, *args++); - gSpeakingActorIdleAnim = get_variable(script, *args++); + stringID = evt_get_variable(script, *args++); + actorID = evt_get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + gSpeakingActorTalkAnim = evt_get_variable(script, *args++); + gSpeakingActorIdleAnim = evt_get_variable(script, *args++); stringID2 = stringID; if (actorID == ACTOR_SELF) { @@ -114,7 +114,7 @@ ApiStatus ShowBattleChoice(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { - s32 stringID = get_variable(script, *args); + s32 stringID = evt_get_variable(script, *args); script->functionTemp[1] = 0; D_8029FA64 = msg_get_printer_for_string(stringID, &script->functionTemp[1]); @@ -133,7 +133,7 @@ ApiStatus ShowBattleChoice(Evt* script, s32 isInitialCall) { } ApiStatus func_802535B4(Evt* script, s32 isInitialCall) { - if (get_variable(script, *script->ptrReadPos)) { + if (evt_get_variable(script, *script->ptrReadPos)) { decrement_status_menu_disabled(); } else { increment_status_menu_disabled(); @@ -142,7 +142,7 @@ ApiStatus func_802535B4(Evt* script, s32 isInitialCall) { } ApiStatus OverrideBattleDmaDest(Evt* script, s32 isInitialCall) { - gBattleDmaDest = get_variable(script, *script->ptrReadPos); + gBattleDmaDest = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -151,7 +151,7 @@ INCLUDE_ASM(s32, "181810", LoadBattleDmaData); ApiStatus func_802536A8(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; - if (get_variable(script, *script->ptrReadPos) != 0) { + if (evt_get_variable(script, *script->ptrReadPos) != 0) { battleStatus->unk_92 |= 1; gOverrideFlags |= 0x80; } else { @@ -165,7 +165,7 @@ ApiStatus func_802536A8(Evt* script, s32 isInitialCall) { ApiStatus func_80253734(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; - s32 val = get_variable(script, *script->ptrReadPos); + s32 val = evt_get_variable(script, *script->ptrReadPos); switch (val) { case 0: @@ -202,15 +202,15 @@ ApiStatus func_802537C0(Evt* script, s32 isInitialCall) { t3 = 1; } - set_variable(script, a0, 1); - set_variable(script, a1, t3); + evt_set_variable(script, a0, 1); + evt_set_variable(script, a1, t3); return ApiStatus_DONE2; } ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Bytecode soundID = *args++; Actor* actor; @@ -226,8 +226,8 @@ ApiStatus PlaySoundAtActor(Evt* script, s32 isInitialCall) { ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); Bytecode soundID = *args++; ActorPart* part; @@ -243,8 +243,8 @@ ApiStatus PlaySoundAtPart(Evt* script, s32 isInitialCall) { ApiStatus PlayLoopingSoundAtActor(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 idx = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 idx = evt_get_variable(script, *args++); Bytecode soundID = *args++; Actor* actor; @@ -261,8 +261,8 @@ ApiStatus PlayLoopingSoundAtActor(Evt* script, s32 isInitialCall) { ApiStatus StopLoopingSoundAtActor(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 idx = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 idx = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -281,7 +281,7 @@ ApiStatus StopLoopingSoundAtActor(Evt* script, s32 isInitialCall) { } ApiStatus SetForegroundModelsVisibleUnchecked(Evt* script, s32 isInitialCall) { - if (get_variable(script, *script->ptrReadPos)) { + if (evt_get_variable(script, *script->ptrReadPos)) { show_foreground_models_unchecked(); } else { hide_foreground_models_unchecked(); @@ -290,7 +290,7 @@ ApiStatus SetForegroundModelsVisibleUnchecked(Evt* script, s32 isInitialCall) { } ApiStatus SetForegroundModelsVisible(Evt* script, s32 isInitialCall) { - if (get_variable(script, *script->ptrReadPos)) { + if (evt_get_variable(script, *script->ptrReadPos)) { show_foreground_models(); } else { hide_foreground_models(); @@ -302,9 +302,9 @@ ApiStatus func_80253B30(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Bytecode a0 = *args++; Bytecode a1 = *args++; - s32 var1 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); - set_variable(script, a0, (a1 | 0xFE) | (var1 * 256)); + evt_set_variable(script, a0, (a1 | 0xFE) | (var1 * 256)); return ApiStatus_DONE2; } @@ -312,10 +312,10 @@ ApiStatus MakeStatusField(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 outVar = *args++; s32 a = *args++; - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); - set_variable(script, outVar, a | 0x80000000 | (c << 8) | b); + evt_set_variable(script, outVar, a | 0x80000000 | (c << 8) | b); return ApiStatus_DONE2; } @@ -361,7 +361,7 @@ ApiStatus MultiplyByActorScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); - set_float_variable(script, args[0], get_float_variable(script, args[0]) * actor->scalingFactor); + evt_set_float_variable(script, args[0], evt_get_float_variable(script, args[0]) * actor->scalingFactor); return ApiStatus_DONE2; } @@ -369,8 +369,8 @@ ApiStatus MultiplyVec2ByActorScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); - set_float_variable(script, args[0], get_float_variable(script, args[0]) * actor->scalingFactor); - set_float_variable(script, args[1], get_float_variable(script, args[1]) * actor->scalingFactor); + evt_set_float_variable(script, args[0], evt_get_float_variable(script, args[0]) * actor->scalingFactor); + evt_set_float_variable(script, args[1], evt_get_float_variable(script, args[1]) * actor->scalingFactor); return ApiStatus_DONE2; } @@ -379,9 +379,9 @@ ApiStatus MultiplyVec3ByActorScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); - set_float_variable(script, args[0], get_float_variable(script, args[0]) * actor->scalingFactor); - set_float_variable(script, args[1], get_float_variable(script, args[1]) * actor->scalingFactor); - set_float_variable(script, args[2], get_float_variable(script, args[2]) * actor->scalingFactor); + evt_set_float_variable(script, args[0], evt_get_float_variable(script, args[0]) * actor->scalingFactor); + evt_set_float_variable(script, args[1], evt_get_float_variable(script, args[1]) * actor->scalingFactor); + evt_set_float_variable(script, args[2], evt_get_float_variable(script, args[2]) * actor->scalingFactor); return ApiStatus_DONE2; } @@ -389,17 +389,17 @@ ApiStatus MultiplyVec3ByActorScale(Evt* script, s32 isInitialCall) { ApiStatus ApplyShrinkFromOwner(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); - s32 amt = get_variable(script, *args); + s32 amt = evt_get_variable(script, *args); if (actor->debuff == STATUS_SHRINK && amt > 0) { amt /= 2; } - set_variable(script, *args, amt); + evt_set_variable(script, *args, amt); return ApiStatus_DONE2; } ApiStatus StartRumble(Evt* script, s32 isInitialCall) { - start_rumble_type(get_variable(script, *script->ptrReadPos)); + start_rumble_type(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/18F340.c b/src/18F340.c index 13fcf85bab..175896e114 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -246,9 +246,9 @@ ApiStatus func_802613A8(Evt* script, s32 isInitialCall) { ApiStatus func_802613BC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); playFX_6B(6, var1, var2 + 15, var3, 1.2f, 30); return ApiStatus_DONE2; @@ -256,9 +256,9 @@ ApiStatus func_802613BC(Evt* script, s32 isInitialCall) { ApiStatus func_80261478(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); playFX_52(9, var1, var2 + 15, var3, 5.0f, 15); return ApiStatus_DONE2; @@ -397,9 +397,9 @@ ApiStatus HasMerleeCastsLeft(Evt* script, s32 isInitialCall) { ApiStatus func_802619E8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); s32 screenX; s32 screenY; s32 screenZ; @@ -434,10 +434,10 @@ ApiStatus func_80261B40(Evt* script, s32 isInitialCall) { ApiStatus FXRecoverHP(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); playFX_40(0, var1, var2, var3, var4); return ApiStatus_DONE2; @@ -445,10 +445,10 @@ ApiStatus FXRecoverHP(Evt* script, s32 isInitialCall) { ApiStatus FXRecoverFP(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); playFX_40(1, var1, var2, var3, var4); return ApiStatus_DONE2; diff --git a/src/196AA0.c b/src/196AA0.c index d45f2ab321..6f1e40b5d0 100644 --- a/src/196AA0.c +++ b/src/196AA0.c @@ -6,7 +6,7 @@ extern void* actionCommandDmaTable[23]; extern s32 D_8029FBC0; ApiStatus LoadActionCommand(Evt* script, s32 isInitialCall) { - s32 cmd = get_variable(script, *script->ptrReadPos); + s32 cmd = evt_get_variable(script, *script->ptrReadPos); dma_copy(actionCommandDmaTable[cmd * 3], actionCommandDmaTable[cmd * 3 + 1], actionCommandDmaTable[cmd * 3 + 2]); return ApiStatus_DONE2; @@ -292,39 +292,39 @@ INCLUDE_ASM(void, "196AA0", func_80269118); INCLUDE_ASM(s32, "196AA0", func_80269160); ApiStatus func_8026919C(Evt* script, s32 isInitialCall) { - gBattleStatus.unk_434 = get_variable(script, *script->ptrReadPos); + gBattleStatus.unk_434 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus SetupMashMeter(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - gActionCommandStatus.mashMeterIntervals = get_variable(script, *args++); - gActionCommandStatus.mashMeterCutoffs[1] = get_variable(script, *args++); - gActionCommandStatus.mashMeterCutoffs[2] = get_variable(script, *args++); - gActionCommandStatus.mashMeterCutoffs[3] = get_variable(script, *args++); - gActionCommandStatus.mashMeterCutoffs[4] = get_variable(script, *args++); - gActionCommandStatus.mashMeterCutoffs[5] = get_variable(script, *args++); + gActionCommandStatus.mashMeterIntervals = evt_get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[1] = evt_get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[2] = evt_get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[3] = evt_get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[4] = evt_get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[5] = evt_get_variable(script, *args++); gActionCommandStatus.mashMeterCutoffs[0] = gActionCommandStatus.mashMeterCutoffs[1] / 2; return ApiStatus_DONE2; } ApiStatus GetActionSuccess(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); return ApiStatus_DONE2; } ApiStatus SetActionSuccess(Evt* script, s32 isInitialCall) { - gBattleStatus.actionSuccess = get_variable(script, *script->ptrReadPos); + gBattleStatus.actionSuccess = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus SetActionCommandMode(Evt* script, s32 isInitialCall) { - gBattleStatus.unk_83 = get_variable(script, *script->ptrReadPos); + gBattleStatus.unk_83 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus GetActionCommandMode(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.unk_83); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_83); return ApiStatus_DONE2; } @@ -346,41 +346,41 @@ INCLUDE_ASM(s32, "196AA0", func_80269470); INCLUDE_ASM(s32, "196AA0", func_802694A4); ApiStatus GetActionSuccessCopy(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); return ApiStatus_DONE2; } ApiStatus func_80269524(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.unk_86); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_86); return ApiStatus_DONE2; } ApiStatus func_80269550(Evt* script, s32 isInitialCall) { - gBattleStatus.unk_86 = get_variable(script, *script->ptrReadPos); + gBattleStatus.unk_86 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus GetBlockResult(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.blockResult); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.blockResult); return ApiStatus_DONE2; } ApiStatus GetActionResult(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.unk_84); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_84); return ApiStatus_DONE2; } ApiStatus SetActionResult(Evt* script, s32 isInitialCall) { - gBattleStatus.unk_84 = get_variable(script, *script->ptrReadPos); + gBattleStatus.unk_84 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus func_80269600(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.unk_85); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_85); return ApiStatus_DONE2; } ApiStatus func_8026962C(Evt* script, s32 isInitialCall) { - gBattleStatus.unk_85 = get_variable(script, *script->ptrReadPos); + gBattleStatus.unk_85 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/197F40.c b/src/197F40.c index 0e99da8d40..0c29ea0a9e 100644 --- a/src/197F40.c +++ b/src/197F40.c @@ -102,17 +102,17 @@ Actor* get_actor(ActorID actorID) { INCLUDE_ASM(s32, "197F40", LoadBattleSection); ApiStatus GetBattlePhase(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.battlePhase); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.battlePhase); return ApiStatus_DONE2; } ApiStatus GetLastElement(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.currentAttackElement); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.currentAttackElement); return ApiStatus_DONE2; } ApiStatus func_80269E80(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.unk_19A); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.unk_19A); return ApiStatus_DONE2; } @@ -124,7 +124,7 @@ ApiStatus func_80269EAC(Evt* script, s32 isInitialCall) { } ApiStatus SetGoalToHome(Evt* script, s32 isInitialCall) { - ActorID actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = evt_get_variable(script, *script->ptrReadPos); Actor* actor; if (actorID == ACTOR_SELF) { @@ -140,7 +140,7 @@ ApiStatus SetGoalToHome(Evt* script, s32 isInitialCall) { } ApiStatus SetIdleGoalToHome(Evt* script, s32 isInitialCall) { - ActorID actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = evt_get_variable(script, *script->ptrReadPos); Actor* actor; if (actorID == ACTOR_SELF) { @@ -159,7 +159,7 @@ INCLUDE_ASM(s32, "197F40", SetGoalToIndex); ApiStatus GetIndexFromPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 a1 = *args++; Actor* actor; @@ -168,14 +168,14 @@ ApiStatus GetIndexFromPos(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - set_variable(script, a1, get_nearest_home_index(actor->currentPos.x, actor->currentPos.y, actor->currentPos.z)); + evt_set_variable(script, a1, get_nearest_home_index(actor->currentPos.x, actor->currentPos.y, actor->currentPos.z)); return ApiStatus_DONE2; } ApiStatus GetIndexFromHome(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 a1 = *args++; Actor* actor; @@ -184,14 +184,14 @@ ApiStatus GetIndexFromHome(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - set_variable(script, a1, get_nearest_home_index(actor->homePos.x, actor->homePos.y, actor->homePos.z)); + evt_set_variable(script, a1, get_nearest_home_index(actor->homePos.x, actor->homePos.y, actor->homePos.z)); return ApiStatus_DONE2; } ApiStatus CountPlayerTargets(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 targetSelectionFlags = *args++; s32 outVar = *args++; Actor* actor; @@ -201,7 +201,7 @@ ApiStatus CountPlayerTargets(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - set_variable(script, outVar, count_targets(actor, get_nearest_home_index(actor->currentPos.x, actor->currentPos.y, + evt_set_variable(script, outVar, count_targets(actor, get_nearest_home_index(actor->currentPos.x, actor->currentPos.y, actor->currentPos.z), targetSelectionFlags)); return ApiStatus_DONE2; @@ -209,7 +209,7 @@ ApiStatus CountPlayerTargets(Evt* script, s32 isInitialCall) { ApiStatus ForceHomePos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); f32 x, y, z; Actor* actor; @@ -217,9 +217,9 @@ ApiStatus ForceHomePos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_variable(script, *args++); - y = get_variable(script, *args++); - z = get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); + z = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->homePos.x = x; @@ -234,7 +234,7 @@ ApiStatus ForceHomePos(Evt* script, s32 isInitialCall) { ApiStatus SetHomePos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); f32 x, y, z; Actor* actor; @@ -242,9 +242,9 @@ ApiStatus SetHomePos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_variable(script, *args++); - y = get_variable(script, *args++); - z = get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); + z = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->homePos.x = x; @@ -256,7 +256,7 @@ ApiStatus SetHomePos(Evt* script, s32 isInitialCall) { ApiStatus SetGoalToTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -271,8 +271,8 @@ ApiStatus SetGoalToTarget(Evt* script, s32 isInitialCall) { ApiStatus SetPartGoalToTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -287,7 +287,7 @@ ApiStatus SetPartGoalToTarget(Evt* script, s32 isInitialCall) { ApiStatus SetGoalToFirstTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; SelectableTarget* target; @@ -304,7 +304,7 @@ ApiStatus SetGoalToFirstTarget(Evt* script, s32 isInitialCall) { ApiStatus SetGoalPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; ActorMovement* walk; f32 x, y, z; @@ -318,21 +318,21 @@ ApiStatus SetGoalPos(Evt* script, s32 isInitialCall) { if (*args == -12345678) { x = actor->walk.goalPos.x; } else { - x = get_variable(script, *args); + x = evt_get_variable(script, *args); } *args++; if (*args == -12345678) { y = walk->goalPos.y; } else { - y = get_variable(script, *args); + y = evt_get_variable(script, *args); } *args++; if (*args == -12345678) { z = walk->goalPos.z; } else { - z = get_variable(script, *args); + z = evt_get_variable(script, *args); } walk->goalPos.x = x; @@ -344,7 +344,7 @@ ApiStatus SetGoalPos(Evt* script, s32 isInitialCall) { ApiStatus SetIdleGoal(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; ActorMovement* fly; f32 x, y, z; @@ -358,21 +358,21 @@ ApiStatus SetIdleGoal(Evt* script, s32 isInitialCall) { if (*args == -12345678) { x = actor->fly.goalPos.x; } else { - x = get_variable(script, *args); + x = evt_get_variable(script, *args); } *args++; if (*args == -12345678) { y = fly->goalPos.y; } else { - y = get_variable(script, *args); + y = evt_get_variable(script, *args); } *args++; if (*args == -12345678) { z = fly->goalPos.z; } else { - z = get_variable(script, *args); + z = evt_get_variable(script, *args); } fly->goalPos.x = x; @@ -383,7 +383,7 @@ ApiStatus SetIdleGoal(Evt* script, s32 isInitialCall) { ApiStatus AddGoalPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; f32 x, y, z; @@ -391,9 +391,9 @@ ApiStatus AddGoalPos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actor = get_actor(actorID); actor->walk.goalPos.x += x; @@ -405,7 +405,7 @@ ApiStatus AddGoalPos(Evt* script, s32 isInitialCall) { ApiStatus GetGoalPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 outX, outY, outZ; s32 x, y, z; @@ -424,9 +424,9 @@ ApiStatus GetGoalPos(Evt* script, s32 isInitialCall) { y = actor->walk.goalPos.y; z = actor->walk.goalPos.z; - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } @@ -434,7 +434,7 @@ ApiStatus GetGoalPos(Evt* script, s32 isInitialCall) { // should this be renamed to GetFlyGoal ? ApiStatus GetIdleGoal(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 outX, outY, outZ; s32 x, y, z; @@ -453,17 +453,17 @@ ApiStatus GetIdleGoal(Evt* script, s32 isInitialCall) { y = actor->fly.goalPos.y; z = actor->fly.goalPos.z; - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } ApiStatus GetPartTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); Actor* actor; ActorPart* actorPart; s32 outX, outY, outZ; @@ -484,16 +484,16 @@ ApiStatus GetPartTarget(Evt* script, s32 isInitialCall) { y = actorPart->movement->goalPos.y; z = actorPart->movement->goalPos.z; - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } ApiStatus GetActorPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 outX, outY, outZ; s32 x, y, z; @@ -512,16 +512,16 @@ ApiStatus GetActorPos(Evt* script, s32 isInitialCall) { y = actor->currentPos.y; z = actor->currentPos.z; - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* actorPart; s32 outX, outY, outZ; @@ -531,7 +531,7 @@ ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); outX = *args++; @@ -548,16 +548,16 @@ ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) { z = actorPart->absolutePosition.z; } - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } ApiStatus GetPartPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* actorPart; s32 outX, outY, outZ; @@ -567,7 +567,7 @@ ApiStatus GetPartPos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); outX = *args++; @@ -578,16 +578,16 @@ ApiStatus GetPartPos(Evt* script, s32 isInitialCall) { y = actorPart->currentPos.y; z = actorPart->currentPos.z; - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } ApiStatus GetHomePos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 outX, outY, outZ; s32 x, y, z; @@ -606,16 +606,16 @@ ApiStatus GetHomePos(Evt* script, s32 isInitialCall) { y = actor->homePos.y; z = actor->homePos.z; - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } ApiStatus SetActorPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; f32 x, y, z; @@ -623,9 +623,9 @@ ApiStatus SetActorPos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_variable(script, *args++); - y = get_variable(script, *args++); - z = get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); + z = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->currentPos.x = x; @@ -637,7 +637,7 @@ ApiStatus SetActorPos(Evt* script, s32 isInitialCall) { ApiStatus SetPartPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 partIndex; f32 x, y, z; @@ -647,10 +647,10 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - x = get_variable(script, *args++); - y = get_variable(script, *args++); - z = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); + z = evt_get_variable(script, *args++); actor = get_actor(actorID); @@ -681,7 +681,7 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) { ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 partIndex; f32 x, y; @@ -691,9 +691,9 @@ ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - x = get_variable(script, *args++); - y = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); actor = get_actor(actorID); @@ -713,21 +713,21 @@ ApiStatus SetEnemyTargetOffset(Evt* script, s32 isInitialCall) { ApiStatus SetAnimation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_animation(actorID, get_variable(script, *args++), get_variable(script, *args++)); + set_animation(actorID, evt_get_variable(script, *args++), evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus GetAnimation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 var1; ActorPart* actorPart; s32 a1; @@ -735,46 +735,46 @@ ApiStatus GetAnimation(Evt* script, s32 isInitialCall) { if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - var1 = get_variable(script, *args++); + var1 = evt_get_variable(script, *args++); a1 = *args++; actorPart = get_actor_part(get_actor(actorID), var1); if (actorPart != NULL) { - set_variable(script, a1, actorPart->currentAnimation); + evt_set_variable(script, a1, actorPart->currentAnimation); } return ApiStatus_DONE2; } ApiStatus SetAnimationRate(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_animation_rate(actorID, get_variable(script, *args++), get_float_variable(script, *args++)); + set_animation_rate(actorID, evt_get_variable(script, *args++), evt_get_float_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus SetActorYaw(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_actor_yaw(actorID, get_variable(script, *args++)); + set_actor_yaw(actorID, evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus GetActorYaw(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 a1; if (actorID == ACTOR_SELF) { @@ -783,25 +783,25 @@ ApiStatus GetActorYaw(Evt* script, s32 isInitialCall) { a1 = *args++; - set_variable(script, a1, get_actor(actorID)->yaw); + evt_set_variable(script, a1, get_actor(actorID)->yaw); return ApiStatus_DONE2; } ApiStatus SetPartYaw(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_part_yaw(actorID, get_variable(script, *args++), get_variable(script, *args++)); + set_part_yaw(actorID, evt_get_variable(script, *args++), evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus GetPartYaw(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; s32 a1; @@ -809,51 +809,51 @@ ApiStatus GetPartYaw(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); a1 = *args++; - set_variable(script, a1, get_actor_part(get_actor(actorID), partIndex)->yaw); + evt_set_variable(script, a1, get_actor_part(get_actor(actorID), partIndex)->yaw); return ApiStatus_DONE2; } ApiStatus SetActorJumpGravity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); f32 jumpAccel; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - jumpAccel = get_float_variable(script, *args++); + jumpAccel = evt_get_float_variable(script, *args++); get_actor(actorID)->walk.acceleration = jumpAccel; return ApiStatus_DONE2; } ApiStatus SetActorIdleJumpGravity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); f32 flyJumpAccel; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - flyJumpAccel = get_float_variable(script, *args++); + flyJumpAccel = evt_get_float_variable(script, *args++); get_actor(actorID)->fly.acceleration = flyJumpAccel; return ApiStatus_DONE2; } ApiStatus SetActorSpeed(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); f32 moveSpeed; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - moveSpeed = get_float_variable(script, *args++); + moveSpeed = evt_get_float_variable(script, *args++); get_actor(actorID)->walk.speed = moveSpeed; return ApiStatus_DONE2; } @@ -861,21 +861,21 @@ ApiStatus SetActorSpeed(Evt* script, s32 isInitialCall) { // SetActorFlySpeed? ApiStatus SetActorIdleSpeed(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); f32 flySpeed; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - flySpeed = get_float_variable(script, *args++); + flySpeed = evt_get_float_variable(script, *args++); get_actor(actorID)->fly.speed = flySpeed; return ApiStatus_DONE2; } ApiStatus SetPartJumpGravity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; f32 jumpScale; @@ -883,8 +883,8 @@ ApiStatus SetPartJumpGravity(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - jumpScale = get_float_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + jumpScale = evt_get_float_variable(script, *args++); get_actor_part(get_actor(actorID), partIndex)->movement->jumpScale = jumpScale; return ApiStatus_DONE2; @@ -892,7 +892,7 @@ ApiStatus SetPartJumpGravity(Evt* script, s32 isInitialCall) { ApiStatus SetPartMoveSpeed(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; f32 moveSpeed; @@ -900,8 +900,8 @@ ApiStatus SetPartMoveSpeed(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - moveSpeed = get_float_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + moveSpeed = evt_get_float_variable(script, *args++); get_actor_part(get_actor(actorID), partIndex)->movement->moveSpeed = moveSpeed; return ApiStatus_DONE2; @@ -909,7 +909,7 @@ ApiStatus SetPartMoveSpeed(Evt* script, s32 isInitialCall) { ApiStatus SetJumpAnimations(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 jumpPartIndex; s32 animJumpRise; @@ -920,7 +920,7 @@ ApiStatus SetJumpAnimations(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - jumpPartIndex = get_variable(script, *args++); + jumpPartIndex = evt_get_variable(script, *args++); animJumpRise = *args++; animJumpFall = *args++; animJumpLand = *args++; @@ -936,7 +936,7 @@ ApiStatus SetJumpAnimations(Evt* script, s32 isInitialCall) { ApiStatus AddActorPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; f32 x, y, z; @@ -944,9 +944,9 @@ ApiStatus AddActorPos(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actor = get_actor(actorID); actor->currentPos.x += x; @@ -958,7 +958,7 @@ ApiStatus AddActorPos(Evt* script, s32 isInitialCall) { ApiStatus SetActorDispOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; f32 x, y, z; @@ -966,9 +966,9 @@ ApiStatus SetActorDispOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actor = get_actor(actorID); actor->headOffset.x = x; @@ -980,7 +980,7 @@ ApiStatus SetActorDispOffset(Evt* script, s32 isInitialCall) { ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 partIndex; s32 outX, outY, outZ; @@ -990,7 +990,7 @@ ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); outX = *args++; outY = *args++; outZ = *args++; @@ -1007,16 +1007,16 @@ ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) { z = actorPart->visualOffset.z; } - set_variable(script, outX, x); - set_variable(script, outY, y); - set_variable(script, outZ, z); + evt_set_variable(script, outX, x); + evt_set_variable(script, outY, y); + evt_set_variable(script, outZ, z); return ApiStatus_DONE2; } ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 partIndex; f32 x, y, z; @@ -1025,11 +1025,11 @@ ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); if (!(actorPart->flags & 0x100000)) { @@ -1047,7 +1047,7 @@ ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) { ApiStatus AddPartDispOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 partIndex; f32 x, y, z; @@ -1056,11 +1056,11 @@ ApiStatus AddPartDispOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); if (!(actorPart->flags & 0x100000)) { @@ -1081,7 +1081,7 @@ ApiStatus func_8026BF48(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus2 = &gBattleStatus; Bytecode* args = script->ptrReadPos; - if (get_variable(script, *args++) != 0) { + if (evt_get_variable(script, *args++) != 0) { battleStatus->unk_8C++; } else if (battleStatus->unk_8C > 0) { battleStatus2->unk_8C--; @@ -1092,7 +1092,7 @@ ApiStatus func_8026BF48(Evt* script, s32 isInitialCall) { ApiStatus GetActorVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 var1; s32 a2; @@ -1100,17 +1100,17 @@ ApiStatus GetActorVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - var1 = get_variable(script, *args++); + var1 = evt_get_variable(script, *args++); a2 = *args++; - set_variable(script, a2, get_actor(actorID)->varTable[var1]); + evt_set_variable(script, a2, get_actor(actorID)->varTable[var1]); return ApiStatus_DONE2; } ApiStatus SetActorVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 index; s32 val; @@ -1118,8 +1118,8 @@ ApiStatus SetActorVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - index = get_variable(script, *args++); - val = get_variable(script, *args++); + index = evt_get_variable(script, *args++); + val = evt_get_variable(script, *args++); get_actor(actorID)->varTable[index] = val; @@ -1129,7 +1129,7 @@ ApiStatus SetActorVar(Evt* script, s32 isInitialCall) { #ifdef NON_MATCHING ApiStatus AddActorVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 index; s32 val; @@ -1137,8 +1137,8 @@ ApiStatus AddActorVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - index = get_variable(script, *args++); - val = get_variable(script, *args++); + index = evt_get_variable(script, *args++); + val = evt_get_variable(script, *args++); get_actor(actorID)->varTable[index] += val; @@ -1150,7 +1150,7 @@ INCLUDE_ASM(s32, "197F40", AddActorVar); ApiStatus GetPartMovementVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; s32 tableIndex; s32 outVar; @@ -1159,18 +1159,18 @@ ApiStatus GetPartMovementVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - tableIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + tableIndex = evt_get_variable(script, *args++); outVar = *args++; - set_variable(script, outVar, get_actor_part(get_actor(actorID), partIndex)->movement->varTable[tableIndex]); + evt_set_variable(script, outVar, get_actor_part(get_actor(actorID), partIndex)->movement->varTable[tableIndex]); return ApiStatus_DONE2; } ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; s32 tableIndex; s32 val; @@ -1179,9 +1179,9 @@ ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - tableIndex = get_variable(script, *args++); - val = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + tableIndex = evt_get_variable(script, *args++); + val = evt_get_variable(script, *args++); get_actor_part(get_actor(actorID), partIndex)->movement->varTable[tableIndex] = val; @@ -1190,7 +1190,7 @@ ApiStatus SetPartMovementVar(Evt* script, s32 isInitialCall) { ApiStatus AddPartMovementVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; s32 tableIndex; s32 val; @@ -1199,9 +1199,9 @@ ApiStatus AddPartMovementVar(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - tableIndex = get_variable(script, *args++); - val = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + tableIndex = evt_get_variable(script, *args++); + val = evt_get_variable(script, *args++); get_actor_part(get_actor(actorID), partIndex)->movement->varTable[tableIndex] += val; @@ -1210,7 +1210,7 @@ ApiStatus AddPartMovementVar(Evt* script, s32 isInitialCall) { ApiStatus SetActorRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 x, y, z; @@ -1218,9 +1218,9 @@ ApiStatus SetActorRotation(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actor = get_actor(actorID); @@ -1241,7 +1241,7 @@ ApiStatus SetActorRotation(Evt* script, s32 isInitialCall) { ApiStatus SetActorRotationOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 x, y, z; @@ -1249,9 +1249,9 @@ ApiStatus SetActorRotationOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actor = get_actor(actorID); @@ -1264,7 +1264,7 @@ ApiStatus SetActorRotationOffset(Evt* script, s32 isInitialCall) { ApiStatus GetActorRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 x, y, z; @@ -1278,17 +1278,17 @@ ApiStatus GetActorRotation(Evt* script, s32 isInitialCall) { actor = get_actor(actorID); - set_variable(script, x, actor->rotation.x); - set_variable(script, y, actor->rotation.y); - set_variable(script, z, actor->rotation.z); + evt_set_variable(script, x, actor->rotation.x); + evt_set_variable(script, y, actor->rotation.y); + evt_set_variable(script, z, actor->rotation.z); return ApiStatus_DONE2; } ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1296,9 +1296,9 @@ ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); @@ -1311,8 +1311,8 @@ ApiStatus SetPartRotation(Evt* script, s32 isInitialCall) { ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1320,9 +1320,9 @@ ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); @@ -1335,8 +1335,8 @@ ApiStatus SetPartRotationOffset(Evt* script, s32 isInitialCall) { ApiStatus GetPartRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1350,16 +1350,16 @@ ApiStatus GetPartRotation(Evt* script, s32 isInitialCall) { actorPart = get_actor_part(get_actor(actorID), partIndex); - set_float_variable(script, x, actorPart->rotation.x); - set_float_variable(script, y, actorPart->rotation.y); - set_float_variable(script, z, actorPart->rotation.z); + evt_set_float_variable(script, x, actorPart->rotation.x); + evt_set_float_variable(script, y, actorPart->rotation.y); + evt_set_float_variable(script, z, actorPart->rotation.z); return ApiStatus_DONE2; } ApiStatus SetActorScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; f32 x, y, z; @@ -1367,9 +1367,9 @@ ApiStatus SetActorScale(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actor = get_actor(actorID); @@ -1382,7 +1382,7 @@ ApiStatus SetActorScale(Evt* script, s32 isInitialCall) { ApiStatus SetActorScaleModifier(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; f32 x, y, z; @@ -1390,9 +1390,9 @@ ApiStatus SetActorScaleModifier(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actor = get_actor(actorID); @@ -1405,7 +1405,7 @@ ApiStatus SetActorScaleModifier(Evt* script, s32 isInitialCall) { ApiStatus GetActorScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; f32 x, y, z; @@ -1419,17 +1419,17 @@ ApiStatus GetActorScale(Evt* script, s32 isInitialCall) { actor = get_actor(actorID); - set_float_variable(script, x, actor->scale.x); - set_float_variable(script, y, actor->scale.y); - set_float_variable(script, z, actor->scale.z); + evt_set_float_variable(script, x, actor->scale.x); + evt_set_float_variable(script, y, actor->scale.y); + evt_set_float_variable(script, z, actor->scale.z); return ApiStatus_DONE2; } ApiStatus SetPartScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); ActorPart* actorPart; f32 x, y, z; @@ -1437,9 +1437,9 @@ ApiStatus SetPartScale(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); @@ -1452,8 +1452,8 @@ ApiStatus SetPartScale(Evt* script, s32 isInitialCall) { ApiStatus GetPartScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); ActorPart* actorPart; s32 x, y, z; @@ -1467,15 +1467,15 @@ ApiStatus GetPartScale(Evt* script, s32 isInitialCall) { actorPart = get_actor_part(get_actor(actorID), partIndex); - set_float_variable(script, x, actorPart->scale.x); - set_float_variable(script, y, actorPart->scale.y); - set_float_variable(script, z, actorPart->scale.z); + evt_set_float_variable(script, x, actorPart->scale.x); + evt_set_float_variable(script, y, actorPart->scale.y); + evt_set_float_variable(script, z, actorPart->scale.z); return ApiStatus_DONE2; } ApiStatus GetBattleFlags(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.flags1); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.flags1); return ApiStatus_DONE2; } @@ -1483,7 +1483,7 @@ ApiStatus SetBattleFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Bytecode a0 = *args++; - if (get_variable(script, *args)) { + if (evt_get_variable(script, *args)) { gBattleStatus.flags1 |= a0; } else { gBattleStatus.flags1 &= ~a0; @@ -1493,7 +1493,7 @@ ApiStatus SetBattleFlagBits(Evt* script, s32 isInitialCall) { } ApiStatus GetBattleFlags2(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.flags2); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.flags2); return ApiStatus_DONE2; } @@ -1501,7 +1501,7 @@ ApiStatus SetBattleFlagBits2(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Bytecode a0 = *args++; - if (get_variable(script, *args)) { + if (evt_get_variable(script, *args)) { BattleStatus* battleStatus = &gBattleStatus; battleStatus->flags2 |= a0; } else { @@ -1514,7 +1514,7 @@ ApiStatus SetBattleFlagBits2(Evt* script, s32 isInitialCall) { ApiStatus SetActorFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 a1; if (actorID == ACTOR_SELF) { @@ -1529,7 +1529,7 @@ ApiStatus SetActorFlags(Evt* script, s32 isInitialCall) { ApiStatus SetActorFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 a1; s32 var1; Actor* actor; @@ -1539,7 +1539,7 @@ ApiStatus SetActorFlagBits(Evt* script, s32 isInitialCall) { } a1 = *args++; - var1 = get_variable(script, *args++); + var1 = evt_get_variable(script, *args++); actor = get_actor(actorID); if (var1 != 0) { @@ -1553,7 +1553,7 @@ ApiStatus SetActorFlagBits(Evt* script, s32 isInitialCall) { ApiStatus GetActorFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 a1; if (actorID == ACTOR_SELF) { @@ -1562,14 +1562,14 @@ ApiStatus GetActorFlags(Evt* script, s32 isInitialCall) { a1 = *args++; - set_variable(script, a1, get_actor(actorID)->flags); + evt_set_variable(script, a1, get_actor(actorID)->flags); return ApiStatus_DONE2; } ApiStatus SetPartFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 a1; s32 partIndex; @@ -1577,7 +1577,7 @@ ApiStatus SetPartFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); a1 = *args++; get_actor_part(get_actor(actorID), partIndex)->flags = a1; @@ -1587,7 +1587,7 @@ ApiStatus SetPartFlags(Evt* script, s32 isInitialCall) { ApiStatus SetPartFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 bits; s32 partIndex; @@ -1597,9 +1597,9 @@ ApiStatus SetPartFlagBits(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); bits = *args++; - cond = get_variable(script, *args++); + cond = evt_get_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); @@ -1614,7 +1614,7 @@ ApiStatus SetPartFlagBits(Evt* script, s32 isInitialCall) { ApiStatus SetPartTargetFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 flags; s32 partIndex; @@ -1624,7 +1624,7 @@ ApiStatus SetPartTargetFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); flags = *args++; get_actor_part(get_actor(actorID), partIndex)->targetFlags = flags; @@ -1634,7 +1634,7 @@ ApiStatus SetPartTargetFlags(Evt* script, s32 isInitialCall) { ApiStatus SetPartTargetFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 partIndex; s32 bits; @@ -1644,9 +1644,9 @@ ApiStatus SetPartTargetFlagBits(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); bits = *args++; - cond = get_variable(script, *args++); + cond = evt_get_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); @@ -1661,7 +1661,7 @@ ApiStatus SetPartTargetFlagBits(Evt* script, s32 isInitialCall) { ApiStatus GetPartFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* actorPart; s32 a2; @@ -1670,17 +1670,17 @@ ApiStatus GetPartFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); a2 = *args++; - set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->flags); + evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->flags); return ApiStatus_DONE2; } ApiStatus GetPartTargetFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* actorPart; s32 a2; @@ -1689,17 +1689,17 @@ ApiStatus GetPartTargetFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); a2 = *args++; - set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->targetFlags); + evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->targetFlags); return ApiStatus_DONE2; } ApiStatus SetPartEventFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 flags; s32 partIndex; @@ -1709,7 +1709,7 @@ ApiStatus SetPartEventFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); flags = *args++; get_actor_part(get_actor(actorID), partIndex)->eventFlags = flags; @@ -1719,7 +1719,7 @@ ApiStatus SetPartEventFlags(Evt* script, s32 isInitialCall) { ApiStatus SetPartEventBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 partIndex; s32 bits; @@ -1729,9 +1729,9 @@ ApiStatus SetPartEventBits(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); bits = *args++; - cond = get_variable(script, *args++); + cond = evt_get_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); @@ -1746,7 +1746,7 @@ ApiStatus SetPartEventBits(Evt* script, s32 isInitialCall) { ApiStatus GetPartEventFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* actorPart; s32 a2; @@ -1755,17 +1755,17 @@ ApiStatus GetPartEventFlags(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); a2 = *args++; - set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->eventFlags); + evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->eventFlags); return ApiStatus_DONE2; } ApiStatus func_8026D51C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 flags; s32 partIndex; @@ -1775,7 +1775,7 @@ ApiStatus func_8026D51C(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); flags = *args++; get_actor_part(get_actor(actorID), partIndex)->partFlags3 = flags; @@ -1785,7 +1785,7 @@ ApiStatus func_8026D51C(Evt* script, s32 isInitialCall) { ApiStatus func_8026D5A4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); ActorPart* actorPart; s32 partIndex; s32 bits; @@ -1795,9 +1795,9 @@ ApiStatus func_8026D5A4(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); bits = *args++; - cond = get_variable(script, *args++); + cond = evt_get_variable(script, *args++); actorPart = get_actor_part(get_actor(actorID), partIndex); @@ -1812,7 +1812,7 @@ ApiStatus func_8026D5A4(Evt* script, s32 isInitialCall) { ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -1835,7 +1835,7 @@ ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) { ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -1858,7 +1858,7 @@ ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) { ApiStatus func_8026D8EC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -1871,7 +1871,7 @@ ApiStatus func_8026D8EC(Evt* script, s32 isInitialCall) { ApiStatus func_8026D940(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 x, y; @@ -1879,8 +1879,8 @@ ApiStatus func_8026D940(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - x = get_variable(script, *args++); - y = get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); actor = get_actor(actorID); @@ -1899,7 +1899,7 @@ ApiStatus func_8026D940(Evt* script, s32 isInitialCall) { ApiStatus func_8026DA94(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 a, b, c, d; @@ -1907,10 +1907,10 @@ ApiStatus func_8026DA94(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - a = get_variable(script, *args++); - b = get_variable(script, *args++); - c = get_variable(script, *args++); - d = get_variable(script, *args++); + a = evt_get_variable(script, *args++); + b = evt_get_variable(script, *args++); + c = evt_get_variable(script, *args++); + d = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->unk_194 = a; @@ -1924,12 +1924,12 @@ ApiStatus func_8026DA94(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "197F40", SummonEnemy); ApiStatus GetOwnerID(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, script->owner1.actorID); + evt_set_variable(script, *script->ptrReadPos, script->owner1.actorID); return ApiStatus_DONE2; } ApiStatus SetOwnerID(Evt* script, s32 isInitialCall) { - script->owner1.actorID = get_variable(script, *script->ptrReadPos); + script->owner1.actorID = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -1937,7 +1937,7 @@ ApiStatus ActorExists(Evt* script, s32 isInitialCall) { Bytecode isExist; Actor* partner = gBattleStatus.partnerActor; Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -1948,36 +1948,36 @@ ApiStatus ActorExists(Evt* script, s32 isInitialCall) { isExist = FALSE; } - set_variable(script, *args++, isExist); + evt_set_variable(script, *args++, isExist); return ApiStatus_DONE2; } ApiStatus func_8026DEF0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); s32 a2 = *args++; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->unk_84); + evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->unk_84); return ApiStatus_DONE2; } ApiStatus func_8026DF88(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); s32 a2 = *args++; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->unk_8C); + evt_set_variable(script, a2, get_actor_part(get_actor(actorID), partIndex)->unk_8C); return ApiStatus_DONE2; } @@ -2019,7 +2019,7 @@ ApiStatus CheckButtonPress(Evt* script, s32 isInitialCall) { Bytecode out = *args; s32 buttonsPressed = gBattleStatus.currentButtonsPressed; - set_variable(script, out, (buttonsPressed & buttons) != 0); + evt_set_variable(script, out, (buttonsPressed & buttons) != 0); return ApiStatus_DONE2; } @@ -2029,7 +2029,7 @@ ApiStatus CheckButtonHeld(Evt* script, s32 isInitialCall) { Bytecode out = *args; s32 buttonsHeld = gBattleStatus.currentButtonsHeld; - set_variable(script, out, (buttonsHeld & buttons) != 0); + evt_set_variable(script, out, (buttonsHeld & buttons) != 0); return ApiStatus_DONE2; } @@ -2039,17 +2039,17 @@ ApiStatus CheckButtonDown(Evt* script, s32 isInitialCall) { Bytecode out = *args; s32 buttonsDown = gBattleStatus.currentButtonsDown; - set_variable(script, out, (buttonsDown & buttons) != 0); + evt_set_variable(script, out, (buttonsDown & buttons) != 0); return ApiStatus_DONE2; } ApiStatus GetBattleState(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleState); + evt_set_variable(script, *script->ptrReadPos, gBattleState); return ApiStatus_DONE2; } ApiStatus SetBattleState(Evt* script, s32 isInitialCall) { - btl_set_state(get_variable(script, *script->ptrReadPos)); + btl_set_state(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -2099,7 +2099,7 @@ INCLUDE_ASM(s32, "197F40", func_8026E558); ApiStatus GetTargetListLength(Evt* script) { Bytecode* args = script->ptrReadPos; - set_variable(script, *args, get_actor(script->owner1.actorID)->targetListLength); + evt_set_variable(script, *args, get_actor(script->owner1.actorID)->targetListLength); return ApiStatus_DONE2; } @@ -2108,7 +2108,7 @@ INCLUDE_ASM(s32, "197F40", GetOwnerTarget); INCLUDE_ASM(s32, "197F40", func_8026E914); ApiStatus GetPlayerActorID(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.attackerActorID); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.attackerActorID); return ApiStatus_DONE2; } @@ -2150,7 +2150,7 @@ INCLUDE_ASM(s32, "197F40", CreatePartShadow); INCLUDE_ASM(s32, "197F40", RemovePartShadow); ApiStatus func_8026F60C(Evt* script, s32 isInitialCall) { - gBattleStatus.unk_8D = get_variable(script, *script->ptrReadPos); + gBattleStatus.unk_8D = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -2159,7 +2159,7 @@ INCLUDE_ASM(s32, "197F40", SetBattleVar); INCLUDE_ASM(s32, "197F40", GetBattleVar); ApiStatus ResetAllActorSounds(Evt* script, s32 isInitialCall) { - ActorID actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = evt_get_variable(script, *script->ptrReadPos); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -2178,7 +2178,7 @@ INCLUDE_ASM(s32, "197F40", SetPartSounds); INCLUDE_ASM(s32, "197F40", SetActorType); ApiStatus ShowShockEffect(Evt* script, s32 isInitialCall) { - ActorID actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = evt_get_variable(script, *script->ptrReadPos); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; diff --git a/src/19FAF0.c b/src/19FAF0.c index 68d81015d6..ba5d1dffda 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -105,9 +105,9 @@ ApiStatus GetMenuSelection(Evt* script, s32 isInitialCall) { s32 outVar2 = *args++; s32 outVar3 = *args++; - set_variable(script, outVar1, battleStatus->moveCategory); - set_variable(script, outVar2, battleStatus->selectedItemID); - set_variable(script, outVar3, battleStatus->selectedMoveID); + evt_set_variable(script, outVar1, battleStatus->moveCategory); + evt_set_variable(script, outVar2, battleStatus->selectedItemID); + evt_set_variable(script, outVar3, battleStatus->selectedMoveID); return ApiStatus_DONE2; } @@ -169,7 +169,7 @@ INCLUDE_ASM(s32, "19FAF0", PlayerRunToGoal, Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "19FAF0", CancelablePlayerRunToGoal, Evt* script, s32 isInitialCall); ApiStatus GetPlayerHP(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gPlayerData.curHP); + evt_set_variable(script, *script->ptrReadPos, gPlayerData.curHP); return ApiStatus_DONE2; } @@ -182,7 +182,7 @@ INCLUDE_ASM(s32, "19FAF0", PlayerTestEnemy, Evt* script, s32 isInitialCall); ApiStatus DispatchDamagePlayerEvent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - if (dispatch_damage_event_player_0(get_variable(script, *args++), *args++) < 0) { + if (dispatch_damage_event_player_0(evt_get_variable(script, *args++), *args++) < 0) { return ApiStatus_BLOCK; } @@ -194,7 +194,7 @@ ApiStatus DispatchDamagePlayerEvent(Evt* script, s32 isInitialCall) { } ApiStatus EnablePlayerBlur(Evt* script, s32 isInitialCall) { - s32 setting = get_variable(script, *script->ptrReadPos); + s32 setting = evt_get_variable(script, *script->ptrReadPos); if (setting == 0) { disable_player_blur(); @@ -237,7 +237,7 @@ ApiStatus DidActionSucceed(Evt* script, s32 isInitialCall) { actionSucceeded = actionSuccess; } - set_variable(script, outVar, actionSucceeded); + evt_set_variable(script, outVar, actionSucceeded); return ApiStatus_DONE2; } @@ -247,6 +247,6 @@ ApiStatus func_80276EFC(Evt* script, s32 isInitialCall) { } ApiStatus DispatchEventPlayer(Evt* script, s32 isInitialCall) { - dispatch_event_player(get_variable(script, *script->ptrReadPos)); + dispatch_event_player(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/1A5830.c b/src/1A5830.c index d0e5079e59..b991a1db9e 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -797,47 +797,47 @@ s32 dispatch_damage_event_actor_1(Actor* actor, s32 damageAmount, s32 event) { ApiStatus BindTakeTurn(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); EvtSource* takeTurnScript; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - takeTurnScript = (EvtSource*) get_variable(script, *args++); + takeTurnScript = (EvtSource*) evt_get_variable(script, *args++); get_actor(actorID)->takeTurnScriptSource = takeTurnScript; return ApiStatus_DONE2; } ApiStatus PauseTakeTurn(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - get_variable(script, *args++); + evt_get_variable(script, *args++); suspend_all_script(get_actor(actorID)->takeTurnID); return ApiStatus_DONE2; } ApiStatus ResumeTakeTurn(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - get_variable(script, *args++); + evt_get_variable(script, *args++); resume_all_script(get_actor(actorID)->takeTurnID); return ApiStatus_DONE2; } ApiStatus BindIdle(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); EvtSource* idleCode; Actor* actor; Evt* newScriptContext; @@ -846,7 +846,7 @@ ApiStatus BindIdle(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - idleCode = (EvtSource*) get_variable(script, *args++); + idleCode = (EvtSource*) evt_get_variable(script, *args++); actor = get_actor(actorID); if (actor->idleScript != 0) { @@ -864,7 +864,7 @@ ApiStatus BindIdle(Evt* script, s32 isInitialCall) { ApiStatus EnableIdleScript(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 var1; Actor* actor; @@ -872,7 +872,7 @@ ApiStatus EnableIdleScript(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - var1 = get_variable(script, *args++); + var1 = evt_get_variable(script, *args++); actor = get_actor(actorID); if (actor->idleScript != NULL) { @@ -895,28 +895,28 @@ ApiStatus EnableIdleScript(Evt* script, s32 isInitialCall) { ApiStatus BindHandleEvent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); EvtSource* var1; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - var1 = (EvtSource*) get_variable(script, *args++); + var1 = (EvtSource*) evt_get_variable(script, *args++); get_actor(actorID)->onHitScriptSource = var1; return ApiStatus_DONE2; } ApiStatus BindNextTurn(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); EvtSource* var1; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - var1 = (EvtSource*) get_variable(script, *args++); + var1 = (EvtSource*) evt_get_variable(script, *args++); get_actor(actorID)->onTurnChanceScriptSource = var1; return ApiStatus_DONE2; } @@ -938,7 +938,7 @@ ApiStatus LandJump(Evt* script, s32 isInitialCall) { } if (script->functionTemp[0] == 0) { - s32 actorID = get_variable(script, *args++); + s32 actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -994,7 +994,7 @@ INCLUDE_ASM(s32, "1A5830", FlyPartTo); ApiStatus GetLastEvent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outVar; if (actorID == ACTOR_SELF) { @@ -1002,13 +1002,13 @@ ApiStatus GetLastEvent(Evt* script, s32 isInitialCall) { } outVar = *args++; - set_variable(script, outVar, get_actor(actorID)->lastEventType); + evt_set_variable(script, outVar, get_actor(actorID)->lastEventType); return ApiStatus_DONE2; } ApiStatus SetTargetActor(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 targetActorID; Actor* actor; @@ -1016,7 +1016,7 @@ ApiStatus SetTargetActor(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - targetActorID = get_variable(script, *args++); + targetActorID = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->targetActorID = targetActorID; actor->targetPartIndex = 1; @@ -1025,7 +1025,7 @@ ApiStatus SetTargetActor(Evt* script, s32 isInitialCall) { ApiStatus SetEnemyHP(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s8 newHP; Actor* actor; @@ -1033,7 +1033,7 @@ ApiStatus SetEnemyHP(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - newHP = get_variable(script, *args++); + newHP = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->currentHP = newHP; @@ -1049,7 +1049,7 @@ ApiStatus SetEnemyHP(Evt* script, s32 isInitialCall) { ApiStatus GetActorHP(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 outVar; s32 outVal; @@ -1073,13 +1073,13 @@ ApiStatus GetActorHP(Evt* script, s32 isInitialCall) { break; } - set_variable(script, outVar, outVal); + evt_set_variable(script, outVar, outVal); return ApiStatus_DONE2; } ApiStatus GetEnemyMaxHP(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outVar; if (actorID == ACTOR_SELF) { @@ -1087,7 +1087,7 @@ ApiStatus GetEnemyMaxHP(Evt* script, s32 isInitialCall) { } outVar = *args++; - set_variable(script, outVar, get_actor(actorID)->maxHP); + evt_set_variable(script, outVar, get_actor(actorID)->maxHP); return ApiStatus_DONE2; } @@ -1097,7 +1097,7 @@ ApiStatus RemoveActor(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; EncounterStatus* currentEncounter = &gCurrentEncounter; Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 i; @@ -1135,7 +1135,7 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) { f32 ntd; s32 numToDrop; - actorID = get_variable(script, *args++); + actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.enemyID; } @@ -1183,7 +1183,7 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) { ApiStatus SetDefenseTable(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; u32* var2; @@ -1191,29 +1191,29 @@ ApiStatus SetDefenseTable(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - var2 = (u32*) get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + var2 = (u32*) evt_get_variable(script, *args++); get_actor_part(get_actor(actorID), partIndex)->defenseTable = var2; return ApiStatus_DONE2; } ApiStatus SetStatusTable(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); u32* var1; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - var1 = (u32*) get_variable(script, *args++); + var1 = (u32*) evt_get_variable(script, *args++); get_actor(actorID)->statusTable = var1; return ApiStatus_DONE2; } ApiStatus SetIdleAnimations(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; u32* var2; @@ -1221,26 +1221,26 @@ ApiStatus SetIdleAnimations(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); - var2 = (u32*) get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); + var2 = (u32*) evt_get_variable(script, *args++); get_actor_part(get_actor(actorID), partIndex)->idleAnimations = var2; return ApiStatus_DONE2; } ApiStatus func_8027CC10(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); // weirdly unused - get_variable(script, *args++); - get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); get_actor_part(get_actor(actorID), partIndex); return ApiStatus_DONE2; @@ -1249,7 +1249,7 @@ ApiStatus func_8027CC10(Evt* script, s32 isInitialCall) { ApiStatus EnemyDamageTarget(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 outVar; s32 hitResult; @@ -1266,7 +1266,7 @@ ApiStatus EnemyDamageTarget(Evt *script, s32 isInitialCall) { battleStatus->currentAttackElement = *args++; battleStatus->currentAttackEventSuppression = *args++; battleStatus->currentAttackStatus = *args++; - battleStatus->currentAttackDamage = get_variable(script, *args++); + battleStatus->currentAttackDamage = evt_get_variable(script, *args++); battleFlagsModifier = *args++; if (battleFlagsModifier & 0x10) { @@ -1313,7 +1313,7 @@ ApiStatus EnemyDamageTarget(Evt *script, s32 isInitialCall) { return ApiStatus_FINISH; } - set_variable(script, outVar, hitResult); + evt_set_variable(script, outVar, hitResult); if (!(does_script_exist_by_ref(script))) { return ApiStatus_FINISH; } @@ -1326,7 +1326,7 @@ ApiStatus EnemyFollowupAfflictTarget(Evt* script, s32 isInitialCall) { BattleStatus* anotherBattleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; Actor* actor; - s32 actorID = get_variable(script, *args++); + s32 actorID = evt_get_variable(script, *args++); s32 hitResults; s32 outVar; @@ -1352,7 +1352,7 @@ ApiStatus EnemyFollowupAfflictTarget(Evt* script, s32 isInitialCall) { return ApiStatus_FINISH; } - set_variable(script, outVar, hitResults); + evt_set_variable(script, outVar, hitResults); if (does_script_exist_by_ref(script) == NULL) { return ApiStatus_FINISH; } @@ -1362,7 +1362,7 @@ ApiStatus EnemyFollowupAfflictTarget(Evt* script, s32 isInitialCall) { ApiStatus EnemyTestTarget(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor *actor; s32 outVar; s32 hitResult; @@ -1379,7 +1379,7 @@ ApiStatus EnemyTestTarget(Evt *script, s32 isInitialCall) { battleStatus->currentAttackElement = *args++; battleStatus->currentAttackEventSuppression = 0; battleStatus->currentAttackStatus = *args++; - battleStatus->currentAttackDamage = get_variable(script, *args++); + battleStatus->currentAttackDamage = evt_get_variable(script, *args++); battleFlagsModifier = *args++; if (battleFlagsModifier & 0x10) { @@ -1426,14 +1426,14 @@ ApiStatus EnemyTestTarget(Evt *script, s32 isInitialCall) { return ApiStatus_FINISH; } - set_variable(script, outVar, hitResult); + evt_set_variable(script, outVar, hitResult); return ApiStatus_DONE2; } ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 damageAmount; s32 scriptExists; @@ -1443,9 +1443,9 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - damageAmount = get_variable(script, *args++); + damageAmount = evt_get_variable(script, *args++); - if (dispatch_damage_event_actor_0(actor, damageAmount, get_variable(script, *args++)) < 0) { + if (dispatch_damage_event_actor_0(actor, damageAmount, evt_get_variable(script, *args++)) < 0) { return ApiStatus_BLOCK; } @@ -1455,18 +1455,18 @@ ApiStatus DispatchDamageEvent(Evt* script, s32 isInitialCall) { ApiStatus DispatchEvent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - dispatch_event_actor(get_actor(actorID), get_variable(script, *args++)); + dispatch_event_actor(get_actor(actorID), evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus func_8027D2D8(Evt* script, s32 isInitialCall) { - ActorID actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = evt_get_variable(script, *script->ptrReadPos); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -1477,7 +1477,7 @@ ApiStatus func_8027D2D8(Evt* script, s32 isInitialCall) { } ApiStatus func_8027D32C(Evt* script, s32 isInitialCall) { - ActorID actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = evt_get_variable(script, *script->ptrReadPos); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -1489,7 +1489,7 @@ ApiStatus func_8027D32C(Evt* script, s32 isInitialCall) { ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* part; s32 x; @@ -1499,11 +1499,11 @@ ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); part = get_actor_part(get_actor(actorID), partIndex); - x = get_variable(script, *args++); - y = get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); part->targetOffset.x = x; part->targetOffset.y = y; @@ -1513,7 +1513,7 @@ ApiStatus SetTargetOffset(Evt* script, s32 isInitialCall) { ApiStatus func_8027D434(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* part; @@ -1521,15 +1521,15 @@ ApiStatus func_8027D434(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); part = get_actor_part(get_actor(actorID), partIndex); - part->unk_70 = get_variable(script, *args++); + part->unk_70 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus func_8027D4C8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 partIndex; ActorPart* part; s32 temp; @@ -1539,11 +1539,11 @@ ApiStatus func_8027D4C8(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - partIndex = get_variable(script, *args++); + partIndex = evt_get_variable(script, *args++); part = get_actor_part(get_actor(actorID), partIndex); - temp = get_variable(script, *args++); - temp2 = get_variable(script, *args++); + temp = evt_get_variable(script, *args++); + temp2 = evt_get_variable(script, *args++); part->unk_75 = temp; part->unk_76 = temp2; @@ -1553,8 +1553,8 @@ ApiStatus func_8027D4C8(Evt* script, s32 isInitialCall) { ApiStatus EnableActorBlur(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 enable = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 enable = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -1574,7 +1574,7 @@ ApiStatus EnableActorBlur(Evt* script, s32 isInitialCall) { } ApiStatus func_8027D628(Evt* script, s32 isInitialCall) { - ActorID actorID = get_variable(script, *script->ptrReadPos); + ActorID actorID = evt_get_variable(script, *script->ptrReadPos); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -1586,14 +1586,14 @@ ApiStatus func_8027D628(Evt* script, s32 isInitialCall) { ApiStatus AfflictActor(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Actor* actor; s32 statusTypeKey; s32 duration; s32 statusDurationKey; - statusTypeKey = get_variable(script, *args++); - duration = get_variable(script, *args++); + statusTypeKey = evt_get_variable(script, *args++); + duration = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; @@ -1625,19 +1625,19 @@ ApiStatus AfflictActor(Evt* script, s32 isInitialCall) { ApiStatus func_8027D75C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outVar = *args++; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_variable(script, outVar, get_actor(actorID)->unk_208); + evt_set_variable(script, outVar, get_actor(actorID)->unk_208); return ApiStatus_DONE2; } ApiStatus GetEncounterState(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gCurrentEncounter.hitType); + evt_set_variable(script, *script->ptrReadPos, gCurrentEncounter.hitType); return ApiStatus_DONE2; } @@ -1648,9 +1648,9 @@ ApiStatus YieldTurn(Evt* script, s32 isInitialCall) { ApiStatus SetActorSize(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 x = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); Actor* actor; if (actorID == ACTOR_SELF) { @@ -1672,7 +1672,7 @@ ApiStatus SetActorSize(Evt* script, s32 isInitialCall) { ApiStatus GetActorSize(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outY = *args++; s32 outX = *args++; Actor* actor; @@ -1682,17 +1682,17 @@ ApiStatus GetActorSize(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - set_variable(script, outY, actor->size.y); - set_variable(script, outX, actor->size.x); + evt_set_variable(script, outY, actor->size.y); + evt_set_variable(script, outX, actor->size.x); return ApiStatus_DONE2; } ApiStatus SetPartSize(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); - s32 partIndex = get_variable(script, *args++); - s32 sizeY = get_variable(script, *args++); - s32 sizeX = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); + s32 partIndex = evt_get_variable(script, *args++); + s32 sizeY = evt_get_variable(script, *args++); + s32 sizeX = evt_get_variable(script, *args++); ActorPart* part; if (actorID == ACTOR_SELF) { @@ -1716,33 +1716,33 @@ ApiStatus SetPartSize(Evt* script, s32 isInitialCall) { ApiStatus GetOriginalActorType(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outVar = *args++; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_variable(script, outVar, get_actor(actorID)->staticActorData->type); + evt_set_variable(script, outVar, get_actor(actorID)->staticActorData->type); return ApiStatus_DONE2; } ApiStatus GetCurrentActorType(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outVar = *args++; if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_variable(script, outVar, get_actor(actorID)->actorType); + evt_set_variable(script, outVar, get_actor(actorID)->actorType); return ApiStatus_DONE2; } ApiStatus GetLastDamage(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outVar; if (actorID == ACTOR_SELF) { @@ -1750,13 +1750,13 @@ ApiStatus GetLastDamage(Evt* script, s32 isInitialCall) { } outVar = *args++; - set_variable(script, outVar, get_actor(actorID)->lastDamageTaken); + evt_set_variable(script, outVar, get_actor(actorID)->lastDamageTaken); return ApiStatus_DONE2; } ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 flag; Actor* actor; @@ -1764,7 +1764,7 @@ ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) { actorID = script->owner1.actorID; } - flag = get_variable(script, *args++); + flag = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->isGlowing = flag; @@ -1788,14 +1788,14 @@ ApiStatus WasStatusInflicted(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; s32 outVal; - get_variable(script, *args++); + evt_get_variable(script, *args++); if (script) { // can be args or script but not 1 or do while 0, nor does else work after outVal = battleStatus->wasStatusInflicted; } outVal = battleStatus->wasStatusInflicted; - set_variable(script, *args++, outVal); + evt_set_variable(script, *args++, outVal); return ApiStatus_DONE2; } @@ -1807,13 +1807,13 @@ ApiStatus CopyStatusEffects(Evt* script, s32 isInitialCall) { Actor* actorTo; Actor* actorFrom; - actorIDFrom = get_variable(script, *args++); + actorIDFrom = evt_get_variable(script, *args++); if (actorIDFrom == ACTOR_SELF) { actorIDFrom = script->owner1.actorID; } actorFrom = get_actor(actorIDFrom); - actorIDTo = get_variable(script, *args++); + actorIDTo = evt_get_variable(script, *args++); if (actorIDTo == ACTOR_SELF) { actorIDTo = script->owner1.actorID; } @@ -1833,7 +1833,7 @@ ApiStatus CopyStatusEffects(Evt* script, s32 isInitialCall) { ApiStatus ClearStatusEffects(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 flag; Actor* actor; diff --git a/src/1AC760.c b/src/1AC760.c index 135915df45..9ae2b7c239 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -127,8 +127,8 @@ ApiStatus MakeOwnerTargetIndex(Evt* script, s32 isInitialCall) { Actor* actor = get_actor(script->owner1.actorID); s32 numTargets = actor->targetListLength; s8* targetList = &actor->targetIndexList; - s32 arg1 = get_variable(script, *args++); - s32 arg2 = get_variable(script, *args++); + s32 arg1 = evt_get_variable(script, *args++); + s32 arg2 = evt_get_variable(script, *args++); s32 otherArg = *args++; SelectableTarget* selectableTarget; @@ -148,7 +148,7 @@ ApiStatus MakeOwnerTargetIndex(Evt* script, s32 isInitialCall) { actor->targetPartIndex = selectableTarget->partID; } - set_variable(script, otherArg, arg2); + evt_set_variable(script, otherArg, arg2); return ApiStatus_DONE2; } @@ -159,7 +159,7 @@ ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; s32 hitResult; Actor* actor; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); s32 outVar; if (actorID == ACTOR_SELF) { @@ -173,14 +173,14 @@ ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) { hitResult = calc_partner_damage_enemy(); show_damage_popup(actor->walk.goalPos.x, actor->walk.goalPos.y, actor->walk.goalPos.z, battleStatus->lastAttackDamage, 0); - set_variable(script, outVar, hitResult); + evt_set_variable(script, outVar, hitResult); return ApiStatus_DONE2; } ApiStatus GetActorLevel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ActorID actorID = get_variable(script, *args++); + ActorID actorID = evt_get_variable(script, *args++); Bytecode* outVar; if (actorID == ACTOR_SELF) { @@ -188,7 +188,7 @@ ApiStatus GetActorLevel(Evt* script, s32 isInitialCall) { } outVar = *args++; - set_variable(script, outVar, get_actor(actorID)->staticActorData->level); + evt_set_variable(script, outVar, get_actor(actorID)->staticActorData->level); return ApiStatus_DONE2; } @@ -205,8 +205,8 @@ ApiStatus func_8028070C(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); - s32 damageAmount = get_variable(script, *args++); - s32 event = get_variable(script, *args++); + s32 damageAmount = evt_get_variable(script, *args++); + s32 event = evt_get_variable(script, *args++); battleStatus->currentTargetID = actor->targetActorID; battleStatus->currentTargetPart = actor->targetPartIndex; @@ -239,7 +239,7 @@ ApiStatus GetActionCommandResult(Evt* script, s32 isInitialCall) { outVal = actionSuccess; } - set_variable(script, var, outVal); + evt_set_variable(script, var, outVal); return ApiStatus_DONE2; } diff --git a/src/1AF120.c b/src/1AF120.c index 578e5a0302..0a8a62fb7a 100644 --- a/src/1AF120.c +++ b/src/1AF120.c @@ -16,11 +16,11 @@ ApiStatus GetDamageIntensity(Evt* script, s32 isInitialCall) { // TODO: Rename to AddEffectOffset ApiStatus AddEffectOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - EffectInstance* effect = get_variable(script, *args++); + EffectInstance* effect = evt_get_variable(script, *args++); - effect->data->pos.x += get_variable(script, *args++); - effect->data->pos.y += get_variable(script, *args++); - effect->data->pos.z += get_variable(script, *args++); + effect->data->pos.x += evt_get_variable(script, *args++); + effect->data->pos.y += evt_get_variable(script, *args++); + effect->data->pos.z += evt_get_variable(script, *args++); return ApiStatus_DONE2; } diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index 8df5fe1615..7b496e5e8d 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -194,9 +194,9 @@ ApiStatus HasMerleeCasts(Evt* script, s32 isInitialCall) { ApiStatus PlayMerleeGatherFX(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); playFX_6B(6, var0, var1, var2, 1.2f, 30); return ApiStatus_DONE2; @@ -204,9 +204,9 @@ ApiStatus PlayMerleeGatherFX(Evt* script, s32 isInitialCall) { ApiStatus PlayMerleeOrbFX(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); playFX_52(9, var0, var1, var2, 5.0f, 15); return ApiStatus_DONE2; diff --git a/src/3251D0.c b/src/3251D0.c index 5e6ba0cf1e..fae54f24e4 100644 --- a/src/3251D0.c +++ b/src/3251D0.c @@ -3,9 +3,9 @@ ApiStatus func_802BD100_3251D0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_11(0, a, b, c, 60.0f); return ApiStatus_DONE2; @@ -13,10 +13,10 @@ ApiStatus func_802BD100_3251D0(Evt* script, s32 isInitialCall) { ApiStatus func_802BD1AC_32527C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); return ApiStatus_DONE2; @@ -24,10 +24,10 @@ ApiStatus func_802BD1AC_32527C(Evt* script, s32 isInitialCall) { ApiStatus func_802BD26C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(1, a, b, c, d); return ApiStatus_DONE2; @@ -36,7 +36,7 @@ ApiStatus func_802BD26C(Evt* script, s32 isInitialCall) { ApiStatus func_802BD32C(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 newHP = playerData->curHP + get_variable(script, *script->ptrReadPos); + s32 newHP = playerData->curHP + evt_get_variable(script, *script->ptrReadPos); if (newHP > playerData->curMaxHP) { newHP = playerData->curMaxHP; @@ -53,7 +53,7 @@ ApiStatus func_802BD32C(Evt* script, s32 isInitialCall) { ApiStatus func_802BD388(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 newFP = playerData->curFP + get_variable(script, *script->ptrReadPos); + s32 newFP = playerData->curFP + evt_get_variable(script, *script->ptrReadPos); if (newFP > playerData->curMaxFP) { newFP = playerData->curMaxFP; @@ -80,7 +80,7 @@ ApiStatus func_802BD41C(Evt* script, s32 isInitialCall) { } ApiStatus func_802BD458(Evt* script, s32 isInitialCall) { - s32 itemIdx = get_variable(script, *script->ptrReadPos); + s32 itemIdx = evt_get_variable(script, *script->ptrReadPos); s32 var15; script->varTable[11] = (&gItemTable[itemIdx])->potencyA; diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index 9e7a3f10e3..68bfde7d9d 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -65,7 +65,7 @@ void check_input_status_menu(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 pressedButtons; - if (get_variable(NULL, EVT_STORY_PROGRESS) < STORY_EPILOGUE) { + if (evt_get_variable(NULL, EVT_STORY_PROGRESS) < STORY_EPILOGUE) { if (playerStatus->actionState != ACTION_STATE_RIDE) { pressedButtons = playerStatus->pressedButtons; } else { diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 5e3be770cf..d006379c99 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -554,7 +554,7 @@ void func_800E96C8(void) { } ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall) { - if (get_variable(script, *script->ptrReadPos)) { + if (evt_get_variable(script, *script->ptrReadPos)) { show_coin_counter(); } else { hide_coin_counter(); diff --git a/src/EA6FD0.c b/src/EA6FD0.c index d9ba7fca9e..3e6fbd1a3b 100644 --- a/src/EA6FD0.c +++ b/src/EA6FD0.c @@ -2,7 +2,7 @@ #include "common.h" s32 func_80240000_EA6FD0(void) { - s32 temp = get_variable(NULL, EVT_STORY_PROGRESS); + s32 temp = evt_get_variable(NULL, EVT_STORY_PROGRESS); if (temp <= 0x26) { return 0x19010F; diff --git a/src/EF2650.c b/src/EF2650.c index 9599bf39c4..681a8bca2b 100644 --- a/src/EF2650.c +++ b/src/EF2650.c @@ -4,6 +4,6 @@ extern s16 D_80169B16; ApiStatus func_80240040_EF2650(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, D_80169B16); + evt_set_variable(script, *script->ptrReadPos, D_80169B16); return ApiStatus_DONE2; } diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 615afe0dbe..5d5a87a6f9 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -861,7 +861,7 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", SetEntityCullMode); ApiStatus UseDynamicShadow(Evt* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(gLastCreatedEntityIndex); - if (get_variable(script, *script->ptrReadPos)) { + if (evt_get_variable(script, *script->ptrReadPos)) { Shadow* shadow; entity->flags |= 4; @@ -878,7 +878,7 @@ ApiStatus AssignScript(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall == TRUE) { - Bytecode* toBind = (Bytecode*)get_variable(script, *args++); + Bytecode* toBind = (Bytecode*)evt_get_variable(script, *args++); get_entity_by_index(gLastCreatedEntityIndex)->boundScriptBytecode = toBind; return ApiStatus_DONE2; @@ -896,7 +896,7 @@ ApiStatus AssignFlag(Evt* script, s32 isInitialCall) { if (isInitialCall == TRUE) { Trigger* trigger = (Trigger*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf; - trigger->flags.bytes.genericFlagIndex = get_variable_index(script, *args); + trigger->flags.bytes.genericFlagIndex = evt_get_variable_index(script, *args); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index a1a63c84fd..87deaa4d38 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -18,7 +18,7 @@ ApiStatus func_802A9000_428A70(Evt* script, s32 isInitialCall) { battleStatus->unk_82 = 0; battleStatus->unk_86 = 127; func_80268858(); - actionCommandStatus->unk_5A = get_variable(script, *args++); + actionCommandStatus->unk_5A = evt_get_variable(script, *args++); actionCommandStatus->actionCommandID = ACTION_COMMAND_AIR_LIFT; actionCommandStatus->unk_61 = 1; actionCommandStatus->state = 0; diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index b092e41c97..de241d17dc 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -24,7 +24,7 @@ ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) { battleStatus->unk_434 = &D_80294200; battleStatus->unk_86 = 127; func_80268858(); - actionCommandStatus->unk_5A = get_variable(script, *args++); + actionCommandStatus->unk_5A = evt_get_variable(script, *args++); actionCommandStatus->actionCommandID = ACTION_COMMAND_FLEE; actionCommandStatus->state = 0; actionCommandStatus->unk_60 = 0; @@ -82,9 +82,9 @@ ApiStatus func_802A92A0_422D70(Evt* script) { BattleStatus* battleStatus = &gBattleStatus; func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_60 = 0; battleStatus->actionSuccess = 0; diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 824e6469fe..883c7eece8 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -94,9 +94,9 @@ ApiStatus func_802A9258_422258(Evt* script, s32 isInitialCall) { } func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_60 = 0; actionCommandStatus->unk_62 = 1; diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 4b0c46165c..b835bf83e5 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -58,8 +58,8 @@ ApiStatus func_802A9120_421B10(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } else { func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_60 = 0; battleStatus->actionSuccess = 0; diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index d4fd5e92ca..4ca42b4c7c 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -90,11 +90,11 @@ ApiStatus func_802A9210_42D120(Evt* script, s32 isInitialCall) { } func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); - actionCommandStatus->unk_64 = get_variable(script, *args++); + actionCommandStatus->unk_64 = evt_get_variable(script, *args++); actionCommandStatus->unk_60 = 0; actionCommandStatus->unk_44 = 0; actionCommandStatus->unk_48 = 0; diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 40498aa086..0aa137f60b 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -55,9 +55,9 @@ ApiStatus func_802A911C_429E3C(Evt* script) { } func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_60 = 0; actionCommandStatus->unk_44 = 0; diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index 246f5f9dba..6b9856b465 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -52,9 +52,9 @@ ApiStatus func_802A9110_4256A0(Evt* script) { } func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_60 = 0; actionCommandStatus->unk_44 = 0; diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index dba6d2214d..144eaf06fc 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -61,9 +61,9 @@ ApiStatus func_802A9138_42C828(Evt* script, s32 isInitialCall) { } func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_60 = 0; actionCommandStatus->unk_44 = 0; diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 878c8ab7df..6e664ea1f4 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -16,9 +16,9 @@ ApiStatus func_802A9398_42A888(Evt* script, s32 isInitialCall) { } func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); actionCommandStatus->unk_60 = 0; actionCommandStatus->unk_44 = 0; diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index e9acd7056b..21e9b5f3a1 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -19,7 +19,7 @@ ApiStatus func_802A9000_423C70(Evt* script, s32 isInitialCall) { } func_80268858(); - temp_v0 = get_variable(script, *args); + temp_v0 = evt_get_variable(script, *args); actionCommandStatus->unk_64 = temp_v0; actionCommandStatus->actionCommandID = ACTION_COMMAND_WHIRLWIND; actionCommandStatus->state = 0; diff --git a/src/battle/area_arn/4FF010.c b/src/battle/area_arn/4FF010.c index ba0ac59464..c50ec627fd 100644 --- a/src/battle/area_arn/4FF010.c +++ b/src/battle/area_arn/4FF010.c @@ -7,7 +7,7 @@ #define NAMESPACE b_area_arn ApiStatus func_80218618_4FF068(Evt* script, s32 isInitialCall) { - s32 temp_s0 = get_variable(script, *script->ptrReadPos); + s32 temp_s0 = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(script->owner1.actorID); if (temp_s0 == 0) { diff --git a/src/battle/area_flo/5B14B0.c b/src/battle/area_flo/5B14B0.c index 0fbb7378bf..9357bffd8b 100644 --- a/src/battle/area_flo/5B14B0.c +++ b/src/battle/area_flo/5B14B0.c @@ -6,15 +6,15 @@ ApiStatus func_802180CC_5B157C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 prevX = get_variable(script, *args++); - s32 prevZ = get_variable(script, *args++); - s32 length = get_variable(script, *args++); - s32 angle = get_variable(script, *args++); + s32 prevX = evt_get_variable(script, *args++); + s32 prevZ = evt_get_variable(script, *args++); + s32 length = evt_get_variable(script, *args++); + s32 angle = evt_get_variable(script, *args++); f32 outX = prevX + (length * cos_deg(angle)); f32 outZ = prevZ - (length * sin_deg(angle)); - set_float_variable(script, *args++, outX); - set_float_variable(script, *args++, outZ); + evt_set_float_variable(script, *args++, outX); + evt_set_float_variable(script, *args++, outZ); return ApiStatus_DONE2; } diff --git a/src/battle/area_iwa/4D01F0.c b/src/battle/area_iwa/4D01F0.c index f9a3e74875..f8beb996b1 100644 --- a/src/battle/area_iwa/4D01F0.c +++ b/src/battle/area_iwa/4D01F0.c @@ -4,7 +4,7 @@ #define NAMESPACE b_area_iwa ApiStatus N(SetSpinSmashable)(Evt* script, s32 isInitialCall) { - s32 canSpinSmash = get_variable(script, *script->ptrReadPos); + s32 canSpinSmash = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(script->owner1.actorID); if (canSpinSmash == FALSE) { diff --git a/src/battle/area_kmr_part_1/actor/anglestuff.inc.c b/src/battle/area_kmr_part_1/actor/anglestuff.inc.c index 9638d468e5..c563236d5d 100644 --- a/src/battle/area_kmr_part_1/actor/anglestuff.inc.c +++ b/src/battle/area_kmr_part_1/actor/anglestuff.inc.c @@ -57,20 +57,20 @@ u32 N(angle_calculate)(f32 x, f32 y) { ApiStatus N(AngleCalculate)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - s32 var5 = get_variable(script, *args); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + s32 var5 = evt_get_variable(script, *args); var3 -= var1; var4 -= var2; if (var3 == 0 && var4 == 0) { - set_variable(script, *args, var5); + evt_set_variable(script, *args, var5); return ApiStatus_DONE2; } else { - set_variable(script, *args, N(angle_calculate)(var3, var4) - 90); + evt_set_variable(script, *args, N(angle_calculate)(var3, var4) - 90); return ApiStatus_DONE2; } } diff --git a/src/battle/area_kmr_part_2/439A90.c b/src/battle/area_kmr_part_2/439A90.c index 303851902c..d586cd39fc 100644 --- a/src/battle/area_kmr_part_2/439A90.c +++ b/src/battle/area_kmr_part_2/439A90.c @@ -25,9 +25,9 @@ ApiStatus func_80218A60_43A4F0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); - fx_land(2, var1, var2, get_variable(script, *args++), 0); + fx_land(2, var1, var2, evt_get_variable(script, *args++), 0); return ApiStatus_DONE2; } diff --git a/src/battle/area_kmr_part_3/447D50.c b/src/battle/area_kmr_part_3/447D50.c index 6060bd1879..70e9209963 100644 --- a/src/battle/area_kmr_part_3/447D50.c +++ b/src/battle/area_kmr_part_3/447D50.c @@ -10,14 +10,14 @@ extern s32 D_80104A28; ApiStatus func_802189DC_447E1C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - f32 posX = get_float_variable(script, *args++); - f32 posY = get_float_variable(script, *args++); + f32 posX = evt_get_float_variable(script, *args++); + f32 posY = evt_get_float_variable(script, *args++); HudElement* icon = create_hud_element(&D_80104A28); set_hud_element_render_pos(icon, posX, posY); set_hud_element_scale(icon, 1.5f); clear_hud_element_flags(icon, 0x200002); - set_variable(script, *args++, icon); + evt_set_variable(script, *args++, icon); load_tattle_flags(0x8B); return ApiStatus_DONE2; } diff --git a/src/battle/area_omo/512E50.c b/src/battle/area_omo/512E50.c index 485b686635..af2de2696a 100644 --- a/src/battle/area_omo/512E50.c +++ b/src/battle/area_omo/512E50.c @@ -18,9 +18,9 @@ ApiStatus func_80218CF4_5132C4(Evt* script, s32 isInitialCall) { status->jumpLossTurns == -1 || status->itemLossTurns == -1 ) { - set_variable(script, *args++, 0); + evt_set_variable(script, *args++, 0); } else { - set_variable(script, *args++, -1); + evt_set_variable(script, *args++, -1); } return ApiStatus_DONE2; diff --git a/src/battle/battle.c b/src/battle/battle.c index c6bb9c634d..17d94d2b54 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -501,7 +501,7 @@ void load_demo_battle(u32 index) { break; } - set_variable(NULL, EVT_SAVE_FLAG(1817), 1); + evt_set_variable(NULL, EVT_SAVE_FLAG(1817), 1); gCurrentEncounter.unk_07 = 0; gCurrentEncounter.unk_10 = 0; set_battle_stage(-1); diff --git a/src/battle/item/dried_shroom.c b/src/battle/item/dried_shroom.c index 3f469914ea..1b486af11d 100644 --- a/src/battle/item/dried_shroom.c +++ b/src/battle/item/dried_shroom.c @@ -5,10 +5,10 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); diff --git a/src/battle/item/egg_missile.c b/src/battle/item/egg_missile.c index ffdcb23234..f0aee0d1e9 100644 --- a/src/battle/item/egg_missile.c +++ b/src/battle/item/egg_missile.c @@ -10,9 +10,9 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_17(0, a, b, c); playFX_19(0, a, b + 20, c); diff --git a/src/battle/item/electro_pop.c b/src/battle/item/electro_pop.c index d49ab8763b..2a56c2ac00 100644 --- a/src/battle/item/electro_pop.c +++ b/src/battle/item/electro_pop.c @@ -14,10 +14,10 @@ ApiStatus N(func_802A123C_7307DC)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A127C_73081C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); @@ -26,10 +26,10 @@ ApiStatus N(func_802A127C_73081C)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(1, a, b, c, d); @@ -54,7 +54,7 @@ ApiStatus N(func_802A1450_7309F0)(Evt* script, s32 isInitialCall) { ApiStatus N(AddFP)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 amt = get_variable(script, *script->ptrReadPos); + s32 amt = evt_get_variable(script, *script->ptrReadPos); // @bug Should be playerData->curFP s32 newFP = playerData->curHP + amt; diff --git a/src/battle/item/fire_flower.c b/src/battle/item/fire_flower.c index 2c4e523fa0..d888dbc26c 100644 --- a/src/battle/item/fire_flower.c +++ b/src/battle/item/fire_flower.c @@ -5,9 +5,9 @@ ApiStatus N(func_802A123C_716E9C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_3F(0, a, b, c, 0); diff --git a/src/battle/item/food.c b/src/battle/item/food.c index 640e14a4c0..6a78f68c34 100644 --- a/src/battle/item/food.c +++ b/src/battle/item/food.c @@ -5,9 +5,9 @@ ApiStatus N(func_802A123C_73330C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); ItemEntity* item = get_item_entity(script->varTable[14]); item->position.x = a; @@ -26,7 +26,7 @@ ApiStatus N(func_802A12EC_7333BC)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - partner->koDuration -= get_variable(script, *args++); + partner->koDuration -= evt_get_variable(script, *args++); if (partner->koDuration < 0) { partner->koDuration = 0; } @@ -43,10 +43,10 @@ ApiStatus N(func_802A12EC_7333BC)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1378_733448)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); @@ -55,10 +55,10 @@ ApiStatus N(func_802A1378_733448)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(1, a, b, c, d); @@ -71,7 +71,7 @@ ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A15A0_733670)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemIdx = get_variable(script, *args++); + s32 itemIdx = evt_get_variable(script, *args++); StaticItem* item = &gItemTable[itemIdx]; s32 temp; diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c index 7d364e9861..e59c6a0dbc 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/item/insecticide_herb.c @@ -33,9 +33,9 @@ typedef struct N(temp) { ApiStatus N(func_802A12E0_72AA30)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - f32 a = get_variable(script, *args++); - f32 b = get_variable(script, *args++); - f32 c = get_variable(script, *args++); + f32 a = evt_get_variable(script, *args++); + f32 b = evt_get_variable(script, *args++); + f32 c = evt_get_variable(script, *args++); struct N(temp)* effect; a += rand_int(20) - 10; diff --git a/src/battle/item/life_shroom.c b/src/battle/item/life_shroom.c index 4e2f2a1765..b086d33176 100644 --- a/src/battle/item/life_shroom.c +++ b/src/battle/item/life_shroom.c @@ -5,9 +5,9 @@ ApiStatus N(func_802A123C_72E76C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); ItemEntity* item = get_item_entity(script->varTable[14]); item->position.x = a; @@ -26,7 +26,7 @@ ApiStatus N(func_802A12EC_72E81C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - partner->koDuration -= get_variable(script, *args++); + partner->koDuration -= evt_get_variable(script, *args++); if (partner->koDuration < 0) { partner->koDuration = 0; } @@ -43,10 +43,10 @@ ApiStatus N(func_802A12EC_72E81C)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); @@ -69,7 +69,7 @@ ApiStatus N(func_802A1438_72E968)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1484_72E9B4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemIdx = get_variable(script, *args++); + s32 itemIdx = evt_get_variable(script, *args++); StaticItem* itemTable = gItemTable; StaticItem* item = &itemTable[itemIdx]; diff --git a/src/battle/item/mushroom.c b/src/battle/item/mushroom.c index 6770179ce9..d654c239b0 100644 --- a/src/battle/item/mushroom.c +++ b/src/battle/item/mushroom.c @@ -5,9 +5,9 @@ ApiStatus N(func_802A123C_715A8C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); ItemEntity* item = get_item_entity(script->varTable[14]); item->position.x = a; @@ -26,7 +26,7 @@ ApiStatus N(func_802A12EC_715B3C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - partner->koDuration -= get_variable(script, *args++); + partner->koDuration -= evt_get_variable(script, *args++); if (partner->koDuration < 0) { partner->koDuration = 0; } @@ -43,10 +43,10 @@ ApiStatus N(func_802A12EC_715B3C)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1378_715BC8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); @@ -55,10 +55,10 @@ ApiStatus N(func_802A1378_715BC8)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(1, a, b, c, d); @@ -72,7 +72,7 @@ ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A15A0_715DF0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; StaticItem* itemTable = gItemTable; - StaticItem* item = &itemTable[get_variable(script, *args++)]; + StaticItem* item = &itemTable[evt_get_variable(script, *args++)]; script->varTable[11] = item->potencyA; script->varTable[12] = item->potencyB; diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 76a67499b0..fe77fa2852 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -214,9 +214,9 @@ INCLUDE_ASM(ApiStatus, "battle/item/mystery", battle_item_mystery_func_802A13E4_ ApiStatus N(func_802A188C_72CE3C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_18(2, a, b, c, 0, -1.0f, 0, 5); diff --git a/src/battle/item/shooting_star.c b/src/battle/item/shooting_star.c index cff917dda4..aff99045b4 100644 --- a/src/battle/item/shooting_star.c +++ b/src/battle/item/shooting_star.c @@ -51,9 +51,9 @@ INCLUDE_ASM(ApiStatus, "battle/item/shooting_star", battle_item_shooting_star_fu ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_18(2, a, b, c, 0, -1.0f, 0, 5); diff --git a/src/battle/item/snowman_doll.c b/src/battle/item/snowman_doll.c index ac6f69e1fc..a058d95df1 100644 --- a/src/battle/item/snowman_doll.c +++ b/src/battle/item/snowman_doll.c @@ -5,9 +5,9 @@ ApiStatus N(func_802A123C_71C06C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_11(2, a, b, c, 30.0f); playFX_11(2, a, b, c, 30.0f); diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index 864773c8f0..4aa44e7829 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -207,10 +207,10 @@ INCLUDE_ASM(ApiStatus, "battle/item/strange_cake", battle_item_strange_cake_func ApiStatus N(func_802A1818_731B18)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); return ApiStatus_DONE2; @@ -218,10 +218,10 @@ ApiStatus N(func_802A1818_731B18)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A18D8_731BD8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(1, a, b, c, d); return ApiStatus_DONE2; diff --git a/src/battle/item/super_soda.c b/src/battle/item/super_soda.c index bc175f2612..000b89a52e 100644 --- a/src/battle/item/super_soda.c +++ b/src/battle/item/super_soda.c @@ -5,9 +5,9 @@ ApiStatus N(func_802A123C_724F1C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); ItemEntity* item = get_item_entity(script->varTable[14]); item->position.x = a; @@ -26,7 +26,7 @@ ApiStatus N(func_802A12EC_724FCC)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - partner->koDuration -= get_variable(script, *args++); + partner->koDuration -= evt_get_variable(script, *args++); if (partner->koDuration < 0) { partner->koDuration = 0; } @@ -42,7 +42,7 @@ ApiStatus N(func_802A12EC_724FCC)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_802A1378_725058)(Evt* script, s32 isInitialCall) { - s32 actorId = get_variable(script, *script->ptrReadPos); + s32 actorId = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(actorId); s32 id = actor->actorID & 0x700; @@ -70,10 +70,10 @@ ApiStatus N(func_802A1378_725058)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(1, a, b, c, d); return ApiStatus_DONE2; diff --git a/src/battle/item/tasty_tonic.c b/src/battle/item/tasty_tonic.c index c9c3eaf77d..601e09e32e 100644 --- a/src/battle/item/tasty_tonic.c +++ b/src/battle/item/tasty_tonic.c @@ -3,7 +3,7 @@ #include "ItemRefund.inc.c" ApiStatus N(func_802A123C_72223C)(Evt* script, s32 isInitialCall) { - s32 actorId = get_variable(script, *script->ptrReadPos); + s32 actorId = evt_get_variable(script, *script->ptrReadPos); Actor* actor = get_actor(actorId); s32 id = actor->actorID & 0x700; diff --git a/src/battle/item/ultra_shroom.c b/src/battle/item/ultra_shroom.c index d69691022e..f4c0bf0969 100644 --- a/src/battle/item/ultra_shroom.c +++ b/src/battle/item/ultra_shroom.c @@ -5,10 +5,10 @@ ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); return ApiStatus_DONE2; diff --git a/src/battle/item/unknown_item.c b/src/battle/item/unknown_item.c index be013edf03..cb2d8b4870 100644 --- a/src/battle/item/unknown_item.c +++ b/src/battle/item/unknown_item.c @@ -5,10 +5,10 @@ ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); - s32 d = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); + s32 d = evt_get_variable(script, *args++); playFX_40(0, a, b, c, d); return ApiStatus_DONE2; diff --git a/src/battle/move/d_down_jump/781920.c b/src/battle/move/d_down_jump/781920.c index 708ebb6c70..1fdf0c7410 100644 --- a/src/battle/move/d_down_jump/781920.c +++ b/src/battle/move/d_down_jump/781920.c @@ -7,9 +7,9 @@ ApiStatus func_802A10E4_781A04(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); if (script->varTable[10] == 0) { playFX_32(TRUE, var0, var1, var2, 0.0f); diff --git a/src/battle/move/d_down_pound/74AD90.c b/src/battle/move/d_down_pound/74AD90.c index ad23ff04f7..5cd1799ecf 100644 --- a/src/battle/move/d_down_pound/74AD90.c +++ b/src/battle/move/d_down_pound/74AD90.c @@ -9,9 +9,9 @@ ApiStatus func_802A10A4_74AE34(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); if (script->varTable[10] == 0) { playFX_32(TRUE, var0 + 30, var1 + 25, var2, 45.0f); diff --git a/src/battle/move/hammer_charge_0/74F130.c b/src/battle/move/hammer_charge_0/74F130.c index 74d41d421d..1a8f96398f 100644 --- a/src/battle/move/hammer_charge_0/74F130.c +++ b/src/battle/move/hammer_charge_0/74F130.c @@ -12,9 +12,9 @@ ApiStatus func_802A10C8_74F1F8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); playFX_56(0, var1, var2, var3, 1.0f, 60); @@ -32,10 +32,10 @@ ApiStatus func_802A10C8_74F1F8(Evt* script, s32 isInitialCall) { ApiStatus func_802A11CC_74F2FC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - f32 var3 = get_float_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); playFX_6B(6, var0 + 10, var1 + 18, var2, var3, 45); diff --git a/src/battle/move/hammer_charge_1/7595B0.c b/src/battle/move/hammer_charge_1/7595B0.c index 05b0b1d862..82884a1046 100644 --- a/src/battle/move/hammer_charge_1/7595B0.c +++ b/src/battle/move/hammer_charge_1/7595B0.c @@ -15,9 +15,9 @@ ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus2 = battleStatus; // TODO: macro? - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); s32* var4; playFX_56(1, var1, var2, var3, 1.0f, 60); diff --git a/src/battle/move/hammer_charge_2/75E5D0.c b/src/battle/move/hammer_charge_2/75E5D0.c index 8bffe97159..1537907b50 100644 --- a/src/battle/move/hammer_charge_2/75E5D0.c +++ b/src/battle/move/hammer_charge_2/75E5D0.c @@ -15,9 +15,9 @@ ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus2 = battleStatus; // TODO: macro? - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); s32* var4; playFX_56(2, var1, var2, var3, 1.0f, 60); diff --git a/src/battle/move/jump_charge_0/74D570.c b/src/battle/move/jump_charge_0/74D570.c index 826a410710..a0bd541ba5 100644 --- a/src/battle/move/jump_charge_0/74D570.c +++ b/src/battle/move/jump_charge_0/74D570.c @@ -10,9 +10,9 @@ ApiStatus func_802A1108_74D678(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); playFX_56(0, var1, var2, var3, 1.0f, 60); @@ -30,10 +30,10 @@ ApiStatus func_802A1108_74D678(Evt* script, s32 isInitialCall) { ApiStatus func_802A120C_74D77C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - f32 var3 = get_float_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); playFX_6B(6, var0 + 10, var1 + 18, var2, var3, 45); diff --git a/src/battle/move/jump_charge_1/75C980.c b/src/battle/move/jump_charge_1/75C980.c index a20a3efe41..ce4b182d93 100644 --- a/src/battle/move/jump_charge_1/75C980.c +++ b/src/battle/move/jump_charge_1/75C980.c @@ -13,9 +13,9 @@ ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus2 = battleStatus; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); s32* var4; playFX_56(1, var1, var2, var3, 1.0f, 60); diff --git a/src/battle/move/jump_charge_2/761920.c b/src/battle/move/jump_charge_2/761920.c index 13b541c43a..be75d64dbf 100644 --- a/src/battle/move/jump_charge_2/761920.c +++ b/src/battle/move/jump_charge_2/761920.c @@ -13,9 +13,9 @@ ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus2 = battleStatus; // TODO: macro? - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); s32* var4; playFX_56(2, var1, var2, var3, 1.0f, 60); diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index b849c700d5..d0a8cb78bb 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -5,9 +5,9 @@ ApiStatus func_80238000_6FAD10(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); s16 selectedMoveID; s32 soundID; @@ -86,7 +86,7 @@ ApiStatus func_80238358_6FB068(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; - s32 var0 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); s32 var1 = 0; switch (partnerActor->staticActorData->level) { @@ -147,7 +147,7 @@ ApiStatus func_8023849C_6FB1AC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; - s32 var0 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); s32 var1 = 0; switch (partnerActor->staticActorData->level) { @@ -194,7 +194,7 @@ ApiStatus func_80238590_6FB2A0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; - s32 var0 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); s32 var1 = 0; switch (partnerActor->staticActorData->level) { diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 0ef802c9a2..7a07af5b58 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -44,8 +44,8 @@ ApiStatus func_802380E4_710FD4(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; Actor* playerActor = battleStatus->playerActor; - f32 var0 = get_variable(script, *args++); - f32 var1 = get_variable(script, *args++); + f32 var0 = evt_get_variable(script, *args++); + f32 var1 = evt_get_variable(script, *args++); f32 scalingFactor = playerActor->scalingFactor; var0 *= scalingFactor; diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index bb5cf5a17b..af65fad9dd 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -217,10 +217,10 @@ ApiStatus N(IsGlowing)(Evt* script, s32 isInitialCall) { ApiStatus func_802390C8_6F21A8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - f32 var4 = get_float_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + f32 var4 = evt_get_float_variable(script, *args++); playFX_6B(6, var1, var2, var3, var4, 45); diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index ec69199e68..5446a923f2 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -122,9 +122,9 @@ ApiStatus func_80238388_708028(Evt* script, s32 isInitialCall) { ApiStatus func_80238480_708120(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - f32 var3 = get_float_variable(script, *args++); + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); s32 effect = battleStatus->unk_A0; if (effect != NULL) { diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 0d1594e8c3..e7bd757d18 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -47,7 +47,7 @@ ApiStatus func_802383F8_703EE8(Evt* script, s32 isInitialCall) { } ApiStatus func_80238408_703EF8(Evt* script, s32 isInitialCall) { - D_8023C1C8 = get_variable(script, *script->ptrReadPos); + D_8023C1C8 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -57,9 +57,9 @@ ApiStatus func_80238408_703EF8(Evt* script, s32 isInitialCall) { ApiStatus func_802384B0_703FA0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); D_80239A0C_7054FC = playFX_33(8, var1, var2, var3, 1.3f, 55); @@ -81,9 +81,9 @@ ApiStatus func_80238570_704060(Evt* script, s32 isInitialCall) { // janky solution, but this does match. ApiStatus func_8023859C_70408C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); EffectInstanceDataThing* dataThing; D_8023C1B4 = playFX_58(0, var1, var2, var3, 1.0f, 10); @@ -120,9 +120,9 @@ INCLUDE_ASM(s32, "battle/partner/watt", func_80238810_704300); // janky solution, but this does match. ApiStatus func_80238B3C_70462C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); EffectInstanceDataThing* temp_a0; D_8023C1B4 = playFX_58(0, var1, var2, var3, 1.0f, 60); diff --git a/src/battle/star/refresh/78B600.c b/src/battle/star/refresh/78B600.c index c629561dfa..d9cfc5f651 100644 --- a/src/battle/star/refresh/78B600.c +++ b/src/battle/star/refresh/78B600.c @@ -31,10 +31,10 @@ ApiStatus func_802A17D4_78BDD4(Evt* script, s32 isInitialCall) { ApiStatus func_802A18E8_78BEE8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); playFX_40(0, var1, var2, var3, var4); @@ -43,10 +43,10 @@ ApiStatus func_802A18E8_78BEE8(Evt* script, s32 isInitialCall) { ApiStatus func_802A19A8_78BFA8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); playFX_40(1, var1, var2, var3, var4); diff --git a/src/battle/star/smooch/791D90.c b/src/battle/star/smooch/791D90.c index 4e86f30f1a..f9f2429ae5 100644 --- a/src/battle/star/smooch/791D90.c +++ b/src/battle/star/smooch/791D90.c @@ -8,10 +8,10 @@ ApiStatus func_802A156C_7922FC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); playFX_40(0, var1, var2, var3, var4); diff --git a/src/battle/star/star_storm/78E7D0.c b/src/battle/star/star_storm/78E7D0.c index 454124a661..8c4a13acbc 100644 --- a/src/battle/star/star_storm/78E7D0.c +++ b/src/battle/star/star_storm/78E7D0.c @@ -23,9 +23,9 @@ ApiStatus func_802A1518_78ECE8(Evt* script, s32 isInitialCall) { ApiStatus func_802A1628_78EDF8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); playFX_18(2, var1, var2, var3, 0, -1.0f, 0, 5); diff --git a/src/common/AddFP.inc.c b/src/common/AddFP.inc.c index e784fbd556..4e3b8f59a0 100644 --- a/src/common/AddFP.inc.c +++ b/src/common/AddFP.inc.c @@ -3,7 +3,7 @@ ApiStatus N(AddFP)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 amt = get_variable(script, *script->ptrReadPos); + s32 amt = evt_get_variable(script, *script->ptrReadPos); s32 newFP = playerData->curFP + amt; if (newFP > playerData->curMaxFP) { diff --git a/src/common/AddHP.inc.c b/src/common/AddHP.inc.c index b8195b97b4..d8d8a93d92 100644 --- a/src/common/AddHP.inc.c +++ b/src/common/AddHP.inc.c @@ -3,7 +3,7 @@ ApiStatus N(AddHP)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - s32 amt = get_variable(script, *script->ptrReadPos); + s32 amt = evt_get_variable(script, *script->ptrReadPos); s32 newHP = playerData->curHP + amt; if (newHP > playerData->curMaxHP) { diff --git a/src/common/BattleAreaAngleStuff.inc.c b/src/common/BattleAreaAngleStuff.inc.c index a011babaac..96de6c6928 100644 --- a/src/common/BattleAreaAngleStuff.inc.c +++ b/src/common/BattleAreaAngleStuff.inc.c @@ -42,20 +42,20 @@ u32 N(BattleAreaAngleStuff1)(f32 x, f32 y) { ApiStatus N(BattleAreaAngleStuff2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - s32 var5 = get_variable(script, *args); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + s32 var5 = evt_get_variable(script, *args); var3 -= var1; var4 -= var2; if (var3 == 0 && var4 == 0) { - set_variable(script, *args, var5); + evt_set_variable(script, *args, var5); return ApiStatus_DONE2; } else { - set_variable(script, *args, N(BattleAreaAngleStuff1)(var3, var4) - 90); + evt_set_variable(script, *args, N(BattleAreaAngleStuff1)(var3, var4) - 90); return ApiStatus_DONE2; } } diff --git a/src/common/DeadUnkFloatFunc.inc.c b/src/common/DeadUnkFloatFunc.inc.c index 18d07bb7a3..96fe3eab43 100644 --- a/src/common/DeadUnkFloatFunc.inc.c +++ b/src/common/DeadUnkFloatFunc.inc.c @@ -4,21 +4,21 @@ ApiStatus N(DeadUnkFloatFunc)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a1 = *args++; - s32 var0 = get_variable(script, a1); + s32 var0 = evt_get_variable(script, a1); s32 a2 = *args++; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - f32 temp = (get_float_variable(script, *args++) / 180.0f) * PI; + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + f32 temp = (evt_get_float_variable(script, *args++) / 180.0f) * PI; f32 diff = (var2 - var1) / 2; if (var4 != 0 && var3 < var0) { var0 = var3; - set_variable(script, a1, var3); + evt_set_variable(script, a1, var3); } - set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); + evt_set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); return ApiStatus_DONE2; } diff --git a/src/common/DeadUnkFloatFuncAbs.inc.c b/src/common/DeadUnkFloatFuncAbs.inc.c index 0f104239b0..17dff118f1 100644 --- a/src/common/DeadUnkFloatFuncAbs.inc.c +++ b/src/common/DeadUnkFloatFuncAbs.inc.c @@ -5,21 +5,21 @@ ApiStatus N(DeadUnkFloatFuncAbs)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a1 = *args++; - s32 var0 = get_variable(script, a1); + s32 var0 = evt_get_variable(script, a1); s32 a2 = *args++; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - f32 temp = (get_float_variable(script, *args++) / 180.0f) * PI; + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + f32 temp = (evt_get_float_variable(script, *args++) / 180.0f) * PI; f32 diff = fabsf(var2 - var1) / 2; if (var4 != 0 && var3 < var0) { var0 = var3; - set_variable(script, a1, var3); + evt_set_variable(script, a1, var3); } - set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); + evt_set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); return ApiStatus_DONE2; } diff --git a/src/common/Dist3D.inc.c b/src/common/Dist3D.inc.c index f20db22e4c..25baffb308 100644 --- a/src/common/Dist3D.inc.c +++ b/src/common/Dist3D.inc.c @@ -3,16 +3,16 @@ ApiStatus N(Dist3D)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - s32 var5 = get_variable(script, *args++); - s32 var6 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + s32 var5 = evt_get_variable(script, *args++); + s32 var6 = evt_get_variable(script, *args++); f32 diff1 = var1 - var4; f32 diff2 = var2 - var5; f32 diff3 = var3 - var6; - set_variable(script, *args++, sqrtf(SQ(diff1) + SQ(diff2) + SQ(diff3))); + evt_set_variable(script, *args++, sqrtf(SQ(diff1) + SQ(diff2) + SQ(diff3))); return ApiStatus_DONE2; } diff --git a/src/common/FreeIcon.inc.c b/src/common/FreeIcon.inc.c index 2956780d95..12167eb679 100644 --- a/src/common/FreeIcon.inc.c +++ b/src/common/FreeIcon.inc.c @@ -2,6 +2,6 @@ #include "map.h" ApiStatus N(FreeIcon)(Evt* script, s32 isInitialCall) { - free_hud_element(get_variable(script, *script->ptrReadPos)); + free_hud_element(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/common/GetBootsHammerLevel.inc.c b/src/common/GetBootsHammerLevel.inc.c index 1d082510e1..3c681c9964 100644 --- a/src/common/GetBootsHammerLevel.inc.c +++ b/src/common/GetBootsHammerLevel.inc.c @@ -3,8 +3,8 @@ ApiStatus N(GetBootsHammerLevel)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - set_variable(script, *args++, gPlayerData.bootsLevel); - set_variable(script, *args++, gPlayerData.hammerLevel); + evt_set_variable(script, *args++, gPlayerData.bootsLevel); + evt_set_variable(script, *args++, gPlayerData.hammerLevel); return ApiStatus_DONE2; } diff --git a/src/common/GetItemEntityPosition.inc.c b/src/common/GetItemEntityPosition.inc.c index 5bbb289301..af5f734f45 100644 --- a/src/common/GetItemEntityPosition.inc.c +++ b/src/common/GetItemEntityPosition.inc.c @@ -3,10 +3,10 @@ ApiStatus N(GetItemEntityPosition)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - ItemEntity* entity = get_item_entity(get_variable(script, *args++)); + ItemEntity* entity = get_item_entity(evt_get_variable(script, *args++)); - set_variable(script, *args++, entity->position.x); - set_variable(script, *args++, entity->position.y); - set_variable(script, *args++, entity->position.z); + evt_set_variable(script, *args++, entity->position.x); + evt_set_variable(script, *args++, entity->position.y); + evt_set_variable(script, *args++, entity->position.z); return ApiStatus_DONE2; } diff --git a/src/common/GetJumpHammerCharge.inc.c b/src/common/GetJumpHammerCharge.inc.c index fca6795832..958d457d71 100644 --- a/src/common/GetJumpHammerCharge.inc.c +++ b/src/common/GetJumpHammerCharge.inc.c @@ -3,8 +3,8 @@ ApiStatus N(GetJumpHammerCharge)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - set_variable(script, *args++, gBattleStatus.jumpCharge); - set_variable(script, *args++, gBattleStatus.hammerCharge); + evt_set_variable(script, *args++, gBattleStatus.jumpCharge); + evt_set_variable(script, *args++, gBattleStatus.hammerCharge); return ApiStatus_DONE2; } diff --git a/src/common/GetLastEventType.inc.c b/src/common/GetLastEventType.inc.c index d1dbf3418f..c881671374 100644 --- a/src/common/GetLastEventType.inc.c +++ b/src/common/GetLastEventType.inc.c @@ -4,7 +4,7 @@ ApiStatus N(GetLastEventType)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Actor* actor = get_actor(script->owner1.actorID); - actor->lastEventType = get_variable(script, *args++); + actor->lastEventType = evt_get_variable(script, *args++); return ApiStatus_DONE2; } diff --git a/src/common/GetSelectedMoveID.inc.c b/src/common/GetSelectedMoveID.inc.c index 6adbafb7f5..3f995bc504 100644 --- a/src/common/GetSelectedMoveID.inc.c +++ b/src/common/GetSelectedMoveID.inc.c @@ -2,6 +2,6 @@ #include "map.h" ApiStatus N(GetSelectedMoveID)(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gBattleStatus.selectedMoveID); + evt_set_variable(script, *script->ptrReadPos, gBattleStatus.selectedMoveID); return ApiStatus_DONE2; } diff --git a/src/common/IsSaveVar123.inc.c b/src/common/IsSaveVar123.inc.c index 5f1cee682e..f69e75254e 100644 --- a/src/common/IsSaveVar123.inc.c +++ b/src/common/IsSaveVar123.inc.c @@ -3,7 +3,7 @@ ApiStatus N(IsSaveVar123)(Evt* script, s32 isInitialCall) { script->varTable[0] = 0; - if (get_variable(NULL, EVT_SAVE_VAR(123)) >= 8) { + if (evt_get_variable(NULL, EVT_SAVE_VAR(123)) >= 8) { script->varTable[0] = 1; } diff --git a/src/common/MashActionCommandInit.inc.c b/src/common/MashActionCommandInit.inc.c index 091961803c..29b973dbb6 100644 --- a/src/common/MashActionCommandInit.inc.c +++ b/src/common/MashActionCommandInit.inc.c @@ -11,11 +11,11 @@ ApiStatus N(MashActionCommandInit)(Evt* script, s32 isInitialCall) { } func_80268858(); - actionCommandStatus->unk_4E = get_variable(script, *args++); - actionCommandStatus->unk_52 = get_variable(script, *args++); - actionCommandStatus->unk_50 = get_variable(script, *args++); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); - actionCommandStatus->unk_64 = get_variable(script, *args++); + actionCommandStatus->unk_64 = evt_get_variable(script, *args++); actionCommandStatus->unk_60 = 0; actionCommandStatus->unk_44 = 0; actionCommandStatus->unk_48 = 0; diff --git a/src/common/MediGuySpriteRotationFunc.inc.c b/src/common/MediGuySpriteRotationFunc.inc.c index 87122a9046..0adb5affa9 100644 --- a/src/common/MediGuySpriteRotationFunc.inc.c +++ b/src/common/MediGuySpriteRotationFunc.inc.c @@ -2,12 +2,12 @@ ApiStatus N(MediGuySpriteRotationFunc)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 angle = get_variable(script, *args++); + s32 angle = evt_get_variable(script, *args++); s32 outPos = *(args++); - s32 temp_s3 = get_variable(script, *args++); - s32 temp_s0_5 = get_variable(script, *args++); - f32 temp_f20 = get_float_variable(script, *args++) * (1.0f - (angle / (f32) temp_s0_5)); + s32 temp_s3 = evt_get_variable(script, *args++); + s32 temp_s0_5 = evt_get_variable(script, *args++); + f32 temp_f20 = evt_get_float_variable(script, *args++) * (1.0f - (angle / (f32) temp_s0_5)); - set_variable(script, outPos, temp_f20 * cos_rad((angle * 6.283184f) / temp_s3)); + evt_set_variable(script, outPos, temp_f20 * cos_rad((angle * 6.283184f) / temp_s3)); return ApiStatus_DONE2; } diff --git a/src/common/SetBackgroundAlpha.inc.c b/src/common/SetBackgroundAlpha.inc.c index 0c613b4fb6..4d864db8a3 100644 --- a/src/common/SetBackgroundAlpha.inc.c +++ b/src/common/SetBackgroundAlpha.inc.c @@ -4,6 +4,6 @@ ApiStatus N(SetBackgroundAlpha)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - set_background_color_blend(0, 0, 0, get_variable(script, *args++)); + set_background_color_blend(0, 0, 0, evt_get_variable(script, *args++)); return ApiStatus_DONE2; } diff --git a/src/common/ShrinkActor.inc.c b/src/common/ShrinkActor.inc.c index 378df4b8a0..fbd5e95a2d 100644 --- a/src/common/ShrinkActor.inc.c +++ b/src/common/ShrinkActor.inc.c @@ -3,13 +3,13 @@ ApiStatus N(ShrinkActor)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - f32 var3 = get_float_variable(script, *args++); - f32 var4 = get_float_variable(script, *args++); - f32 var5 = get_float_variable(script, *args++); - f32 var6 = get_float_variable(script, *args++); - s32 var7 = get_variable(script, *args++); + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); + f32 var4 = evt_get_float_variable(script, *args++); + f32 var5 = evt_get_float_variable(script, *args++); + f32 var6 = evt_get_float_variable(script, *args++); + s32 var7 = evt_get_variable(script, *args++); Actor* actor = get_actor(script->owner1.actorID); EffectInstance* effect = playFX_12(0, var1, (f32) var2 + 5.0, var3, var4, var5, var6, var7); diff --git a/src/common/StarPower.inc.c b/src/common/StarPower.inc.c index 2dc9028aa4..5b18541e4a 100644 --- a/src/common/StarPower.inc.c +++ b/src/common/StarPower.inc.c @@ -3,9 +3,9 @@ ApiStatus N(UnkStarFunc1)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_11(0, a, b, c, 40.0f); return ApiStatus_DONE2; @@ -13,9 +13,9 @@ ApiStatus N(UnkStarFunc1)(Evt* script, s32 isInitialCall) { ApiStatus N(UnkStarFunc2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_22(5, a, b, c, 50.0f, 50.0f, 40, 30); return ApiStatus_DONE2; @@ -23,9 +23,9 @@ ApiStatus N(UnkStarFunc2)(Evt* script, s32 isInitialCall) { ApiStatus N(UnkStarFunc3)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 a = get_variable(script, *args++); - s32 b = get_variable(script, *args++); - s32 c = get_variable(script, *args++); + s32 a = evt_get_variable(script, *args++); + s32 b = evt_get_variable(script, *args++); + s32 c = evt_get_variable(script, *args++); playFX_11(0, a, b, c, 30.0f); return ApiStatus_DONE2; @@ -33,10 +33,10 @@ ApiStatus N(UnkStarFunc3)(Evt* script, s32 isInitialCall) { ApiStatus N(UnkStarFunc4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); - playFX_72(4, var1, var2, get_variable(script, *args++), 20.0f, 20.0f, 1.0f, 0xA, 0xF); + playFX_72(4, var1, var2, evt_get_variable(script, *args++), 20.0f, 20.0f, 1.0f, 0xA, 0xF); return ApiStatus_DONE2; } diff --git a/src/common/StartRumbleWithParams.inc.c b/src/common/StartRumbleWithParams.inc.c index 1fa3f5c7e5..9e64f2fea0 100644 --- a/src/common/StartRumbleWithParams.inc.c +++ b/src/common/StartRumbleWithParams.inc.c @@ -4,7 +4,7 @@ ApiStatus N(StartRumbleWithParams)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - start_rumble(get_variable(script, *args++), get_variable(script, *args++)); + start_rumble(evt_get_variable(script, *args++), evt_get_variable(script, *args++)); return ApiStatus_DONE2; } diff --git a/src/common/UnkAngleFunc2.inc.c b/src/common/UnkAngleFunc2.inc.c index 6d378fa767..62b23ff51b 100644 --- a/src/common/UnkAngleFunc2.inc.c +++ b/src/common/UnkAngleFunc2.inc.c @@ -4,7 +4,7 @@ ApiStatus N(UnkAngleFunc2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - f32 var0 = get_variable(script, *args++) / 10.0; + f32 var0 = evt_get_variable(script, *args++) / 10.0; s32 a3 = *args++; s32 a4 = *args++; s32 a5 = *args++; @@ -15,9 +15,9 @@ ApiStatus N(UnkAngleFunc2)(Evt* script, s32 isInitialCall) { f32 fout3 = cos_rad(temp1) * 150.0f / 20.0f + -50.0f; s32 outVal; - set_float_variable(script, a3, fout1); - set_float_variable(script, a4, fout2); - set_float_variable(script, a5, fout3); + evt_set_float_variable(script, a3, fout1); + evt_set_float_variable(script, a4, fout2); + evt_set_float_variable(script, a5, fout3); outVal = 0; if (var0 > 90.0f && var0 < 270.0f) { @@ -29,7 +29,7 @@ ApiStatus N(UnkAngleFunc2)(Evt* script, s32 isInitialCall) { if ((s32)fabsf(270.0f - var0) < 45) { outVal = 2.0f * (var0 - 225.0f) + 180.0f; } - set_variable(script, a6, outVal); + evt_set_variable(script, a6, outVal); return ApiStatus_DONE2; } diff --git a/src/common/UnkBattleFunc1.inc.c b/src/common/UnkBattleFunc1.inc.c index 93d3e94f6f..e4406b04ab 100644 --- a/src/common/UnkBattleFunc1.inc.c +++ b/src/common/UnkBattleFunc1.inc.c @@ -2,10 +2,10 @@ ApiStatus N(UnkBattleFunc1)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); Actor* actor = get_actor(script->owner1.actorID); actor->unk_194 = (s8)(var0 - actor->staticActorData->statusIconOffset.x); diff --git a/src/common/UnkBattleFunc2.inc.c b/src/common/UnkBattleFunc2.inc.c index c248780534..a2de8c9b58 100644 --- a/src/common/UnkBattleFunc2.inc.c +++ b/src/common/UnkBattleFunc2.inc.c @@ -3,22 +3,22 @@ ApiStatus N(UnkBattleFunc2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); - func_802D7460(x, y, z, get_variable(script, *args++)); + func_802D7460(x, y, z, evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus N(UnkBattleFunc2_2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); - func_802D74C0(x, y, z, get_variable(script, *args++)); + func_802D74C0(x, y, z, evt_get_variable(script, *args++)); return ApiStatus_DONE2; } diff --git a/src/common/UnkBattleFunc5.inc.c b/src/common/UnkBattleFunc5.inc.c index 4dae3a1781..1e5b2b0b9d 100644 --- a/src/common/UnkBattleFunc5.inc.c +++ b/src/common/UnkBattleFunc5.inc.c @@ -2,14 +2,14 @@ ApiStatus N(UnkBattleFunc5)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 actorID = get_variable(script, *args++); - s32 partID = get_variable(script, *args++); + s32 actorID = evt_get_variable(script, *args++); + s32 partID = evt_get_variable(script, *args++); if (actorID == ACTOR_SELF) { actorID = script->owner1.actorID; } - set_variable(script, *args++, lookup_defense(get_actor_part(get_actor(actorID), partID)->defenseTable, 1)); + evt_set_variable(script, *args++, lookup_defense(get_actor_part(get_actor(actorID), partID)->defenseTable, 1)); return ApiStatus_DONE2; } diff --git a/src/common/UnkFloatFunc.inc.c b/src/common/UnkFloatFunc.inc.c index cf948d948a..f8795bd531 100644 --- a/src/common/UnkFloatFunc.inc.c +++ b/src/common/UnkFloatFunc.inc.c @@ -4,21 +4,21 @@ ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a1 = *args++; - s32 var0 = get_variable(script, a1); + s32 var0 = evt_get_variable(script, a1); s32 a2 = *args++; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - f32 temp = (get_float_variable(script, *args++) / 180.0f) * PI; + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + f32 temp = (evt_get_float_variable(script, *args++) / 180.0f) * PI; f32 diff = (var2 - var1) / 2; if (var4 != 0 && var3 < var0) { var0 = var3; - set_variable(script, a1, var3); + evt_set_variable(script, a1, var3); } - set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); + evt_set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); return ApiStatus_DONE2; } diff --git a/src/common/UnkFloatFunc2.inc.c b/src/common/UnkFloatFunc2.inc.c index 1f062f7942..d67aa979ef 100644 --- a/src/common/UnkFloatFunc2.inc.c +++ b/src/common/UnkFloatFunc2.inc.c @@ -3,15 +3,15 @@ ApiStatus N(UnkFloatFunc2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); s32 a1 = *args++; s32 a2 = *args++; s32 a3 = *args++; f32 temp = sin_rad(var0 / 10 * 6.28318f / 360.0f * 8.0f) * 10.0f; - set_variable(script, a1, 0); - set_variable(script, a2, temp); - set_variable(script, a3, 0); + evt_set_variable(script, a1, 0); + evt_set_variable(script, a2, temp); + evt_set_variable(script, a3, 0); return ApiStatus_DONE2; } diff --git a/src/common/UnkStarFunc.inc.c b/src/common/UnkStarFunc.inc.c index e020023079..abfaffdfd3 100644 --- a/src/common/UnkStarFunc.inc.c +++ b/src/common/UnkStarFunc.inc.c @@ -4,7 +4,7 @@ ApiStatus N(UnkStarFunc)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Bytecode* args = script->ptrReadPos; - set_animation(0x100, 0, D_8029C890[playerData->currentPartner][get_variable(script, *args++)]); + set_animation(0x100, 0, D_8029C890[playerData->currentPartner][evt_get_variable(script, *args++)]); return ApiStatus_DONE2; } diff --git a/src/dc470_len_14c0.c b/src/dc470_len_14c0.c index 90c5e54217..d6899cbf60 100644 --- a/src/dc470_len_14c0.c +++ b/src/dc470_len_14c0.c @@ -12,7 +12,7 @@ void load_map_bg(char* optAssetName) { u32 assetSize; char* assetName = optAssetName; - if (get_variable(NULL, EVT_STORY_PROGRESS) >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) { + if (evt_get_variable(NULL, EVT_STORY_PROGRESS) >= STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) { // Use sunny Flower Fields bg rather than cloudy if (strcmp(assetName, gCloudyFlowerFieldsBg) == 0) { assetName = gSunnyFlowerFieldsBg; diff --git a/src/encounter_api.c b/src/encounter_api.c index 6cb7d0b576..6757887274 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -7,7 +7,7 @@ ApiStatus SetEncounterStatusFlags(Evt* script, s32 isInitialCall) { EncounterStatus* currentEncounter = &gCurrentEncounter; s32 a0 = *args++; - if (get_variable(script, *args)) { + if (evt_get_variable(script, *args)) { currentEncounter->flags |= a0; } else { currentEncounter->flags &= ~a0; @@ -19,17 +19,17 @@ ApiStatus SetEncounterStatusFlags(Evt* script, s32 isInitialCall) { ApiStatus IsStartingConversation(Evt* script, s32 isInitialCall) { Bytecode arg1 = *script->ptrReadPos; - set_variable(script, arg1, is_starting_conversation()); + evt_set_variable(script, arg1, is_starting_conversation()); return ApiStatus_DONE2; } ApiStatus func_80044238(Evt* script, s32 isInitialCall) { - func_80072BCC(get_variable(script, *script->ptrReadPos)); + func_80072BCC(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus LoadDemoBattle(Evt* script, s32 isInitialCall) { - load_demo_battle(get_variable(script, *script->ptrReadPos)); + load_demo_battle(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -46,7 +46,7 @@ ApiStatus MakeNpcs(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - make_npcs(get_variable(script, *args++), gGameStatusPtr->mapID, get_variable(script, *args++)); + make_npcs(evt_get_variable(script, *args++), gGameStatusPtr->mapID, evt_get_variable(script, *args++)); script->functionTemp[0] = 1; break; case 1: @@ -63,22 +63,22 @@ INCLUDE_ASM(s32, "encounter_api", RemoveNpc, Evt* script, s32 isInitialCall); INCLUDE_ASM(s32, "encounter_api", RemoveEncounter, Evt* script, s32 isInitialCall); ApiStatus GetBattleOutcome(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gCurrentEncounter.battleOutcome); + evt_set_variable(script, *script->ptrReadPos, gCurrentEncounter.battleOutcome); return ApiStatus_DONE2; } ApiStatus func_800445A8(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, script->owner1.enemy->unk_C4); + evt_set_variable(script, *script->ptrReadPos, script->owner1.enemy->unk_C4); return ApiStatus_DONE2; } ApiStatus func_800445D4(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, script->owner1.enemy->unk_C8); + evt_set_variable(script, *script->ptrReadPos, script->owner1.enemy->unk_C8); return ApiStatus_DONE2; } ApiStatus GetOwnerEncounterTrigger(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, script->owner1.enemy->encountered); + evt_set_variable(script, *script->ptrReadPos, script->owner1.enemy->encountered); return ApiStatus_DONE2; } @@ -107,14 +107,14 @@ ApiStatus StartBattle(Evt* script, s32 isInitialCall) { } ApiStatus StartBattleWith(Evt* script, s32 isInitialCall) { - start_battle(script, get_variable(script, *script->ptrReadPos)); + start_battle(script, evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE1; } INCLUDE_ASM(s32, "encounter_api", StartBossBattle, Evt* script, s32 isInitialCall); ApiStatus SetBattleMusic(Evt* script, s32 isInitialCall) { - Bytecode songID = get_variable(script, *script->ptrReadPos); + Bytecode songID = evt_get_variable(script, *script->ptrReadPos); EncounterStatus* currentEncounter = &gCurrentEncounter; currentEncounter->allowFleeing = 1; @@ -128,8 +128,8 @@ INCLUDE_ASM(s32, "encounter_api", BindNpcAI, Evt* script, s32 isInitialCall); ApiStatus BindNpcIdle(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* owner = script->owner1.enemy; - NpcID npcID = get_variable(script, *args++); - Bytecode* aiBytecode = (Bytecode*)get_variable(script, *args); + NpcID npcID = evt_get_variable(script, *args++); + Bytecode* aiBytecode = (Bytecode*)evt_get_variable(script, *args); if (npcID == NPC_SELF) { npcID = owner->npcID; @@ -144,7 +144,7 @@ ApiStatus BindNpcIdle(Evt* script, s32 isInitialCall) { ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); Evt* newScript; s32 groupFlags; @@ -178,8 +178,8 @@ ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) { ApiStatus EnableNpcAI(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); - s32 var2 = get_variable(script, *args); + NpcID npcId = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -203,8 +203,8 @@ INCLUDE_ASM(s32, "encounter_api", SetNpcAux, Evt* script, s32 isInitialCall); ApiStatus BindNpcAux(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); - Bytecode* auxBytecode = (Bytecode*)get_variable(script, *args); + NpcID npcId = evt_get_variable(script, *args++); + Bytecode* auxBytecode = (Bytecode*)evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -219,7 +219,7 @@ ApiStatus BindNpcAux(Evt* script, s32 isInitialCall) { ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); Evt* newScript; s32 groupFlags; @@ -252,8 +252,8 @@ ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) { ApiStatus EnableNpcAux(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); - s32 var2 = get_variable(script, *args); + NpcID npcId = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -275,8 +275,8 @@ ApiStatus EnableNpcAux(Evt* script, s32 isInitialCall) { ApiStatus BindNpcInteract(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); - Bytecode* interactBytecode = (Bytecode*)get_variable(script, *args); + NpcID npcId = evt_get_variable(script, *args++); + Bytecode* interactBytecode = (Bytecode*)evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -295,8 +295,8 @@ ApiStatus BindNpcInteract(Evt* script, s32 isInitialCall) { ApiStatus BindNpcHit(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); - Bytecode* hitBytecode = (Bytecode*)get_variable(script, *args); + NpcID npcId = evt_get_variable(script, *args++); + Bytecode* hitBytecode = (Bytecode*)evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -315,8 +315,8 @@ ApiStatus BindNpcHit(Evt* script, s32 isInitialCall) { ApiStatus BindNpcDefeat(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - s32 npcId = get_variable(script, *args++); - Bytecode* defeatBytecode = (Bytecode*)get_variable(script, *args); + s32 npcId = evt_get_variable(script, *args++); + Bytecode* defeatBytecode = (Bytecode*)evt_get_variable(script, *args); if (npcId == -1) { npcId = npc->npcID; @@ -331,8 +331,8 @@ ApiStatus BindNpcDefeat(Evt* script, s32 isInitialCall) { ApiStatus SetSelfVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* owner = script->owner1.enemy; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args); owner->varTable[var1] = var2; return ApiStatus_DONE2; @@ -341,16 +341,16 @@ ApiStatus SetSelfVar(Evt* script, s32 isInitialCall) { ApiStatus GetSelfVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - set_variable(script, *args, script->owner1.enemy->varTable[get_variable(script, *args++)]); + evt_set_variable(script, *args, script->owner1.enemy->varTable[evt_get_variable(script, *args++)]); return ApiStatus_DONE2; } ApiStatus SetNpcVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); - s32 varIdx = get_variable(script, *args++); - s32 val = get_variable(script, *args); + NpcID npcId = evt_get_variable(script, *args++); + s32 varIdx = evt_get_variable(script, *args++); + s32 val = evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -365,8 +365,8 @@ ApiStatus SetNpcVar(Evt* script, s32 isInitialCall) { ApiStatus GetNpcVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcID = get_variable(script, *args++); - s32 varIdx = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + s32 varIdx = evt_get_variable(script, *args++); s32 var3 = *args; if (npcID == NPC_SELF) { @@ -374,7 +374,7 @@ ApiStatus GetNpcVar(Evt* script, s32 isInitialCall) { } npc = get_enemy(npcID); - set_variable(script, var3, npc->varTable[varIdx]); + evt_set_variable(script, var3, npc->varTable[varIdx]); return ApiStatus_DONE2; } @@ -382,9 +382,9 @@ ApiStatus GetNpcVar(Evt* script, s32 isInitialCall) { ApiStatus SetSelfRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Npc* self = get_npc_unsafe(script->owner2.npcID); - s32 rotX = get_variable(script, *args++); - s32 rotY = get_variable(script, *args++); - s32 rotZ = get_variable(script, *args++); + s32 rotX = evt_get_variable(script, *args++); + s32 rotY = evt_get_variable(script, *args++); + s32 rotZ = evt_get_variable(script, *args++); self->rotation.x = rotX; self->rotation.y = rotY; @@ -403,7 +403,7 @@ ApiStatus SetSelfEnemyFlagBits(Evt* script, s32 isInitialCall) { Enemy* owner = script->owner1.enemy; s32 bits = *args++; - if (get_variable(script, *args)) { + if (evt_get_variable(script, *args)) { owner->flags |= bits; } else { owner->flags &= ~bits; @@ -416,7 +416,7 @@ ApiStatus SyncOverrideEnemyPos(Evt* script, s32 isInitialCall) { Enemy* owner = script->owner1.enemy; Npc* npc = get_npc_unsafe(script->owner2.npcID); - owner->unk_07 = get_variable(script, *args); + owner->unk_07 = evt_get_variable(script, *args); owner->unk_10.x = npc->pos.x; owner->unk_10.y = npc->pos.y; owner->unk_10.z = npc->pos.z; @@ -425,7 +425,7 @@ ApiStatus SyncOverrideEnemyPos(Evt* script, s32 isInitialCall) { } ApiStatus GetSelfNpcID(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, script->owner1.enemy->npcID); + evt_set_variable(script, *script->ptrReadPos, script->owner1.enemy->npcID); return ApiStatus_DONE2; } @@ -445,9 +445,9 @@ ApiStatus ClearDefeatedEnemies(Evt* script, s32 isInitialCall) { ApiStatus SetEnemyFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; - NpcID npcId = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); s32 bits = *args++; - s32 var2 = get_variable(script, *args); + s32 var2 = evt_get_variable(script, *args); if (npcId == NPC_SELF) { npcId = npc->npcID; @@ -472,19 +472,19 @@ ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* owner = script->owner1.enemy; - set_variable(script, *args, owner->animList[get_variable(script, *args++)]); + evt_set_variable(script, *args, owner->animList[evt_get_variable(script, *args++)]); return ApiStatus_DONE2; } ApiStatus func_80045798(Evt* script, s32 isInitialCall) { - gPartnerActionStatus.unk_358 = get_variable(script, *script->ptrReadPos); + gPartnerActionStatus.unk_358 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus func_800457C4(Evt* script, s32 isInitialCall) { Enemy* ownerActor = script->owner1.enemy; - ownerActor->unk_B5 = get_variable(script, *script->ptrReadPos); + ownerActor->unk_B5 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -494,15 +494,15 @@ ApiStatus func_800457F8(Evt* script, s32 isInitialCall) { } ApiStatus GetEncounterTriggerHitTier(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gCurrentEncounter.hitTier); + evt_set_variable(script, *script->ptrReadPos, gCurrentEncounter.hitTier); return ApiStatus_DONE2; } ApiStatus func_80045838(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args); Npc* npc = resolve_npc(script, var1); if (npc == NULL) { @@ -514,14 +514,14 @@ ApiStatus func_80045838(Evt* script, s32 isInitialCall) { } ApiStatus func_800458CC(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, script->owner1.enemy->npcSettings->unk_2A & 8); + evt_set_variable(script, *script->ptrReadPos, script->owner1.enemy->npcSettings->unk_2A & 8); return ApiStatus_DONE2; } ApiStatus func_80045900(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var0 = get_variable(script, *script->ptrReadPos); + s32 var0 = evt_get_variable(script, *script->ptrReadPos); enemy->unk_B0 |= 4; @@ -554,8 +554,8 @@ ApiStatus func_80045900(Evt* script, s32 isInitialCall) { ApiStatus SetTattleString(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID enemyId = get_variable(script, *args++); - u32 tattleString = get_variable(script, *args); + NpcID enemyId = evt_get_variable(script, *args++); + u32 tattleString = evt_get_variable(script, *args); Enemy* npc = get_enemy(enemyId); npc->tattleString = tattleString; diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 8f7e963f2b..672ef78c4e 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -13,8 +13,8 @@ EvtSource ShakeCamX = SCRIPT({ ApiStatus SetCamEnabled(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s32 enabled = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s32 enabled = evt_get_variable(script, *args++); if (!enabled) { gCameras[id].flags |= CAM_FLAG_ENABLED; @@ -26,8 +26,8 @@ ApiStatus SetCamEnabled(Evt* script, s32 isInitialCall) { ApiStatus SetCamFlag80(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s32 enabled = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s32 enabled = evt_get_variable(script, *args++); if (!enabled) { gCameras[id].flags |= CAM_FLAG_80; @@ -39,11 +39,11 @@ ApiStatus SetCamFlag80(Evt* script, s32 isInitialCall) { ApiStatus SetCamPerspective(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s16 mode = get_variable(script, *args++); - f32 vfov = get_float_variable(script, *args++); - s16 nearClip = get_variable(script, *args++); - s16 farClip = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s16 mode = evt_get_variable(script, *args++); + f32 vfov = evt_get_float_variable(script, *args++); + s16 nearClip = evt_get_variable(script, *args++); + s16 farClip = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -58,8 +58,8 @@ ApiStatus SetCamPerspective(Evt* script, s32 isInitialCall) { ApiStatus func_802CA90C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s16 mode = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s16 mode = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -70,7 +70,7 @@ ApiStatus func_802CA90C(Evt* script, s32 isInitialCall) { ApiStatus func_802CA988(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode id = get_variable(script, *args++); + Bytecode id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Bytecode outVar3 = *args++; @@ -92,20 +92,20 @@ ApiStatus func_802CA988(Evt* script, s32 isInitialCall) { gCameras[id].unk_58 = gCameras[id].lookAt_obj.y; gCameras[id].unk_5C = gCameras[id].lookAt_obj.z; - set_variable(script, outVar1, gCameras[id].unk_1C); - set_variable(script, outVar2, gCameras[id].unk_1E); - set_variable(script, outVar3, gCameras[id].unk_20); - set_variable(script, outVar4, gCameras[id].unk_22); + evt_set_variable(script, outVar1, gCameras[id].unk_1C); + evt_set_variable(script, outVar2, gCameras[id].unk_1E); + evt_set_variable(script, outVar3, gCameras[id].unk_20); + evt_set_variable(script, outVar4, gCameras[id].unk_22); return ApiStatus_DONE2; } ApiStatus SetCamViewport(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s16 width = get_variable(script, *args++); - s16 height = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s16 width = evt_get_variable(script, *args++); + s16 height = evt_get_variable(script, *args++); set_cam_viewport(id, x, y, width, height); return ApiStatus_DONE2; @@ -113,11 +113,11 @@ ApiStatus SetCamViewport(Evt* script, s32 isInitialCall) { ApiStatus func_802CABE8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s16 value1 = get_variable(script, *args++); - s32 value2 = get_variable(script, *args++); - s32 value3 = get_variable(script, *args++); - s16 value4 = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s16 value1 = evt_get_variable(script, *args++); + s32 value2 = evt_get_variable(script, *args++); + s32 value3 = evt_get_variable(script, *args++); + s16 value4 = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -130,11 +130,11 @@ ApiStatus func_802CABE8(Evt* script, s32 isInitialCall) { ApiStatus func_802CACC0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s16 value1 = get_variable(script, *args++); - s32 value2 = get_variable(script, *args++); - s32 value3 = get_variable(script, *args++); - s16 zoomPercent = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s16 value1 = evt_get_variable(script, *args++); + s32 value2 = evt_get_variable(script, *args++); + s32 value3 = evt_get_variable(script, *args++); + s16 zoomPercent = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -147,10 +147,10 @@ ApiStatus func_802CACC0(Evt* script, s32 isInitialCall) { ApiStatus SetCamBGColor(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s16 r = get_variable(script, *args++); - s16 g = get_variable(script, *args++); - s16 b = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s16 r = evt_get_variable(script, *args++); + s16 g = evt_get_variable(script, *args++); + s16 b = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -162,10 +162,10 @@ ApiStatus SetCamBGColor(Evt* script, s32 isInitialCall) { ApiStatus func_802CAE50(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s32 value1 = get_variable(script, *args++); - s32 value2 = get_variable(script, *args++); - s32 value3 = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s32 value1 = evt_get_variable(script, *args++); + s32 value2 = evt_get_variable(script, *args++); + s32 value3 = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -177,10 +177,10 @@ ApiStatus func_802CAE50(Evt* script, s32 isInitialCall) { ApiStatus SetCamTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -207,16 +207,16 @@ void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3) { Evt* script; script = start_script_in_group(&ShakeCamX, 1, 0, 4); - set_variable(script, EVT_VAR(0), arg0); - set_variable(script, EVT_VAR(1), arg1); - set_variable(script, EVT_VAR(2), arg2); - set_float_variable(script, EVT_VAR(3), arg3); + evt_set_variable(script, EVT_VAR(0), arg0); + evt_set_variable(script, EVT_VAR(1), arg1); + evt_set_variable(script, EVT_VAR(2), arg2); + evt_set_float_variable(script, EVT_VAR(3), arg3); } ApiStatus SetCamLeadPlayer(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - s32 enabled = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + s32 enabled = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -230,8 +230,8 @@ ApiStatus SetCamLeadPlayer(Evt* script, s32 isInitialCall) { ApiStatus func_802CB710(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - f32 value = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + f32 value = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -241,9 +241,9 @@ ApiStatus func_802CB710(Evt* script, s32 isInitialCall) { ApiStatus PanToTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - f32 panPhase = get_float_variable(script, *args++); - s32 targetType = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + f32 panPhase = evt_get_float_variable(script, *args++); + s32 targetType = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -265,11 +265,11 @@ INCLUDE_ASM(s32, "evt/cam_api", LoadSettings, Evt* script, s32 isInitialCall); ApiStatus SetCamType(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; - s32 controllerType = get_variable(script, *args++); - s32 enabled = get_variable(script, *args++); + s32 controllerType = evt_get_variable(script, *args++); + s32 enabled = evt_get_variable(script, *args++); camera->unk_500 = enabled; camera->controllerType = controllerType; @@ -278,11 +278,11 @@ ApiStatus SetCamType(Evt* script, s32 isInitialCall) { ApiStatus SetCamPitch(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; - f32 boomPitch = get_float_variable(script, *args++); - f32 viewPitch = get_float_variable(script, *args++); + f32 boomPitch = evt_get_float_variable(script, *args++); + f32 viewPitch = evt_get_float_variable(script, *args++); camera->controllerBoomPitch = boomPitch; camera->controllerViewPitch = viewPitch; @@ -291,10 +291,10 @@ ApiStatus SetCamPitch(Evt* script, s32 isInitialCall) { ApiStatus SetCamDistance(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; - f32 boomLength = get_float_variable(script, *args++); + f32 boomLength = evt_get_float_variable(script, *args++); camera->controllerBoomLen = boomLength; return ApiStatus_DONE2; @@ -302,11 +302,11 @@ ApiStatus SetCamDistance(Evt* script, s32 isInitialCall) { ApiStatus SetCamPosA(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; - f32 x = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + f32 x = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); camera->posA.x = x; camera->posA.z = z; @@ -315,11 +315,11 @@ ApiStatus SetCamPosA(Evt* script, s32 isInitialCall) { ApiStatus SetCamPosB(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; - f32 x = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + f32 x = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); camera->posB.x = x; camera->posB.z = z; @@ -328,11 +328,11 @@ ApiStatus SetCamPosB(Evt* script, s32 isInitialCall) { ApiStatus SetCamPosC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; - f32 y1 = get_float_variable(script, *args++); - f32 y2 = get_float_variable(script, *args++); + f32 y1 = evt_get_float_variable(script, *args++); + f32 y2 = evt_get_float_variable(script, *args++); camera->posA.y = y1; camera->posB.y = y2; @@ -341,12 +341,12 @@ ApiStatus SetCamPosC(Evt* script, s32 isInitialCall) { ApiStatus SetPanTarget(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_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++); camera->movePos.x = x; camera->movePos.y = y; @@ -357,8 +357,8 @@ ApiStatus SetPanTarget(Evt* script, s32 isInitialCall) { ApiStatus SetCamSpeed(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); - f32 speed = get_float_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); + f32 speed = evt_get_float_variable(script, *args++); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -368,99 +368,99 @@ ApiStatus SetCamSpeed(Evt* script, s32 isInitialCall) { ApiStatus GetCamType(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Camera* cameras = gCameras; Camera* camera = &cameras[id]; - set_variable(script, outVar1, camera->controllerType); - set_variable(script, outVar2, camera->unk_500); + evt_set_variable(script, outVar1, camera->controllerType); + evt_set_variable(script, outVar2, camera->unk_500); return ApiStatus_DONE2; } ApiStatus GetCamPitch(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Camera* cameras = gCameras; Camera* camera = &cameras[id]; - set_float_variable(script, outVar1, camera->controllerBoomPitch); - set_float_variable(script, outVar2, camera->controllerViewPitch); + evt_set_float_variable(script, outVar1, camera->controllerBoomPitch); + evt_set_float_variable(script, outVar2, camera->controllerViewPitch); return ApiStatus_DONE2; } ApiStatus GetCamDistance(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Camera* cameras = gCameras; Camera* camera = &cameras[id]; - set_float_variable(script, outVar1, camera->controllerBoomLen); + evt_set_float_variable(script, outVar1, camera->controllerBoomLen); return ApiStatus_DONE2; } ApiStatus GetCamPosA(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Camera* cameras = gCameras; Camera* camera = &cameras[id]; - set_float_variable(script, outVar1, camera->posA.x); - set_float_variable(script, outVar2, camera->posA.z); + evt_set_float_variable(script, outVar1, camera->posA.x); + evt_set_float_variable(script, outVar2, camera->posA.z); return ApiStatus_DONE2; } ApiStatus GetCamPosB(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Camera* cameras = gCameras; Camera* camera = &cameras[id]; - set_float_variable(script, outVar1, camera->posB.x); - set_float_variable(script, outVar2, camera->posB.z); + evt_set_float_variable(script, outVar1, camera->posB.x); + evt_set_float_variable(script, outVar2, camera->posB.z); return ApiStatus_DONE2; } ApiStatus GetCamPosC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Camera* cameras = gCameras; Camera* camera = &cameras[id]; - set_float_variable(script, outVar1, camera->posA.y); - set_float_variable(script, outVar2, camera->posB.y); + evt_set_float_variable(script, outVar1, camera->posA.y); + evt_set_float_variable(script, outVar2, camera->posB.y); return ApiStatus_DONE2; } ApiStatus GetCamPosition(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, *args++); + s32 id = evt_get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Bytecode outVar3 = *args++; Camera* cameras = gCameras; Camera* camera = &cameras[id]; - set_float_variable(script, outVar1, camera->movePos.x); - set_float_variable(script, outVar2, camera->movePos.y); - set_float_variable(script, outVar3, camera->movePos.z); + evt_set_float_variable(script, outVar1, camera->movePos.x); + evt_set_float_variable(script, outVar2, camera->movePos.y); + evt_set_float_variable(script, outVar3, camera->movePos.z); return ApiStatus_DONE2; } ApiStatus WaitForCam(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 id = get_variable(script, args[0]); - f32 endInterpValue = get_float_variable(script, args[1]); + s32 id = evt_get_variable(script, args[0]); + f32 endInterpValue = evt_get_float_variable(script, args[1]); Camera* cameras = gCameras; Camera* camera = &cameras[id]; @@ -502,8 +502,8 @@ ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall) { ApiStatus LoadAnimatedModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); AnimatedModel* animModel = (*gCurrentMeshAnimationListPtr)[index]; s32 animModelID = create_model_animator(0); @@ -526,8 +526,8 @@ ApiStatus LoadAnimatedModel(Evt* script, s32 isInitialCall) { ApiStatus LoadAnimatedMesh(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); AnimatedModel* animModel = (*gCurrentMeshAnimationListPtr)[index]; s32 animModelID = create_model_animator(0); @@ -550,8 +550,8 @@ ApiStatus LoadAnimatedMesh(Evt* script, s32 isInitialCall) { ApiStatus PlayModelAnimation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; model->currentAnimData = var2; @@ -562,9 +562,9 @@ ApiStatus PlayModelAnimation(Evt* script, s32 isInitialCall) { ApiStatus PlayModelAnimationStartingFrom(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; model->currentAnimData = var2; @@ -575,8 +575,8 @@ ApiStatus PlayModelAnimationStartingFrom(Evt* script, s32 isInitialCall) { ApiStatus ChangeModelAnimation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; if (model->currentAnimData == var2) { @@ -590,10 +590,10 @@ ApiStatus ChangeModelAnimation(Evt* script, s32 isInitialCall) { ApiStatus SetAnimatedModelRootPosition(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + s32 index = 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++); AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; model->pos.x = x; @@ -605,25 +605,25 @@ ApiStatus SetAnimatedModelRootPosition(Evt* script, s32 isInitialCall) { ApiStatus GetAnimatedModelRootPosition(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); s32 outX = *args++; s32 outY = *args++; s32 outZ = *args++; AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; - set_float_variable(script, outX, model->pos.x); - set_float_variable(script, outY, model->pos.y); - set_float_variable(script, outZ, model->pos.z); + evt_set_float_variable(script, outX, model->pos.x); + evt_set_float_variable(script, outY, model->pos.y); + evt_set_float_variable(script, outZ, model->pos.z); return ApiStatus_DONE2; } ApiStatus AddAnimatedModelRootPosition(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + s32 index = 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++); AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; model->pos.x += x; @@ -635,10 +635,10 @@ ApiStatus AddAnimatedModelRootPosition(Evt* script, s32 isInitialCall) { ApiStatus SetAnimatedModelRootRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + s32 index = 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++); AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; model->rot.x = x; @@ -650,10 +650,10 @@ ApiStatus SetAnimatedModelRootRotation(Evt* script, s32 isInitialCall) { ApiStatus SetAnimatedModelRootScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + s32 index = 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++); AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[index]; model->scale.x = x; @@ -665,15 +665,15 @@ ApiStatus SetAnimatedModelRootScale(Evt* script, s32 isInitialCall) { ApiStatus SetAnimatedModelRenderMode(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - s32 renderMode = get_float_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 renderMode = evt_get_float_variable(script, *args++); get_animator_by_index((*gCurrentMeshAnimationListPtr)[index]->animModelID)->renderMode = renderMode; return ApiStatus_DONE2; } ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall) { - AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[get_variable(script, *script->ptrReadPos)]; + AnimatedModel* model = (*gCurrentMeshAnimationListPtr)[evt_get_variable(script, *script->ptrReadPos)]; delete_model_animator(get_animator_by_index(model->animModelID)); model->animModelID = -1; @@ -682,9 +682,9 @@ ApiStatus DeleteAnimatedModel(Evt* script, s32 isInitialCall) { ApiStatus SetAnimatorFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); s32 a1 = *args++; - s32 enable = get_variable(script, *args++); + s32 enable = evt_get_variable(script, *args++); AnimatedMesh* animMesh = get_animator_by_index((*gCurrentMeshAnimationListPtr)[index]->animModelID); if (enable) { diff --git a/src/evt/demo_api.c b/src/evt/demo_api.c index 590b395bfa..ec3573e8fe 100644 --- a/src/evt/demo_api.c +++ b/src/evt/demo_api.c @@ -3,7 +3,7 @@ INCLUDE_ASM(ApiStatus, "evt/demo_api", SetSpriteShading, Evt* script, s32 isInitialCall); ApiStatus EnableSpriteShading(Evt* script, s32 isInitialCall) { - if (get_variable(script, *script->ptrReadPos) != 0) { + if (evt_get_variable(script, *script->ptrReadPos) != 0) { *D_80151328 |= 1; } else { *D_80151328 &= ~1; @@ -12,22 +12,22 @@ ApiStatus EnableSpriteShading(Evt* script, s32 isInitialCall) { } ApiStatus GetDemoState(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gGameStatusPtr->demoState); + evt_set_variable(script, *script->ptrReadPos, gGameStatusPtr->demoState); return ApiStatus_DONE2; } ApiStatus DemoPressButton(Evt* script, s32 isInitialCall) { - gGameStatusPtr->demoButtonInput |= get_variable(script, *script->ptrReadPos); + gGameStatusPtr->demoButtonInput |= evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus DemoReleaseButton(Evt* script, s32 isInitialCall) { - gGameStatusPtr->demoButtonInput &= ~get_variable(script, *script->ptrReadPos); + gGameStatusPtr->demoButtonInput &= ~evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus DemoSetButtons(Evt* script, s32 isInitialCall) { - gGameStatusPtr->demoButtonInput = get_variable(script, *script->ptrReadPos); + gGameStatusPtr->demoButtonInput = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -37,8 +37,8 @@ ApiStatus DemoJoystickRadial(Evt* script, s32 isInitialCall) { f32 b; s32* thisPos = script->ptrReadPos; - a = get_float_variable(script, *thisPos++); - b = get_float_variable(script, *thisPos++); + a = evt_get_float_variable(script, *thisPos++); + b = evt_get_float_variable(script, *thisPos++); (*gameStatus)->demoStickX = a * sin_deg(b); (*gameStatus)->demoStickY = a * cos_deg(b); @@ -52,8 +52,8 @@ ApiStatus DemoJoystickXY(Evt* script, s32 isInitialCall) { f32 y; s32* thisPos = script->ptrReadPos; - x = get_float_variable(script, *thisPos++); - y = get_float_variable(script, *thisPos++); + x = evt_get_float_variable(script, *thisPos++); + y = evt_get_float_variable(script, *thisPos++); (*gameStatus)->demoStickX = x; (*gameStatus)->demoStickY = y; diff --git a/src/evt/evt.c b/src/evt/evt.c index 319a839abf..e88195434e 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -6,7 +6,7 @@ Bytecode* evt_skip_else(Evt* script); Bytecode* evt_goto_end_case(Evt* script); Bytecode* evt_goto_next_case(Evt* script); Bytecode* evt_goto_end_loop(Evt* script); -s32 get_variable_index(Evt* script, s32 var); +s32 evt_get_variable_index(Evt* script, s32 var); u8 D_802D9D70 = 0xFE; u8 D_802D9D71 = 0xFE; @@ -16,7 +16,7 @@ u8 D_802D9D73 = 0xFF; // BSS extern s8 evtDebugPrintBuffer[]; -f32 fixed_var_to_float(Bytecode scriptVar) { +f32 evt_fixed_var_to_float(Bytecode scriptVar) { if (scriptVar <= -220000000) { return (scriptVar + 230000000) / 1024.0f; } else { @@ -24,7 +24,7 @@ f32 fixed_var_to_float(Bytecode scriptVar) { } } -Bytecode float_to_fixed_var(f32 value) { +Bytecode evt_float_to_fixed_var(f32 value) { return (s32)(value * 1024.0f) + -230000000; } @@ -38,7 +38,7 @@ ApiStatus evt_handle_label(Evt* script) { } ApiStatus evt_handle_goto(Evt* script) { - script->ptrNextLine = evt_find_label(script, get_variable(script, *script->ptrReadPos)); + script->ptrNextLine = evt_find_label(script, evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -71,8 +71,8 @@ ApiStatus evt_handle_end_loop(Evt* script) { if (loopCounter >= -10000000) { script->loopCounterTable[loopDepth] = --loopCounter; } else { - s32 var = get_variable(script, loopCounter) - 1; - set_variable(script, loopCounter, var); + s32 var = evt_get_variable(script, loopCounter) - 1; + evt_set_variable(script, loopCounter, var); loopCounter = var; } @@ -96,7 +96,7 @@ ApiStatus evt_handle_wait(Evt* script) { Bytecode* ptrReadPos = script->ptrReadPos; if (!script->blocked) { - script->functionTemp[0] = get_variable(script, *ptrReadPos); + script->functionTemp[0] = evt_get_variable(script, *ptrReadPos); script->blocked = 1; } @@ -112,7 +112,7 @@ ApiStatus evt_handle_wait_seconds(Evt* script) { Bytecode* ptrReadPos = script->ptrReadPos; if (!script->blocked) { - script->functionTemp[0] = get_float_variable(script, *ptrReadPos) * 30.0f + 0.5; + script->functionTemp[0] = evt_get_float_variable(script, *ptrReadPos) * 30.0f + 0.5; script->blocked = 1; } @@ -127,7 +127,7 @@ ApiStatus evt_handle_wait_seconds(Evt* script) { ApiStatus evt_handle_if_equal(Evt* script) { Bytecode* args = script->ptrReadPos; - if (get_variable(script, *args++) != get_variable(script, *args++)) { + if (evt_get_variable(script, *args++) != evt_get_variable(script, *args++)) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -137,7 +137,7 @@ ApiStatus evt_handle_if_equal(Evt* script) { ApiStatus evt_handle_if_not_equal(Evt* script) { Bytecode* args = script->ptrReadPos; - if (get_variable(script, *args++) == get_variable(script, *args++)) { + if (evt_get_variable(script, *args++) == evt_get_variable(script, *args++)) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -147,7 +147,7 @@ ApiStatus evt_handle_if_not_equal(Evt* script) { ApiStatus evt_handle_if_less(Evt* script) { Bytecode* args = script->ptrReadPos; - if (get_variable(script, *args++) >= get_variable(script, *args++)) { + if (evt_get_variable(script, *args++) >= evt_get_variable(script, *args++)) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -157,7 +157,7 @@ ApiStatus evt_handle_if_less(Evt* script) { ApiStatus evt_handle_if_greater(Evt* script) { Bytecode* args = script->ptrReadPos; - if (get_variable(script, *args++) <= get_variable(script, *args++)) { + if (evt_get_variable(script, *args++) <= evt_get_variable(script, *args++)) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -167,7 +167,7 @@ ApiStatus evt_handle_if_greater(Evt* script) { ApiStatus evt_handle_if_less_equal(Evt* script) { Bytecode* args = script->ptrReadPos; - if (get_variable(script, *args++) > get_variable(script, *args++)) { + if (evt_get_variable(script, *args++) > evt_get_variable(script, *args++)) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -177,7 +177,7 @@ ApiStatus evt_handle_if_less_equal(Evt* script) { ApiStatus evt_handle_if_greater_equal(Evt* script) { Bytecode* args = script->ptrReadPos; - if (get_variable(script, *args++) < get_variable(script, *args++)) { + if (evt_get_variable(script, *args++) < evt_get_variable(script, *args++)) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -188,7 +188,7 @@ ApiStatus evt_handle_if_AND(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - if ((get_variable(script, var) & *args) == 0) { + if ((evt_get_variable(script, var) & *args) == 0) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -199,7 +199,7 @@ ApiStatus evt_handle_if_not_AND(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - if ((get_variable(script, var) & *args) != 0) { + if ((evt_get_variable(script, var) & *args) != 0) { script->ptrNextLine = evt_skip_if(script); return ApiStatus_DONE2; } @@ -216,7 +216,7 @@ ApiStatus evt_handle_end_if(Evt* script) { } ApiStatus evt_handle_switch(Evt* script) { - Bytecode value = get_variable(script, *script->ptrReadPos); + Bytecode value = evt_get_variable(script, *script->ptrReadPos); s32 switchDepth = ++script->switchDepth; ASSERT(switchDepth < 8); @@ -248,7 +248,7 @@ ApiStatus evt_handle_case_equal(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; if (script->switchBlockState[switchDepth] <= 0) { @@ -271,7 +271,7 @@ ApiStatus evt_handle_case_not_equal(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; if (script->switchBlockState[switchDepth] <= 0) { @@ -294,7 +294,7 @@ ApiStatus evt_handle_case_less(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; if (script->switchBlockState[switchDepth] <= 0) { @@ -317,7 +317,7 @@ ApiStatus evt_handle_case_less_equal(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; if (script->switchBlockState[switchDepth] <= 0) { @@ -340,7 +340,7 @@ ApiStatus evt_handle_case_greater(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; if (script->switchBlockState[switchDepth] <= 0) { @@ -363,7 +363,7 @@ ApiStatus evt_handle_case_greater_equal(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; if (script->switchBlockState[switchDepth] <= 0) { @@ -387,8 +387,8 @@ ApiStatus evt_handle_case_range(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args++); - var2 = get_variable(script, *args++); + var = evt_get_variable(script, *args++); + var2 = evt_get_variable(script, *args++); switchBlockValue = script->switchBlockValue[switchDepth]; @@ -453,7 +453,7 @@ ApiStatus evt_handle_case_equal_OR(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; switchBlockState = script->switchBlockState[switchDepth]; @@ -478,7 +478,7 @@ ApiStatus evt_handle_case_equal_AND(Evt* script) { ASSERT(switchDepth >= 0); - var = get_variable(script, *args); + var = evt_get_variable(script, *args); switchBlockValue = script->switchBlockValue[switchDepth]; switchBlockState = script->switchBlockState[switchDepth]; @@ -535,12 +535,12 @@ ApiStatus evt_handle_set_var(Evt* script) { Bytecode* args = script->ptrReadPos; s32 curPtrReadPos = args[0]; - set_variable(script, curPtrReadPos, get_variable(script, args[1])); + evt_set_variable(script, curPtrReadPos, evt_get_variable(script, args[1])); return ApiStatus_DONE2; } ApiStatus evt_handle_set_const(Evt* script) { - set_variable(script, *script->ptrReadPos, script->ptrReadPos[1]); + evt_set_variable(script, *script->ptrReadPos, script->ptrReadPos[1]); return ApiStatus_DONE2; } @@ -548,125 +548,125 @@ ApiStatus evt_handle_set_float(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - set_float_variable(script, var, get_float_variable(script, *args)); + evt_set_float_variable(script, var, evt_get_float_variable(script, *args)); return ApiStatus_DONE2; } ApiStatus evt_handle_add(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - s32 result = get_variable(script, *args++); - s32 addend = get_variable(script, var); + s32 result = evt_get_variable(script, *args++); + s32 addend = evt_get_variable(script, var); result += addend; - set_variable(script, var, result); + evt_set_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_subtract(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - s32 result = get_variable(script, *args++); - s32 minuend = get_variable(script, var); + s32 result = evt_get_variable(script, *args++); + s32 minuend = evt_get_variable(script, var); result = minuend - result; - set_variable(script, var, result); + evt_set_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_multiply(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - s32 result = get_variable(script, *args++); - s32 multiplier = get_variable(script, var); + s32 result = evt_get_variable(script, *args++); + s32 multiplier = evt_get_variable(script, var); result *= multiplier; - set_variable(script, var, result); + evt_set_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_divide(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - s32 result = get_variable(script, *args++); - s32 dividend = get_variable(script, var); + s32 result = evt_get_variable(script, *args++); + s32 dividend = evt_get_variable(script, var); result = dividend / result; - set_variable(script, var, result); + evt_set_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_mod(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - s32 result = get_variable(script, *args++) + 0.5; - s32 num = get_variable(script, var) + 0.5; + s32 result = evt_get_variable(script, *args++) + 0.5; + s32 num = evt_get_variable(script, var) + 0.5; result = num % result; - set_variable(script, var, result); + evt_set_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_addF(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - f32 result = get_float_variable(script, *args++); - f32 addend = get_float_variable(script, var); + f32 result = evt_get_float_variable(script, *args++); + f32 addend = evt_get_float_variable(script, var); result += addend; - set_float_variable(script, var, result); + evt_set_float_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_subtractF(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - f32 result = get_float_variable(script, *args++); - f32 minuend = get_float_variable(script, var); + f32 result = evt_get_float_variable(script, *args++); + f32 minuend = evt_get_float_variable(script, var); result = minuend - result; - set_float_variable(script, var, result); + evt_set_float_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_multiplyF(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - f32 result = get_float_variable(script, *args++); - f32 multiplier = get_float_variable(script, var); + f32 result = evt_get_float_variable(script, *args++); + f32 multiplier = evt_get_float_variable(script, var); result *= multiplier; - set_float_variable(script, var, result); + evt_set_float_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_divideF(Evt* script) { Bytecode* args = script->ptrReadPos; Bytecode var = *args++; - f32 result = get_float_variable(script, *args++); - f32 dividend = get_float_variable(script, var); + f32 result = evt_get_float_variable(script, *args++); + f32 dividend = evt_get_float_variable(script, var); result = dividend / result; - set_float_variable(script, var, result); + evt_set_float_variable(script, var, result); return ApiStatus_DONE2; } ApiStatus evt_handle_set_int_buffer_ptr(Evt* script) { - script->buffer = get_variable(script, *script->ptrReadPos); + script->buffer = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus evt_handle_set_float_buffer_ptr(Evt* script) { - script->buffer = get_variable(script, *script->ptrReadPos); + script->buffer = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -675,7 +675,7 @@ ApiStatus evt_handle_get_1_word(Evt* script) { Bytecode var; var = *args++; - set_variable(script, var, *script->buffer++); + evt_set_variable(script, var, *script->buffer++); return ApiStatus_DONE2; } @@ -686,10 +686,10 @@ ApiStatus evt_handle_get_2_word(Evt* script) { Bytecode var2; var = *args++; - set_variable(script, var, *script->buffer++); + evt_set_variable(script, var, *script->buffer++); var2 = *args++; - set_variable(script, var2, *script->buffer++); + evt_set_variable(script, var2, *script->buffer++); return ApiStatus_DONE2; } @@ -701,13 +701,13 @@ ApiStatus evt_handle_get_3_word(Evt* script) { Bytecode var3; var = *args++; - set_variable(script, var, *script->buffer++); + evt_set_variable(script, var, *script->buffer++); var2 = *args++; - set_variable(script, var2, *script->buffer++); + evt_set_variable(script, var2, *script->buffer++); var3 = *args++; - set_variable(script, var3, *script->buffer++); + evt_set_variable(script, var3, *script->buffer++); return ApiStatus_DONE2; } @@ -720,16 +720,16 @@ ApiStatus evt_handle_get_4_word(Evt* script) { Bytecode var4; var = *args++; - set_variable(script, var, *script->buffer++); + evt_set_variable(script, var, *script->buffer++); var2 = *args++; - set_variable(script, var2, *script->buffer++); + evt_set_variable(script, var2, *script->buffer++); var3 = *args++; - set_variable(script, var3, *script->buffer++); + evt_set_variable(script, var3, *script->buffer++); var4 = *args++; - set_variable(script, var4, *script->buffer++); + evt_set_variable(script, var4, *script->buffer++); return ApiStatus_DONE2; } @@ -739,7 +739,7 @@ ApiStatus evt_handle_get_Nth_word(Evt* script) { Bytecode var; var = *args++; - set_variable(script, var, script->buffer[get_variable(script, *args)]); + evt_set_variable(script, var, script->buffer[evt_get_variable(script, *args)]); return ApiStatus_DONE2; } @@ -749,7 +749,7 @@ ApiStatus evt_handle_get_1_float(Evt* script) { Bytecode var; var = *args++; - set_float_variable(script, var, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var, evt_get_float_variable(script, *script->buffer++)); return ApiStatus_DONE2; } @@ -760,10 +760,10 @@ ApiStatus evt_handle_get_2_float(Evt* script) { Bytecode var2; var = *args++; - set_float_variable(script, var, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var, evt_get_float_variable(script, *script->buffer++)); var2 = *args++; - set_float_variable(script, var2, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var2, evt_get_float_variable(script, *script->buffer++)); return ApiStatus_DONE2; } @@ -775,13 +775,13 @@ ApiStatus evt_handle_get_3_float(Evt* script) { Bytecode var3; var = *args++; - set_float_variable(script, var, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var, evt_get_float_variable(script, *script->buffer++)); var2 = *args++; - set_float_variable(script, var2, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var2, evt_get_float_variable(script, *script->buffer++)); var3 = *args++; - set_float_variable(script, var3, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var3, evt_get_float_variable(script, *script->buffer++)); return ApiStatus_DONE2; } @@ -794,16 +794,16 @@ ApiStatus evt_handle_get_4_float(Evt* script) { Bytecode var4; var = *args++; - set_float_variable(script, var, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var, evt_get_float_variable(script, *script->buffer++)); var2 = *args++; - set_float_variable(script, var2, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var2, evt_get_float_variable(script, *script->buffer++)); var3 = *args++; - set_float_variable(script, var3, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var3, evt_get_float_variable(script, *script->buffer++)); var4 = *args++; - set_float_variable(script, var4, get_float_variable(script, *script->buffer++)); + evt_set_float_variable(script, var4, evt_get_float_variable(script, *script->buffer++)); return ApiStatus_DONE2; } @@ -813,37 +813,37 @@ ApiStatus evt_handle_get_Nth_float(Evt* script) { Bytecode var; var = *args++; - set_float_variable(script, var, script->buffer[get_variable(script, *args)]); + evt_set_float_variable(script, var, script->buffer[evt_get_variable(script, *args)]); return ApiStatus_DONE2; } ApiStatus evt_handle_set_array(Evt* script) { - script->array = (s32*)get_variable(script, *script->ptrReadPos); + script->array = (s32*)evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus evt_handle_set_flag_array(Evt* script) { - script->flagArray = (s32*)get_variable(script, *script->ptrReadPos); + script->flagArray = (s32*)evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus evt_handle_allocate_array(Evt* script) { Bytecode* args = script->ptrReadPos; - s32 size = get_variable(script, *args++); + s32 size = evt_get_variable(script, *args++); Bytecode var = *args++; script->array = (s32*)heap_malloc(size * 4); - set_variable(script, var, (s32)script->array); + evt_set_variable(script, var, (s32)script->array); return ApiStatus_DONE2; } ApiStatus evt_handle_AND(Evt* script) { Bytecode var = script->ptrReadPos[0]; - s32 val = get_variable(script, script->ptrReadPos[1]); + s32 val = evt_get_variable(script, script->ptrReadPos[1]); - val &= get_variable(script, var); - set_variable(script, var, val); + val &= evt_get_variable(script, var); + evt_set_variable(script, var, val); return ApiStatus_DONE2; } @@ -855,16 +855,16 @@ ApiStatus evt_handle_AND_const(Evt* script) { constant = ptrReadPos[1]; - set_variable(script, var, constant & get_variable(script, var)); + evt_set_variable(script, var, constant & evt_get_variable(script, var)); return ApiStatus_DONE2; } ApiStatus evt_handle_OR(Evt* script) { Bytecode var = script->ptrReadPos[0]; - s32 val = get_variable(script, script->ptrReadPos[1]); + s32 val = evt_get_variable(script, script->ptrReadPos[1]); - val |= get_variable(script, var); - set_variable(script, var, val); + val |= evt_get_variable(script, var); + evt_set_variable(script, var, val); return ApiStatus_DONE2; } @@ -876,7 +876,7 @@ ApiStatus evt_handle_OR_const(Evt* script) { constant = ptrReadPos[1]; - set_variable(script, var, constant | get_variable(script, var)); + evt_set_variable(script, var, constant | evt_get_variable(script, var)); return ApiStatus_DONE2; } @@ -891,7 +891,7 @@ ApiStatus evt_handle_call(Evt* script) { func = script->callFunction; newScript = script; // todo fake match } else { - script->callFunction = (ApiFunc)get_variable(script, *args++); + script->callFunction = (ApiFunc)evt_get_variable(script, *args++); newScript = script; // todo fake match script->ptrReadPos = args; script->currentArgc--; @@ -907,7 +907,7 @@ ApiStatus evt_handle_exec1(Evt* script) { Evt* newScript; s32 i; - newScript = start_script_in_group((EvtSource*)get_variable(script, *script->ptrReadPos), script->priority, 0, + newScript = start_script_in_group((EvtSource*)evt_get_variable(script, *script->ptrReadPos), script->priority, 0, script->groupFlags); newScript->owner1 = script->owner1; @@ -931,7 +931,7 @@ ApiStatus evt_handle_exec1(Evt* script) { ApiStatus evt_handle_exec1_get_id(Evt* script) { Bytecode* args = script->ptrReadPos; - EvtSource* evtSource = (EvtSource*)get_variable(script, *args++); + EvtSource* evtSource = (EvtSource*)evt_get_variable(script, *args++); Bytecode arg2 = *args++; Evt* newScript; s32 i; @@ -952,24 +952,24 @@ ApiStatus evt_handle_exec1_get_id(Evt* script) { newScript->array = script->array; newScript->flagArray = script->flagArray; - set_variable(script, arg2, newScript->id); + evt_set_variable(script, arg2, newScript->id); return ApiStatus_DONE2; } ApiStatus evt_handle_exec_wait(Evt* script) { - start_child_script(script, get_variable(script, *script->ptrReadPos), 0); + start_child_script(script, evt_get_variable(script, *script->ptrReadPos), 0); script->currentOpcode = 0; return ApiStatus_FINISH; } ApiStatus evt_handle_jump(Evt* script) { - script->ptrFirstLine = (Bytecode*)get_variable(script, *script->ptrReadPos); + script->ptrFirstLine = (Bytecode*)evt_get_variable(script, *script->ptrReadPos); restart_script(script); return ApiStatus_DONE2; } -s32 _bound_script_trigger_handler(Trigger* trigger) { +s32 evt_bound_script_trigger_handler(Trigger* trigger) { EvtSource* scriptStart; Evt* script; @@ -999,7 +999,7 @@ s32 _bound_script_trigger_handler(Trigger* trigger) { ApiStatus evt_handle_bind(Evt* script) { Bytecode* args = script->ptrReadPos; Trigger* trigger; - Bytecode* triggerScript = (Bytecode*)get_variable(script, *args++); + Bytecode* triggerScript = (Bytecode*)evt_get_variable(script, *args++); Bytecode eventType = *args++; Bytecode colliderIDVar = *args++; Bytecode a3 = *args++; @@ -1007,29 +1007,29 @@ ApiStatus evt_handle_bind(Evt* script) { TriggerDefinition def; def.flags = eventType | 0x1000000; - def.flagIndex = get_variable(script, colliderIDVar); - def.colliderIndex = get_variable_index(script, colliderIDVar); + def.flagIndex = evt_get_variable(script, colliderIDVar); + def.colliderIndex = evt_get_variable_index(script, colliderIDVar); def.inputArg3 = a3; def.unk_14 = 0; - def.function = _bound_script_trigger_handler; + def.function = evt_bound_script_trigger_handler; trigger = create_trigger(&def); trigger->scriptSource = (EvtSource*)triggerScript; trigger->runningScript = NULL; trigger->priority = script->priority; - trigger->scriptVars[0] = get_variable(script, script->varTable[0]); - trigger->scriptVars[1] = get_variable(script, script->varTable[1]); - trigger->scriptVars[2] = get_variable(script, script->varTable[2]); + trigger->scriptVars[0] = evt_get_variable(script, script->varTable[0]); + trigger->scriptVars[1] = evt_get_variable(script, script->varTable[1]); + trigger->scriptVars[2] = evt_get_variable(script, script->varTable[2]); if (triggerOut != 0) { - set_variable(script, triggerOut, (s32)trigger); + evt_set_variable(script, triggerOut, (s32)trigger); } return ApiStatus_DONE2; } ApiStatus DeleteTrigger(Evt* script, s32 isInitialCall) { - delete_trigger((Trigger*)get_variable(script, *script->ptrReadPos)); + delete_trigger((Trigger*)evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -1039,61 +1039,61 @@ ApiStatus evt_handle_unbind(Evt* script) { } ApiStatus evt_handle_kill(Evt* script) { - kill_script_by_ID(get_variable(script, *script->ptrReadPos)); + kill_script_by_ID(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_set_priority(Evt* script) { - set_script_priority(script, get_variable(script, *script->ptrReadPos)); + set_script_priority(script, evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_set_timescale(Evt* script) { - set_script_timescale(script, get_float_variable(script, *script->ptrReadPos)); + set_script_timescale(script, evt_get_float_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_set_group(Evt* script) { - set_script_group(script, get_variable(script, *script->ptrReadPos)); + set_script_group(script, evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_suspend_all(Evt* script) { - suspend_all_group(get_variable(script, *script->ptrReadPos)); + suspend_all_group(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_resume_all(Evt* script) { - resume_all_group(get_variable(script, *script->ptrReadPos)); + resume_all_group(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_suspend_others(Evt* script) { - suspend_group_others(script, get_variable(script, *script->ptrReadPos)); + suspend_group_others(script, evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_resume_others(Evt* script) { - resume_group_others(script, get_variable(script, *script->ptrReadPos)); + resume_group_others(script, evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_suspend(Evt* script) { - suspend_all_script(get_variable(script, *script->ptrReadPos)); + suspend_all_script(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_resume(Evt* script) { - resume_all_script(get_variable(script, *script->ptrReadPos)); + resume_all_script(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus evt_handle_does_script_exist(Evt* script) { Bytecode* args = script->ptrReadPos; - s32 scriptID = get_variable(script, *args++); + s32 scriptID = evt_get_variable(script, *args++); Bytecode var2 = *args++; - set_variable(script, var2, does_script_exist(scriptID)); + evt_set_variable(script, var2, does_script_exist(scriptID)); return ApiStatus_DONE2; } @@ -1117,17 +1117,17 @@ void evt_standard_trigger_executor(Trigger* trigger) { ApiStatus evt_handle_bind_lock(Evt* script) { Bytecode* args = script->ptrReadPos; Trigger* trigger; - Bytecode* triggerScript = (Bytecode*)get_variable(script, *args++); + Bytecode* triggerScript = (Bytecode*)evt_get_variable(script, *args++); Bytecode eventType = *args++; Bytecode colliderIDVar = *args++; - s32* itemList = (s32*)get_variable(script, *args++); + s32* itemList = (s32*)evt_get_variable(script, *args++); Bytecode triggerOut = *args++; s32 a5 = *args++; TriggerDefinition def; def.flags = eventType | 0x1000000; - def.flagIndex = get_variable(script, colliderIDVar); - def.colliderIndex = get_variable_index(script, colliderIDVar); + def.flagIndex = evt_get_variable(script, colliderIDVar); + def.colliderIndex = evt_get_variable_index(script, colliderIDVar); def.unk_1C = itemList; def.function = evt_standard_trigger_executor; def.unk_14 = triggerOut; @@ -1137,9 +1137,9 @@ ApiStatus evt_handle_bind_lock(Evt* script) { trigger->scriptSource = (EvtSource*)triggerScript; trigger->runningScript = NULL; trigger->priority = script->priority; - trigger->scriptVars[0] = get_variable(script, script->varTable[0]); - trigger->scriptVars[1] = get_variable(script, script->varTable[1]); - trigger->scriptVars[2] = get_variable(script, script->varTable[2]); + trigger->scriptVars[0] = evt_get_variable(script, script->varTable[0]); + trigger->scriptVars[1] = evt_get_variable(script, script->varTable[1]); + trigger->scriptVars[2] = evt_get_variable(script, script->varTable[2]); return ApiStatus_DONE2; } @@ -1176,7 +1176,7 @@ s32 evt_handle_print_debug_var(Evt* script) { if (var <= -270000000) { sprintf(&evtDebugPrintBuffer, "ADDR [%08X]", var); } else if (var <= -220000000) { - sprintf(&evtDebugPrintBuffer, "FLOAT [%4.2f]", fixed_var_to_float(var)); + sprintf(&evtDebugPrintBuffer, "FLOAT [%4.2f]", evt_fixed_var_to_float(var)); } else if (var <= -200000000) { var += 210000000; phi_t0 = var % 32; @@ -1190,7 +1190,7 @@ s32 evt_handle_print_debug_var(Evt* script) { if (script->array[var] <= -270000000) { sprintf(&evtDebugPrintBuffer, "UW(%3d) [%08X]", var, arrayVal); } else if (arrayVal <= -220000000) { - sprintf(&evtDebugPrintBuffer, "UW(%3d) [%4.2f]", var, fixed_var_to_float(arrayVal)); + sprintf(&evtDebugPrintBuffer, "UW(%3d) [%4.2f]", var, evt_fixed_var_to_float(arrayVal)); } else { sprintf(&evtDebugPrintBuffer, "UW(%3d) [%d]", var, arrayVal); } @@ -1203,7 +1203,7 @@ s32 evt_handle_print_debug_var(Evt* script) { if (globalByte <= -270000000) { sprintf(&evtDebugPrintBuffer, "GSW(%3d) [%08X]", var, globalByte); } else if (globalByte <= -220000000) { - sprintf(&evtDebugPrintBuffer, "GSW(%3d) [%4.2f]", var, fixed_var_to_float(globalByte)); + sprintf(&evtDebugPrintBuffer, "GSW(%3d) [%4.2f]", var, evt_fixed_var_to_float(globalByte)); } else { sprintf(&evtDebugPrintBuffer, "GSW(%3d) [%d]", var, globalByte); } @@ -1216,7 +1216,7 @@ s32 evt_handle_print_debug_var(Evt* script) { if (areaByte <= -270000000) { sprintf(&evtDebugPrintBuffer, "LSW(%3d) [%08X]", var, areaByte); } else if (areaByte <= -220000000) { - sprintf(&evtDebugPrintBuffer, "LSW(%3d) [%4.2f]", var, fixed_var_to_float(areaByte)); + sprintf(&evtDebugPrintBuffer, "LSW(%3d) [%4.2f]", var, evt_fixed_var_to_float(areaByte)); } else { sprintf(&evtDebugPrintBuffer, "LSW(%3d) [%d]", var, areaByte); } @@ -1243,7 +1243,7 @@ s32 evt_handle_print_debug_var(Evt* script) { if (mapVar <= -270000000) { sprintf(&evtDebugPrintBuffer, "GW(%3d) [%08X]", var, mapVar); } else if (mapVar <= -220000000) { - sprintf(&evtDebugPrintBuffer, "GW(%3d) [%4.2f]", var, fixed_var_to_float(mapVar)); + sprintf(&evtDebugPrintBuffer, "GW(%3d) [%4.2f]", var, evt_fixed_var_to_float(mapVar)); } else { sprintf(&evtDebugPrintBuffer, "GW(%3d) [%d]", var, mapVar); } @@ -1256,7 +1256,7 @@ s32 evt_handle_print_debug_var(Evt* script) { if (tableVar <= -270000000) { sprintf(&evtDebugPrintBuffer, "LW(%3d) [%08X]", var, tableVar); } else if (tableVar <= -220000000) { - sprintf(&evtDebugPrintBuffer, "LW(%3d) [%4.2f]", var, fixed_var_to_float(tableVar)); + sprintf(&evtDebugPrintBuffer, "LW(%3d) [%4.2f]", var, evt_fixed_var_to_float(tableVar)); } else { sprintf(&evtDebugPrintBuffer, "LW(%3d) [%d]", var, tableVar); } @@ -1625,7 +1625,7 @@ s32 evt_execute_next_command(Evt *script) { // TODO: consider renaming to evt_get_variable #ifdef NON_MATCHING -s32 get_variable(Evt* script, Bytecode var) { +s32 evt_get_variable(Evt* script, Bytecode var) { s32 wordIdx; s32 bitIdx; @@ -1634,7 +1634,7 @@ s32 get_variable(Evt* script, Bytecode var) { } else if (var <= EVT_LIMIT) { return var; } else if (var <= -220000000) { - return fixed_var_to_float(var); + return evt_fixed_var_to_float(var); } else if (var <= -200000000) { var += 210000000; wordIdx = var / 32; @@ -1643,7 +1643,7 @@ s32 get_variable(Evt* script, Bytecode var) { } else if (var <= -180000000) { var += 190000000; var = script->array[var]; - return (var > -270000000 && var < -220000000) ? fixed_var_to_float(var) : var; + return (var > -270000000 && var < -220000000) ? evt_fixed_var_to_float(var) : var; } else if (var <= -160000000) { var += 170000000; return get_global_byte(var); @@ -1669,20 +1669,20 @@ s32 get_variable(Evt* script, Bytecode var) { } else if (var <= -40000000) { var += 50000000; var = gMapVars[var]; - return (var > -270000000 && var < -220000000) ? fixed_var_to_float(var) : var; + return (var > -270000000 && var < -220000000) ? evt_fixed_var_to_float(var) : var; } else if (var <= -20000000) { var += 30000000; var = script->varTable[var]; - return (var > -270000000 && var < -220000000) ? fixed_var_to_float(var) : var; + return (var > -270000000 && var < -220000000) ? evt_fixed_var_to_float(var) : var; } else { return var; } } #else -INCLUDE_ASM(s32, "evt/si", get_variable, Evt* script, Bytecode var); +INCLUDE_ASM(s32, "evt/si", evt_get_variable, Evt* script, Bytecode var); #endif -s32 get_variable_index(Evt* script, s32 var) { +s32 evt_get_variable_index(Evt* script, s32 var) { if (-270000000 >= var) { return var; } @@ -1725,7 +1725,7 @@ s32 get_variable_index(Evt* script, s32 var) { return var; } -s32 get_variable_index_alt(s32 var) { +s32 evt_get_variable_index_alt(s32 var) { if (-270000000 >= var) { return var; } @@ -1768,11 +1768,11 @@ s32 get_variable_index_alt(s32 var) { return var; } -INCLUDE_ASM(s32, "evt/si", set_variable, Evt* script, Bytecode var, s32 value); +INCLUDE_ASM(s32, "evt/si", evt_set_variable, Evt* script, Bytecode var, s32 value); // Tiny regalloc issue with the var <= -80000000 / -60000000 blocks #ifdef NON_MATCHING -f32 get_float_variable(Evt* script, Bytecode var) { +f32 evt_get_float_variable(Evt* script, Bytecode var) { s32 temp; if (var <= -270000000) { @@ -1780,16 +1780,16 @@ f32 get_float_variable(Evt* script, Bytecode var) { } else if (var <= EVT_LIMIT) { return var; } else if (var <= -220000000) { - return fixed_var_to_float(var); + return evt_fixed_var_to_float(var); } else if (var <= -180000000) { var += 190000000; - return fixed_var_to_float(script->array[var]); + return evt_fixed_var_to_float(script->array[var]); } else if (var <= -160000000) { var += 170000000; - return fixed_var_to_float(get_global_byte(var)); + return evt_fixed_var_to_float(get_global_byte(var)); } else if (var <= -140000000) { var += 150000000; - return fixed_var_to_float(get_area_byte(var)); + return evt_fixed_var_to_float(get_area_byte(var)); } else if (var <= -80000000) { var += 90000000; temp = var % 32; @@ -1808,19 +1808,19 @@ f32 get_float_variable(Evt* script, Bytecode var) { } } else if (var <= -40000000) { var += 50000000; - return fixed_var_to_float(gMapVars[var]); + return evt_fixed_var_to_float(gMapVars[var]); } else if (var <= -20000000) { var += 30000000; - return fixed_var_to_float(script->varTable[var]); + return evt_fixed_var_to_float(script->varTable[var]); } else { - return fixed_var_to_float(var); + return evt_fixed_var_to_float(var); } } #else -INCLUDE_ASM(f32, "evt/si", get_float_variable, Evt* script, Bytecode var); +INCLUDE_ASM(f32, "evt/si", evt_get_float_variable, Evt* script, Bytecode var); #endif -INCLUDE_ASM(f32, "evt/si", set_float_variable, Evt* script, Bytecode var, f32 value); +INCLUDE_ASM(f32, "evt/si", evt_set_float_variable, Evt* script, Bytecode var, f32 value); Bytecode* evt_find_label(Evt* script, s32 arg1) { Bytecode* ret = script->ptrReadPos; diff --git a/src/evt/f8f60_len_1560.c b/src/evt/f8f60_len_1560.c index 13be7e7858..b64694c9bc 100644 --- a/src/evt/f8f60_len_1560.c +++ b/src/evt/f8f60_len_1560.c @@ -3,10 +3,10 @@ ApiStatus MakeLerp(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - script->varTable[0xC] = get_variable(script, *ptrReadPos++); // start - script->varTable[0xD] = get_variable(script, *ptrReadPos++); // end - script->varTable[0xF] = get_variable(script, *ptrReadPos++); // duration - script->varTable[0xB] = get_variable(script, *ptrReadPos++); // easing type + script->varTable[0xC] = evt_get_variable(script, *ptrReadPos++); // start + script->varTable[0xD] = evt_get_variable(script, *ptrReadPos++); // end + script->varTable[0xF] = evt_get_variable(script, *ptrReadPos++); // duration + script->varTable[0xB] = evt_get_variable(script, *ptrReadPos++); // easing type script->varTable[0xE] = 0; // elapsed return ApiStatus_DONE2; @@ -34,10 +34,10 @@ ApiStatus UpdateLerp(Evt* script, s32 isInitialCall) { ApiStatus RandInt(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 max = get_variable(script, *ptrReadPos++); + s32 max = evt_get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; - set_variable(script, outVar, rand_int(max)); + evt_set_variable(script, outVar, rand_int(max)); return ApiStatus_DONE2; } @@ -45,13 +45,13 @@ ApiStatus RandInt(Evt* script, s32 isInitialCall) { ApiStatus GetAngleBetweenNPCs(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID aID = get_variable(script, *ptrReadPos++); - NpcID bID = get_variable(script, *ptrReadPos++); + NpcID aID = evt_get_variable(script, *ptrReadPos++); + NpcID bID = evt_get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; Npc* a = resolve_npc(script, aID); Npc* b = resolve_npc(script, bID); - set_variable(script, outVar, atan2(a->pos.x, a->pos.z, b->pos.x, b->pos.z)); + evt_set_variable(script, outVar, atan2(a->pos.x, a->pos.z, b->pos.x, b->pos.z)); return ApiStatus_DONE2; } @@ -60,11 +60,11 @@ ApiStatus GetAngleToNPC(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; Npc* npc = resolve_npc(script, npcID); - set_variable(script, outVar, atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z)); + evt_set_variable(script, outVar, atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z)); return ApiStatus_DONE2; } @@ -73,11 +73,11 @@ ApiStatus GetAngleToPlayer(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; Npc* npc = resolve_npc(script, npcID); - set_variable(script, outVar, atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z)); + evt_set_variable(script, outVar, atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z)); return ApiStatus_DONE2; } @@ -93,9 +93,9 @@ ApiStatus AwaitPlayerApproach(Evt* script, s32 isInitialCall) { f32 distance; if (isInitialCall) { - *targetX = get_variable(script, *ptrReadPos++); - *targetZ = get_variable(script, *ptrReadPos++); - *distanceRequired = get_variable(script, *ptrReadPos++); + *targetX = evt_get_variable(script, *ptrReadPos++); + *targetZ = evt_get_variable(script, *ptrReadPos++); + *distanceRequired = evt_get_variable(script, *ptrReadPos++); } distance = dist2D( @@ -122,9 +122,9 @@ ApiStatus IsPlayerWithin(Evt* script, s32 isInitialCall) { Bytecode outVar = EVT_VAR(0); if (isInitialCall) { - *targetX = get_variable(script, *ptrReadPos++); - *targetZ = get_variable(script, *ptrReadPos++); - *distanceRequired = get_variable(script, *ptrReadPos++); + *targetX = evt_get_variable(script, *ptrReadPos++); + *targetZ = evt_get_variable(script, *ptrReadPos++); + *distanceRequired = evt_get_variable(script, *ptrReadPos++); outVar = *ptrReadPos++; } @@ -133,9 +133,9 @@ ApiStatus IsPlayerWithin(Evt* script, s32 isInitialCall) { *targetX, *targetZ ); - set_variable(script, outVar, 0); + evt_set_variable(script, outVar, 0); if (distance < *distanceRequired) { - set_variable(script, outVar, 1); + evt_set_variable(script, outVar, 1); } return ApiStatus_DONE2; @@ -152,9 +152,9 @@ ApiStatus AwaitPlayerLeave(Evt* script, s32 isInitialCall) { f32 distance; if (isInitialCall) { - *targetX = get_variable(script, *ptrReadPos++); - *targetZ = get_variable(script, *ptrReadPos++); - *distanceRequired = get_variable(script, *ptrReadPos++); + *targetX = evt_get_variable(script, *ptrReadPos++); + *targetZ = evt_get_variable(script, *ptrReadPos++); + *distanceRequired = evt_get_variable(script, *ptrReadPos++); } distance = dist2D( @@ -173,17 +173,17 @@ ApiStatus AddVectorPolar(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; Bytecode xVar = *ptrReadPos++; - f32 x = get_float_variable(script, xVar); + f32 x = evt_get_float_variable(script, xVar); Bytecode yVar = *ptrReadPos++; - f32 y = get_float_variable(script, yVar); + f32 y = evt_get_float_variable(script, yVar); - f32 r = get_float_variable(script, *ptrReadPos++); + f32 r = evt_get_float_variable(script, *ptrReadPos++); - add_vec2D_polar(&x, &y, r, get_float_variable(script, *ptrReadPos++)); + add_vec2D_polar(&x, &y, r, evt_get_float_variable(script, *ptrReadPos++)); - set_float_variable(script, xVar, x); - set_float_variable(script, yVar, y); + evt_set_float_variable(script, xVar, x); + evt_set_float_variable(script, yVar, y); return ApiStatus_DONE2; } @@ -244,7 +244,7 @@ ApiStatus func_802D4C4C(Evt* script, s32 initialCall) { } ApiStatus func_802D4CC4(Evt* script, s32 initialCall) { - s32 value = get_variable(script, *script->ptrReadPos); + s32 value = evt_get_variable(script, *script->ptrReadPos); if (value < 0) { set_screen_overlay_params_back(255, -1.0f); } else { @@ -255,7 +255,7 @@ ApiStatus func_802D4CC4(Evt* script, s32 initialCall) { } ApiStatus func_802D4D14(Evt* script, s32 initialCall) { - s32 value = get_float_variable(script, *script->ptrReadPos); + s32 value = evt_get_float_variable(script, *script->ptrReadPos); set_screen_overlay_center(0, 0, 0xC, 0x14); set_screen_overlay_center(0, 1, 0x134, 0xDC); @@ -353,10 +353,10 @@ INCLUDE_ASM(s32, "evt/f8f60_len_1560", get_path_position); s32 LoadPath(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 time = get_variable(script, *args++); - s32 vectorList = get_variable(script, *args++); - s32 numVectors = get_variable(script, *args++); - s32 easingType = get_variable(script, *args++); + s32 time = evt_get_variable(script, *args++); + s32 vectorList = evt_get_variable(script, *args++); + s32 numVectors = evt_get_variable(script, *args++); + s32 easingType = evt_get_variable(script, *args++); Path* path = heap_malloc(sizeof(Path)); script->varTable[15] = path; @@ -379,25 +379,25 @@ ApiStatus GetDist2D(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; Bytecode outVar = *ptrReadPos++; - set_float_variable(script, outVar, dist2D( - get_float_variable(script, *ptrReadPos++), - get_float_variable(script, *ptrReadPos++), - get_float_variable(script, *ptrReadPos++), - get_float_variable(script, *ptrReadPos++) + evt_set_float_variable(script, outVar, dist2D( + evt_get_float_variable(script, *ptrReadPos++), + evt_get_float_variable(script, *ptrReadPos++), + evt_get_float_variable(script, *ptrReadPos++), + evt_get_float_variable(script, *ptrReadPos++) )); return ApiStatus_DONE2; } ApiStatus SetTimeFreezeMode(Evt* script, s32 initialCall) { - set_time_freeze_mode(get_variable(script, *script->ptrReadPos)); + set_time_freeze_mode(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus ModifyGlobalOverrideFlags(Evt* script, s32 initialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 setMode = get_variable(script, *ptrReadPos++); - s32 flags = get_variable(script, *ptrReadPos++); + s32 setMode = evt_get_variable(script, *ptrReadPos++); + s32 flags = evt_get_variable(script, *ptrReadPos++); if (setMode) { gOverrideFlags |= flags; @@ -411,9 +411,9 @@ ApiStatus ModifyGlobalOverrideFlags(Evt* script, s32 initialCall) { ApiStatus SetValueByRef(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 dest = get_variable(script, *ptrReadPos++); /* Reference */ - s32 src = get_variable(script, *ptrReadPos++); - set_variable(script, dest, src); + s32 dest = evt_get_variable(script, *ptrReadPos++); /* Reference */ + s32 src = evt_get_variable(script, *ptrReadPos++); + evt_set_variable(script, dest, src); return ApiStatus_DONE2; } @@ -421,16 +421,16 @@ ApiStatus SetValueByRef(Evt* script, s32 isInitialCall) { ApiStatus GetValueByRef(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 src = get_variable(script, *ptrReadPos++); /* Reference */ + s32 src = evt_get_variable(script, *ptrReadPos++); /* Reference */ Bytecode dest = *ptrReadPos++; - set_variable(script, dest, get_variable(script, src)); + evt_set_variable(script, dest, evt_get_variable(script, src)); return ApiStatus_DONE2; } ApiStatus EnableStatusMenu(Evt* script, s32 isInitialCall) { - if (get_variable(script, *script->ptrReadPos) != 0) { + if (evt_get_variable(script, *script->ptrReadPos) != 0) { decrement_status_menu_disabled(); } else { increment_status_menu_disabled(); @@ -440,7 +440,7 @@ ApiStatus EnableStatusMenu(Evt* script, s32 isInitialCall) { } ApiStatus ShowStatusMenu(Evt* script, s32 isInitialCall) { - if (get_variable(script, *script->ptrReadPos) != 0) { + if (evt_get_variable(script, *script->ptrReadPos) != 0) { func_800E9894(); close_status_menu(); } else { @@ -451,7 +451,7 @@ ApiStatus ShowStatusMenu(Evt* script, s32 isInitialCall) { } ApiStatus SetGameMode(Evt* script, s32 isInitialCall) { - s16 mode = get_variable(script, *script->ptrReadPos); + s16 mode = evt_get_variable(script, *script->ptrReadPos); set_game_mode(mode); @@ -461,7 +461,7 @@ ApiStatus SetGameMode(Evt* script, s32 isInitialCall) { ApiStatus ClampAngleInt(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - set_variable(script, *ptrReadPos, clamp_angle(get_variable(script, *ptrReadPos))); + evt_set_variable(script, *ptrReadPos, clamp_angle(evt_get_variable(script, *ptrReadPos))); return ApiStatus_DONE2; } @@ -469,7 +469,7 @@ ApiStatus ClampAngleInt(Evt* script, s32 isInitialCall) { ApiStatus ClampAngleFloat(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - set_float_variable(script, *ptrReadPos, clamp_angle(get_float_variable(script, *ptrReadPos))); + evt_set_float_variable(script, *ptrReadPos, clamp_angle(evt_get_float_variable(script, *ptrReadPos))); return ApiStatus_DONE2; } diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index 04aa655828..d36d607ca9 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -14,30 +14,30 @@ INCLUDE_ASM(s32, "evt/fa4c0_len_3bf0", func_802D5C70); ApiStatus FadeOutMusic(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); + s32 itemID = evt_get_variable(script, *args++); s32* ptrNextPos = args++; - return (bgm_set_song(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * ApiStatus_DONE2; + return (bgm_set_song(itemID, -1, 0, evt_get_variable(script, *ptrNextPos++), 8) != 0) * ApiStatus_DONE2; } ApiStatus SetMusicTrack(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 musicPlayer = get_variable(script, *args++); - s32 songID = get_variable(script, *args++); - s32 variation = get_variable(script, *args++); - s16 volume = get_variable(script, *args++); + s32 musicPlayer = evt_get_variable(script, *args++); + s32 songID = evt_get_variable(script, *args++); + s32 variation = evt_get_variable(script, *args++); + s16 volume = evt_get_variable(script, *args++); return (bgm_set_song(musicPlayer, songID, variation, 0x1F4, volume) != 0) * ApiStatus_DONE2; } ApiStatus FadeInMusic(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s16 var4 = get_variable(script, *args++); - s16 var5 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s16 var4 = evt_get_variable(script, *args++); + s16 var5 = evt_get_variable(script, *args++); return (func_8014A964(var0, var1, var2, var3, var4, var5) != 0) * ApiStatus_DONE2; } @@ -46,19 +46,19 @@ ApiStatus func_802D5EE0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; MusicSettings* musicSettings = gMusicSettings; - (&musicSettings[get_variable(script, *args++)])->flags |= 0x2; + (&musicSettings[evt_get_variable(script, *args++)])->flags |= 0x2; return ApiStatus_DONE2; } ApiStatus func_802D5F28(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - func_8014AA54(get_variable(script, *args++), get_variable(script, *args++), (s16)get_variable(script, *args++)); + func_8014AA54(evt_get_variable(script, *args++), evt_get_variable(script, *args++), (s16)evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus func_802D5FA4(Evt* script, s32 isInitialCall) { - func_8014AB0C(0, (s16)get_variable(script, *script->ptrReadPos)); + func_8014AB0C(0, (s16)evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -70,7 +70,7 @@ ApiStatus PopSong(Evt* script, s32 isInitialCall) { ApiStatus PushSong(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - bgm_push_song(get_variable(script, *args++), get_variable(script, *args++)); + bgm_push_song(evt_get_variable(script, *args++), evt_get_variable(script, *args++)); return ApiStatus_DONE2; } @@ -87,27 +87,27 @@ ApiStatus PushBattleSong(Evt* script, s32 isInitialCall) { ApiStatus SetBattleSong(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - bgm_set_battle_song(get_variable(script, *args++), get_variable(script, *args++)); + bgm_set_battle_song(evt_get_variable(script, *args++), evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus ClearAmbientSounds(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 flags = get_variable(script, *args++); + s32 flags = evt_get_variable(script, *args++); return (play_ambient_sounds(-1, flags) != 0) * ApiStatus_DONE2; } ApiStatus PlayAmbientSounds(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 soundID = get_variable(script, *args++); + s32 soundID = evt_get_variable(script, *args++); return (play_ambient_sounds(soundID, 0xFA) != 0) * ApiStatus_DONE2; } ApiStatus PlaySound(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 soundID = get_variable(script, *args++); + s32 soundID = evt_get_variable(script, *args++); sfx_play_sound(soundID); return ApiStatus_DONE2; @@ -115,8 +115,8 @@ ApiStatus PlaySound(Evt* script, s32 isInitialCall) { ApiStatus PlaySoundWithVolume(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 soundID = get_variable(script, *args++); - s32 value2 = get_variable(script, *args++); + s32 soundID = evt_get_variable(script, *args++); + s32 value2 = evt_get_variable(script, *args++); sfx_play_sound_with_params(soundID, value2 & 0xFF, 0, 0); return ApiStatus_DONE2; @@ -124,11 +124,11 @@ ApiStatus PlaySoundWithVolume(Evt* script, s32 isInitialCall) { ApiStatus PlaySoundAt(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 soundID = get_variable(script, *args++); - s32 value2 = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 soundID = evt_get_variable(script, *args++); + s32 value2 = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); sfx_play_sound_at_position(soundID, value2, x, y, z); return ApiStatus_DONE2; @@ -137,38 +137,38 @@ ApiStatus PlaySoundAt(Evt* script, s32 isInitialCall) { ApiStatus StopSound(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - sfx_stop_sound(get_variable(script, *args++)); + sfx_stop_sound(evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus func_802D62E4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - func_80149A6C(get_variable(script, *args++), 1); + func_80149A6C(evt_get_variable(script, *args++), 1); return ApiStatus_DONE2; } ApiStatus UseDoorSounds(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - gCurrentDoorSoundsSet = get_variable(script, *args++); + gCurrentDoorSoundsSet = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus UseAdvancedDoorSounds(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - D_80151308 = get_variable(script, *args++); + D_80151308 = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus PlaySoundAtF(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Bytecode soundID = *args++; - u16 value2 = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + u16 value2 = 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++); sfx_play_sound_at_position(soundID, value2, x, y, z); return ApiStatus_DONE2; @@ -182,7 +182,7 @@ INCLUDE_ASM(ApiStatus, "evt/fa4c0_len_3bf0", ShowConsumableChoicePopup, Evt* scr ApiStatus RemoveKeyItemAt(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); s16* ptrKeyItems = &gPlayerData.keyItems; ptrKeyItems[index] = ITEM_NONE; @@ -191,7 +191,7 @@ ApiStatus RemoveKeyItemAt(Evt* script, s32 isInitialCall) { ApiStatus RemoveItemAt(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); s16* ptrInvItems = &gPlayerData.invItems; ptrInvItems[index] = ITEM_NONE; @@ -203,7 +203,7 @@ ApiStatus AddKeyItem(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 value = *args++; PlayerData* playerData = &gPlayerData; - s32 itemID = get_variable(script, value); + s32 itemID = evt_get_variable(script, value); s32 i; if (itemID == ITEM_FORTRESS_KEY) { @@ -233,7 +233,7 @@ ApiStatus CloseChoicePopup(Evt* script, s32 isInitialCall) { ApiStatus HasKeyItem(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); + s32 itemID = evt_get_variable(script, *args++); s32 value = *args++; PlayerData* playerData = &gPlayerData; s32 i; @@ -243,13 +243,13 @@ ApiStatus HasKeyItem(Evt* script, s32 isInitialCall) { break; } } - set_variable(script, value, i < ARRAY_COUNT(playerData->keyItems)); + evt_set_variable(script, value, i < ARRAY_COUNT(playerData->keyItems)); return ApiStatus_DONE2; } ApiStatus FindKeyItem(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); + s32 itemID = evt_get_variable(script, *args++); s32 value = *args++; PlayerData* playerData = &gPlayerData; s32 i; @@ -266,27 +266,27 @@ ApiStatus FindKeyItem(Evt* script, s32 isInitialCall) { itemIndex = i; } - set_variable(script, value, itemIndex); + evt_set_variable(script, value, itemIndex); return ApiStatus_DONE2; } ApiStatus AddItem(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); + s32 itemID = evt_get_variable(script, *args++); Bytecode outItemIdx = *args++; - set_variable(script, outItemIdx, add_item(itemID)); + evt_set_variable(script, outItemIdx, add_item(itemID)); return ApiStatus_DONE2; } ApiStatus ClearVariable(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, 0); + evt_set_variable(script, *script->ptrReadPos, 0); return ApiStatus_DONE2; } ApiStatus FindItem(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); + s32 itemID = evt_get_variable(script, *args++); s32 value = *args++; PlayerData* playerData = &gPlayerData; s32 i; @@ -303,13 +303,13 @@ ApiStatus FindItem(Evt* script, s32 isInitialCall) { itemIndex = i; } - set_variable(script, value, itemIndex); + evt_set_variable(script, value, itemIndex); return ApiStatus_DONE2; } ApiStatus RemoveItem(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); + s32 itemID = evt_get_variable(script, *args++); s32 value = *args++; PlayerData* playerData = &gPlayerData; s32 i; @@ -333,19 +333,19 @@ ApiStatus RemoveItem(Evt* script, s32 isInitialCall) { } sort_items(); - set_variable(script, value, itemIndex); + evt_set_variable(script, value, itemIndex); return ApiStatus_DONE2; } ApiStatus CountFortessKeys(Evt* script, s32 isInitialCall) { s32 outVar = *script->ptrReadPos; - set_variable(script, outVar, get_fortress_key_count()); + evt_set_variable(script, outVar, get_fortress_key_count()); return ApiStatus_DONE2; } ApiStatus RemoveFortressKeys(Evt* script, s32 isInitialCall) { - s32 num = get_variable(script, *script->ptrReadPos); + s32 num = evt_get_variable(script, *script->ptrReadPos); subtract_fortress_keys(num); return ApiStatus_DONE2; @@ -353,12 +353,12 @@ ApiStatus RemoveFortressKeys(Evt* script, s32 isInitialCall) { ApiStatus MakeItemEntity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); - s32 itemSpawnMode = get_variable(script, *args++); - s32 pickupVar = get_variable_index(script, *args++); + s32 itemID = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 itemSpawnMode = evt_get_variable(script, *args++); + s32 pickupVar = evt_get_variable_index(script, *args++); script->varTable[0] = make_item_entity_nodelay(itemID, x, y, z, itemSpawnMode, pickupVar); return ApiStatus_DONE2; @@ -366,12 +366,12 @@ ApiStatus MakeItemEntity(Evt* script, s32 isInitialCall) { ApiStatus DropItemEntity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); - s32 itemSpawnMode = get_variable(script, *args++); - s32 pickupVar = get_variable(script, *args++); + s32 itemID = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 itemSpawnMode = evt_get_variable(script, *args++); + s32 pickupVar = evt_get_variable(script, *args++); script->varTable[0] = make_item_entity_nodelay(itemID, x, y, z, itemSpawnMode, pickupVar); return ApiStatus_DONE2; @@ -379,12 +379,12 @@ ApiStatus DropItemEntity(Evt* script, s32 isInitialCall) { ApiStatus DropItemEntityB(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemID = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); - s32 itemSpawnMode = get_variable(script, *args++); - s32 pickupVar = get_variable_index(script, *args++); + s32 itemID = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + s32 itemSpawnMode = evt_get_variable(script, *args++); + s32 pickupVar = evt_get_variable_index(script, *args++); script->varTable[0] = make_item_entity_nodelay(itemID, x, y, z, itemSpawnMode, pickupVar); set_item_entity_flags(script->varTable[0], 0x4000); @@ -393,7 +393,7 @@ ApiStatus DropItemEntityB(Evt* script, s32 isInitialCall) { ApiStatus RemoveItemEntity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemEntityIndex = get_variable(script, *args++); + s32 itemEntityIndex = evt_get_variable(script, *args++); remove_item_entity_by_index(itemEntityIndex); return ApiStatus_DONE2; @@ -401,17 +401,17 @@ ApiStatus RemoveItemEntity(Evt* script, s32 isInitialCall) { ApiStatus AddBadge(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 badgeID = get_variable(script, *args++); + s32 badgeID = evt_get_variable(script, *args++); Bytecode outBadgeIdx = *args++; - set_variable(script, outBadgeIdx, add_badge(badgeID)); + evt_set_variable(script, outBadgeIdx, add_badge(badgeID)); return ApiStatus_DONE2; } ApiStatus RemoveBadge(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerData* playerData = &gPlayerData; - s32 badge = get_variable(script, *args++); + s32 badge = evt_get_variable(script, *args++); s32 i; for (i = 0; i < ARRAY_COUNT(playerData->badges); i++) { @@ -434,10 +434,10 @@ ApiStatus SetItemPos(Evt* script, s32 isInitialCall) { s32 itemEntityIndex; s32 x, y, z; - itemEntityIndex = get_variable(script, *args++); - x = get_variable(script, *args++); - y = get_variable(script, *args++); - z = get_variable(script, *args++); + itemEntityIndex = evt_get_variable(script, *args++); + x = evt_get_variable(script, *args++); + y = evt_get_variable(script, *args++); + z = evt_get_variable(script, *args++); ptrItemEntity = (ItemEntity*) get_item_entity(itemEntityIndex); ptrItemEntity->position.x = x; @@ -448,9 +448,9 @@ ApiStatus SetItemPos(Evt* script, s32 isInitialCall) { ApiStatus SetItemFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemEntityIndex = get_variable(script, *args++); + s32 itemEntityIndex = evt_get_variable(script, *args++); s32 flagBits = *args++; - s32 var2 = get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); ItemEntity* itemEntity = get_item_entity(itemEntityIndex); if (var2 != 0) { @@ -463,8 +463,8 @@ ApiStatus SetItemFlags(Evt* script, s32 isInitialCall) { ; ApiStatus SetItemAlpha(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemEntityIndex = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 itemEntityIndex = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); ItemEntity* itemEntity = get_item_entity(itemEntityIndex); itemEntity->unk_2F = var2; @@ -472,28 +472,28 @@ ApiStatus SetItemAlpha(Evt* script, s32 isInitialCall) { } ApiStatus AddCoin(Evt* script, s32 isInitialCall) { - script->varTable[0] = add_coins(get_variable(script, *script->ptrReadPos)); + script->varTable[0] = add_coins(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus AddStarPoints(Evt* script, s32 isInitialCall) { - script->varTable[0] = add_star_points(get_variable(script, *script->ptrReadPos)); + script->varTable[0] = add_star_points(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus AddStarPieces(Evt* script, s32 isInitialCall) { - script->varTable[0] = add_star_pieces(get_variable(script, *script->ptrReadPos)); + script->varTable[0] = add_star_pieces(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus GetItemPower(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemIdx = get_variable(script, *args++); + s32 itemIdx = evt_get_variable(script, *args++); Bytecode out1 = *args++; Bytecode out2 = *args++; - set_variable(script, out1, (&gItemTable[itemIdx])->potencyA); - set_variable(script, out2, (&gItemTable[itemIdx])->potencyB); + evt_set_variable(script, out1, (&gItemTable[itemIdx])->potencyA); + evt_set_variable(script, out2, (&gItemTable[itemIdx])->potencyB); return ApiStatus_DONE2; } @@ -506,7 +506,7 @@ ApiStatus ShowGotItem(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 0: - script->functionTemp[1] = init_got_item(get_variable(script, *args++), get_variable(script, *args++), *args++); + script->functionTemp[1] = init_got_item(evt_get_variable(script, *args++), evt_get_variable(script, *args++), *args++); script->functionTemp[0] = 1; break; case 1: diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 348edcbed8..eec04fd3d6 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -7,22 +7,22 @@ INCLUDE_ASM(void, "evt/fx_api", func_802D74C0, f32 x, f32 y, f32 z, s32 arg3); ApiStatus func_802D7520(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_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++); - func_802D7460(x, y, z, get_variable(script, *args++)); + func_802D7460(x, y, z, evt_get_variable(script, *args++)); sfx_play_sound_at_position(0x2055, 0, x, y, z); return ApiStatus_DONE2; } ApiStatus func_802D75D8(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_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++); - func_802D74C0(x, y, z, get_variable(script, *args++)); + func_802D74C0(x, y, z, evt_get_variable(script, *args++)); sfx_play_sound_at_position(0x378, 0, x, y, z); return ApiStatus_DONE2; } @@ -34,13 +34,13 @@ INCLUDE_ASM(s32, "evt/fx_api", ShowEmote, Evt* script, s32 isInitialCall); ApiStatus RemoveEffect(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - remove_effect(get_variable(script, *args++)); + remove_effect(evt_get_variable(script, *args++)); return ApiStatus_DONE2; } ApiStatus func_802D7B10(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptrValue = (s32*) get_variable(script, *args++); + s32* ptrValue = (s32*) evt_get_variable(script, *args++); *ptrValue |= 0x10; return ApiStatus_DONE2; @@ -48,7 +48,7 @@ ApiStatus func_802D7B10(Evt* script, s32 isInitialCall) { ApiStatus func_802D7B44(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32** ptrValue = (s32**) get_variable(script, *args++); + s32** ptrValue = (s32**) evt_get_variable(script, *args++); s32* ptrTemp = ptrValue[3]; ptrTemp[5] = 10; @@ -57,7 +57,7 @@ ApiStatus func_802D7B44(Evt* script, s32 isInitialCall) { ApiStatus func_802D7B74(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32** ptrValue = (s32**) get_variable(script, *args++); + s32** ptrValue = (s32**) evt_get_variable(script, *args++); s32* ptrTemp = ptrValue[3]; ptrTemp[12] = 5; @@ -101,13 +101,13 @@ EvtSource D_802D9D50 = SCRIPT({ ApiStatus Spawn802D9D50(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - s32 var5 = get_variable(script, *args++); - s32 var6 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + s32 var5 = evt_get_variable(script, *args++); + s32 var6 = evt_get_variable(script, *args++); Evt* newScript = start_script(D_802D9D50, 1, 0); newScript->varTable[0] = var0; @@ -174,38 +174,38 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { intArgs = script->ptrReadPos; floatArgs = script->ptrReadPos; - effectID = get_variable(script, *args++); // todo maybe increment later on + effectID = evt_get_variable(script, *args++); // todo maybe increment later on - get_variable(script, *intArgs++); - get_variable(script, *floatArgs++); + evt_get_variable(script, *intArgs++); + evt_get_variable(script, *floatArgs++); - new_var = get_variable(script, *intArgs++); - iVar2 = get_variable(script, *intArgs++); - iVar3 = get_variable(script, *intArgs++); - iVar4 = get_variable(script, *intArgs++); - iVar5 = get_variable(script, *intArgs++); - iVar6 = get_variable(script, *intArgs++); - iVar7 = get_variable(script, *intArgs++); - iVar8 = get_variable(script, *intArgs++); - iVar9 = get_variable(script, *intArgs++); - iVar10 = get_variable(script, *intArgs++); - get_variable(script, *intArgs++); - get_variable(script, *intArgs++); - get_variable(script, *intArgs++); + new_var = evt_get_variable(script, *intArgs++); + iVar2 = evt_get_variable(script, *intArgs++); + iVar3 = evt_get_variable(script, *intArgs++); + iVar4 = evt_get_variable(script, *intArgs++); + iVar5 = evt_get_variable(script, *intArgs++); + iVar6 = evt_get_variable(script, *intArgs++); + iVar7 = evt_get_variable(script, *intArgs++); + iVar8 = evt_get_variable(script, *intArgs++); + iVar9 = evt_get_variable(script, *intArgs++); + iVar10 = evt_get_variable(script, *intArgs++); + evt_get_variable(script, *intArgs++); + evt_get_variable(script, *intArgs++); + evt_get_variable(script, *intArgs++); - fVar1 = get_float_variable(script, *floatArgs++); - fVar2 = get_float_variable(script, *floatArgs++); - fVar3 = get_float_variable(script, *floatArgs++); - fVar4 = get_float_variable(script, *floatArgs++); - fVar5 = get_float_variable(script, *floatArgs++); - fVar6 = get_float_variable(script, *floatArgs++); - fVar7 = get_float_variable(script, *floatArgs++); - fVar8 = get_float_variable(script, *floatArgs++); - fVar9 = get_float_variable(script, *floatArgs++); - fVar10 = get_float_variable(script, *floatArgs++); - fVar11 = get_float_variable(script, *floatArgs++); - get_float_variable(script, *floatArgs++); - get_float_variable(script, *floatArgs++); + fVar1 = evt_get_float_variable(script, *floatArgs++); + fVar2 = evt_get_float_variable(script, *floatArgs++); + fVar3 = evt_get_float_variable(script, *floatArgs++); + fVar4 = evt_get_float_variable(script, *floatArgs++); + fVar5 = evt_get_float_variable(script, *floatArgs++); + fVar6 = evt_get_float_variable(script, *floatArgs++); + fVar7 = evt_get_float_variable(script, *floatArgs++); + fVar8 = evt_get_float_variable(script, *floatArgs++); + fVar9 = evt_get_float_variable(script, *floatArgs++); + fVar10 = evt_get_float_variable(script, *floatArgs++); + fVar11 = evt_get_float_variable(script, *floatArgs++); + evt_get_float_variable(script, *floatArgs++); + evt_get_float_variable(script, *floatArgs++); args++; // 1 a2 = *args++; @@ -260,7 +260,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { break; case 16: fx_emote(iVar1, (Npc* ) a2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, &sp30); - set_variable(script, a8, sp30); + evt_set_variable(script, a8, sp30); break; case 17: playFX_11(iVar1, fVar2, fVar3, fVar4, fVar5); @@ -294,7 +294,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { break; case 27: playFX_1B(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); - set_variable(script, a6, sp38); + evt_set_variable(script, a6, sp38); break; case 28: playFX_1C(iVar1, fVar2, fVar3, fVar4, iVar5); @@ -304,7 +304,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { break; case 30: playFX_1E(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, &sp30); - set_variable(script, a8, sp30); + evt_set_variable(script, a8, sp30); break; case 31: playFX_1F(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8); @@ -335,14 +335,14 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { break; case 41: fx_sleep_bubble(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, &sp38); - set_variable(script, a7, sp38); + evt_set_variable(script, a7, sp38); break; case 43: playFX_2B(iVar1, fVar2, fVar3, fVar4); break; case 32: playFX_20(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); - set_variable(script, a6, sp38); + evt_set_variable(script, a6, sp38); break; case 44: playFX_2C(iVar1, fVar2, fVar3, fVar4); @@ -355,7 +355,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { break; case 47: playFX_2F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, &sp38); - set_variable(script, a7, sp38); + evt_set_variable(script, a7, sp38); break; case 48: playFX_30(iVar1, fVar2, fVar3, fVar4); @@ -371,11 +371,11 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { break; case 52: playFX_34(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); - set_variable(script, a6, sp38); + evt_set_variable(script, a6, sp38); break; case 53: playFX_35(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); - set_variable(script, a6, sp38); + evt_set_variable(script, a6, sp38); break; case 54: effectRet = playFX_36(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6); @@ -394,15 +394,15 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { break; case 59: playFX_3B(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); - set_variable(script, a6, sp38); + evt_set_variable(script, a6, sp38); break; case 60: playFX_3C(iVar1, fVar2, fVar3, fVar4, fVar5, &sp38); - set_variable(script, a6, sp38); + evt_set_variable(script, a6, sp38); break; case 61: playFX_3D(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, &sp3C); - set_variable(script, a9, sp3C); + evt_set_variable(script, a9, sp3C); break; case 62: playFX_3E(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); @@ -616,7 +616,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { } if (effectRet != NULL) { - set_variable(script, EVT_VAR(15), effectRet); + evt_set_variable(script, EVT_VAR(15), effectRet); } return ApiStatus_DONE2; diff --git a/src/evt/map_api.c b/src/evt/map_api.c index e3c01450fb..d74dfcb788 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -10,16 +10,16 @@ extern s32 D_802DADA4; ApiStatus TranslateModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 modelIndex = get_variable(script, *args++); + s32 modelIndex = evt_get_variable(script, *args++); f32 x; f32 y; f32 z; Model* model; modelIndex = get_model_list_index_from_tree_index(modelIndex); - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); model = get_model_from_list_index(modelIndex); if (!(model->flags & 0x400)) { @@ -37,12 +37,12 @@ ApiStatus TranslateModel(Evt* script, s32 isInitialCall) { ApiStatus RotateModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); s32 modelListIndex = get_model_list_index_from_tree_index(var1); - f32 a = get_float_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + f32 a = evt_get_float_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++); Model* model = get_model_from_list_index(modelListIndex); if (!(model->flags & 0x400)) { @@ -60,16 +60,16 @@ ApiStatus RotateModel(Evt* script, s32 isInitialCall) { ApiStatus ScaleModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 modelIndex = get_variable(script, *args++); + s32 modelIndex = evt_get_variable(script, *args++); f32 x; f32 y; f32 z; Model* model; modelIndex = get_model_list_index_from_tree_index(modelIndex); - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); model = get_model_from_list_index(modelIndex); if (!(model->flags & 0x400)) { @@ -87,16 +87,16 @@ ApiStatus ScaleModel(Evt* script, s32 isInitialCall) { ApiStatus GetModelIndex(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode modelID = get_variable(script, *args++); + Bytecode modelID = evt_get_variable(script, *args++); Bytecode index = *args++; - set_variable(script, index, get_model_list_index_from_tree_index(modelID)); + evt_set_variable(script, index, get_model_list_index_from_tree_index(modelID)); return ApiStatus_DONE2; } ApiStatus InvalidateModelTransform(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode modelID = get_variable(script, *args++); + Bytecode modelID = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(modelID)); model->flags &= ~0x400; @@ -105,8 +105,8 @@ ApiStatus InvalidateModelTransform(Evt* script, s32 isInitialCall) { ApiStatus CloneModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode srcModelID = get_variable(script, *args++); - Bytecode newModelID = get_variable(script, *args++); + Bytecode srcModelID = evt_get_variable(script, *args++); + Bytecode newModelID = evt_get_variable(script, *args++); clone_model(srcModelID, newModelID); return ApiStatus_DONE2; @@ -121,7 +121,7 @@ ApiStatus GetModelCenter(Evt* script, s32 isInitialCall) { f32 sizeY; f32 sizeZ; - get_model_center_and_size(get_variable(script, *args++), ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, + get_model_center_and_size(evt_get_variable(script, *args++), ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); script->varTable[0] = centerX; script->varTable[1] = centerY; @@ -131,8 +131,8 @@ ApiStatus GetModelCenter(Evt* script, s32 isInitialCall) { ApiStatus SetTexPanner(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 treeIndex = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 treeIndex = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); set_tex_panner(model, var2); @@ -142,8 +142,8 @@ ApiStatus SetTexPanner(Evt* script, s32 isInitialCall) { ApiStatus SetCustomGfxEnabled(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode treeIndex = get_variable(script, *args++); - Bytecode enable = get_variable(script, *args++); + Bytecode treeIndex = evt_get_variable(script, *args++); + Bytecode enable = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); if (enable) { @@ -156,9 +156,9 @@ ApiStatus SetCustomGfxEnabled(Evt* script, s32 isInitialCall) { ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 treeIndex = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 treeIndex = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); Model* model; treeIndex = get_model_list_index_from_tree_index(treeIndex); @@ -173,8 +173,8 @@ ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall) { ApiStatus SetModelTexVariant(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode treeIndex = get_variable(script, *args++); - Bytecode var2 = get_variable(script, *args++); + Bytecode treeIndex = evt_get_variable(script, *args++); + Bytecode var2 = evt_get_variable(script, *args++); get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex))->unk_A9 = var2; return ApiStatus_DONE2; @@ -182,8 +182,8 @@ ApiStatus SetModelTexVariant(Evt* script, s32 isInitialCall) { ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 treeIndex = get_variable(script, *args++); - s32 flag = get_variable(script, *args++); + s32 treeIndex = evt_get_variable(script, *args++); + s32 flag = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); if (flag) { @@ -196,8 +196,8 @@ ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall) { ApiStatus EnableModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 listIndex = get_model_list_index_from_tree_index(get_variable(script, *args++)); - Bytecode flag = get_variable(script, *args++); + s32 listIndex = get_model_list_index_from_tree_index(evt_get_variable(script, *args++)); + Bytecode flag = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(listIndex); if (flag != 0) { @@ -210,8 +210,8 @@ ApiStatus EnableModel(Evt* script, s32 isInitialCall) { ApiStatus SetGroupEnabled(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode var1 = get_variable(script, *args++); - Bytecode var2 = get_variable(script, *args++); + Bytecode var1 = evt_get_variable(script, *args++); + Bytecode var2 = evt_get_variable(script, *args++); func_8011B7C0(var1, 2, var2); return ApiStatus_DONE2; @@ -219,10 +219,10 @@ ApiStatus SetGroupEnabled(Evt* script, s32 isInitialCall) { ApiStatus SetTexPanOffset(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Bytecode var1 = get_variable(script, *args++); - Bytecode var2 = get_variable(script, *args++); - Bytecode var3 = get_variable(script, *args++); - Bytecode var4 = get_variable(script, *args++); + Bytecode var1 = evt_get_variable(script, *args++); + Bytecode var2 = evt_get_variable(script, *args++); + Bytecode var3 = evt_get_variable(script, *args++); + Bytecode var4 = evt_get_variable(script, *args++); if (var2 == 0) { set_main_pan_u(var1, var3); @@ -237,9 +237,9 @@ ApiStatus SetTexPanOffset(Evt* script, s32 isInitialCall) { ApiStatus SetCustomGfx(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); set_custom_gfx(var1, var2, var3); return ApiStatus_DONE2; @@ -247,9 +247,9 @@ ApiStatus SetCustomGfx(Evt* script, s32 isInitialCall) { ApiStatus SetCustomGfxBuilders(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); set_custom_gfx_builders(var1, var2, var3); return ApiStatus_DONE2; @@ -262,10 +262,10 @@ ApiStatus SetModelFlags(Evt* script, s32 isInitialCall) { s32 enable; Model* model; - modelIndex = get_variable(script, *args++); + modelIndex = evt_get_variable(script, *args++); modelIndex = get_model_list_index_from_tree_index(modelIndex); a1 = *args++; - enable = get_variable(script, *args++); + enable = evt_get_variable(script, *args++); model = get_model_from_list_index(modelIndex); if (enable) { @@ -280,14 +280,14 @@ ApiStatus SetModelFlags(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "evt/map_api", apply_transform_to_children); ApiStatus MakeTransformGroup(Evt* script, s32 isInitialCall) { - make_transform_group((u16)get_variable(script, *script->ptrReadPos)); + make_transform_group((u16)evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus SetTransformGroupEnabled(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - u16 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + u16 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); if (var2 != 0) { enable_transform_group(var1); @@ -299,7 +299,7 @@ ApiStatus SetTransformGroupEnabled(Evt* script, s32 isInitialCall) { ApiStatus TranslateGroup(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args); + s32 var1 = evt_get_variable(script, *args); s32 index = get_transform_group_index(var1); ModelTransformGroup* transformGroup; f32 x, y, z; @@ -311,9 +311,9 @@ ApiStatus TranslateGroup(Evt* script, s32 isInitialCall) { args++; - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); transformGroup = get_transform_group(index); @@ -333,7 +333,7 @@ ApiStatus TranslateGroup(Evt* script, s32 isInitialCall) { ApiStatus RotateGroup(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_transform_group_index(get_variable(script, *args)); + s32 index = get_transform_group_index(evt_get_variable(script, *args)); ModelTransformGroup* transformGroup; f32 a, x, y, z; @@ -344,10 +344,10 @@ ApiStatus RotateGroup(Evt* script, s32 isInitialCall) { args++; - a = get_float_variable(script, *args++); - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + a = evt_get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); transformGroup = get_transform_group(index); @@ -366,7 +366,7 @@ ApiStatus RotateGroup(Evt* script, s32 isInitialCall) { ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args); + s32 var1 = evt_get_variable(script, *args); s32 index = get_transform_group_index(var1); ModelTransformGroup* transformGroup; f32 x, y, z; @@ -378,9 +378,9 @@ ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { args++; - x = get_float_variable(script, *args++); - y = get_float_variable(script, *args++); - z = get_float_variable(script, *args++); + x = evt_get_float_variable(script, *args++); + y = evt_get_float_variable(script, *args++); + z = evt_get_float_variable(script, *args++); transformGroup = get_transform_group(index); @@ -400,16 +400,16 @@ ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { ApiStatus GetTransformGroup(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); Bytecode var2 = *args++; - set_variable(script, var2, get_transform_group_index(var1)); + evt_set_variable(script, var2, get_transform_group_index(var1)); return ApiStatus_DONE2; } ApiStatus EnableGroup(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_transform_group_index(get_variable(script, *args)); + s32 index = get_transform_group_index(evt_get_variable(script, *args)); s32 flagUnset; ModelTransformGroup* transformGroup; @@ -420,7 +420,7 @@ ApiStatus EnableGroup(Evt* script, s32 isInitialCall) { args++; - flagUnset = get_variable(script, *args++); + flagUnset = evt_get_variable(script, *args++); transformGroup = get_transform_group(index); for (index = transformGroup->minChildModelIndex; index <= transformGroup->maxChildModelIndex; index++) { @@ -437,9 +437,9 @@ ApiStatus EnableGroup(Evt* script, s32 isInitialCall) { ApiStatus MakeLocalVertexCopy(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - u16 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + u16 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); mdl_make_local_vertex_copy(var1, var2, var3); return ApiStatus_DONE2; @@ -476,9 +476,9 @@ void modify_collider_family_flags(s32 index, s32 flags, s32 mode) { ApiStatus ModifyColliderFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 mode = get_variable(script, *args++); - s32 index = get_variable(script, *args++); - s32 flags = get_variable(script, *args++); + s32 mode = evt_get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 flags = evt_get_variable(script, *args++); Collider* collider = &gCollisionData.colliderList[index]; if (collider->firstChild >= 0) { @@ -511,7 +511,7 @@ ApiStatus ResetFromLava(Evt* script, s32 isInitialCall) { LavaReset* lavaReset; if (isInitialCall) { - lavaReset = gLavaResetList = get_variable(script, *args++); + lavaReset = gLavaResetList = evt_get_variable(script, *args++); while (TRUE) { if (lavaReset->colliderID == -1) { @@ -571,7 +571,7 @@ s32 get_lava_reset_pos(f32* outX, f32* outY, f32* outZ) { ApiStatus GetColliderCenter(Evt* script, s32 isInitialCall) { f32 x, y, z; - get_collider_center(get_variable(script, *script->ptrReadPos), &x, &y, &z); + get_collider_center(evt_get_variable(script, *script->ptrReadPos), &x, &y, &z); script->varTable[0] = x; script->varTable[1] = y; @@ -582,8 +582,8 @@ ApiStatus GetColliderCenter(Evt* script, s32 isInitialCall) { ApiStatus ParentColliderToModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s16 colliderID = get_variable(script, *args++); - s32 treeIndex = get_variable(script, *args++); + s16 colliderID = evt_get_variable(script, *args++); + s32 treeIndex = evt_get_variable(script, *args++); parent_collider_to_model(colliderID, get_model_list_index_from_tree_index(treeIndex)); update_collider_transform(colliderID); @@ -591,7 +591,7 @@ ApiStatus ParentColliderToModel(Evt* script, s32 isInitialCall) { } ApiStatus UpdateColliderTransform(Evt* script, s32 isInitialCall) { - update_collider_transform(get_variable(script, *script->ptrReadPos)); + update_collider_transform(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -617,8 +617,8 @@ void set_zone_enabled(s32 zoneID, s32 enabled) { ApiStatus SetZoneEnabled(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 idx = get_variable(script, *args++); - s32 enabled = get_variable(script, *args++); + s32 idx = evt_get_variable(script, *args++); + s32 enabled = evt_get_variable(script, *args++); TempSetZoneEnabled* unkStruct = &D_800D91D4[idx]; if (unkStruct->id2 >= 0) { @@ -644,18 +644,18 @@ void goto_map(Evt* script, s32 mode) { s16 mapTransitionEffect = 0; if (mode == 2) { - areaID = get_variable(script, *args++); - mapID = get_variable(script, *args++); + areaID = evt_get_variable(script, *args++); + mapID = evt_get_variable(script, *args++); } else { - get_map_IDs_by_name(get_variable(script, *args++), &areaID, &mapID); + get_map_IDs_by_name(evt_get_variable(script, *args++), &areaID, &mapID); } gGameStatusPtr->areaID = areaID; gGameStatusPtr->mapID = mapID; - gGameStatusPtr->entryID = get_variable(script, *args++); + gGameStatusPtr->entryID = evt_get_variable(script, *args++); if (mode == 1) { - mapTransitionEffect = get_variable(script, *args++); + mapTransitionEffect = evt_get_variable(script, *args++); } set_map_transition_effect(mapTransitionEffect); @@ -678,24 +678,24 @@ ApiStatus GotoMapByID(Evt* script, s32 isInitialCall) { } ApiStatus GetEntryID(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gGameStatusPtr->entryID); + evt_set_variable(script, *script->ptrReadPos, gGameStatusPtr->entryID); return ApiStatus_DONE2; } ApiStatus GetMapID(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gGameStatusPtr->mapID); + evt_set_variable(script, *script->ptrReadPos, gGameStatusPtr->mapID); return ApiStatus_DONE2; } ApiStatus GetLoadType(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gGameStatusPtr->loadType != 0); + evt_set_variable(script, *script->ptrReadPos, gGameStatusPtr->loadType != 0); return ApiStatus_DONE2; } ApiStatus SetRenderMode(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 treeIndex = get_variable(script, *args++); - s8 renderMode = get_variable(script, *args++); + s32 treeIndex = evt_get_variable(script, *args++); + s8 renderMode = evt_get_variable(script, *args++); get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex))->renderMode = renderMode; @@ -704,9 +704,9 @@ ApiStatus SetRenderMode(Evt* script, s32 isInitialCall) { ApiStatus PlaySoundAtModel(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 modelID = get_variable(script, *args++); - SoundID soundID = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 modelID = evt_get_variable(script, *args++); + SoundID soundID = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); f32 x, y, z; f32 sx, sy, sz; @@ -718,9 +718,9 @@ ApiStatus PlaySoundAtModel(Evt* script, s32 isInitialCall) { ApiStatus PlaySoundAtCollider(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 colliderID = get_variable(script, *args++); - SoundID soundID = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 colliderID = evt_get_variable(script, *args++); + SoundID soundID = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); f32 x, y, z; get_collider_center(colliderID, &x, &y, &z); diff --git a/src/evt/msg_api.c b/src/evt/msg_api.c index 8e4ed6dfa4..21ca88edde 100644 --- a/src/evt/msg_api.c +++ b/src/evt/msg_api.c @@ -24,9 +24,9 @@ ApiStatus ShowMessageAtScreenPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { - s32 stringID = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); + s32 stringID = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); s32* temp802DB264 = &D_802DB264; *temp802DB264 = 0; @@ -52,10 +52,10 @@ ApiStatus ShowMessageAtWorldPos(Evt* script, s32 isInitialCall) { s32* currentCameraID = &gCurrentCameraID; if (isInitialCall) { - s32 stringID = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 stringID = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); s32 x2; s32 y2; s32 z2; @@ -99,7 +99,7 @@ ApiStatus SwitchMessage(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { - msg_printer_load_string(get_variable(script, *args), gCurrentPrintContext); + msg_printer_load_string(evt_get_variable(script, *args), gCurrentPrintContext); } if (gCurrentPrintContext->stateFlags & 0x40) { @@ -117,7 +117,7 @@ ApiStatus ShowChoice(Evt* script, s32 isInitialCall) { MessagePrintState** temp802DB268; if (isInitialCall) { - s32 stringID = get_variable(script, *args++); + s32 stringID = evt_get_variable(script, *args++); script->functionTemp[1] = 0; D_802DB268 = msg_get_printer_for_string(stringID, &script->functionTemp[1]); @@ -155,7 +155,7 @@ ApiStatus SetMessageImages(Evt* script, s32 isInitialCall) { } ApiStatus func_802D0C94(Evt* script, s32 initialCall) { - if (get_variable(script, *script->ptrReadPos) == 0) { + if (evt_get_variable(script, *script->ptrReadPos) == 0) { gOverrideFlags |= 0x10; } else { gOverrideFlags &= ~0x10; @@ -165,8 +165,8 @@ ApiStatus func_802D0C94(Evt* script, s32 initialCall) { ApiStatus SetMessageString(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 string = get_variable(script, *args++); - s32 index = get_variable(script, *args++); + s32 string = evt_get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); set_message_string(string, index); return ApiStatus_DONE2; @@ -174,8 +174,8 @@ ApiStatus SetMessageString(Evt* script, s32 isInitialCall) { ApiStatus SetMessageValue(Evt* script, s32 initialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 value = get_variable(script, *ptrReadPos++); - s32 index = get_variable(script, *ptrReadPos); + s32 value = evt_get_variable(script, *ptrReadPos++); + s32 index = evt_get_variable(script, *ptrReadPos); set_message_value(value, index); return ApiStatus_DONE2; diff --git a/src/evt/npc_api.c b/src/evt/npc_api.c index 1082c2eaa3..e851665fb1 100644 --- a/src/evt/npc_api.c +++ b/src/evt/npc_api.c @@ -29,8 +29,8 @@ void set_npc_animation(Npc* npc, u32 arg1) { ApiStatus CreateNpc(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcID = get_variable(script, *args++); - s32 initialAnim = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + s32 initialAnim = evt_get_variable(script, *args++); NpcBlueprint blueprint; Npc *npc; @@ -47,7 +47,7 @@ ApiStatus CreateNpc(Evt* script, s32 isInitialCall) { ApiStatus DeleteNpc(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Npc* npc = get_npc_unsafe(get_variable(script, *args++)); + Npc* npc = get_npc_unsafe(evt_get_variable(script, *args++)); if (npc == NULL) { return ApiStatus_DONE2; @@ -59,19 +59,19 @@ ApiStatus DeleteNpc(Evt* script, s32 isInitialCall) { ApiStatus GetNpcPointer(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); Bytecode varNPC = *args++; - set_variable(script, varNPC, (s32)get_npc_safe(npcID)); + evt_set_variable(script, varNPC, (s32)get_npc_safe(npcID)); return ApiStatus_DONE2; } ApiStatus SetNpcPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcID = get_variable(script, *args++); - f32 x = get_variable(script, *args++); - f32 y = get_variable(script, *args++); - f32 z = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + f32 x = evt_get_variable(script, *args++); + f32 y = evt_get_variable(script, *args++); + f32 z = evt_get_variable(script, *args++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -91,10 +91,10 @@ ApiStatus SetNpcPos(Evt* script, s32 isInitialCall) { ApiStatus SetNpcRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcID = get_variable(script, *args++); - f32 rotX = get_float_variable(script, *args++); - f32 rotY = get_float_variable(script, *args++); - f32 rotZ = get_float_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + f32 rotX = evt_get_float_variable(script, *args++); + f32 rotY = evt_get_float_variable(script, *args++); + f32 rotZ = evt_get_float_variable(script, *args++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -109,8 +109,8 @@ ApiStatus SetNpcRotation(Evt* script, s32 isInitialCall) { ApiStatus func_802CDE68(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); - f32 var1 = get_float_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); + f32 var1 = evt_get_float_variable(script, *args++); Npc* npc; npc = resolve_npc(script, npcId); @@ -124,10 +124,10 @@ ApiStatus func_802CDE68(Evt* script, s32 isInitialCall) { ApiStatus SetNpcScale(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - f32 sizeX = get_float_variable(script, *ptrReadPos++); - f32 sizeY = get_float_variable(script, *ptrReadPos++); - f32 sizeZ = get_float_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + f32 sizeX = evt_get_float_variable(script, *ptrReadPos++); + f32 sizeY = evt_get_float_variable(script, *ptrReadPos++); + f32 sizeZ = evt_get_float_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -142,9 +142,9 @@ ApiStatus SetNpcScale(Evt* script, s32 isInitialCall) { ApiStatus SetNpcCollisionSize(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - s32 height = get_variable(script, *ptrReadPos++); - s32 radius = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + s32 height = evt_get_variable(script, *ptrReadPos++); + s32 radius = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -158,8 +158,8 @@ ApiStatus SetNpcCollisionSize(Evt* script, s32 isInitialCall) { ApiStatus SetNpcSpeed(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - f32 speed = get_float_variable(script, *ptrReadPos); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + f32 speed = evt_get_float_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -172,8 +172,8 @@ ApiStatus SetNpcSpeed(Evt* script, s32 isInitialCall) { ApiStatus SetNpcJumpscale(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - f32 jumpScale = get_float_variable(script, *ptrReadPos); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + f32 jumpScale = evt_get_float_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -186,8 +186,8 @@ ApiStatus SetNpcJumpscale(Evt* script, s32 isInitialCall) { ApiStatus SetNpcAnimation(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - s32 animation = get_variable(script, *ptrReadPos); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + s32 animation = evt_get_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -200,7 +200,7 @@ ApiStatus SetNpcAnimation(Evt* script, s32 isInitialCall) { ApiStatus GetNpcAnimation(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; Npc* npc = resolve_npc(script, npcID); @@ -208,14 +208,14 @@ ApiStatus GetNpcAnimation(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - set_variable(script, outVar, npc->currentAnim.w); + evt_set_variable(script, outVar, npc->currentAnim.w); return ApiStatus_DONE2; } ApiStatus SetNpcAnimationSpeed(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - f32 animationSpeed = get_float_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + f32 animationSpeed = evt_get_float_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -237,10 +237,10 @@ ApiStatus NpcMoveTo(Evt* script, s32 isInitialCall) { } if (script->functionTemp[0] == 0) { - NpcID npcID = get_variable(script, *args++); - f32 targetX = get_variable(script, *args++); - f32 targetZ = get_variable(script, *args++); - s32 duration = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + f32 targetX = evt_get_variable(script, *args++); + f32 targetZ = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -297,11 +297,11 @@ ApiStatus _npc_jump_to(Evt* script, s32 isInitialCall, s32 snapYaw) { } if (script->functionTemp[0] == 0) { - NpcID npcID = get_variable(script, *args++); - f32 xTemp = get_variable(script, *args++); - f32 yTemp = get_variable(script, *args++); - f32 zTemp = get_variable(script, *args++); - s32 duration = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + f32 xTemp = evt_get_variable(script, *args++); + f32 yTemp = evt_get_variable(script, *args++); + f32 zTemp = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); f32 dist; npc = resolve_npc(script, npcID); @@ -375,18 +375,18 @@ ApiStatus NpcFlyTo(Evt* script, s32 isInitialCall) { f32 yDelta; if (isInitialCall) { - npc = resolve_npc(script, get_variable(script, *args++)); + npc = resolve_npc(script, evt_get_variable(script, *args++)); if (npc == NULL) { return ApiStatus_DONE2; } script->functionTemp[1] = (s32)npc; - npc->moveToPos.x = get_float_variable(script, *args++); - npc->moveToPos.y = get_float_variable(script, *args++); - npc->moveToPos.z = get_float_variable(script, *args++); - script->varTable[6] = get_variable(script, *args++); - script->functionTemp[2] = get_variable(script, *args++); - script->functionTemp[3] = get_variable(script, *args++); + npc->moveToPos.x = evt_get_float_variable(script, *args++); + npc->moveToPos.y = evt_get_float_variable(script, *args++); + npc->moveToPos.z = evt_get_float_variable(script, *args++); + script->varTable[6] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + script->functionTemp[3] = evt_get_variable(script, *args++); npc->duration = 0; *outX = npc->pos.x; *outY = npc->pos.y; @@ -439,7 +439,7 @@ ApiStatus NpcFlyTo(Evt* script, s32 isInitialCall) { ApiStatus GetNpcYaw(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; Npc* npc = resolve_npc(script, npcID); @@ -447,20 +447,20 @@ ApiStatus GetNpcYaw(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - set_variable(script, outVar, clamp_angle(npc->yaw)); + evt_set_variable(script, outVar, clamp_angle(npc->yaw)); return ApiStatus_DONE2; } ApiStatus SetNpcYaw(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { return ApiStatus_DONE2; } - set_npc_yaw(npc, get_variable(script, *ptrReadPos++)); + set_npc_yaw(npc, evt_get_variable(script, *ptrReadPos++)); return ApiStatus_DONE2; } @@ -473,7 +473,7 @@ ApiStatus InterpNpcYaw(Evt* script, s32 isInitialCall) { Npc* npc; if (isInitialCall) { - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -481,9 +481,9 @@ ApiStatus InterpNpcYaw(Evt* script, s32 isInitialCall) { } *t1 = npc->yaw; - *t2 = get_variable(script, *args++) - *t1; + *t2 = evt_get_variable(script, *args++) - *t1; script->functionTemp[0] = (s32)npc; - *t3 = get_variable(script, *args++); + *t3 = evt_get_variable(script, *args++); if (*t3 == 0) { npc->yaw += *t2; @@ -521,7 +521,7 @@ ApiStatus NpcFacePlayer(Evt* script, s32 isInitialCall) { Npc* npc; if (isInitialCall) { - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -531,7 +531,7 @@ ApiStatus NpcFacePlayer(Evt* script, s32 isInitialCall) { *t1 = npc->yaw; *t2 = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z) - *t1; script->functionTemp[0] = (s32)npc; - *t3 = get_variable(script, *args++); + *t3 = evt_get_variable(script, *args++); npc->duration = 0; if (*t2 < -180.0f) { @@ -563,8 +563,8 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) { Npc* npc2; if (isInitialCall) { - NpcID npcID = get_variable(script, *args++); - NpcID npcID2 = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + NpcID npcID2 = evt_get_variable(script, *args++); npc = resolve_npc(script, npcID2); if (npc == NULL) { @@ -579,7 +579,7 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) { *t1 = npc2->yaw; *t2 = atan2(npc2->pos.x, npc2->pos.z, npc->pos.x, npc->pos.z) - *t1; script->functionTemp[0] = (s32)npc2; - *t3 = get_variable(script, *args++); + *t3 = evt_get_variable(script, *args++); npc2->duration = 0; if (*t2 < -180.0f) { @@ -604,9 +604,9 @@ ApiStatus NpcFaceNpc(Evt* script, s32 isInitialCall) { ApiStatus SetNpcFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); s32 flagBits = *args++; - s32 enable = get_variable(script, *args++); + s32 enable = evt_get_variable(script, *args++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -624,7 +624,7 @@ ApiStatus SetNpcFlagBits(Evt* script, s32 isInitialCall) { ApiStatus GetNpcPos(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); s32 a1 = *args++; s32 a2 = *args++; s32 a3 = *args++; @@ -634,15 +634,15 @@ ApiStatus GetNpcPos(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - set_variable(script, a1, npc->pos.x); - set_variable(script, a2, npc->pos.y); - set_variable(script, a3, npc->pos.z); + evt_set_variable(script, a1, npc->pos.x); + evt_set_variable(script, a2, npc->pos.y); + evt_set_variable(script, a3, npc->pos.z); return ApiStatus_DONE2; } ApiStatus func_802CF1B4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); Bytecode arg1 = *args; Npc* npc = resolve_npc(script, npcId); @@ -656,7 +656,7 @@ ApiStatus func_802CF1B4(Evt* script, s32 isInitialCall) { ApiStatus SetNpcSprite(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); Bytecode arg1 = *args; Npc* npc = resolve_npc(script, npcId); @@ -670,8 +670,8 @@ ApiStatus SetNpcSprite(Evt* script, s32 isInitialCall) { ApiStatus EnableNpcShadow(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - s32 enableShadow = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + s32 enableShadow = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -688,8 +688,8 @@ ApiStatus EnableNpcShadow(Evt* script, s32 isInitialCall) { ApiStatus EnableNpcBlur(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - s32 enableBlur = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + s32 enableBlur = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -706,7 +706,7 @@ ApiStatus EnableNpcBlur(Evt* script, s32 isInitialCall) { ApiStatus ClearPartnerMoveHistory(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -718,7 +718,7 @@ ApiStatus ClearPartnerMoveHistory(Evt* script, s32 isInitialCall) { } ApiStatus NpcSetHomePosToCurrent(Evt* script, s32 isInitialCall) { - Npc* npc = resolve_npc(script, get_variable(script, *script->ptrReadPos)); + Npc* npc = resolve_npc(script, evt_get_variable(script, *script->ptrReadPos)); if (npc == NULL) { return ApiStatus_DONE2; @@ -741,16 +741,16 @@ ApiStatus GetPartnerPos(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - set_variable(script, posX, npc->pos.x); - set_variable(script, posY, npc->pos.y); - set_variable(script, posZ, npc->pos.z); + evt_set_variable(script, posX, npc->pos.x); + evt_set_variable(script, posY, npc->pos.y); + evt_set_variable(script, posZ, npc->pos.z); return ApiStatus_DONE2; } ApiStatus DisablePartnerAI(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - if (get_variable(script, *ptrReadPos++) == 0) { + if (evt_get_variable(script, *ptrReadPos++) == 0) { func_800EF314(); } else { func_800EF300(); @@ -770,7 +770,7 @@ ApiStatus func_802CF54C(Evt* script, s32 isInitialCall) { ApiStatus func_802CF56C(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 value = get_variable(script, *ptrReadPos++); + s32 value = evt_get_variable(script, *ptrReadPos++); if (value == 2) { func_800EF3E4(); @@ -797,7 +797,7 @@ s32 BringPartnerOut(Evt *script, s32 isInitialCall) { f32 playerY; if (isInitialCall) { - D_802DAE40 = get_variable(script, *args++); + D_802DAE40 = evt_get_variable(script, *args++); if (playerData->currentPartner == D_802DAE40) { D_802DAE40 = 0; return ApiStatus_DONE2; @@ -947,32 +947,32 @@ ApiStatus PutPartnerAway(Evt* script, s32 isInitialCall) { } ApiStatus GetCurrentPartnerID(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner); + evt_set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner); return ApiStatus_DONE2; } ApiStatus PartnerCanUseAbility(Evt* script, s32 isInitialCall) { Bytecode arg0 = *script->ptrReadPos; - set_variable(script, arg0, partner_can_use_ability()); + evt_set_variable(script, arg0, partner_can_use_ability()); return ApiStatus_DONE2; } ApiStatus PartnerIsFlying(Evt* script, s32 isInitialCall) { Bytecode arg0 = *script->ptrReadPos; - set_variable(script, arg0, partner_is_flying()); + evt_set_variable(script, arg0, partner_is_flying()); return ApiStatus_DONE2; } ApiStatus func_802CFD30(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); - Bytecode var1 = get_variable(script, *args++); - Bytecode var2 = get_variable(script, *args++); - Bytecode var3 = get_variable(script, *args++); - Bytecode var4 = get_variable(script, *args++); - Bytecode var5 = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); + Bytecode var1 = evt_get_variable(script, *args++); + Bytecode var2 = evt_get_variable(script, *args++); + Bytecode var3 = evt_get_variable(script, *args++); + Bytecode var4 = evt_get_variable(script, *args++); + Bytecode var5 = evt_get_variable(script, *args++); Npc* npc = resolve_npc(script, npcId); if (npc == NULL) { @@ -985,7 +985,7 @@ ApiStatus func_802CFD30(Evt* script, s32 isInitialCall) { ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); Bytecode arg1 = *args; Npc* npc = resolve_npc(script, npcId); @@ -999,8 +999,8 @@ ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall) { ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); - Bytecode var1 = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); + Bytecode var1 = evt_get_variable(script, *args++); Npc* npc = resolve_npc(script, npcId); if (npc == NULL) { @@ -1013,11 +1013,11 @@ ApiStatus SetNpcPaletteSwapMode(Evt* script, s32 isInitialCall) { ApiStatus SetNpcPaletteSwapLower(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); - Bytecode var1 = get_variable(script, *args++); - Bytecode var2 = get_variable(script, *args++); - Bytecode var3 = get_variable(script, *args++); - Bytecode var4 = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); + Bytecode var1 = evt_get_variable(script, *args++); + Bytecode var2 = evt_get_variable(script, *args++); + Bytecode var3 = evt_get_variable(script, *args++); + Bytecode var4 = evt_get_variable(script, *args++); Npc* npc = resolve_npc(script, npcId); if (npc == NULL) { @@ -1030,15 +1030,15 @@ ApiStatus SetNpcPaletteSwapLower(Evt* script, s32 isInitialCall) { ApiStatus SetNpcPaletteSwapping(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcId = get_variable(script, *args++); - Bytecode var1 = get_variable(script, *args++); - Bytecode var2 = get_variable(script, *args++); - Bytecode var3 = get_variable(script, *args++); - Bytecode var4 = get_variable(script, *args++); - Bytecode var5 = get_variable(script, *args++); - Bytecode var6 = get_variable(script, *args++); - Bytecode var7 = get_variable(script, *args++); - Bytecode var8 = get_variable(script, *args++); + NpcID npcId = evt_get_variable(script, *args++); + Bytecode var1 = evt_get_variable(script, *args++); + Bytecode var2 = evt_get_variable(script, *args++); + Bytecode var3 = evt_get_variable(script, *args++); + Bytecode var4 = evt_get_variable(script, *args++); + Bytecode var5 = evt_get_variable(script, *args++); + Bytecode var6 = evt_get_variable(script, *args++); + Bytecode var7 = evt_get_variable(script, *args++); + Bytecode var8 = evt_get_variable(script, *args++); Npc* npc = resolve_npc(script, npcId); if (npc == NULL) { @@ -1052,9 +1052,9 @@ ApiStatus SetNpcPaletteSwapping(Evt* script, s32 isInitialCall) { ApiStatus SetNpcDecoration(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - s32 value1 = get_variable(script, *ptrReadPos++); - s32 value2 = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + s32 value1 = evt_get_variable(script, *ptrReadPos++); + s32 value2 = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -1067,9 +1067,9 @@ ApiStatus SetNpcDecoration(Evt* script, s32 isInitialCall) { ApiStatus PlaySoundAtNpc(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - SoundID soundID = get_variable(script, *ptrReadPos++); - s32 value2 = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + SoundID soundID = evt_get_variable(script, *ptrReadPos++); + s32 value2 = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); if (npc == NULL) { @@ -1082,8 +1082,8 @@ ApiStatus PlaySoundAtNpc(Evt* script, s32 isInitialCall) { ApiStatus func_802D0244(Evt* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - NpcID npcID = get_variable(script, *ptrReadPos++); - u8 renderMode = get_variable(script, *ptrReadPos++); + NpcID npcID = evt_get_variable(script, *ptrReadPos++); + u8 renderMode = evt_get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); npc->renderMode = renderMode; diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 527befd16b..7cbe616aab 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -12,7 +12,7 @@ void virtual_entity_list_render_UI(void); ApiStatus HidePlayerShadow(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 hideShadow = get_variable(script, *args++); + s32 hideShadow = evt_get_variable(script, *args++); if (hideShadow) { disable_player_shadow(); @@ -24,7 +24,7 @@ ApiStatus HidePlayerShadow(Evt* script, s32 isInitialCall) { ApiStatus DisablePlayerPhysics(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 disable = get_variable(script, *args++); + s32 disable = evt_get_variable(script, *args++); if (disable) { disable_player_static_collisions(); @@ -37,7 +37,7 @@ ApiStatus DisablePlayerPhysics(Evt* script, s32 isInitialCall) { ApiStatus DisablePlayerInput(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; - s32 enable = get_variable(script, *args++); + s32 enable = evt_get_variable(script, *args++); if (enable) { disable_player_input(); @@ -61,9 +61,9 @@ ApiStatus DisablePlayerInput(Evt* script, s32 isInitialCall) { ApiStatus SetPlayerPos(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; - f32 x = get_variable(script, *args++); - f32 y = get_variable(script, *args++); - f32 z = get_variable(script, *args++); + f32 x = evt_get_variable(script, *args++); + f32 y = evt_get_variable(script, *args++); + f32 z = evt_get_variable(script, *args++); playerNpc->pos.x = x; playerNpc->pos.y = y; @@ -79,8 +79,8 @@ ApiStatus SetPlayerPos(Evt* script, s32 isInitialCall) { ApiStatus SetPlayerCollisionSize(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; - s32 height = get_variable(script, *args++); - s32 radius = get_variable(script, *args); + s32 height = evt_get_variable(script, *args++); + s32 radius = evt_get_variable(script, *args); playerNpc->collisionHeight = height; playerNpc->collisionRadius = radius; @@ -92,18 +92,18 @@ ApiStatus SetPlayerCollisionSize(Evt* script, s32 isInitialCall) { } ApiStatus SetPlayerSpeed(Evt* script, s32 isInitialCall) { - playerNpc->moveSpeed = get_float_variable(script, *script->ptrReadPos); + playerNpc->moveSpeed = evt_get_float_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus SetPlayerJumpscale(Evt* script, s32 isInitialCall) { - playerNpc->jumpScale = get_float_variable(script, *script->ptrReadPos); + playerNpc->jumpScale = evt_get_float_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus SetPlayerAnimation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - PlayerAnim currentAnim = get_variable(script, *args++); + PlayerAnim currentAnim = evt_get_variable(script, *args++); s32 shakeAnim = 0x80003; playerNpc->currentAnim.w = currentAnim; @@ -120,12 +120,12 @@ ApiStatus SetPlayerAnimation(Evt* script, s32 isInitialCall) { } ApiStatus SetPlayerActionState(Evt* script, s32 isInitialCall) { - set_action_state(get_variable(script, *script->ptrReadPos)); + set_action_state(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus SetPlayerAnimationSpeed(Evt* script, s32 isInitialCall) { - playerNpc->animationSpeed = get_float_variable(script, *script->ptrReadPos); + playerNpc->animationSpeed = evt_get_float_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -134,11 +134,11 @@ ApiStatus PlayerMoveTo(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; if (isInitialCall) { - f32 targetX = get_variable(script, *args++); - f32 targetZ = get_variable(script, *args++); + f32 targetX = evt_get_variable(script, *args++); + f32 targetZ = evt_get_variable(script, *args++); f32 moveSpeed; - script->functionTemp[0] = get_variable(script, *args++); + script->functionTemp[0] = evt_get_variable(script, *args++); playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, targetX, targetZ); if (script->functionTemp[0] == 0) { @@ -161,9 +161,9 @@ ApiStatus func_802D1270(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; if (isInitialCall) { - f32 targetX = get_variable(script, *args++); - f32 targetZ = get_variable(script, *args++); - f32 var3 = get_float_variable(script, *args++); + f32 targetX = evt_get_variable(script, *args++); + f32 targetZ = evt_get_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); f32 dist; f32 moveSpeed; @@ -185,10 +185,10 @@ ApiStatus func_802D1380(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; if (isInitialCall) { - f32 targetX = get_variable(script, *args++); - f32 targetZ = get_variable(script, *args++); + f32 targetX = evt_get_variable(script, *args++); + f32 targetZ = evt_get_variable(script, *args++); - playerNpc->duration = get_variable(script, *args++); + playerNpc->duration = evt_get_variable(script, *args++); playerStatus->targetYaw = atan2(playerStatus->position.x, playerStatus->position.z, targetX, targetZ); if (playerNpc->duration != 0) { @@ -222,10 +222,10 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { } if (script->functionTemp[0] == 0) { - xTemp = get_variable(script, *args++); - yTemp = get_variable(script, *args++); - zTemp = get_variable(script, *args++); - duration = get_variable(script, *args++); + xTemp = evt_get_variable(script, *args++); + yTemp = evt_get_variable(script, *args++); + zTemp = evt_get_variable(script, *args++); + duration = evt_get_variable(script, *args++); playerNpc->pos.x = playerStatus->position.x; playerNpc->pos.y = playerStatus->position.y; @@ -352,8 +352,8 @@ ApiStatus InterpPlayerYaw(Evt* script, s32 isInitialCall) { if (isInitialCall) { playerNpc->yaw = playerStatus->targetYaw; *initialYaw = playerNpc->yaw; - *deltaYaw = get_float_variable(script, *args++) - *initialYaw; - *time = get_variable(script, *args++); + *deltaYaw = evt_get_float_variable(script, *args++) - *initialYaw; + *time = evt_get_variable(script, *args++); playerNpc->duration = 0; if (*deltaYaw < -180.0f) { @@ -388,7 +388,7 @@ ApiStatus PlayerFaceNpc(Evt* script, s32 isInitialCall) { s32* ft3 = &script->functionTemp[3]; if (isInitialCall) { - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); Npc* npc; if (npcID == NPC_SELF) { @@ -404,7 +404,7 @@ ApiStatus PlayerFaceNpc(Evt* script, s32 isInitialCall) { *playerTargetYaw = playerNpc->yaw = playerStatus->targetYaw; *angle = atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z) - *playerTargetYaw; - *ft3 = get_variable(script, *args++); + *ft3 = evt_get_variable(script, *args++); playerNpc->duration = 0; @@ -430,7 +430,7 @@ ApiStatus PlayerFaceNpc(Evt* script, s32 isInitialCall) { } ApiStatus GetPlayerTargetYaw(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gPlayerStatus.targetYaw); + evt_set_variable(script, *script->ptrReadPos, gPlayerStatus.targetYaw); return ApiStatus_DONE2; } @@ -440,7 +440,7 @@ ApiStatus SetPlayerFlagBits(Evt* script, s32 isInitialCall) { Bytecode bits = *args++; Bytecode a1 = *args; - if (get_variable(script, a1)) { + if (evt_get_variable(script, a1)) { playerStatus->flags |= bits; } else { playerStatus->flags &= ~bits; @@ -451,7 +451,7 @@ ApiStatus SetPlayerFlagBits(Evt* script, s32 isInitialCall) { ApiStatus GetPlayerActionState(Evt* script, s32 isInitialCall) { Bytecode outVar = *script->ptrReadPos; - set_variable(script, outVar, gPlayerActionState); + evt_set_variable(script, outVar, gPlayerActionState); return ApiStatus_DONE2; } @@ -462,16 +462,16 @@ ApiStatus GetPlayerPos(Evt* script, s32 isInitialCall) { Bytecode outVar2 = *args++; Bytecode outVar3 = *args++; - set_variable(script, outVar1, playerStatus->position.x); - set_variable(script, outVar2, playerStatus->position.y); - set_variable(script, outVar3, playerStatus->position.z); + evt_set_variable(script, outVar1, playerStatus->position.x); + evt_set_variable(script, outVar2, playerStatus->position.y); + evt_set_variable(script, outVar3, playerStatus->position.z); return ApiStatus_DONE2; } ApiStatus GetPlayerAnimation(Evt* script, s32 isInitialCall) { Bytecode outVar = *script->ptrReadPos; - set_variable(script, outVar, gPlayerAnimation); + evt_set_variable(script, outVar, gPlayerAnimation); return ApiStatus_DONE2; } @@ -491,7 +491,7 @@ ApiStatus FullyRestoreSP(Evt* script, s32 isInitialCall) { } ApiStatus EnablePartner(Evt* script, s32 isInitialCall) { - s32 partnerIdx = get_variable(script, *script->ptrReadPos) - 1; + s32 partnerIdx = evt_get_variable(script, *script->ptrReadPos) - 1; PartnerData* partner = &gPlayerData.partners[partnerIdx]; partner->enabled = TRUE; @@ -499,7 +499,7 @@ ApiStatus EnablePartner(Evt* script, s32 isInitialCall) { } ApiStatus DisablePartner(Evt* script, s32 isInitialCall) { - s32 partnerIdx = get_variable(script, *script->ptrReadPos) - 1; + s32 partnerIdx = evt_get_variable(script, *script->ptrReadPos) - 1; PartnerData* partner = &gPlayerData.partners[partnerIdx]; partner->enabled = FALSE; @@ -509,8 +509,8 @@ ApiStatus DisablePartner(Evt* script, s32 isInitialCall) { ApiStatus UseEntryHeading(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; MapConfig* mapConfig = get_current_map_header(); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); f32 entryX = script->varTable[1] = (*mapConfig->entryList)[gGameStatusPtr->entryID].x; f32 entryY = script->varTable[2] = (*mapConfig->entryList)[gGameStatusPtr->entryID].y; f32 entryZ = script->varTable[3] = (*mapConfig->entryList)[gGameStatusPtr->entryID].z; @@ -544,8 +544,8 @@ ApiStatus UseExitHeading(Evt* script, s32 isInitialCall) { f32* varTableVar5 = &script->varTable[5]; if (can_trigger_loading_zone()) { - s32 var1 = get_variable(script, *args++); - s32 entryID = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 entryID = evt_get_variable(script, *args++); f32 entryX = (*mapConfig->entryList)[entryID].x; f32 entryZ = (*mapConfig->entryList)[entryID].z; f32 temp = (var1 + 10.0f) / 2; @@ -605,7 +605,7 @@ ApiStatus IsPlayerOnValidFloor(Evt* script, s32 isInitialCall) { if (gCollisionStatus.currentFloor >= 0) { val = func_802D23F8() != 0; } - set_variable(script, *args, val); + evt_set_variable(script, *args, val); return ApiStatus_DONE2; } @@ -624,7 +624,7 @@ ApiStatus func_802D2520(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; s32 a0 = *args++; - s32 val = get_variable(script, *args++); + s32 val = evt_get_variable(script, *args++); s32 a2; s32 a3; @@ -643,44 +643,44 @@ ApiStatus func_802D2520(Evt* script, s32 isInitialCall) { break; case 4: playerStatus->renderMode = 13; - a2 = get_variable(script, *args++); - a3 = get_variable(script, *args++); - get_variable(script, *args++); + a2 = evt_get_variable(script, *args++); + a3 = evt_get_variable(script, *args++); + evt_get_variable(script, *args++); func_802DDFF8(a0, 4, a2, a3, 0, 0, 0); break; case 6: playerStatus->renderMode = 13; - a2 = get_variable(script, *args++); - a3 = get_variable(script, *args++); - get_variable(script, *args++); + a2 = evt_get_variable(script, *args++); + a3 = evt_get_variable(script, *args++); + evt_get_variable(script, *args++); func_802DDFF8(a0, 6, a2, a3, 0, 0, 0); break; case 7: playerStatus->renderMode = 22; - get_variable(script, *args++); + evt_get_variable(script, *args++); func_802DDFF8(a0, 7, 0xFF, 0xFF, 0, 0, 0); break; case 8: playerStatus->renderMode = 22; - a3 = get_variable(script, *args++); - a2 = get_variable(script, *args++); - get_variable(script, *args++); - get_variable(script, *args++); + a3 = evt_get_variable(script, *args++); + a2 = evt_get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); func_802DDFF8(a0, 8, a2, a3, 0, 0, 0); break; case 5: playerStatus->renderMode = 13; - a2 = get_variable(script, *args++); - a3 = get_variable(script, *args++); - get_variable(script, *args++); + a2 = evt_get_variable(script, *args++); + a3 = evt_get_variable(script, *args++); + evt_get_variable(script, *args++); func_802DDFF8(a0, 5, a2, a3, 0, 0, 0); break; case 13: playerStatus->renderMode = 22; - a2 = get_variable(script, *args++); - a3 = get_variable(script, *args++); - get_variable(script, *args++); - get_variable(script, *args++); + a2 = evt_get_variable(script, *args++); + a3 = evt_get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); func_802DDFF8(a0, 13, a2, a3, 0, 0, 0); break; } @@ -707,8 +707,8 @@ ApiStatus func_802D2884(Evt* script, s32 isInitialCall) { s32* ft3 = &script->functionTemp[3]; if (isInitialCall) { - f32 x = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + f32 x = evt_get_float_variable(script, *args++); + f32 z = evt_get_float_variable(script, *args++); f32 yawTemp; *ft1 = playerNpc->yaw = playerStatus->targetYaw; @@ -720,7 +720,7 @@ ApiStatus func_802D2884(Evt* script, s32 isInitialCall) { } *angle = yawTemp - *ft1; - *ft3 = get_variable(script, *args++); + *ft3 = evt_get_variable(script, *args++); playerNpc->duration = 0; if (*angle < -180.0f) { @@ -746,7 +746,7 @@ ApiStatus func_802D2884(Evt* script, s32 isInitialCall) { ApiStatus DisablePulseStone(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - if (get_variable(script, *script->ptrReadPos)) { + if (evt_get_variable(script, *script->ptrReadPos)) { playerStatus->animFlags &= ~0x80; } else { playerStatus->animFlags |= 0x80; @@ -765,7 +765,7 @@ ApiStatus GetCurrentPartner(Evt* script, s32 isInitialCall) { currentPartner = playerData->currentPartner; } - set_variable(script, a0, currentPartner); + evt_set_variable(script, a0, currentPartner); return ApiStatus_DONE2; } @@ -787,7 +787,7 @@ ApiStatus Disable8bitMario(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - if (get_variable(script, *args)) { + if (evt_get_variable(script, *args)) { playerStatus->colliderHeight = 37; playerStatus->colliderDiameter = 26; playerStatus->animFlags &= ~0x4000; @@ -801,28 +801,28 @@ ApiStatus Disable8bitMario(Evt* script, s32 isInitialCall) { } ApiStatus func_802D2C14(Evt* script, s32 isInitialCall) { - func_800EF3D4(get_variable(script, *script->ptrReadPos)); + func_800EF3D4(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } ApiStatus func_802D2C40(Evt* script) { Bytecode* args = script->ptrReadPos; - f32 x = get_variable(script, *args++); + f32 x = evt_get_variable(script, *args++); PlayerStatus* playerStatus = &gPlayerStatus; f32 y; f32 z; playerStatus->extraVelocity.x = x; - playerStatus->extraVelocity.y = get_variable(script, *args++); - playerStatus->extraVelocity.z = get_variable(script, *args++); + playerStatus->extraVelocity.y = evt_get_variable(script, *args++); + playerStatus->extraVelocity.z = evt_get_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus PlaySoundAtPlayer(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); sfx_play_sound_at_player(var, var2); return ApiStatus_DONE2; @@ -888,8 +888,8 @@ ApiStatus InitVirtualEntityList(Evt* script, s32 isInitialCall) { ApiStatus CreateVirtualEntityAt(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - u32* cmdList = (u32*)get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + u32* cmdList = (u32*)evt_get_variable(script, *args++); VirtualEntity* virtualEntity = (*D_802DB7C0)[index]; virtualEntity->entityModelIndex = load_entity_model(cmdList); @@ -910,7 +910,7 @@ ApiStatus CreateVirtualEntityAt(Evt* script, s32 isInitialCall) { ApiStatus CreateVirtualEntity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 outVar = *args++; - s32* unkStructPtr = (s32*)get_variable(script, *args++); + s32* unkStructPtr = (s32*)evt_get_variable(script, *args++); VirtualEntity* virtualEntity; s32 i; @@ -937,7 +937,7 @@ ApiStatus CreateVirtualEntity(Evt* script, s32 isInitialCall) { virtualEntity->scale.z = 1.0f; exec_entity_model_commandlist(virtualEntity->entityModelIndex); - set_variable(script, outVar, i); + evt_set_variable(script, outVar, i); return ApiStatus_DONE2; } @@ -945,7 +945,7 @@ ApiStatus CreateVirtualEntity(Evt* script, s32 isInitialCall) { ApiStatus CreateVirtualEntity_ALT(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 outVar = *args++; - s32* unkStructPtr = (s32*)get_variable(script, *args++); + s32* unkStructPtr = (s32*)evt_get_variable(script, *args++); VirtualEntity* virtualEntity; s32 i; @@ -972,13 +972,13 @@ ApiStatus CreateVirtualEntity_ALT(Evt* script, s32 isInitialCall) { virtualEntity->scale.z = 1.0f; exec_entity_model_commandlist(virtualEntity->entityModelIndex); - set_variable(script, outVar, i); + evt_set_variable(script, outVar, i); return ApiStatus_DONE2; } ApiStatus DeleteVirtualEntity(Evt* script, s32 isInitialCall) { - VirtualEntity* virtualEntity = (*D_802DB7C0)[get_variable(script, *script->ptrReadPos)]; + VirtualEntity* virtualEntity = (*D_802DB7C0)[evt_get_variable(script, *script->ptrReadPos)]; free_entity_model_by_index(virtualEntity->entityModelIndex); virtualEntity->entityModelIndex = -1; @@ -987,8 +987,8 @@ ApiStatus DeleteVirtualEntity(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityRenderCommands(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - u32* commandList = (u32*)get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + u32* commandList = (u32*)evt_get_variable(script, *args++); set_entity_model_render_command_list((*D_802DB7C0)[index]->entityModelIndex, commandList); return ApiStatus_DONE2; @@ -996,10 +996,10 @@ ApiStatus SetVirtualEntityRenderCommands(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityPosition(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + s32 index = 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++); VirtualEntity* virtualEntity = (*D_802DB7C0)[index]; virtualEntity->pos.x = x; @@ -1010,24 +1010,24 @@ ApiStatus SetVirtualEntityPosition(Evt* script, s32 isInitialCall) { ApiStatus GetVirtualEntityPosition(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); VirtualEntity* virtualEntity = (*D_802DB7C0)[index]; s32 outVar1 = *args++; s32 outVar2 = *args++; s32 outVar3 = *args++; - set_variable(script, outVar1, virtualEntity->pos.x); - set_variable(script, outVar2, virtualEntity->pos.y); - set_variable(script, outVar3, virtualEntity->pos.z); + evt_set_variable(script, outVar1, virtualEntity->pos.x); + evt_set_variable(script, outVar2, virtualEntity->pos.y); + evt_set_variable(script, outVar3, virtualEntity->pos.z); return ApiStatus_DONE2; } ApiStatus SetVirtualEntityRotation(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + s32 index = 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++); VirtualEntity* virtualEntity = (*D_802DB7C0)[index]; virtualEntity->rot.x = x; @@ -1038,10 +1038,10 @@ ApiStatus SetVirtualEntityRotation(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityScale(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - f32 x = get_float_variable(script, *args++); - f32 y = get_float_variable(script, *args++); - f32 z = get_float_variable(script, *args++); + s32 index = 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++); VirtualEntity* virtualEntity = (*D_802DB7C0)[index]; virtualEntity->scale.x = x; @@ -1052,17 +1052,17 @@ ApiStatus SetVirtualEntityScale(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityMoveSpeed(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); - (*D_802DB7C0)[index]->moveSpeed = get_float_variable(script, *args++); + (*D_802DB7C0)[index]->moveSpeed = evt_get_float_variable(script, *args++); return ApiStatus_DONE2; } ApiStatus SetVirtualEntityJumpGravity(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); - (*D_802DB7C0)[index]->jumpGravity = get_float_variable(script, *args++); + (*D_802DB7C0)[index]->jumpGravity = evt_get_float_variable(script, *args++); return ApiStatus_DONE2; } @@ -1075,11 +1075,11 @@ ApiStatus VirtualEntityMoveTo(Evt* script, s32 isInitialCall) { } if (script->functionTemp[0] == 0) { - s32 index = get_variable(script, *args++); - f32 xTemp = get_variable(script, *args++); - f32 yTemp = get_variable(script, *args++); - f32 zTemp = get_variable(script, *args++); - s32 moveTime = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + f32 xTemp = evt_get_variable(script, *args++); + f32 yTemp = evt_get_variable(script, *args++); + f32 zTemp = evt_get_variable(script, *args++); + s32 moveTime = evt_get_variable(script, *args++); f32 goalPosX; f32 goalPosZ; @@ -1141,11 +1141,11 @@ ApiStatus VirtualEntityJumpTo(Evt* script, s32 isInitialCall) { } if (script->functionTemp[0] == 0) { - index = get_variable(script, *args++); - xTemp = get_variable(script, *args++); - yTemp = get_variable(script, *args++); - zTemp = get_variable(script, *args++); - moveTime = get_variable(script, *args++); + index = evt_get_variable(script, *args++); + xTemp = evt_get_variable(script, *args++); + yTemp = evt_get_variable(script, *args++); + zTemp = evt_get_variable(script, *args++); + moveTime = evt_get_variable(script, *args++); virtualEntity = (*D_802DB7C0)[index]; script->functionTemp[1] = index; @@ -1208,7 +1208,7 @@ ApiStatus VirtualEntityLandJump(Evt* script, s32 isInitialCall) { } if (script->functionTemp[0] == 0) { - script->functionTemp[1] = get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[0] = 1; } @@ -1228,7 +1228,7 @@ ApiStatus VirtualEntityLandJump(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); s32 flags = *args++; get_entity_model((*D_802DB7C0)[index]->entityModelIndex)->flags = flags; @@ -1237,9 +1237,9 @@ ApiStatus SetVirtualEntityFlags(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityFlagBits(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); s32 flags = *args++; - s32 cond = get_variable(script, *args++); + s32 cond = evt_get_variable(script, *args++); VirtualEntity* virtualEntity = (*D_802DB7C0)[index]; if (cond) { @@ -1253,8 +1253,8 @@ ApiStatus SetVirtualEntityFlagBits(Evt* script, s32 isInitialCall) { ApiStatus SetVirtualEntityRenderMode(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 index = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 index = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); EntityModel* entityModel = get_entity_model((*D_802DB7C0)[index]->entityModelIndex); switch (var2) { @@ -1263,26 +1263,26 @@ ApiStatus SetVirtualEntityRenderMode(Evt* script, s32 isInitialCall) { break; case 0: entityModel->renderMode = 1; - get_variable(script, *args++); - get_variable(script, *args++); - get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); break; case 2: entityModel->renderMode = 0xD; - get_variable(script, *args++); - get_variable(script, *args++); - get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); break; case 3: entityModel->renderMode = 0x16; - get_variable(script, *args++); + evt_get_variable(script, *args++); break; case 4: entityModel->renderMode = 0x16; - get_variable(script, *args++); - get_variable(script, *args++); - get_variable(script, *args++); - get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); + evt_get_variable(script, *args++); break; } return ApiStatus_DONE2; diff --git a/src/evt/script_list.c b/src/evt/script_list.c index f00d935190..678012fe8c 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -658,7 +658,7 @@ Trigger* bind_trigger(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 tr def.flags = flags | 0x1000000; def.flagIndex = triggerFlagIndex; def.unk_14 = 0; - def.function = _bound_script_trigger_handler; + def.function = evt_bound_script_trigger_handler; def.inputArg3 = arg6; trigger = create_trigger(&def); diff --git a/src/fio.c b/src/fio.c index 395f73edc3..4e441607e6 100644 --- a/src/fio.c +++ b/src/fio.c @@ -10,22 +10,22 @@ extern s32 D_800D95E8[]; void fio_serialize_state(void); s32 get_spirits_rescued(void) { - s32 storyProgress = get_variable(NULL, EVT_STORY_PROGRESS); + s32 storyProgress = evt_get_variable(NULL, EVT_STORY_PROGRESS); s32 ret = 7; - if (storyProgress < get_variable(NULL, STORY_CH1_STAR_SPIRIT_RESCUED)) { + if (storyProgress < evt_get_variable(NULL, STORY_CH1_STAR_SPIRIT_RESCUED)) { ret = 0; - } else if (storyProgress < get_variable(NULL, STORY_CH2_STAR_SPIRIT_RESCUED)) { + } else if (storyProgress < evt_get_variable(NULL, STORY_CH2_STAR_SPIRIT_RESCUED)) { ret = 1; - } else if (storyProgress < get_variable(NULL, STORY_CH3_STAR_SPIRIT_RESCUED)) { + } else if (storyProgress < evt_get_variable(NULL, STORY_CH3_STAR_SPIRIT_RESCUED)) { ret = 2; - } else if (storyProgress < get_variable(NULL, STORY_CH4_STAR_SPIRIT_RESCUED)) { + } else if (storyProgress < evt_get_variable(NULL, STORY_CH4_STAR_SPIRIT_RESCUED)) { ret = 3; - } else if (storyProgress < get_variable(NULL, STORY_CH5_OPENED_ESCAPE_ROUTE)) { + } else if (storyProgress < evt_get_variable(NULL, STORY_CH5_OPENED_ESCAPE_ROUTE)) { ret = 4; - } else if (storyProgress < get_variable(NULL, STORY_CH6_STAR_SPIRIT_RESCUED)) { + } else if (storyProgress < evt_get_variable(NULL, STORY_CH6_STAR_SPIRIT_RESCUED)) { ret = 5; - } else if (storyProgress < get_variable(NULL, STORY_CH7_STAR_SPIRIT_RESCUED)) { + } else if (storyProgress < evt_get_variable(NULL, STORY_CH7_STAR_SPIRIT_RESCUED)) { ret = 6; } diff --git a/src/state_demo.c b/src/state_demo.c index 43239e34a4..d64966bf9d 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -132,7 +132,7 @@ void state_step_demo(void) { gGameStatusPtr->peachFlags = 0; playerData->currentPartner = demoSceneData->partnerID; set_cam_viewport(0, 29, 20, -262, 177); - set_variable(NULL, EVT_STORY_PROGRESS, demoSceneData->unk_6); + evt_set_variable(NULL, EVT_STORY_PROGRESS, demoSceneData->unk_6); if (gGameStatusPtr->nextDemoScene == 0) { set_map_transition_effect(3); @@ -150,7 +150,7 @@ void state_step_demo(void) { gGameStatusPtr->peachFlags = 1; playerData->currentPartner = demoSceneData->partnerID; set_cam_viewport(0, 29, 20, -262, 177); - set_variable(NULL, EVT_STORY_PROGRESS, demoSceneData->unk_6); + evt_set_variable(NULL, EVT_STORY_PROGRESS, demoSceneData->unk_6); if (gGameStatusPtr->nextDemoScene == 0) { set_map_transition_effect(3); diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index 1eb5825e99..9c50f77e4b 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -317,11 +317,11 @@ s32 N(func_80240C90_BDDE40)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - enemy->varTable[10] = get_variable(script, *args++); + enemy->varTable[10] = evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index a277475bae..97839bea7b 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -119,7 +119,7 @@ ApiStatus N(func_80240B94_BDF924)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -256,7 +256,7 @@ ApiStatus N(func_8024113C_BDFECC)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->patrol.detectShape; @@ -1078,7 +1078,7 @@ ApiStatus N(func_802415F4_BE0384)(Evt* script, s32 isInitialCall) { if (*ptr != NULL) { ptr = &N(D_80241CCC_BE0A5C); *ptr = 0; - set_variable(script, *args, N(D_80241CD0_BE0A60)); + evt_set_variable(script, *args, N(D_80241CD0_BE0A60)); return ApiStatus_DONE2; } @@ -1088,14 +1088,14 @@ ApiStatus N(func_802415F4_BE0384)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80241648_BE03D8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241CD0_BE0A60) = get_variable(script, *args); + N(D_80241CD0_BE0A60) = evt_get_variable(script, *args); N(D_80241CCC_BE0A5C) = 1; return ApiStatus_DONE2; } ApiStatus N(func_80241680_BE0410)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index dfc16bd72a..c29fc5edab 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -350,7 +350,7 @@ ApiStatus N(func_80240B94_BE4344)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -594,7 +594,7 @@ ApiStatus N(func_8024219C_BE594C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -764,12 +764,12 @@ ApiStatus N(func_80243018_BE67C8)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); Bytecode* args = script->ptrReadPos; - NpcAISettings* aiSettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; u32 var; - enemy->varTable[10] = get_variable(script, *args++); + enemy->varTable[10] = evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 742828cc36..a1ba62efa1 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -1029,7 +1029,7 @@ ApiStatus N(func_80240B94_BE8774)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -1167,7 +1167,7 @@ ApiStatus N(func_8024113C_BE8D1C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->patrol.detectShape; diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index 8e05a805f0..33c5b2c5e7 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -49,17 +49,17 @@ ApiStatus N(func_8024004C_BECE3C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_3C = get_variable(script, *args++); - ptr->unk_0C = get_float_variable(script, *args++); - ptr->unk_10 = get_float_variable(script, *args++); - ptr->unk_14 = get_float_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_1C = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + 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++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; @@ -171,7 +171,7 @@ ApiStatus N(func_802401AC_BECF9C)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_802405BC_BED3AC)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); arn_07_struct* ptr = script->varTable[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; @@ -183,11 +183,11 @@ ApiStatus N(func_802405FC_BED3EC)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38; ptr->unk_54->unk_0C->unk_20 = 0; diff --git a/src/world/area_arn/arn_07/BED5F0.c b/src/world/area_arn/arn_07/BED5F0.c index b69f747c18..7264862eb3 100644 --- a/src/world/area_arn/arn_07/BED5F0.c +++ b/src/world/area_arn/arn_07/BED5F0.c @@ -1,11 +1,11 @@ #include "arn_07.h" ApiStatus N(func_80240800_BED5F0)(Evt* script, s32 isInitialCall) { - f32 temp_f0 = get_float_variable(script, EVT_VAR(0)); + f32 temp_f0 = evt_get_float_variable(script, EVT_VAR(0)); if (temp_f0 >= 360.0) { temp_f0 -= 360.0; } - set_float_variable(script, EVT_VAR(0), temp_f0); + evt_set_float_variable(script, EVT_VAR(0), temp_f0); return ApiStatus_DONE2; } diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index d71c52f114..bd0d68ab75 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -1339,7 +1339,7 @@ ApiStatus N(func_80241C5C_BEEA4C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 69d5a091b8..c01ee15e8e 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -663,7 +663,7 @@ ApiStatus N(func_8024142C_BFECAC)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -961,7 +961,7 @@ ApiStatus N(func_802422B0_BFFB30)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -1260,7 +1260,7 @@ ApiStatus N(func_802430C0_C00940)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* aiSettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 614f6cbbe2..323200d7f9 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -430,7 +430,7 @@ ApiStatus N(func_8024061C_C2F1BC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -693,7 +693,7 @@ ApiStatus N(func_802410D4_C2FC74)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 82f8235a59..a9df7177f4 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -751,7 +751,7 @@ ApiStatus N(func_8024086C_C31D4C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -858,7 +858,7 @@ ApiStatus N(func_802416B4_C32B94)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -943,7 +943,7 @@ ApiStatus N(func_802419B0_C32E90)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->patrol.detectShape; @@ -1209,7 +1209,7 @@ ApiStatus N(func_80242480_C33960)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 4876f2d388..bd8809a10f 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -572,7 +572,7 @@ ApiStatus N(func_8024130C_C3783C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -860,7 +860,7 @@ ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -935,7 +935,7 @@ ApiStatus N(func_80242154_C38684)(Evt* script, s32 isInitialCall) { #include "world/common/UnkFunc17.inc.c" ApiStatus N(func_8024240C_C3893C)(Evt* script, s32 isInitialCall) { - entity_upgrade_block_hide_content(get_variable(script, *script->ptrReadPos)); + entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -1083,7 +1083,7 @@ ApiStatus N(func_802429D0_C38F00)(Evt* script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, @@ -1200,8 +1200,8 @@ s32 N(func_80242F08_C39438)(Evt* script, s32 isInitialCall) { s32 ret = 0; if (isInitialCall) { - script->varTable[0] = get_variable(script, *args++); - script->varTable[1] = get_variable(script, *args++); + script->varTable[0] = evt_get_variable(script, *args++); + script->varTable[1] = evt_get_variable(script, *args++); script->functionTemp[0] = 0; script->functionTemp[1] = 0; set_screen_overlay_color(0, 0xD0, 0xD0, 0xD0); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 2857f44287..a0ec48d8ee 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -543,7 +543,7 @@ ApiStatus N(func_80240E80_C3B890)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -647,7 +647,7 @@ ApiStatus N(func_802411D0_C3BBE0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 6d2f9e324a..695b76a02a 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -452,7 +452,7 @@ ApiStatus N(func_80240E20_C3EA10)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -556,7 +556,7 @@ ApiStatus N(func_80241170_C3ED60)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 313d3de55c..49c46cfe3f 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -981,7 +981,7 @@ ApiStatus N(func_80240B94_C40944)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -1078,7 +1078,7 @@ ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -1334,7 +1334,7 @@ ApiStatus N(func_80242A6C_C4281C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -1633,7 +1633,7 @@ ApiStatus N(func_802438F0_C436A0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = get_variable(script, *args); + NpcAISettings* npcAISettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 43c625aa6e..5e5ac82b9e 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -613,7 +613,7 @@ ApiStatus N(func_8024061C_C471FC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -876,7 +876,7 @@ ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -1151,7 +1151,7 @@ ApiStatus N(func_80242730_C49310)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -1442,7 +1442,7 @@ ApiStatus N(func_80243578_C4A158)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_11/C4D3E0.c b/src/world/area_dgb/dgb_11/C4D3E0.c index ed163384a9..0c08bf7200 100644 --- a/src/world/area_dgb/dgb_11/C4D3E0.c +++ b/src/world/area_dgb/dgb_11/C4D3E0.c @@ -205,7 +205,7 @@ EvtSource N(makeEntities) = SCRIPT({ }); ApiStatus N(func_80240000_C4D3E0)(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(get_variable(NULL, 0xFD050F80)); + Entity* entity = get_entity_by_index(evt_get_variable(NULL, 0xFD050F80)); if (entity == NULL) { return ApiStatus_BLOCK; diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 68b760749d..019575fe71 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -457,7 +457,7 @@ ApiStatus N(func_8024061C_C4FB2C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -564,7 +564,7 @@ ApiStatus N(func_80241464_C50974)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 413ca5c4e5..ec5f48e71c 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -809,7 +809,7 @@ ApiStatus N(func_80240E20_C53360)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -913,7 +913,7 @@ ApiStatus N(func_80241170_C536B0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 2bf11f2fb7..77cec8908f 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -711,7 +711,7 @@ ApiStatus N(func_80240B94_C56AD4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index bc9a3f34a5..1be3b519df 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -2896,7 +2896,7 @@ ApiStatus N(func_80241174_95C374)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -2999,10 +2999,10 @@ ApiStatus N(func_80241470_95C670)(Evt* script, s32 isInitialCall) { // Ok good luck. ApiStatus N(func_802415AC_95C7AC)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -3023,16 +3023,16 @@ ApiStatus N(func_802415AC_95C7AC)(Evt* script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -3063,7 +3063,7 @@ ApiStatus N(func_80241B5C_95CD5C)(Evt* script, s32 isInitialCall) { gPlayerData.quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; gPlayerData.quizzesCorrect++; } else { @@ -3077,12 +3077,12 @@ ApiStatus N(func_80241BE0_95CDE0)(Evt* script, s32 isInitialCall) { EffectInstanceDataThing* effectPtr; if (isInitialCall) { - N(D_8024DFE0) = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), - get_variable(script, EVT_ARRAY(3))); - N(D_8024DFE4) = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), - get_variable(script, EVT_ARRAY(3))); - N(D_8024DFE8) = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), - get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + N(D_8024DFE0) = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), + evt_get_variable(script, EVT_ARRAY(3))); + N(D_8024DFE4) = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), + evt_get_variable(script, EVT_ARRAY(3))); + N(D_8024DFE8) = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), + evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = N(D_8024DFE0)->unk_0C; effectPtr->unk_18 = 0; @@ -3133,12 +3133,12 @@ ApiStatus N(func_80241DF8_95CFF8)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80241EAC_95D0AC)(Evt* script, s32 isInitialCall) { - N(D_8024DFE0)->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + N(D_8024DFE0)->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus N(func_80241EE0_95D0E0)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = N(D_8024DFE0)->unk_0C; switch (var) { @@ -3187,7 +3187,7 @@ ApiStatus N(func_80241F94_95D194)(Evt* script, s32 isInitialCall) { #include "world/common/UnkPartnerFuncs.inc.c" void N(func_80242468_95D668)(void) { - s32 var = get_variable(NULL, N(D_8024DFD8)); + s32 var = evt_get_variable(NULL, N(D_8024DFD8)); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -3218,7 +3218,7 @@ ApiStatus N(func_80242730_95D930)(Evt* script, s32 isInitialCall) { if (*ptr != NULL) { ptr = &N(D_802477E0_9629E0); *ptr = 0; - set_variable(script, *args, N(D_802477E4_9629E4)); + evt_set_variable(script, *args, N(D_802477E4_9629E4)); return ApiStatus_DONE2; } @@ -3228,14 +3228,14 @@ ApiStatus N(func_80242730_95D930)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80242784_95D984)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802477E4_9629E4) = get_variable(script, *args); + N(D_802477E4_9629E4) = evt_get_variable(script, *args); N(D_802477E0_9629E0) = 1; return ApiStatus_DONE2; } ApiStatus N(func_802427BC_95D9BC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -3254,7 +3254,7 @@ ApiStatus N(func_802427BC_95D9BC)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80242858_95DA58)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - Unk_Struct_2* temp_s1 = get_variable(script, *script->ptrReadPos); + Unk_Struct_2* temp_s1 = evt_get_variable(script, *script->ptrReadPos); Unk_Struct_1* ptr; s32 atan_res1, atan_res2; s32 clamp; @@ -3460,10 +3460,10 @@ ApiStatus N(func_802431FC_95E3FC)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80243350_95E550)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; - f32 var1 = get_variable(script, *args++); - f32 var2 = get_variable(script, *args++); - f32 var3 = get_variable(script, *args++); - f32 var4 = get_variable(script, *args++); + f32 var1 = evt_get_variable(script, *args++); + f32 var2 = evt_get_variable(script, *args++); + f32 var3 = evt_get_variable(script, *args++); + f32 var4 = evt_get_variable(script, *args++); f32 temp_f0 = (var4 - var2) / (var3 - var1); if (playerStatus->position.z < ((temp_f0 * playerStatus->position.x) + (var2 - (temp_f0 * var1)))) { diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index cf8bb71285..f9971d1d2f 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -3112,10 +3112,10 @@ ApiStatus N(func_80240300_9694C0)(Evt* script, s32 isInitialCall) { ApiStatus N(func_8024043C_9695FC)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -3136,16 +3136,16 @@ ApiStatus N(func_8024043C_9695FC)(Evt* script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -3176,7 +3176,7 @@ ApiStatus N(func_802409EC_969BAC)(Evt* script, s32 isInitialCall) { gPlayerData.quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; gPlayerData.quizzesCorrect++; } else { @@ -3190,12 +3190,12 @@ ApiStatus N(func_80240A70_969C30)(Evt* script, s32 isInitialCall) { EffectInstanceDataThing* effectPtr; if (isInitialCall) { - N(D_8024EFC0) = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), - get_variable(script, EVT_ARRAY(3))); - N(D_8024EFC4) = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), - get_variable(script, EVT_ARRAY(3))); - N(D_8024EFC8) = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), - get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + N(D_8024EFC0) = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), + evt_get_variable(script, EVT_ARRAY(3))); + N(D_8024EFC4) = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), + evt_get_variable(script, EVT_ARRAY(3))); + N(D_8024EFC8) = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), + evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = N(D_8024EFC0)->freeDelay; // TODO this is wrong effectPtr->unk_18 = 0; @@ -3246,12 +3246,12 @@ ApiStatus N(func_80240C88_969E48)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80240D3C_969EFC)(Evt* script, s32 isInitialCall) { - ((N(temp)*)N(D_8024EFC0))->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + ((N(temp)*)N(D_8024EFC0))->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus N(func_80240D70_969F30)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = N(D_8024EFC0)->freeDelay; switch (var) { @@ -3300,7 +3300,7 @@ ApiStatus N(func_80240E24_969FE4)(Evt* script, s32 isInitialCall) { #include "world/common/UnkPartnerFuncs.inc.c" void N(func_802412F8_96A4B8)(void) { - s32 var = get_variable(NULL, N(D_8024EFB8)); + s32 var = evt_get_variable(NULL, N(D_8024EFB8)); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -3317,13 +3317,13 @@ ApiStatus N(func_80241364_96A524)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80241394_96A554)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); s32 var2 = *args; u8 coins1 = N(D_802475E0_9707A0)[var1]; u8 coins2 = N(D_802475DC_97079C)[var1]; if (playerData->coins < coins1) { - set_variable(script, var2, 1); + evt_set_variable(script, var2, 1); } else { playerData->coins = playerData->coins - coins1; if (playerData->merleeCastsLeft < coins2) { @@ -3344,7 +3344,7 @@ ApiStatus N(func_80241394_96A554)(Evt* script, s32 isInitialCall) { playerData->merleeSpellType = 4; break; } - set_variable(script, var2, 0); + evt_set_variable(script, var2, 0); } return ApiStatus_DONE2; @@ -3414,27 +3414,27 @@ ApiStatus N(func_802416FC_96A8BC)(Evt* script, s32 isInitialCall) { ret = func_8013A704(1); func_8013AA9C(ret, 5, 0xF, 1, 1, 0, 0x800); - set_variable(script, EVT_ARRAY(0), ret); + evt_set_variable(script, EVT_ARRAY(0), ret); ret = func_8013A704(1); func_8013AA9C(ret, 5, 0x10, 1, 1, 0, 0x800); - set_variable(script, EVT_ARRAY(1), ret); + evt_set_variable(script, EVT_ARRAY(1), ret); ret = func_8013A704(1); func_8013AA9C(ret, 5, 0x11, 1, 1, 0, 0x800); - set_variable(script, EVT_ARRAY(2), ret); + evt_set_variable(script, EVT_ARRAY(2), ret); ret = func_8013A704(1); func_8013AA9C(ret, 5, 0x12, 1, 1, 0, 0x800); - set_variable(script, EVT_ARRAY(3), ret); + evt_set_variable(script, EVT_ARRAY(3), ret); - set_variable(script, EVT_ARRAY(7), create_generic_entity_world(N(func_8024240C_96B5CC), N(func_80242EAC_96C06C))); + evt_set_variable(script, EVT_ARRAY(7), create_generic_entity_world(N(func_8024240C_96B5CC), N(func_80242EAC_96C06C))); return ApiStatus_DONE2; } ApiStatus N(func_80241874_96AA34)(Evt* script, s32 isInitialCall) { - func_8013A854(get_variable(script, EVT_ARRAY(0))); - func_8013A854(get_variable(script, EVT_ARRAY(1))); - func_8013A854(get_variable(script, EVT_ARRAY(2))); - func_8013A854(get_variable(script, EVT_ARRAY(3))); - free_generic_entity(get_variable(script, EVT_ARRAY(7))); + func_8013A854(evt_get_variable(script, EVT_ARRAY(0))); + func_8013A854(evt_get_variable(script, EVT_ARRAY(1))); + func_8013A854(evt_get_variable(script, EVT_ARRAY(2))); + func_8013A854(evt_get_variable(script, EVT_ARRAY(3))); + free_generic_entity(evt_get_variable(script, EVT_ARRAY(7))); return ApiStatus_DONE2; } @@ -3515,7 +3515,7 @@ s32 dro_02_func_8024190C_96AACC(D_8024F010_Struct* ptr, Matrix4f matrix) { gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - func_8013AF70(get_variable(N(D_8024EFCC), EVT_ARRAY(0)), &subroutine_arg26, 0x30, &subroutine_arg6); + func_8013AF70(evt_get_variable(N(D_8024EFCC), EVT_ARRAY(0)), &subroutine_arg26, 0x30, &subroutine_arg6); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); @@ -3531,8 +3531,8 @@ s32 dro_02_func_8024190C_96AACC(D_8024F010_Struct* ptr, Matrix4f matrix) { gSPMatrix(gMasterGfxPos++, 0xFFFFFFFF, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - func_8013AF70(get_variable(N(D_8024EFCC), EVT_ARRAY(1)), &subroutine_arg26, 0x30, &subroutine_arg6); - func_8013AF70(get_variable(N(D_8024EFCC), EVT_ARRAY(2)), &subroutine_arg26, 0x30, &subroutine_arg6); + func_8013AF70(evt_get_variable(N(D_8024EFCC), EVT_ARRAY(1)), &subroutine_arg26, 0x30, &subroutine_arg6); + func_8013AF70(evt_get_variable(N(D_8024EFCC), EVT_ARRAY(2)), &subroutine_arg26, 0x30, &subroutine_arg6); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); @@ -3544,7 +3544,7 @@ s32 dro_02_func_8024190C_96AACC(D_8024F010_Struct* ptr, Matrix4f matrix) { gMatrixListPos++; spr_get_player_raster_info(&subroutine_arg2C, ptr->unk_18, ptr->unk_1C); - func_8013AF70(get_variable(N(D_8024EFCC), EVT_ARRAY(3)), subroutine_arg2C, subroutine_arg2D, subroutine_arg2E, + func_8013AF70(evt_get_variable(N(D_8024EFCC), EVT_ARRAY(3)), subroutine_arg2C, subroutine_arg2D, subroutine_arg2E, subroutine_arg2F, -(subroutine_arg2E / 2), subroutine_arg2F / 2, 0xFF, &subroutine_arg26, 0x10, &subroutine_arg6); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); @@ -3563,8 +3563,8 @@ void N(func_80242214_96B3D4)(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg Matrix4f spA0; guPositionF(&spA0, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE, - get_variable(*CC_ptr, EVT_ARRAY(4)), get_variable(*CC_ptr, EVT_ARRAY(5)), - get_variable(*CC_ptr, EVT_ARRAY(6))); + evt_get_variable(*CC_ptr, EVT_ARRAY(4)), evt_get_variable(*CC_ptr, EVT_ARRAY(5)), + evt_get_variable(*CC_ptr, EVT_ARRAY(6))); F010_ptr = ({ D_8024F010_Struct* a = &N(D_8024F010); &a[arg0]; }); guTranslateF(&sp60, F010_ptr->unk_04, F010_ptr->unk_08, F010_ptr->unk_0C); @@ -3586,7 +3586,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { N(temp)** effect2; N(temp)** effect3; EffectInstanceDataThing* effectPtr; - s32 var = get_variable(N(D_8024EFCC), EVT_ARRAY(9)); + s32 var = evt_get_variable(N(D_8024EFCC), EVT_ARRAY(9)); s32 i, j, x; f32 subroutine_arg6; f32 subroutine_arg7; @@ -3637,7 +3637,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { switch (var) { case 0: N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 1); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 1); N(D_8024F010)[0].unk_00 = 1; N(D_8024F010)[0].unk_04 = -200.0f; @@ -3679,7 +3679,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { gPlayerStatus.position.y = -1000.0f; } if (N(D_8024EF88) == 0x14) { - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 2); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 2); N(D_8024EF88) = 0; } break; @@ -3702,7 +3702,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { N(D_8024EF88)++; if (N(D_8024EF88) == 0xA) { N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 4); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 4); } break; @@ -3719,7 +3719,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { N(D_8024EF88)++; if (N(D_8024EF88) == 0x14) { N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 5); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 5); sfx_play_sound_with_params(0x203, 0, 0x18, 0); } break; @@ -3735,7 +3735,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { } if (N(D_8024EF88) == 0xA) { N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 6); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 6); sfx_play_sound_with_params(0x203, 0, 0x40, 0); } break; @@ -3751,7 +3751,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { } if (N(D_8024EF88) == 0xA) { N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 7); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 7); sfx_play_sound_with_params(0x203, 0, 0x68, 0); } break; @@ -3767,7 +3767,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { } if (N(D_8024EF88) == 0xA) { N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 8); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 8); } break; @@ -3778,7 +3778,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { N(D_8024EF88)++; if (N(D_8024EF88) == 0xA) { N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 9); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 9); } break; @@ -3795,7 +3795,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { N(D_8024EF88)++; if (N(D_8024EF88) == 0xA) { N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 10); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 10); } break; @@ -3822,7 +3822,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { N(D_8024F010)[0].unk_10 = 180.0f; N(D_8024F010)[1].unk_08 = 68.0f; N(D_8024F010)[1].unk_10 = 180.0f; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 0xC); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 0xC); gPauseMenuTabs[0].unk_00 = 0; N(D_8024EF84) = 1.0f; N(func_80242214_96B3D4)(1, &subroutine_arg12, &subroutine_arg13, &subroutine_arg14, &subroutine_arg15); @@ -3873,7 +3873,7 @@ void func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { if (N(D_8024F010)[1].unk_08 < -5.0f) { N(D_8024F010)[1].unk_08 = -5.0f; N(D_8024EF88) = 0; - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 0xD); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 0xD); N(D_8024F010)[0].unk_00 = 0; N(D_8024F010)[1].unk_00 = 0; N(func_80242214_96B3D4)(1, &subroutine_arg1A, &subroutine_arg1B, &subroutine_arg1C, &subroutine_arg1D); @@ -3900,17 +3900,17 @@ void N(func_80242EAC_96C06C)(Evt* script, s32 isInitialCall) { u32 temp_s1; guPositionF(&sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, SPRITE_WORLD_SCALE, - get_variable(N(D_8024EFCC), EVT_ARRAY(4)), get_variable(N(D_8024EFCC), EVT_ARRAY(5)), - get_variable(N(D_8024EFCC), EVT_ARRAY(6))); + evt_get_variable(N(D_8024EFCC), EVT_ARRAY(4)), evt_get_variable(N(D_8024EFCC), EVT_ARRAY(5)), + evt_get_variable(N(D_8024EFCC), EVT_ARRAY(6))); temp_s1 = N(func_8024190C_96AACC)(&N(D_8024F010)[0], &sp20); N(func_8024190C_96AACC)(&N(D_8024F010)[1], &sp20); N(func_8024190C_96AACC)(&N(D_8024F010)[2], &sp20); if ((N(D_8024F010)[0].unk_00 == 2) && ((temp_s1 - 1) < 2)) { - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 3); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 3); } if ((N(D_8024F010)[0].unk_00 == 3) && ((temp_s1 - 1) < 2)) { - set_variable(N(D_8024EFCC), EVT_ARRAY(9), 0xB); + evt_set_variable(N(D_8024EFCC), EVT_ARRAY(9), 0xB); } } @@ -3937,7 +3937,7 @@ ApiStatus N(func_802432C0_96C480)(Evt* script, s32 isInitialCall) { if (N(D_80248780_971940) != NULL) { N(D_80248780_971940) = 0; - set_variable(script, *args, N(D_80248784_971944)); + evt_set_variable(script, *args, N(D_80248784_971944)); return ApiStatus_DONE2; } @@ -3947,14 +3947,14 @@ ApiStatus N(func_802432C0_96C480)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80243314_96C4D4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80248784_971944) = get_variable(script, *args); + N(D_80248784_971944) = evt_get_variable(script, *args); N(D_80248780_971940) = 1; return ApiStatus_DONE2; } ApiStatus N(func_8024334C_96C50C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -3973,7 +3973,7 @@ ApiStatus N(func_8024334C_96C50C)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802433E8_96C5A8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_end/end_00/DF6A20.c b/src/world/area_end/end_00/DF6A20.c index a460e9fd67..73f66f281a 100644 --- a/src/world/area_end/end_00/DF6A20.c +++ b/src/world/area_end/end_00/DF6A20.c @@ -46,15 +46,15 @@ INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242680_DF9080); ApiStatus func_80242744_DF9144(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); s32 a1 = *args++; - set_variable(script, a1, _heap_malloc(&gSpriteHeapPtr, var1)); + evt_set_variable(script, a1, _heap_malloc(&gSpriteHeapPtr, var1)); return ApiStatus_DONE2; } ApiStatus func_802427A4_DF91A4(Evt* script, s32 isInitialCall) { - _heap_free(&gSpriteHeapPtr, get_variable(script, *script->ptrReadPos)); + _heap_free(&gSpriteHeapPtr, evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -71,8 +71,8 @@ ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) { f32 newShadowScale; Bytecode* args = script->ptrReadPos; - npcID = get_variable(script, *args++); - newShadowScale = get_float_variable(script, *args++); + npcID = evt_get_variable(script, *args++); + newShadowScale = evt_get_float_variable(script, *args++); resolve_npc(script, npcID)->shadowScale = newShadowScale; return ApiStatus_DONE2; @@ -83,7 +83,7 @@ ApiStatus func_80242898_DF9298(Evt* script, s32 isInitialCall) { Npc** npc = &script->functionTemp[1]; if (isInitialCall) { - *npc = get_npc_unsafe(get_variable(script, *args++)); + *npc = get_npc_unsafe(evt_get_variable(script, *args++)); } (*npc)->pos.x += 0.6666667f; diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index d881d4e474..b373389ff6 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -2108,7 +2108,7 @@ ApiStatus N(func_80240BD4_C9EAF4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_flo/flo_00/C9EE30.c b/src/world/area_flo/flo_00/C9EE30.c index b527359a11..e5d4340c38 100644 --- a/src/world/area_flo/flo_00/C9EE30.c +++ b/src/world/area_flo/flo_00/C9EE30.c @@ -5,20 +5,20 @@ ApiStatus N(func_80240F10_C9EE30)(Evt* script, s32 isInitialCall) { s32 var1 = *args++; s32 var2 = *args++; - set_variable(script, var1, gPlayerStatus.spriteFacingAngle); - set_variable(script, var2, gPlayerStatus.targetYaw); + evt_set_variable(script, var1, gPlayerStatus.spriteFacingAngle); + evt_set_variable(script, var2, gPlayerStatus.targetYaw); return ApiStatus_DONE2; } ApiStatus N(func_80240F80_C9EEA0)(Evt* script, s32 isInitialCall) { - f32 var1 = get_variable(NULL, script->varTable[2]); + f32 var1 = evt_get_variable(NULL, script->varTable[2]); f32 dist = dist2D(-83.0f, 87.0f, script->varTable[9], script->varTable[11]); f32 clamped = clamp_angle(atan2(-83.0f, 87.0f, script->varTable[9], script->varTable[11]) - var1); var1 = sin_deg(clamped); gPlayerStatus.position.x = (dist * var1) + -83.0f; - gPlayerStatus.position.y = get_variable(NULL, script->varTable[10]) + get_variable(NULL, script->varTable[3]); + gPlayerStatus.position.y = evt_get_variable(NULL, script->varTable[10]) + evt_get_variable(NULL, script->varTable[3]); var1 = cos_deg(clamped); gPlayerStatus.position.z = 87.0f - (dist * var1); @@ -27,13 +27,13 @@ ApiStatus N(func_80240F80_C9EEA0)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802410B4_C9EFD4)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_by_index(0); - f32 temp_f20 = get_variable(NULL, script->varTable[2]); + f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]); f32 dist = dist2D(-83.0f, 87.0f, script->varTable[12], script->varTable[14]); f32 clamped = clamp_angle(atan2(-83.0f, 87.0f, script->varTable[12], script->varTable[14]) - temp_f20); temp_f20 = sin_deg(clamped); npc->pos.x = (dist * temp_f20) + -83.0f; - npc->pos.y = get_variable(NULL, script->varTable[13]) + get_variable(NULL, script->varTable[3]); + npc->pos.y = evt_get_variable(NULL, script->varTable[13]) + evt_get_variable(NULL, script->varTable[3]); temp_f20 = cos_deg(clamped); npc->pos.z = 87.0f - (dist * temp_f20); diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index 6fd93a960d..76d9411b7a 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -9,7 +9,7 @@ extern s32 D_8008EF20[11][4]; #include "world/common/UnkFunc17.inc.c" ApiStatus N(func_8024003C_CAED7C)(Evt* script, s32 isInitialCall) { - entity_upgrade_block_hide_content(get_variable(script, *script->ptrReadPos)); + entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -155,7 +155,7 @@ ApiStatus N(func_80240600_CAF340)(Evt* script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 35142daf90..f5f26d6899 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -1096,7 +1096,7 @@ ApiStatus N(func_8024150C_CB024C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -1168,7 +1168,7 @@ ApiStatus N(func_80241970_CB06B0)(Evt* script, s32 isInitialCall) { if (N(D_80243088_CB1DC8)) { N(D_80243088_CB1DC8) = FALSE; - set_variable(script, *args, N(D_8024308C_CB1DCC)); + evt_set_variable(script, *args, N(D_8024308C_CB1DCC)); return ApiStatus_DONE2; } @@ -1178,14 +1178,14 @@ ApiStatus N(func_80241970_CB06B0)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802419C4_CB0704)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_8024308C_CB1DCC) = get_variable(script, *args); + N(D_8024308C_CB1DCC) = evt_get_variable(script, *args); N(D_80243088_CB1DC8) = TRUE; return ApiStatus_DONE2; } ApiStatus N(func_802419FC_CB073C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -1204,10 +1204,10 @@ ApiStatus N(func_802419FC_CB073C)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80241A98_CB07D8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemIdx = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 itemIdx = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); ItemEntity* item = get_item_entity(itemIdx); item->position.x = var1; @@ -1218,7 +1218,7 @@ ApiStatus N(func_80241A98_CB07D8)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80241B5C_CB089C)(Evt* script, s32 isInitialCall) { - s32 itemId = get_variable(script, *script->ptrReadPos); + s32 itemId = evt_get_variable(script, *script->ptrReadPos); StaticItem* item = &gItemTable[itemId]; if (itemId == ITEM_YUMMY_MEAL) { diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index a5f6443035..ce878d0490 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -181,7 +181,7 @@ ApiStatus N(func_8024162C_CB662C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_flo/flo_10/CB9200.c b/src/world/area_flo/flo_10/CB9200.c index 1cbae522dc..9950615343 100644 --- a/src/world/area_flo/flo_10/CB9200.c +++ b/src/world/area_flo/flo_10/CB9200.c @@ -1,7 +1,7 @@ #include "flo_10.h" s32 N(func_80240000_CB9200)(void) { - if (get_variable(NULL, EVT_STORY_PROGRESS) <= 0x30) { + if (evt_get_variable(NULL, EVT_STORY_PROGRESS) <= 0x30) { return MESSAGE_ID(0x19, 0x0119); } return MESSAGE_ID(0x19, 0x011A); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index af9b048534..d2ff7290f6 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -503,7 +503,7 @@ ApiStatus N(func_802405C0_CC13F0)(Evt* script, s32 isInitialCall) { if (N(D_80241850_CC2680)) { N(D_80241850_CC2680) = FALSE; - set_variable(script, *args, N(D_80241854_CC2684)); + evt_set_variable(script, *args, N(D_80241854_CC2684)); return ApiStatus_DONE2; } @@ -513,14 +513,14 @@ ApiStatus N(func_802405C0_CC13F0)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80240614_CC1444)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241854_CC2684) = get_variable(script, *args); + N(D_80241854_CC2684) = evt_get_variable(script, *args); N(D_80241850_CC2680) = TRUE; return ApiStatus_DONE2; } ApiStatus N(func_8024064C_CC147C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index f11b08bff8..1c1e1d198e 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -1365,7 +1365,7 @@ ApiStatus N(func_802414D0_CC4CE0)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -1568,7 +1568,7 @@ ApiStatus N(func_80241DB8_CC55C8)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); f32 temp_f4; f32 dist; @@ -1710,7 +1710,7 @@ ApiStatus N(func_8024262C_CC5E3C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); s32 var; territory.unk_00 = 0; @@ -1846,7 +1846,7 @@ ApiStatus N(func_80242A6C_CC627C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); s32 var; u32 x, y, z; f32 x2, y2, z2, w2; @@ -2067,7 +2067,7 @@ ApiStatus N(func_802433C0_CC6BD0)(Evt* script, s32 isInitialCall) { s16 param1; s16 param2; - script->functionTemp[1] = get_variable(script, *script->ptrReadPos); + script->functionTemp[1] = evt_get_variable(script, *script->ptrReadPos); if (isInitialCall) { script->functionTemp[0] = 0; diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index 2e02407193..deda84f0e4 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -567,23 +567,23 @@ ApiStatus N(func_802403D4_CCB6E4)(Evt* script, s32 isInitialCall) { } script->varTable[14] = 1; - set_variable(NULL, EVT_MAP_VAR(0), get_npc_unsafe(-4)->flags); + evt_set_variable(NULL, EVT_MAP_VAR(0), get_npc_unsafe(-4)->flags); return ApiStatus_DONE2; } ApiStatus N(func_8024042C_CCB73C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(-4); - npc->flags = get_variable(NULL, EVT_MAP_VAR(0)); + npc->flags = evt_get_variable(NULL, EVT_MAP_VAR(0)); return ApiStatus_DONE2; } ApiStatus N(func_8024046C_CCB77C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - script->functionTemp[0] = get_variable(script, *args++); - script->functionTemp[1] = get_variable(script, *args++); - script->functionTemp[2] = get_variable(script, *args++); + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -657,7 +657,7 @@ void N(func_802407D4_CCBAE4)(void) { gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(1)); - if (get_variable(NULL, EVT_AREA_FLAG(36)) != 0) { + if (evt_get_variable(NULL, EVT_AREA_FLAG(36)) != 0) { if (N(D_80243B18_CCEE28) > 90) { N(D_80243B18_CCEE28) -= 360; } diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 4c9efeee97..574c222734 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -490,7 +490,7 @@ ApiStatus N(func_80241E1C_CCD12C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -557,7 +557,7 @@ ApiStatus N(func_80242234_CCD544)(Evt* script, s32 isInitialCall) { if (N(D_802445FC_CCF90C)) { N(D_802445FC_CCF90C) = FALSE; - set_variable(script, *args, N(D_80244600_CCF910)); + evt_set_variable(script, *args, N(D_80244600_CCF910)); return ApiStatus_DONE2; } @@ -567,14 +567,14 @@ ApiStatus N(func_80242234_CCD544)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80242288_CCD598)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80244600_CCF910) = get_variable(script, *args); + N(D_80244600_CCF910) = evt_get_variable(script, *args); N(D_802445FC_CCF90C) = TRUE; return ApiStatus_DONE2; } ApiStatus N(func_802422C0_CCD5D0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_flo/flo_14/CCD670.c b/src/world/area_flo/flo_14/CCD670.c index 0cf417c6f1..724a50ccb0 100644 --- a/src/world/area_flo/flo_14/CCD670.c +++ b/src/world/area_flo/flo_14/CCD670.c @@ -3,6 +3,6 @@ ApiStatus N(func_80242360_CCD670)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; - set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); + evt_set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index ad840931d7..fb601a9821 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -416,7 +416,7 @@ EvtSource N(makeEntities) = SCRIPT({ #include "world/common/UnkFunc17.inc.c" ApiStatus N(func_8024011C_CD1F4C)(Evt* script, s32 isInitialCall) { - entity_upgrade_block_hide_content(get_variable(script, *script->ptrReadPos)); + entity_upgrade_block_hide_content(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } @@ -562,7 +562,7 @@ ApiStatus N(func_802406E0_CD2510)(Evt* script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 11b8087857..7415d54f23 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -518,7 +518,7 @@ ApiStatus N(func_8024215C_CD3F8C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -627,7 +627,7 @@ ApiStatus N(func_80242754_CD4584)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_flo/flo_17/CD7320.c b/src/world/area_flo/flo_17/CD7320.c index 70977d185b..36340795c4 100644 --- a/src/world/area_flo/flo_17/CD7320.c +++ b/src/world/area_flo/flo_17/CD7320.c @@ -3,6 +3,6 @@ ApiStatus N(func_80240040_CD7320)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; - set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); + evt_set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 8a71b25155..ca20849bfb 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -786,7 +786,7 @@ ApiStatus N(func_8024137C_CD865C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -989,7 +989,7 @@ ApiStatus N(func_80241C64_CD8F44)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); f32 temp_f4; f32 dist; @@ -1131,7 +1131,7 @@ ApiStatus N(func_802424D8_CD97B8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); s32 var; territory.unk_00 = 0; @@ -1267,7 +1267,7 @@ ApiStatus N(func_80242918_CD9BF8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); s32 var; u32 x, y, z; f32 x2, y2, z2, w2; diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index d50091812d..c9e06bbd31 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -673,21 +673,21 @@ ApiStatus N(func_8024030C_CE39FC)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80240340_CE3A30)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a1 = *args++; - s32 var0 = get_variable(script, a1); + s32 var0 = evt_get_variable(script, a1); s32 a2 = *args++; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - f32 temp = (get_float_variable(script, *args++) / 180.0f) * PI; + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + f32 temp = (evt_get_float_variable(script, *args++) / 180.0f) * PI; f32 diff = fabsf(var2 - var1) / 2; if (var4 != 0 && var3 < var0) { var0 = var3; - set_variable(script, a1, var3); + evt_set_variable(script, a1, var3); } - set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); + evt_set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); return ApiStatus_DONE2; } @@ -697,20 +697,20 @@ ApiStatus N(func_802404D0_CE3BC0)(Evt* script, s32 isInitialCall) { s32 var1 = *args++; s32 var2 = *args++; - set_variable(script, var1, gPlayerStatus.spriteFacingAngle); - set_variable(script, var2, gPlayerStatus.targetYaw); + evt_set_variable(script, var1, gPlayerStatus.spriteFacingAngle); + evt_set_variable(script, var2, gPlayerStatus.targetYaw); return ApiStatus_DONE2; } ApiStatus N(func_80240540_CE3C30)(Evt* script, s32 isInitialCall) { - f32 temp_f20 = get_variable(NULL, script->varTable[2]); + f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]); f32 dist = dist2D(0.0f, 0.0f, script->varTable[9], script->varTable[11]); f32 temp_f22 = clamp_angle(atan2(0.0f, 0.0f, script->varTable[9], script->varTable[11]) - temp_f20); temp_f20 = sin_deg(temp_f22); gPlayerStatus.position.x = (dist * temp_f20) + 0.0f; - gPlayerStatus.position.y = get_variable(NULL, script->varTable[10]) + get_variable(NULL, script->varTable[3]); + gPlayerStatus.position.y = evt_get_variable(NULL, script->varTable[10]) + evt_get_variable(NULL, script->varTable[3]); temp_f20 = cos_deg(temp_f22); gPlayerStatus.position.z = 0.0f - (dist * temp_f20); @@ -719,13 +719,13 @@ ApiStatus N(func_80240540_CE3C30)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80240660_CE3D50)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_by_index(0); - f32 temp_f20 = get_variable(NULL, script->varTable[2]); + f32 temp_f20 = evt_get_variable(NULL, script->varTable[2]); f32 dist = dist2D(0.0f, 0.0f, script->varTable[12], script->varTable[14]); f32 clamped = clamp_angle(atan2(0.0f, 0.0f, script->varTable[12], script->varTable[14]) - temp_f20); temp_f20 = sin_deg(clamped); npc->pos.x = (dist * temp_f20) + 0.0f; - npc->pos.y = get_variable(NULL, script->varTable[13]) + get_variable(NULL, script->varTable[3]); + npc->pos.y = evt_get_variable(NULL, script->varTable[13]) + evt_get_variable(NULL, script->varTable[3]); temp_f20 = cos_deg(clamped); npc->pos.z = 0.0f - (dist * temp_f20); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 9882e1eb4f..fe66b34013 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -114,17 +114,17 @@ ApiStatus N(func_8024004C_CE674C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)heap_malloc(sizeof(N(Unk_effect_struct))); script->varTable[0] = ptr; - set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_3C = get_variable(script, *args++); - ptr->unk_0C = get_float_variable(script, *args++); - ptr->unk_10 = get_float_variable(script, *args++); - ptr->unk_14 = get_float_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_1C = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + 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++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; @@ -236,7 +236,7 @@ ApiStatus N(func_802401AC_CE68AC)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_802405BC_CE6CBC)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)script->varTable[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; @@ -248,11 +248,11 @@ ApiStatus N(func_802405FC_CE6CFC)(Evt* script, s32 isInitialCall) { if (isInitialCall) { N(Unk_effect_struct)* ptr = (N(Unk_effect_struct)*)heap_malloc(sizeof(N(Unk_effect_struct))); script->varTable[0] = ptr; - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; ptr->unk_54->unk_0C->unk_20 = 0; diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index edc9151602..fe417da83a 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -468,7 +468,7 @@ ApiStatus N(func_8024026C_CEE4CC)(Evt* script, s32 isInitialCall) { if (N(D_8024130C_CEF56C)) { N(D_8024130C_CEF56C) = FALSE; - set_variable(script, *args, N(D_80241310_CEF570)); + evt_set_variable(script, *args, N(D_80241310_CEF570)); return ApiStatus_DONE2; } @@ -478,14 +478,14 @@ ApiStatus N(func_8024026C_CEE4CC)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802402C0_CEE520)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241310_CEF570) = get_variable(script, *args); + N(D_80241310_CEF570) = evt_get_variable(script, *args); N(D_8024130C_CEF56C) = TRUE; return ApiStatus_DONE2; } ApiStatus N(func_802402F8_CEE558)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -516,7 +516,7 @@ ApiStatus N(func_80240728_CEE988)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); s32 var; territory.unk_00 = 0; @@ -648,10 +648,10 @@ ApiStatus N(func_80240728_CEE988)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80240B68_CEEDC8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemIdx = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 itemIdx = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); ItemEntity* item = get_item_entity(itemIdx); item->position.x = var1; @@ -662,7 +662,7 @@ ApiStatus N(func_80240B68_CEEDC8)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80240C2C_CEEE8C)(Evt* script, s32 isInitialCall) { - s32 itemId = get_variable(script, *script->ptrReadPos); + s32 itemId = evt_get_variable(script, *script->ptrReadPos); StaticItem* item = &gItemTable[itemId]; if (itemId == ITEM_YUMMY_MEAL) { diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 4a67770fc2..760bcb78b2 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -679,7 +679,7 @@ ApiStatus N(func_8024134C_CF3F1C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -788,7 +788,7 @@ ApiStatus N(func_80241944_CF4514)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -855,7 +855,7 @@ ApiStatus N(func_80241D58_CF4928)(Evt* script, s32 isInitialCall) { if (N(D_80242ACC_CF569C)) { N(D_80242ACC_CF569C) = FALSE; - set_variable(script, *args, N(D_80242AD0_CF56A0)); + evt_set_variable(script, *args, N(D_80242AD0_CF56A0)); return ApiStatus_DONE2; } @@ -865,14 +865,14 @@ ApiStatus N(func_80241D58_CF4928)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80241DAC_CF497C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80242AD0_CF56A0) = get_variable(script, *args); + N(D_80242AD0_CF56A0) = evt_get_variable(script, *args); N(D_80242ACC_CF569C) = TRUE; return ApiStatus_DONE2; } ApiStatus N(func_80241DE4_CF49B4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -891,10 +891,10 @@ ApiStatus N(func_80241DE4_CF49B4)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80241E80_CF4A50)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemIdx = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 itemIdx = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); ItemEntity* item = get_item_entity(itemIdx); item->position.x = var1; @@ -905,7 +905,7 @@ ApiStatus N(func_80241E80_CF4A50)(Evt* script, s32 isInitialCall) { } ApiStatus N(func_80241F44_CF4B14)(Evt* script, s32 isInitialCall) { - s32 itemId = get_variable(script, *script->ptrReadPos); + s32 itemId = evt_get_variable(script, *script->ptrReadPos); StaticItem* item = &gItemTable[itemId]; if (itemId == ITEM_YUMMY_MEAL) { diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 352eee2efc..2057000982 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -39,7 +39,7 @@ ApiStatus N(func_802422FC_A1851C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index dc06a3c092..691c9b6e56 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -41,7 +41,7 @@ ApiStatus N(func_80241FBC_A1D0BC)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -145,10 +145,10 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0); /* ApiStatus N(func_802425E0_A1D6E0)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -169,16 +169,16 @@ ApiStatus N(func_802425E0_A1D6E0)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -213,7 +213,7 @@ ApiStatus N(func_80242B90_A1DC90)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -232,9 +232,9 @@ ApiStatus N(func_80242C14_A1DD14)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -291,7 +291,7 @@ ApiStatus N(func_80242E2C_A1DF2C)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242EE0_A1DFE0); /* ApiStatus N(func_80242EE0_A1DFE0)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -299,7 +299,7 @@ ApiStatus N(func_80242EE0_A1DFE0)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F14_A1E014); /* ApiStatus N(func_80242F14_A1E014)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -360,7 +360,7 @@ ApiStatus N(func_80242FC8_A1E0C8)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C); /* void N(func_8024349C_A1E59C)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); diff --git a/src/world/area_hos/hos_04/A27AA0.c b/src/world/area_hos/hos_04/A27AA0.c index d81e11966c..c8cd7d629b 100644 --- a/src/world/area_hos/hos_04/A27AA0.c +++ b/src/world/area_hos/hos_04/A27AA0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240BD0_A27AA0); INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E40_A27D10); /* ApiStatus N(func_80240E40_A27D10)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ diff --git a/src/world/area_hos/hos_05/A2EC30.c b/src/world/area_hos/hos_05/A2EC30.c index 20be35f7e0..14f7d305c5 100644 --- a/src/world/area_hos/hos_05/A2EC30.c +++ b/src/world/area_hos/hos_05/A2EC30.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_802449F0_A2EC30); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C60_A2EEA0); /* ApiStatus N(func_80244C60_A2EEA0)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index 047995b25f..bcefe7fd78 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -42,7 +42,7 @@ ApiStatus N(func_80240654_A39B34)(Evt* script, s32 isInitialCall) { if (N(D_80242C6C_A3C14C)) { N(D_80242C6C_A3C14C) = FALSE; - set_variable(script, *args, N(D_80242C70_A3C150)); + evt_set_variable(script, *args, N(D_80242C70_A3C150)); return ApiStatus_DONE2; } @@ -55,7 +55,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88); ApiStatus N(func_802406A8_A39B88)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80242C70_A3C150) = get_variable(script, *args); + N(D_80242C70_A3C150) = evt_get_variable(script, *args); N(D_80242C6C_A3C14C) = TRUE; return ApiStatus_DONE2; } @@ -65,7 +65,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0); /* ApiStatus N(func_802406E0_A39BC0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index f246f656a8..e2b20bc96f 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -15,7 +15,7 @@ ApiStatus N(func_80240F7C_A3A45C)(Evt* script, s32 isInitialCall) { if (N(D_802445D0_A3DAB0)) { N(D_802445D0_A3DAB0) = FALSE; - set_variable(script, *args, N(D_802445D4_A3DAB4)); + evt_set_variable(script, *args, N(D_802445D4_A3DAB4)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0); ApiStatus N(func_80240FD0_A3A4B0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802445D4_A3DAB4) = get_variable(script, *args); + N(D_802445D4_A3DAB4) = evt_get_variable(script, *args); N(D_802445D0_A3DAB0) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008_A3A4E8); /* ApiStatus N(func_80241008_A3A4E8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index 63a2064d1a..cb7f0cb793 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -12,7 +12,7 @@ static char* N(exit_str_3) = ""; INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024003C_988B9C); /* ApiStatus N(func_8024003C_988B9C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -51,7 +51,7 @@ ApiStatus N(func_80240600_989160)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_isk/isk_16/9951F0.c b/src/world/area_isk/isk_16/9951F0.c index 7d0e0dd995..34664dc52d 100644 --- a/src/world/area_isk/isk_16/9951F0.c +++ b/src/world/area_isk/isk_16/9951F0.c @@ -18,17 +18,17 @@ ApiStatus N(func_8024004C_99523C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_3C = get_variable(script, *args++); - ptr->unk_0C = get_float_variable(script, *args++); - ptr->unk_10 = get_float_variable(script, *args++); - ptr->unk_14 = get_float_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_1C = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + 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++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; @@ -49,7 +49,7 @@ static char* N(exit_str_1) = "isk_19"; INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802405BC_9957AC); /* ApiStatus N(func_802405BC_9957AC)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); arn_07_struct* ptr = script->varTable[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; @@ -64,11 +64,11 @@ ApiStatus N(func_802405FC_9957EC)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; ptr->unk_54->unk_0C->unk_20 = 0; diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index 18d58bdbd7..613f5a14a8 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -9,7 +9,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024032C_91E89C); /* ApiStatus N(func_8024032C_91E89C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -48,7 +48,7 @@ ApiStatus N(func_802408F0_91EE60)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c index a713e4f5a4..8e11fde9da 100644 --- a/src/world/area_iwa/iwa_10/91F5A0.c +++ b/src/world/area_iwa/iwa_10/91F5A0.c @@ -17,7 +17,7 @@ ApiStatus N(func_802413E0_91F950)(Evt* script, s32 isInitialCall) { if (N(D_8024626C_9247DC)) { N(D_8024626C_9247DC) = FALSE; - set_variable(script, *args, N(D_80246270_9247E0)); + evt_set_variable(script, *args, N(D_80246270_9247E0)); return ApiStatus_DONE2; } @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434_91F9A4); ApiStatus N(func_80241434_91F9A4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80246270_9247E0) = get_variable(script, *args); + N(D_80246270_9247E0) = evt_get_variable(script, *args); N(D_8024626C_9247DC) = TRUE; return ApiStatus_DONE2; } @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_8024146C_91F9DC); /* ApiStatus N(func_8024146C_91F9DC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index d9a1a94daf..b3018c8afc 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -46,7 +46,7 @@ ApiStatus N(func_80240738_B20C78)(Evt* script, s32 isInitialCall) { if (N(D_8024242C_B2296C)) { N(D_8024242C_B2296C) = FALSE; - set_variable(script, *args, N(D_80242430_B22970)); + evt_set_variable(script, *args, N(D_80242430_B22970)); return ApiStatus_DONE2; } @@ -59,7 +59,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C_B20CCC); ApiStatus N(func_8024078C_B20CCC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80242430_B22970) = get_variable(script, *args); + N(D_80242430_B22970) = evt_get_variable(script, *args); N(D_8024242C_B2296C) = TRUE; return ApiStatus_DONE2; } @@ -69,7 +69,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802407C4_B20D04); /* ApiStatus N(func_802407C4_B20D04)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index f8180db77e..986ba62209 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -32,7 +32,7 @@ ApiStatus N(func_80240FC4_B2D434)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -126,7 +126,7 @@ ApiStatus N(func_802414EC_B2D95C)(Evt* script, s32 isInitialCall) { if (N(D_80243048_B2F4B8)) { N(D_80243048_B2F4B8) = FALSE; - set_variable(script, *args, N(D_8024304C_B2F4BC)); + evt_set_variable(script, *args, N(D_8024304C_B2F4BC)); return ApiStatus_DONE2; } @@ -139,7 +139,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0); ApiStatus N(func_80241540_B2D9B0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_8024304C_B2F4BC) = get_variable(script, *args); + N(D_8024304C_B2F4BC) = evt_get_variable(script, *args); N(D_80243048_B2F4B8) = TRUE; return ApiStatus_DONE2; } @@ -149,7 +149,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8); /* ApiStatus N(func_80241578_B2D9E8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -196,10 +196,10 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0); /* ApiStatus N(func_80241750_B2DBC0)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -220,16 +220,16 @@ ApiStatus N(func_80241750_B2DBC0)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -264,7 +264,7 @@ ApiStatus N(func_80241D00_B2E170)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -283,9 +283,9 @@ ApiStatus N(func_80241D84_B2E1F4)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -342,7 +342,7 @@ ApiStatus N(func_80241F9C_B2E40C)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242050_B2E4C0); /* ApiStatus N(func_80242050_B2E4C0)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -350,7 +350,7 @@ ApiStatus N(func_80242050_B2E4C0)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242084_B2E4F4); /* ApiStatus N(func_80242084_B2E4F4)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -411,7 +411,7 @@ ApiStatus N(func_80242138_B2E5A8)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C); /* void N(func_8024260C_B2EA7C)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index e6d7aac7a6..c0011f3986 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -55,7 +55,7 @@ ApiStatus N(func_802411B4_B35D84)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -171,7 +171,7 @@ ApiStatus N(func_802419D8_B365A8)(Evt* script, s32 isInitialCall) { if (N(D_80247444_B3C014)) { N(D_80247444_B3C014) = FALSE; - set_variable(script, *args, N(D_80247448_B3C018)); + evt_set_variable(script, *args, N(D_80247448_B3C018)); return ApiStatus_DONE2; } @@ -184,7 +184,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC); ApiStatus N(func_80241A2C_B365FC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80247448_B3C018) = get_variable(script, *args); + N(D_80247448_B3C018) = evt_get_variable(script, *args); N(D_80247444_B3C014) = TRUE; return ApiStatus_DONE2; } @@ -194,7 +194,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A64_B36634); /* ApiStatus N(func_80241A64_B36634)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -216,7 +216,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0); /* ApiStatus N(func_80241B00_B366D0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -263,10 +263,10 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8); /* ApiStatus N(func_80241CD8_B368A8)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -287,16 +287,16 @@ ApiStatus N(func_80241CD8_B368A8)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -331,7 +331,7 @@ ApiStatus N(func_80242288_B36E58)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -350,9 +350,9 @@ ApiStatus N(func_8024230C_B36EDC)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -409,7 +409,7 @@ ApiStatus N(func_80242524_B370F4)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802425D8_B371A8); /* ApiStatus N(func_802425D8_B371A8)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -417,7 +417,7 @@ ApiStatus N(func_802425D8_B371A8)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024260C_B371DC); /* ApiStatus N(func_8024260C_B371DC)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -478,7 +478,7 @@ ApiStatus N(func_802426C0_B37290)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764); /* void N(func_80242B94_B37764)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); diff --git a/src/world/area_jan/jan_06/B52B40.c b/src/world/area_jan/jan_06/B52B40.c index 6bb6004260..ef46ab2ddb 100644 --- a/src/world/area_jan/jan_06/B52B40.c +++ b/src/world/area_jan/jan_06/B52B40.c @@ -5,9 +5,9 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52B40", func_80240310_B52B40); ApiStatus N(func_80240310_B52B40)(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - script->functionTemp[0] = get_variable(script, *args++); - script->functionTemp[1] = get_variable(script, *args++); - script->functionTemp[2] = get_variable(script, *args++); + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index 864be85b24..a462e6da89 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024069C_B5E94C); /* ApiStatus N(func_8024069C_B5E94C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -46,7 +46,7 @@ ApiStatus N(func_80240C60_B5EF10)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 72dcf20fed..c17f77cb80 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -35,7 +35,7 @@ ApiStatus N(func_80240B94_B84D14)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 5a5debb798..42d5a4c915 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -30,7 +30,7 @@ ApiStatus N(func_80240C44_ABBED4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 2e34e3e204..20c921e69f 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -35,7 +35,7 @@ ApiStatus N(func_80240B94_AC5D04)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index 56a02483a4..b5ebc76803 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -15,7 +15,7 @@ ApiStatus N(func_8024056C_AF320C)(Evt* script, s32 isInitialCall) { if (N(D_80241F10_AF4BB0)) { N(D_80241F10_AF4BB0) = FALSE; - set_variable(script, *args, N(D_80241F14_AF4BB4)); + evt_set_variable(script, *args, N(D_80241F14_AF4BB4)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_802405C0_AF3260); ApiStatus N(func_802405C0_AF3260)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241F14_AF4BB4) = get_variable(script, *args); + N(D_80241F14_AF4BB4) = evt_get_variable(script, *args); N(D_80241F10_AF4BB0) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_802405F8_AF3298); /* ApiStatus N(func_802405F8_AF3298)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240694_AF3334); /* ApiStatus N(func_80240694_AF3334)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index da23445fb7..0bb7bd5691 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -15,7 +15,7 @@ ApiStatus N(func_802404DC_AF7E2C)(Evt* script, s32 isInitialCall) { if (N(D_80241B10_AF9460)) { N(D_80241B10_AF9460) = FALSE; - set_variable(script, *args, N(D_80241B14_AF9464)); + evt_set_variable(script, *args, N(D_80241B14_AF9464)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240530_AF7E80); ApiStatus N(func_80240530_AF7E80)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241B14_AF9464) = get_variable(script, *args); + N(D_80241B14_AF9464) = evt_get_variable(script, *args); N(D_80241B10_AF9460) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240568_AF7EB8); /* ApiStatus N(func_80240568_AF7EB8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240604_AF7F54); /* ApiStatus N(func_80240604_AF7F54)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c index 5f3c226279..e88062bb52 100644 --- a/src/world/area_kmr/kmr_00/8ABF90.c +++ b/src/world/area_kmr/kmr_00/8ABF90.c @@ -10,11 +10,11 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240388_8AC318); ApiStatus func_802403B8_8AC348(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); playFX_11(var0, var1, var2, var3, var4); return ApiStatus_DONE2; @@ -28,7 +28,7 @@ ApiStatus func_802404A0_8AC430(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8_8AC478); ApiStatus func_80240530_8AC4C0(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(get_variable(script, *script->ptrReadPos)); + Npc* npc = get_npc_unsafe(evt_get_variable(script, *script->ptrReadPos)); playFX_11(3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f); return ApiStatus_DONE2; @@ -56,7 +56,7 @@ ApiStatus func_80240BD8_8ACB68(Evt* script, s32 isInitialCall) { Npc* npc; if (isInitialCall) { - script->functionTemp[1] = get_variable(script, *args); + script->functionTemp[1] = evt_get_variable(script, *args); npc = get_npc_unsafe(script->functionTemp[1]); sfx_play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z); playFX_11(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 74815d299f..9924c05efd 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -52,10 +52,10 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C); /* ApiStatus N(func_802404CC_8B053C)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -76,16 +76,16 @@ ApiStatus N(func_802404CC_8B053C)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -120,7 +120,7 @@ ApiStatus N(func_80240A7C_8B0AEC)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -139,9 +139,9 @@ ApiStatus N(func_80240B00_8B0B70)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -198,7 +198,7 @@ ApiStatus N(func_80240D18_8B0D88)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240DCC_8B0E3C); /* ApiStatus N(func_80240DCC_8B0E3C)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -206,7 +206,7 @@ ApiStatus N(func_80240DCC_8B0E3C)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E00_8B0E70); /* ApiStatus N(func_80240E00_8B0E70)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -267,7 +267,7 @@ ApiStatus N(func_80240EB4_8B0F24)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8); /* void N(func_80241388_8B13F8)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -328,7 +328,7 @@ ApiStatus N(func_8024226C_8B22DC)(Evt* script, s32 isInitialCall) { if (N(D_80247E30_8B7EA0)) { N(D_80247E30_8B7EA0) = FALSE; - set_variable(script, *args, N(D_80247E34_8B7EA4)); + evt_set_variable(script, *args, N(D_80247E34_8B7EA4)); return ApiStatus_DONE2; } @@ -341,7 +341,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330); ApiStatus N(func_802422C0_8B2330)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80247E34_8B7EA4) = get_variable(script, *args); + N(D_80247E34_8B7EA4) = evt_get_variable(script, *args); N(D_80247E30_8B7EA0) = TRUE; return ApiStatus_DONE2; } @@ -351,7 +351,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368); /* ApiStatus N(func_802422F8_8B2368)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kmr/kmr_06/8D2A10.c b/src/world/area_kmr/kmr_06/8D2A10.c index 495a28e3f1..fa92eb32c7 100644 --- a/src/world/area_kmr/kmr_06/8D2A10.c +++ b/src/world/area_kmr/kmr_06/8D2A10.c @@ -16,9 +16,9 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241C78_8D3188); ApiStatus func_80241CC8_8D31D8(Evt* script, s32 isInitialCall) { // todo use correct types - s32* mapVar10 = get_variable(script, EVT_MAP_VAR(10)); - s32 mapVar11 = get_variable(script, EVT_MAP_VAR(11)); - s32 mapVar12 = get_variable(script, EVT_MAP_VAR(12)); + s32* mapVar10 = evt_get_variable(script, EVT_MAP_VAR(10)); + s32 mapVar11 = evt_get_variable(script, EVT_MAP_VAR(11)); + s32 mapVar12 = evt_get_variable(script, EVT_MAP_VAR(12)); free_generic_entity(mapVar10[1]); @@ -26,9 +26,9 @@ ApiStatus func_80241CC8_8D31D8(Evt* script, s32 isInitialCall) { heap_free(mapVar11); heap_free(mapVar12); - set_variable(script, EVT_MAP_VAR(10), NULL); - set_variable(script, EVT_MAP_VAR(11), NULL); - set_variable(script, EVT_MAP_VAR(12), NULL); + evt_set_variable(script, EVT_MAP_VAR(10), NULL); + evt_set_variable(script, EVT_MAP_VAR(11), NULL); + evt_set_variable(script, EVT_MAP_VAR(12), NULL); return ApiStatus_DONE2; } diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index e7e9531846..b736d8ee15 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802407F4_8D45B4); // see func_802402BC_8D878C #ifdef NON_MATCHING ApiStatus func_80240A6C_8D482C(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(get_variable(NULL, EVT_MAP_VAR(0))); + Entity* entity = get_entity_by_index(evt_get_variable(NULL, EVT_MAP_VAR(0))); if (entity == NULL) { return ApiStatus_BLOCK; @@ -39,7 +39,7 @@ ApiStatus func_80240A6C_8D482C(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240A6C_8D482C); /* ApiStatus N(func_80240A6C_8D482C)(void) { - Entity* entity = get_entity_by_index(get_variable(NULL, 0xFD050F80)); + Entity* entity = get_entity_by_index(evt_get_variable(NULL, 0xFD050F80)); if (entity == NULL) { return ApiStatus_BLOCK; diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 7f30a41366..fde6d827ba 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -42,7 +42,7 @@ ApiStatus N(func_8024130C_8D710C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index c02c8ac83e..92f484935b 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -35,7 +35,7 @@ ApiStatus N(func_80240000_8D84D0)(Evt* script, s32 isInitialCall) { // play_model_animation, and entity->unk_14 before we can tackle this ApiStatus func_802402BC_8D878C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Entity* entity = get_entity_by_index(get_variable(script, *args++)); + Entity* entity = get_entity_by_index(evt_get_variable(script, *args++)); if (entity == NULL) { return ApiStatus_BLOCK; diff --git a/src/world/area_kpa/kpa_12/A54CA0.c b/src/world/area_kpa/kpa_12/A54CA0.c index a933924c98..c81738d5a3 100644 --- a/src/world/area_kpa/kpa_12/A54CA0.c +++ b/src/world/area_kpa/kpa_12/A54CA0.c @@ -3,7 +3,7 @@ ApiStatus N(func_80240350_A54CA0)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; - set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); + evt_set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); return ApiStatus_DONE2; } diff --git a/src/world/area_kpa/kpa_13/A56270.c b/src/world/area_kpa/kpa_13/A56270.c index 8ae37b5433..62fa9644b0 100644 --- a/src/world/area_kpa/kpa_13/A56270.c +++ b/src/world/area_kpa/kpa_13/A56270.c @@ -3,7 +3,7 @@ ApiStatus N(func_80240350_A56270)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; - set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); + evt_set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); return ApiStatus_DONE2; } diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 49b0d41952..d340314c50 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -34,7 +34,7 @@ ApiStatus N(func_80240380_A57830)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80240710_A57BC0)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; - set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); + evt_set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); return ApiStatus_DONE2; } diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index 75a0b2b066..7af748d1d2 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -15,7 +15,7 @@ ApiStatus N(func_8024027C_A7873C)(Evt* script, s32 isInitialCall) { if (N(D_80240D98_A79258)) { N(D_80240D98_A79258) = FALSE; - set_variable(script, *args, N(D_80240D9C_A7925C)); + evt_set_variable(script, *args, N(D_80240D9C_A7925C)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790); ApiStatus N(func_802402D0_A78790)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80240D9C_A7925C) = get_variable(script, *args); + N(D_80240D9C_A7925C) = evt_get_variable(script, *args); N(D_80240D98_A79258) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8); /* ApiStatus N(func_80240308_A787C8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802403A4_A78864); /* ApiStatus N(func_802403A4_A78864)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c index c97e2a12c0..50a8814c6d 100644 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ b/src/world/area_kpa/kpa_82/A7A550.c @@ -15,7 +15,7 @@ ApiStatus N(func_8024027C_A7A77C)(Evt* script, s32 isInitialCall) { if (N(D_80240C20_A7B120)) { N(D_80240C20_A7B120) = FALSE; - set_variable(script, *args, N(D_80240C24_A7B124)); + evt_set_variable(script, *args, N(D_80240C24_A7B124)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802402D0_A7A7D0); ApiStatus N(func_802402D0_A7A7D0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80240C24_A7B124) = get_variable(script, *args); + N(D_80240C24_A7B124) = evt_get_variable(script, *args); N(D_80240C20_A7B120) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_80240308_A7A808); /* ApiStatus N(func_80240308_A7A808)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802403A4_A7A8A4); /* ApiStatus N(func_802403A4_A7A8A4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index ca14561b44..5751ceb0a3 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -33,7 +33,7 @@ ApiStatus N(func_80240B94_A875E4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 3b15560939..89e5c3ed7c 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -30,7 +30,7 @@ ApiStatus N(func_80240C74_A8D6F4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index f1e74bc6bb..c175b63c76 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -39,7 +39,7 @@ ApiStatus N(func_802417EC_C5BF2C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -154,7 +154,7 @@ ApiStatus N(func_80241DE4_C5C524)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -249,7 +249,7 @@ ApiStatus N(func_80242310_C5CA50)(Evt* script, s32 isInitialCall) { if (N(D_80244A74_C5F1B4)) { N(D_80244A74_C5F1B4) = FALSE; - set_variable(script, *args, N(D_80244A78_C5F1B8)); + evt_set_variable(script, *args, N(D_80244A78_C5F1B8)); return ApiStatus_DONE2; } @@ -262,7 +262,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242364_C5CAA4); ApiStatus N(func_80242364_C5CAA4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80244A78_C5F1B8) = get_variable(script, *args); + N(D_80244A78_C5F1B8) = evt_get_variable(script, *args); N(D_80244A74_C5F1B4) = TRUE; return ApiStatus_DONE2; } @@ -272,7 +272,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_8024239C_C5CADC); /* ApiStatus N(func_8024239C_C5CADC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 0a0a067c5e..849ad05a37 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -80,7 +80,7 @@ ApiStatus N(func_802428E0_C635F0)(Evt* script, s32 isInitialCall) { if (N(D_80244204_C64F14)) { N(D_80244204_C64F14) = FALSE; - set_variable(script, *args, N(D_80244208_C64F18)); + evt_set_variable(script, *args, N(D_80244208_C64F18)); return ApiStatus_DONE2; } @@ -93,7 +93,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242934_C63644); ApiStatus N(func_80242934_C63644)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80244208_C64F18) = get_variable(script, *args); + N(D_80244208_C64F18) = evt_get_variable(script, *args); N(D_80244204_C64F14) = TRUE; return ApiStatus_DONE2; } @@ -103,7 +103,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024296C_C6367C); /* ApiStatus N(func_8024296C_C6367C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index 2829db4f8f..1cc113f6c5 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024034C_C6847C); /* ApiStatus N(func_8024034C_C6847C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -46,7 +46,7 @@ ApiStatus N(func_80240910_C68A40)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 2e5f3ddfca..61a44df1c2 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -43,7 +43,7 @@ ApiStatus N(func_80241B2C_C6FE5C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 66fabb9d10..77032ee998 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -39,7 +39,7 @@ ApiStatus N(func_80241D5C_C731DC)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -154,7 +154,7 @@ ApiStatus N(func_80242354_C737D4)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c index f1e3bde297..0bfeede86c 100644 --- a/src/world/area_kzn/kzn_09/C76CE0.c +++ b/src/world/area_kzn/kzn_09/C76CE0.c @@ -10,7 +10,7 @@ static char* N(exit_str_1) = "kzn_10"; INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024003C_C76D1C); /* ApiStatus N(func_8024003C_C76D1C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -49,7 +49,7 @@ ApiStatus N(func_80240600_C772E0)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index a51bb91679..ed77dbee61 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -80,7 +80,7 @@ ApiStatus N(func_802435F0_C7A2D0)(Evt* script, s32 isInitialCall) { if (N(D_802452B4_C7BF94)) { N(D_802452B4_C7BF94) = FALSE; - set_variable(script, *args, N(D_802452B8_C7BF98)); + evt_set_variable(script, *args, N(D_802452B8_C7BF98)); return ApiStatus_DONE2; } @@ -93,7 +93,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243644_C7A324); ApiStatus N(func_80243644_C7A324)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802452B8_C7BF98) = get_variable(script, *args); + N(D_802452B8_C7BF98) = evt_get_variable(script, *args); N(D_802452B4_C7BF94) = TRUE; return ApiStatus_DONE2; } @@ -103,7 +103,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024367C_C7A35C); /* ApiStatus N(func_8024367C_C7A35C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kzn/kzn_10/C7E4B0.c b/src/world/area_kzn/kzn_10/C7E4B0.c index 6b5aadcadc..af166a7ae8 100644 --- a/src/world/area_kzn/kzn_10/C7E4B0.c +++ b/src/world/area_kzn/kzn_10/C7E4B0.c @@ -19,9 +19,9 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240638_C7E7B8); ApiStatus N(func_80240638_C7E7B8)(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - script->functionTemp[0] = get_variable(script, *args++); - script->functionTemp[1] = get_variable(script, *args++); - script->functionTemp[2] = get_variable(script, *args++); + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 5892c88dfe..3a19d0b3f5 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -39,7 +39,7 @@ ApiStatus N(func_8024176C_C8190C)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -154,7 +154,7 @@ ApiStatus N(func_80241D64_C81F04)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 6ec0444048..ffd09e94de 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -80,7 +80,7 @@ ApiStatus N(func_802428E0_C88390)(Evt* script, s32 isInitialCall) { if (N(D_802440D8_C89B88)) { N(D_802440D8_C89B88) = FALSE; - set_variable(script, *args, N(D_802440DC_C89B8C)); + evt_set_variable(script, *args, N(D_802440DC_C89B8C)); return ApiStatus_DONE2; } @@ -93,7 +93,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242934_C883E4); ApiStatus N(func_80242934_C883E4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802440DC_C89B8C) = get_variable(script, *args); + N(D_802440DC_C89B8C) = evt_get_variable(script, *args); N(D_802440D8_C89B88) = TRUE; return ApiStatus_DONE2; } @@ -103,7 +103,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024296C_C8841C); /* ApiStatus N(func_8024296C_C8841C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kzn/kzn_17/C887B0.c b/src/world/area_kzn/kzn_17/C887B0.c index f1817021b0..3446fc0252 100644 --- a/src/world/area_kzn/kzn_17/C887B0.c +++ b/src/world/area_kzn/kzn_17/C887B0.c @@ -19,9 +19,9 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80243004_C88AB4); ApiStatus N(func_80243004_C88AB4)(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - script->functionTemp[0] = get_variable(script, *args++); - script->functionTemp[1] = get_variable(script, *args++); - script->functionTemp[2] = get_variable(script, *args++); + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); sfx_adjust_env_sound_pos(0x194, 0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index 37fb52ee45..e1f49b4fc2 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -22,17 +22,17 @@ ApiStatus N(func_80240358_C8DF08)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_3C = get_variable(script, *args++); - ptr->unk_0C = get_float_variable(script, *args++); - ptr->unk_10 = get_float_variable(script, *args++); - ptr->unk_14 = get_float_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_1C = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + 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++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; @@ -54,7 +54,7 @@ static char* N(exit_str_2) = "kzn_20"; INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802408C8_C8E478); /* ApiStatus N(func_802408C8_C8E478)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); arn_07_struct* ptr = script->varTable[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; @@ -69,11 +69,11 @@ ApiStatus N(func_80240908_C8E4B8)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; ptr->unk_54->unk_0C->unk_20 = 0; @@ -159,7 +159,7 @@ ApiStatus N(func_802417AC_C8F35C)(Evt* script, s32 isInitialCall) { if (N(D_80243DD8_C91988)) { N(D_80243DD8_C91988) = FALSE; - set_variable(script, *args, N(D_80243DDC_C9198C)); + evt_set_variable(script, *args, N(D_80243DDC_C9198C)); return ApiStatus_DONE2; } @@ -172,7 +172,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241800_C8F3B0); ApiStatus N(func_80241800_C8F3B0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80243DDC_C9198C) = get_variable(script, *args); + N(D_80243DDC_C9198C) = evt_get_variable(script, *args); N(D_80243DD8_C91988) = TRUE; return ApiStatus_DONE2; } @@ -182,7 +182,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241838_C8F3E8); /* ApiStatus N(func_80241838_C8F3E8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index 69dd4c008e..a6418f8bff 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -38,7 +38,7 @@ ApiStatus N(func_80240654_C96584)(Evt* script, s32 isInitialCall) { if (N(D_802417E4_C97714)) { N(D_802417E4_C97714) = FALSE; - set_variable(script, *args, N(D_802417E8_C97718)); + evt_set_variable(script, *args, N(D_802417E8_C97718)); return ApiStatus_DONE2; } @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406A8_C965D8); ApiStatus N(func_802406A8_C965D8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802417E8_C97718) = get_variable(script, *args); + N(D_802417E8_C97718) = evt_get_variable(script, *args); N(D_802417E4_C97714) = TRUE; return ApiStatus_DONE2; } @@ -61,7 +61,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_802406E0_C96610); /* ApiStatus N(func_802406E0_C96610)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index 7f2c363970..53141a958e 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -28,7 +28,7 @@ ApiStatus func_802405EC_7EB2FC(Evt* script, s32 isInitialCall) { f32 y; f32 z; - get_collider_center(get_variable(script, *script->ptrReadPos), &x, &y, &z); + get_collider_center(evt_get_variable(script, *script->ptrReadPos), &x, &y, &z); return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index e1455d14cd..6ead5a7fb6 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -31,10 +31,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C); /* ApiStatus N(func_8024076C_7EB47C)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -55,16 +55,16 @@ ApiStatus N(func_8024076C_7EB47C)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -99,7 +99,7 @@ ApiStatus N(func_80240D1C_7EBA2C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -118,9 +118,9 @@ ApiStatus N(func_80240DA0_7EBAB0)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -177,7 +177,7 @@ ApiStatus N(func_80240FB8_7EBCC8)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024106C_7EBD7C); /* ApiStatus N(func_8024106C_7EBD7C)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -185,7 +185,7 @@ ApiStatus N(func_8024106C_7EBD7C)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802410A0_7EBDB0); /* ApiStatus N(func_802410A0_7EBDB0)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -246,7 +246,7 @@ ApiStatus N(func_80241154_7EBE64)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338); /* void N(func_80241628_7EC338)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -279,7 +279,7 @@ ApiStatus N(func_802418F0_7EC600)(Evt* script, s32 isInitialCall) { if (N(D_802483E8_7F30F8)) { N(D_802483E8_7F30F8) = FALSE; - set_variable(script, *args, N(D_802483EC_7F30FC)); + evt_set_variable(script, *args, N(D_802483EC_7F30FC)); return ApiStatus_DONE2; } @@ -292,7 +292,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654); ApiStatus N(func_80241944_7EC654)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802483EC_7F30FC) = get_variable(script, *args); + N(D_802483EC_7F30FC) = evt_get_variable(script, *args); N(D_802483E8_7F30F8) = TRUE; return ApiStatus_DONE2; } @@ -302,7 +302,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C); /* ApiStatus N(func_8024197C_7EC68C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -324,7 +324,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728); /* ApiStatus N(func_80241A18_7EC728)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -378,7 +378,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00); ApiStatus N(SetDojoBattle)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; - gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = N(dojoBattleIDs)[get_variable(script, EVT_SAVE_VAR(28))]; + gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = N(dojoBattleIDs)[evt_get_variable(script, EVT_SAVE_VAR(28))]; return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index b3a6f34670..221052171e 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -30,7 +30,7 @@ ApiStatus N(func_80243104_7EDE14)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -155,7 +155,7 @@ ApiStatus N(func_80243744_7EE454)(Evt* script, s32 isInitialCall) { if (N(D_8024ED4C_7F9A5C)) { N(D_8024ED4C_7F9A5C) = FALSE; - set_variable(script, *args, N(D_8024ED50_7F9A60)); + evt_set_variable(script, *args, N(D_8024ED50_7F9A60)); return ApiStatus_DONE2; } @@ -168,7 +168,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8); ApiStatus N(func_80243798_7EE4A8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_8024ED50_7F9A60) = get_variable(script, *args); + N(D_8024ED50_7F9A60) = evt_get_variable(script, *args); N(D_8024ED4C_7F9A5C) = TRUE; return ApiStatus_DONE2; } @@ -178,7 +178,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0); /* ApiStatus N(func_802437D0_7EE4E0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mac/mac_01/800880.c b/src/world/area_mac/mac_01/800880.c index 4d1cf596c2..83df12232e 100644 --- a/src/world/area_mac/mac_01/800880.c +++ b/src/world/area_mac/mac_01/800880.c @@ -8,18 +8,18 @@ static char* N(exit_str_4) = "osr_01"; static char* N(exit_str_5) = "mac_02"; ApiStatus func_80240000_800880(Evt* script, s32 isInitialCall) { - s32 itemIndex = get_variable(script, *script->ptrReadPos); + s32 itemIndex = evt_get_variable(script, *script->ptrReadPos); set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, 0x40); return ApiStatus_DONE2; } ApiStatus func_80240044_8008C4(Evt* script, s32 isInitialCall) { - s32 itemIndex = get_variable(script, *script->ptrReadPos); - s32* var1 = get_variable(NULL, EVT_MAP_VAR(2)); + s32 itemIndex = evt_get_variable(script, *script->ptrReadPos); + s32* var1 = evt_get_variable(NULL, EVT_MAP_VAR(2)); set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, 0x40); - set_variable(NULL, var1[itemIndex], 1); + evt_set_variable(NULL, var1[itemIndex], 1); return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 600d416c55..2106f567fd 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -50,7 +50,7 @@ ApiStatus N(func_80241C14_802494)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -161,10 +161,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC); /* ApiStatus N(func_8024204C_8028CC)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -185,16 +185,16 @@ ApiStatus N(func_8024204C_8028CC)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -229,7 +229,7 @@ ApiStatus N(func_802425FC_802E7C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -248,9 +248,9 @@ ApiStatus N(func_80242680_802F00)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -307,7 +307,7 @@ ApiStatus N(func_80242898_803118)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024294C_8031CC); /* ApiStatus N(func_8024294C_8031CC)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -315,7 +315,7 @@ ApiStatus N(func_8024294C_8031CC)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242980_803200); /* ApiStatus N(func_80242980_803200)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -376,7 +376,7 @@ ApiStatus N(func_80242A34_8032B4)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788); /* void N(func_80242F08_803788)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -445,7 +445,7 @@ ApiStatus N(func_80243CD4_804554)(Evt* script, s32 isInitialCall) { if (N(D_8024D944_80E1C4)) { N(D_8024D944_80E1C4) = FALSE; - set_variable(script, *args, N(D_8024D948_80E1C8)); + evt_set_variable(script, *args, N(D_8024D948_80E1C8)); return ApiStatus_DONE2; } @@ -458,7 +458,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D28_8045A8); ApiStatus N(func_80243D28_8045A8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_8024D948_80E1C8) = get_variable(script, *args); + N(D_8024D948_80E1C8) = evt_get_variable(script, *args); N(D_8024D944_80E1C4) = TRUE; return ApiStatus_DONE2; } @@ -468,7 +468,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0); /* ApiStatus N(func_80243D60_8045E0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 63d2e9387a..9485a6738f 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -30,7 +30,7 @@ ApiStatus N(func_802460E4_806964)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index cc69abfb8c..1cc73abda5 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -32,7 +32,7 @@ ApiStatus N(func_802414C4_824784)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -140,10 +140,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC); /* ApiStatus N(func_802418FC_824BBC)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -164,16 +164,16 @@ ApiStatus N(func_802418FC_824BBC)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -208,7 +208,7 @@ ApiStatus N(func_80241EAC_82516C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -227,9 +227,9 @@ ApiStatus N(func_80241F30_8251F0)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -286,7 +286,7 @@ ApiStatus N(func_80242148_825408)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802421FC_8254BC); /* ApiStatus N(func_802421FC_8254BC)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -294,7 +294,7 @@ ApiStatus N(func_802421FC_8254BC)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242230_8254F0); /* ApiStatus N(func_80242230_8254F0)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -355,7 +355,7 @@ ApiStatus N(func_802422E4_8255A4)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78); /* void N(func_802427B8_825A78)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -388,7 +388,7 @@ ApiStatus N(func_80242A80_825D40)(Evt* script, s32 isInitialCall) { if (N(D_80248778_82BA38)) { N(D_80248778_82BA38) = FALSE; - set_variable(script, *args, N(D_8024877C_82BA3C)); + evt_set_variable(script, *args, N(D_8024877C_82BA3C)); return ApiStatus_DONE2; } @@ -401,7 +401,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94); ApiStatus N(func_80242AD4_825D94)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_8024877C_82BA3C) = get_variable(script, *args); + N(D_8024877C_82BA3C) = evt_get_variable(script, *args); N(D_80248778_82BA38) = TRUE; return ApiStatus_DONE2; } @@ -411,7 +411,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242B0C_825DCC); /* ApiStatus N(func_80242B0C_825DCC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -433,7 +433,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242BA8_825E68); /* ApiStatus N(func_80242BA8_825E68)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index f1012f643d..351079ad3f 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -33,10 +33,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC); /* ApiStatus N(func_802405EC_831DEC)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -57,16 +57,16 @@ ApiStatus N(func_802405EC_831DEC)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -101,7 +101,7 @@ ApiStatus N(func_80240B9C_83239C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -120,9 +120,9 @@ ApiStatus N(func_80240C20_832420)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -179,7 +179,7 @@ ApiStatus N(func_80240E38_832638)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240EEC_8326EC); /* ApiStatus N(func_80240EEC_8326EC)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -187,7 +187,7 @@ ApiStatus N(func_80240EEC_8326EC)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240F20_832720); /* ApiStatus N(func_80240F20_832720)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -248,7 +248,7 @@ ApiStatus N(func_80240FD4_8327D4)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8); /* void N(func_802414A8_832CA8)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -281,7 +281,7 @@ ApiStatus N(func_80241770_832F70)(Evt* script, s32 isInitialCall) { if (N(D_80248C6C_83A46C)) { N(D_80248C6C_83A46C) = FALSE; - set_variable(script, *args, N(D_80248C70_83A470)); + evt_set_variable(script, *args, N(D_80248C70_83A470)); return ApiStatus_DONE2; } @@ -294,7 +294,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4); ApiStatus N(func_802417C4_832FC4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80248C70_83A470) = get_variable(script, *args); + N(D_80248C70_83A470) = evt_get_variable(script, *args); N(D_80248C6C_83A46C) = TRUE; return ApiStatus_DONE2; } @@ -304,7 +304,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC); /* ApiStatus N(func_802417FC_832FFC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 5f856e0b9a..4c16f624a5 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -31,10 +31,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C); /* ApiStatus N(func_8024059C_84316C)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -55,16 +55,16 @@ ApiStatus N(func_8024059C_84316C)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -99,7 +99,7 @@ ApiStatus N(func_80240B4C_84371C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -118,9 +118,9 @@ ApiStatus N(func_80240BD0_8437A0)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -177,7 +177,7 @@ ApiStatus N(func_80240DE8_8439B8)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240E9C_843A6C); /* ApiStatus N(func_80240E9C_843A6C)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -185,7 +185,7 @@ ApiStatus N(func_80240E9C_843A6C)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240ED0_843AA0); /* ApiStatus N(func_80240ED0_843AA0)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -246,7 +246,7 @@ ApiStatus N(func_80240F84_843B54)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028); /* void N(func_80241458_844028)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -279,7 +279,7 @@ ApiStatus N(func_80241720_8442F0)(Evt* script, s32 isInitialCall) { if (N(D_80246610_8491E0)) { N(D_80246610_8491E0) = FALSE; - set_variable(script, *args, N(D_80246614_8491E4)); + evt_set_variable(script, *args, N(D_80246614_8491E4)); return ApiStatus_DONE2; } @@ -292,7 +292,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344); ApiStatus N(func_80241774_844344)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80246614_8491E4) = get_variable(script, *args); + N(D_80246614_8491E4) = evt_get_variable(script, *args); N(D_80246610_8491E0) = TRUE; return ApiStatus_DONE2; } @@ -302,7 +302,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802417AC_84437C); /* ApiStatus N(func_802417AC_84437C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 3e37391fc3..4a0a9f53c6 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -43,7 +43,7 @@ ApiStatus N(func_80241024_853194)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -151,10 +151,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC); /* ApiStatus N(func_8024145C_8535CC)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -175,16 +175,16 @@ ApiStatus N(func_8024145C_8535CC)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -219,7 +219,7 @@ ApiStatus N(func_80241A0C_853B7C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -238,9 +238,9 @@ ApiStatus N(func_80241A90_853C00)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -297,7 +297,7 @@ ApiStatus N(func_80241CA8_853E18)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D5C_853ECC); /* ApiStatus N(func_80241D5C_853ECC)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -305,7 +305,7 @@ ApiStatus N(func_80241D5C_853ECC)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D90_853F00); /* ApiStatus N(func_80241D90_853F00)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -366,7 +366,7 @@ ApiStatus N(func_80241E44_853FB4)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488); /* void N(func_80242318_854488)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -399,7 +399,7 @@ ApiStatus N(func_802425E0_854750)(Evt* script, s32 isInitialCall) { if (N(D_802476D8_859848)) { N(D_802476D8_859848) = FALSE; - set_variable(script, *args, N(D_802476DC_85984C)); + evt_set_variable(script, *args, N(D_802476DC_85984C)); return ApiStatus_DONE2; } @@ -412,7 +412,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4); ApiStatus N(func_80242634_8547A4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802476DC_85984C) = get_variable(script, *args); + N(D_802476DC_85984C) = evt_get_variable(script, *args); N(D_802476D8_859848) = TRUE; return ApiStatus_DONE2; } @@ -422,7 +422,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC); /* ApiStatus N(func_8024266C_8547DC)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -444,7 +444,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878); /* ApiStatus N(func_80242708_854878)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 6f82c5a0da..7b77cdd750 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -47,7 +47,7 @@ ApiStatus N(func_80240E74_E0F614)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index fba2d02b33..529c7e36a8 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -31,7 +31,7 @@ ApiStatus N(func_802410B0_B98CB0)(Evt* script, s32 isInitialCall) { if (N(D_802416AC_B992AC)) { N(D_802416AC_B992AC) = FALSE; - set_variable(script, *args, N(D_802416B0_B992B0)); + evt_set_variable(script, *args, N(D_802416B0_B992B0)); return ApiStatus_DONE2; } @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80241104_B98D04); ApiStatus N(func_80241104_B98D04)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802416B0_B992B0) = get_variable(script, *args); + N(D_802416B0_B992B0) = evt_get_variable(script, *args); N(D_802416AC_B992AC) = TRUE; return ApiStatus_DONE2; } @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024113C_B98D3C); /* ApiStatus N(func_8024113C_B98D3C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index afd79182ca..ffd1616de1 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -46,7 +46,7 @@ ApiStatus N(func_802413AC_BAECEC)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 750fd9bbe3..e99670a07d 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -74,10 +74,10 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284); /* ApiStatus N(func_80240EA4_9C6284)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -98,16 +98,16 @@ ApiStatus N(func_80240EA4_9C6284)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -142,7 +142,7 @@ ApiStatus N(func_80241454_9C6834)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -161,9 +161,9 @@ ApiStatus N(func_802414D8_9C68B8)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -220,7 +220,7 @@ ApiStatus N(func_802416F0_9C6AD0)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417A4_9C6B84); /* ApiStatus N(func_802417A4_9C6B84)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -228,7 +228,7 @@ ApiStatus N(func_802417A4_9C6B84)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417D8_9C6BB8); /* ApiStatus N(func_802417D8_9C6BB8)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -289,7 +289,7 @@ ApiStatus N(func_8024188C_9C6C6C)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140); /* void N(func_80241D60_9C7140)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -322,7 +322,7 @@ ApiStatus N(func_80242028_9C7408)(Evt* script, s32 isInitialCall) { if (N(D_8024856C_9CD94C)) { N(D_8024856C_9CD94C) = FALSE; - set_variable(script, *args, N(D_80248570_9CD950)); + evt_set_variable(script, *args, N(D_80248570_9CD950)); return ApiStatus_DONE2; } @@ -335,7 +335,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C); ApiStatus N(func_8024207C_9C745C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80248570_9CD950) = get_variable(script, *args); + N(D_80248570_9CD950) = evt_get_variable(script, *args); N(D_8024856C_9CD94C) = TRUE; return ApiStatus_DONE2; } @@ -345,7 +345,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494); /* ApiStatus N(func_802420B4_9C7494)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index e72260d182..e6d33a668c 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -61,7 +61,7 @@ ApiStatus N(func_80240624_9D7644)(Evt* script, s32 isInitialCall) { if (N(D_80245434_9DC454)) { N(D_80245434_9DC454) = FALSE; - set_variable(script, *args, N(D_80245438_9DC458)); + evt_set_variable(script, *args, N(D_80245438_9DC458)); return ApiStatus_DONE2; } @@ -74,7 +74,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698); ApiStatus N(func_80240678_9D7698)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80245438_9DC458) = get_variable(script, *args); + N(D_80245438_9DC458) = evt_get_variable(script, *args); N(D_80245434_9DC454) = TRUE; return ApiStatus_DONE2; } @@ -84,7 +84,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802406B0_9D76D0); /* ApiStatus N(func_802406B0_9D76D0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 253bccd6bf..5c33bba7ac 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -32,7 +32,7 @@ ApiStatus N(func_80241614_9D8634)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -143,10 +143,10 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C); /* ApiStatus N(func_80241A4C_9D8A6C)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -167,16 +167,16 @@ ApiStatus N(func_80241A4C_9D8A6C)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -211,7 +211,7 @@ ApiStatus N(func_80241FFC_9D901C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -230,9 +230,9 @@ ApiStatus N(func_80242080_9D90A0)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -289,7 +289,7 @@ ApiStatus N(func_80242298_9D92B8)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024234C_9D936C); /* ApiStatus N(func_8024234C_9D936C)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -297,7 +297,7 @@ ApiStatus N(func_8024234C_9D936C)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242380_9D93A0); /* ApiStatus N(func_80242380_9D93A0)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -358,7 +358,7 @@ ApiStatus N(func_80242434_9D9454)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928); /* void N(func_80242908_9D9928)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); @@ -391,7 +391,7 @@ ApiStatus N(func_80242BD0_9D9BF0)(Evt* script, s32 isInitialCall) { if (N(D_802496F0_9E0710)) { N(D_802496F0_9E0710) = FALSE; - set_variable(script, *args, N(D_802496F4_9E0714)); + evt_set_variable(script, *args, N(D_802496F4_9E0714)); return ApiStatus_DONE2; } @@ -404,7 +404,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44); ApiStatus N(func_80242C24_9D9C44)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802496F4_9E0714) = get_variable(script, *args); + N(D_802496F4_9E0714) = evt_get_variable(script, *args); N(D_802496F0_9E0710) = TRUE; return ApiStatus_DONE2; } @@ -414,7 +414,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C); /* ApiStatus N(func_80242C5C_9D9C7C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index d0b11b5840..0aaf2ce9c7 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -21,7 +21,7 @@ ApiStatus N(func_80243BEC_9DAC0C)(Evt* script, s32 isInitialCall) { if (N(D_80252400_9E9420)) { N(D_80252400_9E9420) = FALSE; - set_variable(script, *args, N(D_80252404_9E9424)); + evt_set_variable(script, *args, N(D_80252404_9E9424)); return ApiStatus_DONE2; } @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60); ApiStatus N(func_80243C40_9DAC60)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80252404_9E9424) = get_variable(script, *args); + N(D_80252404_9E9424) = evt_get_variable(script, *args); N(D_80252400_9E9420) = TRUE; return ApiStatus_DONE2; } @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C78_9DAC98); /* ApiStatus N(func_80243C78_9DAC98)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34); /* ApiStatus N(func_80243D14_9DAD34)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 64ec6ca2fb..31866c625a 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -52,7 +52,7 @@ ApiStatus N(func_80241AE0_9F6520)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 8fc5d1e8eb..08e2100d5f 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -40,7 +40,7 @@ ApiStatus N(func_802418D8_9FC0C8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 4f7b2532b5..999a91b31e 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -49,7 +49,7 @@ ApiStatus N(func_80241CA0_A044E0)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 5d784c4bf6..b736e048ce 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -66,7 +66,7 @@ ApiStatus N(func_80241DC0_A08CC0)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index d1b11ddf8d..c9df0602f6 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -38,7 +38,7 @@ ApiStatus N(func_80240B24_BBDCC4)(Evt* script, s32 isInitialCall) { if (N(D_80244154_BC12F4)) { N(D_80244154_BC12F4) = FALSE; - set_variable(script, *args, N(D_80244158_BC12F8)); + evt_set_variable(script, *args, N(D_80244158_BC12F8)); return ApiStatus_DONE2; } @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18); ApiStatus N(func_80240B78_BBDD18)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80244158_BC12F8) = get_variable(script, *args); + N(D_80244158_BC12F8) = evt_get_variable(script, *args); N(D_80244154_BC12F4) = TRUE; return ApiStatus_DONE2; } @@ -61,7 +61,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50); /* ApiStatus N(func_80240BB0_BBDD50)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 94a53ff149..60eefdf903 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -38,7 +38,7 @@ ApiStatus N(func_802404B4_BC4734)(Evt* script, s32 isInitialCall) { if (N(D_80242F30_BC71B0)) { N(D_80242F30_BC71B0) = FALSE; - set_variable(script, *args, N(D_80242F34_BC71B4)); + evt_set_variable(script, *args, N(D_80242F34_BC71B4)); return ApiStatus_DONE2; } @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788); ApiStatus N(func_80240508_BC4788)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80242F34_BC71B4) = get_variable(script, *args); + N(D_80242F34_BC71B4) = evt_get_variable(script, *args); N(D_80242F30_BC71B0) = TRUE; return ApiStatus_DONE2; } @@ -61,7 +61,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240540_BC47C0); /* ApiStatus N(func_80240540_BC47C0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index bf055682b3..d52f99c374 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -75,7 +75,7 @@ ApiStatus N(func_802416AC_DAEAAC)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index e7335d4047..49b08d35cd 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -58,7 +58,7 @@ ApiStatus N(func_80241D60_DB4020)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -128,7 +128,7 @@ ApiStatus N(func_80242178_DB4438)(Evt* script, s32 isInitialCall) { if (N(D_80243098_DB5358)) { N(D_80243098_DB5358) = FALSE; - set_variable(script, *args, N(D_8024309C_DB535C)); + evt_set_variable(script, *args, N(D_8024309C_DB535C)); return ApiStatus_DONE2; } @@ -141,7 +141,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802421CC_DB448C); ApiStatus N(func_802421CC_DB448C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_8024309C_DB535C) = get_variable(script, *args); + N(D_8024309C_DB535C) = evt_get_variable(script, *args); N(D_80243098_DB5358) = TRUE; return ApiStatus_DONE2; } @@ -151,7 +151,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242204_DB44C4); /* ApiStatus N(func_80242204_DB44C4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 5b230296e5..5c2ec3c012 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -43,7 +43,7 @@ ApiStatus N(func_80241100_DBE3B0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -175,7 +175,7 @@ ApiStatus N(func_80242C84_DBFF34)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 7927375674..f7952f1600 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -40,7 +40,7 @@ ApiStatus N(func_80241AE0_DCE7B0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index 381dd1e690..249d351330 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407CC_DDCFFC); /* ApiStatus N(func_802407CC_DDCFFC)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -46,7 +46,7 @@ ApiStatus N(func_80240D90_DDD5C0)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 7e35bd452d..8a28dbd542 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -31,7 +31,7 @@ ApiStatus N(func_80240F00_DE3390)(Evt* script, s32 isInitialCall) { if (N(D_80241C04_DE4094)) { N(D_80241C04_DE4094) = FALSE; - set_variable(script, *args, N(D_80241C08_DE4098)); + evt_set_variable(script, *args, N(D_80241C08_DE4098)); return ApiStatus_DONE2; } @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4); ApiStatus N(func_80240F54_DE33E4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241C08_DE4098) = get_variable(script, *args); + N(D_80241C08_DE4098) = evt_get_variable(script, *args); N(D_80241C04_DE4094) = TRUE; return ApiStatus_DONE2; } @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F8C_DE341C); /* ApiStatus N(func_80240F8C_DE341C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_omo/omo_15/DE8770.c b/src/world/area_omo/omo_15/DE8770.c index 473f7e3c60..2be7cf57da 100644 --- a/src/world/area_omo/omo_15/DE8770.c +++ b/src/world/area_omo/omo_15/DE8770.c @@ -18,17 +18,17 @@ ApiStatus N(func_8024004C_DE87BC)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_3C = get_variable(script, *args++); - ptr->unk_0C = get_float_variable(script, *args++); - ptr->unk_10 = get_float_variable(script, *args++); - ptr->unk_14 = get_float_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_1C = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + 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++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; @@ -49,7 +49,7 @@ static char* N(exit_str_1) = "omo_14"; INCLUDE_ASM(s32, "world/area_omo/omo_15/DE8770", func_802405BC_DE8D2C); /* ApiStatus N(func_802405BC_DE8D2C)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); arn_07_struct* ptr = script->varTable[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; @@ -64,11 +64,11 @@ ApiStatus N(func_802405FC_DE8D6C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; ptr->unk_54->unk_0C->unk_20 = 0; diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 381f82602f..5b2540e6ba 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -55,7 +55,7 @@ ApiStatus N(func_802422C0_DF1160)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index 1b51070592..54ed6e962b 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -38,7 +38,7 @@ ApiStatus N(func_802406A4_AB0694)(Evt* script, s32 isInitialCall) { if (N(D_8024121C_AB120C)) { N(D_8024121C_AB120C) = FALSE; - set_variable(script, *args, N(D_80241220_AB1210)); + evt_set_variable(script, *args, N(D_80241220_AB1210)); return ApiStatus_DONE2; } @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8); ApiStatus N(func_802406F8_AB06E8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241220_AB1210) = get_variable(script, *args); + N(D_80241220_AB1210) = evt_get_variable(script, *args); N(D_8024121C_AB120C) = TRUE; return ApiStatus_DONE2; } @@ -61,7 +61,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); /* ApiStatus N(func_80240730_AB0720)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index dc5a957c3e..bc38d5723a 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -24,7 +24,7 @@ ApiStatus N(func_802411AC_D4E1EC)(Evt* script, s32 isInitialCall) { if (N(D_80241F94_D4EFD4)) { N(D_80241F94_D4EFD4) = FALSE; - set_variable(script, *args, N(D_80241F98_D4EFD8)); + evt_set_variable(script, *args, N(D_80241F98_D4EFD8)); return ApiStatus_DONE2; } @@ -37,7 +37,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241200_D4E240); ApiStatus N(func_80241200_D4E240)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241F98_D4EFD8) = get_variable(script, *args); + N(D_80241F98_D4EFD8) = evt_get_variable(script, *args); N(D_80241F94_D4EFD4) = TRUE; return ApiStatus_DONE2; } @@ -47,7 +47,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238_D4E278); /* ApiStatus N(func_80241238_D4E278)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -69,7 +69,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314); /* ApiStatus N(func_802412D4_D4E314)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 747227f8dc..43ce803db5 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -17,7 +17,7 @@ ApiStatus N(func_8024114C_D5113C)(Evt* script, s32 isInitialCall) { if (N(D_80242ACC_D52ABC)) { N(D_80242ACC_D52ABC) = FALSE; - set_variable(script, *args, N(D_80242AD0_D52AC0)); + evt_set_variable(script, *args, N(D_80242AD0_D52AC0)); return ApiStatus_DONE2; } @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411A0_D51190); ApiStatus N(func_802411A0_D51190)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80242AD0_D52AC0) = get_variable(script, *args); + N(D_80242AD0_D52AC0) = evt_get_variable(script, *args); N(D_80242ACC_D52ABC) = TRUE; return ApiStatus_DONE2; } @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8); /* ApiStatus N(func_802411D8_D511C8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241274_D51264); /* ApiStatus N(func_80241274_D51264)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index bfa1bdb84d..aae4b27f89 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -17,7 +17,7 @@ ApiStatus N(func_8024114C_D599DC)(Evt* script, s32 isInitialCall) { if (N(D_80241D98_D5A628)) { N(D_80241D98_D5A628) = FALSE; - set_variable(script, *args, N(D_80241D9C_D5A62C)); + evt_set_variable(script, *args, N(D_80241D9C_D5A62C)); return ApiStatus_DONE2; } @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411A0_D59A30); ApiStatus N(func_802411A0_D59A30)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80241D9C_D5A62C) = get_variable(script, *args); + N(D_80241D9C_D5A62C) = evt_get_variable(script, *args); N(D_80241D98_D5A628) = TRUE; return ApiStatus_DONE2; } @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411D8_D59A68); /* ApiStatus N(func_802411D8_D59A68)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241274_D59B04); /* ApiStatus N(func_80241274_D59B04)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 71dcc3d360..08a96bb5f5 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -17,7 +17,7 @@ ApiStatus N(func_8024114C_D6572C)(Evt* script, s32 isInitialCall) { if (N(D_802422CC_D668AC)) { N(D_802422CC_D668AC) = FALSE; - set_variable(script, *args, N(D_802422D0_D668B0)); + evt_set_variable(script, *args, N(D_802422D0_D668B0)); return ApiStatus_DONE2; } @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411A0_D65780); ApiStatus N(func_802411A0_D65780)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802422D0_D668B0) = get_variable(script, *args); + N(D_802422D0_D668B0) = evt_get_variable(script, *args); N(D_802422CC_D668AC) = TRUE; return ApiStatus_DONE2; } @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411D8_D657B8); /* ApiStatus N(func_802411D8_D657B8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241274_D65854); /* ApiStatus N(func_80241274_D65854)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -85,7 +85,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241310_D658F0); INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802413A4_D65984); /* ApiStatus N(func_802413A4_D65984)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 458c157c32..b9dc71ade5 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -17,7 +17,7 @@ ApiStatus N(func_8024114C_D6FAFC)(Evt* script, s32 isInitialCall) { if (N(D_8024219C_D70B4C)) { N(D_8024219C_D70B4C) = FALSE; - set_variable(script, *args, N(D_802421A0_D70B50)); + evt_set_variable(script, *args, N(D_802421A0_D70B50)); return ApiStatus_DONE2; } @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411A0_D6FB50); ApiStatus N(func_802411A0_D6FB50)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802421A0_D70B50) = get_variable(script, *args); + N(D_802421A0_D70B50) = evt_get_variable(script, *args); N(D_8024219C_D70B4C) = TRUE; return ApiStatus_DONE2; } @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411D8_D6FB88); /* ApiStatus N(func_802411D8_D6FB88)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241274_D6FC24); /* ApiStatus N(func_80241274_D6FC24)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c index b8e0cedc13..db8f6e6375 100644 --- a/src/world/area_pra/pra_31/D7ED80.c +++ b/src/world/area_pra/pra_31/D7ED80.c @@ -15,7 +15,7 @@ ApiStatus N(func_8024024C_D7EFAC)(Evt* script, s32 isInitialCall) { if (N(D_8024119C_D7FEFC)) { N(D_8024119C_D7FEFC) = FALSE; - set_variable(script, *args, N(D_802411A0_D7FF00)); + evt_set_variable(script, *args, N(D_802411A0_D7FF00)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402A0_D7F000); ApiStatus N(func_802402A0_D7F000)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802411A0_D7FF00) = get_variable(script, *args); + N(D_802411A0_D7FF00) = evt_get_variable(script, *args); N(D_8024119C_D7FEFC) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402D8_D7F038); /* ApiStatus N(func_802402D8_D7F038)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240374_D7F0D4); /* ApiStatus N(func_80240374_D7F0D4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_pra/pra_32/D86A20.c b/src/world/area_pra/pra_32/D86A20.c index 49aa535d63..eccbc1926b 100644 --- a/src/world/area_pra/pra_32/D86A20.c +++ b/src/world/area_pra/pra_32/D86A20.c @@ -18,17 +18,17 @@ ApiStatus N(func_8024006C_D86A6C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_3C = get_variable(script, *args++); - ptr->unk_0C = get_float_variable(script, *args++); - ptr->unk_10 = get_float_variable(script, *args++); - ptr->unk_14 = get_float_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_1C = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + 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++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; @@ -49,7 +49,7 @@ static char* N(exit_str_1) = "pra_40"; INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A20", func_802405DC_D86FDC); /* ApiStatus N(func_802405DC_D86FDC)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); arn_07_struct* ptr = script->varTable[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; @@ -64,11 +64,11 @@ ApiStatus N(func_8024061C_D8701C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; ptr->unk_54->unk_0C->unk_20 = 0; diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 63a52e951c..9555623fa4 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -32,7 +32,7 @@ ApiStatus N(func_80241AB4_D8ED04)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -135,7 +135,7 @@ ApiStatus N(func_80242698_D8F8E8)(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 09c3ce1b32..607f9dd788 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -17,7 +17,7 @@ ApiStatus N(func_8024053C_CF80AC)(Evt* script, s32 isInitialCall) { if (N(D_802432D0_CFAE40)) { N(D_802432D0_CFAE40) = FALSE; - set_variable(script, *args, N(D_802432D4_CFAE44)); + evt_set_variable(script, *args, N(D_802432D4_CFAE44)); return ApiStatus_DONE2; } @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100); ApiStatus N(func_80240590_CF8100)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_802432D4_CFAE44) = get_variable(script, *args); + N(D_802432D4_CFAE44) = evt_get_variable(script, *args); N(D_802432D0_CFAE40) = TRUE; return ApiStatus_DONE2; } @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802405C8_CF8138); /* ApiStatus N(func_802405C8_CF8138)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4); /* ApiStatus N(func_80240664_CF81D4)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -109,10 +109,10 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC); /* ApiStatus N(func_8024083C_CF83AC)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -133,16 +133,16 @@ ApiStatus N(func_8024083C_CF83AC)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -177,7 +177,7 @@ ApiStatus N(func_80240DEC_CF895C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -196,9 +196,9 @@ ApiStatus N(func_80240E70_CF89E0)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -255,7 +255,7 @@ ApiStatus N(func_80241088_CF8BF8)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024113C_CF8CAC); /* ApiStatus N(func_8024113C_CF8CAC)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -263,7 +263,7 @@ ApiStatus N(func_8024113C_CF8CAC)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241170_CF8CE0); /* ApiStatus N(func_80241170_CF8CE0)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -324,7 +324,7 @@ ApiStatus N(func_80241224_CF8D94)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268); /* void N(func_802416F8_CF9268)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index c39ce00099..ab3b111edc 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -51,10 +51,10 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398); /* ApiStatus N(func_80240C68_D06398)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -75,16 +75,16 @@ ApiStatus N(func_80240C68_D06398)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -119,7 +119,7 @@ ApiStatus N(begin_battle_D06948)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -138,9 +138,9 @@ ApiStatus N(func_8024129C_D069CC)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -197,7 +197,7 @@ ApiStatus N(func_802414B4_D06BE4)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241568_D06C98); /* ApiStatus N(func_80241568_D06C98)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -205,7 +205,7 @@ ApiStatus N(func_80241568_D06C98)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024159C_D06CCC); /* ApiStatus N(func_8024159C_D06CCC)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -266,7 +266,7 @@ ApiStatus N(func_80241650_D06D80)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254); /* void N(func_80241B24_D07254)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c index d813ab6f47..9a378baf92 100644 --- a/src/world/area_sam/sam_04/D138E0.c +++ b/src/world/area_sam/sam_04/D138E0.c @@ -15,7 +15,7 @@ ApiStatus N(func_8024053C_D13B0C)(Evt* script, s32 isInitialCall) { if (N(D_8024387C_D16E4C)) { N(D_8024387C_D16E4C) = FALSE; - set_variable(script, *args, N(D_80243880_D16E50)); + evt_set_variable(script, *args, N(D_80243880_D16E50)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240590_D13B60); ApiStatus N(func_80240590_D13B60)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80243880_D16E50) = get_variable(script, *args); + N(D_80243880_D16E50) = evt_get_variable(script, *args); N(D_8024387C_D16E4C) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_802405C8_D13B98); /* ApiStatus N(func_802405C8_D13B98)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240664_D13C34); /* ApiStatus N(func_80240664_D13C34)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index b55f8ce825..c45cada364 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -39,7 +39,7 @@ ApiStatus N(func_8024185C_D216EC)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; @@ -132,7 +132,7 @@ ApiStatus N(func_80241D8C_D21C1C)(Evt* script, s32 isInitialCall) { if (N(D_80244434_D242C4)) { N(D_80244434_D242C4) = FALSE; - set_variable(script, *args, N(D_80244438_D242C8)); + evt_set_variable(script, *args, N(D_80244438_D242C8)); return ApiStatus_DONE2; } @@ -145,7 +145,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0_D21C70); ApiStatus N(func_80241DE0_D21C70)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80244438_D242C8) = get_variable(script, *args); + N(D_80244438_D242C8) = evt_get_variable(script, *args); N(D_80244434_D242C4) = TRUE; return ApiStatus_DONE2; } @@ -155,7 +155,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8); /* ApiStatus N(func_80241E18_D21CA8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -177,7 +177,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); /* ApiStatus N(func_80241EB4_D21D44)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index 781459a83f..f2ba20a00a 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -10,7 +10,7 @@ static char* N(exit_str_1) = "sam_09"; INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024003C_D2FCBC); /* ApiStatus N(func_8024003C_D2FCBC)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -49,7 +49,7 @@ ApiStatus N(func_80240600_D30280)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index fd203d5f4b..5553ea61de 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -33,10 +33,10 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC); /* ApiStatus N(func_8024090C_D3AEDC)(Evt *script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemyID; - u16 phi_s0 = get_variable(script, EVT_SAVE_FLAG(1768)); - u16 phi_s7 = get_variable(script, EVT_SAVE_FLAG(1769)); - u16 temp_s6 = get_variable(script, EVT_SAVE_VAR(350)); - u16 phi_s5 = get_variable(script, EVT_SAVE_VAR(351)); + u16 phi_s0 = evt_get_variable(script, EVT_SAVE_FLAG(1768)); + u16 phi_s7 = evt_get_variable(script, EVT_SAVE_FLAG(1769)); + u16 temp_s6 = evt_get_variable(script, EVT_SAVE_VAR(350)); + u16 phi_s5 = evt_get_variable(script, EVT_SAVE_VAR(351)); s32 var; s32 i; @@ -57,16 +57,16 @@ ApiStatus N(func_8024090C_D3AEDC)(Evt *script, s32 isInitialCall) { if (rand_int(100) < 30) { phi_s5 = rand_int(temp_s2 - 1); temp_s6 = temp_s3; - set_variable(script, EVT_SAVE_VAR(350), temp_s6); - set_variable(script, EVT_SAVE_VAR(351), phi_s5); + evt_set_variable(script, EVT_SAVE_VAR(350), temp_s6); + evt_set_variable(script, EVT_SAVE_VAR(351), phi_s5); phi_s0 = 1; } } - set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); - set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); - temp_s0_2 = get_variable(NULL, EVT_SAVE_VAR(352)); - temp_v0 = get_variable(NULL, EVT_STORY_PROGRESS); + evt_set_variable(script, EVT_SAVE_FLAG(1768), phi_s0); + evt_set_variable(script, EVT_SAVE_FLAG(1769), phi_s7); + temp_s0_2 = evt_get_variable(NULL, EVT_SAVE_VAR(352)); + temp_v0 = evt_get_variable(NULL, EVT_STORY_PROGRESS); for (i = 0; i < 8; i++) { if (temp_v0 < (*(N(quizRequirements) + i)).unk_00) { @@ -101,7 +101,7 @@ ApiStatus N(func_80240EBC_D3B48C)(Evt *script, s32 isInitialCall) { playerData->quizzesAnswered++; } - if (script->varTable[0] == N(quizAnswers)[get_variable(NULL, EVT_SAVE_VAR(352))]) { + if (script->varTable[0] == N(quizAnswers)[evt_get_variable(NULL, EVT_SAVE_VAR(352))]) { script->varTable[0] = 1; playerData->quizzesCorrect++; } else { @@ -120,9 +120,9 @@ ApiStatus N(func_80240F40_D3B510)(Evt *script, s32 isInitialCall) { if (isInitialCall) { Effect** effect = &D_8024DFE0; - *effect = playFX_4E(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE4 = playFX_54(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3))); - D_8024DFE8 = playFX_80(0, get_variable(script, EVT_ARRAY(1)), get_variable(script, EVT_ARRAY(2)), get_variable(script, EVT_ARRAY(3)), 1.0f, 0); + *effect = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE4 = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3))); + D_8024DFE8 = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)), evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0); effectPtr = (*effect)->unk_0C; effectPtr->unk_18 = 0; @@ -179,7 +179,7 @@ ApiStatus N(func_80241158_D3B728)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024120C_D3B7DC); /* ApiStatus N(func_8024120C_D3B7DC)(Evt *script, s32 isInitialCall) { - D_8024DFE0->unk_0C->unk_34 = get_variable(script, *script->ptrReadPos); + D_8024DFE0->unk_0C->unk_34 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } */ @@ -187,7 +187,7 @@ ApiStatus N(func_8024120C_D3B7DC)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241240_D3B810); /* ApiStatus N(func_80241240_D3B810)(Evt *script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); EffectInstanceDataThing* effectPtr = D_8024DFE0->unk_0C; switch (var) { @@ -248,7 +248,7 @@ ApiStatus N(func_802412F4_D3B8C4)(Evt *script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98); /* void N(func_802417C8_D3BD98)(void) { - s32 var = get_variable(NULL, D_8024DFD8); + s32 var = evt_get_variable(NULL, D_8024DFD8); if (var == 1) { playFX_50(0, 0, 0, 0); diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 69e9bad8b7..d68953d252 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -15,7 +15,7 @@ ApiStatus N(func_8024091C_92ABCC)(Evt* script, s32 isInitialCall) { if (N(D_8024404C_92E2FC)) { N(D_8024404C_92E2FC) = FALSE; - set_variable(script, *args, N(D_80244050_92E300)); + evt_set_variable(script, *args, N(D_80244050_92E300)); return ApiStatus_DONE2; } @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240970_92AC20); ApiStatus N(func_80240970_92AC20)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80244050_92E300) = get_variable(script, *args); + N(D_80244050_92E300) = evt_get_variable(script, *args); N(D_8024404C_92E2FC) = TRUE; return ApiStatus_DONE2; } @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802409A8_92AC58); /* ApiStatus N(func_802409A8_92AC58)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index e0e8cc5dc5..918b02107d 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -73,7 +73,7 @@ ApiStatus N(func_80241120_9406D0)(Evt* script, s32 isInitialCall) { if (N(D_80242058_941608)) { N(D_80242058_941608) = FALSE; - set_variable(script, *args, N(D_8024205C_94160C)); + evt_set_variable(script, *args, N(D_8024205C_94160C)); return ApiStatus_DONE2; } @@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241174_940724); ApiStatus N(func_80241174_940724)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_8024205C_94160C) = get_variable(script, *args); + N(D_8024205C_94160C) = evt_get_variable(script, *args); N(D_80242058_941608) = TRUE; return ApiStatus_DONE2; } @@ -96,7 +96,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C); /* ApiStatus N(func_802411AC_94075C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { @@ -118,7 +118,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8); /* ApiStatus N(func_80241248_9407F8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index f0cd696d2f..4520e7924f 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -38,7 +38,7 @@ ApiStatus N(func_80240384_946254)(Evt* script, s32 isInitialCall) { if (N(D_80240E00_946CD0)) { N(D_80240E00_946CD0) = FALSE; - set_variable(script, *args, N(D_80240E04_946CD4)); + evt_set_variable(script, *args, N(D_80240E04_946CD4)); return ApiStatus_DONE2; } @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802403D8_9462A8); ApiStatus N(func_802403D8_9462A8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - N(D_80240E04_946CD4) = get_variable(script, *args); + N(D_80240E04_946CD4) = evt_get_variable(script, *args); N(D_80240E00_946CD0) = TRUE; return ApiStatus_DONE2; } @@ -61,7 +61,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240410_9462E0); /* ApiStatus N(func_80240410_9462E0)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32* ptr = get_variable(script, *args); + s32* ptr = evt_get_variable(script, *args); s32 i; if (ptr != NULL) { diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index 7189257528..fa8940b73e 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024005C_95401C); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400BC_95407C); /* ApiStatus N(func_802400BC_95407C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -57,7 +57,7 @@ ApiStatus N(func_80240680_954640)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 27d4bd8f4c..e5cca7b8cb 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -22,7 +22,7 @@ static char* N(exit_str_1) = "tik_07"; INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024031C_879EFC); /* ApiStatus N(func_8024031C_879EFC)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -61,7 +61,7 @@ ApiStatus N(func_802408E0_87A4C0)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index de9a2ca25e..e47c5ad9ed 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -9,7 +9,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240310_8866D0); INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406BC_886A7C); /* ApiStatus N(func_802406BC_886A7C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -48,7 +48,7 @@ ApiStatus N(func_80240C80_887040)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index fd43deb43a..901dee978d 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -36,7 +36,7 @@ ApiStatus N(func_80240960_889530)(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C58_889828); /* ApiStatus N(func_80240C58_889828)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -75,7 +75,7 @@ ApiStatus N(func_8024121C_889DEC)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index f47aa5be4f..e383c0a4df 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024006C_892A8C); /* ApiStatus N(func_8024006C_892A8C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -46,7 +46,7 @@ ApiStatus N(func_80240630_893050)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index 8363335dda..252c7440a8 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024062C_897C0C); /* ApiStatus N(func_8024062C_897C0C)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } */ @@ -46,7 +46,7 @@ ApiStatus N(func_80240BF0_8981D0)(Evt *script, s32 isInitialCall) { script->userData = (N(UserData)*)general_heap_malloc(0x68); scriptPtr = (N(UserData)*)script->userData; - scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args)); for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 9683437e38..4e07d00536 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -40,7 +40,7 @@ ApiStatus N(func_80241448_9A2428)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; diff --git a/src/world/area_trd/trd_03/9A4650.c b/src/world/area_trd/trd_03/9A4650.c index 8c2f1db435..71cf44b3e5 100644 --- a/src/world/area_trd/trd_03/9A4650.c +++ b/src/world/area_trd/trd_03/9A4650.c @@ -15,11 +15,11 @@ ApiStatus func_80240000_9A4650(Evt* script, s32 isInitialCall) { stickX = 2; } - set_variable(script, *args, stickX); + evt_set_variable(script, *args, stickX); return ApiStatus_DONE2; } ApiStatus GetFrameCounter(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gGameStatusPtr->frameCounter); + evt_set_variable(script, *script->ptrReadPos, gGameStatusPtr->frameCounter); return ApiStatus_DONE2; } diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index fec5140303..4adcc4dc35 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -40,7 +40,7 @@ ApiStatus N(func_80241818_9A9C08)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); f32 posX, posY, posZ, posW; territory.unk_00 = 0; @@ -162,7 +162,7 @@ ApiStatus N(func_80243124_9AB514)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 9ed5ecf5d5..ab1ae7d3c8 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -49,7 +49,7 @@ ApiStatus N(func_80241DF0_9B8770)(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* aiSettings = get_variable(script, *args); + NpcAISettings* aiSettings = evt_get_variable(script, *args); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/area_trd/trd_10/9C2910.c b/src/world/area_trd/trd_10/9C2910.c index 5b22c71793..bc9a5cd723 100644 --- a/src/world/area_trd/trd_10/9C2910.c +++ b/src/world/area_trd/trd_10/9C2910.c @@ -18,17 +18,17 @@ ApiStatus N(func_8024004C_9C295C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - set_variable(NULL, EVT_MAP_VAR(1), ptr); - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_3C = get_variable(script, *args++); - ptr->unk_0C = get_float_variable(script, *args++); - ptr->unk_10 = get_float_variable(script, *args++); - ptr->unk_14 = get_float_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_1C = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + evt_set_variable(NULL, EVT_MAP_VAR(1), ptr); + 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++); + ptr->unk_10 = evt_get_float_variable(script, *args++); + ptr->unk_14 = evt_get_float_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_1C = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_50 = (struct N(temp)*)playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; @@ -50,7 +50,7 @@ static char* N(exit_str_2) = "trd_09"; INCLUDE_ASM(s32, "world/area_trd/trd_10/9C2910", func_802405BC_9C2ECC); /* ApiStatus N(func_802405BC_9C2ECC)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); arn_07_struct* ptr = script->varTable[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; @@ -65,11 +65,11 @@ ApiStatus N(func_802405FC_9C2F0C)(Evt* script, s32 isInitialCall) { if (isInitialCall) { arn_07_struct* ptr = heap_malloc(sizeof(arn_07_struct)); script->varTable[0] = ptr; - ptr->unk_38 = get_variable(script, *args++); - ptr->unk_18 = get_float_variable(script, *args++); - ptr->unk_24 = get_float_variable(script, *args++); - ptr->unk_20 = get_float_variable(script, *args++); - ptr->unk_28 = get_float_variable(script, *args++); + ptr->unk_38 = evt_get_variable(script, *args++); + ptr->unk_18 = evt_get_float_variable(script, *args++); + ptr->unk_24 = evt_get_float_variable(script, *args++); + ptr->unk_20 = evt_get_float_variable(script, *args++); + ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; ptr->unk_54->unk_0C->unk_20 = 0; diff --git a/src/world/area_tst/tst_04/B1B570.c b/src/world/area_tst/tst_04/B1B570.c index aeea6e5fe7..632cb53146 100644 --- a/src/world/area_tst/tst_04/B1B570.c +++ b/src/world/area_tst/tst_04/B1B570.c @@ -47,14 +47,14 @@ ApiStatus func_802400FC_B1B66C(Evt* script, s32 isInitialCall) { f32 sin2; f32 cos2; - theta1 = (get_variable(script, EVT_VAR(0)) - 1) * TAU / 360.0f; + theta1 = (evt_get_variable(script, EVT_VAR(0)) - 1) * TAU / 360.0f; sinTemp = sin_rad(theta1); cosTemp = cos_rad(theta1); sin1 = -sinTemp * dist; cos1 = cosTemp * dist; - theta2 = (get_variable(script, EVT_VAR(0)) * TAU) / 360.0f; + theta2 = (evt_get_variable(script, EVT_VAR(0)) * TAU) / 360.0f; sin2 = sin_rad(theta2); cos2 = cos_rad(theta2); diff --git a/src/world/common/AddPlayerHandsOffset.inc.c b/src/world/common/AddPlayerHandsOffset.inc.c index 0a1cbe7991..c91504d274 100644 --- a/src/world/common/AddPlayerHandsOffset.inc.c +++ b/src/world/common/AddPlayerHandsOffset.inc.c @@ -5,11 +5,11 @@ ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; s32 xVar = *args++; - f32 x = (f32)get_variable(script, xVar); + f32 x = (f32)evt_get_variable(script, xVar); s32 yVar = *args++; - f32 y = (f32)get_variable(script, yVar); + f32 y = (f32)evt_get_variable(script, yVar); s32 zVar = *args++; - f32 z = (f32)get_variable(script, zVar); + f32 z = (f32)evt_get_variable(script, zVar); f32 cameraYaw; cameraYaw = gCameras[gCurrentCameraID].currentYaw; @@ -25,9 +25,9 @@ ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall) { y += playerStatus->colliderHeight * 0.5f; z -= cos_deg(cameraYaw) * 15.0f; - set_variable(script, xVar, x); - set_variable(script, yVar, y); - set_variable(script, zVar, z); + evt_set_variable(script, xVar, x); + evt_set_variable(script, yVar, y); + evt_set_variable(script, zVar, z); return ApiStatus_DONE2; } diff --git a/src/world/common/AwaitScriptComplete.inc.c b/src/world/common/AwaitScriptComplete.inc.c index 0d729bb7db..09eb3c379b 100644 --- a/src/world/common/AwaitScriptComplete.inc.c +++ b/src/world/common/AwaitScriptComplete.inc.c @@ -2,5 +2,5 @@ #include "map.h" ApiStatus N(AwaitScriptComplete)(Evt* script, s32 isInitialCall) { - return (!does_script_exist(get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2; + return (!does_script_exist(evt_get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2; } diff --git a/src/world/common/Bandit_DropCoin.inc.c b/src/world/common/Bandit_DropCoin.inc.c index 35575e4915..8966c932a8 100644 --- a/src/world/common/Bandit_DropCoin.inc.c +++ b/src/world/common/Bandit_DropCoin.inc.c @@ -9,8 +9,8 @@ ApiStatus N(Bandit_DropCoin)(Evt* script, s32 isInitialCall) { s32 areaFlag; if (isInitialCall) { - npcID = get_variable(script, *args++); - itemEntityIndex = get_variable(script, *args++); + npcID = evt_get_variable(script, *args++); + itemEntityIndex = evt_get_variable(script, *args++); areaFlag = *args++; if (npcID == -1) { @@ -30,7 +30,7 @@ ApiStatus N(Bandit_DropCoin)(Evt* script, s32 isInitialCall) { itemEntityIndex = script->functionTemp[1]; areaFlag = script->functionTemp[2]; - if (get_variable(script, areaFlag)) { + if (evt_get_variable(script, areaFlag)) { set_item_entity_position(itemEntityIndex, npc->pos.x, npc->pos.y + 30.0f, npc->pos.z); return ApiStatus_BLOCK; } diff --git a/src/world/common/CamSetFOV.inc.c b/src/world/common/CamSetFOV.inc.c index 745267bf84..36d11e1a0f 100644 --- a/src/world/common/CamSetFOV.inc.c +++ b/src/world/common/CamSetFOV.inc.c @@ -3,9 +3,9 @@ ApiStatus N(CamSetFOV)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 camIdx = get_variable(script, *args++); + s32 camIdx = evt_get_variable(script, *args++); - gCameras[camIdx].vfov = get_variable(script, *args++); + gCameras[camIdx].vfov = evt_get_variable(script, *args++); return ApiStatus_DONE2; } diff --git a/src/world/common/CheckItemFlags40.inc.c b/src/world/common/CheckItemFlags40.inc.c index aec9e289cc..ba604b0fee 100644 --- a/src/world/common/CheckItemFlags40.inc.c +++ b/src/world/common/CheckItemFlags40.inc.c @@ -3,7 +3,7 @@ ApiStatus N(CheckItemFlags40)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 itemIndex = get_variable(script, *args++); + s32 itemIndex = evt_get_variable(script, *args++); script->varTable[0] = FALSE; if (gItemTable[itemIndex].typeFlags & 0x40) { diff --git a/src/world/common/DeadFoliage.inc.c b/src/world/common/DeadFoliage.inc.c index f503f6b034..533f6c16e0 100644 --- a/src/world/common/DeadFoliage.inc.c +++ b/src/world/common/DeadFoliage.inc.c @@ -10,11 +10,11 @@ void N(foliage_setup_shear_mtx)(Matrix4f mtx, f32 scale, f32 xAmount, f32 zAmoun ApiStatus N(DeadTransformFoliage)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 modelListIndex = func_80125270(get_variable(script, *args++)); - f32 scale = get_float_variable(script, *args++); - f32 dx = get_float_variable(script, *args++); - f32 dy = get_float_variable(script, *args++); - f32 dz = get_float_variable(script, *args++); + s32 modelListIndex = func_80125270(evt_get_variable(script, *args++)); + f32 scale = evt_get_float_variable(script, *args++); + f32 dx = evt_get_float_variable(script, *args++); + f32 dy = evt_get_float_variable(script, *args++); + f32 dz = evt_get_float_variable(script, *args++); Model* model = func_80124F44(modelListIndex); Matrix4f mtx; diff --git a/src/world/common/DeadGetItemName.inc.c b/src/world/common/DeadGetItemName.inc.c index 6530a6b63d..866c5ac14a 100644 --- a/src/world/common/DeadGetItemName.inc.c +++ b/src/world/common/DeadGetItemName.inc.c @@ -3,8 +3,8 @@ ApiStatus N(DeadGetItemName)(Evt* script, s32 isInitialCall) { Bytecode args = *script->ptrReadPos; - s32 itemID = get_variable(script, args); + s32 itemID = evt_get_variable(script, args); - set_variable(script, args, LOOKUP_ITEM(itemID).nameString); + evt_set_variable(script, args, LOOKUP_ITEM(itemID).nameString); return ApiStatus_DONE2; } diff --git a/src/world/common/GetCamVfov.inc.c b/src/world/common/GetCamVfov.inc.c index 3971384cb7..86c9a23ddf 100644 --- a/src/world/common/GetCamVfov.inc.c +++ b/src/world/common/GetCamVfov.inc.c @@ -3,8 +3,8 @@ ApiStatus N(GetCamVfov)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 cameraID = get_variable(script, *args++); + s32 cameraID = evt_get_variable(script, *args++); - set_variable(script, *args++, EVT_FIXED(gCameras[cameraID].vfov)); + evt_set_variable(script, *args++, EVT_FIXED(gCameras[cameraID].vfov)); return ApiStatus_DONE2; } diff --git a/src/world/common/GetEncounterEnemyIsOwner.inc.c b/src/world/common/GetEncounterEnemyIsOwner.inc.c index 23bc095c07..4a2b8b034f 100644 --- a/src/world/common/GetEncounterEnemyIsOwner.inc.c +++ b/src/world/common/GetEncounterEnemyIsOwner.inc.c @@ -4,6 +4,6 @@ ApiStatus N(GetEncounterEnemyIsOwner)(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; - set_variable(script, EVT_VAR(0), gCurrentEncounter.currentEnemy == enemy); + evt_set_variable(script, EVT_VAR(0), gCurrentEncounter.currentEnemy == enemy); return ApiStatus_DONE2; } diff --git a/src/world/common/GetEntityPosition.inc.c b/src/world/common/GetEntityPosition.inc.c index 0ca65d3dc8..b4fb02139e 100644 --- a/src/world/common/GetEntityPosition.inc.c +++ b/src/world/common/GetEntityPosition.inc.c @@ -3,10 +3,10 @@ ApiStatus N(GetEntityPosition)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Entity* entity = get_entity_by_index(get_variable(script, *args++)); + Entity* entity = get_entity_by_index(evt_get_variable(script, *args++)); - set_variable(script, *args++, entity->position.x); - set_variable(script, *args++, entity->position.y); - set_variable(script, *args++, entity->position.z); + evt_set_variable(script, *args++, entity->position.x); + evt_set_variable(script, *args++, entity->position.y); + evt_set_variable(script, *args++, entity->position.z); return ApiStatus_DONE2; } diff --git a/src/world/common/GetEntryPos.inc.c b/src/world/common/GetEntryPos.inc.c index 7910afecd0..de5a16baa3 100644 --- a/src/world/common/GetEntryPos.inc.c +++ b/src/world/common/GetEntryPos.inc.c @@ -3,11 +3,11 @@ ApiStatus N(GetEntryPos)(Evt* script, s32 isInitialCall) { MapConfig* mapConfig = get_current_map_header(); - s32 index = get_variable(script, EVT_VAR(0)); + s32 index = evt_get_variable(script, EVT_VAR(0)); - set_variable(script, EVT_VAR(1), ((Vec4f*)*mapConfig->entryList)[index].x); - set_variable(script, EVT_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); - set_variable(script, EVT_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); - set_variable(script, EVT_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); + evt_set_variable(script, EVT_VAR(1), ((Vec4f*)*mapConfig->entryList)[index].x); + evt_set_variable(script, EVT_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); + evt_set_variable(script, EVT_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); + evt_set_variable(script, EVT_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); return ApiStatus_DONE2; } diff --git a/src/world/common/GetFloorCollider.inc.c b/src/world/common/GetFloorCollider.inc.c index e4a5de16c7..727a2f135b 100644 --- a/src/world/common/GetFloorCollider.inc.c +++ b/src/world/common/GetFloorCollider.inc.c @@ -4,6 +4,6 @@ ApiStatus N(GetFloorCollider)(Evt* script, s32 isInitialCall) { CollisionStatus* collisionStatus = &gCollisionStatus; - set_variable(script, *script->ptrReadPos, collisionStatus->currentFloor); + evt_set_variable(script, *script->ptrReadPos, collisionStatus->currentFloor); return ApiStatus_DONE2; } diff --git a/src/world/common/GetGameStatus75.inc.c b/src/world/common/GetGameStatus75.inc.c index 7329c7a1b6..dce895b9c6 100644 --- a/src/world/common/GetGameStatus75.inc.c +++ b/src/world/common/GetGameStatus75.inc.c @@ -2,6 +2,6 @@ #include "map.h" ApiStatus N(GetGameStatus75)(Evt* script, s32 isInitialCall) { - set_variable(script, EVT_VAR(0), gGameStatusPtr->debugQuizmo); + evt_set_variable(script, EVT_VAR(0), gGameStatusPtr->debugQuizmo); return ApiStatus_DONE2; } diff --git a/src/world/common/GetItemName.inc.c b/src/world/common/GetItemName.inc.c index ee494d74c7..0d78eaca43 100644 --- a/src/world/common/GetItemName.inc.c +++ b/src/world/common/GetItemName.inc.c @@ -3,8 +3,8 @@ ApiStatus N(GetItemName)(Evt* script, s32 isInitialCall) { Bytecode a0 = *script->ptrReadPos; - s32 itemID = get_variable(script, a0); + s32 itemID = evt_get_variable(script, a0); - set_variable(script, a0, LOOKUP_ITEM(itemID).nameString); + evt_set_variable(script, a0, LOOKUP_ITEM(itemID).nameString); return ApiStatus_DONE2; } diff --git a/src/world/common/GetNpcCollisionHeight.inc.c b/src/world/common/GetNpcCollisionHeight.inc.c index ad176ef994..173e030109 100644 --- a/src/world/common/GetNpcCollisionHeight.inc.c +++ b/src/world/common/GetNpcCollisionHeight.inc.c @@ -3,11 +3,11 @@ ApiStatus N(GetNpcCollisionHeight)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - NpcID npcID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); Npc* npc = get_npc_safe(npcID); if (npc != NULL) { - set_variable(script, *args++, npc->collisionHeight); + evt_set_variable(script, *args++, npc->collisionHeight); } return ApiStatus_DONE2; } diff --git a/src/world/common/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c index 7ad99491b4..63d4c7219f 100644 --- a/src/world/common/GetPartnerCall800EB168.inc.c +++ b/src/world/common/GetPartnerCall800EB168.inc.c @@ -2,12 +2,12 @@ #include "map.h" ApiStatus N(GetPartnerCall800EB168)(Evt* script, s32 isInitialCall) { - set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner); + evt_set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner); switch_to_partner(0); return ApiStatus_DONE2; } ApiStatus N(Call800EB168)(Evt* script, s32 isInitialCall) { - switch_to_partner((s8)get_variable(script, *script->ptrReadPos)); + switch_to_partner((s8)evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/world/common/PlayFX3D.inc.c b/src/world/common/PlayFX3D.inc.c index 287626d4a3..7a40314635 100644 --- a/src/world/common/PlayFX3D.inc.c +++ b/src/world/common/PlayFX3D.inc.c @@ -3,14 +3,14 @@ ApiStatus N(PlayFX3D)(Evt* script, s32 isInitialStatus) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - f32 var3 = get_float_variable(script, *args++); - f32 var4 = get_float_variable(script, *args++); - f32 var5 = get_float_variable(script, *args++); - f32 var6 = get_float_variable(script, *args++); - f32 var7 = get_float_variable(script, *args++); - s32 var8 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + f32 var3 = evt_get_float_variable(script, *args++); + f32 var4 = evt_get_float_variable(script, *args++); + f32 var5 = evt_get_float_variable(script, *args++); + f32 var6 = evt_get_float_variable(script, *args++); + f32 var7 = evt_get_float_variable(script, *args++); + s32 var8 = evt_get_variable(script, *args++); s32 outVal; playFX_3D(var1, var2, var3, var4, var5, var6, var7, var8, &outVal); diff --git a/src/world/common/SetCamVfov.inc.c b/src/world/common/SetCamVfov.inc.c index 3548134df4..5d3669dc0d 100644 --- a/src/world/common/SetCamVfov.inc.c +++ b/src/world/common/SetCamVfov.inc.c @@ -3,8 +3,8 @@ ApiStatus N(SetCamVfov)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 cameraID = get_variable(script, *args++); + s32 cameraID = evt_get_variable(script, *args++); - gCameras[cameraID].vfov = get_float_variable(script, *args++); + gCameras[cameraID].vfov = evt_get_float_variable(script, *args++); return ApiStatus_DONE2; } diff --git a/src/world/common/SetEntityPosition.inc.c b/src/world/common/SetEntityPosition.inc.c index 9c2bb9b0de..915689ce02 100644 --- a/src/world/common/SetEntityPosition.inc.c +++ b/src/world/common/SetEntityPosition.inc.c @@ -3,10 +3,10 @@ ApiStatus N(SetEntityPosition)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 entityIndex = get_variable(script, *args++); - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); + s32 entityIndex = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); Entity* entity = get_entity_by_index(entityIndex); entity->position.x = x; diff --git a/src/world/common/SetManyVars.inc.c b/src/world/common/SetManyVars.inc.c index 1d623babe2..1b59d2c286 100644 --- a/src/world/common/SetManyVars.inc.c +++ b/src/world/common/SetManyVars.inc.c @@ -4,15 +4,15 @@ ApiStatus N(SetManyVars)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - script->varTable[2] = get_variable(script, *args++); - script->varTable[3] = get_variable(script, *args++); - script->varTable[4] = get_variable(script, *args++); - script->varTable[5] = get_variable(script, *args++); - script->varTable[6] = get_variable(script, *args++); - script->varTable[7] = get_variable(script, *args++); - script->varTable[8] = get_variable(script, *args++); - script->varTable[9] = get_variable(script, *args++); - script->varTable[10] = get_variable(script, *args++); - script->varTable[11] = get_variable(script, *args++); + script->varTable[2] = evt_get_variable(script, *args++); + script->varTable[3] = evt_get_variable(script, *args++); + script->varTable[4] = evt_get_variable(script, *args++); + script->varTable[5] = evt_get_variable(script, *args++); + script->varTable[6] = evt_get_variable(script, *args++); + script->varTable[7] = evt_get_variable(script, *args++); + script->varTable[8] = evt_get_variable(script, *args++); + script->varTable[9] = evt_get_variable(script, *args++); + script->varTable[10] = evt_get_variable(script, *args++); + script->varTable[11] = evt_get_variable(script, *args++); return ApiStatus_DONE2; } diff --git a/src/world/common/SomeXYZFunc2.inc.c b/src/world/common/SomeXYZFunc2.inc.c index e40564718d..2e4f0ecf73 100644 --- a/src/world/common/SomeXYZFunc2.inc.c +++ b/src/world/common/SomeXYZFunc2.inc.c @@ -3,15 +3,15 @@ ApiStatus N(SomeXYZFunc2)(Evt* script, s32 isInitialStatus) { PlayerStatus* playerStatus = &gPlayerStatus; - f32 r = get_float_variable(script, *script->ptrReadPos); + f32 r = evt_get_float_variable(script, *script->ptrReadPos); f32 x = playerStatus->position.x; f32 y = playerStatus->position.y; f32 z = playerStatus->position.z; add_vec2D_polar(&x, &z, r, playerStatus->targetYaw); - set_float_variable(script, EVT_VAR(0), x); - set_float_variable(script, EVT_VAR(1), y); - set_float_variable(script, EVT_VAR(2), z); + evt_set_float_variable(script, EVT_VAR(0), x); + evt_set_float_variable(script, EVT_VAR(1), y); + evt_set_float_variable(script, EVT_VAR(2), z); return ApiStatus_DONE2; } diff --git a/src/world/common/SwitchToPartner.inc.c b/src/world/common/SwitchToPartner.inc.c index 2c6b005e20..59a3bbdee5 100644 --- a/src/world/common/SwitchToPartner.inc.c +++ b/src/world/common/SwitchToPartner.inc.c @@ -1,6 +1,6 @@ #include "common.h" ApiStatus N(SwitchToPartner)(Evt* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); + switch_to_partner(evt_get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } diff --git a/src/world/common/UnkCameraFunc.inc.c b/src/world/common/UnkCameraFunc.inc.c index 0b2a5ef534..87e5abdd02 100644 --- a/src/world/common/UnkCameraFunc.inc.c +++ b/src/world/common/UnkCameraFunc.inc.c @@ -3,20 +3,20 @@ ApiStatus N(UnkCameraFunc)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var0 = get_variable(script, *args++); - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var0 = evt_get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); Bytecode out1 = *args++; Bytecode out2 = *args++; s32 cameraYaw = gCameras[gCurrentCameraID].currentYaw; - s32 outVal1 = get_variable(script, EVT_ARRAY(1)) - (var2 * cos_deg(cameraYaw)); - s32 outVal2 = get_variable(script, EVT_ARRAY(3)) - (var2 * sin_deg(cameraYaw)); + s32 outVal1 = evt_get_variable(script, EVT_ARRAY(1)) - (var2 * cos_deg(cameraYaw)); + s32 outVal2 = evt_get_variable(script, EVT_ARRAY(3)) - (var2 * sin_deg(cameraYaw)); outVal1 -= var0; outVal2 -= var1; - set_variable(script, out1, outVal1); - set_variable(script, out2, outVal2); + evt_set_variable(script, out1, outVal1); + evt_set_variable(script, out2, outVal2); return ApiStatus_DONE2; } diff --git a/src/world/common/UnkFunc11.inc.c b/src/world/common/UnkFunc11.inc.c index a3fe44d6f2..12dedb9dc4 100644 --- a/src/world/common/UnkFunc11.inc.c +++ b/src/world/common/UnkFunc11.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) { - s32 var = get_variable(script, *script->ptrReadPos); + s32 var = evt_get_variable(script, *script->ptrReadPos); PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus = &gCollisionStatus; diff --git a/src/world/common/UnkFunc18.inc.c b/src/world/common/UnkFunc18.inc.c index b3c49c70d0..a4434031d3 100644 --- a/src/world/common/UnkFunc18.inc.c +++ b/src/world/common/UnkFunc18.inc.c @@ -4,11 +4,11 @@ ApiStatus N(UnkFunc18)(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; Bytecode* args = script->ptrReadPos; - s32 partnerIdx = get_variable(script, *args++); + s32 partnerIdx = evt_get_variable(script, *args++); s32 evt_var = *args++; playerData->partners[partnerIdx].level++; - set_variable(script, evt_var, playerData->partners[partnerIdx].level); + evt_set_variable(script, evt_var, playerData->partners[partnerIdx].level); return ApiStatus_DONE2; } diff --git a/src/world/common/UnkFunc20.inc.c b/src/world/common/UnkFunc20.inc.c index c9edeffdcd..bb87e4db78 100644 --- a/src/world/common/UnkFunc20.inc.c +++ b/src/world/common/UnkFunc20.inc.c @@ -4,13 +4,13 @@ ApiStatus N(UnkFunc20)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 entityIdx = get_variable(script, *args++); + s32 entityIdx = evt_get_variable(script, *args++); Entity* entity = get_entity_by_index(entityIdx); s32 evt_var = *args++; EffectInstance* effectInst = playFX_52(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f, 0); - set_variable(script, evt_var, (s32) effectInst); + evt_set_variable(script, evt_var, (s32) effectInst); return ApiStatus_DONE2; } diff --git a/src/world/common/UnkFunc21.inc.c b/src/world/common/UnkFunc21.inc.c index f035d967a3..ef10626884 100644 --- a/src/world/common/UnkFunc21.inc.c +++ b/src/world/common/UnkFunc21.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(UnkFunc21)(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(get_variable(script, *script->ptrReadPos)); + Entity* entity = get_entity_by_index(evt_get_variable(script, *script->ptrReadPos)); playFX_33(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B); diff --git a/src/world/common/UnkFunc23.inc.c b/src/world/common/UnkFunc23.inc.c index 07feaeb38b..a87ebb2503 100644 --- a/src/world/common/UnkFunc23.inc.c +++ b/src/world/common/UnkFunc23.inc.c @@ -6,8 +6,8 @@ s32 N(UnkFunc23)(Evt* script, s32 isInitialCall) { s32 ret = 0; if (isInitialCall) { - script->varTable[0] = get_variable(script, *args++); - script->varTable[1] = get_variable(script, *args++); + script->varTable[0] = evt_get_variable(script, *args++); + script->varTable[1] = evt_get_variable(script, *args++); script->functionTemp[0] = 0; script->functionTemp[1] = 0; set_screen_overlay_color(0, 0xD0, 0xD0, 0xD0); diff --git a/src/world/common/UnkFunc26.inc.c b/src/world/common/UnkFunc26.inc.c index cc064b5350..efb1dc4edd 100644 --- a/src/world/common/UnkFunc26.inc.c +++ b/src/world/common/UnkFunc26.inc.c @@ -6,16 +6,16 @@ void set_model_env_color_parameters(u8 var2, u8 var3, u8 var4, u8 var5, u8 var6, ApiStatus N(UnkFunc26)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - s32 var5 = get_variable(script, *args++); - s32 var6 = get_variable(script, *args++); - s32 var7 = get_variable(script, *args++); - s32 var8 = get_variable(script, *args++); - s32 var9 = get_variable(script, *args++); - s32 var10 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + s32 var5 = evt_get_variable(script, *args++); + s32 var6 = evt_get_variable(script, *args++); + s32 var7 = evt_get_variable(script, *args++); + s32 var8 = evt_get_variable(script, *args++); + s32 var9 = evt_get_variable(script, *args++); + s32 var10 = evt_get_variable(script, *args++); switch (var1) { case 1: diff --git a/src/world/common/UnkFunc27.inc.c b/src/world/common/UnkFunc27.inc.c index b1ba21e916..53ddf34f3c 100644 --- a/src/world/common/UnkFunc27.inc.c +++ b/src/world/common/UnkFunc27.inc.c @@ -5,9 +5,9 @@ void func_8011B950(u16, s32, s32, s32); ApiStatus N(UnkFunc27)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 testS2 = get_variable(script, *args++); - s32 testS0 = get_variable(script, *args++); - s32 testS1 = get_variable(script, *args++); + s32 testS2 = evt_get_variable(script, *args++); + s32 testS0 = evt_get_variable(script, *args++); + s32 testS1 = evt_get_variable(script, *args++); s32* temp_s0_3 = testS0; s32 temp_s1 = testS1; s32 temp_s2 = testS2; diff --git a/src/world/common/UnkFunc32.inc.c b/src/world/common/UnkFunc32.inc.c index f73f49b875..f2e9508db4 100644 --- a/src/world/common/UnkFunc32.inc.c +++ b/src/world/common/UnkFunc32.inc.c @@ -3,8 +3,8 @@ ApiStatus N(UnkFunc32)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); set_screen_overlay_center(0, 0, 190, 145); set_screen_overlay_params_front(var1, var2); diff --git a/src/world/common/UnkFunc35.inc.c b/src/world/common/UnkFunc35.inc.c index 4331c78219..c0d6bdbe0b 100644 --- a/src/world/common/UnkFunc35.inc.c +++ b/src/world/common/UnkFunc35.inc.c @@ -3,9 +3,9 @@ ApiStatus N(UnkFunc35)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); set_screen_overlay_color(0, var1, var2, var3); return ApiStatus_DONE2; diff --git a/src/world/common/UnkFunc39.inc.c b/src/world/common/UnkFunc39.inc.c index 1de1f8443e..659c0bdc5e 100644 --- a/src/world/common/UnkFunc39.inc.c +++ b/src/world/common/UnkFunc39.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(UnkFunc39)(Evt* script, s32 isInitialCall) { - EffectGraphics* effect = (EffectGraphics*)get_variable(script, *script->ptrReadPos); + EffectGraphics* effect = (EffectGraphics*)evt_get_variable(script, *script->ptrReadPos); effect->flags |= 0x10; diff --git a/src/world/common/UnkFunc41.inc.c b/src/world/common/UnkFunc41.inc.c index 795ad16d73..abe62ebf6a 100644 --- a/src/world/common/UnkFunc41.inc.c +++ b/src/world/common/UnkFunc41.inc.c @@ -4,8 +4,8 @@ ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerData* playerData = &gPlayerData; - NpcID npcID = get_variable(script, *args++); - PartnerID partnerID = get_variable(script, *args++); + NpcID npcID = evt_get_variable(script, *args++); + PartnerID partnerID = evt_get_variable(script, *args++); Npc* npc = get_npc_safe(npcID); if (isInitialCall) { diff --git a/src/world/common/UnkMoveFunc2.inc.c b/src/world/common/UnkMoveFunc2.inc.c index e92cce7dbe..4c1c7249e0 100644 --- a/src/world/common/UnkMoveFunc2.inc.c +++ b/src/world/common/UnkMoveFunc2.inc.c @@ -3,10 +3,10 @@ ApiStatus N(UnkMoveFunc2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - f32 var4 = get_float_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + f32 var4 = evt_get_float_variable(script, *args++); playFX_6B(6, var1 + 10, var2 + 18, var3, var4, 45); playFX_33(12, var1 + 10, var2 + 18, var3, var4, 30); diff --git a/src/world/common/UnkMoveFunc3.inc.c b/src/world/common/UnkMoveFunc3.inc.c index 2bebfba33d..8783a0c737 100644 --- a/src/world/common/UnkMoveFunc3.inc.c +++ b/src/world/common/UnkMoveFunc3.inc.c @@ -3,10 +3,10 @@ ApiStatus N(UnkMoveFunc3)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = get_variable(script, *args++); - s32 var2 = get_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - f32 var4 = get_float_variable(script, *args++); + s32 var1 = evt_get_variable(script, *args++); + s32 var2 = evt_get_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + f32 var4 = evt_get_float_variable(script, *args++); playFX_6B(6, var1 + 10, var2 + 18, var3, var4, 45); playFX_33(13, var1 + 10, var2 + 18, var3, var4, 30); diff --git a/src/world/common/UnkMusicFunc.inc.c b/src/world/common/UnkMusicFunc.inc.c index 009ea8e939..7b9a9a9897 100644 --- a/src/world/common/UnkMusicFunc.inc.c +++ b/src/world/common/UnkMusicFunc.inc.c @@ -8,14 +8,14 @@ ApiStatus N(UnkMusicFunc)(Evt* script, s32 isInitialCall) { f32 dist; if (isInitialCall) { - script->functionTemp[0] = get_variable(script, *args); + script->functionTemp[0] = evt_get_variable(script, *args); script->functionTemp[1] = 0; script->functionTemp[2] = ((s32*)(script->functionTemp[0]))[5]; } something = (X32*) script->functionTemp[0]; - if (get_variable(script, script->functionTemp[2])) { + if (evt_get_variable(script, script->functionTemp[2])) { if (script->functionTemp[1] != 2) { script->functionTemp[1] = 2; cond = TRUE; diff --git a/src/world/common/UnkNpcAIFunc27.inc.c b/src/world/common/UnkNpcAIFunc27.inc.c index d8d4aea475..e70905e2c1 100644 --- a/src/world/common/UnkNpcAIFunc27.inc.c +++ b/src/world/common/UnkNpcAIFunc27.inc.c @@ -7,7 +7,7 @@ ApiStatus N(UnkNpcAIFunc27)(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/common/UnkNpcAIFunc28.inc.c b/src/world/common/UnkNpcAIFunc28.inc.c index cbca6f77d6..5cf1043c4c 100644 --- a/src/world/common/UnkNpcAIFunc28.inc.c +++ b/src/world/common/UnkNpcAIFunc28.inc.c @@ -7,7 +7,7 @@ ApiStatus N(UnkNpcAIFunc28)(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EnemyTerritoryThing territory; EnemyTerritoryThing* territoryPtr = &territory; - NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + NpcAISettings* npcAISettings = (NpcAISettings*)evt_get_variable(script, *args++); territory.unk_00 = 0; territory.shape = enemy->territory->wander.detectShape; diff --git a/src/world/common/UnkPartnerFuncs.inc.c b/src/world/common/UnkPartnerFuncs.inc.c index 4154924b1c..5230a036ac 100644 --- a/src/world/common/UnkPartnerFuncs.inc.c +++ b/src/world/common/UnkPartnerFuncs.inc.c @@ -25,9 +25,9 @@ ApiStatus N(UnkMovePartner)(Evt* script, s32 isInitialCall) { f32* z = (f32*) &script->functionTemp[3]; if (isInitialCall) { - *x = get_float_variable(script, EVT_VAR(0)) / 60.0f; - *y = get_float_variable(script, EVT_VAR(5)) / 60.0f; - *z = get_float_variable(script, EVT_VAR(1)) / 60.0f; + *x = evt_get_float_variable(script, EVT_VAR(0)) / 60.0f; + *y = evt_get_float_variable(script, EVT_VAR(5)) / 60.0f; + *z = evt_get_float_variable(script, EVT_VAR(1)) / 60.0f; script->functionTemp[0] = 60; } diff --git a/src/world/common/UnkPositionFunc.inc.c b/src/world/common/UnkPositionFunc.inc.c index 3a6b1c96ae..a01583409e 100644 --- a/src/world/common/UnkPositionFunc.inc.c +++ b/src/world/common/UnkPositionFunc.inc.c @@ -4,10 +4,10 @@ ApiStatus N(UnkPositionFunc)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerStatus* playerStatus = &gPlayerStatus; - f32 var0 = get_variable(script, *args++); - f32 var1 = get_variable(script, *args++); - f32 var2 = get_variable(script, *args++); - f32 var3 = get_variable(script, *args++); + f32 var0 = evt_get_variable(script, *args++); + f32 var1 = evt_get_variable(script, *args++); + f32 var2 = evt_get_variable(script, *args++); + f32 var3 = evt_get_variable(script, *args++); f32 temp; temp = (var3 - var1) / (var2 - var0); diff --git a/src/world/common/UnkYawFunc.inc.c b/src/world/common/UnkYawFunc.inc.c index 53d3373475..b2892a4a4a 100644 --- a/src/world/common/UnkYawFunc.inc.c +++ b/src/world/common/UnkYawFunc.inc.c @@ -4,20 +4,20 @@ ApiStatus N(UnkYawFunc)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a0 = *args++; - f32 a = get_variable(script, a0); + f32 a = evt_get_variable(script, a0); s32 a1 = *args++; - f32 b = get_variable(script, a1); + f32 b = evt_get_variable(script, a1); s32 a2 = *args++; - f32 c = get_variable(script, a2); + f32 c = evt_get_variable(script, a2); Npc* partner = get_npc_unsafe(NPC_PARTNER); f32 currentCamYaw = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); add_vec2D_polar(&a, &c, 15.0f, partner->yaw); add_vec2D_polar(&a, &c, 10.0f, currentCamYaw); - set_variable(script, a0, a); - set_variable(script, a1, b); - set_variable(script, a2, c); + evt_set_variable(script, a0, a); + evt_set_variable(script, a1, b); + evt_set_variable(script, a2, c); return ApiStatus_DONE2; } diff --git a/src/world/common/foliage.inc.c b/src/world/common/foliage.inc.c index 6295770aec..880fff8cd2 100644 --- a/src/world/common/foliage.inc.c +++ b/src/world/common/foliage.inc.c @@ -51,11 +51,11 @@ void N(foliage_setup_shear_mtx)(Matrix4f mtx, f32 scale, f32 xAmount, f32 zAmoun /// @apiparam float dz ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 modelListIndex = get_model_list_index_from_tree_index(get_variable(script, *args++)); - f32 scale = get_float_variable(script, *args++); - f32 dx = get_float_variable(script, *args++); - f32 dy = get_float_variable(script, *args++); - f32 dz = get_float_variable(script, *args++); + s32 modelListIndex = get_model_list_index_from_tree_index(evt_get_variable(script, *args++)); + f32 scale = evt_get_float_variable(script, *args++); + f32 dx = evt_get_float_variable(script, *args++); + f32 dy = evt_get_float_variable(script, *args++); + f32 dz = evt_get_float_variable(script, *args++); Model* model = get_model_from_list_index(modelListIndex); Matrix4f mtx; diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 32e8a5d67b..566ba535d0 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -151,7 +151,7 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { static s32 D_80286524; Shop* shop = gGameStatusPtr->mapShop; - s32 currentItemSlot = get_variable(script, *script->ptrReadPos); + s32 currentItemSlot = evt_get_variable(script, *script->ptrReadPos); if (!(shop->flags & 8)) { shop->currentItemSlot = currentItemSlot; @@ -390,6 +390,6 @@ INCLUDE_ASM(ApiStatus, "world/script_api/7E0E80", MakeShop, Evt* script, s32 isI ApiStatus MakeShopOwner(Evt* script, s32 isInitialCall) { Shop* mapShop = gGameStatusPtr->mapShop; - mapShop->owner = get_variable(script, *script->ptrReadPos); + mapShop->owner = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } diff --git a/src/world/script_api/7E2AA0.c b/src/world/script_api/7E2AA0.c index de6f35310c..3019cf0b11 100644 --- a/src/world/script_api/7E2AA0.c +++ b/src/world/script_api/7E2AA0.c @@ -25,7 +25,7 @@ typedef struct { ApiStatus func_80281C20(Evt* script, s32 isInitialCall) { Bytecode* thisPos = script->ptrReadPos; - func_800EF414(get_variable(script, *thisPos++), get_variable(script, *thisPos++)); + func_800EF414(evt_get_variable(script, *thisPos++), evt_get_variable(script, *thisPos++)); partner_set_tether_distance(0.0f); return ApiStatus_DONE2; } @@ -53,7 +53,7 @@ ApiStatus func_80282324(Evt* script, s32 isInitialCall) { ApiStatus func_80282338(Evt* script, s32 isInitialCall) { UNK_TYPE* temp_s0 = script->functionTemp[1]; - *temp_s0 = get_variable(script, *script->ptrReadPos); + *temp_s0 = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -69,7 +69,7 @@ ApiStatus func_80282594(Evt* script, s32 isInitialCall) { Camera* camera; f32 temp_f0; - temp_f0 = get_float_variable(script, *script->ptrReadPos); + temp_f0 = evt_get_float_variable(script, *script->ptrReadPos); camera = &gCameras[0]; if (temp_f0 >= 0.0f) { diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c index cb8e391da6..cd8e014339 100644 --- a/src/world/script_api/7E3700.c +++ b/src/world/script_api/7E3700.c @@ -22,9 +22,9 @@ INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283174); ApiStatus CheckActionState(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Bytecode a0 = *args++; - s32 var = get_float_variable(script, *args); + s32 var = evt_get_float_variable(script, *args); - set_variable(script, a0, gPlayerActionState == var); + evt_set_variable(script, a0, gPlayerActionState == var); return ApiStatus_DONE2; } diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c index ac770e27dc..de3c0212e8 100644 --- a/src/world/script_api/7E4690.c +++ b/src/world/script_api/7E4690.c @@ -80,7 +80,7 @@ ApiStatus PlayerMoveToDoor(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; if (isInitialCall) { - script->functionTemp[0] = get_variable(script, *args++); + script->functionTemp[0] = evt_get_variable(script, *args++); move_player(script->functionTemp[0], playerStatus->targetYaw, playerStatus->runSpeed); } diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 442eb0e338..95afbd61f3 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -11,7 +11,7 @@ func_8002AF18 = 0x8002AF18; dead_clamp_angle = 0x8002AE14; func_8004D800 = 0x8004D800; func_8002B28C = 0x8002B28C; -dead_get_variable = 0x802D4E8C; +dead_evt_get_variable = 0x802D4E8C; func_8004D9C0 = 0x8004D9C0; func_8004DAD8 = 0x8004DAD8; func_8004DF64 = 0x8004DF64; @@ -33,12 +33,12 @@ dead_rand_int = 0x8002ACEC; func_8003E534 = 0x8003E534; // get_npc_safe func_8002BFD4 = 0x8002BFD4; func_8002C01C = 0x8002C01C; -dead_set_variable = 0x802D5468; +dead_evt_set_variable = 0x802D5468; func_8002B5DC = 0x8002B5DC; func_8002B640 = 0x8002B640; func_800F1EF8 = 0x800F1EF8; func_8015704C = 0x8015704C; -dead_get_float_variable = 0x802D57FC; +dead_evt_get_float_variable = 0x802D57FC; func_80077C30 = 0x80077C30; func_8002B6A4 = 0x8002B6A4; func_80077930 = 0x80077930; @@ -57,7 +57,7 @@ func_80041080 = 0x80041080; func_800F1D9C = 0x800F1D9C; func_800F1730 = 0x800F1730; func_8003C43C = 0x8003C43C; -dead_set_float_variable = 0x802D5A10; +dead_evt_set_float_variable = 0x802D5A10; func_800F1718 = 0x800F1718; func_800F16F4 = 0x800F16F4; func_80125270 = 0x80125270; diff --git a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s index 2d52d03996..03a3275cf4 100644 --- a/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s +++ b/ver/us/asm/nonmatchings/167570/filemenu_yesno_handle_input.s @@ -438,7 +438,7 @@ glabel L802477F8_168058 /* 168080 80247820 2402000B */ addiu $v0, $zero, 0xb /* 168084 80247824 A4600086 */ sh $zero, 0x86($v1) /* 168088 80247828 A462008C */ sh $v0, 0x8c($v1) -/* 16808C 8024782C 0C0B2026 */ jal set_variable +/* 16808C 8024782C 0C0B2026 */ jal evt_set_variable /* 168090 80247830 A460008E */ sh $zero, 0x8e($v1) /* 168094 80247834 0000202D */ daddu $a0, $zero, $zero /* 168098 80247838 3C028025 */ lui $v0, %hi(D_80249B84) diff --git a/ver/us/asm/nonmatchings/196AA0/SetCommandAutoSuccess.s b/ver/us/asm/nonmatchings/196AA0/SetCommandAutoSuccess.s index 72e0e1ab4d..63508429b2 100644 --- a/ver/us/asm/nonmatchings/196AA0/SetCommandAutoSuccess.s +++ b/ver/us/asm/nonmatchings/196AA0/SetCommandAutoSuccess.s @@ -7,7 +7,7 @@ glabel SetCommandAutoSuccess /* 197C58 80269378 8C82000C */ lw $v0, 0xc($a0) /* 197C5C 8026937C 3C06802A */ lui $a2, %hi(D_8029FC3E) /* 197C60 80269380 80C6FC3E */ lb $a2, %lo(D_8029FC3E)($a2) -/* 197C64 80269384 0C0B2026 */ jal set_variable +/* 197C64 80269384 0C0B2026 */ jal evt_set_variable /* 197C68 80269388 8C450000 */ lw $a1, ($v0) /* 197C6C 8026938C 8FBF0010 */ lw $ra, 0x10($sp) /* 197C70 80269390 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s b/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s index 9cf7ec5098..7dde593b9f 100644 --- a/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s +++ b/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s @@ -81,7 +81,7 @@ glabel ChooseNextTarget /* 19CE08 8026E528 A6220428 */ sh $v0, 0x428($s1) /* 19CE0C 8026E52C 90620003 */ lbu $v0, 3($v1) /* 19CE10 8026E530 0240202D */ daddu $a0, $s2, $zero -/* 19CE14 8026E534 0C0B2026 */ jal set_variable +/* 19CE14 8026E534 0C0B2026 */ jal evt_set_variable /* 19CE18 8026E538 A2220426 */ sb $v0, 0x426($s1) /* 19CE1C 8026E53C 24020002 */ addiu $v0, $zero, 2 .L8026E540: diff --git a/ver/us/asm/nonmatchings/197F40/GetActorAttackBoost.s b/ver/us/asm/nonmatchings/197F40/GetActorAttackBoost.s index 86074bcbe9..24bd077127 100644 --- a/ver/us/asm/nonmatchings/197F40/GetActorAttackBoost.s +++ b/ver/us/asm/nonmatchings/197F40/GetActorAttackBoost.s @@ -21,7 +21,7 @@ glabel GetActorAttackBoost /* 19E520 8026FC40 8E100000 */ lw $s0, ($s0) /* 19E524 8026FC44 0220202D */ daddu $a0, $s1, $zero /* 19E528 8026FC48 80460221 */ lb $a2, 0x221($v0) -/* 19E52C 8026FC4C 0C0B2026 */ jal set_variable +/* 19E52C 8026FC4C 0C0B2026 */ jal evt_set_variable /* 19E530 8026FC50 0200282D */ daddu $a1, $s0, $zero /* 19E534 8026FC54 8FBF0018 */ lw $ra, 0x18($sp) /* 19E538 8026FC58 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/197F40/GetActorDefenseBoost.s b/ver/us/asm/nonmatchings/197F40/GetActorDefenseBoost.s index ccf3b46ddc..e6a05b5993 100644 --- a/ver/us/asm/nonmatchings/197F40/GetActorDefenseBoost.s +++ b/ver/us/asm/nonmatchings/197F40/GetActorDefenseBoost.s @@ -21,7 +21,7 @@ glabel GetActorDefenseBoost /* 19E588 8026FCA8 8E100000 */ lw $s0, ($s0) /* 19E58C 8026FCAC 0220202D */ daddu $a0, $s1, $zero /* 19E590 8026FCB0 80460222 */ lb $a2, 0x222($v0) -/* 19E594 8026FCB4 0C0B2026 */ jal set_variable +/* 19E594 8026FCB4 0C0B2026 */ jal evt_set_variable /* 19E598 8026FCB8 0200282D */ daddu $a1, $s0, $zero /* 19E59C 8026FCBC 8FBF0018 */ lw $ra, 0x18($sp) /* 19E5A0 8026FCC0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/197F40/GetBattleVar.s b/ver/us/asm/nonmatchings/197F40/GetBattleVar.s index ab6c8307cb..6a53d41b9e 100644 --- a/ver/us/asm/nonmatchings/197F40/GetBattleVar.s +++ b/ver/us/asm/nonmatchings/197F40/GetBattleVar.s @@ -16,7 +16,7 @@ glabel GetBattleVar /* 19DFA0 8026F6C0 3C06800E */ lui $a2, %hi(gBattleStatus+0x8) /* 19DFA4 8026F6C4 00C23021 */ addu $a2, $a2, $v0 /* 19DFA8 8026F6C8 8CC6C078 */ lw $a2, %lo(gBattleStatus+0x8)($a2) -/* 19DFAC 8026F6CC 0C0B2026 */ jal set_variable +/* 19DFAC 8026F6CC 0C0B2026 */ jal evt_set_variable /* 19DFB0 8026F6D0 0220202D */ daddu $a0, $s1, $zero /* 19DFB4 8026F6D4 8FBF0018 */ lw $ra, 0x18($sp) /* 19DFB8 8026F6D8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/197F40/GetDistanceToGoal.s b/ver/us/asm/nonmatchings/197F40/GetDistanceToGoal.s index 1873d8c6ed..31af58bef6 100644 --- a/ver/us/asm/nonmatchings/197F40/GetDistanceToGoal.s +++ b/ver/us/asm/nonmatchings/197F40/GetDistanceToGoal.s @@ -27,7 +27,7 @@ glabel GetDistanceToGoal /* 19D330 8026EA50 0220202D */ daddu $a0, $s1, $zero /* 19D334 8026EA54 4600008D */ trunc.w.s $f2, $f0 /* 19D338 8026EA58 44061000 */ mfc1 $a2, $f2 -/* 19D33C 8026EA5C 0C0B2026 */ jal set_variable +/* 19D33C 8026EA5C 0C0B2026 */ jal evt_set_variable /* 19D340 8026EA60 0200282D */ daddu $a1, $s0, $zero /* 19D344 8026EA64 8FBF0018 */ lw $ra, 0x18($sp) /* 19D348 8026EA68 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s b/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s index 5c04ff4978..23539cb460 100644 --- a/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s +++ b/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s @@ -15,11 +15,11 @@ glabel GetOwnerTarget /* 19D1B4 8026E8D4 8E050000 */ lw $a1, ($s0) /* 19D1B8 8026E8D8 86460428 */ lh $a2, 0x428($s2) /* 19D1BC 8026E8DC 8E100004 */ lw $s0, 4($s0) -/* 19D1C0 8026E8E0 0C0B2026 */ jal set_variable +/* 19D1C0 8026E8E0 0C0B2026 */ jal evt_set_variable /* 19D1C4 8026E8E4 0220202D */ daddu $a0, $s1, $zero /* 19D1C8 8026E8E8 0220202D */ daddu $a0, $s1, $zero /* 19D1CC 8026E8EC 82460426 */ lb $a2, 0x426($s2) -/* 19D1D0 8026E8F0 0C0B2026 */ jal set_variable +/* 19D1D0 8026E8F0 0C0B2026 */ jal evt_set_variable /* 19D1D4 8026E8F4 0200282D */ daddu $a1, $s0, $zero /* 19D1D8 8026E8F8 8FBF001C */ lw $ra, 0x1c($sp) /* 19D1DC 8026E8FC 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/197F40/GetStatusFlags.s b/ver/us/asm/nonmatchings/197F40/GetStatusFlags.s index b521c39f6a..9c588e2a4d 100644 --- a/ver/us/asm/nonmatchings/197F40/GetStatusFlags.s +++ b/ver/us/asm/nonmatchings/197F40/GetStatusFlags.s @@ -151,7 +151,7 @@ glabel GetStatusFlags .L8026F420: /* 19DD00 8026F420 0220202D */ daddu $a0, $s1, $zero /* 19DD04 8026F424 0240282D */ daddu $a1, $s2, $zero -/* 19DD08 8026F428 0C0B2026 */ jal set_variable +/* 19DD08 8026F428 0C0B2026 */ jal evt_set_variable /* 19DD0C 8026F42C 0200302D */ daddu $a2, $s0, $zero /* 19DD10 8026F430 8FBF001C */ lw $ra, 0x1c($sp) /* 19DD14 8026F434 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/197F40/func_8026E558.s b/ver/us/asm/nonmatchings/197F40/func_8026E558.s index 2024b2f1a3..b157f54cfb 100644 --- a/ver/us/asm/nonmatchings/197F40/func_8026E558.s +++ b/ver/us/asm/nonmatchings/197F40/func_8026E558.s @@ -204,7 +204,7 @@ glabel func_8026E558 .L8026E838: /* 19D118 8026E838 0260202D */ daddu $a0, $s3, $zero .L8026E83C: -/* 19D11C 8026E83C 0C0B2026 */ jal set_variable +/* 19D11C 8026E83C 0C0B2026 */ jal evt_set_variable /* 19D120 8026E840 0200282D */ daddu $a1, $s0, $zero /* 19D124 8026E844 8FBF0020 */ lw $ra, 0x20($sp) /* 19D128 8026E848 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/197F40/func_8026E914.s b/ver/us/asm/nonmatchings/197F40/func_8026E914.s index bce894ba01..cd599906d9 100644 --- a/ver/us/asm/nonmatchings/197F40/func_8026E914.s +++ b/ver/us/asm/nonmatchings/197F40/func_8026E914.s @@ -13,11 +13,11 @@ glabel func_8026E914 /* 19D214 8026E934 8E02000C */ lw $v0, 0xc($s0) /* 19D218 8026E938 864601A4 */ lh $a2, 0x1a4($s2) /* 19D21C 8026E93C 8C450000 */ lw $a1, ($v0) -/* 19D220 8026E940 0C0B2026 */ jal set_variable +/* 19D220 8026E940 0C0B2026 */ jal evt_set_variable /* 19D224 8026E944 8C510004 */ lw $s1, 4($v0) /* 19D228 8026E948 0200202D */ daddu $a0, $s0, $zero /* 19D22C 8026E94C 824601A6 */ lb $a2, 0x1a6($s2) -/* 19D230 8026E950 0C0B2026 */ jal set_variable +/* 19D230 8026E950 0C0B2026 */ jal evt_set_variable /* 19D234 8026E954 0220282D */ daddu $a1, $s1, $zero /* 19D238 8026E958 8FBF001C */ lw $ra, 0x1c($sp) /* 19D23C 8026E95C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/19FAF0/CancelablePlayerRunToGoal.s b/ver/us/asm/nonmatchings/19FAF0/CancelablePlayerRunToGoal.s index eb414c3ba2..2cc0d665a9 100644 --- a/ver/us/asm/nonmatchings/19FAF0/CancelablePlayerRunToGoal.s +++ b/ver/us/asm/nonmatchings/19FAF0/CancelablePlayerRunToGoal.s @@ -206,7 +206,7 @@ glabel CancelablePlayerRunToGoal /* 1A2AD0 802741F0 8C850074 */ lw $a1, 0x74($a0) /* 1A2AD4 802741F4 0000302D */ daddu $a2, $zero, $zero .L802741F8: -/* 1A2AD8 802741F8 0C0B2026 */ jal set_variable +/* 1A2AD8 802741F8 0C0B2026 */ jal evt_set_variable /* 1A2ADC 802741FC 00000000 */ nop /* 1A2AE0 80274200 24020002 */ addiu $v0, $zero, 2 .L80274204: diff --git a/ver/us/asm/nonmatchings/19FAF0/PlayerDamageEnemy.s b/ver/us/asm/nonmatchings/19FAF0/PlayerDamageEnemy.s index 300c119efd..b67dd144ce 100644 --- a/ver/us/asm/nonmatchings/19FAF0/PlayerDamageEnemy.s +++ b/ver/us/asm/nonmatchings/19FAF0/PlayerDamageEnemy.s @@ -143,7 +143,7 @@ glabel PlayerDamageEnemy /* 1A2D30 80274450 0440000B */ bltz $v0, .L80274480 /* 1A2D34 80274454 0240202D */ daddu $a0, $s2, $zero /* 1A2D38 80274458 0260282D */ daddu $a1, $s3, $zero -/* 1A2D3C 8027445C 0C0B2026 */ jal set_variable +/* 1A2D3C 8027445C 0C0B2026 */ jal evt_set_variable /* 1A2D40 80274460 0040302D */ daddu $a2, $v0, $zero /* 1A2D44 80274464 0C0B1069 */ jal does_script_exist_by_ref /* 1A2D48 80274468 0240202D */ daddu $a0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/19FAF0/PlayerPowerBounceEnemy.s b/ver/us/asm/nonmatchings/19FAF0/PlayerPowerBounceEnemy.s index d8d4046556..b34b76fd7f 100644 --- a/ver/us/asm/nonmatchings/19FAF0/PlayerPowerBounceEnemy.s +++ b/ver/us/asm/nonmatchings/19FAF0/PlayerPowerBounceEnemy.s @@ -147,7 +147,7 @@ glabel PlayerPowerBounceEnemy /* 1A2F80 802746A0 0440000B */ bltz $v0, .L802746D0 /* 1A2F84 802746A4 0240202D */ daddu $a0, $s2, $zero /* 1A2F88 802746A8 0260282D */ daddu $a1, $s3, $zero -/* 1A2F8C 802746AC 0C0B2026 */ jal set_variable +/* 1A2F8C 802746AC 0C0B2026 */ jal evt_set_variable /* 1A2F90 802746B0 0040302D */ daddu $a2, $v0, $zero /* 1A2F94 802746B4 0C0B1069 */ jal does_script_exist_by_ref /* 1A2F98 802746B8 0240202D */ daddu $a0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/19FAF0/PlayerTestEnemy.s b/ver/us/asm/nonmatchings/19FAF0/PlayerTestEnemy.s index 81a42b26fd..af55229440 100644 --- a/ver/us/asm/nonmatchings/19FAF0/PlayerTestEnemy.s +++ b/ver/us/asm/nonmatchings/19FAF0/PlayerTestEnemy.s @@ -143,7 +143,7 @@ glabel PlayerTestEnemy /* 1A31C0 802748E0 04400006 */ bltz $v0, .L802748FC /* 1A31C4 802748E4 0240202D */ daddu $a0, $s2, $zero /* 1A31C8 802748E8 0260282D */ daddu $a1, $s3, $zero -/* 1A31CC 802748EC 0C0B2026 */ jal set_variable +/* 1A31CC 802748EC 0C0B2026 */ jal evt_set_variable /* 1A31D0 802748F0 0040302D */ daddu $a2, $v0, $zero /* 1A31D4 802748F4 0809D240 */ j .L80274900 /* 1A31D8 802748F8 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/1A5830/JumpWithBounce.s b/ver/us/asm/nonmatchings/1A5830/JumpWithBounce.s index 891418e856..9b8f9fdfbb 100644 --- a/ver/us/asm/nonmatchings/1A5830/JumpWithBounce.s +++ b/ver/us/asm/nonmatchings/1A5830/JumpWithBounce.s @@ -41,7 +41,7 @@ glabel JumpWithBounce /* 1A8090 802797B0 0240202D */ daddu $a0, $s2, $zero /* 1A8094 802797B4 A6020070 */ sh $v0, 0x70($s0) /* 1A8098 802797B8 8E250000 */ lw $a1, ($s1) -/* 1A809C 802797BC 0C0B210B */ jal get_float_variable +/* 1A809C 802797BC 0C0B210B */ jal evt_get_float_variable /* 1A80A0 802797C0 0240202D */ daddu $a0, $s2, $zero /* 1A80A4 802797C4 C6020148 */ lwc1 $f2, 0x148($s0) /* 1A80A8 802797C8 C61A0018 */ lwc1 $f26, 0x18($s0) diff --git a/ver/us/asm/nonmatchings/1AC760/PartnerAfflictEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerAfflictEnemy.s index 2a1ec530c4..98186dc294 100644 --- a/ver/us/asm/nonmatchings/1AC760/PartnerAfflictEnemy.s +++ b/ver/us/asm/nonmatchings/1AC760/PartnerAfflictEnemy.s @@ -153,7 +153,7 @@ glabel PartnerAfflictEnemy /* 1AEAFC 8028021C 0440000B */ bltz $v0, .L8028024C /* 1AEB00 80280220 0240202D */ daddu $a0, $s2, $zero /* 1AEB04 80280224 0280282D */ daddu $a1, $s4, $zero -/* 1AEB08 80280228 0C0B2026 */ jal set_variable +/* 1AEB08 80280228 0C0B2026 */ jal evt_set_variable /* 1AEB0C 8028022C 0040302D */ daddu $a2, $v0, $zero /* 1AEB10 80280230 0C0B1069 */ jal does_script_exist_by_ref /* 1AEB14 80280234 0240202D */ daddu $a0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/1AC760/PartnerDamageEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerDamageEnemy.s index f27ce909c0..b959b952dc 100644 --- a/ver/us/asm/nonmatchings/1AC760/PartnerDamageEnemy.s +++ b/ver/us/asm/nonmatchings/1AC760/PartnerDamageEnemy.s @@ -146,7 +146,7 @@ glabel PartnerDamageEnemy /* 1AE890 8027FFB0 0440000B */ bltz $v0, .L8027FFE0 /* 1AE894 8027FFB4 0240202D */ daddu $a0, $s2, $zero /* 1AE898 8027FFB8 0280282D */ daddu $a1, $s4, $zero -/* 1AE89C 8027FFBC 0C0B2026 */ jal set_variable +/* 1AE89C 8027FFBC 0C0B2026 */ jal evt_set_variable /* 1AE8A0 8027FFC0 0040302D */ daddu $a2, $v0, $zero /* 1AE8A4 8027FFC4 0C0B1069 */ jal does_script_exist_by_ref /* 1AE8A8 8027FFC8 0240202D */ daddu $a0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/1AC760/PartnerPowerBounceEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerPowerBounceEnemy.s index 2cbe14b8d0..0e76785f65 100644 --- a/ver/us/asm/nonmatchings/1AC760/PartnerPowerBounceEnemy.s +++ b/ver/us/asm/nonmatchings/1AC760/PartnerPowerBounceEnemy.s @@ -150,7 +150,7 @@ glabel PartnerPowerBounceEnemy /* 1AED5C 8028047C 0440000B */ bltz $v0, .L802804AC /* 1AED60 80280480 0240202D */ daddu $a0, $s2, $zero /* 1AED64 80280484 0280282D */ daddu $a1, $s4, $zero -/* 1AED68 80280488 0C0B2026 */ jal set_variable +/* 1AED68 80280488 0C0B2026 */ jal evt_set_variable /* 1AED6C 8028048C 0040302D */ daddu $a2, $v0, $zero /* 1AED70 80280490 0C0B1069 */ jal does_script_exist_by_ref /* 1AED74 80280494 0240202D */ daddu $a0, $s2, $zero diff --git a/ver/us/asm/nonmatchings/1AC760/PartnerTestEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerTestEnemy.s index 15678ee45b..24cb7ff3af 100644 --- a/ver/us/asm/nonmatchings/1AC760/PartnerTestEnemy.s +++ b/ver/us/asm/nonmatchings/1AC760/PartnerTestEnemy.s @@ -146,7 +146,7 @@ glabel PartnerTestEnemy /* 1AEFAC 802806CC 04400006 */ bltz $v0, .L802806E8 /* 1AEFB0 802806D0 0240202D */ daddu $a0, $s2, $zero /* 1AEFB4 802806D4 0280282D */ daddu $a1, $s4, $zero -/* 1AEFB8 802806D8 0C0B2026 */ jal set_variable +/* 1AEFB8 802806D8 0C0B2026 */ jal evt_set_variable /* 1AEFBC 802806DC 0040302D */ daddu $a2, $v0, $zero /* 1AEFC0 802806E0 080A01BB */ j .L802806EC /* 1AEFC4 802806E4 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s b/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s index 511a2c1174..8256befd35 100644 --- a/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s +++ b/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s @@ -29,7 +29,7 @@ glabel func_8005DB00 .L8005DB5C: /* 38F5C 8005DB5C 0240202D */ daddu $a0, $s2, $zero /* 38F60 8005DB60 3C05FE36 */ lui $a1, 0xfe36 -/* 38F64 8005DB64 0C0B210B */ jal get_float_variable +/* 38F64 8005DB64 0C0B210B */ jal evt_get_float_variable /* 38F68 8005DB68 34A53C80 */ ori $a1, $a1, 0x3c80 /* 38F6C 8005DB6C 0240202D */ daddu $a0, $s2, $zero /* 38F70 8005DB70 3C05FE36 */ lui $a1, 0xfe36 diff --git a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s index beb8d77a53..8c18bfb0c6 100644 --- a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s +++ b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s @@ -571,7 +571,7 @@ glabel L80135E78_CC578 /* CC5E4 80135EE4 3C05F840 */ lui $a1, 0xf840 /* CC5E8 80135EE8 34A55BE5 */ ori $a1, $a1, 0x5be5 .L80135EEC: -/* CC5EC 80135EEC 0C0B2026 */ jal set_variable +/* CC5EC 80135EEC 0C0B2026 */ jal evt_set_variable /* CC5F0 80135EF0 24060001 */ addiu $a2, $zero, 1 /* CC5F4 80135EF4 24020005 */ addiu $v0, $zero, 5 /* CC5F8 80135EF8 0804D8DF */ j L8013637C_CCA7C diff --git a/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s index da545e9a3f..0db6fa7063 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s @@ -25,7 +25,7 @@ glabel func_8024097C_EA127C /* EA12B0 802409B0 8E63000C */ lw $v1, 0xc($s3) /* EA12B4 802409B4 0260202D */ daddu $a0, $s3, $zero /* EA12B8 802409B8 8C650000 */ lw $a1, ($v1) -/* EA12BC 802409BC 0C0B53A3 */ jal dead_get_variable +/* EA12BC 802409BC 0C0B53A3 */ jal dead_evt_get_variable /* EA12C0 802409C0 0040902D */ daddu $s2, $v0, $zero /* EA12C4 802409C4 AFA00010 */ sw $zero, 0x10($sp) /* EA12C8 802409C8 8E2300D0 */ lw $v1, 0xd0($s1) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s b/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s index 3cfcfcf373..c18f9a1d82 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s @@ -18,7 +18,7 @@ glabel func_80241AE0_EA23E0 /* EA2414 80241B14 8E23000C */ lw $v1, 0xc($s1) /* EA2418 80241B18 0220202D */ daddu $a0, $s1, $zero /* EA241C 80241B1C 8C650000 */ lw $a1, ($v1) -/* EA2420 80241B20 0C0B53A3 */ jal dead_get_variable +/* EA2420 80241B20 0C0B53A3 */ jal dead_evt_get_variable /* EA2424 80241B24 0040A02D */ daddu $s4, $v0, $zero /* EA2428 80241B28 AFA00010 */ sw $zero, 0x10($sp) /* EA242C 80241B2C 8E0300D0 */ lw $v1, 0xd0($s0) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s b/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s index 9e013c1bd1..70af1fa19a 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s @@ -25,7 +25,7 @@ glabel func_802420FC_EA29FC /* EA2A30 80242130 8E63000C */ lw $v1, 0xc($s3) /* EA2A34 80242134 0260202D */ daddu $a0, $s3, $zero /* EA2A38 80242138 8C650000 */ lw $a1, ($v1) -/* EA2A3C 8024213C 0C0B53A3 */ jal dead_get_variable +/* EA2A3C 8024213C 0C0B53A3 */ jal dead_evt_get_variable /* EA2A40 80242140 0040902D */ daddu $s2, $v0, $zero /* EA2A44 80242144 AFA00028 */ sw $zero, 0x28($sp) /* EA2A48 80242148 8E2300D0 */ lw $v1, 0xd0($s1) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s b/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s index 53e0f71a35..c88fbf11fb 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s @@ -9,7 +9,7 @@ glabel func_80242794_EA3094 /* EA30A4 802427A4 AFB00010 */ sw $s0, 0x10($sp) /* EA30A8 802427A8 8E30000C */ lw $s0, 0xc($s1) /* EA30AC 802427AC 8E050000 */ lw $a1, ($s0) -/* EA30B0 802427B0 0C0B53A3 */ jal dead_get_variable +/* EA30B0 802427B0 0C0B53A3 */ jal dead_evt_get_variable /* EA30B4 802427B4 26100004 */ addiu $s0, $s0, 4 /* EA30B8 802427B8 0C00F94D */ jal func_8003E534 /* EA30BC 802427BC 0040202D */ daddu $a0, $v0, $zero @@ -17,7 +17,7 @@ glabel func_80242794_EA3094 /* EA30C4 802427C4 00000000 */ nop /* EA30C8 802427C8 8E050000 */ lw $a1, ($s0) /* EA30CC 802427CC 844600A8 */ lh $a2, 0xa8($v0) -/* EA30D0 802427D0 0C0B551A */ jal dead_set_variable +/* EA30D0 802427D0 0C0B551A */ jal dead_evt_set_variable /* EA30D4 802427D4 0220202D */ daddu $a0, $s1, $zero .L802427D8: /* EA30D8 802427D8 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s index b58c994fe9..491c035195 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s @@ -18,7 +18,7 @@ glabel func_802427F0_EA30F0 /* EA3124 80242824 8E30000C */ lw $s0, 0xc($s1) /* EA3128 80242828 8E130000 */ lw $s3, ($s0) /* EA312C 8024282C 26100004 */ addiu $s0, $s0, 4 -/* EA3130 80242830 0C0B53A3 */ jal dead_get_variable +/* EA3130 80242830 0C0B53A3 */ jal dead_evt_get_variable /* EA3134 80242834 0260282D */ daddu $a1, $s3, $zero /* EA3138 80242838 4482E000 */ mtc1 $v0, $f28 /* EA313C 8024283C 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_802427F0_EA30F0 /* EA3144 80242844 8E140000 */ lw $s4, ($s0) /* EA3148 80242848 26100004 */ addiu $s0, $s0, 4 /* EA314C 8024284C 0220202D */ daddu $a0, $s1, $zero -/* EA3150 80242850 0C0B53A3 */ jal dead_get_variable +/* EA3150 80242850 0C0B53A3 */ jal dead_evt_get_variable /* EA3154 80242854 0280282D */ daddu $a1, $s4, $zero /* EA3158 80242858 4482D000 */ mtc1 $v0, $f26 /* EA315C 8024285C 00000000 */ nop /* EA3160 80242860 4680D6A0 */ cvt.s.w $f26, $f26 /* EA3164 80242864 8E100000 */ lw $s0, ($s0) /* EA3168 80242868 0220202D */ daddu $a0, $s1, $zero -/* EA316C 8024286C 0C0B53A3 */ jal dead_get_variable +/* EA316C 8024286C 0C0B53A3 */ jal dead_evt_get_variable /* EA3170 80242870 0200282D */ daddu $a1, $s0, $zero /* EA3174 80242874 4482C000 */ mtc1 $v0, $f24 /* EA3178 80242878 00000000 */ nop @@ -94,17 +94,17 @@ glabel func_802427F0_EA30F0 /* EA324C 8024294C 0260282D */ daddu $a1, $s3, $zero /* EA3250 80242950 4600E18D */ trunc.w.s $f6, $f28 /* EA3254 80242954 44063000 */ mfc1 $a2, $f6 -/* EA3258 80242958 0C0B551A */ jal dead_set_variable +/* EA3258 80242958 0C0B551A */ jal dead_evt_set_variable /* EA325C 8024295C 4600C601 */ sub.s $f24, $f24, $f0 /* EA3260 80242960 0220202D */ daddu $a0, $s1, $zero /* EA3264 80242964 4600D18D */ trunc.w.s $f6, $f26 /* EA3268 80242968 44063000 */ mfc1 $a2, $f6 -/* EA326C 8024296C 0C0B551A */ jal dead_set_variable +/* EA326C 8024296C 0C0B551A */ jal dead_evt_set_variable /* EA3270 80242970 0280282D */ daddu $a1, $s4, $zero /* EA3274 80242974 0220202D */ daddu $a0, $s1, $zero /* EA3278 80242978 4600C18D */ trunc.w.s $f6, $f24 /* EA327C 8024297C 44063000 */ mfc1 $a2, $f6 -/* EA3280 80242980 0C0B551A */ jal dead_set_variable +/* EA3280 80242980 0C0B551A */ jal dead_evt_set_variable /* EA3284 80242984 0200282D */ daddu $a1, $s0, $zero /* EA3288 80242988 8FBF0024 */ lw $ra, 0x24($sp) /* EA328C 8024298C 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s b/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s index 554d26ad16..b1e46abf28 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s @@ -19,7 +19,7 @@ glabel func_802429C0_EA32C0 .L802429F4: /* EA32F4 802429F4 8CC50000 */ lw $a1, ($a2) /* EA32F8 802429F8 3C068024 */ lui $a2, %hi(D_802441BC_EA4ABC) -/* EA32FC 802429FC 0C0B551A */ jal dead_set_variable +/* EA32FC 802429FC 0C0B551A */ jal dead_evt_set_variable /* EA3300 80242A00 8CC641BC */ lw $a2, %lo(D_802441BC_EA4ABC)($a2) /* EA3304 80242A04 24020002 */ addiu $v0, $zero, 2 .L80242A08: diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s b/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s index 89aa186f58..8b6cfc0a2c 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s @@ -5,7 +5,7 @@ glabel func_80242A14_EA3314 /* EA3314 80242A14 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EA3318 80242A18 AFBF0010 */ sw $ra, 0x10($sp) /* EA331C 80242A1C 8C82000C */ lw $v0, 0xc($a0) -/* EA3320 80242A20 0C0B53A3 */ jal dead_get_variable +/* EA3320 80242A20 0C0B53A3 */ jal dead_evt_get_variable /* EA3324 80242A24 8C450000 */ lw $a1, ($v0) /* EA3328 80242A28 3C018024 */ lui $at, %hi(D_802441BC_EA4ABC) /* EA332C 80242A2C AC2241BC */ sw $v0, %lo(D_802441BC_EA4ABC)($at) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s b/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s index defb39e614..49ffdd9871 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s @@ -5,7 +5,7 @@ glabel func_80242A4C_EA334C /* EA334C 80242A4C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EA3350 80242A50 AFBF0010 */ sw $ra, 0x10($sp) /* EA3354 80242A54 8C82000C */ lw $v0, 0xc($a0) -/* EA3358 80242A58 0C0B53A3 */ jal dead_get_variable +/* EA3358 80242A58 0C0B53A3 */ jal dead_evt_get_variable /* EA335C 80242A5C 8C450000 */ lw $a1, ($v0) /* EA3360 80242A60 0040182D */ daddu $v1, $v0, $zero /* EA3364 80242A64 10600012 */ beqz $v1, .L80242AB0 diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s index eee99419bd..baf050270a 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s @@ -9,51 +9,51 @@ glabel func_80242AE8_EA33E8 /* EA33F8 80242AF8 AFB00010 */ sw $s0, 0x10($sp) /* EA33FC 80242AFC 8E30000C */ lw $s0, 0xc($s1) /* EA3400 80242B00 8E050000 */ lw $a1, ($s0) -/* EA3404 80242B04 0C0B53A3 */ jal dead_get_variable +/* EA3404 80242B04 0C0B53A3 */ jal dead_evt_get_variable /* EA3408 80242B08 26100004 */ addiu $s0, $s0, 4 /* EA340C 80242B0C AE22008C */ sw $v0, 0x8c($s1) /* EA3410 80242B10 8E050000 */ lw $a1, ($s0) /* EA3414 80242B14 26100004 */ addiu $s0, $s0, 4 -/* EA3418 80242B18 0C0B53A3 */ jal dead_get_variable +/* EA3418 80242B18 0C0B53A3 */ jal dead_evt_get_variable /* EA341C 80242B1C 0220202D */ daddu $a0, $s1, $zero /* EA3420 80242B20 AE220090 */ sw $v0, 0x90($s1) /* EA3424 80242B24 8E050000 */ lw $a1, ($s0) /* EA3428 80242B28 26100004 */ addiu $s0, $s0, 4 -/* EA342C 80242B2C 0C0B53A3 */ jal dead_get_variable +/* EA342C 80242B2C 0C0B53A3 */ jal dead_evt_get_variable /* EA3430 80242B30 0220202D */ daddu $a0, $s1, $zero /* EA3434 80242B34 AE220094 */ sw $v0, 0x94($s1) /* EA3438 80242B38 8E050000 */ lw $a1, ($s0) /* EA343C 80242B3C 26100004 */ addiu $s0, $s0, 4 -/* EA3440 80242B40 0C0B53A3 */ jal dead_get_variable +/* EA3440 80242B40 0C0B53A3 */ jal dead_evt_get_variable /* EA3444 80242B44 0220202D */ daddu $a0, $s1, $zero /* EA3448 80242B48 AE220098 */ sw $v0, 0x98($s1) /* EA344C 80242B4C 8E050000 */ lw $a1, ($s0) /* EA3450 80242B50 26100004 */ addiu $s0, $s0, 4 -/* EA3454 80242B54 0C0B53A3 */ jal dead_get_variable +/* EA3454 80242B54 0C0B53A3 */ jal dead_evt_get_variable /* EA3458 80242B58 0220202D */ daddu $a0, $s1, $zero /* EA345C 80242B5C AE22009C */ sw $v0, 0x9c($s1) /* EA3460 80242B60 8E050000 */ lw $a1, ($s0) /* EA3464 80242B64 26100004 */ addiu $s0, $s0, 4 -/* EA3468 80242B68 0C0B53A3 */ jal dead_get_variable +/* EA3468 80242B68 0C0B53A3 */ jal dead_evt_get_variable /* EA346C 80242B6C 0220202D */ daddu $a0, $s1, $zero /* EA3470 80242B70 AE2200A0 */ sw $v0, 0xa0($s1) /* EA3474 80242B74 8E050000 */ lw $a1, ($s0) /* EA3478 80242B78 26100004 */ addiu $s0, $s0, 4 -/* EA347C 80242B7C 0C0B53A3 */ jal dead_get_variable +/* EA347C 80242B7C 0C0B53A3 */ jal dead_evt_get_variable /* EA3480 80242B80 0220202D */ daddu $a0, $s1, $zero /* EA3484 80242B84 AE2200A4 */ sw $v0, 0xa4($s1) /* EA3488 80242B88 8E050000 */ lw $a1, ($s0) /* EA348C 80242B8C 26100004 */ addiu $s0, $s0, 4 -/* EA3490 80242B90 0C0B53A3 */ jal dead_get_variable +/* EA3490 80242B90 0C0B53A3 */ jal dead_evt_get_variable /* EA3494 80242B94 0220202D */ daddu $a0, $s1, $zero /* EA3498 80242B98 AE2200A8 */ sw $v0, 0xa8($s1) /* EA349C 80242B9C 8E050000 */ lw $a1, ($s0) /* EA34A0 80242BA0 26100004 */ addiu $s0, $s0, 4 -/* EA34A4 80242BA4 0C0B53A3 */ jal dead_get_variable +/* EA34A4 80242BA4 0C0B53A3 */ jal dead_evt_get_variable /* EA34A8 80242BA8 0220202D */ daddu $a0, $s1, $zero /* EA34AC 80242BAC AE2200AC */ sw $v0, 0xac($s1) /* EA34B0 80242BB0 8E050000 */ lw $a1, ($s0) -/* EA34B4 80242BB4 0C0B53A3 */ jal dead_get_variable +/* EA34B4 80242BB4 0C0B53A3 */ jal dead_evt_get_variable /* EA34B8 80242BB8 0220202D */ daddu $a0, $s1, $zero /* EA34BC 80242BBC AE2200B0 */ sw $v0, 0xb0($s1) /* EA34C0 80242BC0 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s index 5312c1cfe3..b3ae7c56e5 100644 --- a/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s +++ b/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s @@ -17,7 +17,7 @@ glabel func_80242BD8_EA34D8 /* EA3508 80242C08 8E30000C */ lw $s0, 0xc($s1) /* EA350C 80242C0C 8E160000 */ lw $s6, ($s0) /* EA3510 80242C10 26100004 */ addiu $s0, $s0, 4 -/* EA3514 80242C14 0C0B53A3 */ jal dead_get_variable +/* EA3514 80242C14 0C0B53A3 */ jal dead_evt_get_variable /* EA3518 80242C18 02C0282D */ daddu $a1, $s6, $zero /* EA351C 80242C1C 44820000 */ mtc1 $v0, $f0 /* EA3520 80242C20 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_80242BD8_EA34D8 /* EA352C 80242C2C 8E140000 */ lw $s4, ($s0) /* EA3530 80242C30 26100004 */ addiu $s0, $s0, 4 /* EA3534 80242C34 0220202D */ daddu $a0, $s1, $zero -/* EA3538 80242C38 0C0B53A3 */ jal dead_get_variable +/* EA3538 80242C38 0C0B53A3 */ jal dead_evt_get_variable /* EA353C 80242C3C 0280282D */ daddu $a1, $s4, $zero /* EA3540 80242C40 0220202D */ daddu $a0, $s1, $zero /* EA3544 80242C44 8E150000 */ lw $s5, ($s0) /* EA3548 80242C48 4482B000 */ mtc1 $v0, $f22 /* EA354C 80242C4C 00000000 */ nop /* EA3550 80242C50 4680B5A0 */ cvt.s.w $f22, $f22 -/* EA3554 80242C54 0C0B53A3 */ jal dead_get_variable +/* EA3554 80242C54 0C0B53A3 */ jal dead_evt_get_variable /* EA3558 80242C58 02A0282D */ daddu $a1, $s5, $zero /* EA355C 80242C5C 2404FFFC */ addiu $a0, $zero, -4 /* EA3560 80242C60 44820000 */ mtc1 $v0, $f0 @@ -75,18 +75,18 @@ glabel func_80242BD8_EA34D8 /* EA35F0 80242CF0 C7A00010 */ lwc1 $f0, 0x10($sp) /* EA35F4 80242CF4 4600008D */ trunc.w.s $f2, $f0 /* EA35F8 80242CF8 44061000 */ mfc1 $a2, $f2 -/* EA35FC 80242CFC 0C0B551A */ jal dead_set_variable +/* EA35FC 80242CFC 0C0B551A */ jal dead_evt_set_variable /* EA3600 80242D00 02C0282D */ daddu $a1, $s6, $zero /* EA3604 80242D04 0220202D */ daddu $a0, $s1, $zero /* EA3608 80242D08 4600B08D */ trunc.w.s $f2, $f22 /* EA360C 80242D0C 44061000 */ mfc1 $a2, $f2 -/* EA3610 80242D10 0C0B551A */ jal dead_set_variable +/* EA3610 80242D10 0C0B551A */ jal dead_evt_set_variable /* EA3614 80242D14 0280282D */ daddu $a1, $s4, $zero /* EA3618 80242D18 0220202D */ daddu $a0, $s1, $zero /* EA361C 80242D1C C7A00014 */ lwc1 $f0, 0x14($sp) /* EA3620 80242D20 4600008D */ trunc.w.s $f2, $f0 /* EA3624 80242D24 44061000 */ mfc1 $a2, $f2 -/* EA3628 80242D28 0C0B551A */ jal dead_set_variable +/* EA3628 80242D28 0C0B551A */ jal dead_evt_set_variable /* EA362C 80242D2C 02A0282D */ daddu $a1, $s5, $zero /* EA3630 80242D30 8FBF0034 */ lw $ra, 0x34($sp) /* EA3634 80242D34 8FB60030 */ lw $s6, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s b/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s index f8e1b4885f..6e9d72bcf6 100644 --- a/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s +++ b/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s @@ -5,7 +5,7 @@ glabel func_80242F64_EA3864 /* EA3864 80242F64 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EA3868 80242F68 AFBF0010 */ sw $ra, 0x10($sp) /* EA386C 80242F6C 8C82000C */ lw $v0, 0xc($a0) -/* EA3870 80242F70 0C0B53A3 */ jal dead_get_variable +/* EA3870 80242F70 0C0B53A3 */ jal dead_evt_get_variable /* EA3874 80242F74 8C450000 */ lw $a1, ($v0) /* EA3878 80242F78 44820000 */ mtc1 $v0, $f0 /* EA387C 80242F7C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s b/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s index ecf452b067..06873efde4 100644 --- a/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s +++ b/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s @@ -9,16 +9,16 @@ glabel func_802430E4_EA39E4 /* EA39F4 802430F4 AFB00018 */ sw $s0, 0x18($sp) /* EA39F8 802430F8 8E30000C */ lw $s0, 0xc($s1) /* EA39FC 802430FC 8E050000 */ lw $a1, ($s0) -/* EA3A00 80243100 0C0B53A3 */ jal dead_get_variable +/* EA3A00 80243100 0C0B53A3 */ jal dead_evt_get_variable /* EA3A04 80243104 26100004 */ addiu $s0, $s0, 4 /* EA3A08 80243108 AE220070 */ sw $v0, 0x70($s1) /* EA3A0C 8024310C 8E050000 */ lw $a1, ($s0) /* EA3A10 80243110 26100004 */ addiu $s0, $s0, 4 -/* EA3A14 80243114 0C0B53A3 */ jal dead_get_variable +/* EA3A14 80243114 0C0B53A3 */ jal dead_evt_get_variable /* EA3A18 80243118 0220202D */ daddu $a0, $s1, $zero /* EA3A1C 8024311C AE220074 */ sw $v0, 0x74($s1) /* EA3A20 80243120 8E050000 */ lw $a1, ($s0) -/* EA3A24 80243124 0C0B53A3 */ jal dead_get_variable +/* EA3A24 80243124 0C0B53A3 */ jal dead_evt_get_variable /* EA3A28 80243128 0220202D */ daddu $a0, $s1, $zero /* EA3A2C 8024312C 24040052 */ addiu $a0, $zero, 0x52 /* EA3A30 80243130 0000282D */ daddu $a1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s b/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s index 1a11dada5d..08d1a2c000 100644 --- a/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s +++ b/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s @@ -7,7 +7,7 @@ glabel func_80240388_EA7358 /* EA7360 80240390 8C82000C */ lw $v0, 0xc($a0) /* EA7364 80240394 3C068017 */ lui $a2, %hi(D_80169B12) /* EA7368 80240398 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) -/* EA736C 8024039C 0C0B551A */ jal dead_set_variable +/* EA736C 8024039C 0C0B551A */ jal dead_evt_set_variable /* EA7370 802403A0 8C450000 */ lw $a1, ($v0) /* EA7374 802403A4 8FBF0010 */ lw $ra, 0x10($sp) /* EA7378 802403A8 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s index 2f3f9a9cda..7cf6ebc4ce 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s @@ -17,55 +17,55 @@ glabel func_80240358_EA8E38 /* EA8E68 80240388 34A50F81 */ ori $a1, $a1, 0xf81 /* EA8E6C 8024038C 0040802D */ daddu $s0, $v0, $zero /* EA8E70 80240390 0200302D */ daddu $a2, $s0, $zero -/* EA8E74 80240394 0C0B551A */ jal dead_set_variable +/* EA8E74 80240394 0C0B551A */ jal dead_evt_set_variable /* EA8E78 80240398 AE500084 */ sw $s0, 0x84($s2) /* EA8E7C 8024039C 8E250000 */ lw $a1, ($s1) /* EA8E80 802403A0 26310004 */ addiu $s1, $s1, 4 -/* EA8E84 802403A4 0C0B53A3 */ jal dead_get_variable +/* EA8E84 802403A4 0C0B53A3 */ jal dead_evt_get_variable /* EA8E88 802403A8 0240202D */ daddu $a0, $s2, $zero /* EA8E8C 802403AC AE020038 */ sw $v0, 0x38($s0) /* EA8E90 802403B0 8E250000 */ lw $a1, ($s1) /* EA8E94 802403B4 26310004 */ addiu $s1, $s1, 4 -/* EA8E98 802403B8 0C0B53A3 */ jal dead_get_variable +/* EA8E98 802403B8 0C0B53A3 */ jal dead_evt_get_variable /* EA8E9C 802403BC 0240202D */ daddu $a0, $s2, $zero /* EA8EA0 802403C0 AE02003C */ sw $v0, 0x3c($s0) /* EA8EA4 802403C4 8E250000 */ lw $a1, ($s1) /* EA8EA8 802403C8 26310004 */ addiu $s1, $s1, 4 -/* EA8EAC 802403CC 0C0B55FF */ jal dead_get_float_variable +/* EA8EAC 802403CC 0C0B55FF */ jal dead_evt_get_float_variable /* EA8EB0 802403D0 0240202D */ daddu $a0, $s2, $zero /* EA8EB4 802403D4 E600000C */ swc1 $f0, 0xc($s0) /* EA8EB8 802403D8 8E250000 */ lw $a1, ($s1) /* EA8EBC 802403DC 26310004 */ addiu $s1, $s1, 4 -/* EA8EC0 802403E0 0C0B55FF */ jal dead_get_float_variable +/* EA8EC0 802403E0 0C0B55FF */ jal dead_evt_get_float_variable /* EA8EC4 802403E4 0240202D */ daddu $a0, $s2, $zero /* EA8EC8 802403E8 E6000010 */ swc1 $f0, 0x10($s0) /* EA8ECC 802403EC 8E250000 */ lw $a1, ($s1) /* EA8ED0 802403F0 26310004 */ addiu $s1, $s1, 4 -/* EA8ED4 802403F4 0C0B55FF */ jal dead_get_float_variable +/* EA8ED4 802403F4 0C0B55FF */ jal dead_evt_get_float_variable /* EA8ED8 802403F8 0240202D */ daddu $a0, $s2, $zero /* EA8EDC 802403FC E6000014 */ swc1 $f0, 0x14($s0) /* EA8EE0 80240400 8E250000 */ lw $a1, ($s1) /* EA8EE4 80240404 26310004 */ addiu $s1, $s1, 4 -/* EA8EE8 80240408 0C0B55FF */ jal dead_get_float_variable +/* EA8EE8 80240408 0C0B55FF */ jal dead_evt_get_float_variable /* EA8EEC 8024040C 0240202D */ daddu $a0, $s2, $zero /* EA8EF0 80240410 E6000018 */ swc1 $f0, 0x18($s0) /* EA8EF4 80240414 8E250000 */ lw $a1, ($s1) /* EA8EF8 80240418 26310004 */ addiu $s1, $s1, 4 -/* EA8EFC 8024041C 0C0B55FF */ jal dead_get_float_variable +/* EA8EFC 8024041C 0C0B55FF */ jal dead_evt_get_float_variable /* EA8F00 80240420 0240202D */ daddu $a0, $s2, $zero /* EA8F04 80240424 E600001C */ swc1 $f0, 0x1c($s0) /* EA8F08 80240428 8E250000 */ lw $a1, ($s1) /* EA8F0C 8024042C 26310004 */ addiu $s1, $s1, 4 -/* EA8F10 80240430 0C0B55FF */ jal dead_get_float_variable +/* EA8F10 80240430 0C0B55FF */ jal dead_evt_get_float_variable /* EA8F14 80240434 0240202D */ daddu $a0, $s2, $zero /* EA8F18 80240438 E6000020 */ swc1 $f0, 0x20($s0) /* EA8F1C 8024043C 8E250000 */ lw $a1, ($s1) /* EA8F20 80240440 26310004 */ addiu $s1, $s1, 4 -/* EA8F24 80240444 0C0B55FF */ jal dead_get_float_variable +/* EA8F24 80240444 0C0B55FF */ jal dead_evt_get_float_variable /* EA8F28 80240448 0240202D */ daddu $a0, $s2, $zero /* EA8F2C 8024044C E6000024 */ swc1 $f0, 0x24($s0) /* EA8F30 80240450 8E250000 */ lw $a1, ($s1) -/* EA8F34 80240454 0C0B55FF */ jal dead_get_float_variable +/* EA8F34 80240454 0C0B55FF */ jal dead_evt_get_float_variable /* EA8F38 80240458 0240202D */ daddu $a0, $s2, $zero /* EA8F3C 8024045C 3C013F80 */ lui $at, 0x3f80 /* EA8F40 80240460 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s b/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s index 5f4905c89a..4c51ff7f9b 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s @@ -7,7 +7,7 @@ glabel func_802408C8_EA93A8 /* EA93B0 802408D0 0080802D */ daddu $s0, $a0, $zero /* EA93B4 802408D4 AFBF0014 */ sw $ra, 0x14($sp) /* EA93B8 802408D8 8E02000C */ lw $v0, 0xc($s0) -/* EA93BC 802408DC 0C0B53A3 */ jal dead_get_variable +/* EA93BC 802408DC 0C0B53A3 */ jal dead_evt_get_variable /* EA93C0 802408E0 8C450000 */ lw $a1, ($v0) /* EA93C4 802408E4 8E030084 */ lw $v1, 0x84($s0) /* EA93C8 802408E8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s index 5090dde600..0afc62e952 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s @@ -16,26 +16,26 @@ glabel func_80240908_EA93E8 /* EA9414 80240934 AE500084 */ sw $s0, 0x84($s2) /* EA9418 80240938 8E250000 */ lw $a1, ($s1) /* EA941C 8024093C 26310004 */ addiu $s1, $s1, 4 -/* EA9420 80240940 0C0B53A3 */ jal dead_get_variable +/* EA9420 80240940 0C0B53A3 */ jal dead_evt_get_variable /* EA9424 80240944 0240202D */ daddu $a0, $s2, $zero /* EA9428 80240948 AE020038 */ sw $v0, 0x38($s0) /* EA942C 8024094C 8E250000 */ lw $a1, ($s1) /* EA9430 80240950 26310004 */ addiu $s1, $s1, 4 -/* EA9434 80240954 0C0B55FF */ jal dead_get_float_variable +/* EA9434 80240954 0C0B55FF */ jal dead_evt_get_float_variable /* EA9438 80240958 0240202D */ daddu $a0, $s2, $zero /* EA943C 8024095C E6000018 */ swc1 $f0, 0x18($s0) /* EA9440 80240960 8E250000 */ lw $a1, ($s1) /* EA9444 80240964 26310004 */ addiu $s1, $s1, 4 -/* EA9448 80240968 0C0B55FF */ jal dead_get_float_variable +/* EA9448 80240968 0C0B55FF */ jal dead_evt_get_float_variable /* EA944C 8024096C 0240202D */ daddu $a0, $s2, $zero /* EA9450 80240970 E6000024 */ swc1 $f0, 0x24($s0) /* EA9454 80240974 8E250000 */ lw $a1, ($s1) /* EA9458 80240978 26310004 */ addiu $s1, $s1, 4 -/* EA945C 8024097C 0C0B55FF */ jal dead_get_float_variable +/* EA945C 8024097C 0C0B55FF */ jal dead_evt_get_float_variable /* EA9460 80240980 0240202D */ daddu $a0, $s2, $zero /* EA9464 80240984 E6000020 */ swc1 $f0, 0x20($s0) /* EA9468 80240988 8E250000 */ lw $a1, ($s1) -/* EA946C 8024098C 0C0B55FF */ jal dead_get_float_variable +/* EA946C 8024098C 0C0B55FF */ jal dead_evt_get_float_variable /* EA9470 80240990 0240202D */ daddu $a0, $s2, $zero /* EA9474 80240994 3C013F80 */ lui $at, 0x3f80 /* EA9478 80240998 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240B00_EA95E0.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240B00_EA95E0.s index b5d7aaac58..b8e3531102 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240B00_EA95E0.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240B00_EA95E0.s @@ -31,17 +31,17 @@ glabel func_80240B00_EA95E0 /* EA9644 80240B64 24050001 */ addiu $a1, $zero, 1 /* EA9648 80240B68 0220202D */ daddu $a0, $s1, $zero /* EA964C 80240B6C 3C05FE36 */ lui $a1, 0xfe36 -/* EA9650 80240B70 0C0B55FF */ jal dead_get_float_variable +/* EA9650 80240B70 0C0B55FF */ jal dead_evt_get_float_variable /* EA9654 80240B74 34A53C81 */ ori $a1, $a1, 0x3c81 /* EA9658 80240B78 0220202D */ daddu $a0, $s1, $zero /* EA965C 80240B7C 3C05FE36 */ lui $a1, 0xfe36 /* EA9660 80240B80 34A53C82 */ ori $a1, $a1, 0x3c82 -/* EA9664 80240B84 0C0B55FF */ jal dead_get_float_variable +/* EA9664 80240B84 0C0B55FF */ jal dead_evt_get_float_variable /* EA9668 80240B88 E6000098 */ swc1 $f0, 0x98($s0) /* EA966C 80240B8C 0220202D */ daddu $a0, $s1, $zero /* EA9670 80240B90 3C05FE36 */ lui $a1, 0xfe36 /* EA9674 80240B94 34A53C83 */ ori $a1, $a1, 0x3c83 -/* EA9678 80240B98 0C0B55FF */ jal dead_get_float_variable +/* EA9678 80240B98 0C0B55FF */ jal dead_evt_get_float_variable /* EA967C 80240B9C E600009C */ swc1 $f0, 0x9c($s0) /* EA9680 80240BA0 E60000A0 */ swc1 $f0, 0xa0($s0) /* EA9684 80240BA4 2610000C */ addiu $s0, $s0, 0xc diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240BD4_EA96B4.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240BD4_EA96B4.s index 26857cc994..1b49318aca 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240BD4_EA96B4.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240BD4_EA96B4.s @@ -12,31 +12,31 @@ glabel func_80240BD4_EA96B4 /* EA96D0 80240BF0 AFB00010 */ sw $s0, 0x10($sp) /* EA96D4 80240BF4 8E30000C */ lw $s0, 0xc($s1) /* EA96D8 80240BF8 8E050000 */ lw $a1, ($s0) -/* EA96DC 80240BFC 0C0B53A3 */ jal dead_get_variable +/* EA96DC 80240BFC 0C0B53A3 */ jal dead_evt_get_variable /* EA96E0 80240C00 26100004 */ addiu $s0, $s0, 4 /* EA96E4 80240C04 8E050000 */ lw $a1, ($s0) /* EA96E8 80240C08 26100004 */ addiu $s0, $s0, 4 /* EA96EC 80240C0C 0220202D */ daddu $a0, $s1, $zero -/* EA96F0 80240C10 0C0B53A3 */ jal dead_get_variable +/* EA96F0 80240C10 0C0B53A3 */ jal dead_evt_get_variable /* EA96F4 80240C14 0040982D */ daddu $s3, $v0, $zero /* EA96F8 80240C18 8E050000 */ lw $a1, ($s0) /* EA96FC 80240C1C 26100004 */ addiu $s0, $s0, 4 /* EA9700 80240C20 0220202D */ daddu $a0, $s1, $zero -/* EA9704 80240C24 0C0B53A3 */ jal dead_get_variable +/* EA9704 80240C24 0C0B53A3 */ jal dead_evt_get_variable /* EA9708 80240C28 0040902D */ daddu $s2, $v0, $zero /* EA970C 80240C2C 8E050000 */ lw $a1, ($s0) /* EA9710 80240C30 26100004 */ addiu $s0, $s0, 4 /* EA9714 80240C34 0220202D */ daddu $a0, $s1, $zero -/* EA9718 80240C38 0C0B53A3 */ jal dead_get_variable +/* EA9718 80240C38 0C0B53A3 */ jal dead_evt_get_variable /* EA971C 80240C3C 0040A02D */ daddu $s4, $v0, $zero /* EA9720 80240C40 0220202D */ daddu $a0, $s1, $zero /* EA9724 80240C44 8E050000 */ lw $a1, ($s0) -/* EA9728 80240C48 0C0B53A3 */ jal dead_get_variable +/* EA9728 80240C48 0C0B53A3 */ jal dead_evt_get_variable /* EA972C 80240C4C 0040882D */ daddu $s1, $v0, $zero /* EA9730 80240C50 0000202D */ daddu $a0, $zero, $zero /* EA9734 80240C54 3C05FD05 */ lui $a1, 0xfd05 /* EA9738 80240C58 34A50F80 */ ori $a1, $a1, 0xf80 -/* EA973C 80240C5C 0C0B53A3 */ jal dead_get_variable +/* EA973C 80240C5C 0C0B53A3 */ jal dead_evt_get_variable /* EA9740 80240C60 0040802D */ daddu $s0, $v0, $zero /* EA9744 80240C64 00131900 */ sll $v1, $s3, 4 /* EA9748 80240C68 00731823 */ subu $v1, $v1, $s3 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240CD8_EA97B8.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240CD8_EA97B8.s index 7009fae028..bdd7cc2d84 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240CD8_EA97B8.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240CD8_EA97B8.s @@ -11,29 +11,29 @@ glabel func_80240CD8_EA97B8 /* EA97D0 80240CF0 AFB00010 */ sw $s0, 0x10($sp) /* EA97D4 80240CF4 8E30000C */ lw $s0, 0xc($s1) /* EA97D8 80240CF8 8E050000 */ lw $a1, ($s0) -/* EA97DC 80240CFC 0C0B53A3 */ jal dead_get_variable +/* EA97DC 80240CFC 0C0B53A3 */ jal dead_evt_get_variable /* EA97E0 80240D00 26100004 */ addiu $s0, $s0, 4 /* EA97E4 80240D04 8E050000 */ lw $a1, ($s0) /* EA97E8 80240D08 26100004 */ addiu $s0, $s0, 4 /* EA97EC 80240D0C 0220202D */ daddu $a0, $s1, $zero -/* EA97F0 80240D10 0C0B53A3 */ jal dead_get_variable +/* EA97F0 80240D10 0C0B53A3 */ jal dead_evt_get_variable /* EA97F4 80240D14 0040982D */ daddu $s3, $v0, $zero /* EA97F8 80240D18 8E050000 */ lw $a1, ($s0) /* EA97FC 80240D1C 26100004 */ addiu $s0, $s0, 4 /* EA9800 80240D20 0220202D */ daddu $a0, $s1, $zero -/* EA9804 80240D24 0C0B53A3 */ jal dead_get_variable +/* EA9804 80240D24 0C0B53A3 */ jal dead_evt_get_variable /* EA9808 80240D28 0040902D */ daddu $s2, $v0, $zero /* EA980C 80240D2C 8E050000 */ lw $a1, ($s0) /* EA9810 80240D30 26100004 */ addiu $s0, $s0, 4 -/* EA9814 80240D34 0C0B53A3 */ jal dead_get_variable +/* EA9814 80240D34 0C0B53A3 */ jal dead_evt_get_variable /* EA9818 80240D38 0220202D */ daddu $a0, $s1, $zero /* EA981C 80240D3C 8E050000 */ lw $a1, ($s0) -/* EA9820 80240D40 0C0B53A3 */ jal dead_get_variable +/* EA9820 80240D40 0C0B53A3 */ jal dead_evt_get_variable /* EA9824 80240D44 0220202D */ daddu $a0, $s1, $zero /* EA9828 80240D48 0000202D */ daddu $a0, $zero, $zero /* EA982C 80240D4C 3C05FD05 */ lui $a1, 0xfd05 /* EA9830 80240D50 34A50F80 */ ori $a1, $a1, 0xf80 -/* EA9834 80240D54 0C0B53A3 */ jal dead_get_variable +/* EA9834 80240D54 0C0B53A3 */ jal dead_evt_get_variable /* EA9838 80240D58 0040802D */ daddu $s0, $v0, $zero /* EA983C 80240D5C 00131900 */ sll $v1, $s3, 4 /* EA9840 80240D60 00731823 */ subu $v1, $v1, $s3 diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240DA4_EA9884.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240DA4_EA9884.s index db6b3cb632..27f81565e1 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240DA4_EA9884.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240DA4_EA9884.s @@ -9,26 +9,26 @@ glabel func_80240DA4_EA9884 /* EA9894 80240DB4 AFB00010 */ sw $s0, 0x10($sp) /* EA9898 80240DB8 8E30000C */ lw $s0, 0xc($s1) /* EA989C 80240DBC 8E050000 */ lw $a1, ($s0) -/* EA98A0 80240DC0 0C0B53A3 */ jal dead_get_variable +/* EA98A0 80240DC0 0C0B53A3 */ jal dead_evt_get_variable /* EA98A4 80240DC4 26100004 */ addiu $s0, $s0, 4 /* EA98A8 80240DC8 8E050000 */ lw $a1, ($s0) /* EA98AC 80240DCC 26100004 */ addiu $s0, $s0, 4 -/* EA98B0 80240DD0 0C0B53A3 */ jal dead_get_variable +/* EA98B0 80240DD0 0C0B53A3 */ jal dead_evt_get_variable /* EA98B4 80240DD4 0220202D */ daddu $a0, $s1, $zero /* EA98B8 80240DD8 8E050000 */ lw $a1, ($s0) /* EA98BC 80240DDC 26100004 */ addiu $s0, $s0, 4 -/* EA98C0 80240DE0 0C0B53A3 */ jal dead_get_variable +/* EA98C0 80240DE0 0C0B53A3 */ jal dead_evt_get_variable /* EA98C4 80240DE4 0220202D */ daddu $a0, $s1, $zero /* EA98C8 80240DE8 8E050000 */ lw $a1, ($s0) /* EA98CC 80240DEC 26100004 */ addiu $s0, $s0, 4 -/* EA98D0 80240DF0 0C0B53A3 */ jal dead_get_variable +/* EA98D0 80240DF0 0C0B53A3 */ jal dead_evt_get_variable /* EA98D4 80240DF4 0220202D */ daddu $a0, $s1, $zero /* EA98D8 80240DF8 8E050000 */ lw $a1, ($s0) -/* EA98DC 80240DFC 0C0B53A3 */ jal dead_get_variable +/* EA98DC 80240DFC 0C0B53A3 */ jal dead_evt_get_variable /* EA98E0 80240E00 0220202D */ daddu $a0, $s1, $zero /* EA98E4 80240E04 0000202D */ daddu $a0, $zero, $zero /* EA98E8 80240E08 3C05FD05 */ lui $a1, 0xfd05 -/* EA98EC 80240E0C 0C0B53A3 */ jal dead_get_variable +/* EA98EC 80240E0C 0C0B53A3 */ jal dead_evt_get_variable /* EA98F0 80240E10 34A50F80 */ ori $a1, $a1, 0xf80 /* EA98F4 80240E14 8FBF0018 */ lw $ra, 0x18($sp) /* EA98F8 80240E18 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s index c10cf260db..d374cad656 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s @@ -45,7 +45,7 @@ glabel func_80240E2C_EA990C /* EA998C 80240EAC 0000202D */ daddu $a0, $zero, $zero /* EA9990 80240EB0 3C05FD05 */ lui $a1, 0xfd05 /* EA9994 80240EB4 34A50F80 */ ori $a1, $a1, 0xf80 -/* EA9998 80240EB8 0C0B53A3 */ jal dead_get_variable +/* EA9998 80240EB8 0C0B53A3 */ jal dead_evt_get_variable /* EA999C 80240EBC AFA70030 */ sw $a3, 0x30($sp) /* EA99A0 80240EC0 00502021 */ addu $a0, $v0, $s0 /* EA99A4 80240EC4 8FA70030 */ lw $a3, 0x30($sp) @@ -168,7 +168,7 @@ glabel func_80240E2C_EA990C /* EA9B40 80241060 3C05FD05 */ lui $a1, 0xfd05 /* EA9B44 80241064 34A50F80 */ ori $a1, $a1, 0xf80 /* EA9B48 80241068 AFA70030 */ sw $a3, 0x30($sp) -/* EA9B4C 8024106C 0C0B53A3 */ jal dead_get_variable +/* EA9B4C 8024106C 0C0B53A3 */ jal dead_evt_get_variable /* EA9B50 80241070 AFA80034 */ sw $t0, 0x34($sp) /* EA9B54 80241074 0000882D */ daddu $s1, $zero, $zero /* EA9B58 80241078 8FA90020 */ lw $t1, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s b/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s index c9d3cc1bbe..35b6672835 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s @@ -11,7 +11,7 @@ glabel func_8024140C_EA9EEC /* EA9F04 80241424 0200202D */ daddu $a0, $s0, $zero /* EA9F08 80241428 3C05FD05 */ lui $a1, 0xfd05 /* EA9F0C 8024142C 34A50F80 */ ori $a1, $a1, 0xf80 -/* EA9F10 80241430 0C0B551A */ jal dead_set_variable +/* EA9F10 80241430 0C0B551A */ jal dead_evt_set_variable /* EA9F14 80241434 0040302D */ daddu $a2, $v0, $zero /* EA9F18 80241438 2402FFFF */ addiu $v0, $zero, -1 /* EA9F1C 8024143C 3C058024 */ lui $a1, %hi(func_802413C0_EA9EA0) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s index bbb04f9309..4ff1db0b86 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s @@ -9,7 +9,7 @@ glabel func_80241580_EAA060 /* EAA070 80241590 AFB00010 */ sw $s0, 0x10($sp) /* EAA074 80241594 8E30000C */ lw $s0, 0xc($s1) /* EAA078 80241598 8E050000 */ lw $a1, ($s0) -/* EAA07C 8024159C 0C0B53A3 */ jal dead_get_variable +/* EAA07C 8024159C 0C0B53A3 */ jal dead_evt_get_variable /* EAA080 802415A0 26100004 */ addiu $s0, $s0, 4 /* EAA084 802415A4 0C00F94D */ jal func_8003E534 /* EAA088 802415A8 0040202D */ daddu $a0, $v0, $zero @@ -17,7 +17,7 @@ glabel func_80241580_EAA060 /* EAA090 802415B0 00000000 */ nop /* EAA094 802415B4 8E050000 */ lw $a1, ($s0) /* EAA098 802415B8 844600A8 */ lh $a2, 0xa8($v0) -/* EAA09C 802415BC 0C0B551A */ jal dead_set_variable +/* EAA09C 802415BC 0C0B551A */ jal dead_evt_set_variable /* EAA0A0 802415C0 0220202D */ daddu $a0, $s1, $zero .L802415C4: /* EAA0A4 802415C4 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s index 5ac8a19c00..501c1f06ea 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s @@ -18,7 +18,7 @@ glabel func_802415DC_EAA0BC /* EAA0F0 80241610 8E30000C */ lw $s0, 0xc($s1) /* EAA0F4 80241614 8E130000 */ lw $s3, ($s0) /* EAA0F8 80241618 26100004 */ addiu $s0, $s0, 4 -/* EAA0FC 8024161C 0C0B53A3 */ jal dead_get_variable +/* EAA0FC 8024161C 0C0B53A3 */ jal dead_evt_get_variable /* EAA100 80241620 0260282D */ daddu $a1, $s3, $zero /* EAA104 80241624 4482E000 */ mtc1 $v0, $f28 /* EAA108 80241628 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_802415DC_EAA0BC /* EAA110 80241630 8E140000 */ lw $s4, ($s0) /* EAA114 80241634 26100004 */ addiu $s0, $s0, 4 /* EAA118 80241638 0220202D */ daddu $a0, $s1, $zero -/* EAA11C 8024163C 0C0B53A3 */ jal dead_get_variable +/* EAA11C 8024163C 0C0B53A3 */ jal dead_evt_get_variable /* EAA120 80241640 0280282D */ daddu $a1, $s4, $zero /* EAA124 80241644 4482D000 */ mtc1 $v0, $f26 /* EAA128 80241648 00000000 */ nop /* EAA12C 8024164C 4680D6A0 */ cvt.s.w $f26, $f26 /* EAA130 80241650 8E100000 */ lw $s0, ($s0) /* EAA134 80241654 0220202D */ daddu $a0, $s1, $zero -/* EAA138 80241658 0C0B53A3 */ jal dead_get_variable +/* EAA138 80241658 0C0B53A3 */ jal dead_evt_get_variable /* EAA13C 8024165C 0200282D */ daddu $a1, $s0, $zero /* EAA140 80241660 4482C000 */ mtc1 $v0, $f24 /* EAA144 80241664 00000000 */ nop @@ -94,17 +94,17 @@ glabel func_802415DC_EAA0BC /* EAA218 80241738 0260282D */ daddu $a1, $s3, $zero /* EAA21C 8024173C 4600E18D */ trunc.w.s $f6, $f28 /* EAA220 80241740 44063000 */ mfc1 $a2, $f6 -/* EAA224 80241744 0C0B551A */ jal dead_set_variable +/* EAA224 80241744 0C0B551A */ jal dead_evt_set_variable /* EAA228 80241748 4600C601 */ sub.s $f24, $f24, $f0 /* EAA22C 8024174C 0220202D */ daddu $a0, $s1, $zero /* EAA230 80241750 4600D18D */ trunc.w.s $f6, $f26 /* EAA234 80241754 44063000 */ mfc1 $a2, $f6 -/* EAA238 80241758 0C0B551A */ jal dead_set_variable +/* EAA238 80241758 0C0B551A */ jal dead_evt_set_variable /* EAA23C 8024175C 0280282D */ daddu $a1, $s4, $zero /* EAA240 80241760 0220202D */ daddu $a0, $s1, $zero /* EAA244 80241764 4600C18D */ trunc.w.s $f6, $f24 /* EAA248 80241768 44063000 */ mfc1 $a2, $f6 -/* EAA24C 8024176C 0C0B551A */ jal dead_set_variable +/* EAA24C 8024176C 0C0B551A */ jal dead_evt_set_variable /* EAA250 80241770 0200282D */ daddu $a1, $s0, $zero /* EAA254 80241774 8FBF0024 */ lw $ra, 0x24($sp) /* EAA258 80241778 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s b/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s index f65c65adab..62e54a8f52 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s @@ -19,7 +19,7 @@ glabel func_802417AC_EAA28C .L802417E0: /* EAA2C0 802417E0 8CC50000 */ lw $a1, ($a2) /* EAA2C4 802417E4 3C068024 */ lui $a2, %hi(D_80243DDC_EAC8BC) -/* EAA2C8 802417E8 0C0B551A */ jal dead_set_variable +/* EAA2C8 802417E8 0C0B551A */ jal dead_evt_set_variable /* EAA2CC 802417EC 8CC63DDC */ lw $a2, %lo(D_80243DDC_EAC8BC)($a2) /* EAA2D0 802417F0 24020002 */ addiu $v0, $zero, 2 .L802417F4: diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s index 9729121b8f..1ba585483e 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s @@ -5,7 +5,7 @@ glabel func_80241800_EAA2E0 /* EAA2E0 80241800 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EAA2E4 80241804 AFBF0010 */ sw $ra, 0x10($sp) /* EAA2E8 80241808 8C82000C */ lw $v0, 0xc($a0) -/* EAA2EC 8024180C 0C0B53A3 */ jal dead_get_variable +/* EAA2EC 8024180C 0C0B53A3 */ jal dead_evt_get_variable /* EAA2F0 80241810 8C450000 */ lw $a1, ($v0) /* EAA2F4 80241814 3C018024 */ lui $at, %hi(D_80243DDC_EAC8BC) /* EAA2F8 80241818 AC223DDC */ sw $v0, %lo(D_80243DDC_EAC8BC)($at) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s index 69b9f8b52c..e1bfd6e9e5 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s @@ -5,7 +5,7 @@ glabel func_80241838_EAA318 /* EAA318 80241838 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EAA31C 8024183C AFBF0010 */ sw $ra, 0x10($sp) /* EAA320 80241840 8C82000C */ lw $v0, 0xc($a0) -/* EAA324 80241844 0C0B53A3 */ jal dead_get_variable +/* EAA324 80241844 0C0B53A3 */ jal dead_evt_get_variable /* EAA328 80241848 8C450000 */ lw $a1, ($v0) /* EAA32C 8024184C 0040182D */ daddu $v1, $v0, $zero /* EAA330 80241850 10600012 */ beqz $v1, .L8024189C diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s b/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s index d964f46595..f48b873f43 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s @@ -9,51 +9,51 @@ glabel func_802418D4_EAA3B4 /* EAA3C4 802418E4 AFB00010 */ sw $s0, 0x10($sp) /* EAA3C8 802418E8 8E30000C */ lw $s0, 0xc($s1) /* EAA3CC 802418EC 8E050000 */ lw $a1, ($s0) -/* EAA3D0 802418F0 0C0B53A3 */ jal dead_get_variable +/* EAA3D0 802418F0 0C0B53A3 */ jal dead_evt_get_variable /* EAA3D4 802418F4 26100004 */ addiu $s0, $s0, 4 /* EAA3D8 802418F8 AE22008C */ sw $v0, 0x8c($s1) /* EAA3DC 802418FC 8E050000 */ lw $a1, ($s0) /* EAA3E0 80241900 26100004 */ addiu $s0, $s0, 4 -/* EAA3E4 80241904 0C0B53A3 */ jal dead_get_variable +/* EAA3E4 80241904 0C0B53A3 */ jal dead_evt_get_variable /* EAA3E8 80241908 0220202D */ daddu $a0, $s1, $zero /* EAA3EC 8024190C AE220090 */ sw $v0, 0x90($s1) /* EAA3F0 80241910 8E050000 */ lw $a1, ($s0) /* EAA3F4 80241914 26100004 */ addiu $s0, $s0, 4 -/* EAA3F8 80241918 0C0B53A3 */ jal dead_get_variable +/* EAA3F8 80241918 0C0B53A3 */ jal dead_evt_get_variable /* EAA3FC 8024191C 0220202D */ daddu $a0, $s1, $zero /* EAA400 80241920 AE220094 */ sw $v0, 0x94($s1) /* EAA404 80241924 8E050000 */ lw $a1, ($s0) /* EAA408 80241928 26100004 */ addiu $s0, $s0, 4 -/* EAA40C 8024192C 0C0B53A3 */ jal dead_get_variable +/* EAA40C 8024192C 0C0B53A3 */ jal dead_evt_get_variable /* EAA410 80241930 0220202D */ daddu $a0, $s1, $zero /* EAA414 80241934 AE220098 */ sw $v0, 0x98($s1) /* EAA418 80241938 8E050000 */ lw $a1, ($s0) /* EAA41C 8024193C 26100004 */ addiu $s0, $s0, 4 -/* EAA420 80241940 0C0B53A3 */ jal dead_get_variable +/* EAA420 80241940 0C0B53A3 */ jal dead_evt_get_variable /* EAA424 80241944 0220202D */ daddu $a0, $s1, $zero /* EAA428 80241948 AE22009C */ sw $v0, 0x9c($s1) /* EAA42C 8024194C 8E050000 */ lw $a1, ($s0) /* EAA430 80241950 26100004 */ addiu $s0, $s0, 4 -/* EAA434 80241954 0C0B53A3 */ jal dead_get_variable +/* EAA434 80241954 0C0B53A3 */ jal dead_evt_get_variable /* EAA438 80241958 0220202D */ daddu $a0, $s1, $zero /* EAA43C 8024195C AE2200A0 */ sw $v0, 0xa0($s1) /* EAA440 80241960 8E050000 */ lw $a1, ($s0) /* EAA444 80241964 26100004 */ addiu $s0, $s0, 4 -/* EAA448 80241968 0C0B53A3 */ jal dead_get_variable +/* EAA448 80241968 0C0B53A3 */ jal dead_evt_get_variable /* EAA44C 8024196C 0220202D */ daddu $a0, $s1, $zero /* EAA450 80241970 AE2200A4 */ sw $v0, 0xa4($s1) /* EAA454 80241974 8E050000 */ lw $a1, ($s0) /* EAA458 80241978 26100004 */ addiu $s0, $s0, 4 -/* EAA45C 8024197C 0C0B53A3 */ jal dead_get_variable +/* EAA45C 8024197C 0C0B53A3 */ jal dead_evt_get_variable /* EAA460 80241980 0220202D */ daddu $a0, $s1, $zero /* EAA464 80241984 AE2200A8 */ sw $v0, 0xa8($s1) /* EAA468 80241988 8E050000 */ lw $a1, ($s0) /* EAA46C 8024198C 26100004 */ addiu $s0, $s0, 4 -/* EAA470 80241990 0C0B53A3 */ jal dead_get_variable +/* EAA470 80241990 0C0B53A3 */ jal dead_evt_get_variable /* EAA474 80241994 0220202D */ daddu $a0, $s1, $zero /* EAA478 80241998 AE2200AC */ sw $v0, 0xac($s1) /* EAA47C 8024199C 8E050000 */ lw $a1, ($s0) -/* EAA480 802419A0 0C0B53A3 */ jal dead_get_variable +/* EAA480 802419A0 0C0B53A3 */ jal dead_evt_get_variable /* EAA484 802419A4 0220202D */ daddu $a0, $s1, $zero /* EAA488 802419A8 AE2200B0 */ sw $v0, 0xb0($s1) /* EAA48C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s b/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s index 4506cd6de8..c357e74611 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s @@ -17,7 +17,7 @@ glabel func_802419C4_EAA4A4 /* EAA4D4 802419F4 8E30000C */ lw $s0, 0xc($s1) /* EAA4D8 802419F8 8E160000 */ lw $s6, ($s0) /* EAA4DC 802419FC 26100004 */ addiu $s0, $s0, 4 -/* EAA4E0 80241A00 0C0B53A3 */ jal dead_get_variable +/* EAA4E0 80241A00 0C0B53A3 */ jal dead_evt_get_variable /* EAA4E4 80241A04 02C0282D */ daddu $a1, $s6, $zero /* EAA4E8 80241A08 44820000 */ mtc1 $v0, $f0 /* EAA4EC 80241A0C 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_802419C4_EAA4A4 /* EAA4F8 80241A18 8E140000 */ lw $s4, ($s0) /* EAA4FC 80241A1C 26100004 */ addiu $s0, $s0, 4 /* EAA500 80241A20 0220202D */ daddu $a0, $s1, $zero -/* EAA504 80241A24 0C0B53A3 */ jal dead_get_variable +/* EAA504 80241A24 0C0B53A3 */ jal dead_evt_get_variable /* EAA508 80241A28 0280282D */ daddu $a1, $s4, $zero /* EAA50C 80241A2C 0220202D */ daddu $a0, $s1, $zero /* EAA510 80241A30 8E150000 */ lw $s5, ($s0) /* EAA514 80241A34 4482B000 */ mtc1 $v0, $f22 /* EAA518 80241A38 00000000 */ nop /* EAA51C 80241A3C 4680B5A0 */ cvt.s.w $f22, $f22 -/* EAA520 80241A40 0C0B53A3 */ jal dead_get_variable +/* EAA520 80241A40 0C0B53A3 */ jal dead_evt_get_variable /* EAA524 80241A44 02A0282D */ daddu $a1, $s5, $zero /* EAA528 80241A48 2404FFFC */ addiu $a0, $zero, -4 /* EAA52C 80241A4C 44820000 */ mtc1 $v0, $f0 @@ -75,18 +75,18 @@ glabel func_802419C4_EAA4A4 /* EAA5BC 80241ADC C7A00010 */ lwc1 $f0, 0x10($sp) /* EAA5C0 80241AE0 4600008D */ trunc.w.s $f2, $f0 /* EAA5C4 80241AE4 44061000 */ mfc1 $a2, $f2 -/* EAA5C8 80241AE8 0C0B551A */ jal dead_set_variable +/* EAA5C8 80241AE8 0C0B551A */ jal dead_evt_set_variable /* EAA5CC 80241AEC 02C0282D */ daddu $a1, $s6, $zero /* EAA5D0 80241AF0 0220202D */ daddu $a0, $s1, $zero /* EAA5D4 80241AF4 4600B08D */ trunc.w.s $f2, $f22 /* EAA5D8 80241AF8 44061000 */ mfc1 $a2, $f2 -/* EAA5DC 80241AFC 0C0B551A */ jal dead_set_variable +/* EAA5DC 80241AFC 0C0B551A */ jal dead_evt_set_variable /* EAA5E0 80241B00 0280282D */ daddu $a1, $s4, $zero /* EAA5E4 80241B04 0220202D */ daddu $a0, $s1, $zero /* EAA5E8 80241B08 C7A00014 */ lwc1 $f0, 0x14($sp) /* EAA5EC 80241B0C 4600008D */ trunc.w.s $f2, $f0 /* EAA5F0 80241B10 44061000 */ mfc1 $a2, $f2 -/* EAA5F4 80241B14 0C0B551A */ jal dead_set_variable +/* EAA5F4 80241B14 0C0B551A */ jal dead_evt_set_variable /* EAA5F8 80241B18 02A0282D */ daddu $a1, $s5, $zero /* EAA5FC 80241B1C 8FBF0034 */ lw $ra, 0x34($sp) /* EAA600 80241B20 8FB60030 */ lw $s6, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241BC0_EAA6A0.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241BC0_EAA6A0.s index 2eac611544..1d9a3cc68f 100644 --- a/ver/us/asm/nonmatchings/EA8AE0/func_80241BC0_EAA6A0.s +++ b/ver/us/asm/nonmatchings/EA8AE0/func_80241BC0_EAA6A0.s @@ -9,11 +9,11 @@ glabel func_80241BC0_EAA6A0 /* EAA6B0 80241BD0 AFB00010 */ sw $s0, 0x10($sp) /* EAA6B4 80241BD4 8E30000C */ lw $s0, 0xc($s1) /* EAA6B8 80241BD8 8E050000 */ lw $a1, ($s0) -/* EAA6BC 80241BDC 0C0B53A3 */ jal dead_get_variable +/* EAA6BC 80241BDC 0C0B53A3 */ jal dead_evt_get_variable /* EAA6C0 80241BE0 26100004 */ addiu $s0, $s0, 4 /* EAA6C4 80241BE4 0220202D */ daddu $a0, $s1, $zero /* EAA6C8 80241BE8 8E050000 */ lw $a1, ($s0) -/* EAA6CC 80241BEC 0C0B53A3 */ jal dead_get_variable +/* EAA6CC 80241BEC 0C0B53A3 */ jal dead_evt_get_variable /* EAA6D0 80241BF0 0040802D */ daddu $s0, $v0, $zero /* EAA6D4 80241BF4 0040202D */ daddu $a0, $v0, $zero /* EAA6D8 80241BF8 24020001 */ addiu $v0, $zero, 1 diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s b/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s index 113eafd706..a3e6f5fc6a 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s +++ b/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s @@ -9,7 +9,7 @@ glabel func_80240428_EB1288 /* EB1298 80240438 AFB00010 */ sw $s0, 0x10($sp) /* EB129C 8024043C 8E30000C */ lw $s0, 0xc($s1) /* EB12A0 80240440 8E050000 */ lw $a1, ($s0) -/* EB12A4 80240444 0C0B53A3 */ jal dead_get_variable +/* EB12A4 80240444 0C0B53A3 */ jal dead_evt_get_variable /* EB12A8 80240448 26100004 */ addiu $s0, $s0, 4 /* EB12AC 8024044C 0C00F94D */ jal func_8003E534 /* EB12B0 80240450 0040202D */ daddu $a0, $v0, $zero @@ -17,7 +17,7 @@ glabel func_80240428_EB1288 /* EB12B8 80240458 00000000 */ nop /* EB12BC 8024045C 8E050000 */ lw $a1, ($s0) /* EB12C0 80240460 844600A8 */ lh $a2, 0xa8($v0) -/* EB12C4 80240464 0C0B551A */ jal dead_set_variable +/* EB12C4 80240464 0C0B551A */ jal dead_evt_set_variable /* EB12C8 80240468 0220202D */ daddu $a0, $s1, $zero .L8024046C: /* EB12CC 8024046C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s index 44ed8ecbb9..7fc8e0541c 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s +++ b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s @@ -18,7 +18,7 @@ glabel func_80240484_EB12E4 /* EB1318 802404B8 8E30000C */ lw $s0, 0xc($s1) /* EB131C 802404BC 8E130000 */ lw $s3, ($s0) /* EB1320 802404C0 26100004 */ addiu $s0, $s0, 4 -/* EB1324 802404C4 0C0B53A3 */ jal dead_get_variable +/* EB1324 802404C4 0C0B53A3 */ jal dead_evt_get_variable /* EB1328 802404C8 0260282D */ daddu $a1, $s3, $zero /* EB132C 802404CC 4482E000 */ mtc1 $v0, $f28 /* EB1330 802404D0 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_80240484_EB12E4 /* EB1338 802404D8 8E140000 */ lw $s4, ($s0) /* EB133C 802404DC 26100004 */ addiu $s0, $s0, 4 /* EB1340 802404E0 0220202D */ daddu $a0, $s1, $zero -/* EB1344 802404E4 0C0B53A3 */ jal dead_get_variable +/* EB1344 802404E4 0C0B53A3 */ jal dead_evt_get_variable /* EB1348 802404E8 0280282D */ daddu $a1, $s4, $zero /* EB134C 802404EC 4482D000 */ mtc1 $v0, $f26 /* EB1350 802404F0 00000000 */ nop /* EB1354 802404F4 4680D6A0 */ cvt.s.w $f26, $f26 /* EB1358 802404F8 8E100000 */ lw $s0, ($s0) /* EB135C 802404FC 0220202D */ daddu $a0, $s1, $zero -/* EB1360 80240500 0C0B53A3 */ jal dead_get_variable +/* EB1360 80240500 0C0B53A3 */ jal dead_evt_get_variable /* EB1364 80240504 0200282D */ daddu $a1, $s0, $zero /* EB1368 80240508 4482C000 */ mtc1 $v0, $f24 /* EB136C 8024050C 00000000 */ nop @@ -94,17 +94,17 @@ glabel func_80240484_EB12E4 /* EB1440 802405E0 0260282D */ daddu $a1, $s3, $zero /* EB1444 802405E4 4600E18D */ trunc.w.s $f6, $f28 /* EB1448 802405E8 44063000 */ mfc1 $a2, $f6 -/* EB144C 802405EC 0C0B551A */ jal dead_set_variable +/* EB144C 802405EC 0C0B551A */ jal dead_evt_set_variable /* EB1450 802405F0 4600C601 */ sub.s $f24, $f24, $f0 /* EB1454 802405F4 0220202D */ daddu $a0, $s1, $zero /* EB1458 802405F8 4600D18D */ trunc.w.s $f6, $f26 /* EB145C 802405FC 44063000 */ mfc1 $a2, $f6 -/* EB1460 80240600 0C0B551A */ jal dead_set_variable +/* EB1460 80240600 0C0B551A */ jal dead_evt_set_variable /* EB1464 80240604 0280282D */ daddu $a1, $s4, $zero /* EB1468 80240608 0220202D */ daddu $a0, $s1, $zero /* EB146C 8024060C 4600C18D */ trunc.w.s $f6, $f24 /* EB1470 80240610 44063000 */ mfc1 $a2, $f6 -/* EB1474 80240614 0C0B551A */ jal dead_set_variable +/* EB1474 80240614 0C0B551A */ jal dead_evt_set_variable /* EB1478 80240618 0200282D */ daddu $a1, $s0, $zero /* EB147C 8024061C 8FBF0024 */ lw $ra, 0x24($sp) /* EB1480 80240620 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s b/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s index 733f8ea93d..e7b1d16e74 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s +++ b/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s @@ -19,7 +19,7 @@ glabel func_80240654_EB14B4 .L80240688: /* EB14E8 80240688 8CC50000 */ lw $a1, ($a2) /* EB14EC 8024068C 3C068024 */ lui $a2, %hi(D_802417E8_EB2648) -/* EB14F0 80240690 0C0B551A */ jal dead_set_variable +/* EB14F0 80240690 0C0B551A */ jal dead_evt_set_variable /* EB14F4 80240694 8CC617E8 */ lw $a2, %lo(D_802417E8_EB2648)($a2) /* EB14F8 80240698 24020002 */ addiu $v0, $zero, 2 .L8024069C: diff --git a/ver/us/asm/nonmatchings/EB1170/func_802406A8_EB1508.s b/ver/us/asm/nonmatchings/EB1170/func_802406A8_EB1508.s index 9ff28c0625..fb27f47e03 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_802406A8_EB1508.s +++ b/ver/us/asm/nonmatchings/EB1170/func_802406A8_EB1508.s @@ -5,7 +5,7 @@ glabel func_802406A8_EB1508 /* EB1508 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EB150C 802406AC AFBF0010 */ sw $ra, 0x10($sp) /* EB1510 802406B0 8C82000C */ lw $v0, 0xc($a0) -/* EB1514 802406B4 0C0B53A3 */ jal dead_get_variable +/* EB1514 802406B4 0C0B53A3 */ jal dead_evt_get_variable /* EB1518 802406B8 8C450000 */ lw $a1, ($v0) /* EB151C 802406BC 3C018024 */ lui $at, %hi(D_802417E8_EB2648) /* EB1520 802406C0 AC2217E8 */ sw $v0, %lo(D_802417E8_EB2648)($at) diff --git a/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s b/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s index 2fd4902f5d..9a526699f0 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s +++ b/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s @@ -5,7 +5,7 @@ glabel func_802406E0_EB1540 /* EB1540 802406E0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EB1544 802406E4 AFBF0010 */ sw $ra, 0x10($sp) /* EB1548 802406E8 8C82000C */ lw $v0, 0xc($a0) -/* EB154C 802406EC 0C0B53A3 */ jal dead_get_variable +/* EB154C 802406EC 0C0B53A3 */ jal dead_evt_get_variable /* EB1550 802406F0 8C450000 */ lw $a1, ($v0) /* EB1554 802406F4 0040182D */ daddu $v1, $v0, $zero /* EB1558 802406F8 10600012 */ beqz $v1, .L80240744 diff --git a/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s b/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s index 0c6b5e13d1..016aef1858 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s +++ b/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s @@ -9,51 +9,51 @@ glabel func_8024077C_EB15DC /* EB15EC 8024078C AFB00010 */ sw $s0, 0x10($sp) /* EB15F0 80240790 8E30000C */ lw $s0, 0xc($s1) /* EB15F4 80240794 8E050000 */ lw $a1, ($s0) -/* EB15F8 80240798 0C0B53A3 */ jal dead_get_variable +/* EB15F8 80240798 0C0B53A3 */ jal dead_evt_get_variable /* EB15FC 8024079C 26100004 */ addiu $s0, $s0, 4 /* EB1600 802407A0 AE22008C */ sw $v0, 0x8c($s1) /* EB1604 802407A4 8E050000 */ lw $a1, ($s0) /* EB1608 802407A8 26100004 */ addiu $s0, $s0, 4 -/* EB160C 802407AC 0C0B53A3 */ jal dead_get_variable +/* EB160C 802407AC 0C0B53A3 */ jal dead_evt_get_variable /* EB1610 802407B0 0220202D */ daddu $a0, $s1, $zero /* EB1614 802407B4 AE220090 */ sw $v0, 0x90($s1) /* EB1618 802407B8 8E050000 */ lw $a1, ($s0) /* EB161C 802407BC 26100004 */ addiu $s0, $s0, 4 -/* EB1620 802407C0 0C0B53A3 */ jal dead_get_variable +/* EB1620 802407C0 0C0B53A3 */ jal dead_evt_get_variable /* EB1624 802407C4 0220202D */ daddu $a0, $s1, $zero /* EB1628 802407C8 AE220094 */ sw $v0, 0x94($s1) /* EB162C 802407CC 8E050000 */ lw $a1, ($s0) /* EB1630 802407D0 26100004 */ addiu $s0, $s0, 4 -/* EB1634 802407D4 0C0B53A3 */ jal dead_get_variable +/* EB1634 802407D4 0C0B53A3 */ jal dead_evt_get_variable /* EB1638 802407D8 0220202D */ daddu $a0, $s1, $zero /* EB163C 802407DC AE220098 */ sw $v0, 0x98($s1) /* EB1640 802407E0 8E050000 */ lw $a1, ($s0) /* EB1644 802407E4 26100004 */ addiu $s0, $s0, 4 -/* EB1648 802407E8 0C0B53A3 */ jal dead_get_variable +/* EB1648 802407E8 0C0B53A3 */ jal dead_evt_get_variable /* EB164C 802407EC 0220202D */ daddu $a0, $s1, $zero /* EB1650 802407F0 AE22009C */ sw $v0, 0x9c($s1) /* EB1654 802407F4 8E050000 */ lw $a1, ($s0) /* EB1658 802407F8 26100004 */ addiu $s0, $s0, 4 -/* EB165C 802407FC 0C0B53A3 */ jal dead_get_variable +/* EB165C 802407FC 0C0B53A3 */ jal dead_evt_get_variable /* EB1660 80240800 0220202D */ daddu $a0, $s1, $zero /* EB1664 80240804 AE2200A0 */ sw $v0, 0xa0($s1) /* EB1668 80240808 8E050000 */ lw $a1, ($s0) /* EB166C 8024080C 26100004 */ addiu $s0, $s0, 4 -/* EB1670 80240810 0C0B53A3 */ jal dead_get_variable +/* EB1670 80240810 0C0B53A3 */ jal dead_evt_get_variable /* EB1674 80240814 0220202D */ daddu $a0, $s1, $zero /* EB1678 80240818 AE2200A4 */ sw $v0, 0xa4($s1) /* EB167C 8024081C 8E050000 */ lw $a1, ($s0) /* EB1680 80240820 26100004 */ addiu $s0, $s0, 4 -/* EB1684 80240824 0C0B53A3 */ jal dead_get_variable +/* EB1684 80240824 0C0B53A3 */ jal dead_evt_get_variable /* EB1688 80240828 0220202D */ daddu $a0, $s1, $zero /* EB168C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) /* EB1690 80240830 8E050000 */ lw $a1, ($s0) /* EB1694 80240834 26100004 */ addiu $s0, $s0, 4 -/* EB1698 80240838 0C0B53A3 */ jal dead_get_variable +/* EB1698 80240838 0C0B53A3 */ jal dead_evt_get_variable /* EB169C 8024083C 0220202D */ daddu $a0, $s1, $zero /* EB16A0 80240840 AE2200AC */ sw $v0, 0xac($s1) /* EB16A4 80240844 8E050000 */ lw $a1, ($s0) -/* EB16A8 80240848 0C0B53A3 */ jal dead_get_variable +/* EB16A8 80240848 0C0B53A3 */ jal dead_evt_get_variable /* EB16AC 8024084C 0220202D */ daddu $a0, $s1, $zero /* EB16B0 80240850 AE2200B0 */ sw $v0, 0xb0($s1) /* EB16B4 80240854 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s b/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s index 7f4168e156..3b0e1d8fdf 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s +++ b/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s @@ -17,7 +17,7 @@ glabel func_8024086C_EB16CC /* EB16FC 8024089C 8E30000C */ lw $s0, 0xc($s1) /* EB1700 802408A0 8E160000 */ lw $s6, ($s0) /* EB1704 802408A4 26100004 */ addiu $s0, $s0, 4 -/* EB1708 802408A8 0C0B53A3 */ jal dead_get_variable +/* EB1708 802408A8 0C0B53A3 */ jal dead_evt_get_variable /* EB170C 802408AC 02C0282D */ daddu $a1, $s6, $zero /* EB1710 802408B0 44820000 */ mtc1 $v0, $f0 /* EB1714 802408B4 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_8024086C_EB16CC /* EB1720 802408C0 8E140000 */ lw $s4, ($s0) /* EB1724 802408C4 26100004 */ addiu $s0, $s0, 4 /* EB1728 802408C8 0220202D */ daddu $a0, $s1, $zero -/* EB172C 802408CC 0C0B53A3 */ jal dead_get_variable +/* EB172C 802408CC 0C0B53A3 */ jal dead_evt_get_variable /* EB1730 802408D0 0280282D */ daddu $a1, $s4, $zero /* EB1734 802408D4 0220202D */ daddu $a0, $s1, $zero /* EB1738 802408D8 8E150000 */ lw $s5, ($s0) /* EB173C 802408DC 4482B000 */ mtc1 $v0, $f22 /* EB1740 802408E0 00000000 */ nop /* EB1744 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* EB1748 802408E8 0C0B53A3 */ jal dead_get_variable +/* EB1748 802408E8 0C0B53A3 */ jal dead_evt_get_variable /* EB174C 802408EC 02A0282D */ daddu $a1, $s5, $zero /* EB1750 802408F0 2404FFFC */ addiu $a0, $zero, -4 /* EB1754 802408F4 44820000 */ mtc1 $v0, $f0 @@ -75,18 +75,18 @@ glabel func_8024086C_EB16CC /* EB17E4 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) /* EB17E8 80240988 4600008D */ trunc.w.s $f2, $f0 /* EB17EC 8024098C 44061000 */ mfc1 $a2, $f2 -/* EB17F0 80240990 0C0B551A */ jal dead_set_variable +/* EB17F0 80240990 0C0B551A */ jal dead_evt_set_variable /* EB17F4 80240994 02C0282D */ daddu $a1, $s6, $zero /* EB17F8 80240998 0220202D */ daddu $a0, $s1, $zero /* EB17FC 8024099C 4600B08D */ trunc.w.s $f2, $f22 /* EB1800 802409A0 44061000 */ mfc1 $a2, $f2 -/* EB1804 802409A4 0C0B551A */ jal dead_set_variable +/* EB1804 802409A4 0C0B551A */ jal dead_evt_set_variable /* EB1808 802409A8 0280282D */ daddu $a1, $s4, $zero /* EB180C 802409AC 0220202D */ daddu $a0, $s1, $zero /* EB1810 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) /* EB1814 802409B4 4600008D */ trunc.w.s $f2, $f0 /* EB1818 802409B8 44061000 */ mfc1 $a2, $f2 -/* EB181C 802409BC 0C0B551A */ jal dead_set_variable +/* EB181C 802409BC 0C0B551A */ jal dead_evt_set_variable /* EB1820 802409C0 02A0282D */ daddu $a1, $s5, $zero /* EB1824 802409C4 8FBF0034 */ lw $ra, 0x34($sp) /* EB1828 802409C8 8FB60030 */ lw $s6, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240A8C_EB18EC.s b/ver/us/asm/nonmatchings/EB1170/func_80240A8C_EB18EC.s index cd9d3c9734..92a2956636 100644 --- a/ver/us/asm/nonmatchings/EB1170/func_80240A8C_EB18EC.s +++ b/ver/us/asm/nonmatchings/EB1170/func_80240A8C_EB18EC.s @@ -7,7 +7,7 @@ glabel func_80240A8C_EB18EC /* EB18F4 80240A94 8C82000C */ lw $v0, 0xc($a0) /* EB18F8 80240A98 3C068017 */ lui $a2, %hi(D_80169B12) /* EB18FC 80240A9C 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) -/* EB1900 80240AA0 0C0B551A */ jal dead_set_variable +/* EB1900 80240AA0 0C0B551A */ jal dead_evt_set_variable /* EB1904 80240AA4 8C450000 */ lw $a1, ($v0) /* EB1908 80240AA8 8FBF0010 */ lw $ra, 0x10($sp) /* EB190C 80240AAC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EB5130/func_8024030C_EB543C.s b/ver/us/asm/nonmatchings/EB5130/func_8024030C_EB543C.s index cc05563ebb..d4ad310852 100644 --- a/ver/us/asm/nonmatchings/EB5130/func_8024030C_EB543C.s +++ b/ver/us/asm/nonmatchings/EB5130/func_8024030C_EB543C.s @@ -7,7 +7,7 @@ glabel func_8024030C_EB543C /* EB5444 80240314 8C82000C */ lw $v0, 0xc($a0) /* EB5448 80240318 3C068017 */ lui $a2, %hi(D_80169B12) /* EB544C 8024031C 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) -/* EB5450 80240320 0C0B551A */ jal dead_set_variable +/* EB5450 80240320 0C0B551A */ jal dead_evt_set_variable /* EB5454 80240324 8C450000 */ lw $a1, ($v0) /* EB5458 80240328 8FBF0010 */ lw $ra, 0x10($sp) /* EB545C 8024032C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s b/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s index 55e2024772..dd71179743 100644 --- a/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s +++ b/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s @@ -7,7 +7,7 @@ glabel func_80240340_EB5470 /* EB5478 80240348 8C82000C */ lw $v0, 0xc($a0) /* EB547C 8024034C 3C068017 */ lui $a2, %hi(D_80169B12) /* EB5480 80240350 84C69B12 */ lh $a2, %lo(D_80169B12)($a2) -/* EB5484 80240354 0C0B551A */ jal dead_set_variable +/* EB5484 80240354 0C0B551A */ jal dead_evt_set_variable /* EB5488 80240358 8C450000 */ lw $a1, ($v0) /* EB548C 8024035C 8FBF0010 */ lw $ra, 0x10($sp) /* EB5490 80240360 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s b/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s index fb58724307..3903aa14f4 100644 --- a/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s +++ b/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s @@ -13,25 +13,25 @@ glabel func_80240310_EB7540 /* EB7560 80240330 F7B40020 */ sdc1 $f20, 0x20($sp) /* EB7564 80240334 8E30000C */ lw $s0, 0xc($s1) /* EB7568 80240338 8E050000 */ lw $a1, ($s0) -/* EB756C 8024033C 0C0B53A3 */ jal dead_get_variable +/* EB756C 8024033C 0C0B53A3 */ jal dead_evt_get_variable /* EB7570 80240340 26100004 */ addiu $s0, $s0, 4 /* EB7574 80240344 8E050000 */ lw $a1, ($s0) /* EB7578 80240348 26100004 */ addiu $s0, $s0, 4 /* EB757C 8024034C 0220202D */ daddu $a0, $s1, $zero -/* EB7580 80240350 0C0B53A3 */ jal dead_get_variable +/* EB7580 80240350 0C0B53A3 */ jal dead_evt_get_variable /* EB7584 80240354 0040902D */ daddu $s2, $v0, $zero /* EB7588 80240358 8E050000 */ lw $a1, ($s0) /* EB758C 8024035C 26100004 */ addiu $s0, $s0, 4 /* EB7590 80240360 4482C000 */ mtc1 $v0, $f24 /* EB7594 80240364 00000000 */ nop /* EB7598 80240368 4680C620 */ cvt.s.w $f24, $f24 -/* EB759C 8024036C 0C0B53A3 */ jal dead_get_variable +/* EB759C 8024036C 0C0B53A3 */ jal dead_evt_get_variable /* EB75A0 80240370 0220202D */ daddu $a0, $s1, $zero /* EB75A4 80240374 8E050000 */ lw $a1, ($s0) /* EB75A8 80240378 4482B000 */ mtc1 $v0, $f22 /* EB75AC 8024037C 00000000 */ nop /* EB75B0 80240380 4680B5A0 */ cvt.s.w $f22, $f22 -/* EB75B4 80240384 0C0B53A3 */ jal dead_get_variable +/* EB75B4 80240384 0C0B53A3 */ jal dead_evt_get_variable /* EB75B8 80240388 0220202D */ daddu $a0, $s1, $zero /* EB75BC 8024038C 4482A000 */ mtc1 $v0, $f20 /* EB75C0 80240390 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s b/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s index 2933aaf10d..9c7cc0d5cf 100644 --- a/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s +++ b/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s @@ -10,7 +10,7 @@ glabel func_802403D8_EB7608 /* EB761C 802403EC AFB00010 */ sw $s0, 0x10($sp) /* EB7620 802403F0 8E50000C */ lw $s0, 0xc($s2) /* EB7624 802403F4 8E050000 */ lw $a1, ($s0) -/* EB7628 802403F8 0C0B53A3 */ jal dead_get_variable +/* EB7628 802403F8 0C0B53A3 */ jal dead_evt_get_variable /* EB762C 802403FC 26100004 */ addiu $s0, $s0, 4 /* EB7630 80240400 0C0462EC */ jal func_80118BB0 /* EB7634 80240404 0040202D */ daddu $a0, $v0, $zero @@ -20,20 +20,20 @@ glabel func_802403D8_EB7608 /* EB7644 80240414 C6200048 */ lwc1 $f0, 0x48($s1) /* EB7648 80240418 4600008D */ trunc.w.s $f2, $f0 /* EB764C 8024041C 44061000 */ mfc1 $a2, $f2 -/* EB7650 80240420 0C0B551A */ jal dead_set_variable +/* EB7650 80240420 0C0B551A */ jal dead_evt_set_variable /* EB7654 80240424 0240202D */ daddu $a0, $s2, $zero /* EB7658 80240428 8E050000 */ lw $a1, ($s0) /* EB765C 8024042C 26100004 */ addiu $s0, $s0, 4 /* EB7660 80240430 C620004C */ lwc1 $f0, 0x4c($s1) /* EB7664 80240434 4600008D */ trunc.w.s $f2, $f0 /* EB7668 80240438 44061000 */ mfc1 $a2, $f2 -/* EB766C 8024043C 0C0B551A */ jal dead_set_variable +/* EB766C 8024043C 0C0B551A */ jal dead_evt_set_variable /* EB7670 80240440 0240202D */ daddu $a0, $s2, $zero /* EB7674 80240444 C6200050 */ lwc1 $f0, 0x50($s1) /* EB7678 80240448 8E050000 */ lw $a1, ($s0) /* EB767C 8024044C 4600008D */ trunc.w.s $f2, $f0 /* EB7680 80240450 44061000 */ mfc1 $a2, $f2 -/* EB7684 80240454 0C0B551A */ jal dead_set_variable +/* EB7684 80240454 0C0B551A */ jal dead_evt_set_variable /* EB7688 80240458 0240202D */ daddu $a0, $s2, $zero /* EB768C 8024045C 8FBF001C */ lw $ra, 0x1c($sp) /* EB7690 80240460 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s b/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s index 5391db0677..67bf44b9a5 100644 --- a/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s +++ b/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s @@ -11,16 +11,16 @@ glabel func_80240478_EB76A8 /* EB76C0 80240490 F7B40020 */ sdc1 $f20, 0x20($sp) /* EB76C4 80240494 8E30000C */ lw $s0, 0xc($s1) /* EB76C8 80240498 8E050000 */ lw $a1, ($s0) -/* EB76CC 8024049C 0C0B55FF */ jal dead_get_float_variable +/* EB76CC 8024049C 0C0B55FF */ jal dead_evt_get_float_variable /* EB76D0 802404A0 26100004 */ addiu $s0, $s0, 4 /* EB76D4 802404A4 8E050000 */ lw $a1, ($s0) /* EB76D8 802404A8 26100004 */ addiu $s0, $s0, 4 /* EB76DC 802404AC 0220202D */ daddu $a0, $s1, $zero -/* EB76E0 802404B0 0C0B55FF */ jal dead_get_float_variable +/* EB76E0 802404B0 0C0B55FF */ jal dead_evt_get_float_variable /* EB76E4 802404B4 46000586 */ mov.s $f22, $f0 /* EB76E8 802404B8 0220202D */ daddu $a0, $s1, $zero /* EB76EC 802404BC 8E050000 */ lw $a1, ($s0) -/* EB76F0 802404C0 0C0B55FF */ jal dead_get_float_variable +/* EB76F0 802404C0 0C0B55FF */ jal dead_evt_get_float_variable /* EB76F4 802404C4 46000506 */ mov.s $f20, $f0 /* EB76F8 802404C8 8E2300BC */ lw $v1, 0xbc($s1) /* EB76FC 802404CC 8C62000C */ lw $v0, 0xc($v1) diff --git a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s index ac2a730f68..ff0c2c7bcc 100644 --- a/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s +++ b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s @@ -25,7 +25,7 @@ glabel func_80240BD4_EB9A24 /* EB9A58 80240C08 8EA3000C */ lw $v1, 0xc($s5) /* EB9A5C 80240C0C 02A0202D */ daddu $a0, $s5, $zero /* EB9A60 80240C10 8C650000 */ lw $a1, ($v1) -/* EB9A64 80240C14 0C0B53A3 */ jal dead_get_variable +/* EB9A64 80240C14 0C0B53A3 */ jal dead_evt_get_variable /* EB9A68 80240C18 0040902D */ daddu $s2, $v0, $zero /* EB9A6C 80240C1C AFA00018 */ sw $zero, 0x18($sp) /* EB9A70 80240C20 8E2300D0 */ lw $v1, 0xd0($s1) diff --git a/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s b/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s index 72a8b71a19..9d8ad3f3b3 100644 --- a/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s +++ b/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s @@ -15,13 +15,13 @@ glabel func_80240F40_EB9D90 /* EB9DB8 80240F68 4600008D */ trunc.w.s $f2, $f0 /* EB9DBC 80240F6C 44061000 */ mfc1 $a2, $f2 /* EB9DC0 80240F70 8C450000 */ lw $a1, ($v0) -/* EB9DC4 80240F74 0C0B551A */ jal dead_set_variable +/* EB9DC4 80240F74 0C0B551A */ jal dead_evt_set_variable /* EB9DC8 80240F78 8C510004 */ lw $s1, 4($v0) /* EB9DCC 80240F7C 0200202D */ daddu $a0, $s0, $zero /* EB9DD0 80240F80 C6400080 */ lwc1 $f0, 0x80($s2) /* EB9DD4 80240F84 4600008D */ trunc.w.s $f2, $f0 /* EB9DD8 80240F88 44061000 */ mfc1 $a2, $f2 -/* EB9DDC 80240F8C 0C0B551A */ jal dead_set_variable +/* EB9DDC 80240F8C 0C0B551A */ jal dead_evt_set_variable /* EB9DE0 80240F90 0220282D */ daddu $a1, $s1, $zero /* EB9DE4 80240F94 8FBF001C */ lw $ra, 0x1c($sp) /* EB9DE8 80240F98 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s b/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s index 868f25692c..39064bca1a 100644 --- a/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s +++ b/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s @@ -12,7 +12,7 @@ glabel func_80240FB0_EB9E00 /* EB9E1C 80240FCC F7B60028 */ sdc1 $f22, 0x28($sp) /* EB9E20 80240FD0 F7B40020 */ sdc1 $f20, 0x20($sp) /* EB9E24 80240FD4 8E05008C */ lw $a1, 0x8c($s0) -/* EB9E28 80240FD8 0C0B53A3 */ jal dead_get_variable +/* EB9E28 80240FD8 0C0B53A3 */ jal dead_evt_get_variable /* EB9E2C 80240FDC 0000202D */ daddu $a0, $zero, $zero /* EB9E30 80240FE0 C60200A8 */ lwc1 $f2, 0xa8($s0) /* EB9E34 80240FE4 468010A0 */ cvt.s.w $f2, $f2 @@ -52,11 +52,11 @@ glabel func_80240FB0_EB9E00 /* EB9EBC 8024106C 26317578 */ addiu $s1, $s1, %lo(D_80117578) /* EB9EC0 80241070 E6200028 */ swc1 $f0, 0x28($s1) /* EB9EC4 80241074 8E0500AC */ lw $a1, 0xac($s0) -/* EB9EC8 80241078 0C0B53A3 */ jal dead_get_variable +/* EB9EC8 80241078 0C0B53A3 */ jal dead_evt_get_variable /* EB9ECC 8024107C 0000202D */ daddu $a0, $zero, $zero /* EB9ED0 80241080 0000202D */ daddu $a0, $zero, $zero /* EB9ED4 80241084 8E050090 */ lw $a1, 0x90($s0) -/* EB9ED8 80241088 0C0B53A3 */ jal dead_get_variable +/* EB9ED8 80241088 0C0B53A3 */ jal dead_evt_get_variable /* EB9EDC 8024108C 0040802D */ daddu $s0, $v0, $zero /* EB9EE0 80241090 4600A306 */ mov.s $f12, $f20 /* EB9EE4 80241094 02028021 */ addu $s0, $s0, $v0 diff --git a/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s b/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s index adde918e43..f1f56adeda 100644 --- a/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s +++ b/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s @@ -15,7 +15,7 @@ glabel func_802410E4_EB9F34 /* EB9F5C 8024110C 0000202D */ daddu $a0, $zero, $zero /* EB9F60 80241110 0000202D */ daddu $a0, $zero, $zero /* EB9F64 80241114 8E05008C */ lw $a1, 0x8c($s0) -/* EB9F68 80241118 0C0B53A3 */ jal dead_get_variable +/* EB9F68 80241118 0C0B53A3 */ jal dead_evt_get_variable /* EB9F6C 8024111C 0040882D */ daddu $s1, $v0, $zero /* EB9F70 80241120 C60200B4 */ lwc1 $f2, 0xb4($s0) /* EB9F74 80241124 468010A0 */ cvt.s.w $f2, $f2 @@ -53,11 +53,11 @@ glabel func_802410E4_EB9F34 /* EB9FF4 802411A4 46180000 */ add.s $f0, $f0, $f24 /* EB9FF8 802411A8 E6200038 */ swc1 $f0, 0x38($s1) /* EB9FFC 802411AC 8E0500B8 */ lw $a1, 0xb8($s0) -/* EBA000 802411B0 0C0B53A3 */ jal dead_get_variable +/* EBA000 802411B0 0C0B53A3 */ jal dead_evt_get_variable /* EBA004 802411B4 0000202D */ daddu $a0, $zero, $zero /* EBA008 802411B8 0000202D */ daddu $a0, $zero, $zero /* EBA00C 802411BC 8E050090 */ lw $a1, 0x90($s0) -/* EBA010 802411C0 0C0B53A3 */ jal dead_get_variable +/* EBA010 802411C0 0C0B53A3 */ jal dead_evt_get_variable /* EBA014 802411C4 0040802D */ daddu $s0, $v0, $zero /* EBA018 802411C8 4600A306 */ mov.s $f12, $f20 /* EBA01C 802411CC 02028021 */ addu $s0, $s0, $v0 diff --git a/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s b/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s index 2ca555557f..db1973c802 100644 --- a/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s +++ b/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s @@ -17,33 +17,33 @@ glabel func_8024121C_EBA06C /* EBA09C 8024124C 8E50000C */ lw $s0, 0xc($s2) /* EBA0A0 80241250 8E140000 */ lw $s4, ($s0) /* EBA0A4 80241254 26100004 */ addiu $s0, $s0, 4 -/* EBA0A8 80241258 0C0B53A3 */ jal dead_get_variable +/* EBA0A8 80241258 0C0B53A3 */ jal dead_evt_get_variable /* EBA0AC 8024125C 0280282D */ daddu $a1, $s4, $zero /* EBA0B0 80241260 0040982D */ daddu $s3, $v0, $zero /* EBA0B4 80241264 8E150000 */ lw $s5, ($s0) /* EBA0B8 80241268 26100004 */ addiu $s0, $s0, 4 /* EBA0BC 8024126C 8E050000 */ lw $a1, ($s0) /* EBA0C0 80241270 26100004 */ addiu $s0, $s0, 4 -/* EBA0C4 80241274 0C0B55FF */ jal dead_get_float_variable +/* EBA0C4 80241274 0C0B55FF */ jal dead_evt_get_float_variable /* EBA0C8 80241278 0240202D */ daddu $a0, $s2, $zero /* EBA0CC 8024127C 8E050000 */ lw $a1, ($s0) /* EBA0D0 80241280 26100004 */ addiu $s0, $s0, 4 /* EBA0D4 80241284 0240202D */ daddu $a0, $s2, $zero -/* EBA0D8 80241288 0C0B55FF */ jal dead_get_float_variable +/* EBA0D8 80241288 0C0B55FF */ jal dead_evt_get_float_variable /* EBA0DC 8024128C 46000606 */ mov.s $f24, $f0 /* EBA0E0 80241290 8E050000 */ lw $a1, ($s0) /* EBA0E4 80241294 26100004 */ addiu $s0, $s0, 4 /* EBA0E8 80241298 0240202D */ daddu $a0, $s2, $zero -/* EBA0EC 8024129C 0C0B53A3 */ jal dead_get_variable +/* EBA0EC 8024129C 0C0B53A3 */ jal dead_evt_get_variable /* EBA0F0 802412A0 46000506 */ mov.s $f20, $f0 /* EBA0F4 802412A4 8E050000 */ lw $a1, ($s0) /* EBA0F8 802412A8 26100004 */ addiu $s0, $s0, 4 /* EBA0FC 802412AC 0240202D */ daddu $a0, $s2, $zero -/* EBA100 802412B0 0C0B53A3 */ jal dead_get_variable +/* EBA100 802412B0 0C0B53A3 */ jal dead_evt_get_variable /* EBA104 802412B4 0040882D */ daddu $s1, $v0, $zero /* EBA108 802412B8 0240202D */ daddu $a0, $s2, $zero /* EBA10C 802412BC 8E050000 */ lw $a1, ($s0) -/* EBA110 802412C0 0C0B55FF */ jal dead_get_float_variable +/* EBA110 802412C0 0C0B55FF */ jal dead_evt_get_float_variable /* EBA114 802412C4 0040802D */ daddu $s0, $v0, $zero /* EBA118 802412C8 3C014334 */ lui $at, 0x4334 /* EBA11C 802412CC 44811000 */ mtc1 $at, $f2 @@ -65,7 +65,7 @@ glabel func_8024121C_EBA06C /* EBA15C 8024130C 0240202D */ daddu $a0, $s2, $zero /* EBA160 80241310 0220982D */ daddu $s3, $s1, $zero /* EBA164 80241314 0280282D */ daddu $a1, $s4, $zero -/* EBA168 80241318 0C0B551A */ jal dead_set_variable +/* EBA168 80241318 0C0B551A */ jal dead_evt_set_variable /* EBA16C 8024131C 0220302D */ daddu $a2, $s1, $zero .L80241320: /* EBA170 80241320 3C014049 */ lui $at, 0x4049 @@ -88,7 +88,7 @@ glabel func_8024121C_EBA06C /* EBA1B4 80241364 46001081 */ sub.s $f2, $f2, $f0 /* EBA1B8 80241368 0240202D */ daddu $a0, $s2, $zero /* EBA1BC 8024136C 44061000 */ mfc1 $a2, $f2 -/* EBA1C0 80241370 0C0B5684 */ jal dead_set_float_variable +/* EBA1C0 80241370 0C0B5684 */ jal dead_evt_set_float_variable /* EBA1C4 80241374 02A0282D */ daddu $a1, $s5, $zero /* EBA1C8 80241378 8FBF0028 */ lw $ra, 0x28($sp) /* EBA1CC 8024137C 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s index c63ba936bf..9f1418a212 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s @@ -5,7 +5,7 @@ glabel func_8024003C_EC9D3C /* EC9D3C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EC9D40 80240040 AFBF0010 */ sw $ra, 0x10($sp) /* EC9D44 80240044 8C82000C */ lw $v0, 0xc($a0) -/* EC9D48 80240048 0C0B53A3 */ jal dead_get_variable +/* EC9D48 80240048 0C0B53A3 */ jal dead_evt_get_variable /* EC9D4C 8024004C 8C450000 */ lw $a1, ($v0) /* EC9D50 80240050 0C0BCEC0 */ jal func_802F3B00 /* EC9D54 80240054 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s b/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s index 4b13db579a..5929235abd 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s @@ -9,7 +9,7 @@ glabel func_80240068_EC9D68 /* EC9D78 80240078 AFB10014 */ sw $s1, 0x14($sp) /* EC9D7C 8024007C 8E11000C */ lw $s1, 0xc($s0) /* EC9D80 80240080 8E250000 */ lw $a1, ($s1) -/* EC9D84 80240084 0C0B53A3 */ jal dead_get_variable +/* EC9D84 80240084 0C0B53A3 */ jal dead_evt_get_variable /* EC9D88 80240088 26310004 */ addiu $s1, $s1, 4 /* EC9D8C 8024008C 0200202D */ daddu $a0, $s0, $zero /* EC9D90 80240090 3C038011 */ lui $v1, %hi(D_80117840) @@ -21,7 +21,7 @@ glabel func_80240068_EC9D68 /* EC9DA8 802400A8 24C60001 */ addiu $a2, $a2, 1 /* EC9DAC 802400AC A0460015 */ sb $a2, 0x15($v0) /* EC9DB0 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* EC9DB4 802400B4 0C0B551A */ jal dead_set_variable +/* EC9DB4 802400B4 0C0B551A */ jal dead_evt_set_variable /* EC9DB8 802400B8 00063603 */ sra $a2, $a2, 0x18 /* EC9DBC 802400BC 8FBF0018 */ lw $ra, 0x18($sp) /* EC9DC0 802400C0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s index 0e227e4703..aff8f6ef8d 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s @@ -5,7 +5,7 @@ glabel func_8024041C_ECA11C /* ECA11C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ECA120 80240420 AFBF0010 */ sw $ra, 0x10($sp) /* ECA124 80240424 8C82000C */ lw $v0, 0xc($a0) -/* ECA128 80240428 0C0B53A3 */ jal dead_get_variable +/* ECA128 80240428 0C0B53A3 */ jal dead_evt_get_variable /* ECA12C 8024042C 8C450000 */ lw $a1, ($v0) /* ECA130 80240430 0C03CB57 */ jal func_800F2D5C /* ECA134 80240434 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s b/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s index 5388fda299..a1e74b2b81 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s @@ -9,7 +9,7 @@ glabel func_80240480_ECA180 /* ECA190 80240490 AFB00018 */ sw $s0, 0x18($sp) /* ECA194 80240494 8E30000C */ lw $s0, 0xc($s1) /* ECA198 80240498 8E050000 */ lw $a1, ($s0) -/* ECA19C 8024049C 0C0B53A3 */ jal dead_get_variable +/* ECA19C 8024049C 0C0B53A3 */ jal dead_evt_get_variable /* ECA1A0 802404A0 26100004 */ addiu $s0, $s0, 4 /* ECA1A4 802404A4 0C0462EC */ jal func_80118BB0 /* ECA1A8 802404A8 0040202D */ daddu $a0, $v0, $zero @@ -30,7 +30,7 @@ glabel func_80240480_ECA180 /* ECA1E4 802404E4 0000202D */ daddu $a0, $zero, $zero /* ECA1E8 802404E8 0220202D */ daddu $a0, $s1, $zero /* ECA1EC 802404EC 0200282D */ daddu $a1, $s0, $zero -/* ECA1F0 802404F0 0C0B551A */ jal dead_set_variable +/* ECA1F0 802404F0 0C0B551A */ jal dead_evt_set_variable /* ECA1F4 802404F4 0040302D */ daddu $a2, $v0, $zero /* ECA1F8 802404F8 8FBF0020 */ lw $ra, 0x20($sp) /* ECA1FC 802404FC 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s b/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s index fd02012ae7..a1ec49381b 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s @@ -5,7 +5,7 @@ glabel func_80240510_ECA210 /* ECA210 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ECA214 80240514 AFBF0010 */ sw $ra, 0x10($sp) /* ECA218 80240518 8C82000C */ lw $v0, 0xc($a0) -/* ECA21C 8024051C 0C0B53A3 */ jal dead_get_variable +/* ECA21C 8024051C 0C0B53A3 */ jal dead_evt_get_variable /* ECA220 80240520 8C450000 */ lw $a1, ($v0) /* ECA224 80240524 0040202D */ daddu $a0, $v0, $zero /* ECA228 80240528 8C830000 */ lw $v1, ($a0) diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s b/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s index 3f6bdaa926..fca9ef3eb7 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s @@ -5,7 +5,7 @@ glabel func_80240544_ECA244 /* ECA244 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 /* ECA248 80240548 AFBF0018 */ sw $ra, 0x18($sp) /* ECA24C 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* ECA250 80240550 0C0B53A3 */ jal dead_get_variable +/* ECA250 80240550 0C0B53A3 */ jal dead_evt_get_variable /* ECA254 80240554 8C450000 */ lw $a1, ($v0) /* ECA258 80240558 0C0462EC */ jal func_80118BB0 /* ECA25C 8024055C 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s index 456bb9414b..108475fabf 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s @@ -50,7 +50,7 @@ glabel func_80240600_ECA300 /* ECA3B4 802406B4 3C013F80 */ lui $at, 0x3f80 /* ECA3B8 802406B8 4481B000 */ mtc1 $at, $f22 /* ECA3BC 802406BC 4480A000 */ mtc1 $zero, $f20 -/* ECA3C0 802406C0 0C0B53A3 */ jal dead_get_variable +/* ECA3C0 802406C0 0C0B53A3 */ jal dead_evt_get_variable /* ECA3C4 802406C4 0240802D */ daddu $s0, $s2, $zero /* ECA3C8 802406C8 0C0462EC */ jal func_80118BB0 /* ECA3CC 802406CC 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s b/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s index e9bbda480f..e5738d4709 100644 --- a/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s +++ b/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s @@ -12,11 +12,11 @@ glabel func_80240B38_ECA838 /* ECA854 80240B54 10A00010 */ beqz $a1, .L80240B98 /* ECA858 80240B58 0000902D */ daddu $s2, $zero, $zero /* ECA85C 80240B5C 8E050000 */ lw $a1, ($s0) -/* ECA860 80240B60 0C0B53A3 */ jal dead_get_variable +/* ECA860 80240B60 0C0B53A3 */ jal dead_evt_get_variable /* ECA864 80240B64 26100004 */ addiu $s0, $s0, 4 /* ECA868 80240B68 AE220084 */ sw $v0, 0x84($s1) /* ECA86C 80240B6C 8E050000 */ lw $a1, ($s0) -/* ECA870 80240B70 0C0B53A3 */ jal dead_get_variable +/* ECA870 80240B70 0C0B53A3 */ jal dead_evt_get_variable /* ECA874 80240B74 0220202D */ daddu $a0, $s1, $zero /* ECA878 80240B78 0240202D */ daddu $a0, $s2, $zero /* ECA87C 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 diff --git a/ver/us/asm/nonmatchings/ECAA80/func_8024150C_ECB20C.s b/ver/us/asm/nonmatchings/ECAA80/func_8024150C_ECB20C.s index 294d87b3fa..eadf52429e 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_8024150C_ECB20C.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_8024150C_ECB20C.s @@ -25,7 +25,7 @@ glabel func_8024150C_ECB20C /* ECB240 80241540 8EA3000C */ lw $v1, 0xc($s5) /* ECB244 80241544 02A0202D */ daddu $a0, $s5, $zero /* ECB248 80241548 8C650000 */ lw $a1, ($v1) -/* ECB24C 8024154C 0C0B53A3 */ jal dead_get_variable +/* ECB24C 8024154C 0C0B53A3 */ jal dead_evt_get_variable /* ECB250 80241550 0040902D */ daddu $s2, $v0, $zero /* ECB254 80241554 AFA00010 */ sw $zero, 0x10($sp) /* ECB258 80241558 8E2300D0 */ lw $v1, 0xd0($s1) diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s b/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s index a60e49da1e..49b697b56d 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s @@ -9,7 +9,7 @@ glabel func_80241770_ECB470 /* ECB480 80241780 AFB00010 */ sw $s0, 0x10($sp) /* ECB484 80241784 8E30000C */ lw $s0, 0xc($s1) /* ECB488 80241788 8E050000 */ lw $a1, ($s0) -/* ECB48C 8024178C 0C0B53A3 */ jal dead_get_variable +/* ECB48C 8024178C 0C0B53A3 */ jal dead_evt_get_variable /* ECB490 80241790 26100004 */ addiu $s0, $s0, 4 /* ECB494 80241794 0C00F94D */ jal func_8003E534 /* ECB498 80241798 0040202D */ daddu $a0, $v0, $zero @@ -17,7 +17,7 @@ glabel func_80241770_ECB470 /* ECB4A0 802417A0 00000000 */ nop /* ECB4A4 802417A4 8E050000 */ lw $a1, ($s0) /* ECB4A8 802417A8 844600A8 */ lh $a2, 0xa8($v0) -/* ECB4AC 802417AC 0C0B551A */ jal dead_set_variable +/* ECB4AC 802417AC 0C0B551A */ jal dead_evt_set_variable /* ECB4B0 802417B0 0220202D */ daddu $a0, $s1, $zero .L802417B4: /* ECB4B4 802417B4 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s index 21ea0c55fc..9a54b49cbd 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s @@ -18,7 +18,7 @@ glabel func_802417CC_ECB4CC /* ECB500 80241800 8E30000C */ lw $s0, 0xc($s1) /* ECB504 80241804 8E130000 */ lw $s3, ($s0) /* ECB508 80241808 26100004 */ addiu $s0, $s0, 4 -/* ECB50C 8024180C 0C0B53A3 */ jal dead_get_variable +/* ECB50C 8024180C 0C0B53A3 */ jal dead_evt_get_variable /* ECB510 80241810 0260282D */ daddu $a1, $s3, $zero /* ECB514 80241814 4482E000 */ mtc1 $v0, $f28 /* ECB518 80241818 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_802417CC_ECB4CC /* ECB520 80241820 8E140000 */ lw $s4, ($s0) /* ECB524 80241824 26100004 */ addiu $s0, $s0, 4 /* ECB528 80241828 0220202D */ daddu $a0, $s1, $zero -/* ECB52C 8024182C 0C0B53A3 */ jal dead_get_variable +/* ECB52C 8024182C 0C0B53A3 */ jal dead_evt_get_variable /* ECB530 80241830 0280282D */ daddu $a1, $s4, $zero /* ECB534 80241834 4482D000 */ mtc1 $v0, $f26 /* ECB538 80241838 00000000 */ nop /* ECB53C 8024183C 4680D6A0 */ cvt.s.w $f26, $f26 /* ECB540 80241840 8E100000 */ lw $s0, ($s0) /* ECB544 80241844 0220202D */ daddu $a0, $s1, $zero -/* ECB548 80241848 0C0B53A3 */ jal dead_get_variable +/* ECB548 80241848 0C0B53A3 */ jal dead_evt_get_variable /* ECB54C 8024184C 0200282D */ daddu $a1, $s0, $zero /* ECB550 80241850 4482C000 */ mtc1 $v0, $f24 /* ECB554 80241854 00000000 */ nop @@ -94,17 +94,17 @@ glabel func_802417CC_ECB4CC /* ECB628 80241928 0260282D */ daddu $a1, $s3, $zero /* ECB62C 8024192C 4600E18D */ trunc.w.s $f6, $f28 /* ECB630 80241930 44063000 */ mfc1 $a2, $f6 -/* ECB634 80241934 0C0B551A */ jal dead_set_variable +/* ECB634 80241934 0C0B551A */ jal dead_evt_set_variable /* ECB638 80241938 4600C601 */ sub.s $f24, $f24, $f0 /* ECB63C 8024193C 0220202D */ daddu $a0, $s1, $zero /* ECB640 80241940 4600D18D */ trunc.w.s $f6, $f26 /* ECB644 80241944 44063000 */ mfc1 $a2, $f6 -/* ECB648 80241948 0C0B551A */ jal dead_set_variable +/* ECB648 80241948 0C0B551A */ jal dead_evt_set_variable /* ECB64C 8024194C 0280282D */ daddu $a1, $s4, $zero /* ECB650 80241950 0220202D */ daddu $a0, $s1, $zero /* ECB654 80241954 4600C18D */ trunc.w.s $f6, $f24 /* ECB658 80241958 44063000 */ mfc1 $a2, $f6 -/* ECB65C 8024195C 0C0B551A */ jal dead_set_variable +/* ECB65C 8024195C 0C0B551A */ jal dead_evt_set_variable /* ECB660 80241960 0200282D */ daddu $a1, $s0, $zero /* ECB664 80241964 8FBF0024 */ lw $ra, 0x24($sp) /* ECB668 80241968 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s b/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s index f911903cad..fc531a338b 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s @@ -19,7 +19,7 @@ glabel func_8024199C_ECB69C .L802419D0: /* ECB6D0 802419D0 8CC50000 */ lw $a1, ($a2) /* ECB6D4 802419D4 3C068024 */ lui $a2, %hi(D_802430BC_ECCDBC) -/* ECB6D8 802419D8 0C0B551A */ jal dead_set_variable +/* ECB6D8 802419D8 0C0B551A */ jal dead_evt_set_variable /* ECB6DC 802419DC 8CC630BC */ lw $a2, %lo(D_802430BC_ECCDBC)($a2) /* ECB6E0 802419E0 24020002 */ addiu $v0, $zero, 2 .L802419E4: diff --git a/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s b/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s index 8c15094e06..d071b66261 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s @@ -5,7 +5,7 @@ glabel func_802419F0_ECB6F0 /* ECB6F0 802419F0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ECB6F4 802419F4 AFBF0010 */ sw $ra, 0x10($sp) /* ECB6F8 802419F8 8C82000C */ lw $v0, 0xc($a0) -/* ECB6FC 802419FC 0C0B53A3 */ jal dead_get_variable +/* ECB6FC 802419FC 0C0B53A3 */ jal dead_evt_get_variable /* ECB700 80241A00 8C450000 */ lw $a1, ($v0) /* ECB704 80241A04 3C018024 */ lui $at, %hi(D_802430BC_ECCDBC) /* ECB708 80241A08 AC2230BC */ sw $v0, %lo(D_802430BC_ECCDBC)($at) diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s b/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s index 0d207cb6f6..53575833b6 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s @@ -5,7 +5,7 @@ glabel func_80241A28_ECB728 /* ECB728 80241A28 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ECB72C 80241A2C AFBF0010 */ sw $ra, 0x10($sp) /* ECB730 80241A30 8C82000C */ lw $v0, 0xc($a0) -/* ECB734 80241A34 0C0B53A3 */ jal dead_get_variable +/* ECB734 80241A34 0C0B53A3 */ jal dead_evt_get_variable /* ECB738 80241A38 8C450000 */ lw $a1, ($v0) /* ECB73C 80241A3C 0040182D */ daddu $v1, $v0, $zero /* ECB740 80241A40 10600012 */ beqz $v1, .L80241A8C diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s b/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s index 8db2d998d5..357325d3bc 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s @@ -11,21 +11,21 @@ glabel func_80241AC4_ECB7C4 /* ECB7DC 80241ADC AFB00010 */ sw $s0, 0x10($sp) /* ECB7E0 80241AE0 8E30000C */ lw $s0, 0xc($s1) /* ECB7E4 80241AE4 8E050000 */ lw $a1, ($s0) -/* ECB7E8 80241AE8 0C0B53A3 */ jal dead_get_variable +/* ECB7E8 80241AE8 0C0B53A3 */ jal dead_evt_get_variable /* ECB7EC 80241AEC 26100004 */ addiu $s0, $s0, 4 /* ECB7F0 80241AF0 8E050000 */ lw $a1, ($s0) /* ECB7F4 80241AF4 26100004 */ addiu $s0, $s0, 4 /* ECB7F8 80241AF8 0220202D */ daddu $a0, $s1, $zero -/* ECB7FC 80241AFC 0C0B53A3 */ jal dead_get_variable +/* ECB7FC 80241AFC 0C0B53A3 */ jal dead_evt_get_variable /* ECB800 80241B00 0040982D */ daddu $s3, $v0, $zero /* ECB804 80241B04 8E050000 */ lw $a1, ($s0) /* ECB808 80241B08 26100004 */ addiu $s0, $s0, 4 /* ECB80C 80241B0C 0220202D */ daddu $a0, $s1, $zero -/* ECB810 80241B10 0C0B53A3 */ jal dead_get_variable +/* ECB810 80241B10 0C0B53A3 */ jal dead_evt_get_variable /* ECB814 80241B14 0040902D */ daddu $s2, $v0, $zero /* ECB818 80241B18 0220202D */ daddu $a0, $s1, $zero /* ECB81C 80241B1C 8E050000 */ lw $a1, ($s0) -/* ECB820 80241B20 0C0B53A3 */ jal dead_get_variable +/* ECB820 80241B20 0C0B53A3 */ jal dead_evt_get_variable /* ECB824 80241B24 0040882D */ daddu $s1, $v0, $zero /* ECB828 80241B28 0260202D */ daddu $a0, $s3, $zero /* ECB82C 80241B2C 0C04F3E6 */ jal func_8013CF98 diff --git a/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s b/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s index 4e3f6543e3..5edbabb2c4 100644 --- a/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s +++ b/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s @@ -7,7 +7,7 @@ glabel func_80241B88_ECB888 /* ECB890 80241B90 0080802D */ daddu $s0, $a0, $zero /* ECB894 80241B94 AFBF0014 */ sw $ra, 0x14($sp) /* ECB898 80241B98 8E02000C */ lw $v0, 0xc($s0) -/* ECB89C 80241B9C 0C0B53A3 */ jal dead_get_variable +/* ECB89C 80241B9C 0C0B53A3 */ jal dead_evt_get_variable /* ECB8A0 80241BA0 8C450000 */ lw $a1, ($v0) /* ECB8A4 80241BA4 3C048009 */ lui $a0, %hi(dead_gItemTable) /* ECB8A8 80241BA8 2484D2C0 */ addiu $a0, $a0, %lo(dead_gItemTable) diff --git a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s index 0d7f6148d5..f5fbdded65 100644 --- a/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s +++ b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s @@ -25,7 +25,7 @@ glabel func_8024162C_ED161C /* ED1650 80241660 00A0882D */ daddu $s1, $a1, $zero /* ED1654 80241664 02A0202D */ daddu $a0, $s5, $zero /* ED1658 80241668 8E050000 */ lw $a1, ($s0) -/* ED165C 8024166C 0C0B53A3 */ jal dead_get_variable +/* ED165C 8024166C 0C0B53A3 */ jal dead_evt_get_variable /* ED1660 80241670 0040A02D */ daddu $s4, $v0, $zero /* ED1664 80241674 AFA00010 */ sw $zero, 0x10($sp) /* ED1668 80241678 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s b/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s index ede93b982b..12ae97ea74 100644 --- a/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s +++ b/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s @@ -6,7 +6,7 @@ glabel func_80240000_ED4220 /* ED4224 80240004 AFBF0010 */ sw $ra, 0x10($sp) /* ED4228 80240008 3C05F5DE */ lui $a1, 0xf5de /* ED422C 8024000C 34A50180 */ ori $a1, $a1, 0x180 -/* ED4230 80240010 0C0B53A3 */ jal dead_get_variable +/* ED4230 80240010 0C0B53A3 */ jal dead_evt_get_variable /* ED4234 80240014 0000202D */ daddu $a0, $zero, $zero /* ED4238 80240018 28430031 */ slti $v1, $v0, 0x31 /* ED423C 8024001C 3C020019 */ lui $v0, 0x19 diff --git a/ver/us/asm/nonmatchings/ED8E20/func_802400F0_ED8F10.s b/ver/us/asm/nonmatchings/ED8E20/func_802400F0_ED8F10.s index dce9fa4741..2ba63adb60 100644 --- a/ver/us/asm/nonmatchings/ED8E20/func_802400F0_ED8F10.s +++ b/ver/us/asm/nonmatchings/ED8E20/func_802400F0_ED8F10.s @@ -19,7 +19,7 @@ glabel func_802400F0_ED8F10 /* ED8F2C 8024010C 0200202D */ daddu $a0, $s0, $zero /* ED8F30 80240110 3C05FE36 */ lui $a1, 0xfe36 /* ED8F34 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* ED8F38 80240118 0C0B53A3 */ jal dead_get_variable +/* ED8F38 80240118 0C0B53A3 */ jal dead_evt_get_variable /* ED8F3C 8024011C 0040902D */ daddu $s2, $v0, $zero /* ED8F40 80240120 0200202D */ daddu $a0, $s0, $zero /* ED8F44 80240124 3C05FE36 */ lui $a1, 0xfe36 @@ -29,7 +29,7 @@ glabel func_802400F0_ED8F10 /* ED8F54 80240134 C4600000 */ lwc1 $f0, ($v1) /* ED8F58 80240138 4600008D */ trunc.w.s $f2, $f0 /* ED8F5C 8024013C 44061000 */ mfc1 $a2, $f2 -/* ED8F60 80240140 0C0B551A */ jal dead_set_variable +/* ED8F60 80240140 0C0B551A */ jal dead_evt_set_variable /* ED8F64 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 /* ED8F68 80240148 0200202D */ daddu $a0, $s0, $zero /* ED8F6C 8024014C 8E420014 */ lw $v0, 0x14($s2) @@ -38,7 +38,7 @@ glabel func_802400F0_ED8F10 /* ED8F78 80240158 C4400004 */ lwc1 $f0, 4($v0) /* ED8F7C 8024015C 4600008D */ trunc.w.s $f2, $f0 /* ED8F80 80240160 44061000 */ mfc1 $a2, $f2 -/* ED8F84 80240164 0C0B551A */ jal dead_set_variable +/* ED8F84 80240164 0C0B551A */ jal dead_evt_set_variable /* ED8F88 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 /* ED8F8C 8024016C 0200202D */ daddu $a0, $s0, $zero /* ED8F90 80240170 8E420014 */ lw $v0, 0x14($s2) @@ -47,7 +47,7 @@ glabel func_802400F0_ED8F10 /* ED8F9C 8024017C C4400008 */ lwc1 $f0, 8($v0) /* ED8FA0 80240180 4600008D */ trunc.w.s $f2, $f0 /* ED8FA4 80240184 44061000 */ mfc1 $a2, $f2 -/* ED8FA8 80240188 0C0B551A */ jal dead_set_variable +/* ED8FA8 80240188 0C0B551A */ jal dead_evt_set_variable /* ED8FAC 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 /* ED8FB0 80240190 0200202D */ daddu $a0, $s0, $zero /* ED8FB4 80240194 8E420014 */ lw $v0, 0x14($s2) @@ -56,7 +56,7 @@ glabel func_802400F0_ED8F10 /* ED8FC0 802401A0 C620000C */ lwc1 $f0, 0xc($s1) /* ED8FC4 802401A4 4600008D */ trunc.w.s $f2, $f0 /* ED8FC8 802401A8 44061000 */ mfc1 $a2, $f2 -/* ED8FCC 802401AC 0C0B551A */ jal dead_set_variable +/* ED8FCC 802401AC 0C0B551A */ jal dead_evt_set_variable /* ED8FD0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 /* ED8FD4 802401B4 3C028008 */ lui $v0, %hi(D_80079430) /* ED8FD8 802401B8 8C429430 */ lw $v0, %lo(D_80079430)($v0) diff --git a/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s b/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s index e268c3626a..a9c969e883 100644 --- a/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s +++ b/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s @@ -8,7 +8,7 @@ glabel func_80240274_ED9094 /* ED90A0 80240280 AFBF001C */ sw $ra, 0x1c($sp) /* ED90A4 80240284 F7B40020 */ sdc1 $f20, 0x20($sp) /* ED90A8 80240288 8E02000C */ lw $v0, 0xc($s0) -/* ED90AC 8024028C 0C0B55FF */ jal dead_get_float_variable +/* ED90AC 8024028C 0C0B55FF */ jal dead_evt_get_float_variable /* ED90B0 80240290 8C450000 */ lw $a1, ($v0) /* ED90B4 80240294 27A40010 */ addiu $a0, $sp, 0x10 /* ED90B8 80240298 3C028011 */ lui $v0, %hi(D_80117578) @@ -25,17 +25,17 @@ glabel func_80240274_ED9094 /* ED90E4 802402C4 0200202D */ daddu $a0, $s0, $zero /* ED90E8 802402C8 3C05FE36 */ lui $a1, 0xfe36 /* ED90EC 802402CC 8FA60010 */ lw $a2, 0x10($sp) -/* ED90F0 802402D0 0C0B5684 */ jal dead_set_float_variable +/* ED90F0 802402D0 0C0B5684 */ jal dead_evt_set_float_variable /* ED90F4 802402D4 34A53C80 */ ori $a1, $a1, 0x3c80 /* ED90F8 802402D8 0200202D */ daddu $a0, $s0, $zero /* ED90FC 802402DC 3C05FE36 */ lui $a1, 0xfe36 /* ED9100 802402E0 4406A000 */ mfc1 $a2, $f20 -/* ED9104 802402E4 0C0B5684 */ jal dead_set_float_variable +/* ED9104 802402E4 0C0B5684 */ jal dead_evt_set_float_variable /* ED9108 802402E8 34A53C81 */ ori $a1, $a1, 0x3c81 /* ED910C 802402EC 0200202D */ daddu $a0, $s0, $zero /* ED9110 802402F0 3C05FE36 */ lui $a1, 0xfe36 /* ED9114 802402F4 8FA60014 */ lw $a2, 0x14($sp) -/* ED9118 802402F8 0C0B5684 */ jal dead_set_float_variable +/* ED9118 802402F8 0C0B5684 */ jal dead_evt_set_float_variable /* ED911C 802402FC 34A53C82 */ ori $a1, $a1, 0x3c82 /* ED9120 80240300 8FBF001C */ lw $ra, 0x1c($sp) /* ED9124 80240304 8FB00018 */ lw $s0, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s b/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s index 7262631055..b8b760489f 100644 --- a/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s +++ b/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s @@ -9,7 +9,7 @@ glabel func_80240394_EDC374 /* EDC384 802403A4 AFB00010 */ sw $s0, 0x10($sp) /* EDC388 802403A8 8E30000C */ lw $s0, 0xc($s1) /* EDC38C 802403AC 8E050000 */ lw $a1, ($s0) -/* EDC390 802403B0 0C0B53A3 */ jal dead_get_variable +/* EDC390 802403B0 0C0B53A3 */ jal dead_evt_get_variable /* EDC394 802403B4 26100004 */ addiu $s0, $s0, 4 /* EDC398 802403B8 0C00F94D */ jal func_8003E534 /* EDC39C 802403BC 0040202D */ daddu $a0, $v0, $zero @@ -17,7 +17,7 @@ glabel func_80240394_EDC374 /* EDC3A4 802403C4 00000000 */ nop /* EDC3A8 802403C8 8E050000 */ lw $a1, ($s0) /* EDC3AC 802403CC 844600A8 */ lh $a2, 0xa8($v0) -/* EDC3B0 802403D0 0C0B551A */ jal dead_set_variable +/* EDC3B0 802403D0 0C0B551A */ jal dead_evt_set_variable /* EDC3B4 802403D4 0220202D */ daddu $a0, $s1, $zero .L802403D8: /* EDC3B8 802403D8 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s index 78804f50a3..596d6ec6a7 100644 --- a/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s +++ b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s @@ -18,7 +18,7 @@ glabel func_802403F0_EDC3D0 /* EDC404 80240424 8E30000C */ lw $s0, 0xc($s1) /* EDC408 80240428 8E130000 */ lw $s3, ($s0) /* EDC40C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* EDC410 80240430 0C0B53A3 */ jal dead_get_variable +/* EDC410 80240430 0C0B53A3 */ jal dead_evt_get_variable /* EDC414 80240434 0260282D */ daddu $a1, $s3, $zero /* EDC418 80240438 4482E000 */ mtc1 $v0, $f28 /* EDC41C 8024043C 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_802403F0_EDC3D0 /* EDC424 80240444 8E140000 */ lw $s4, ($s0) /* EDC428 80240448 26100004 */ addiu $s0, $s0, 4 /* EDC42C 8024044C 0220202D */ daddu $a0, $s1, $zero -/* EDC430 80240450 0C0B53A3 */ jal dead_get_variable +/* EDC430 80240450 0C0B53A3 */ jal dead_evt_get_variable /* EDC434 80240454 0280282D */ daddu $a1, $s4, $zero /* EDC438 80240458 4482D000 */ mtc1 $v0, $f26 /* EDC43C 8024045C 00000000 */ nop /* EDC440 80240460 4680D6A0 */ cvt.s.w $f26, $f26 /* EDC444 80240464 8E100000 */ lw $s0, ($s0) /* EDC448 80240468 0220202D */ daddu $a0, $s1, $zero -/* EDC44C 8024046C 0C0B53A3 */ jal dead_get_variable +/* EDC44C 8024046C 0C0B53A3 */ jal dead_evt_get_variable /* EDC450 80240470 0200282D */ daddu $a1, $s0, $zero /* EDC454 80240474 4482C000 */ mtc1 $v0, $f24 /* EDC458 80240478 00000000 */ nop @@ -94,17 +94,17 @@ glabel func_802403F0_EDC3D0 /* EDC52C 8024054C 0260282D */ daddu $a1, $s3, $zero /* EDC530 80240550 4600E18D */ trunc.w.s $f6, $f28 /* EDC534 80240554 44063000 */ mfc1 $a2, $f6 -/* EDC538 80240558 0C0B551A */ jal dead_set_variable +/* EDC538 80240558 0C0B551A */ jal dead_evt_set_variable /* EDC53C 8024055C 4600C601 */ sub.s $f24, $f24, $f0 /* EDC540 80240560 0220202D */ daddu $a0, $s1, $zero /* EDC544 80240564 4600D18D */ trunc.w.s $f6, $f26 /* EDC548 80240568 44063000 */ mfc1 $a2, $f6 -/* EDC54C 8024056C 0C0B551A */ jal dead_set_variable +/* EDC54C 8024056C 0C0B551A */ jal dead_evt_set_variable /* EDC550 80240570 0280282D */ daddu $a1, $s4, $zero /* EDC554 80240574 0220202D */ daddu $a0, $s1, $zero /* EDC558 80240578 4600C18D */ trunc.w.s $f6, $f24 /* EDC55C 8024057C 44063000 */ mfc1 $a2, $f6 -/* EDC560 80240580 0C0B551A */ jal dead_set_variable +/* EDC560 80240580 0C0B551A */ jal dead_evt_set_variable /* EDC564 80240584 0200282D */ daddu $a1, $s0, $zero /* EDC568 80240588 8FBF0024 */ lw $ra, 0x24($sp) /* EDC56C 8024058C 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s b/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s index 0388a1534b..d0fd085498 100644 --- a/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s +++ b/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s @@ -19,7 +19,7 @@ glabel func_802405C0_EDC5A0 .L802405F4: /* EDC5D4 802405F4 8CC50000 */ lw $a1, ($a2) /* EDC5D8 802405F8 3C068024 */ lui $a2, %hi(D_80241854_EDD834) -/* EDC5DC 802405FC 0C0B551A */ jal dead_set_variable +/* EDC5DC 802405FC 0C0B551A */ jal dead_evt_set_variable /* EDC5E0 80240600 8CC61854 */ lw $a2, %lo(D_80241854_EDD834)($a2) /* EDC5E4 80240604 24020002 */ addiu $v0, $zero, 2 .L80240608: diff --git a/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s b/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s index 790e89a711..f3ba7d9810 100644 --- a/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s +++ b/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s @@ -5,7 +5,7 @@ glabel func_80240614_EDC5F4 /* EDC5F4 80240614 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EDC5F8 80240618 AFBF0010 */ sw $ra, 0x10($sp) /* EDC5FC 8024061C 8C82000C */ lw $v0, 0xc($a0) -/* EDC600 80240620 0C0B53A3 */ jal dead_get_variable +/* EDC600 80240620 0C0B53A3 */ jal dead_evt_get_variable /* EDC604 80240624 8C450000 */ lw $a1, ($v0) /* EDC608 80240628 3C018024 */ lui $at, %hi(D_80241854_EDD834) /* EDC60C 8024062C AC221854 */ sw $v0, %lo(D_80241854_EDD834)($at) diff --git a/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s b/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s index 637d3cf601..f05b161cd0 100644 --- a/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s +++ b/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s @@ -5,7 +5,7 @@ glabel func_8024064C_EDC62C /* EDC62C 8024064C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EDC630 80240650 AFBF0010 */ sw $ra, 0x10($sp) /* EDC634 80240654 8C82000C */ lw $v0, 0xc($a0) -/* EDC638 80240658 0C0B53A3 */ jal dead_get_variable +/* EDC638 80240658 0C0B53A3 */ jal dead_evt_get_variable /* EDC63C 8024065C 8C450000 */ lw $a1, ($v0) /* EDC640 80240660 0040182D */ daddu $v1, $v0, $zero /* EDC644 80240664 10600012 */ beqz $v1, .L802406B0 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s b/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s index 87b1a8829f..b557d9eb58 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s @@ -13,11 +13,11 @@ glabel func_80240040_EDEA00 /* EDEA20 80240060 AFB00010 */ sw $s0, 0x10($sp) /* EDEA24 80240064 8E50000C */ lw $s0, 0xc($s2) /* EDEA28 80240068 8E050000 */ lw $a1, ($s0) -/* EDEA2C 8024006C 0C0B53A3 */ jal dead_get_variable +/* EDEA2C 8024006C 0C0B53A3 */ jal dead_evt_get_variable /* EDEA30 80240070 26100004 */ addiu $s0, $s0, 4 /* EDEA34 80240074 0240202D */ daddu $a0, $s2, $zero /* EDEA38 80240078 8E050000 */ lw $a1, ($s0) -/* EDEA3C 8024007C 0C0B53A3 */ jal dead_get_variable +/* EDEA3C 8024007C 0C0B53A3 */ jal dead_evt_get_variable /* EDEA40 80240080 0040802D */ daddu $s0, $v0, $zero /* EDEA44 80240084 0200202D */ daddu $a0, $s0, $zero /* EDEA48 80240088 0C00F94D */ jal func_8003E534 diff --git a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s index 808dadf7aa..f0f9825e06 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s @@ -28,7 +28,7 @@ glabel func_802414D0_EDFE90 /* EDFEC4 80241504 00A0882D */ daddu $s1, $a1, $zero /* EDFEC8 80241508 02A0202D */ daddu $a0, $s5, $zero /* EDFECC 8024150C 8E050000 */ lw $a1, ($s0) -/* EDFED0 80241510 0C0B53A3 */ jal dead_get_variable +/* EDFED0 80241510 0C0B53A3 */ jal dead_evt_get_variable /* EDFED4 80241514 0040A02D */ daddu $s4, $v0, $zero /* EDFED8 80241518 AFA00010 */ sw $zero, 0x10($sp) /* EDFEDC 8024151C 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s index 02d32716c4..d75e4200fb 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s @@ -20,7 +20,7 @@ glabel func_80241DE4_EE07A4 /* EE07E0 80241E20 00A0882D */ daddu $s1, $a1, $zero /* EE07E4 80241E24 0280202D */ daddu $a0, $s4, $zero /* EE07E8 80241E28 8E050000 */ lw $a1, ($s0) -/* EE07EC 80241E2C 0C0B53A3 */ jal dead_get_variable +/* EE07EC 80241E2C 0C0B53A3 */ jal dead_evt_get_variable /* EE07F0 80241E30 0040902D */ daddu $s2, $v0, $zero /* EE07F4 80241E34 AFA00020 */ sw $zero, 0x20($sp) /* EE07F8 80241E38 8E6300D0 */ lw $v1, 0xd0($s3) diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s index eb5464e4d7..f9d0d4daca 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s @@ -25,7 +25,7 @@ glabel func_80242684_EE1044 /* EE1078 802426B8 8E63000C */ lw $v1, 0xc($s3) /* EE107C 802426BC 0260202D */ daddu $a0, $s3, $zero /* EE1080 802426C0 8C650000 */ lw $a1, ($v1) -/* EE1084 802426C4 0C0B53A3 */ jal dead_get_variable +/* EE1084 802426C4 0C0B53A3 */ jal dead_evt_get_variable /* EE1088 802426C8 0040902D */ daddu $s2, $v0, $zero /* EE108C 802426CC AFA00028 */ sw $zero, 0x28($sp) /* EE1090 802426D0 8E2300D0 */ lw $v1, 0xd0($s1) diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s index 33ef4c6c0f..53f5b462ec 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s @@ -27,7 +27,7 @@ glabel func_80242AF0_EE14B0 /* EE14EC 80242B2C 8EA3000C */ lw $v1, 0xc($s5) /* EE14F0 80242B30 02A0202D */ daddu $a0, $s5, $zero /* EE14F4 80242B34 8C650000 */ lw $a1, ($v1) -/* EE14F8 80242B38 0C0B53A3 */ jal dead_get_variable +/* EE14F8 80242B38 0C0B53A3 */ jal dead_evt_get_variable /* EE14FC 80242B3C 0040882D */ daddu $s1, $v0, $zero /* EE1500 80242B40 AFA00028 */ sw $zero, 0x28($sp) /* EE1504 80242B44 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s b/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s index fbaa8ac129..809835e606 100644 --- a/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s @@ -15,7 +15,7 @@ glabel func_80243470_EE1E30 /* EE1E58 80243498 8E63000C */ lw $v1, 0xc($s3) /* EE1E5C 8024349C 0260202D */ daddu $a0, $s3, $zero /* EE1E60 802434A0 8C650000 */ lw $a1, ($v1) -/* EE1E64 802434A4 0C0B53A3 */ jal dead_get_variable +/* EE1E64 802434A4 0C0B53A3 */ jal dead_evt_get_variable /* EE1E68 802434A8 0040902D */ daddu $s2, $v0, $zero /* EE1E6C 802434AC 12000002 */ beqz $s0, .L802434B8 /* EE1E70 802434B0 AE620074 */ sw $v0, 0x74($s3) diff --git a/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s b/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s index 787d180680..3d2254cb6b 100644 --- a/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s +++ b/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s @@ -15,7 +15,7 @@ glabel func_802403D4_EE6984 /* EE69AC 802403FC 0000202D */ daddu $a0, $zero, $zero /* EE69B0 80240400 3C05FD05 */ lui $a1, 0xfd05 /* EE69B4 80240404 8C460000 */ lw $a2, ($v0) -/* EE69B8 80240408 0C0B551A */ jal dead_set_variable +/* EE69B8 80240408 0C0B551A */ jal dead_evt_set_variable /* EE69BC 8024040C 34A50F80 */ ori $a1, $a1, 0xf80 /* EE69C0 80240410 08090108 */ j .L80240420 /* EE69C4 80240414 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s b/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s index 0eed074c3f..3b63e46a33 100644 --- a/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s +++ b/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s @@ -10,7 +10,7 @@ glabel func_8024042C_EE69DC /* EE69F0 80240440 0000202D */ daddu $a0, $zero, $zero /* EE69F4 80240444 3C05FD05 */ lui $a1, 0xfd05 /* EE69F8 80240448 34A50F80 */ ori $a1, $a1, 0xf80 -/* EE69FC 8024044C 0C0B53A3 */ jal dead_get_variable +/* EE69FC 8024044C 0C0B53A3 */ jal dead_evt_get_variable /* EE6A00 80240450 0040802D */ daddu $s0, $v0, $zero /* EE6A04 80240454 AE020000 */ sw $v0, ($s0) /* EE6A08 80240458 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s b/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s index 15a823e1c9..904d95fedb 100644 --- a/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s +++ b/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s @@ -9,16 +9,16 @@ glabel func_8024046C_EE6A1C /* EE6A2C 8024047C AFB00018 */ sw $s0, 0x18($sp) /* EE6A30 80240480 8E30000C */ lw $s0, 0xc($s1) /* EE6A34 80240484 8E050000 */ lw $a1, ($s0) -/* EE6A38 80240488 0C0B53A3 */ jal dead_get_variable +/* EE6A38 80240488 0C0B53A3 */ jal dead_evt_get_variable /* EE6A3C 8024048C 26100004 */ addiu $s0, $s0, 4 /* EE6A40 80240490 AE220070 */ sw $v0, 0x70($s1) /* EE6A44 80240494 8E050000 */ lw $a1, ($s0) /* EE6A48 80240498 26100004 */ addiu $s0, $s0, 4 -/* EE6A4C 8024049C 0C0B53A3 */ jal dead_get_variable +/* EE6A4C 8024049C 0C0B53A3 */ jal dead_evt_get_variable /* EE6A50 802404A0 0220202D */ daddu $a0, $s1, $zero /* EE6A54 802404A4 AE220074 */ sw $v0, 0x74($s1) /* EE6A58 802404A8 8E050000 */ lw $a1, ($s0) -/* EE6A5C 802404AC 0C0B53A3 */ jal dead_get_variable +/* EE6A5C 802404AC 0C0B53A3 */ jal dead_evt_get_variable /* EE6A60 802404B0 0220202D */ daddu $a0, $s1, $zero /* EE6A64 802404B4 24040194 */ addiu $a0, $zero, 0x194 /* EE6A68 802404B8 0000282D */ daddu $a1, $zero, $zero diff --git a/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s b/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s index 23b7dffc0f..e665010e37 100644 --- a/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s +++ b/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s @@ -149,7 +149,7 @@ glabel func_802407D4_EE6D84 /* EE6FB8 80240A08 0000202D */ daddu $a0, $zero, $zero /* EE6FBC 80240A0C 3C05F971 */ lui $a1, 0xf971 /* EE6FC0 80240A10 34A588A4 */ ori $a1, $a1, 0x88a4 -/* EE6FC4 80240A14 0C0B53A3 */ jal dead_get_variable +/* EE6FC4 80240A14 0C0B53A3 */ jal dead_evt_get_variable /* EE6FC8 80240A18 AE020004 */ sw $v0, 4($s0) /* EE6FCC 80240A1C 10400017 */ beqz $v0, .L80240A7C /* EE6FD0 80240A20 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s index fce91bddb8..0833ea2b32 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s @@ -18,7 +18,7 @@ glabel func_80241E1C_EE83CC /* EE8400 80241E50 00A0882D */ daddu $s1, $a1, $zero /* EE8404 80241E54 02A0202D */ daddu $a0, $s5, $zero /* EE8408 80241E58 8E050000 */ lw $a1, ($s0) -/* EE840C 80241E5C 0C0B53A3 */ jal dead_get_variable +/* EE840C 80241E5C 0C0B53A3 */ jal dead_evt_get_variable /* EE8410 80241E60 0040A02D */ daddu $s4, $v0, $zero /* EE8414 80241E64 AFA00010 */ sw $zero, 0x10($sp) /* EE8418 80241E68 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s b/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s index 5eabb4a8d4..8826358d6b 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s @@ -9,7 +9,7 @@ glabel func_80242034_EE85E4 /* EE85F4 80242044 AFB00010 */ sw $s0, 0x10($sp) /* EE85F8 80242048 8E30000C */ lw $s0, 0xc($s1) /* EE85FC 8024204C 8E050000 */ lw $a1, ($s0) -/* EE8600 80242050 0C0B53A3 */ jal dead_get_variable +/* EE8600 80242050 0C0B53A3 */ jal dead_evt_get_variable /* EE8604 80242054 26100004 */ addiu $s0, $s0, 4 /* EE8608 80242058 0C00F94D */ jal func_8003E534 /* EE860C 8024205C 0040202D */ daddu $a0, $v0, $zero @@ -17,7 +17,7 @@ glabel func_80242034_EE85E4 /* EE8614 80242064 00000000 */ nop /* EE8618 80242068 8E050000 */ lw $a1, ($s0) /* EE861C 8024206C 844600A8 */ lh $a2, 0xa8($v0) -/* EE8620 80242070 0C0B551A */ jal dead_set_variable +/* EE8620 80242070 0C0B551A */ jal dead_evt_set_variable /* EE8624 80242074 0220202D */ daddu $a0, $s1, $zero .L80242078: /* EE8628 80242078 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s index 36238bfd97..7a8bcfb78d 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s @@ -18,7 +18,7 @@ glabel func_80242090_EE8640 /* EE8674 802420C4 8E30000C */ lw $s0, 0xc($s1) /* EE8678 802420C8 8E130000 */ lw $s3, ($s0) /* EE867C 802420CC 26100004 */ addiu $s0, $s0, 4 -/* EE8680 802420D0 0C0B53A3 */ jal dead_get_variable +/* EE8680 802420D0 0C0B53A3 */ jal dead_evt_get_variable /* EE8684 802420D4 0260282D */ daddu $a1, $s3, $zero /* EE8688 802420D8 4482E000 */ mtc1 $v0, $f28 /* EE868C 802420DC 00000000 */ nop @@ -26,14 +26,14 @@ glabel func_80242090_EE8640 /* EE8694 802420E4 8E140000 */ lw $s4, ($s0) /* EE8698 802420E8 26100004 */ addiu $s0, $s0, 4 /* EE869C 802420EC 0220202D */ daddu $a0, $s1, $zero -/* EE86A0 802420F0 0C0B53A3 */ jal dead_get_variable +/* EE86A0 802420F0 0C0B53A3 */ jal dead_evt_get_variable /* EE86A4 802420F4 0280282D */ daddu $a1, $s4, $zero /* EE86A8 802420F8 4482D000 */ mtc1 $v0, $f26 /* EE86AC 802420FC 00000000 */ nop /* EE86B0 80242100 4680D6A0 */ cvt.s.w $f26, $f26 /* EE86B4 80242104 8E100000 */ lw $s0, ($s0) /* EE86B8 80242108 0220202D */ daddu $a0, $s1, $zero -/* EE86BC 8024210C 0C0B53A3 */ jal dead_get_variable +/* EE86BC 8024210C 0C0B53A3 */ jal dead_evt_get_variable /* EE86C0 80242110 0200282D */ daddu $a1, $s0, $zero /* EE86C4 80242114 4482C000 */ mtc1 $v0, $f24 /* EE86C8 80242118 00000000 */ nop @@ -94,17 +94,17 @@ glabel func_80242090_EE8640 /* EE879C 802421EC 0260282D */ daddu $a1, $s3, $zero /* EE87A0 802421F0 4600E18D */ trunc.w.s $f6, $f28 /* EE87A4 802421F4 44063000 */ mfc1 $a2, $f6 -/* EE87A8 802421F8 0C0B551A */ jal dead_set_variable +/* EE87A8 802421F8 0C0B551A */ jal dead_evt_set_variable /* EE87AC 802421FC 4600C601 */ sub.s $f24, $f24, $f0 /* EE87B0 80242200 0220202D */ daddu $a0, $s1, $zero /* EE87B4 80242204 4600D18D */ trunc.w.s $f6, $f26 /* EE87B8 80242208 44063000 */ mfc1 $a2, $f6 -/* EE87BC 8024220C 0C0B551A */ jal dead_set_variable +/* EE87BC 8024220C 0C0B551A */ jal dead_evt_set_variable /* EE87C0 80242210 0280282D */ daddu $a1, $s4, $zero /* EE87C4 80242214 0220202D */ daddu $a0, $s1, $zero /* EE87C8 80242218 4600C18D */ trunc.w.s $f6, $f24 /* EE87CC 8024221C 44063000 */ mfc1 $a2, $f6 -/* EE87D0 80242220 0C0B551A */ jal dead_set_variable +/* EE87D0 80242220 0C0B551A */ jal dead_evt_set_variable /* EE87D4 80242224 0200282D */ daddu $a1, $s0, $zero /* EE87D8 80242228 8FBF0024 */ lw $ra, 0x24($sp) /* EE87DC 8024222C 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/EE70C0/func_80242260_EE8810.s b/ver/us/asm/nonmatchings/EE70C0/func_80242260_EE8810.s index e4122058ab..ae27ed8d1b 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_80242260_EE8810.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80242260_EE8810.s @@ -19,7 +19,7 @@ glabel func_80242260_EE8810 .L80242294: /* EE8844 80242294 8CC50000 */ lw $a1, ($a2) /* EE8848 80242298 3C068024 */ lui $a2, %hi(D_80244630_EEABE0) -/* EE884C 8024229C 0C0B551A */ jal dead_set_variable +/* EE884C 8024229C 0C0B551A */ jal dead_evt_set_variable /* EE8850 802422A0 8CC64630 */ lw $a2, %lo(D_80244630_EEABE0)($a2) /* EE8854 802422A4 24020002 */ addiu $v0, $zero, 2 .L802422A8: diff --git a/ver/us/asm/nonmatchings/EE70C0/func_802422B4_EE8864.s b/ver/us/asm/nonmatchings/EE70C0/func_802422B4_EE8864.s index ff9db96c69..aca5b54c0f 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_802422B4_EE8864.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_802422B4_EE8864.s @@ -5,7 +5,7 @@ glabel func_802422B4_EE8864 /* EE8864 802422B4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EE8868 802422B8 AFBF0010 */ sw $ra, 0x10($sp) /* EE886C 802422BC 8C82000C */ lw $v0, 0xc($a0) -/* EE8870 802422C0 0C0B53A3 */ jal dead_get_variable +/* EE8870 802422C0 0C0B53A3 */ jal dead_evt_get_variable /* EE8874 802422C4 8C450000 */ lw $a1, ($v0) /* EE8878 802422C8 3C018024 */ lui $at, %hi(D_80244630_EEABE0) /* EE887C 802422CC AC224630 */ sw $v0, %lo(D_80244630_EEABE0)($at) diff --git a/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s b/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s index d251c54518..91391370de 100644 --- a/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s @@ -5,7 +5,7 @@ glabel func_802422EC_EE889C /* EE889C 802422EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EE88A0 802422F0 AFBF0010 */ sw $ra, 0x10($sp) /* EE88A4 802422F4 8C82000C */ lw $v0, 0xc($a0) -/* EE88A8 802422F8 0C0B53A3 */ jal dead_get_variable +/* EE88A8 802422F8 0C0B53A3 */ jal dead_evt_get_variable /* EE88AC 802422FC 8C450000 */ lw $a1, ($v0) /* EE88B0 80242300 0040182D */ daddu $v1, $v0, $zero /* EE88B4 80242304 10600012 */ beqz $v1, .L80242350 diff --git a/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s b/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s index 86c735c3a9..68f92a9f2d 100644 --- a/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s +++ b/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s @@ -7,7 +7,7 @@ glabel func_80242390_EE8940 /* EE8948 80242398 8C82000C */ lw $v0, 0xc($a0) /* EE894C 8024239C 3C068017 */ lui $a2, %hi(D_80169B16) /* EE8950 802423A0 84C69B16 */ lh $a2, %lo(D_80169B16)($a2) -/* EE8954 802423A4 0C0B551A */ jal dead_set_variable +/* EE8954 802423A4 0C0B551A */ jal dead_evt_set_variable /* EE8958 802423A8 8C450000 */ lw $a1, ($v0) /* EE895C 802423AC 8FBF0010 */ lw $ra, 0x10($sp) /* EE8960 802423B0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/EED1E0/func_8024011C_EED21C.s b/ver/us/asm/nonmatchings/EED1E0/func_8024011C_EED21C.s index 098712ea04..d667e637c4 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_8024011C_EED21C.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_8024011C_EED21C.s @@ -5,7 +5,7 @@ glabel func_8024011C_EED21C /* EED21C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EED220 80240120 AFBF0010 */ sw $ra, 0x10($sp) /* EED224 80240124 8C82000C */ lw $v0, 0xc($a0) -/* EED228 80240128 0C0B53A3 */ jal dead_get_variable +/* EED228 80240128 0C0B53A3 */ jal dead_evt_get_variable /* EED22C 8024012C 8C450000 */ lw $a1, ($v0) /* EED230 80240130 0C0BCEC0 */ jal func_802F3B00 /* EED234 80240134 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s b/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s index 5b1863cb75..165a629d8e 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s @@ -9,7 +9,7 @@ glabel func_80240148_EED248 /* EED258 80240158 AFB10014 */ sw $s1, 0x14($sp) /* EED25C 8024015C 8E11000C */ lw $s1, 0xc($s0) /* EED260 80240160 8E250000 */ lw $a1, ($s1) -/* EED264 80240164 0C0B53A3 */ jal dead_get_variable +/* EED264 80240164 0C0B53A3 */ jal dead_evt_get_variable /* EED268 80240168 26310004 */ addiu $s1, $s1, 4 /* EED26C 8024016C 0200202D */ daddu $a0, $s0, $zero /* EED270 80240170 3C038011 */ lui $v1, %hi(D_80117840) @@ -21,7 +21,7 @@ glabel func_80240148_EED248 /* EED288 80240188 24C60001 */ addiu $a2, $a2, 1 /* EED28C 8024018C A0460015 */ sb $a2, 0x15($v0) /* EED290 80240190 00063600 */ sll $a2, $a2, 0x18 -/* EED294 80240194 0C0B551A */ jal dead_set_variable +/* EED294 80240194 0C0B551A */ jal dead_evt_set_variable /* EED298 80240198 00063603 */ sra $a2, $a2, 0x18 /* EED29C 8024019C 8FBF0018 */ lw $ra, 0x18($sp) /* EED2A0 802401A0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802404FC_EED5FC.s b/ver/us/asm/nonmatchings/EED1E0/func_802404FC_EED5FC.s index 9ccaedf4b9..22b76e622f 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_802404FC_EED5FC.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_802404FC_EED5FC.s @@ -5,7 +5,7 @@ glabel func_802404FC_EED5FC /* EED5FC 802404FC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EED600 80240500 AFBF0010 */ sw $ra, 0x10($sp) /* EED604 80240504 8C82000C */ lw $v0, 0xc($a0) -/* EED608 80240508 0C0B53A3 */ jal dead_get_variable +/* EED608 80240508 0C0B53A3 */ jal dead_evt_get_variable /* EED60C 8024050C 8C450000 */ lw $a1, ($v0) /* EED610 80240510 0C03CB57 */ jal func_800F2D5C /* EED614 80240514 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s b/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s index 04051f346c..2aea6fb8c4 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s @@ -9,7 +9,7 @@ glabel func_80240560_EED660 /* EED670 80240570 AFB00018 */ sw $s0, 0x18($sp) /* EED674 80240574 8E30000C */ lw $s0, 0xc($s1) /* EED678 80240578 8E050000 */ lw $a1, ($s0) -/* EED67C 8024057C 0C0B53A3 */ jal dead_get_variable +/* EED67C 8024057C 0C0B53A3 */ jal dead_evt_get_variable /* EED680 80240580 26100004 */ addiu $s0, $s0, 4 /* EED684 80240584 0C0462EC */ jal func_80118BB0 /* EED688 80240588 0040202D */ daddu $a0, $v0, $zero @@ -30,7 +30,7 @@ glabel func_80240560_EED660 /* EED6C4 802405C4 0000202D */ daddu $a0, $zero, $zero /* EED6C8 802405C8 0220202D */ daddu $a0, $s1, $zero /* EED6CC 802405CC 0200282D */ daddu $a1, $s0, $zero -/* EED6D0 802405D0 0C0B551A */ jal dead_set_variable +/* EED6D0 802405D0 0C0B551A */ jal dead_evt_set_variable /* EED6D4 802405D4 0040302D */ daddu $a2, $v0, $zero /* EED6D8 802405D8 8FBF0020 */ lw $ra, 0x20($sp) /* EED6DC 802405DC 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802405F0_EED6F0.s b/ver/us/asm/nonmatchings/EED1E0/func_802405F0_EED6F0.s index 6b5a98ee53..b47ca4dcb6 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_802405F0_EED6F0.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_802405F0_EED6F0.s @@ -5,7 +5,7 @@ glabel func_802405F0_EED6F0 /* EED6F0 802405F0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* EED6F4 802405F4 AFBF0010 */ sw $ra, 0x10($sp) /* EED6F8 802405F8 8C82000C */ lw $v0, 0xc($a0) -/* EED6FC 802405FC 0C0B53A3 */ jal dead_get_variable +/* EED6FC 802405FC 0C0B53A3 */ jal dead_evt_get_variable /* EED700 80240600 8C450000 */ lw $a1, ($v0) /* EED704 80240604 0040202D */ daddu $a0, $v0, $zero /* EED708 80240608 8C830000 */ lw $v1, ($a0) diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s b/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s index be0c7e21c8..34df774976 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s @@ -5,7 +5,7 @@ glabel func_80240624_EED724 /* EED724 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 /* EED728 80240628 AFBF0018 */ sw $ra, 0x18($sp) /* EED72C 8024062C 8C82000C */ lw $v0, 0xc($a0) -/* EED730 80240630 0C0B53A3 */ jal dead_get_variable +/* EED730 80240630 0C0B53A3 */ jal dead_evt_get_variable /* EED734 80240634 8C450000 */ lw $a1, ($v0) /* EED738 80240638 0C0462EC */ jal func_80118BB0 /* EED73C 8024063C 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s index 8293226972..ecb3190f78 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s @@ -50,7 +50,7 @@ glabel func_802406E0_EED7E0 /* EED894 80240794 3C013F80 */ lui $at, 0x3f80 /* EED898 80240798 4481B000 */ mtc1 $at, $f22 /* EED89C 8024079C 4480A000 */ mtc1 $zero, $f20 -/* EED8A0 802407A0 0C0B53A3 */ jal dead_get_variable +/* EED8A0 802407A0 0C0B53A3 */ jal dead_evt_get_variable /* EED8A4 802407A4 0240802D */ daddu $s0, $s2, $zero /* EED8A8 802407A8 0C0462EC */ jal func_80118BB0 /* EED8AC 802407AC 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s b/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s index 42d0ed5ed4..2bd42f2591 100644 --- a/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s +++ b/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s @@ -12,11 +12,11 @@ glabel func_80240C18_EEDD18 /* EEDD34 80240C34 10A00010 */ beqz $a1, .L80240C78 /* EEDD38 80240C38 0000902D */ daddu $s2, $zero, $zero /* EEDD3C 80240C3C 8E050000 */ lw $a1, ($s0) -/* EEDD40 80240C40 0C0B53A3 */ jal dead_get_variable +/* EEDD40 80240C40 0C0B53A3 */ jal dead_evt_get_variable /* EEDD44 80240C44 26100004 */ addiu $s0, $s0, 4 /* EEDD48 80240C48 AE220084 */ sw $v0, 0x84($s1) /* EEDD4C 80240C4C 8E050000 */ lw $a1, ($s0) -/* EEDD50 80240C50 0C0B53A3 */ jal dead_get_variable +/* EEDD50 80240C50 0C0B53A3 */ jal dead_evt_get_variable /* EEDD54 80240C54 0220202D */ daddu $a0, $s1, $zero /* EEDD58 80240C58 0240202D */ daddu $a0, $s2, $zero /* EEDD5C 80240C5C 240500D0 */ addiu $a1, $zero, 0xd0 diff --git a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s index faa9ddd798..cea9812e80 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s @@ -25,7 +25,7 @@ glabel func_8024215C_EEF25C /* EEF290 80242190 00A0882D */ daddu $s1, $a1, $zero /* EEF294 80242194 02A0202D */ daddu $a0, $s5, $zero /* EEF298 80242198 8E050000 */ lw $a1, ($s0) -/* EEF29C 8024219C 0C0B53A3 */ jal dead_get_variable +/* EEF29C 8024219C 0C0B53A3 */ jal dead_evt_get_variable /* EEF2A0 802421A0 0040A02D */ daddu $s4, $v0, $zero /* EEF2A4 802421A4 AFA00010 */ sw $zero, 0x10($sp) /* EEF2A8 802421A8 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s index c0bd3a88a0..48a03c2386 100644 --- a/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s @@ -25,7 +25,7 @@ glabel func_80242780_EEF880 /* EEF8B4 802427B4 00A0882D */ daddu $s1, $a1, $zero /* EEF8B8 802427B8 0280202D */ daddu $a0, $s4, $zero /* EEF8BC 802427BC 8E050000 */ lw $a1, ($s0) -/* EEF8C0 802427C0 0C0B53A3 */ jal dead_get_variable +/* EEF8C0 802427C0 0C0B53A3 */ jal dead_evt_get_variable /* EEF8C4 802427C4 0040A82D */ daddu $s5, $v0, $zero /* EEF8C8 802427C8 AFA00010 */ sw $zero, 0x10($sp) /* EEF8CC 802427CC 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s index 85083530a3..b8d3e1ad20 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s +++ b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s @@ -25,7 +25,7 @@ glabel func_8024137C_EF398C /* EF39C0 802413B0 00A0882D */ daddu $s1, $a1, $zero /* EF39C4 802413B4 02A0202D */ daddu $a0, $s5, $zero /* EF39C8 802413B8 8E050000 */ lw $a1, ($s0) -/* EF39CC 802413BC 0C0B53A3 */ jal dead_get_variable +/* EF39CC 802413BC 0C0B53A3 */ jal dead_evt_get_variable /* EF39D0 802413C0 0040A02D */ daddu $s4, $v0, $zero /* EF39D4 802413C4 AFA00010 */ sw $zero, 0x10($sp) /* EF39D8 802413C8 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s index 078e55d9f1..7d0f52f3d1 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s +++ b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s @@ -20,7 +20,7 @@ glabel func_80241C90_EF42A0 /* EF42DC 80241CCC 00A0882D */ daddu $s1, $a1, $zero /* EF42E0 80241CD0 0280202D */ daddu $a0, $s4, $zero /* EF42E4 80241CD4 8E050000 */ lw $a1, ($s0) -/* EF42E8 80241CD8 0C0B53A3 */ jal dead_get_variable +/* EF42E8 80241CD8 0C0B53A3 */ jal dead_evt_get_variable /* EF42EC 80241CDC 0040902D */ daddu $s2, $v0, $zero /* EF42F0 80241CE0 AFA00020 */ sw $zero, 0x20($sp) /* EF42F4 80241CE4 8E6300D0 */ lw $v1, 0xd0($s3) diff --git a/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s b/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s index 4a202eeb66..e66446ade1 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s +++ b/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s @@ -25,7 +25,7 @@ glabel func_80242530_EF4B40 /* EF4B74 80242564 8E63000C */ lw $v1, 0xc($s3) /* EF4B78 80242568 0260202D */ daddu $a0, $s3, $zero /* EF4B7C 8024256C 8C650000 */ lw $a1, ($v1) -/* EF4B80 80242570 0C0B53A3 */ jal dead_get_variable +/* EF4B80 80242570 0C0B53A3 */ jal dead_evt_get_variable /* EF4B84 80242574 0040902D */ daddu $s2, $v0, $zero /* EF4B88 80242578 AFA00028 */ sw $zero, 0x28($sp) /* EF4B8C 8024257C 8E2300D0 */ lw $v1, 0xd0($s1) diff --git a/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s b/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s index 88f1ce191e..a69ae18840 100644 --- a/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s +++ b/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s @@ -27,7 +27,7 @@ glabel func_8024299C_EF4FAC /* EF4FE8 802429D8 8EA3000C */ lw $v1, 0xc($s5) /* EF4FEC 802429DC 02A0202D */ daddu $a0, $s5, $zero /* EF4FF0 802429E0 8C650000 */ lw $a1, ($v1) -/* EF4FF4 802429E4 0C0B53A3 */ jal dead_get_variable +/* EF4FF4 802429E4 0C0B53A3 */ jal dead_evt_get_variable /* EF4FF8 802429E8 0040882D */ daddu $s1, $v0, $zero /* EF4FFC 802429EC AFA00028 */ sw $zero, 0x28($sp) /* EF5000 802429F0 8E4300D0 */ lw $v1, 0xd0($s2) diff --git a/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s b/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s index eadf49868a..3d3c51327b 100644 --- a/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s +++ b/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s @@ -15,13 +15,13 @@ glabel func_802404D0_EFEFD0 /* EFEFF8 802404F8 4600008D */ trunc.w.s $f2, $f0 /* EFEFFC 802404FC 44061000 */ mfc1 $a2, $f2 /* EFF000 80240500 8C450000 */ lw $a1, ($v0) -/* EFF004 80240504 0C0B551A */ jal dead_set_variable +/* EFF004 80240504 0C0B551A */ jal dead_evt_set_variable /* EFF008 80240508 8C510004 */ lw $s1, 4($v0) /* EFF00C 8024050C 0200202D */ daddu $a0, $s0, $zero /* EFF010 80240510 C6400080 */ lwc1 $f0, 0x80($s2) /* EFF014 80240514 4600008D */ trunc.w.s $f2, $f0 /* EFF018 80240518 44061000 */ mfc1 $a2, $f2 -/* EFF01C 8024051C 0C0B551A */ jal dead_set_variable +/* EFF01C 8024051C 0C0B551A */ jal dead_evt_set_variable /* EFF020 80240520 0220282D */ daddu $a1, $s1, $zero /* EFF024 80240524 8FBF001C */ lw $ra, 0x1c($sp) /* EFF028 80240528 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s b/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s index 058601be60..111156c1bb 100644 --- a/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s +++ b/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s @@ -12,7 +12,7 @@ glabel func_80240540_EFF040 /* EFF05C 8024055C F7B40020 */ sdc1 $f20, 0x20($sp) /* EFF060 80240560 8E05008C */ lw $a1, 0x8c($s0) /* EFF064 80240564 4480B000 */ mtc1 $zero, $f22 -/* EFF068 80240568 0C0B53A3 */ jal dead_get_variable +/* EFF068 80240568 0C0B53A3 */ jal dead_evt_get_variable /* EFF06C 8024056C 0000202D */ daddu $a0, $zero, $zero /* EFF070 80240570 4600B306 */ mov.s $f12, $f22 /* EFF074 80240574 C60200A8 */ lwc1 $f2, 0xa8($s0) @@ -48,11 +48,11 @@ glabel func_80240540_EFF040 /* EFF0EC 802405EC 26317578 */ addiu $s1, $s1, %lo(D_80117578) /* EFF0F0 802405F0 E6200028 */ swc1 $f0, 0x28($s1) /* EFF0F4 802405F4 8E0500AC */ lw $a1, 0xac($s0) -/* EFF0F8 802405F8 0C0B53A3 */ jal dead_get_variable +/* EFF0F8 802405F8 0C0B53A3 */ jal dead_evt_get_variable /* EFF0FC 802405FC 0000202D */ daddu $a0, $zero, $zero /* EFF100 80240600 0000202D */ daddu $a0, $zero, $zero /* EFF104 80240604 8E050090 */ lw $a1, 0x90($s0) -/* EFF108 80240608 0C0B53A3 */ jal dead_get_variable +/* EFF108 80240608 0C0B53A3 */ jal dead_evt_get_variable /* EFF10C 8024060C 0040802D */ daddu $s0, $v0, $zero /* EFF110 80240610 4600A306 */ mov.s $f12, $f20 /* EFF114 80240614 02028021 */ addu $s0, $s0, $v0 diff --git a/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s b/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s index 35d8489972..91bf5b3077 100644 --- a/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s +++ b/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s @@ -15,7 +15,7 @@ glabel func_80240660_EFF160 /* EFF188 80240688 0000202D */ daddu $a0, $zero, $zero /* EFF18C 8024068C 8E05008C */ lw $a1, 0x8c($s0) /* EFF190 80240690 4480B000 */ mtc1 $zero, $f22 -/* EFF194 80240694 0C0B53A3 */ jal dead_get_variable +/* EFF194 80240694 0C0B53A3 */ jal dead_evt_get_variable /* EFF198 80240698 0040882D */ daddu $s1, $v0, $zero /* EFF19C 8024069C 4600B306 */ mov.s $f12, $f22 /* EFF1A0 802406A0 C60200B4 */ lwc1 $f2, 0xb4($s0) @@ -49,11 +49,11 @@ glabel func_80240660_EFF160 /* EFF210 80240710 46160000 */ add.s $f0, $f0, $f22 /* EFF214 80240714 E6200038 */ swc1 $f0, 0x38($s1) /* EFF218 80240718 8E0500B8 */ lw $a1, 0xb8($s0) -/* EFF21C 8024071C 0C0B53A3 */ jal dead_get_variable +/* EFF21C 8024071C 0C0B53A3 */ jal dead_evt_get_variable /* EFF220 80240720 0000202D */ daddu $a0, $zero, $zero /* EFF224 80240724 0000202D */ daddu $a0, $zero, $zero /* EFF228 80240728 8E050090 */ lw $a1, 0x90($s0) -/* EFF22C 8024072C 0C0B53A3 */ jal dead_get_variable +/* EFF22C 8024072C 0C0B53A3 */ jal dead_evt_get_variable /* EFF230 80240730 0040802D */ daddu $s0, $v0, $zero /* EFF234 80240734 4600A306 */ mov.s $f12, $f20 /* EFF238 80240738 02028021 */ addu $s0, $s0, $v0 diff --git a/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s b/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s index 37514cbeb1..78d76db961 100644 --- a/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s +++ b/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s @@ -17,33 +17,33 @@ glabel func_802407B0_EFF2B0 /* EFF2E0 802407E0 8E50000C */ lw $s0, 0xc($s2) /* EFF2E4 802407E4 8E140000 */ lw $s4, ($s0) /* EFF2E8 802407E8 26100004 */ addiu $s0, $s0, 4 -/* EFF2EC 802407EC 0C0B53A3 */ jal dead_get_variable +/* EFF2EC 802407EC 0C0B53A3 */ jal dead_evt_get_variable /* EFF2F0 802407F0 0280282D */ daddu $a1, $s4, $zero /* EFF2F4 802407F4 0040982D */ daddu $s3, $v0, $zero /* EFF2F8 802407F8 8E150000 */ lw $s5, ($s0) /* EFF2FC 802407FC 26100004 */ addiu $s0, $s0, 4 /* EFF300 80240800 8E050000 */ lw $a1, ($s0) /* EFF304 80240804 26100004 */ addiu $s0, $s0, 4 -/* EFF308 80240808 0C0B55FF */ jal dead_get_float_variable +/* EFF308 80240808 0C0B55FF */ jal dead_evt_get_float_variable /* EFF30C 8024080C 0240202D */ daddu $a0, $s2, $zero /* EFF310 80240810 8E050000 */ lw $a1, ($s0) /* EFF314 80240814 26100004 */ addiu $s0, $s0, 4 /* EFF318 80240818 0240202D */ daddu $a0, $s2, $zero -/* EFF31C 8024081C 0C0B55FF */ jal dead_get_float_variable +/* EFF31C 8024081C 0C0B55FF */ jal dead_evt_get_float_variable /* EFF320 80240820 46000606 */ mov.s $f24, $f0 /* EFF324 80240824 8E050000 */ lw $a1, ($s0) /* EFF328 80240828 26100004 */ addiu $s0, $s0, 4 /* EFF32C 8024082C 0240202D */ daddu $a0, $s2, $zero -/* EFF330 80240830 0C0B53A3 */ jal dead_get_variable +/* EFF330 80240830 0C0B53A3 */ jal dead_evt_get_variable /* EFF334 80240834 46000506 */ mov.s $f20, $f0 /* EFF338 80240838 8E050000 */ lw $a1, ($s0) /* EFF33C 8024083C 26100004 */ addiu $s0, $s0, 4 /* EFF340 80240840 0240202D */ daddu $a0, $s2, $zero -/* EFF344 80240844 0C0B53A3 */ jal dead_get_variable +/* EFF344 80240844 0C0B53A3 */ jal dead_evt_get_variable /* EFF348 80240848 0040882D */ daddu $s1, $v0, $zero /* EFF34C 8024084C 0240202D */ daddu $a0, $s2, $zero /* EFF350 80240850 8E050000 */ lw $a1, ($s0) -/* EFF354 80240854 0C0B55FF */ jal dead_get_float_variable +/* EFF354 80240854 0C0B55FF */ jal dead_evt_get_float_variable /* EFF358 80240858 0040802D */ daddu $s0, $v0, $zero /* EFF35C 8024085C 3C014334 */ lui $at, 0x4334 /* EFF360 80240860 44811000 */ mtc1 $at, $f2 @@ -65,7 +65,7 @@ glabel func_802407B0_EFF2B0 /* EFF3A0 802408A0 0240202D */ daddu $a0, $s2, $zero /* EFF3A4 802408A4 0220982D */ daddu $s3, $s1, $zero /* EFF3A8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* EFF3AC 802408AC 0C0B551A */ jal dead_set_variable +/* EFF3AC 802408AC 0C0B551A */ jal dead_evt_set_variable /* EFF3B0 802408B0 0220302D */ daddu $a2, $s1, $zero .L802408B4: /* EFF3B4 802408B4 3C014049 */ lui $at, 0x4049 @@ -88,7 +88,7 @@ glabel func_802407B0_EFF2B0 /* EFF3F8 802408F8 46001081 */ sub.s $f2, $f2, $f0 /* EFF3FC 802408FC 0240202D */ daddu $a0, $s2, $zero /* EFF400 80240900 44061000 */ mfc1 $a2, $f2 -/* EFF404 80240904 0C0B5684 */ jal dead_set_float_variable +/* EFF404 80240904 0C0B5684 */ jal dead_evt_set_float_variable /* EFF408 80240908 02A0282D */ daddu $a1, $s5, $zero /* EFF40C 8024090C 8FBF0028 */ lw $ra, 0x28($sp) /* EFF410 80240910 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s index b4e4dd6374..55e1939782 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s @@ -8,7 +8,7 @@ glabel AssignBlockFlag /* A8778 80112078 AFB00010 */ sw $s0, 0x10($sp) /* A877C 8011207C 14A2000A */ bne $a1, $v0, .L801120A8 /* A8780 80112080 8C83000C */ lw $v1, 0xc($a0) -/* A8784 80112084 0C0B1F6A */ jal get_variable_index +/* A8784 80112084 0C0B1F6A */ jal evt_get_variable_index /* A8788 80112088 8C650000 */ lw $a1, ($v1) /* A878C 8011208C 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) /* A8790 80112090 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s index 66e1ef8492..bd389918f6 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s @@ -16,7 +16,7 @@ glabel AssignCrateFlag /* A889C 8011219C 00000000 */ nop /* A88A0 801121A0 8E050000 */ lw $a1, ($s0) /* A88A4 801121A4 8C500040 */ lw $s0, 0x40($v0) -/* A88A8 801121A8 0C0B1F6A */ jal get_variable_index +/* A88A8 801121A8 0C0B1F6A */ jal evt_get_variable_index /* A88AC 801121AC 0220202D */ daddu $a0, $s1, $zero /* A88B0 801121B0 A6020004 */ sh $v0, 4($s0) /* A88B4 801121B4 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s index d069be1ff2..6c187ff78e 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s @@ -16,7 +16,7 @@ glabel AssignPanelFlag /* A8840 80112140 00000000 */ nop /* A8844 80112144 8E050000 */ lw $a1, ($s0) /* A8848 80112148 8C500040 */ lw $s0, 0x40($v0) -/* A884C 8011214C 0C0B1F6A */ jal get_variable_index +/* A884C 8011214C 0C0B1F6A */ jal evt_get_variable_index /* A8850 80112150 0220202D */ daddu $a0, $s1, $zero /* A8854 80112154 A6020006 */ sh $v0, 6($s0) /* A8858 80112158 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s b/ver/us/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s index 697b154327..61b7bd73c2 100644 --- a/ver/us/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s +++ b/ver/us/asm/nonmatchings/battle/area_arn/4FF0D0/func_80218680_4FF0D0.s @@ -31,7 +31,7 @@ glabel func_80218680_4FF0D0 /* 4FF138 802186E8 0040982D */ daddu $s3, $v0, $zero /* 4FF13C 802186EC 0220202D */ daddu $a0, $s1, $zero /* 4FF140 802186F0 8E050000 */ lw $a1, ($s0) -/* 4FF144 802186F4 0C0B210B */ jal get_float_variable +/* 4FF144 802186F4 0C0B210B */ jal evt_get_float_variable /* 4FF148 802186F8 0040802D */ daddu $s0, $v0, $zero /* 4FF14C 802186FC 8E42000C */ lw $v0, 0xc($s2) /* 4FF150 80218700 44941000 */ mtc1 $s4, $f2 diff --git a/ver/us/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s b/ver/us/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s index e1ce94f62d..409608b532 100644 --- a/ver/us/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s +++ b/ver/us/asm/nonmatchings/battle/area_dig/6DE1F0/func_80218430_6DE1F0.s @@ -64,15 +64,15 @@ glabel func_80218430_6DE1F0 /* 6DE2DC 8021851C C62000B4 */ lwc1 $f0, 0xb4($s1) /* 6DE2E0 80218520 46800020 */ cvt.s.w $f0, $f0 /* 6DE2E4 80218524 4406B000 */ mfc1 $a2, $f22 -/* 6DE2E8 80218528 0C0B2190 */ jal set_float_variable +/* 6DE2E8 80218528 0C0B2190 */ jal evt_set_float_variable /* 6DE2EC 8021852C 4600A501 */ sub.s $f20, $f20, $f0 /* 6DE2F0 80218530 0220202D */ daddu $a0, $s1, $zero /* 6DE2F4 80218534 4406A000 */ mfc1 $a2, $f20 -/* 6DE2F8 80218538 0C0B2190 */ jal set_float_variable +/* 6DE2F8 80218538 0C0B2190 */ jal evt_set_float_variable /* 6DE2FC 8021853C 0260282D */ daddu $a1, $s3, $zero /* 6DE300 80218540 0220202D */ daddu $a0, $s1, $zero /* 6DE304 80218544 4406C000 */ mfc1 $a2, $f24 -/* 6DE308 80218548 0C0B2190 */ jal set_float_variable +/* 6DE308 80218548 0C0B2190 */ jal evt_set_float_variable /* 6DE30C 8021854C 0200282D */ daddu $a1, $s0, $zero /* 6DE310 80218550 8FBF0060 */ lw $ra, 0x60($sp) /* 6DE314 80218554 8FB3005C */ lw $s3, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo/5B1A10/func_80218808_5B1CB8.s b/ver/us/asm/nonmatchings/battle/area_flo/5B1A10/func_80218808_5B1CB8.s index 011f72b236..1001c1b0da 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo/5B1A10/func_80218808_5B1CB8.s +++ b/ver/us/asm/nonmatchings/battle/area_flo/5B1A10/func_80218808_5B1CB8.s @@ -48,7 +48,7 @@ glabel func_80218808_5B1CB8 /* 5B1D54 802188A4 8E050000 */ lw $a1, ($s0) /* 5B1D58 802188A8 0000302D */ daddu $a2, $zero, $zero .L802188AC: -/* 5B1D5C 802188AC 0C0B2026 */ jal set_variable +/* 5B1D5C 802188AC 0C0B2026 */ jal evt_set_variable /* 5B1D60 802188B0 00000000 */ nop /* 5B1D64 802188B4 8FBF0018 */ lw $ra, 0x18($sp) /* 5B1D68 802188B8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo/5B1D80/func_80218B78_5B2028.s b/ver/us/asm/nonmatchings/battle/area_flo/5B1D80/func_80218B78_5B2028.s index e023833a1d..03e0633905 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo/5B1D80/func_80218B78_5B2028.s +++ b/ver/us/asm/nonmatchings/battle/area_flo/5B1D80/func_80218B78_5B2028.s @@ -48,7 +48,7 @@ glabel func_80218B78_5B2028 /* 5B20C4 80218C14 8E050000 */ lw $a1, ($s0) /* 5B20C8 80218C18 0000302D */ daddu $a2, $zero, $zero .L80218C1C: -/* 5B20CC 80218C1C 0C0B2026 */ jal set_variable +/* 5B20CC 80218C1C 0C0B2026 */ jal evt_set_variable /* 5B20D0 80218C20 00000000 */ nop /* 5B20D4 80218C24 8FBF0018 */ lw $ra, 0x18($sp) /* 5B20D8 80218C28 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80218EE8_5B2398.s b/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80218EE8_5B2398.s index b3ca3d371b..bcbfcf801b 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80218EE8_5B2398.s +++ b/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80218EE8_5B2398.s @@ -48,7 +48,7 @@ glabel func_80218EE8_5B2398 /* 5B2434 80218F84 8E050000 */ lw $a1, ($s0) /* 5B2438 80218F88 0000302D */ daddu $a2, $zero, $zero .L80218F8C: -/* 5B243C 80218F8C 0C0B2026 */ jal set_variable +/* 5B243C 80218F8C 0C0B2026 */ jal evt_set_variable /* 5B2440 80218F90 00000000 */ nop /* 5B2444 80218F94 8FBF0018 */ lw $ra, 0x18($sp) /* 5B2448 80218F98 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80219358_5B2808.s b/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80219358_5B2808.s index 3ab5b62a08..b9a38032e7 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80219358_5B2808.s +++ b/ver/us/asm/nonmatchings/battle/area_flo/5B20F0/func_80219358_5B2808.s @@ -48,7 +48,7 @@ glabel func_80219358_5B2808 /* 5B28A4 802193F4 8E050000 */ lw $a1, ($s0) /* 5B28A8 802193F8 0000302D */ daddu $a2, $zero, $zero .L802193FC: -/* 5B28AC 802193FC 0C0B2026 */ jal set_variable +/* 5B28AC 802193FC 0C0B2026 */ jal evt_set_variable /* 5B28B0 80219400 00000000 */ nop /* 5B28B4 80219404 8FBF0018 */ lw $ra, 0x18($sp) /* 5B28B8 80219408 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s index 31d7a6a8ad..7fa3e608e2 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s +++ b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802182A4_5CE934.s @@ -19,33 +19,33 @@ glabel func_802182A4_5CE934 /* 5CE96C 802182DC 8E30000C */ lw $s0, 0xc($s1) /* 5CE970 802182E0 8E130000 */ lw $s3, ($s0) /* 5CE974 802182E4 26100004 */ addiu $s0, $s0, 4 -/* 5CE978 802182E8 0C0B210B */ jal get_float_variable +/* 5CE978 802182E8 0C0B210B */ jal evt_get_float_variable /* 5CE97C 802182EC 0260282D */ daddu $a1, $s3, $zero /* 5CE980 802182F0 E7A00010 */ swc1 $f0, 0x10($sp) /* 5CE984 802182F4 8E140000 */ lw $s4, ($s0) /* 5CE988 802182F8 26100004 */ addiu $s0, $s0, 4 /* 5CE98C 802182FC 0220202D */ daddu $a0, $s1, $zero -/* 5CE990 80218300 0C0B210B */ jal get_float_variable +/* 5CE990 80218300 0C0B210B */ jal evt_get_float_variable /* 5CE994 80218304 0280282D */ daddu $a1, $s4, $zero /* 5CE998 80218308 46000786 */ mov.s $f30, $f0 /* 5CE99C 8021830C 8E120000 */ lw $s2, ($s0) /* 5CE9A0 80218310 26100004 */ addiu $s0, $s0, 4 /* 5CE9A4 80218314 0220202D */ daddu $a0, $s1, $zero -/* 5CE9A8 80218318 0C0B210B */ jal get_float_variable +/* 5CE9A8 80218318 0C0B210B */ jal evt_get_float_variable /* 5CE9AC 8021831C 0240282D */ daddu $a1, $s2, $zero /* 5CE9B0 80218320 46000706 */ mov.s $f28, $f0 /* 5CE9B4 80218324 8E050000 */ lw $a1, ($s0) /* 5CE9B8 80218328 26100004 */ addiu $s0, $s0, 4 -/* 5CE9BC 8021832C 0C0B210B */ jal get_float_variable +/* 5CE9BC 8021832C 0C0B210B */ jal evt_get_float_variable /* 5CE9C0 80218330 0220202D */ daddu $a0, $s1, $zero /* 5CE9C4 80218334 8E050000 */ lw $a1, ($s0) /* 5CE9C8 80218338 26100004 */ addiu $s0, $s0, 4 /* 5CE9CC 8021833C 0220202D */ daddu $a0, $s1, $zero -/* 5CE9D0 80218340 0C0B210B */ jal get_float_variable +/* 5CE9D0 80218340 0C0B210B */ jal evt_get_float_variable /* 5CE9D4 80218344 46000686 */ mov.s $f26, $f0 /* 5CE9D8 80218348 46000606 */ mov.s $f24, $f0 /* 5CE9DC 8021834C 8E050000 */ lw $a1, ($s0) -/* 5CE9E0 80218350 0C0B210B */ jal get_float_variable +/* 5CE9E0 80218350 0C0B210B */ jal evt_get_float_variable /* 5CE9E4 80218354 0220202D */ daddu $a0, $s1, $zero /* 5CE9E8 80218358 4600D306 */ mov.s $f12, $f26 /* 5CE9EC 8021835C 3C014170 */ lui $at, 0x4170 @@ -80,15 +80,15 @@ glabel func_802182A4_5CE934 /* 5CEA60 802183D0 0220202D */ daddu $a0, $s1, $zero /* 5CEA64 802183D4 0260282D */ daddu $a1, $s3, $zero /* 5CEA68 802183D8 8FA60010 */ lw $a2, 0x10($sp) -/* 5CEA6C 802183DC 0C0B2190 */ jal set_float_variable +/* 5CEA6C 802183DC 0C0B2190 */ jal evt_set_float_variable /* 5CEA70 802183E0 4616E701 */ sub.s $f28, $f28, $f22 /* 5CEA74 802183E4 0220202D */ daddu $a0, $s1, $zero /* 5CEA78 802183E8 4406F000 */ mfc1 $a2, $f30 -/* 5CEA7C 802183EC 0C0B2190 */ jal set_float_variable +/* 5CEA7C 802183EC 0C0B2190 */ jal evt_set_float_variable /* 5CEA80 802183F0 0280282D */ daddu $a1, $s4, $zero /* 5CEA84 802183F4 0220202D */ daddu $a0, $s1, $zero /* 5CEA88 802183F8 4406E000 */ mfc1 $a2, $f28 -/* 5CEA8C 802183FC 0C0B2190 */ jal set_float_variable +/* 5CEA8C 802183FC 0C0B2190 */ jal evt_set_float_variable /* 5CEA90 80218400 0240282D */ daddu $a1, $s2, $zero /* 5CEA94 80218404 8FBF002C */ lw $ra, 0x2c($sp) /* 5CEA98 80218408 8FB40028 */ lw $s4, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218440_5CEAD0.s b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218440_5CEAD0.s index 9f12c0ba17..984a921735 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218440_5CEAD0.s +++ b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218440_5CEAD0.s @@ -107,7 +107,7 @@ glabel func_80218440_5CEAD0 /* 5CEC3C 802185AC 8C460010 */ lw $a2, 0x10($v0) .L802185B0: /* 5CEC40 802185B0 8E050000 */ lw $a1, ($s0) -/* 5CEC44 802185B4 0C0B2026 */ jal set_variable +/* 5CEC44 802185B4 0C0B2026 */ jal evt_set_variable /* 5CEC48 802185B8 0220202D */ daddu $a0, $s1, $zero /* 5CEC4C 802185BC 8FBF0040 */ lw $ra, 0x40($sp) /* 5CEC50 802185C0 8FB1003C */ lw $s1, 0x3c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218774_5CEE04.s b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218774_5CEE04.s index 7afa1f4b09..a9ef8ec865 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218774_5CEE04.s +++ b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218774_5CEE04.s @@ -21,32 +21,32 @@ glabel func_80218774_5CEE04 /* 5CEE44 802187B4 8E050000 */ lw $a1, ($s0) /* 5CEE48 802187B8 26100004 */ addiu $s0, $s0, 4 /* 5CEE4C 802187BC 0220202D */ daddu $a0, $s1, $zero -/* 5CEE50 802187C0 0C0B210B */ jal get_float_variable +/* 5CEE50 802187C0 0C0B210B */ jal evt_get_float_variable /* 5CEE54 802187C4 0040902D */ daddu $s2, $v0, $zero /* 5CEE58 802187C8 8E050000 */ lw $a1, ($s0) /* 5CEE5C 802187CC 26100004 */ addiu $s0, $s0, 4 /* 5CEE60 802187D0 0220202D */ daddu $a0, $s1, $zero -/* 5CEE64 802187D4 0C0B210B */ jal get_float_variable +/* 5CEE64 802187D4 0C0B210B */ jal evt_get_float_variable /* 5CEE68 802187D8 46000786 */ mov.s $f30, $f0 /* 5CEE6C 802187DC 8E050000 */ lw $a1, ($s0) /* 5CEE70 802187E0 26100004 */ addiu $s0, $s0, 4 /* 5CEE74 802187E4 0220202D */ daddu $a0, $s1, $zero -/* 5CEE78 802187E8 0C0B210B */ jal get_float_variable +/* 5CEE78 802187E8 0C0B210B */ jal evt_get_float_variable /* 5CEE7C 802187EC 46000706 */ mov.s $f28, $f0 /* 5CEE80 802187F0 8E050000 */ lw $a1, ($s0) /* 5CEE84 802187F4 26100004 */ addiu $s0, $s0, 4 /* 5CEE88 802187F8 0220202D */ daddu $a0, $s1, $zero -/* 5CEE8C 802187FC 0C0B210B */ jal get_float_variable +/* 5CEE8C 802187FC 0C0B210B */ jal evt_get_float_variable /* 5CEE90 80218800 46000686 */ mov.s $f26, $f0 /* 5CEE94 80218804 8E050000 */ lw $a1, ($s0) /* 5CEE98 80218808 26100004 */ addiu $s0, $s0, 4 /* 5CEE9C 8021880C 0220202D */ daddu $a0, $s1, $zero -/* 5CEEA0 80218810 0C0B210B */ jal get_float_variable +/* 5CEEA0 80218810 0C0B210B */ jal evt_get_float_variable /* 5CEEA4 80218814 46000606 */ mov.s $f24, $f0 /* 5CEEA8 80218818 8E050000 */ lw $a1, ($s0) /* 5CEEAC 8021881C 26100004 */ addiu $s0, $s0, 4 /* 5CEEB0 80218820 0220202D */ daddu $a0, $s1, $zero -/* 5CEEB4 80218824 0C0B210B */ jal get_float_variable +/* 5CEEB4 80218824 0C0B210B */ jal evt_get_float_variable /* 5CEEB8 80218828 46000586 */ mov.s $f22, $f0 /* 5CEEBC 8021882C 8E050000 */ lw $a1, ($s0) /* 5CEEC0 80218830 26100004 */ addiu $s0, $s0, 4 @@ -64,7 +64,7 @@ glabel func_80218774_5CEE04 /* 5CEEF0 80218860 AFA2001C */ sw $v0, 0x1c($sp) /* 5CEEF4 80218864 0220202D */ daddu $a0, $s1, $zero /* 5CEEF8 80218868 8E050000 */ lw $a1, ($s0) -/* 5CEEFC 8021886C 0C0B2026 */ jal set_variable +/* 5CEEFC 8021886C 0C0B2026 */ jal evt_set_variable /* 5CEF00 80218870 0040302D */ daddu $a2, $v0, $zero /* 5CEF04 80218874 8FBF002C */ lw $ra, 0x2c($sp) /* 5CEF08 80218878 8FB20028 */ lw $s2, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s index d90be27afb..53927b62e0 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s +++ b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218924_5CEFB4.s @@ -25,7 +25,7 @@ glabel func_80218924_5CEFB4 /* 5CF004 80218974 0040902D */ daddu $s2, $v0, $zero /* 5CF008 80218978 0220202D */ daddu $a0, $s1, $zero /* 5CF00C 8021897C 8E050000 */ lw $a1, ($s0) -/* 5CF010 80218980 0C0B210B */ jal get_float_variable +/* 5CF010 80218980 0C0B210B */ jal evt_get_float_variable /* 5CF014 80218984 0040802D */ daddu $s0, $v0, $zero /* 5CF018 80218988 44932000 */ mtc1 $s3, $f4 /* 5CF01C 8021898C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802189FC_5CF08C.s b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802189FC_5CF08C.s index b259e9685b..78a4cb5127 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802189FC_5CF08C.s +++ b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_802189FC_5CF08C.s @@ -17,16 +17,16 @@ glabel func_802189FC_5CF08C /* 5CF0BC 80218A2C 8E050000 */ lw $a1, ($s0) /* 5CF0C0 80218A30 26100004 */ addiu $s0, $s0, 4 /* 5CF0C4 80218A34 0220202D */ daddu $a0, $s1, $zero -/* 5CF0C8 80218A38 0C0B210B */ jal get_float_variable +/* 5CF0C8 80218A38 0C0B210B */ jal evt_get_float_variable /* 5CF0CC 80218A3C 0040902D */ daddu $s2, $v0, $zero /* 5CF0D0 80218A40 8E050000 */ lw $a1, ($s0) /* 5CF0D4 80218A44 26100004 */ addiu $s0, $s0, 4 /* 5CF0D8 80218A48 0220202D */ daddu $a0, $s1, $zero -/* 5CF0DC 80218A4C 0C0B210B */ jal get_float_variable +/* 5CF0DC 80218A4C 0C0B210B */ jal evt_get_float_variable /* 5CF0E0 80218A50 46000586 */ mov.s $f22, $f0 /* 5CF0E4 80218A54 0220202D */ daddu $a0, $s1, $zero /* 5CF0E8 80218A58 8E050000 */ lw $a1, ($s0) -/* 5CF0EC 80218A5C 0C0B210B */ jal get_float_variable +/* 5CF0EC 80218A5C 0C0B210B */ jal evt_get_float_variable /* 5CF0F0 80218A60 46000506 */ mov.s $f20, $f0 /* 5CF0F4 80218A64 8E42000C */ lw $v0, 0xc($s2) /* 5CF0F8 80218A68 E4560004 */ swc1 $f22, 4($v0) diff --git a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218AA0_5CF130.s b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218AA0_5CF130.s index 0cbca1e7fc..3e0b6579f1 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218AA0_5CF130.s +++ b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218AA0_5CF130.s @@ -15,21 +15,21 @@ glabel func_80218AA0_5CF130 /* 5CF158 80218AC8 8E120000 */ lw $s2, ($s0) /* 5CF15C 80218ACC 26100004 */ addiu $s0, $s0, 4 /* 5CF160 80218AD0 8E050000 */ lw $a1, ($s0) -/* 5CF164 80218AD4 0C0B210B */ jal get_float_variable +/* 5CF164 80218AD4 0C0B210B */ jal evt_get_float_variable /* 5CF168 80218AD8 26100004 */ addiu $s0, $s0, 4 /* 5CF16C 80218ADC 8E050000 */ lw $a1, ($s0) /* 5CF170 80218AE0 26100004 */ addiu $s0, $s0, 4 /* 5CF174 80218AE4 0220202D */ daddu $a0, $s1, $zero -/* 5CF178 80218AE8 0C0B210B */ jal get_float_variable +/* 5CF178 80218AE8 0C0B210B */ jal evt_get_float_variable /* 5CF17C 80218AEC 46000606 */ mov.s $f24, $f0 /* 5CF180 80218AF0 8E050000 */ lw $a1, ($s0) /* 5CF184 80218AF4 26100004 */ addiu $s0, $s0, 4 /* 5CF188 80218AF8 0220202D */ daddu $a0, $s1, $zero -/* 5CF18C 80218AFC 0C0B210B */ jal get_float_variable +/* 5CF18C 80218AFC 0C0B210B */ jal evt_get_float_variable /* 5CF190 80218B00 46000586 */ mov.s $f22, $f0 /* 5CF194 80218B04 0220202D */ daddu $a0, $s1, $zero /* 5CF198 80218B08 8E050000 */ lw $a1, ($s0) -/* 5CF19C 80218B0C 0C0B210B */ jal get_float_variable +/* 5CF19C 80218B0C 0C0B210B */ jal evt_get_float_variable /* 5CF1A0 80218B10 46000506 */ mov.s $f20, $f0 /* 5CF1A4 80218B14 4600C306 */ mov.s $f12, $f24 /* 5CF1A8 80218B18 4406A000 */ mfc1 $a2, $f20 @@ -38,7 +38,7 @@ glabel func_80218AA0_5CF130 /* 5CF1B4 80218B24 4600B386 */ mov.s $f14, $f22 /* 5CF1B8 80218B28 0220202D */ daddu $a0, $s1, $zero /* 5CF1BC 80218B2C 44060000 */ mfc1 $a2, $f0 -/* 5CF1C0 80218B30 0C0B2190 */ jal set_float_variable +/* 5CF1C0 80218B30 0C0B2190 */ jal evt_set_float_variable /* 5CF1C4 80218B34 0240282D */ daddu $a1, $s2, $zero /* 5CF1C8 80218B38 8FBF001C */ lw $ra, 0x1c($sp) /* 5CF1CC 80218B3C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s index 053ea7362b..810f04d2a7 100644 --- a/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s +++ b/ver/us/asm/nonmatchings/battle/area_flo2/5CE690/func_80218B60_5CF1F0.s @@ -18,12 +18,12 @@ glabel func_80218B60_5CF1F0 /* 5CF224 80218B94 8E050000 */ lw $a1, ($s0) /* 5CF228 80218B98 26100004 */ addiu $s0, $s0, 4 /* 5CF22C 80218B9C 0220202D */ daddu $a0, $s1, $zero -/* 5CF230 80218BA0 0C0B210B */ jal get_float_variable +/* 5CF230 80218BA0 0C0B210B */ jal evt_get_float_variable /* 5CF234 80218BA4 0040982D */ daddu $s3, $v0, $zero /* 5CF238 80218BA8 8E050000 */ lw $a1, ($s0) /* 5CF23C 80218BAC 26100004 */ addiu $s0, $s0, 4 /* 5CF240 80218BB0 0220202D */ daddu $a0, $s1, $zero -/* 5CF244 80218BB4 0C0B210B */ jal get_float_variable +/* 5CF244 80218BB4 0C0B210B */ jal evt_get_float_variable /* 5CF248 80218BB8 46000586 */ mov.s $f22, $f0 /* 5CF24C 80218BBC 8E050000 */ lw $a1, ($s0) /* 5CF250 80218BC0 26100004 */ addiu $s0, $s0, 4 @@ -43,7 +43,7 @@ glabel func_80218B60_5CF1F0 /* 5CF288 80218BF8 AFA20010 */ sw $v0, 0x10($sp) /* 5CF28C 80218BFC 8E050000 */ lw $a1, ($s0) /* 5CF290 80218C00 44060000 */ mfc1 $a2, $f0 -/* 5CF294 80218C04 0C0B2190 */ jal set_float_variable +/* 5CF294 80218C04 0C0B2190 */ jal evt_set_float_variable /* 5CF298 80218C08 0220202D */ daddu $a0, $s1, $zero /* 5CF29C 80218C0C 8FBF0028 */ lw $ra, 0x28($sp) /* 5CF2A0 80218C10 8FB30024 */ lw $s3, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s b/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s index f703863bc2..a9434e4bdf 100644 --- a/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s +++ b/ver/us/asm/nonmatchings/battle/area_hos/47F0D0/func_802183F8_47F4A8.s @@ -48,7 +48,7 @@ glabel func_802183F8_47F4A8 /* 47F544 80218494 8E050000 */ lw $a1, ($s0) /* 47F548 80218498 0000302D */ daddu $a2, $zero, $zero .L8021849C: -/* 47F54C 8021849C 0C0B2026 */ jal set_variable +/* 47F54C 8021849C 0C0B2026 */ jal evt_set_variable /* 47F550 802184A0 00000000 */ nop /* 47F554 802184A4 8FBF0018 */ lw $ra, 0x18($sp) /* 47F558 802184A8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s b/ver/us/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s index 7c1ca6f676..e8ed5c901b 100644 --- a/ver/us/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s +++ b/ver/us/asm/nonmatchings/battle/area_jan2/584940/func_802180CC_584A0C.s @@ -34,7 +34,7 @@ glabel func_802180CC_584A0C /* 584A80 80218140 8E050000 */ lw $a1, ($s0) /* 584A84 80218144 26100004 */ addiu $s0, $s0, 4 /* 584A88 80218148 0220202D */ daddu $a0, $s1, $zero -/* 584A8C 8021814C 0C0B210B */ jal get_float_variable +/* 584A8C 8021814C 0C0B210B */ jal evt_get_float_variable /* 584A90 80218150 0040A02D */ daddu $s4, $v0, $zero /* 584A94 80218154 8E050000 */ lw $a1, ($s0) /* 584A98 80218158 26100004 */ addiu $s0, $s0, 4 diff --git a/ver/us/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s b/ver/us/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s index ccd07dc757..b5660b9e74 100644 --- a/ver/us/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s +++ b/ver/us/asm/nonmatchings/battle/area_jan2/584B90/func_802184F8_584E38.s @@ -48,7 +48,7 @@ glabel func_802184F8_584E38 /* 584ED4 80218594 8E050000 */ lw $a1, ($s0) /* 584ED8 80218598 0000302D */ daddu $a2, $zero, $zero .L8021859C: -/* 584EDC 8021859C 0C0B2026 */ jal set_variable +/* 584EDC 8021859C 0C0B2026 */ jal evt_set_variable /* 584EE0 802185A0 00000000 */ nop /* 584EE4 802185A4 8FBF0018 */ lw $ra, 0x18($sp) /* 584EE8 802185A8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s b/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s index 806da707b6..eeee03aeb6 100644 --- a/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s +++ b/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802180CC_56E36C.s @@ -22,17 +22,17 @@ glabel func_802180CC_56E36C /* 56E3B0 80218110 AE220020 */ sw $v0, 0x20($s1) /* 56E3B4 80218114 8E050000 */ lw $a1, ($s0) /* 56E3B8 80218118 26100004 */ addiu $s0, $s0, 4 -/* 56E3BC 8021811C 0C0B210B */ jal get_float_variable +/* 56E3BC 8021811C 0C0B210B */ jal evt_get_float_variable /* 56E3C0 80218120 0240202D */ daddu $a0, $s2, $zero /* 56E3C4 80218124 E6200000 */ swc1 $f0, ($s1) /* 56E3C8 80218128 8E050000 */ lw $a1, ($s0) /* 56E3CC 8021812C 26100004 */ addiu $s0, $s0, 4 -/* 56E3D0 80218130 0C0B210B */ jal get_float_variable +/* 56E3D0 80218130 0C0B210B */ jal evt_get_float_variable /* 56E3D4 80218134 0240202D */ daddu $a0, $s2, $zero /* 56E3D8 80218138 E6200004 */ swc1 $f0, 4($s1) /* 56E3DC 8021813C 8E050000 */ lw $a1, ($s0) /* 56E3E0 80218140 26100004 */ addiu $s0, $s0, 4 -/* 56E3E4 80218144 0C0B210B */ jal get_float_variable +/* 56E3E4 80218144 0C0B210B */ jal evt_get_float_variable /* 56E3E8 80218148 0240202D */ daddu $a0, $s2, $zero /* 56E3EC 8021814C E6200008 */ swc1 $f0, 8($s1) /* 56E3F0 80218150 8E050000 */ lw $a1, ($s0) @@ -41,7 +41,7 @@ glabel func_802180CC_56E36C /* 56E3FC 8021815C 0240202D */ daddu $a0, $s2, $zero /* 56E400 80218160 AE22001C */ sw $v0, 0x1c($s1) /* 56E404 80218164 8E050000 */ lw $a1, ($s0) -/* 56E408 80218168 0C0B210B */ jal get_float_variable +/* 56E408 80218168 0C0B210B */ jal evt_get_float_variable /* 56E40C 8021816C 0240202D */ daddu $a0, $s2, $zero /* 56E410 80218170 8E240020 */ lw $a0, 0x20($s1) /* 56E414 80218174 0C04C3D6 */ jal get_item_entity diff --git a/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s b/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s index b1c170ac27..e0d06bb472 100644 --- a/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s +++ b/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802182E4_56E584.s @@ -70,7 +70,7 @@ glabel func_802182E4_56E584 /* 56E674 802183D4 3C068022 */ lui $a2, %hi(D_8021AFD8_571278) /* 56E678 802183D8 00C23021 */ addu $a2, $a2, $v0 /* 56E67C 802183DC 8CC6AFD8 */ lw $a2, %lo(D_8021AFD8_571278)($a2) -/* 56E680 802183E0 0C0B2026 */ jal set_variable +/* 56E680 802183E0 0C0B2026 */ jal evt_set_variable /* 56E684 802183E4 0260202D */ daddu $a0, $s3, $zero /* 56E688 802183E8 82820001 */ lb $v0, 1($s4) /* 56E68C 802183EC 8E250000 */ lw $a1, ($s1) @@ -89,7 +89,7 @@ glabel func_802182E4_56E584 /* 56E6BC 8021841C 3C068022 */ lui $a2, %hi(D_8021AFF0_571290) /* 56E6C0 80218420 00C23021 */ addu $a2, $a2, $v0 /* 56E6C4 80218424 8CC6AFF0 */ lw $a2, %lo(D_8021AFF0_571290)($a2) -/* 56E6C8 80218428 0C0B2026 */ jal set_variable +/* 56E6C8 80218428 0C0B2026 */ jal evt_set_variable /* 56E6CC 8021842C 0260202D */ daddu $a0, $s3, $zero /* 56E6D0 80218430 82A20000 */ lb $v0, ($s5) /* 56E6D4 80218434 8E250000 */ lw $a1, ($s1) @@ -103,13 +103,13 @@ glabel func_802182E4_56E584 /* 56E6F0 80218450 8E250000 */ lw $a1, ($s1) /* 56E6F4 80218454 26310004 */ addiu $s1, $s1, 4 /* 56E6F8 80218458 0260202D */ daddu $a0, $s3, $zero -/* 56E6FC 8021845C 0C0B2026 */ jal set_variable +/* 56E6FC 8021845C 0C0B2026 */ jal evt_set_variable /* 56E700 80218460 2406016C */ addiu $a2, $zero, 0x16c /* 56E704 80218464 0260202D */ daddu $a0, $s3, $zero /* 56E708 80218468 8E250000 */ lw $a1, ($s1) /* 56E70C 8021846C 2406004F */ addiu $a2, $zero, 0x4f .L80218470: -/* 56E710 80218470 0C0B2026 */ jal set_variable +/* 56E710 80218470 0C0B2026 */ jal evt_set_variable /* 56E714 80218474 00000000 */ nop .L80218478: /* 56E718 80218478 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s b/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s index 7f92706eaa..cfc1c0e5e8 100644 --- a/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s +++ b/ver/us/asm/nonmatchings/battle/area_kgr/56E2A0/func_802184F8_56E798.s @@ -23,7 +23,7 @@ glabel func_802184F8_56E798 .L8021853C: /* 56E7DC 8021853C 8CA50000 */ lw $a1, ($a1) .L80218540: -/* 56E7E0 80218540 0C0B2026 */ jal set_variable +/* 56E7E0 80218540 0C0B2026 */ jal evt_set_variable /* 56E7E4 80218544 00000000 */ nop /* 56E7E8 80218548 8FBF0010 */ lw $ra, 0x10($sp) /* 56E7EC 8021854C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s b/ver/us/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s index 9f05c14a4c..90f002d46b 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa/684C30/func_80218638_685068.s @@ -48,7 +48,7 @@ glabel func_80218638_685068 /* 685104 802186D4 8E050000 */ lw $a1, ($s0) /* 685108 802186D8 0000302D */ daddu $a2, $zero, $zero .L802186DC: -/* 68510C 802186DC 0C0B2026 */ jal set_variable +/* 68510C 802186DC 0C0B2026 */ jal evt_set_variable /* 685110 802186E0 00000000 */ nop /* 685114 802186E4 8FBF0018 */ lw $ra, 0x18($sp) /* 685118 802186E8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s index 63e5d5b3a6..31a34facfa 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s @@ -47,11 +47,11 @@ glabel func_802186D0_69F8D0 /* 69F978 80218778 4482C000 */ mtc1 $v0, $f24 /* 69F97C 8021877C 00000000 */ nop /* 69F980 80218780 4680C620 */ cvt.s.w $f24, $f24 -/* 69F984 80218784 0C0B210B */ jal get_float_variable +/* 69F984 80218784 0C0B210B */ jal evt_get_float_variable /* 69F988 80218788 0220202D */ daddu $a0, $s1, $zero /* 69F98C 8021878C 0220202D */ daddu $a0, $s1, $zero /* 69F990 80218790 8E050000 */ lw $a1, ($s0) -/* 69F994 80218794 0C0B210B */ jal get_float_variable +/* 69F994 80218794 0C0B210B */ jal evt_get_float_variable /* 69F998 80218798 46000506 */ mov.s $f20, $f0 /* 69F99C 8021879C 240400B4 */ addiu $a0, $zero, 0xb4 /* 69F9A0 802187A0 0C00AB39 */ jal heap_malloc diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s index 242fa9efac..2a13c9d908 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s @@ -45,7 +45,7 @@ glabel func_80218AA4_69FCA4 /* 69FD44 80218B44 4482B000 */ mtc1 $v0, $f22 /* 69FD48 80218B48 00000000 */ nop /* 69FD4C 80218B4C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 69FD50 80218B50 0C0B210B */ jal get_float_variable +/* 69FD50 80218B50 0C0B210B */ jal evt_get_float_variable /* 69FD54 80218B54 0220202D */ daddu $a0, $s1, $zero /* 69FD58 80218B58 82830210 */ lb $v1, 0x210($s4) /* 69FD5C 80218B5C 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s index 0ecd18b0c8..582cbc20c7 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s @@ -47,11 +47,11 @@ glabel func_80219444_6A0644 /* 6A06EC 802194EC 4482C000 */ mtc1 $v0, $f24 /* 6A06F0 802194F0 00000000 */ nop /* 6A06F4 802194F4 4680C620 */ cvt.s.w $f24, $f24 -/* 6A06F8 802194F8 0C0B210B */ jal get_float_variable +/* 6A06F8 802194F8 0C0B210B */ jal evt_get_float_variable /* 6A06FC 802194FC 0220202D */ daddu $a0, $s1, $zero /* 6A0700 80219500 0220202D */ daddu $a0, $s1, $zero /* 6A0704 80219504 8E050000 */ lw $a1, ($s0) -/* 6A0708 80219508 0C0B210B */ jal get_float_variable +/* 6A0708 80219508 0C0B210B */ jal evt_get_float_variable /* 6A070C 8021950C 46000506 */ mov.s $f20, $f0 /* 6A0710 80219510 240400B4 */ addiu $a0, $zero, 0xb4 /* 6A0714 80219514 0C00AB39 */ jal heap_malloc diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s index be541a6ea9..a535110746 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s @@ -45,7 +45,7 @@ glabel func_80219818_6A0A18 /* 6A0AB8 802198B8 4482B000 */ mtc1 $v0, $f22 /* 6A0ABC 802198BC 00000000 */ nop /* 6A0AC0 802198C0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 6A0AC4 802198C4 0C0B210B */ jal get_float_variable +/* 6A0AC4 802198C4 0C0B210B */ jal evt_get_float_variable /* 6A0AC8 802198C8 0220202D */ daddu $a0, $s1, $zero /* 6A0ACC 802198CC 82830210 */ lb $v1, 0x210($s4) /* 6A0AD0 802198D0 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s index 19f1fd1bc7..ae91a0c25c 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219CD4_6A0ED4.s @@ -26,7 +26,7 @@ glabel func_80219CD4_6A0ED4 .L80219D24: /* 6A0F24 80219D24 00003012 */ mflo $a2 /* 6A0F28 80219D28 8C82000C */ lw $v0, 0xc($a0) -/* 6A0F2C 80219D2C 0C0B2026 */ jal set_variable +/* 6A0F2C 80219D2C 0C0B2026 */ jal evt_set_variable /* 6A0F30 80219D30 8C450000 */ lw $a1, ($v0) /* 6A0F34 80219D34 8FBF0010 */ lw $ra, 0x10($sp) /* 6A0F38 80219D38 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s index b13e3887dc..a470c61916 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219D44_6A0F44.s @@ -22,17 +22,17 @@ glabel func_80219D44_6A0F44 /* 6A0F88 80219D88 AE220020 */ sw $v0, 0x20($s1) /* 6A0F8C 80219D8C 8E050000 */ lw $a1, ($s0) /* 6A0F90 80219D90 26100004 */ addiu $s0, $s0, 4 -/* 6A0F94 80219D94 0C0B210B */ jal get_float_variable +/* 6A0F94 80219D94 0C0B210B */ jal evt_get_float_variable /* 6A0F98 80219D98 0240202D */ daddu $a0, $s2, $zero /* 6A0F9C 80219D9C E6200000 */ swc1 $f0, ($s1) /* 6A0FA0 80219DA0 8E050000 */ lw $a1, ($s0) /* 6A0FA4 80219DA4 26100004 */ addiu $s0, $s0, 4 -/* 6A0FA8 80219DA8 0C0B210B */ jal get_float_variable +/* 6A0FA8 80219DA8 0C0B210B */ jal evt_get_float_variable /* 6A0FAC 80219DAC 0240202D */ daddu $a0, $s2, $zero /* 6A0FB0 80219DB0 E6200004 */ swc1 $f0, 4($s1) /* 6A0FB4 80219DB4 8E050000 */ lw $a1, ($s0) /* 6A0FB8 80219DB8 26100004 */ addiu $s0, $s0, 4 -/* 6A0FBC 80219DBC 0C0B210B */ jal get_float_variable +/* 6A0FBC 80219DBC 0C0B210B */ jal evt_get_float_variable /* 6A0FC0 80219DC0 0240202D */ daddu $a0, $s2, $zero /* 6A0FC4 80219DC4 E6200008 */ swc1 $f0, 8($s1) /* 6A0FC8 80219DC8 8E050000 */ lw $a1, ($s0) @@ -41,7 +41,7 @@ glabel func_80219D44_6A0F44 /* 6A0FD4 80219DD4 0240202D */ daddu $a0, $s2, $zero /* 6A0FD8 80219DD8 AE22001C */ sw $v0, 0x1c($s1) /* 6A0FDC 80219DDC 8E050000 */ lw $a1, ($s0) -/* 6A0FE0 80219DE0 0C0B210B */ jal get_float_variable +/* 6A0FE0 80219DE0 0C0B210B */ jal evt_get_float_variable /* 6A0FE4 80219DE4 0240202D */ daddu $a0, $s2, $zero /* 6A0FE8 80219DE8 8E240020 */ lw $a0, 0x20($s1) /* 6A0FEC 80219DEC 0C04C3D6 */ jal get_item_entity diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s index e715b23a03..0abe878a9f 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219FFC_6A11FC.s @@ -70,7 +70,7 @@ glabel func_80219FFC_6A11FC /* 6A12EC 8021A0EC 3C068022 */ lui $a2, %hi(D_8022466C_6AB86C) /* 6A12F0 8021A0F0 00C23021 */ addu $a2, $a2, $v0 /* 6A12F4 8021A0F4 8CC6466C */ lw $a2, %lo(D_8022466C_6AB86C)($a2) -/* 6A12F8 8021A0F8 0C0B2026 */ jal set_variable +/* 6A12F8 8021A0F8 0C0B2026 */ jal evt_set_variable /* 6A12FC 8021A0FC 0260202D */ daddu $a0, $s3, $zero /* 6A1300 8021A100 82820001 */ lb $v0, 1($s4) /* 6A1304 8021A104 8E250000 */ lw $a1, ($s1) @@ -89,7 +89,7 @@ glabel func_80219FFC_6A11FC /* 6A1334 8021A134 3C068022 */ lui $a2, %hi(D_80224684_6AB884) /* 6A1338 8021A138 00C23021 */ addu $a2, $a2, $v0 /* 6A133C 8021A13C 8CC64684 */ lw $a2, %lo(D_80224684_6AB884)($a2) -/* 6A1340 8021A140 0C0B2026 */ jal set_variable +/* 6A1340 8021A140 0C0B2026 */ jal evt_set_variable /* 6A1344 8021A144 0260202D */ daddu $a0, $s3, $zero /* 6A1348 8021A148 82A20000 */ lb $v0, ($s5) /* 6A134C 8021A14C 8E250000 */ lw $a1, ($s1) @@ -103,13 +103,13 @@ glabel func_80219FFC_6A11FC /* 6A1368 8021A168 8E250000 */ lw $a1, ($s1) /* 6A136C 8021A16C 26310004 */ addiu $s1, $s1, 4 /* 6A1370 8021A170 0260202D */ daddu $a0, $s3, $zero -/* 6A1374 8021A174 0C0B2026 */ jal set_variable +/* 6A1374 8021A174 0C0B2026 */ jal evt_set_variable /* 6A1378 8021A178 2406016C */ addiu $a2, $zero, 0x16c /* 6A137C 8021A17C 0260202D */ daddu $a0, $s3, $zero /* 6A1380 8021A180 8E250000 */ lw $a1, ($s1) /* 6A1384 8021A184 2406004F */ addiu $a2, $zero, 0x4f .L8021A188: -/* 6A1388 8021A188 0C0B2026 */ jal set_variable +/* 6A1388 8021A188 0C0B2026 */ jal evt_set_variable /* 6A138C 8021A18C 00000000 */ nop .L8021A190: /* 6A1390 8021A190 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s index c5aab24cd7..32eeeee1da 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A1B8_6A13B8.s @@ -36,7 +36,7 @@ glabel func_8021A1B8_6A13B8 /* 6A1428 8021A228 8E050000 */ lw $a1, ($s0) /* 6A142C 8021A22C 2406FFFF */ addiu $a2, $zero, -1 .L8021A230: -/* 6A1430 8021A230 0C0B2026 */ jal set_variable +/* 6A1430 8021A230 0C0B2026 */ jal evt_set_variable /* 6A1434 8021A234 00000000 */ nop /* 6A1438 8021A238 24020002 */ addiu $v0, $zero, 2 /* 6A143C 8021A23C 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s index 7fa43b5079..1ccd8ed3e8 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s @@ -47,11 +47,11 @@ glabel func_8021A804_6A1A04 /* 6A1AAC 8021A8AC 4482C000 */ mtc1 $v0, $f24 /* 6A1AB0 8021A8B0 00000000 */ nop /* 6A1AB4 8021A8B4 4680C620 */ cvt.s.w $f24, $f24 -/* 6A1AB8 8021A8B8 0C0B210B */ jal get_float_variable +/* 6A1AB8 8021A8B8 0C0B210B */ jal evt_get_float_variable /* 6A1ABC 8021A8BC 0220202D */ daddu $a0, $s1, $zero /* 6A1AC0 8021A8C0 0220202D */ daddu $a0, $s1, $zero /* 6A1AC4 8021A8C4 8E050000 */ lw $a1, ($s0) -/* 6A1AC8 8021A8C8 0C0B210B */ jal get_float_variable +/* 6A1AC8 8021A8C8 0C0B210B */ jal evt_get_float_variable /* 6A1ACC 8021A8CC 46000506 */ mov.s $f20, $f0 /* 6A1AD0 8021A8D0 240400B4 */ addiu $a0, $zero, 0xb4 /* 6A1AD4 8021A8D4 0C00AB39 */ jal heap_malloc diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s index f4d4e7b731..f60ce6992a 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s @@ -45,7 +45,7 @@ glabel func_8021ABD8_6A1DD8 /* 6A1E78 8021AC78 4482B000 */ mtc1 $v0, $f22 /* 6A1E7C 8021AC7C 00000000 */ nop /* 6A1E80 8021AC80 4680B5A0 */ cvt.s.w $f22, $f22 -/* 6A1E84 8021AC84 0C0B210B */ jal get_float_variable +/* 6A1E84 8021AC84 0C0B210B */ jal evt_get_float_variable /* 6A1E88 8021AC88 0220202D */ daddu $a0, $s1, $zero /* 6A1E8C 8021AC8C 82830210 */ lb $v1, 0x210($s4) /* 6A1E90 8021AC90 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s index 304bda5f77..2df3802791 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B08C_6A228C.s @@ -26,7 +26,7 @@ glabel func_8021B08C_6A228C .L8021B0DC: /* 6A22DC 8021B0DC 00003012 */ mflo $a2 /* 6A22E0 8021B0E0 8C82000C */ lw $v0, 0xc($a0) -/* 6A22E4 8021B0E4 0C0B2026 */ jal set_variable +/* 6A22E4 8021B0E4 0C0B2026 */ jal evt_set_variable /* 6A22E8 8021B0E8 8C450000 */ lw $a1, ($v0) /* 6A22EC 8021B0EC 8FBF0010 */ lw $ra, 0x10($sp) /* 6A22F0 8021B0F0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s index 4580b10b21..4fffca3ee1 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B0FC_6A22FC.s @@ -22,17 +22,17 @@ glabel func_8021B0FC_6A22FC /* 6A2340 8021B140 AE220020 */ sw $v0, 0x20($s1) /* 6A2344 8021B144 8E050000 */ lw $a1, ($s0) /* 6A2348 8021B148 26100004 */ addiu $s0, $s0, 4 -/* 6A234C 8021B14C 0C0B210B */ jal get_float_variable +/* 6A234C 8021B14C 0C0B210B */ jal evt_get_float_variable /* 6A2350 8021B150 0240202D */ daddu $a0, $s2, $zero /* 6A2354 8021B154 E6200000 */ swc1 $f0, ($s1) /* 6A2358 8021B158 8E050000 */ lw $a1, ($s0) /* 6A235C 8021B15C 26100004 */ addiu $s0, $s0, 4 -/* 6A2360 8021B160 0C0B210B */ jal get_float_variable +/* 6A2360 8021B160 0C0B210B */ jal evt_get_float_variable /* 6A2364 8021B164 0240202D */ daddu $a0, $s2, $zero /* 6A2368 8021B168 E6200004 */ swc1 $f0, 4($s1) /* 6A236C 8021B16C 8E050000 */ lw $a1, ($s0) /* 6A2370 8021B170 26100004 */ addiu $s0, $s0, 4 -/* 6A2374 8021B174 0C0B210B */ jal get_float_variable +/* 6A2374 8021B174 0C0B210B */ jal evt_get_float_variable /* 6A2378 8021B178 0240202D */ daddu $a0, $s2, $zero /* 6A237C 8021B17C E6200008 */ swc1 $f0, 8($s1) /* 6A2380 8021B180 8E050000 */ lw $a1, ($s0) @@ -41,7 +41,7 @@ glabel func_8021B0FC_6A22FC /* 6A238C 8021B18C 0240202D */ daddu $a0, $s2, $zero /* 6A2390 8021B190 AE22001C */ sw $v0, 0x1c($s1) /* 6A2394 8021B194 8E050000 */ lw $a1, ($s0) -/* 6A2398 8021B198 0C0B210B */ jal get_float_variable +/* 6A2398 8021B198 0C0B210B */ jal evt_get_float_variable /* 6A239C 8021B19C 0240202D */ daddu $a0, $s2, $zero /* 6A23A0 8021B1A0 8E240020 */ lw $a0, 0x20($s1) /* 6A23A4 8021B1A4 0C04C3D6 */ jal get_item_entity diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s index 2388349394..c5d485a3d8 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B3B4_6A25B4.s @@ -70,7 +70,7 @@ glabel func_8021B3B4_6A25B4 /* 6A26A4 8021B4A4 3C068023 */ lui $a2, %hi(D_80229EBC_6B10BC) /* 6A26A8 8021B4A8 00C23021 */ addu $a2, $a2, $v0 /* 6A26AC 8021B4AC 8CC69EBC */ lw $a2, %lo(D_80229EBC_6B10BC)($a2) -/* 6A26B0 8021B4B0 0C0B2026 */ jal set_variable +/* 6A26B0 8021B4B0 0C0B2026 */ jal evt_set_variable /* 6A26B4 8021B4B4 0260202D */ daddu $a0, $s3, $zero /* 6A26B8 8021B4B8 82820001 */ lb $v0, 1($s4) /* 6A26BC 8021B4BC 8E250000 */ lw $a1, ($s1) @@ -89,7 +89,7 @@ glabel func_8021B3B4_6A25B4 /* 6A26EC 8021B4EC 3C068023 */ lui $a2, %hi(D_80229ED4_6B10D4) /* 6A26F0 8021B4F0 00C23021 */ addu $a2, $a2, $v0 /* 6A26F4 8021B4F4 8CC69ED4 */ lw $a2, %lo(D_80229ED4_6B10D4)($a2) -/* 6A26F8 8021B4F8 0C0B2026 */ jal set_variable +/* 6A26F8 8021B4F8 0C0B2026 */ jal evt_set_variable /* 6A26FC 8021B4FC 0260202D */ daddu $a0, $s3, $zero /* 6A2700 8021B500 82A20000 */ lb $v0, ($s5) /* 6A2704 8021B504 8E250000 */ lw $a1, ($s1) @@ -103,13 +103,13 @@ glabel func_8021B3B4_6A25B4 /* 6A2720 8021B520 8E250000 */ lw $a1, ($s1) /* 6A2724 8021B524 26310004 */ addiu $s1, $s1, 4 /* 6A2728 8021B528 0260202D */ daddu $a0, $s3, $zero -/* 6A272C 8021B52C 0C0B2026 */ jal set_variable +/* 6A272C 8021B52C 0C0B2026 */ jal evt_set_variable /* 6A2730 8021B530 2406016C */ addiu $a2, $zero, 0x16c /* 6A2734 8021B534 0260202D */ daddu $a0, $s3, $zero /* 6A2738 8021B538 8E250000 */ lw $a1, ($s1) /* 6A273C 8021B53C 2406004F */ addiu $a2, $zero, 0x4f .L8021B540: -/* 6A2740 8021B540 0C0B2026 */ jal set_variable +/* 6A2740 8021B540 0C0B2026 */ jal evt_set_variable /* 6A2744 8021B544 00000000 */ nop .L8021B548: /* 6A2748 8021B548 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s index a73b25224c..d13da10d19 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B570_6A2770.s @@ -36,7 +36,7 @@ glabel func_8021B570_6A2770 /* 6A27E0 8021B5E0 8E050000 */ lw $a1, ($s0) /* 6A27E4 8021B5E4 2406FFFF */ addiu $a2, $zero, -1 .L8021B5E8: -/* 6A27E8 8021B5E8 0C0B2026 */ jal set_variable +/* 6A27E8 8021B5E8 0C0B2026 */ jal evt_set_variable /* 6A27EC 8021B5EC 00000000 */ nop /* 6A27F0 8021B5F0 24020002 */ addiu $v0, $zero, 2 /* 6A27F4 8021B5F4 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s index a0c0a51d77..87847e4a00 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s @@ -54,7 +54,7 @@ glabel func_8021B9A8_6A2BA8 /* 6A2C6C 8021BA6C 0220202D */ daddu $a0, $s1, $zero /* 6A2C70 8021BA70 0220202D */ daddu $a0, $s1, $zero /* 6A2C74 8021BA74 8E050000 */ lw $a1, ($s0) -/* 6A2C78 8021BA78 0C0B210B */ jal get_float_variable +/* 6A2C78 8021BA78 0C0B210B */ jal evt_get_float_variable /* 6A2C7C 8021BA7C 0040B02D */ daddu $s6, $v0, $zero /* 6A2C80 8021BA80 82430210 */ lb $v1, 0x210($s2) /* 6A2C84 8021BA84 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s index ac2669ba5a..30723d35a6 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s @@ -47,11 +47,11 @@ glabel func_8021C14C_6A334C /* 6A33F4 8021C1F4 4482C000 */ mtc1 $v0, $f24 /* 6A33F8 8021C1F8 00000000 */ nop /* 6A33FC 8021C1FC 4680C620 */ cvt.s.w $f24, $f24 -/* 6A3400 8021C200 0C0B210B */ jal get_float_variable +/* 6A3400 8021C200 0C0B210B */ jal evt_get_float_variable /* 6A3404 8021C204 0220202D */ daddu $a0, $s1, $zero /* 6A3408 8021C208 0220202D */ daddu $a0, $s1, $zero /* 6A340C 8021C20C 8E050000 */ lw $a1, ($s0) -/* 6A3410 8021C210 0C0B210B */ jal get_float_variable +/* 6A3410 8021C210 0C0B210B */ jal evt_get_float_variable /* 6A3414 8021C214 46000506 */ mov.s $f20, $f0 /* 6A3418 8021C218 240400B4 */ addiu $a0, $zero, 0xb4 /* 6A341C 8021C21C 0C00AB39 */ jal heap_malloc diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s index c0f181fd6b..76313e49af 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s @@ -45,7 +45,7 @@ glabel func_8021C520_6A3720 /* 6A37C0 8021C5C0 4482B000 */ mtc1 $v0, $f22 /* 6A37C4 8021C5C4 00000000 */ nop /* 6A37C8 8021C5C8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 6A37CC 8021C5CC 0C0B210B */ jal get_float_variable +/* 6A37CC 8021C5CC 0C0B210B */ jal evt_get_float_variable /* 6A37D0 8021C5D0 0220202D */ daddu $a0, $s1, $zero /* 6A37D4 8021C5D4 82830210 */ lb $v1, 0x210($s4) /* 6A37D8 8021C5D8 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s index 6f244952e9..698ae53f1a 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C9D4_6A3BD4.s @@ -26,7 +26,7 @@ glabel func_8021C9D4_6A3BD4 .L8021CA24: /* 6A3C24 8021CA24 00003012 */ mflo $a2 /* 6A3C28 8021CA28 8C82000C */ lw $v0, 0xc($a0) -/* 6A3C2C 8021CA2C 0C0B2026 */ jal set_variable +/* 6A3C2C 8021CA2C 0C0B2026 */ jal evt_set_variable /* 6A3C30 8021CA30 8C450000 */ lw $a1, ($v0) /* 6A3C34 8021CA34 8FBF0010 */ lw $ra, 0x10($sp) /* 6A3C38 8021CA38 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s index b5798463ae..9f2dd7c4e6 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CA44_6A3C44.s @@ -22,17 +22,17 @@ glabel func_8021CA44_6A3C44 /* 6A3C88 8021CA88 AE220020 */ sw $v0, 0x20($s1) /* 6A3C8C 8021CA8C 8E050000 */ lw $a1, ($s0) /* 6A3C90 8021CA90 26100004 */ addiu $s0, $s0, 4 -/* 6A3C94 8021CA94 0C0B210B */ jal get_float_variable +/* 6A3C94 8021CA94 0C0B210B */ jal evt_get_float_variable /* 6A3C98 8021CA98 0240202D */ daddu $a0, $s2, $zero /* 6A3C9C 8021CA9C E6200000 */ swc1 $f0, ($s1) /* 6A3CA0 8021CAA0 8E050000 */ lw $a1, ($s0) /* 6A3CA4 8021CAA4 26100004 */ addiu $s0, $s0, 4 -/* 6A3CA8 8021CAA8 0C0B210B */ jal get_float_variable +/* 6A3CA8 8021CAA8 0C0B210B */ jal evt_get_float_variable /* 6A3CAC 8021CAAC 0240202D */ daddu $a0, $s2, $zero /* 6A3CB0 8021CAB0 E6200004 */ swc1 $f0, 4($s1) /* 6A3CB4 8021CAB4 8E050000 */ lw $a1, ($s0) /* 6A3CB8 8021CAB8 26100004 */ addiu $s0, $s0, 4 -/* 6A3CBC 8021CABC 0C0B210B */ jal get_float_variable +/* 6A3CBC 8021CABC 0C0B210B */ jal evt_get_float_variable /* 6A3CC0 8021CAC0 0240202D */ daddu $a0, $s2, $zero /* 6A3CC4 8021CAC4 E6200008 */ swc1 $f0, 8($s1) /* 6A3CC8 8021CAC8 8E050000 */ lw $a1, ($s0) @@ -41,7 +41,7 @@ glabel func_8021CA44_6A3C44 /* 6A3CD4 8021CAD4 0240202D */ daddu $a0, $s2, $zero /* 6A3CD8 8021CAD8 AE22001C */ sw $v0, 0x1c($s1) /* 6A3CDC 8021CADC 8E050000 */ lw $a1, ($s0) -/* 6A3CE0 8021CAE0 0C0B210B */ jal get_float_variable +/* 6A3CE0 8021CAE0 0C0B210B */ jal evt_get_float_variable /* 6A3CE4 8021CAE4 0240202D */ daddu $a0, $s2, $zero /* 6A3CE8 8021CAE8 8E240020 */ lw $a0, 0x20($s1) /* 6A3CEC 8021CAEC 0C04C3D6 */ jal get_item_entity diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CC5C_6A3E5C.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CC5C_6A3E5C.s index 23a061f08f..29a867be1e 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CC5C_6A3E5C.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CC5C_6A3E5C.s @@ -20,20 +20,20 @@ glabel func_8021CC5C_6A3E5C /* 6A3E98 8021CC98 C6200008 */ lwc1 $f0, 8($s1) /* 6A3E9C 8021CC9C 4600008D */ trunc.w.s $f2, $f0 /* 6A3EA0 8021CCA0 44061000 */ mfc1 $a2, $f2 -/* 6A3EA4 8021CCA4 0C0B2026 */ jal set_variable +/* 6A3EA4 8021CCA4 0C0B2026 */ jal evt_set_variable /* 6A3EA8 8021CCA8 0240202D */ daddu $a0, $s2, $zero /* 6A3EAC 8021CCAC 8E050000 */ lw $a1, ($s0) /* 6A3EB0 8021CCB0 26100004 */ addiu $s0, $s0, 4 /* 6A3EB4 8021CCB4 C620000C */ lwc1 $f0, 0xc($s1) /* 6A3EB8 8021CCB8 4600008D */ trunc.w.s $f2, $f0 /* 6A3EBC 8021CCBC 44061000 */ mfc1 $a2, $f2 -/* 6A3EC0 8021CCC0 0C0B2026 */ jal set_variable +/* 6A3EC0 8021CCC0 0C0B2026 */ jal evt_set_variable /* 6A3EC4 8021CCC4 0240202D */ daddu $a0, $s2, $zero /* 6A3EC8 8021CCC8 C6200010 */ lwc1 $f0, 0x10($s1) /* 6A3ECC 8021CCCC 8E050000 */ lw $a1, ($s0) /* 6A3ED0 8021CCD0 4600008D */ trunc.w.s $f2, $f0 /* 6A3ED4 8021CCD4 44061000 */ mfc1 $a2, $f2 -/* 6A3ED8 8021CCD8 0C0B2026 */ jal set_variable +/* 6A3ED8 8021CCD8 0C0B2026 */ jal evt_set_variable /* 6A3EDC 8021CCDC 0240202D */ daddu $a0, $s2, $zero /* 6A3EE0 8021CCE0 8FBF001C */ lw $ra, 0x1c($sp) /* 6A3EE4 8021CCE4 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s index f467622b33..99f7f94ad9 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CCFC_6A3EFC.s @@ -70,7 +70,7 @@ glabel func_8021CCFC_6A3EFC /* 6A3FEC 8021CDEC 3C068023 */ lui $a2, %hi(D_80230B28_6B7D28) /* 6A3FF0 8021CDF0 00C23021 */ addu $a2, $a2, $v0 /* 6A3FF4 8021CDF4 8CC60B28 */ lw $a2, %lo(D_80230B28_6B7D28)($a2) -/* 6A3FF8 8021CDF8 0C0B2026 */ jal set_variable +/* 6A3FF8 8021CDF8 0C0B2026 */ jal evt_set_variable /* 6A3FFC 8021CDFC 0260202D */ daddu $a0, $s3, $zero /* 6A4000 8021CE00 82820001 */ lb $v0, 1($s4) /* 6A4004 8021CE04 8E250000 */ lw $a1, ($s1) @@ -89,7 +89,7 @@ glabel func_8021CCFC_6A3EFC /* 6A4034 8021CE34 3C068023 */ lui $a2, %hi(D_80230B40_6B7D40) /* 6A4038 8021CE38 00C23021 */ addu $a2, $a2, $v0 /* 6A403C 8021CE3C 8CC60B40 */ lw $a2, %lo(D_80230B40_6B7D40)($a2) -/* 6A4040 8021CE40 0C0B2026 */ jal set_variable +/* 6A4040 8021CE40 0C0B2026 */ jal evt_set_variable /* 6A4044 8021CE44 0260202D */ daddu $a0, $s3, $zero /* 6A4048 8021CE48 82A20000 */ lb $v0, ($s5) /* 6A404C 8021CE4C 8E250000 */ lw $a1, ($s1) @@ -103,13 +103,13 @@ glabel func_8021CCFC_6A3EFC /* 6A4068 8021CE68 8E250000 */ lw $a1, ($s1) /* 6A406C 8021CE6C 26310004 */ addiu $s1, $s1, 4 /* 6A4070 8021CE70 0260202D */ daddu $a0, $s3, $zero -/* 6A4074 8021CE74 0C0B2026 */ jal set_variable +/* 6A4074 8021CE74 0C0B2026 */ jal evt_set_variable /* 6A4078 8021CE78 2406016C */ addiu $a2, $zero, 0x16c /* 6A407C 8021CE7C 0260202D */ daddu $a0, $s3, $zero /* 6A4080 8021CE80 8E250000 */ lw $a1, ($s1) /* 6A4084 8021CE84 2406004F */ addiu $a2, $zero, 0x4f .L8021CE88: -/* 6A4088 8021CE88 0C0B2026 */ jal set_variable +/* 6A4088 8021CE88 0C0B2026 */ jal evt_set_variable /* 6A408C 8021CE8C 00000000 */ nop .L8021CE90: /* 6A4090 8021CE90 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s index 47cb8ebcf2..ae6b299fd0 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CEB8_6A40B8.s @@ -36,7 +36,7 @@ glabel func_8021CEB8_6A40B8 /* 6A4128 8021CF28 8E050000 */ lw $a1, ($s0) /* 6A412C 8021CF2C 2406FFFF */ addiu $a2, $zero, -1 .L8021CF30: -/* 6A4130 8021CF30 0C0B2026 */ jal set_variable +/* 6A4130 8021CF30 0C0B2026 */ jal evt_set_variable /* 6A4134 8021CF34 00000000 */ nop /* 6A4138 8021CF38 24020002 */ addiu $v0, $zero, 2 /* 6A413C 8021CF3C 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218B60_6BC6F0.s b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218B60_6BC6F0.s index b62370126a..b298303a43 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218B60_6BC6F0.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218B60_6BC6F0.s @@ -19,7 +19,7 @@ glabel func_80218B60_6BC6F0 /* 6BC728 80218B98 E7A00010 */ swc1 $f0, 0x10($sp) /* 6BC72C 80218B9C 0200202D */ daddu $a0, $s0, $zero /* 6BC730 80218BA0 8E250000 */ lw $a1, ($s1) -/* 6BC734 80218BA4 0C0B2026 */ jal set_variable +/* 6BC734 80218BA4 0C0B2026 */ jal evt_set_variable /* 6BC738 80218BA8 0040302D */ daddu $a2, $v0, $zero /* 6BC73C 80218BAC 8FBF0020 */ lw $ra, 0x20($sp) /* 6BC740 80218BB0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219588_6BD118.s b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219588_6BD118.s index b7c0d19396..5565bfa785 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219588_6BD118.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219588_6BD118.s @@ -13,14 +13,14 @@ glabel func_80219588_6BD118 /* 6BD138 802195A8 8E50000C */ lw $s0, 0xc($s2) /* 6BD13C 802195AC 82260012 */ lb $a2, 0x12($s1) /* 6BD140 802195B0 8E050000 */ lw $a1, ($s0) -/* 6BD144 802195B4 0C0B2026 */ jal set_variable +/* 6BD144 802195B4 0C0B2026 */ jal evt_set_variable /* 6BD148 802195B8 26100004 */ addiu $s0, $s0, 4 /* 6BD14C 802195BC 82220012 */ lb $v0, 0x12($s1) /* 6BD150 802195C0 8E050000 */ lw $a1, ($s0) /* 6BD154 802195C4 000210C0 */ sll $v0, $v0, 3 /* 6BD158 802195C8 00511021 */ addu $v0, $v0, $s1 /* 6BD15C 802195CC 80460015 */ lb $a2, 0x15($v0) -/* 6BD160 802195D0 0C0B2026 */ jal set_variable +/* 6BD160 802195D0 0C0B2026 */ jal evt_set_variable /* 6BD164 802195D4 0240202D */ daddu $a0, $s2, $zero /* 6BD168 802195D8 8FBF001C */ lw $ra, 0x1c($sp) /* 6BD16C 802195DC 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s b/ver/us/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s index 043fe1b768..d2841384f5 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa4/6CC1C0/func_80218588_6CC5F8.s @@ -48,7 +48,7 @@ glabel func_80218588_6CC5F8 /* 6CC694 80218624 8E050000 */ lw $a1, ($s0) /* 6CC698 80218628 0000302D */ daddu $a2, $zero, $zero .L8021862C: -/* 6CC69C 8021862C 0C0B2026 */ jal set_variable +/* 6CC69C 8021862C 0C0B2026 */ jal evt_set_variable /* 6CC6A0 80218630 00000000 */ nop /* 6CC6A4 80218634 8FBF0018 */ lw $ra, 0x18($sp) /* 6CC6A8 80218638 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s b/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s index c77f9b3c7c..18702c4bd9 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s @@ -34,7 +34,7 @@ glabel func_802181FC_58C4EC /* 58C560 80218270 8E050000 */ lw $a1, ($s0) /* 58C564 80218274 26100004 */ addiu $s0, $s0, 4 /* 58C568 80218278 0220202D */ daddu $a0, $s1, $zero -/* 58C56C 8021827C 0C0B210B */ jal get_float_variable +/* 58C56C 8021827C 0C0B210B */ jal evt_get_float_variable /* 58C570 80218280 0040A02D */ daddu $s4, $v0, $zero /* 58C574 80218284 8E050000 */ lw $a1, ($s0) /* 58C578 80218288 26100004 */ addiu $s0, $s0, 4 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s b/ver/us/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s index d8dd35d906..e736a38b89 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s @@ -29,7 +29,7 @@ glabel func_8021851C_58C80C /* 58C86C 8021857C 0040982D */ daddu $s3, $v0, $zero /* 58C870 80218580 0220202D */ daddu $a0, $s1, $zero /* 58C874 80218584 8E050000 */ lw $a1, ($s0) -/* 58C878 80218588 0C0B210B */ jal get_float_variable +/* 58C878 80218588 0C0B210B */ jal evt_get_float_variable /* 58C87C 8021858C 0040802D */ daddu $s0, $v0, $zero /* 58C880 80218590 3C0140C9 */ lui $at, 0x40c9 /* 58C884 80218594 34210FD8 */ ori $at, $at, 0xfd8 @@ -58,7 +58,7 @@ glabel func_8021851C_58C80C /* 58C8E0 802185F0 0220202D */ daddu $a0, $s1, $zero /* 58C8E4 802185F4 4600A28D */ trunc.w.s $f10, $f20 /* 58C8E8 802185F8 44065000 */ mfc1 $a2, $f10 -/* 58C8EC 802185FC 0C0B2026 */ jal set_variable +/* 58C8EC 802185FC 0C0B2026 */ jal evt_set_variable /* 58C8F0 80218600 0280282D */ daddu $a1, $s4, $zero /* 58C8F4 80218604 8FBF0024 */ lw $ra, 0x24($sp) /* 58C8F8 80218608 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn/58C920/func_802188D8_58CBC8.s b/ver/us/asm/nonmatchings/battle/area_kzn/58C920/func_802188D8_58CBC8.s index 11f848ec12..f63dc51d0b 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn/58C920/func_802188D8_58CBC8.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn/58C920/func_802188D8_58CBC8.s @@ -48,7 +48,7 @@ glabel func_802188D8_58CBC8 /* 58CC64 80218974 8E050000 */ lw $a1, ($s0) /* 58CC68 80218978 0000302D */ daddu $a2, $zero, $zero .L8021897C: -/* 58CC6C 8021897C 0C0B2026 */ jal set_variable +/* 58CC6C 8021897C 0C0B2026 */ jal evt_set_variable /* 58CC70 80218980 00000000 */ nop /* 58CC74 80218984 8FBF0018 */ lw $ra, 0x18($sp) /* 58CC78 80218988 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn/58CC90/func_80218C48_58CF38.s b/ver/us/asm/nonmatchings/battle/area_kzn/58CC90/func_80218C48_58CF38.s index 603624af81..86e76440fa 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn/58CC90/func_80218C48_58CF38.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn/58CC90/func_80218C48_58CF38.s @@ -48,7 +48,7 @@ glabel func_80218C48_58CF38 /* 58CFD4 80218CE4 8E050000 */ lw $a1, ($s0) /* 58CFD8 80218CE8 0000302D */ daddu $a2, $zero, $zero .L80218CEC: -/* 58CFDC 80218CEC 0C0B2026 */ jal set_variable +/* 58CFDC 80218CEC 0C0B2026 */ jal evt_set_variable /* 58CFE0 80218CF0 00000000 */ nop /* 58CFE4 80218CF4 8FBF0018 */ lw $ra, 0x18($sp) /* 58CFE8 80218CF8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218058_59E738.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218058_59E738.s index 3aec9acd19..e893ab6094 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218058_59E738.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218058_59E738.s @@ -31,17 +31,17 @@ glabel func_80218058_59E738 /* 59E79C 802180BC 24050001 */ addiu $a1, $zero, 1 /* 59E7A0 802180C0 0220202D */ daddu $a0, $s1, $zero /* 59E7A4 802180C4 3C05FE36 */ lui $a1, 0xfe36 -/* 59E7A8 802180C8 0C0B210B */ jal get_float_variable +/* 59E7A8 802180C8 0C0B210B */ jal evt_get_float_variable /* 59E7AC 802180CC 34A53C81 */ ori $a1, $a1, 0x3c81 /* 59E7B0 802180D0 0220202D */ daddu $a0, $s1, $zero /* 59E7B4 802180D4 3C05FE36 */ lui $a1, 0xfe36 /* 59E7B8 802180D8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 59E7BC 802180DC 0C0B210B */ jal get_float_variable +/* 59E7BC 802180DC 0C0B210B */ jal evt_get_float_variable /* 59E7C0 802180E0 E6000098 */ swc1 $f0, 0x98($s0) /* 59E7C4 802180E4 0220202D */ daddu $a0, $s1, $zero /* 59E7C8 802180E8 3C05FE36 */ lui $a1, 0xfe36 /* 59E7CC 802180EC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 59E7D0 802180F0 0C0B210B */ jal get_float_variable +/* 59E7D0 802180F0 0C0B210B */ jal evt_get_float_variable /* 59E7D4 802180F4 E600009C */ swc1 $f0, 0x9c($s0) /* 59E7D8 802180F8 E60000A0 */ swc1 $f0, 0xa0($s0) /* 59E7DC 802180FC 2610000C */ addiu $s0, $s0, 0xc diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B38_59F218.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B38_59F218.s index 730b3a95b3..77daa78037 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B38_59F218.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B38_59F218.s @@ -16,7 +16,7 @@ glabel func_80218B38_59F218 /* 59F244 80218B64 3C068022 */ lui $a2, %hi(D_80222D48_5A9428) /* 59F248 80218B68 00C23021 */ addu $a2, $a2, $v0 /* 59F24C 80218B6C 8CC62D48 */ lw $a2, %lo(D_80222D48_5A9428)($a2) -/* 59F250 80218B70 0C0B2026 */ jal set_variable +/* 59F250 80218B70 0C0B2026 */ jal evt_set_variable /* 59F254 80218B74 0220202D */ daddu $a0, $s1, $zero /* 59F258 80218B78 8FBF0018 */ lw $ra, 0x18($sp) /* 59F25C 80218B7C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B90_59F270.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B90_59F270.s index 9658b6de60..812c191ef6 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B90_59F270.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B90_59F270.s @@ -16,7 +16,7 @@ glabel func_80218B90_59F270 /* 59F29C 80218BBC 3C068022 */ lui $a2, %hi(D_80222E20_5A9500) /* 59F2A0 80218BC0 00C23021 */ addu $a2, $a2, $v0 /* 59F2A4 80218BC4 8CC62E20 */ lw $a2, %lo(D_80222E20_5A9500)($a2) -/* 59F2A8 80218BC8 0C0B2026 */ jal set_variable +/* 59F2A8 80218BC8 0C0B2026 */ jal evt_set_variable /* 59F2AC 80218BCC 0220202D */ daddu $a0, $s1, $zero /* 59F2B0 80218BD0 8FBF0018 */ lw $ra, 0x18($sp) /* 59F2B4 80218BD4 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s index 7bd1475770..cf46f62093 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s @@ -67,11 +67,11 @@ glabel func_80218BE8_59F2C8 /* 59F3C0 80218CE0 0240202D */ daddu $a0, $s2, $zero /* 59F3C4 80218CE4 4600110D */ trunc.w.s $f4, $f2 /* 59F3C8 80218CE8 44142000 */ mfc1 $s4, $f4 -/* 59F3CC 80218CEC 0C0B2026 */ jal set_variable +/* 59F3CC 80218CEC 0C0B2026 */ jal evt_set_variable /* 59F3D0 80218CF0 02A0302D */ daddu $a2, $s5, $zero /* 59F3D4 80218CF4 0240202D */ daddu $a0, $s2, $zero /* 59F3D8 80218CF8 8E050000 */ lw $a1, ($s0) -/* 59F3DC 80218CFC 0C0B2026 */ jal set_variable +/* 59F3DC 80218CFC 0C0B2026 */ jal evt_set_variable /* 59F3E0 80218D00 0280302D */ daddu $a2, $s4, $zero /* 59F3E4 80218D04 8FBF0028 */ lw $ra, 0x28($sp) /* 59F3E8 80218D08 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D40_59F420.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D40_59F420.s index 3b594bb227..de977ba731 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D40_59F420.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59F420/func_80218D40_59F420.s @@ -13,7 +13,7 @@ glabel func_80218D40_59F420 /* 59F440 80218D60 26100004 */ addiu $s0, $s0, 4 /* 59F444 80218D64 8E050000 */ lw $a1, ($s0) /* 59F448 80218D68 8C50000C */ lw $s0, 0xc($v0) -/* 59F44C 80218D6C 0C0B210B */ jal get_float_variable +/* 59F44C 80218D6C 0C0B210B */ jal evt_get_float_variable /* 59F450 80218D70 0220202D */ daddu $a0, $s1, $zero /* 59F454 80218D74 E600002C */ swc1 $f0, 0x2c($s0) /* 59F458 80218D78 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59F4D0/func_80218DF0_59F4D0.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59F4D0/func_80218DF0_59F4D0.s index 933adc8a10..adeb626e3f 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59F4D0/func_80218DF0_59F4D0.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59F4D0/func_80218DF0_59F4D0.s @@ -13,7 +13,7 @@ glabel func_80218DF0_59F4D0 /* 59F4F0 80218E10 26100004 */ addiu $s0, $s0, 4 /* 59F4F4 80218E14 8E050000 */ lw $a1, ($s0) /* 59F4F8 80218E18 8C50000C */ lw $s0, 0xc($v0) -/* 59F4FC 80218E1C 0C0B210B */ jal get_float_variable +/* 59F4FC 80218E1C 0C0B210B */ jal evt_get_float_variable /* 59F500 80218E20 0220202D */ daddu $a0, $s1, $zero /* 59F504 80218E24 E600002C */ swc1 $f0, 0x2c($s0) /* 59F508 80218E28 E6000030 */ swc1 $f0, 0x30($s0) diff --git a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218D90_465220.s b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218D90_465220.s index 3a6a555b9f..72dab1c4a2 100644 --- a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218D90_465220.s +++ b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218D90_465220.s @@ -19,7 +19,7 @@ glabel func_80218D90_465220 /* 465258 80218DC8 E7A00010 */ swc1 $f0, 0x10($sp) /* 46525C 80218DCC 0200202D */ daddu $a0, $s0, $zero /* 465260 80218DD0 8E250000 */ lw $a1, ($s1) -/* 465264 80218DD4 0C0B2026 */ jal set_variable +/* 465264 80218DD4 0C0B2026 */ jal evt_set_variable /* 465268 80218DD8 0040302D */ daddu $a2, $v0, $zero /* 46526C 80218DDC 8FBF0020 */ lw $ra, 0x20($sp) /* 465270 80218DE0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_802197B8_465C48.s b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_802197B8_465C48.s index db40009011..b2d0201921 100644 --- a/ver/us/asm/nonmatchings/battle/area_mac/464560/func_802197B8_465C48.s +++ b/ver/us/asm/nonmatchings/battle/area_mac/464560/func_802197B8_465C48.s @@ -13,14 +13,14 @@ glabel func_802197B8_465C48 /* 465C68 802197D8 8E50000C */ lw $s0, 0xc($s2) /* 465C6C 802197DC 82260012 */ lb $a2, 0x12($s1) /* 465C70 802197E0 8E050000 */ lw $a1, ($s0) -/* 465C74 802197E4 0C0B2026 */ jal set_variable +/* 465C74 802197E4 0C0B2026 */ jal evt_set_variable /* 465C78 802197E8 26100004 */ addiu $s0, $s0, 4 /* 465C7C 802197EC 82220012 */ lb $v0, 0x12($s1) /* 465C80 802197F0 8E050000 */ lw $a1, ($s0) /* 465C84 802197F4 000210C0 */ sll $v0, $v0, 3 /* 465C88 802197F8 00511021 */ addu $v0, $v0, $s1 /* 465C8C 802197FC 80460015 */ lb $a2, 0x15($v0) -/* 465C90 80219800 0C0B2026 */ jal set_variable +/* 465C90 80219800 0C0B2026 */ jal evt_set_variable /* 465C94 80219804 0240202D */ daddu $a0, $s2, $zero /* 465C98 80219808 8FBF001C */ lw $ra, 0x1c($sp) /* 465C9C 8021980C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s b/ver/us/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s index 3dda593692..209e94d84a 100644 --- a/ver/us/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s +++ b/ver/us/asm/nonmatchings/battle/area_mim/4F7D50/func_8021823C_4F7E1C.s @@ -56,11 +56,11 @@ glabel func_8021823C_4F7E1C /* 4F7EE8 80218308 4494A000 */ mtc1 $s4, $f20 /* 4F7EEC 8021830C 00000000 */ nop /* 4F7EF0 80218310 4680A520 */ cvt.s.w $f20, $f20 -/* 4F7EF4 80218314 0C0B2190 */ jal set_float_variable +/* 4F7EF4 80218314 0C0B2190 */ jal evt_set_float_variable /* 4F7EF8 80218318 4616A501 */ sub.s $f20, $f20, $f22 /* 4F7EFC 8021831C 8E050000 */ lw $a1, ($s0) /* 4F7F00 80218320 4406A000 */ mfc1 $a2, $f20 -/* 4F7F04 80218324 0C0B2190 */ jal set_float_variable +/* 4F7F04 80218324 0C0B2190 */ jal evt_set_float_variable /* 4F7F08 80218328 0220202D */ daddu $a0, $s1, $zero /* 4F7F0C 8021832C 8FBF0024 */ lw $ra, 0x24($sp) /* 4F7F10 80218330 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s b/ver/us/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s index 2a9a91ce7c..c5a2e0ae1b 100644 --- a/ver/us/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s +++ b/ver/us/asm/nonmatchings/battle/area_nok/48DCF0/func_80218C74_48DE14.s @@ -70,21 +70,21 @@ glabel func_80218C74_48DE14 /* 48DF18 80218D78 0240302D */ daddu $a2, $s2, $zero /* 48DF1C 80218D7C 4600C08D */ trunc.w.s $f2, $f24 /* 48DF20 80218D80 44121000 */ mfc1 $s2, $f2 -/* 48DF24 80218D84 0C0B2026 */ jal set_variable +/* 48DF24 80218D84 0C0B2026 */ jal evt_set_variable /* 48DF28 80218D88 0220202D */ daddu $a0, $s1, $zero /* 48DF2C 80218D8C 8E050000 */ lw $a1, ($s0) /* 48DF30 80218D90 26100004 */ addiu $s0, $s0, 4 /* 48DF34 80218D94 0220202D */ daddu $a0, $s1, $zero -/* 48DF38 80218D98 0C0B2026 */ jal set_variable +/* 48DF38 80218D98 0C0B2026 */ jal evt_set_variable /* 48DF3C 80218D9C 0260302D */ daddu $a2, $s3, $zero /* 48DF40 80218DA0 8E050000 */ lw $a1, ($s0) /* 48DF44 80218DA4 26100004 */ addiu $s0, $s0, 4 /* 48DF48 80218DA8 0220202D */ daddu $a0, $s1, $zero -/* 48DF4C 80218DAC 0C0B2026 */ jal set_variable +/* 48DF4C 80218DAC 0C0B2026 */ jal evt_set_variable /* 48DF50 80218DB0 0280302D */ daddu $a2, $s4, $zero /* 48DF54 80218DB4 0220202D */ daddu $a0, $s1, $zero /* 48DF58 80218DB8 8E050000 */ lw $a1, ($s0) -/* 48DF5C 80218DBC 0C0B2026 */ jal set_variable +/* 48DF5C 80218DBC 0C0B2026 */ jal evt_set_variable /* 48DF60 80218DC0 0240302D */ daddu $a2, $s2, $zero /* 48DF64 80218DC4 8FBF0024 */ lw $ra, 0x24($sp) /* 48DF68 80218DC8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_omo/512C90/func_8021878C_512D5C.s b/ver/us/asm/nonmatchings/battle/area_omo/512C90/func_8021878C_512D5C.s index 2ec1e8cc3c..5afe235212 100644 --- a/ver/us/asm/nonmatchings/battle/area_omo/512C90/func_8021878C_512D5C.s +++ b/ver/us/asm/nonmatchings/battle/area_omo/512C90/func_8021878C_512D5C.s @@ -28,7 +28,7 @@ glabel func_8021878C_512D5C /* 512DB8 802187E8 8E050000 */ lw $a1, ($s0) /* 512DBC 802187EC 26100004 */ addiu $s0, $s0, 4 /* 512DC0 802187F0 0220202D */ daddu $a0, $s1, $zero -/* 512DC4 802187F4 0C0B210B */ jal get_float_variable +/* 512DC4 802187F4 0C0B210B */ jal evt_get_float_variable /* 512DC8 802187F8 0040902D */ daddu $s2, $v0, $zero /* 512DCC 802187FC 0220202D */ daddu $a0, $s1, $zero /* 512DD0 80218800 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218880_512E50.s b/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218880_512E50.s index af13d39c7c..7ea5873cf9 100644 --- a/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218880_512E50.s +++ b/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218880_512E50.s @@ -22,17 +22,17 @@ glabel func_80218880_512E50 /* 512E94 802188C4 AE220020 */ sw $v0, 0x20($s1) /* 512E98 802188C8 8E050000 */ lw $a1, ($s0) /* 512E9C 802188CC 26100004 */ addiu $s0, $s0, 4 -/* 512EA0 802188D0 0C0B210B */ jal get_float_variable +/* 512EA0 802188D0 0C0B210B */ jal evt_get_float_variable /* 512EA4 802188D4 0240202D */ daddu $a0, $s2, $zero /* 512EA8 802188D8 E6200000 */ swc1 $f0, ($s1) /* 512EAC 802188DC 8E050000 */ lw $a1, ($s0) /* 512EB0 802188E0 26100004 */ addiu $s0, $s0, 4 -/* 512EB4 802188E4 0C0B210B */ jal get_float_variable +/* 512EB4 802188E4 0C0B210B */ jal evt_get_float_variable /* 512EB8 802188E8 0240202D */ daddu $a0, $s2, $zero /* 512EBC 802188EC E6200004 */ swc1 $f0, 4($s1) /* 512EC0 802188F0 8E050000 */ lw $a1, ($s0) /* 512EC4 802188F4 26100004 */ addiu $s0, $s0, 4 -/* 512EC8 802188F8 0C0B210B */ jal get_float_variable +/* 512EC8 802188F8 0C0B210B */ jal evt_get_float_variable /* 512ECC 802188FC 0240202D */ daddu $a0, $s2, $zero /* 512ED0 80218900 E6200008 */ swc1 $f0, 8($s1) /* 512ED4 80218904 8E050000 */ lw $a1, ($s0) @@ -41,7 +41,7 @@ glabel func_80218880_512E50 /* 512EE0 80218910 0240202D */ daddu $a0, $s2, $zero /* 512EE4 80218914 AE22001C */ sw $v0, 0x1c($s1) /* 512EE8 80218918 8E050000 */ lw $a1, ($s0) -/* 512EEC 8021891C 0C0B210B */ jal get_float_variable +/* 512EEC 8021891C 0C0B210B */ jal evt_get_float_variable /* 512EF0 80218920 0240202D */ daddu $a0, $s2, $zero /* 512EF4 80218924 8E240020 */ lw $a0, 0x20($s1) /* 512EF8 80218928 0C04C3D6 */ jal get_item_entity diff --git a/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218B38_513108.s b/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218B38_513108.s index 7e77042f42..51fcf2b6a8 100644 --- a/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218B38_513108.s +++ b/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218B38_513108.s @@ -70,7 +70,7 @@ glabel func_80218B38_513108 /* 5131F8 80218C28 3C068023 */ lui $a2, %hi(D_80228748_522D18) /* 5131FC 80218C2C 00C23021 */ addu $a2, $a2, $v0 /* 513200 80218C30 8CC68748 */ lw $a2, %lo(D_80228748_522D18)($a2) -/* 513204 80218C34 0C0B2026 */ jal set_variable +/* 513204 80218C34 0C0B2026 */ jal evt_set_variable /* 513208 80218C38 0260202D */ daddu $a0, $s3, $zero /* 51320C 80218C3C 82820001 */ lb $v0, 1($s4) /* 513210 80218C40 8E250000 */ lw $a1, ($s1) @@ -89,7 +89,7 @@ glabel func_80218B38_513108 /* 513240 80218C70 3C068023 */ lui $a2, %hi(D_80228760_522D30) /* 513244 80218C74 00C23021 */ addu $a2, $a2, $v0 /* 513248 80218C78 8CC68760 */ lw $a2, %lo(D_80228760_522D30)($a2) -/* 51324C 80218C7C 0C0B2026 */ jal set_variable +/* 51324C 80218C7C 0C0B2026 */ jal evt_set_variable /* 513250 80218C80 0260202D */ daddu $a0, $s3, $zero /* 513254 80218C84 82A20000 */ lb $v0, ($s5) /* 513258 80218C88 8E250000 */ lw $a1, ($s1) @@ -103,13 +103,13 @@ glabel func_80218B38_513108 /* 513274 80218CA4 8E250000 */ lw $a1, ($s1) /* 513278 80218CA8 26310004 */ addiu $s1, $s1, 4 /* 51327C 80218CAC 0260202D */ daddu $a0, $s3, $zero -/* 513280 80218CB0 0C0B2026 */ jal set_variable +/* 513280 80218CB0 0C0B2026 */ jal evt_set_variable /* 513284 80218CB4 2406016C */ addiu $a2, $zero, 0x16c /* 513288 80218CB8 0260202D */ daddu $a0, $s3, $zero /* 51328C 80218CBC 8E250000 */ lw $a1, ($s1) /* 513290 80218CC0 2406004F */ addiu $a2, $zero, 0x4f .L80218CC4: -/* 513294 80218CC4 0C0B2026 */ jal set_variable +/* 513294 80218CC4 0C0B2026 */ jal evt_set_variable /* 513298 80218CC8 00000000 */ nop .L80218CCC: /* 51329C 80218CCC 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s b/ver/us/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s index 2c7e7c4417..b8ddb3f117 100644 --- a/ver/us/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s +++ b/ver/us/asm/nonmatchings/battle/area_omo2_1/543570/func_80231000_543570.s @@ -33,11 +33,11 @@ glabel func_80231000_543570 /* 5435DC 8023106C 26310004 */ addiu $s1, $s1, 4 /* 5435E0 80231070 0040802D */ daddu $s0, $v0, $zero /* 5435E4 80231074 92060073 */ lbu $a2, 0x73($s0) -/* 5435E8 80231078 0C0B2026 */ jal set_variable +/* 5435E8 80231078 0C0B2026 */ jal evt_set_variable /* 5435EC 8023107C 0260202D */ daddu $a0, $s3, $zero /* 5435F0 80231080 8E250000 */ lw $a1, ($s1) /* 5435F4 80231084 92060072 */ lbu $a2, 0x72($s0) -/* 5435F8 80231088 0C0B2026 */ jal set_variable +/* 5435F8 80231088 0C0B2026 */ jal evt_set_variable /* 5435FC 8023108C 0260202D */ daddu $a0, $s3, $zero /* 543600 80231090 8FBF0020 */ lw $ra, 0x20($sp) /* 543604 80231094 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s b/ver/us/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s index 448ad17b84..05d1c8a43f 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s +++ b/ver/us/asm/nonmatchings/battle/area_pra/649050/func_802185A8_6493B8.s @@ -48,7 +48,7 @@ glabel func_802185A8_6493B8 /* 649454 80218644 8E050000 */ lw $a1, ($s0) /* 649458 80218648 0000302D */ daddu $a2, $zero, $zero .L8021864C: -/* 64945C 8021864C 0C0B2026 */ jal set_variable +/* 64945C 8021864C 0C0B2026 */ jal evt_set_variable /* 649460 80218650 00000000 */ nop /* 649464 80218654 8FBF0018 */ lw $ra, 0x18($sp) /* 649468 80218658 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra/649480/func_80218918_649728.s b/ver/us/asm/nonmatchings/battle/area_pra/649480/func_80218918_649728.s index 4963c1e2ff..1b5b728607 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra/649480/func_80218918_649728.s +++ b/ver/us/asm/nonmatchings/battle/area_pra/649480/func_80218918_649728.s @@ -48,7 +48,7 @@ glabel func_80218918_649728 /* 6497C4 802189B4 8E050000 */ lw $a1, ($s0) /* 6497C8 802189B8 0000302D */ daddu $a2, $zero, $zero .L802189BC: -/* 6497CC 802189BC 0C0B2026 */ jal set_variable +/* 6497CC 802189BC 0C0B2026 */ jal evt_set_variable /* 6497D0 802189C0 00000000 */ nop /* 6497D4 802189C4 8FBF0018 */ lw $ra, 0x18($sp) /* 6497D8 802189C8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra/6497F0/func_80218C88_649A98.s b/ver/us/asm/nonmatchings/battle/area_pra/6497F0/func_80218C88_649A98.s index 39d6ca99b6..140b4fd0fa 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra/6497F0/func_80218C88_649A98.s +++ b/ver/us/asm/nonmatchings/battle/area_pra/6497F0/func_80218C88_649A98.s @@ -48,7 +48,7 @@ glabel func_80218C88_649A98 /* 649B34 80218D24 8E050000 */ lw $a1, ($s0) /* 649B38 80218D28 0000302D */ daddu $a2, $zero, $zero .L80218D2C: -/* 649B3C 80218D2C 0C0B2026 */ jal set_variable +/* 649B3C 80218D2C 0C0B2026 */ jal evt_set_variable /* 649B40 80218D30 00000000 */ nop /* 649B44 80218D34 8FBF0018 */ lw $ra, 0x18($sp) /* 649B48 80218D38 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra/649B60/func_80218FF8_649E08.s b/ver/us/asm/nonmatchings/battle/area_pra/649B60/func_80218FF8_649E08.s index 9e119a0cdb..fa308045b8 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra/649B60/func_80218FF8_649E08.s +++ b/ver/us/asm/nonmatchings/battle/area_pra/649B60/func_80218FF8_649E08.s @@ -48,7 +48,7 @@ glabel func_80218FF8_649E08 /* 649EA4 80219094 8E050000 */ lw $a1, ($s0) /* 649EA8 80219098 0000302D */ daddu $a2, $zero, $zero .L8021909C: -/* 649EAC 8021909C 0C0B2026 */ jal set_variable +/* 649EAC 8021909C 0C0B2026 */ jal evt_set_variable /* 649EB0 802190A0 00000000 */ nop /* 649EB4 802190A4 8FBF0018 */ lw $ra, 0x18($sp) /* 649EB8 802190A8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra/649ED0/func_80219368_64A178.s b/ver/us/asm/nonmatchings/battle/area_pra/649ED0/func_80219368_64A178.s index 65defc954b..6b7798bf7b 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra/649ED0/func_80219368_64A178.s +++ b/ver/us/asm/nonmatchings/battle/area_pra/649ED0/func_80219368_64A178.s @@ -48,7 +48,7 @@ glabel func_80219368_64A178 /* 64A214 80219404 8E050000 */ lw $a1, ($s0) /* 64A218 80219408 0000302D */ daddu $a2, $zero, $zero .L8021940C: -/* 64A21C 8021940C 0C0B2026 */ jal set_variable +/* 64A21C 8021940C 0C0B2026 */ jal evt_set_variable /* 64A220 80219410 00000000 */ nop /* 64A224 80219414 8FBF0018 */ lw $ra, 0x18($sp) /* 64A228 80219418 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s b/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s index 38634f7297..41d5a88b87 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s +++ b/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802181E8_660938.s @@ -31,7 +31,7 @@ glabel func_802181E8_660938 /* 66099C 8021824C 0260282D */ daddu $a1, $s3, $zero /* 6609A0 80218250 8E050000 */ lw $a1, ($s0) /* 6609A4 80218254 84460098 */ lh $a2, 0x98($v0) -/* 6609A8 80218258 0C0B2026 */ jal set_variable +/* 6609A8 80218258 0C0B2026 */ jal evt_set_variable /* 6609AC 8021825C 0240202D */ daddu $a0, $s2, $zero /* 6609B0 80218260 8FBF0020 */ lw $ra, 0x20($sp) /* 6609B4 80218264 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s b/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s index 06e0c0c154..f4c2dc42cc 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s +++ b/ver/us/asm/nonmatchings/battle/area_pra2/660750/func_802183A4_660AF4.s @@ -48,7 +48,7 @@ glabel func_802183A4_660AF4 /* 660BA0 80218450 0220202D */ daddu $a0, $s1, $zero /* 660BA4 80218454 4600008D */ trunc.w.s $f2, $f0 /* 660BA8 80218458 44061000 */ mfc1 $a2, $f2 -/* 660BAC 8021845C 0C0B2026 */ jal set_variable +/* 660BAC 8021845C 0C0B2026 */ jal evt_set_variable /* 660BB0 80218460 0240282D */ daddu $a1, $s2, $zero /* 660BB4 80218464 8FBF001C */ lw $ra, 0x1c($sp) /* 660BB8 80218468 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218A90_66A810.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218A90_66A810.s index a1537782ed..f7c5740855 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218A90_66A810.s +++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218A90_66A810.s @@ -19,7 +19,7 @@ glabel func_80218A90_66A810 /* 66A848 80218AC8 E7A00010 */ swc1 $f0, 0x10($sp) /* 66A84C 80218ACC 0200202D */ daddu $a0, $s0, $zero /* 66A850 80218AD0 8E250000 */ lw $a1, ($s1) -/* 66A854 80218AD4 0C0B2026 */ jal set_variable +/* 66A854 80218AD4 0C0B2026 */ jal evt_set_variable /* 66A858 80218AD8 0040302D */ daddu $a2, $v0, $zero /* 66A85C 80218ADC 8FBF0020 */ lw $ra, 0x20($sp) /* 66A860 80218AE0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_802194B8_66B238.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_802194B8_66B238.s index 2056720b86..d104f1b4c1 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_802194B8_66B238.s +++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_802194B8_66B238.s @@ -13,14 +13,14 @@ glabel func_802194B8_66B238 /* 66B258 802194D8 8E50000C */ lw $s0, 0xc($s2) /* 66B25C 802194DC 82260012 */ lb $a2, 0x12($s1) /* 66B260 802194E0 8E050000 */ lw $a1, ($s0) -/* 66B264 802194E4 0C0B2026 */ jal set_variable +/* 66B264 802194E4 0C0B2026 */ jal evt_set_variable /* 66B268 802194E8 26100004 */ addiu $s0, $s0, 4 /* 66B26C 802194EC 82220012 */ lb $v0, 0x12($s1) /* 66B270 802194F0 8E050000 */ lw $a1, ($s0) /* 66B274 802194F4 000210C0 */ sll $v0, $v0, 3 /* 66B278 802194F8 00511021 */ addu $v0, $v0, $s1 /* 66B27C 802194FC 80460015 */ lb $a2, 0x15($v0) -/* 66B280 80219500 0C0B2026 */ jal set_variable +/* 66B280 80219500 0C0B2026 */ jal evt_set_variable /* 66B284 80219504 0240202D */ daddu $a0, $s2, $zero /* 66B288 80219508 8FBF001C */ lw $ra, 0x1c($sp) /* 66B28C 8021950C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s b/ver/us/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s index 9102b672b2..1da6366b05 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s +++ b/ver/us/asm/nonmatchings/battle/area_pra3/66B5B0/func_80219AD8_66B858.s @@ -48,7 +48,7 @@ glabel func_80219AD8_66B858 /* 66B8F4 80219B74 8E050000 */ lw $a1, ($s0) /* 66B8F8 80219B78 0000302D */ daddu $a2, $zero, $zero .L80219B7C: -/* 66B8FC 80219B7C 0C0B2026 */ jal set_variable +/* 66B8FC 80219B7C 0C0B2026 */ jal evt_set_variable /* 66B900 80219B80 00000000 */ nop /* 66B904 80219B84 8FBF0018 */ lw $ra, 0x18($sp) /* 66B908 80219B88 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/66B920/func_80219E48_66BBC8.s b/ver/us/asm/nonmatchings/battle/area_pra3/66B920/func_80219E48_66BBC8.s index 7a9a1c0c2f..52d268947a 100644 --- a/ver/us/asm/nonmatchings/battle/area_pra3/66B920/func_80219E48_66BBC8.s +++ b/ver/us/asm/nonmatchings/battle/area_pra3/66B920/func_80219E48_66BBC8.s @@ -48,7 +48,7 @@ glabel func_80219E48_66BBC8 /* 66BC64 80219EE4 8E050000 */ lw $a1, ($s0) /* 66BC68 80219EE8 0000302D */ daddu $a2, $zero, $zero .L80219EEC: -/* 66BC6C 80219EEC 0C0B2026 */ jal set_variable +/* 66BC6C 80219EEC 0C0B2026 */ jal evt_set_variable /* 66BC70 80219EF0 00000000 */ nop /* 66BC74 80219EF4 8FBF0018 */ lw $ra, 0x18($sp) /* 66BC78 80219EF8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218A90_624630.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218A90_624630.s index a50dfdd2b2..e89d9f9b3b 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218A90_624630.s +++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218A90_624630.s @@ -19,7 +19,7 @@ glabel func_80218A90_624630 /* 624668 80218AC8 E7A00010 */ swc1 $f0, 0x10($sp) /* 62466C 80218ACC 0200202D */ daddu $a0, $s0, $zero /* 624670 80218AD0 8E250000 */ lw $a1, ($s1) -/* 624674 80218AD4 0C0B2026 */ jal set_variable +/* 624674 80218AD4 0C0B2026 */ jal evt_set_variable /* 624678 80218AD8 0040302D */ daddu $a2, $v0, $zero /* 62467C 80218ADC 8FBF0020 */ lw $ra, 0x20($sp) /* 624680 80218AE0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802194B8_625058.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802194B8_625058.s index 63ef5d1a47..92149f019e 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802194B8_625058.s +++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802194B8_625058.s @@ -13,14 +13,14 @@ glabel func_802194B8_625058 /* 625078 802194D8 8E50000C */ lw $s0, 0xc($s2) /* 62507C 802194DC 82260012 */ lb $a2, 0x12($s1) /* 625080 802194E0 8E050000 */ lw $a1, ($s0) -/* 625084 802194E4 0C0B2026 */ jal set_variable +/* 625084 802194E4 0C0B2026 */ jal evt_set_variable /* 625088 802194E8 26100004 */ addiu $s0, $s0, 4 /* 62508C 802194EC 82220012 */ lb $v0, 0x12($s1) /* 625090 802194F0 8E050000 */ lw $a1, ($s0) /* 625094 802194F4 000210C0 */ sll $v0, $v0, 3 /* 625098 802194F8 00511021 */ addu $v0, $v0, $s1 /* 62509C 802194FC 80460015 */ lb $a2, 0x15($v0) -/* 6250A0 80219500 0C0B2026 */ jal set_variable +/* 6250A0 80219500 0C0B2026 */ jal evt_set_variable /* 6250A4 80219504 0240202D */ daddu $a0, $s2, $zero /* 6250A8 80219508 8FBF001C */ lw $ra, 0x1c($sp) /* 6250AC 8021950C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s index a5d97114ca..f253d20ec0 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s +++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s @@ -34,7 +34,7 @@ glabel func_802196BC_62525C /* 6252D0 80219730 8E050000 */ lw $a1, ($s0) /* 6252D4 80219734 26100004 */ addiu $s0, $s0, 4 /* 6252D8 80219738 0220202D */ daddu $a0, $s1, $zero -/* 6252DC 8021973C 0C0B210B */ jal get_float_variable +/* 6252DC 8021973C 0C0B210B */ jal evt_get_float_variable /* 6252E0 80219740 0040A02D */ daddu $s4, $v0, $zero /* 6252E4 80219744 8E050000 */ lw $a1, ($s0) /* 6252E8 80219748 26100004 */ addiu $s0, $s0, 4 diff --git a/ver/us/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s b/ver/us/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s index bc8133af94..5dba131e5a 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s +++ b/ver/us/asm/nonmatchings/battle/area_sam/6253E0/func_80219AE8_625688.s @@ -48,7 +48,7 @@ glabel func_80219AE8_625688 /* 625724 80219B84 8E050000 */ lw $a1, ($s0) /* 625728 80219B88 0000302D */ daddu $a2, $zero, $zero .L80219B8C: -/* 62572C 80219B8C 0C0B2026 */ jal set_variable +/* 62572C 80219B8C 0C0B2026 */ jal evt_set_variable /* 625730 80219B90 00000000 */ nop /* 625734 80219B94 8FBF0018 */ lw $ra, 0x18($sp) /* 625738 80219B98 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s b/ver/us/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s index dc047d3d4a..9aed43617f 100644 --- a/ver/us/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s +++ b/ver/us/asm/nonmatchings/battle/area_sam2/63D9F0/func_80218AB8_63DC98.s @@ -48,7 +48,7 @@ glabel func_80218AB8_63DC98 /* 63DD34 80218B54 8E050000 */ lw $a1, ($s0) /* 63DD38 80218B58 0000302D */ daddu $a2, $zero, $zero .L80218B5C: -/* 63DD3C 80218B5C 0C0B2026 */ jal set_variable +/* 63DD3C 80218B5C 0C0B2026 */ jal evt_set_variable /* 63DD40 80218B60 00000000 */ nop /* 63DD44 80218B64 8FBF0018 */ lw $ra, 0x18($sp) /* 63DD48 80218B68 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s b/ver/us/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s index 07edd71eb6..cd21b4b462 100644 --- a/ver/us/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s +++ b/ver/us/asm/nonmatchings/battle/area_sbk/4DA6B0/func_802180D0_4DA6B0.s @@ -64,15 +64,15 @@ glabel func_802180D0_4DA6B0 /* 4DA79C 802181BC C62000B4 */ lwc1 $f0, 0xb4($s1) /* 4DA7A0 802181C0 46800020 */ cvt.s.w $f0, $f0 /* 4DA7A4 802181C4 4406B000 */ mfc1 $a2, $f22 -/* 4DA7A8 802181C8 0C0B2190 */ jal set_float_variable +/* 4DA7A8 802181C8 0C0B2190 */ jal evt_set_float_variable /* 4DA7AC 802181CC 4600A501 */ sub.s $f20, $f20, $f0 /* 4DA7B0 802181D0 0220202D */ daddu $a0, $s1, $zero /* 4DA7B4 802181D4 4406A000 */ mfc1 $a2, $f20 -/* 4DA7B8 802181D8 0C0B2190 */ jal set_float_variable +/* 4DA7B8 802181D8 0C0B2190 */ jal evt_set_float_variable /* 4DA7BC 802181DC 0260282D */ daddu $a1, $s3, $zero /* 4DA7C0 802181E0 0220202D */ daddu $a0, $s1, $zero /* 4DA7C4 802181E4 4406C000 */ mfc1 $a2, $f24 -/* 4DA7C8 802181E8 0C0B2190 */ jal set_float_variable +/* 4DA7C8 802181E8 0C0B2190 */ jal evt_set_float_variable /* 4DA7CC 802181EC 0200282D */ daddu $a1, $s0, $zero /* 4DA7D0 802181F0 8FBF0060 */ lw $ra, 0x60($sp) /* 4DA7D4 802181F4 8FB3005C */ lw $s3, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s index ad544c2f38..76a072daaa 100644 --- a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s +++ b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218258_608D08.s @@ -10,11 +10,11 @@ glabel func_80218258_608D08 /* 608D1C 8021826C F7B40020 */ sdc1 $f20, 0x20($sp) /* 608D20 80218270 8E02000C */ lw $v0, 0xc($s0) /* 608D24 80218274 8C450004 */ lw $a1, 4($v0) -/* 608D28 80218278 0C0B210B */ jal get_float_variable +/* 608D28 80218278 0C0B210B */ jal evt_get_float_variable /* 608D2C 8021827C 8C510000 */ lw $s1, ($v0) /* 608D30 80218280 46000506 */ mov.s $f20, $f0 /* 608D34 80218284 0200202D */ daddu $a0, $s0, $zero -/* 608D38 80218288 0C0B210B */ jal get_float_variable +/* 608D38 80218288 0C0B210B */ jal evt_get_float_variable /* 608D3C 8021828C 0220282D */ daddu $a1, $s1, $zero /* 608D40 80218290 3C0140C9 */ lui $at, 0x40c9 /* 608D44 80218294 34210FD0 */ ori $at, $at, 0xfd0 @@ -30,7 +30,7 @@ glabel func_80218258_608D08 /* 608D6C 802182BC 00000000 */ nop /* 608D70 802182C0 0200202D */ daddu $a0, $s0, $zero /* 608D74 802182C4 4406A000 */ mfc1 $a2, $f20 -/* 608D78 802182C8 0C0B2190 */ jal set_float_variable +/* 608D78 802182C8 0C0B2190 */ jal evt_set_float_variable /* 608D7C 802182CC 0220282D */ daddu $a1, $s1, $zero /* 608D80 802182D0 8FBF0018 */ lw $ra, 0x18($sp) /* 608D84 802182D4 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s index daae2e247a..6861ca0370 100644 --- a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s +++ b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218404_608EB4.s @@ -38,7 +38,7 @@ glabel func_80218404_608EB4 /* 608F38 80218488 4482A000 */ mtc1 $v0, $f20 /* 608F3C 8021848C 00000000 */ nop /* 608F40 80218490 4680A520 */ cvt.s.w $f20, $f20 -/* 608F44 80218494 0C0B210B */ jal get_float_variable +/* 608F44 80218494 0C0B210B */ jal evt_get_float_variable /* 608F48 80218498 0220202D */ daddu $a0, $s1, $zero /* 608F4C 8021849C 8E42000C */ lw $v0, 0xc($s2) /* 608F50 802184A0 E4580004 */ swc1 $f24, 4($v0) diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s index e13d05037f..ce51e8d99f 100644 --- a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s +++ b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802186D8_609188.s @@ -10,11 +10,11 @@ glabel func_802186D8_609188 /* 60919C 802186EC F7B40020 */ sdc1 $f20, 0x20($sp) /* 6091A0 802186F0 8E02000C */ lw $v0, 0xc($s0) /* 6091A4 802186F4 8C450004 */ lw $a1, 4($v0) -/* 6091A8 802186F8 0C0B210B */ jal get_float_variable +/* 6091A8 802186F8 0C0B210B */ jal evt_get_float_variable /* 6091AC 802186FC 8C510000 */ lw $s1, ($v0) /* 6091B0 80218700 46000506 */ mov.s $f20, $f0 /* 6091B4 80218704 0200202D */ daddu $a0, $s0, $zero -/* 6091B8 80218708 0C0B210B */ jal get_float_variable +/* 6091B8 80218708 0C0B210B */ jal evt_get_float_variable /* 6091BC 8021870C 0220282D */ daddu $a1, $s1, $zero /* 6091C0 80218710 3C0140C9 */ lui $at, 0x40c9 /* 6091C4 80218714 34210FD0 */ ori $at, $at, 0xfd0 @@ -30,7 +30,7 @@ glabel func_802186D8_609188 /* 6091EC 8021873C 00000000 */ nop /* 6091F0 80218740 0200202D */ daddu $a0, $s0, $zero /* 6091F4 80218744 4406A000 */ mfc1 $a2, $f20 -/* 6091F8 80218748 0C0B2190 */ jal set_float_variable +/* 6091F8 80218748 0C0B2190 */ jal evt_set_float_variable /* 6091FC 8021874C 0220282D */ daddu $a1, $s1, $zero /* 609200 80218750 8FBF0018 */ lw $ra, 0x18($sp) /* 609204 80218754 8FB10014 */ lw $s1, 0x14($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 index 2b49946a5e..0d4e364957 100644 --- 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 @@ -188,14 +188,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -206,14 +206,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -239,14 +239,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -257,14 +257,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -275,14 +275,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -309,14 +309,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -327,14 +327,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -345,14 +345,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -363,14 +363,14 @@ glabel func_802185B0_4B17A0 /* 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 set_variable +/* 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 set_variable +/* 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) @@ -378,7 +378,7 @@ glabel func_802185B0_4B17A0 /* 4B1D08 80218B18 8E050000 */ lw $a1, ($s0) /* 4B1D0C 80218B1C 4600010D */ trunc.w.s $f4, $f0 /* 4B1D10 80218B20 44062000 */ mfc1 $a2, $f4 -/* 4B1D14 80218B24 0C0B2026 */ jal set_variable +/* 4B1D14 80218B24 0C0B2026 */ jal evt_set_variable /* 4B1D18 80218B28 00000000 */ nop .L80218B2C: /* 4B1D1C 80218B2C 8FBF005C */ lw $ra, 0x5c($sp) 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 index e47b5b012c..5292f0928d 100644 --- 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 @@ -188,14 +188,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -206,14 +206,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -239,14 +239,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -257,14 +257,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -275,14 +275,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -309,14 +309,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -327,14 +327,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -345,14 +345,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -363,14 +363,14 @@ glabel func_80218D70_4B1F60 /* 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 set_variable +/* 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 set_variable +/* 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) @@ -378,7 +378,7 @@ glabel func_80218D70_4B1F60 /* 4B24C8 802192D8 8E050000 */ lw $a1, ($s0) /* 4B24CC 802192DC 4600010D */ trunc.w.s $f4, $f0 /* 4B24D0 802192E0 44062000 */ mfc1 $a2, $f4 -/* 4B24D4 802192E4 0C0B2026 */ jal set_variable +/* 4B24D4 802192E4 0C0B2026 */ jal evt_set_variable /* 4B24D8 802192E8 00000000 */ nop .L802192EC: /* 4B24DC 802192EC 8FBF005C */ lw $ra, 0x5c($sp) 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 index 5050f7cb42..f570975272 100644 --- 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 @@ -188,14 +188,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -206,14 +206,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -239,14 +239,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -257,14 +257,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -275,14 +275,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -309,14 +309,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -327,14 +327,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -345,14 +345,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -363,14 +363,14 @@ glabel func_80219530_4B2720 /* 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 set_variable +/* 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 set_variable +/* 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) @@ -378,7 +378,7 @@ glabel func_80219530_4B2720 /* 4B2C88 80219A98 8E050000 */ lw $a1, ($s0) /* 4B2C8C 80219A9C 4600010D */ trunc.w.s $f4, $f0 /* 4B2C90 80219AA0 44062000 */ mfc1 $a2, $f4 -/* 4B2C94 80219AA4 0C0B2026 */ jal set_variable +/* 4B2C94 80219AA4 0C0B2026 */ jal evt_set_variable /* 4B2C98 80219AA8 00000000 */ nop .L80219AAC: /* 4B2C9C 80219AAC 8FBF005C */ lw $ra, 0x5c($sp) 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 index 8043f2849b..cca03323fd 100644 --- 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 @@ -188,14 +188,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -206,14 +206,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -239,14 +239,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -257,14 +257,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -275,14 +275,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -309,14 +309,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -327,14 +327,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -345,14 +345,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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 @@ -363,14 +363,14 @@ glabel func_80219CF0_4B2EE0 /* 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 set_variable +/* 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 set_variable +/* 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) @@ -378,7 +378,7 @@ glabel func_80219CF0_4B2EE0 /* 4B3448 8021A258 8E050000 */ lw $a1, ($s0) /* 4B344C 8021A25C 4600010D */ trunc.w.s $f4, $f0 /* 4B3450 8021A260 44062000 */ mfc1 $a2, $f4 -/* 4B3454 8021A264 0C0B2026 */ jal set_variable +/* 4B3454 8021A264 0C0B2026 */ jal evt_set_variable /* 4B3458 8021A268 00000000 */ nop .L8021A26C: /* 4B345C 8021A26C 8FBF005C */ lw $ra, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/AdjustCam.s b/ver/us/asm/nonmatchings/evt/cam_api/AdjustCam.s index bbf8360987..0d3c506ad0 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/AdjustCam.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/AdjustCam.s @@ -32,26 +32,26 @@ glabel AdjustCam /* F107C 802CC6CC 000310C0 */ sll $v0, $v1, 3 /* F1080 802CC6D0 00621821 */ addu $v1, $v1, $v0 /* F1084 802CC6D4 000318C0 */ sll $v1, $v1, 3 -/* F1088 802CC6D8 0C0B210B */ jal get_float_variable +/* F1088 802CC6D8 0C0B210B */ jal evt_get_float_variable /* F108C 802CC6DC 00669821 */ addu $s3, $v1, $a2 /* F1090 802CC6E0 8E050000 */ lw $a1, ($s0) /* F1094 802CC6E4 26100004 */ addiu $s0, $s0, 4 /* F1098 802CC6E8 0220202D */ daddu $a0, $s1, $zero -/* F109C 802CC6EC 0C0B210B */ jal get_float_variable +/* F109C 802CC6EC 0C0B210B */ jal evt_get_float_variable /* F10A0 802CC6F0 E7A00054 */ swc1 $f0, 0x54($sp) /* F10A4 802CC6F4 8E050000 */ lw $a1, ($s0) /* F10A8 802CC6F8 26100004 */ addiu $s0, $s0, 4 /* F10AC 802CC6FC 0220202D */ daddu $a0, $s1, $zero -/* F10B0 802CC700 0C0B210B */ jal get_float_variable +/* F10B0 802CC700 0C0B210B */ jal evt_get_float_variable /* F10B4 802CC704 E7A00058 */ swc1 $f0, 0x58($sp) /* F10B8 802CC708 8E050000 */ lw $a1, ($s0) /* F10BC 802CC70C 26100004 */ addiu $s0, $s0, 4 /* F10C0 802CC710 0220202D */ daddu $a0, $s1, $zero -/* F10C4 802CC714 0C0B210B */ jal get_float_variable +/* F10C4 802CC714 0C0B210B */ jal evt_get_float_variable /* F10C8 802CC718 46000786 */ mov.s $f30, $f0 /* F10CC 802CC71C 0220202D */ daddu $a0, $s1, $zero /* F10D0 802CC720 8E050000 */ lw $a1, ($s0) -/* F10D4 802CC724 0C0B210B */ jal get_float_variable +/* F10D4 802CC724 0C0B210B */ jal evt_get_float_variable /* F10D8 802CC728 46000706 */ mov.s $f28, $f0 /* F10DC 802CC72C 3C038011 */ lui $v1, %hi(gPlayerStatus) /* F10E0 802CC730 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodePosition.s b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodePosition.s index 8b03a0c7e9..b0a7733a46 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodePosition.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodePosition.s @@ -50,19 +50,19 @@ glabel GetAnimatedNodePosition /* F2024 802CD674 C7A00020 */ lwc1 $f0, 0x20($sp) /* F2028 802CD678 4600008D */ trunc.w.s $f2, $f0 /* F202C 802CD67C 44061000 */ mfc1 $a2, $f2 -/* F2030 802CD680 0C0B2026 */ jal set_variable +/* F2030 802CD680 0C0B2026 */ jal evt_set_variable /* F2034 802CD684 0280282D */ daddu $a1, $s4, $zero /* F2038 802CD688 0240202D */ daddu $a0, $s2, $zero /* F203C 802CD68C C7A00024 */ lwc1 $f0, 0x24($sp) /* F2040 802CD690 4600008D */ trunc.w.s $f2, $f0 /* F2044 802CD694 44061000 */ mfc1 $a2, $f2 -/* F2048 802CD698 0C0B2026 */ jal set_variable +/* F2048 802CD698 0C0B2026 */ jal evt_set_variable /* F204C 802CD69C 02A0282D */ daddu $a1, $s5, $zero /* F2050 802CD6A0 0240202D */ daddu $a0, $s2, $zero /* F2054 802CD6A4 C7A00028 */ lwc1 $f0, 0x28($sp) /* F2058 802CD6A8 4600008D */ trunc.w.s $f2, $f0 /* F205C 802CD6AC 44061000 */ mfc1 $a2, $f2 -/* F2060 802CD6B0 0C0B2026 */ jal set_variable +/* F2060 802CD6B0 0C0B2026 */ jal evt_set_variable /* F2064 802CD6B4 0200282D */ daddu $a1, $s0, $zero /* F2068 802CD6B8 8FBF0048 */ lw $ra, 0x48($sp) /* F206C 802CD6BC 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodeRotation.s b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodeRotation.s index 11c3c46b01..b6fa5cbd3f 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodeRotation.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedNodeRotation.s @@ -40,19 +40,19 @@ glabel GetAnimatedNodeRotation /* F211C 802CD76C C600009C */ lwc1 $f0, 0x9c($s0) /* F2120 802CD770 4600008D */ trunc.w.s $f2, $f0 /* F2124 802CD774 44061000 */ mfc1 $a2, $f2 -/* F2128 802CD778 0C0B2026 */ jal set_variable +/* F2128 802CD778 0C0B2026 */ jal evt_set_variable /* F212C 802CD77C 0260282D */ daddu $a1, $s3, $zero /* F2130 802CD780 0240202D */ daddu $a0, $s2, $zero /* F2134 802CD784 C60000A0 */ lwc1 $f0, 0xa0($s0) /* F2138 802CD788 4600008D */ trunc.w.s $f2, $f0 /* F213C 802CD78C 44061000 */ mfc1 $a2, $f2 -/* F2140 802CD790 0C0B2026 */ jal set_variable +/* F2140 802CD790 0C0B2026 */ jal evt_set_variable /* F2144 802CD794 0280282D */ daddu $a1, $s4, $zero /* F2148 802CD798 0240202D */ daddu $a0, $s2, $zero /* F214C 802CD79C C60000A4 */ lwc1 $f0, 0xa4($s0) /* F2150 802CD7A0 4600008D */ trunc.w.s $f2, $f0 /* F2154 802CD7A4 44061000 */ mfc1 $a2, $f2 -/* F2158 802CD7A8 0C0B2026 */ jal set_variable +/* F2158 802CD7A8 0C0B2026 */ jal evt_set_variable /* F215C 802CD7AC 02A0282D */ daddu $a1, $s5, $zero /* F2160 802CD7B0 8FBF0028 */ lw $ra, 0x28($sp) /* F2164 802CD7B4 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedPositionByTreeIndex.s b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedPositionByTreeIndex.s index 5c08a0dfc9..fcec4b7d84 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedPositionByTreeIndex.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedPositionByTreeIndex.s @@ -50,19 +50,19 @@ glabel GetAnimatedPositionByTreeIndex /* F223C 802CD88C C7A00020 */ lwc1 $f0, 0x20($sp) /* F2240 802CD890 4600008D */ trunc.w.s $f2, $f0 /* F2244 802CD894 44061000 */ mfc1 $a2, $f2 -/* F2248 802CD898 0C0B2026 */ jal set_variable +/* F2248 802CD898 0C0B2026 */ jal evt_set_variable /* F224C 802CD89C 0280282D */ daddu $a1, $s4, $zero /* F2250 802CD8A0 0240202D */ daddu $a0, $s2, $zero /* F2254 802CD8A4 C7A00024 */ lwc1 $f0, 0x24($sp) /* F2258 802CD8A8 4600008D */ trunc.w.s $f2, $f0 /* F225C 802CD8AC 44061000 */ mfc1 $a2, $f2 -/* F2260 802CD8B0 0C0B2026 */ jal set_variable +/* F2260 802CD8B0 0C0B2026 */ jal evt_set_variable /* F2264 802CD8B4 02A0282D */ daddu $a1, $s5, $zero /* F2268 802CD8B8 0240202D */ daddu $a0, $s2, $zero /* F226C 802CD8BC C7A00028 */ lwc1 $f0, 0x28($sp) /* F2270 802CD8C0 4600008D */ trunc.w.s $f2, $f0 /* F2274 802CD8C4 44061000 */ mfc1 $a2, $f2 -/* F2278 802CD8C8 0C0B2026 */ jal set_variable +/* F2278 802CD8C8 0C0B2026 */ jal evt_set_variable /* F227C 802CD8CC 0200282D */ daddu $a1, $s0, $zero /* F2280 802CD8D0 8FBF0048 */ lw $ra, 0x48($sp) /* F2284 802CD8D4 8FB50044 */ lw $s5, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedRotationByTreeIndex.s b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedRotationByTreeIndex.s index 8de2d2a48e..32e89155ee 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedRotationByTreeIndex.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/GetAnimatedRotationByTreeIndex.s @@ -40,19 +40,19 @@ glabel GetAnimatedRotationByTreeIndex /* F2334 802CD984 C600009C */ lwc1 $f0, 0x9c($s0) /* F2338 802CD988 4600008D */ trunc.w.s $f2, $f0 /* F233C 802CD98C 44061000 */ mfc1 $a2, $f2 -/* F2340 802CD990 0C0B2026 */ jal set_variable +/* F2340 802CD990 0C0B2026 */ jal evt_set_variable /* F2344 802CD994 0260282D */ daddu $a1, $s3, $zero /* F2348 802CD998 0240202D */ daddu $a0, $s2, $zero /* F234C 802CD99C C60000A0 */ lwc1 $f0, 0xa0($s0) /* F2350 802CD9A0 4600008D */ trunc.w.s $f2, $f0 /* F2354 802CD9A4 44061000 */ mfc1 $a2, $f2 -/* F2358 802CD9A8 0C0B2026 */ jal set_variable +/* F2358 802CD9A8 0C0B2026 */ jal evt_set_variable /* F235C 802CD9AC 0280282D */ daddu $a1, $s4, $zero /* F2360 802CD9B0 0240202D */ daddu $a0, $s2, $zero /* F2364 802CD9B4 C60000A4 */ lwc1 $f0, 0xa4($s0) /* F2368 802CD9B8 4600008D */ trunc.w.s $f2, $f0 /* F236C 802CD9BC 44061000 */ mfc1 $a2, $f2 -/* F2370 802CD9C0 0C0B2026 */ jal set_variable +/* F2370 802CD9C0 0C0B2026 */ jal evt_set_variable /* F2374 802CD9C4 02A0282D */ daddu $a1, $s5, $zero /* F2378 802CD9C8 8FBF0028 */ lw $ra, 0x28($sp) /* F237C 802CD9CC 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/ResetCam.s b/ver/us/asm/nonmatchings/evt/cam_api/ResetCam.s index e931c8617e..c8058dc6ad 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/ResetCam.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/ResetCam.s @@ -28,7 +28,7 @@ glabel ResetCam /* F12D4 802CC924 00621821 */ addu $v1, $v1, $v0 /* F12D8 802CC928 000318C0 */ sll $v1, $v1, 3 /* F12DC 802CC92C 8E050000 */ lw $a1, ($s0) -/* F12E0 802CC930 0C0B210B */ jal get_float_variable +/* F12E0 802CC930 0C0B210B */ jal evt_get_float_variable /* F12E4 802CC934 00668021 */ addu $s0, $v1, $a2 /* F12E8 802CC938 3C038011 */ lui $v1, %hi(gPlayerStatus) /* F12EC 802CC93C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/SetCamProperties.s b/ver/us/asm/nonmatchings/evt/cam_api/SetCamProperties.s index 389e142444..456cca76e2 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/SetCamProperties.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/SetCamProperties.s @@ -32,36 +32,36 @@ glabel SetCamProperties /* F0E08 802CC458 000310C0 */ sll $v0, $v1, 3 /* F0E0C 802CC45C 00621821 */ addu $v1, $v1, $v0 /* F0E10 802CC460 000318C0 */ sll $v1, $v1, 3 -/* F0E14 802CC464 0C0B210B */ jal get_float_variable +/* F0E14 802CC464 0C0B210B */ jal evt_get_float_variable /* F0E18 802CC468 00669821 */ addu $s3, $v1, $a2 /* F0E1C 802CC46C 8E050000 */ lw $a1, ($s0) /* F0E20 802CC470 26100004 */ addiu $s0, $s0, 4 /* F0E24 802CC474 0220202D */ daddu $a0, $s1, $zero -/* F0E28 802CC478 0C0B210B */ jal get_float_variable +/* F0E28 802CC478 0C0B210B */ jal evt_get_float_variable /* F0E2C 802CC47C E7A00054 */ swc1 $f0, 0x54($sp) /* F0E30 802CC480 8E050000 */ lw $a1, ($s0) /* F0E34 802CC484 26100004 */ addiu $s0, $s0, 4 /* F0E38 802CC488 0220202D */ daddu $a0, $s1, $zero -/* F0E3C 802CC48C 0C0B210B */ jal get_float_variable +/* F0E3C 802CC48C 0C0B210B */ jal evt_get_float_variable /* F0E40 802CC490 46000606 */ mov.s $f24, $f0 /* F0E44 802CC494 8E050000 */ lw $a1, ($s0) /* F0E48 802CC498 26100004 */ addiu $s0, $s0, 4 /* F0E4C 802CC49C 0220202D */ daddu $a0, $s1, $zero -/* F0E50 802CC4A0 0C0B210B */ jal get_float_variable +/* F0E50 802CC4A0 0C0B210B */ jal evt_get_float_variable /* F0E54 802CC4A4 46000586 */ mov.s $f22, $f0 /* F0E58 802CC4A8 8E050000 */ lw $a1, ($s0) /* F0E5C 802CC4AC 26100004 */ addiu $s0, $s0, 4 /* F0E60 802CC4B0 0220202D */ daddu $a0, $s1, $zero -/* F0E64 802CC4B4 0C0B210B */ jal get_float_variable +/* F0E64 802CC4B4 0C0B210B */ jal evt_get_float_variable /* F0E68 802CC4B8 46000506 */ mov.s $f20, $f0 /* F0E6C 802CC4BC 8E050000 */ lw $a1, ($s0) /* F0E70 802CC4C0 26100004 */ addiu $s0, $s0, 4 /* F0E74 802CC4C4 0220202D */ daddu $a0, $s1, $zero -/* F0E78 802CC4C8 0C0B210B */ jal get_float_variable +/* F0E78 802CC4C8 0C0B210B */ jal evt_get_float_variable /* F0E7C 802CC4CC 46000786 */ mov.s $f30, $f0 /* F0E80 802CC4D0 0220202D */ daddu $a0, $s1, $zero /* F0E84 802CC4D4 8E050000 */ lw $a1, ($s0) -/* F0E88 802CC4D8 0C0B210B */ jal get_float_variable +/* F0E88 802CC4D8 0C0B210B */ jal evt_get_float_variable /* F0E8C 802CC4DC 46000706 */ mov.s $f28, $f0 /* F0E90 802CC4E0 12400049 */ beqz $s2, .L802CC608 /* F0E94 802CC4E4 46000686 */ mov.s $f26, $f0 diff --git a/ver/us/asm/nonmatchings/evt/cam_api/ShakeCam.s b/ver/us/asm/nonmatchings/evt/cam_api/ShakeCam.s index 3be304d504..ba086927d9 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/ShakeCam.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/ShakeCam.s @@ -36,7 +36,7 @@ glabel ShakeCam /* EFCB8 802CB308 0040982D */ daddu $s3, $v0, $zero /* EFCBC 802CB30C 0040A02D */ daddu $s4, $v0, $zero /* EFCC0 802CB310 8E050000 */ lw $a1, ($s0) -/* EFCC4 802CB314 0C0B210B */ jal get_float_variable +/* EFCC4 802CB314 0C0B210B */ jal evt_get_float_variable /* EFCC8 802CB318 02A0202D */ daddu $a0, $s5, $zero /* EFCCC 802CB31C 3C04800B */ lui $a0, %hi(gCameras) /* EFCD0 802CB320 24841D80 */ addiu $a0, $a0, %lo(gCameras) diff --git a/ver/us/asm/nonmatchings/evt/cam_api/UseSettingsFrom.s b/ver/us/asm/nonmatchings/evt/cam_api/UseSettingsFrom.s index faf28d16f9..528a0ac076 100644 --- a/ver/us/asm/nonmatchings/evt/cam_api/UseSettingsFrom.s +++ b/ver/us/asm/nonmatchings/evt/cam_api/UseSettingsFrom.s @@ -26,16 +26,16 @@ glabel UseSettingsFrom /* F0264 802CB8B4 000310C0 */ sll $v0, $v1, 3 /* F0268 802CB8B8 00621821 */ addu $v1, $v1, $v0 /* F026C 802CB8BC 000318C0 */ sll $v1, $v1, 3 -/* F0270 802CB8C0 0C0B210B */ jal get_float_variable +/* F0270 802CB8C0 0C0B210B */ jal evt_get_float_variable /* F0274 802CB8C4 00669021 */ addu $s2, $v1, $a2 /* F0278 802CB8C8 8E050000 */ lw $a1, ($s0) /* F027C 802CB8CC 26100004 */ addiu $s0, $s0, 4 /* F0280 802CB8D0 0220202D */ daddu $a0, $s1, $zero -/* F0284 802CB8D4 0C0B210B */ jal get_float_variable +/* F0284 802CB8D4 0C0B210B */ jal evt_get_float_variable /* F0288 802CB8D8 46000586 */ mov.s $f22, $f0 /* F028C 802CB8DC 0220202D */ daddu $a0, $s1, $zero /* F0290 802CB8E0 8E050000 */ lw $a1, ($s0) -/* F0294 802CB8E4 0C0B210B */ jal get_float_variable +/* F0294 802CB8E4 0C0B210B */ jal evt_get_float_variable /* F0298 802CB8E8 46000506 */ mov.s $f20, $f0 /* F029C 802CB8EC 27A20038 */ addiu $v0, $sp, 0x38 /* F02A0 802CB8F0 3C0146FF */ lui $at, 0x46ff diff --git a/ver/us/asm/nonmatchings/evt/fx_api/PlayEffect.s b/ver/us/asm/nonmatchings/evt/fx_api/PlayEffect.s index 49409e7598..7b49641a92 100644 --- a/ver/us/asm/nonmatchings/evt/fx_api/PlayEffect.s +++ b/ver/us/asm/nonmatchings/evt/fx_api/PlayEffect.s @@ -106,66 +106,66 @@ glabel PlayEffect /* FCDC4 802D8414 26520004 */ addiu $s2, $s2, 4 /* FCDC8 802D8418 8E250000 */ lw $a1, ($s1) /* FCDCC 802D841C 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCDD0 802D8420 0C0B210B */ jal get_float_variable +/* FCDD0 802D8420 0C0B210B */ jal evt_get_float_variable /* FCDD4 802D8424 26310004 */ addiu $s1, $s1, 4 /* FCDD8 802D8428 8E250000 */ lw $a1, ($s1) /* FCDDC 802D842C 8FA400C8 */ lw $a0, 0xc8($sp) /* FCDE0 802D8430 26310004 */ addiu $s1, $s1, 4 -/* FCDE4 802D8434 0C0B210B */ jal get_float_variable +/* FCDE4 802D8434 0C0B210B */ jal evt_get_float_variable /* FCDE8 802D8438 E7A00058 */ swc1 $f0, 0x58($sp) /* FCDEC 802D843C 8E250000 */ lw $a1, ($s1) /* FCDF0 802D8440 26310004 */ addiu $s1, $s1, 4 /* FCDF4 802D8444 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCDF8 802D8448 0C0B210B */ jal get_float_variable +/* FCDF8 802D8448 0C0B210B */ jal evt_get_float_variable /* FCDFC 802D844C 46000506 */ mov.s $f20, $f0 /* FCE00 802D8450 8E250000 */ lw $a1, ($s1) /* FCE04 802D8454 26310004 */ addiu $s1, $s1, 4 /* FCE08 802D8458 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCE0C 802D845C 0C0B210B */ jal get_float_variable +/* FCE0C 802D845C 0C0B210B */ jal evt_get_float_variable /* FCE10 802D8460 46000586 */ mov.s $f22, $f0 /* FCE14 802D8464 8E250000 */ lw $a1, ($s1) /* FCE18 802D8468 26310004 */ addiu $s1, $s1, 4 /* FCE1C 802D846C 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCE20 802D8470 0C0B210B */ jal get_float_variable +/* FCE20 802D8470 0C0B210B */ jal evt_get_float_variable /* FCE24 802D8474 46000606 */ mov.s $f24, $f0 /* FCE28 802D8478 8E250000 */ lw $a1, ($s1) /* FCE2C 802D847C 26310004 */ addiu $s1, $s1, 4 /* FCE30 802D8480 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCE34 802D8484 0C0B210B */ jal get_float_variable +/* FCE34 802D8484 0C0B210B */ jal evt_get_float_variable /* FCE38 802D8488 46000686 */ mov.s $f26, $f0 /* FCE3C 802D848C 8E250000 */ lw $a1, ($s1) /* FCE40 802D8490 26310004 */ addiu $s1, $s1, 4 /* FCE44 802D8494 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCE48 802D8498 0C0B210B */ jal get_float_variable +/* FCE48 802D8498 0C0B210B */ jal evt_get_float_variable /* FCE4C 802D849C 46000706 */ mov.s $f28, $f0 /* FCE50 802D84A0 8E250000 */ lw $a1, ($s1) /* FCE54 802D84A4 26310004 */ addiu $s1, $s1, 4 /* FCE58 802D84A8 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCE5C 802D84AC 0C0B210B */ jal get_float_variable +/* FCE5C 802D84AC 0C0B210B */ jal evt_get_float_variable /* FCE60 802D84B0 46000786 */ mov.s $f30, $f0 /* FCE64 802D84B4 8E250000 */ lw $a1, ($s1) /* FCE68 802D84B8 8FA400C8 */ lw $a0, 0xc8($sp) /* FCE6C 802D84BC 26310004 */ addiu $s1, $s1, 4 -/* FCE70 802D84C0 0C0B210B */ jal get_float_variable +/* FCE70 802D84C0 0C0B210B */ jal evt_get_float_variable /* FCE74 802D84C4 E7A0005C */ swc1 $f0, 0x5c($sp) /* FCE78 802D84C8 8E250000 */ lw $a1, ($s1) /* FCE7C 802D84CC 8FA400C8 */ lw $a0, 0xc8($sp) /* FCE80 802D84D0 26310004 */ addiu $s1, $s1, 4 -/* FCE84 802D84D4 0C0B210B */ jal get_float_variable +/* FCE84 802D84D4 0C0B210B */ jal evt_get_float_variable /* FCE88 802D84D8 E7A00060 */ swc1 $f0, 0x60($sp) /* FCE8C 802D84DC 8E250000 */ lw $a1, ($s1) /* FCE90 802D84E0 8FA400C8 */ lw $a0, 0xc8($sp) /* FCE94 802D84E4 26310004 */ addiu $s1, $s1, 4 -/* FCE98 802D84E8 0C0B210B */ jal get_float_variable +/* FCE98 802D84E8 0C0B210B */ jal evt_get_float_variable /* FCE9C 802D84EC E7A00064 */ swc1 $f0, 0x64($sp) /* FCEA0 802D84F0 8E250000 */ lw $a1, ($s1) /* FCEA4 802D84F4 8FA400C8 */ lw $a0, 0xc8($sp) /* FCEA8 802D84F8 26310004 */ addiu $s1, $s1, 4 -/* FCEAC 802D84FC 0C0B210B */ jal get_float_variable +/* FCEAC 802D84FC 0C0B210B */ jal evt_get_float_variable /* FCEB0 802D8500 E7A00068 */ swc1 $f0, 0x68($sp) /* FCEB4 802D8504 8E250000 */ lw $a1, ($s1) /* FCEB8 802D8508 8FA400C8 */ lw $a0, 0xc8($sp) -/* FCEBC 802D850C 0C0B210B */ jal get_float_variable +/* FCEBC 802D850C 0C0B210B */ jal evt_get_float_variable /* FCEC0 802D8510 26520004 */ addiu $s2, $s2, 4 /* FCEC4 802D8514 8E450000 */ lw $a1, ($s2) /* FCEC8 802D8518 26520010 */ addiu $s2, $s2, 0x10 @@ -436,7 +436,7 @@ glabel L802D88A8_FD258 .L802D88D0: /* FD280 802D88D0 8FA400C8 */ lw $a0, 0xc8($sp) /* FD284 802D88D4 8FA60030 */ lw $a2, 0x30($sp) -/* FD288 802D88D8 0C0B2026 */ jal set_variable +/* FD288 802D88D8 0C0B2026 */ jal evt_set_variable /* FD28C 802D88DC 0260282D */ daddu $a1, $s3, $zero /* FD290 802D88E0 080B65A4 */ j .L802D9690 /* FD294 802D88E4 00000000 */ nop @@ -595,7 +595,7 @@ glabel L802D8AE8_FD498 .L802D8B08: /* FD4B8 802D8B08 8FA400C8 */ lw $a0, 0xc8($sp) /* FD4BC 802D8B0C 8FA60038 */ lw $a2, 0x38($sp) -/* FD4C0 802D8B10 0C0B2026 */ jal set_variable +/* FD4C0 802D8B10 0C0B2026 */ jal evt_set_variable /* FD4C4 802D8B14 8FA5006C */ lw $a1, 0x6c($sp) /* FD4C8 802D8B18 080B65A4 */ j .L802D9690 /* FD4CC 802D8B1C 00000000 */ nop @@ -726,7 +726,7 @@ glabel L802D8CC0_FD670 .L802D8CDC: /* FD68C 802D8CDC 8FA400C8 */ lw $a0, 0xc8($sp) /* FD690 802D8CE0 8FA60034 */ lw $a2, 0x34($sp) -/* FD694 802D8CE4 0C0B2026 */ jal set_variable +/* FD694 802D8CE4 0C0B2026 */ jal evt_set_variable /* FD698 802D8CE8 0200282D */ daddu $a1, $s0, $zero /* FD69C 802D8CEC 080B65A4 */ j .L802D9690 /* FD6A0 802D8CF0 00000000 */ nop @@ -743,7 +743,7 @@ glabel L802D8CF4_FD6A4 /* FD6C8 802D8D18 AFA20020 */ sw $v0, 0x20($sp) /* FD6CC 802D8D1C 8FA400C8 */ lw $a0, 0xc8($sp) /* FD6D0 802D8D20 8FA6003C */ lw $a2, 0x3c($sp) -/* FD6D4 802D8D24 0C0B2026 */ jal set_variable +/* FD6D4 802D8D24 0C0B2026 */ jal evt_set_variable /* FD6D8 802D8D28 0220282D */ daddu $a1, $s1, $zero /* FD6DC 802D8D2C 080B65A4 */ j .L802D9690 /* FD6E0 802D8D30 00000000 */ nop @@ -1421,7 +1421,7 @@ glabel L802D9688_FE038 /* FE044 802D9694 3C05FE36 */ lui $a1, 0xfe36 /* FE048 802D9698 8FA400C8 */ lw $a0, 0xc8($sp) /* FE04C 802D969C 34A53C8F */ ori $a1, $a1, 0x3c8f -/* FE050 802D96A0 0C0B2026 */ jal set_variable +/* FE050 802D96A0 0C0B2026 */ jal evt_set_variable /* FE054 802D96A4 02A0302D */ daddu $a2, $s5, $zero .L802D96A8: /* FE058 802D96A8 8FBF0094 */ lw $ra, 0x94($sp) diff --git a/ver/us/asm/nonmatchings/evt/fx_api/ShowEmote.s b/ver/us/asm/nonmatchings/evt/fx_api/ShowEmote.s index 255151f7a0..ee74cbbe9e 100644 --- a/ver/us/asm/nonmatchings/evt/fx_api/ShowEmote.s +++ b/ver/us/asm/nonmatchings/evt/fx_api/ShowEmote.s @@ -27,7 +27,7 @@ glabel ShowEmote /* FC2A8 802D78F8 8E050000 */ lw $a1, ($s0) /* FC2AC 802D78FC 26100004 */ addiu $s0, $s0, 4 /* FC2B0 802D7900 0220202D */ daddu $a0, $s1, $zero -/* FC2B4 802D7904 0C0B210B */ jal get_float_variable +/* FC2B4 802D7904 0C0B210B */ jal evt_get_float_variable /* FC2B8 802D7908 0040A82D */ daddu $s5, $v0, $zero /* FC2BC 802D790C 8E050000 */ lw $a1, ($s0) /* FC2C0 802D7910 26100004 */ addiu $s0, $s0, 4 @@ -42,21 +42,21 @@ glabel ShowEmote /* FC2E4 802D7934 8E050000 */ lw $a1, ($s0) /* FC2E8 802D7938 26100004 */ addiu $s0, $s0, 4 /* FC2EC 802D793C 0220202D */ daddu $a0, $s1, $zero -/* FC2F0 802D7940 0C0B210B */ jal get_float_variable +/* FC2F0 802D7940 0C0B210B */ jal evt_get_float_variable /* FC2F4 802D7944 0040902D */ daddu $s2, $v0, $zero /* FC2F8 802D7948 8E050000 */ lw $a1, ($s0) /* FC2FC 802D794C 26100004 */ addiu $s0, $s0, 4 /* FC300 802D7950 0220202D */ daddu $a0, $s1, $zero -/* FC304 802D7954 0C0B210B */ jal get_float_variable +/* FC304 802D7954 0C0B210B */ jal evt_get_float_variable /* FC308 802D7958 46000606 */ mov.s $f24, $f0 /* FC30C 802D795C 8E050000 */ lw $a1, ($s0) /* FC310 802D7960 26100004 */ addiu $s0, $s0, 4 /* FC314 802D7964 0220202D */ daddu $a0, $s1, $zero -/* FC318 802D7968 0C0B210B */ jal get_float_variable +/* FC318 802D7968 0C0B210B */ jal evt_get_float_variable /* FC31C 802D796C 46000586 */ mov.s $f22, $f0 /* FC320 802D7970 0220202D */ daddu $a0, $s1, $zero /* FC324 802D7974 8E050000 */ lw $a1, ($s0) -/* FC328 802D7978 0C0B210B */ jal get_float_variable +/* FC328 802D7978 0C0B210B */ jal evt_get_float_variable /* FC32C 802D797C 46000506 */ mov.s $f20, $f0 /* FC330 802D7980 12400006 */ beqz $s2, .L802D799C /* FC334 802D7984 3C055555 */ lui $a1, 0x5555 diff --git a/ver/us/asm/nonmatchings/evt/fx_api/ShowSleepBubble.s b/ver/us/asm/nonmatchings/evt/fx_api/ShowSleepBubble.s index f4b9b43214..37f0334848 100644 --- a/ver/us/asm/nonmatchings/evt/fx_api/ShowSleepBubble.s +++ b/ver/us/asm/nonmatchings/evt/fx_api/ShowSleepBubble.s @@ -26,7 +26,7 @@ glabel ShowSleepBubble /* FCA2C 802D807C 8E050000 */ lw $a1, ($s0) /* FCA30 802D8080 26100004 */ addiu $s0, $s0, 4 /* FCA34 802D8084 0220202D */ daddu $a0, $s1, $zero -/* FCA38 802D8088 0C0B210B */ jal get_float_variable +/* FCA38 802D8088 0C0B210B */ jal evt_get_float_variable /* FCA3C 802D808C 0040A02D */ daddu $s4, $v0, $zero /* FCA40 802D8090 8E050000 */ lw $a1, ($s0) /* FCA44 802D8094 26100004 */ addiu $s0, $s0, 4 @@ -36,22 +36,22 @@ glabel ShowSleepBubble /* FCA54 802D80A4 8E050000 */ lw $a1, ($s0) /* FCA58 802D80A8 26100004 */ addiu $s0, $s0, 4 /* FCA5C 802D80AC 0220202D */ daddu $a0, $s1, $zero -/* FCA60 802D80B0 0C0B210B */ jal get_float_variable +/* FCA60 802D80B0 0C0B210B */ jal evt_get_float_variable /* FCA64 802D80B4 0040902D */ daddu $s2, $v0, $zero /* FCA68 802D80B8 8E050000 */ lw $a1, ($s0) /* FCA6C 802D80BC 26100004 */ addiu $s0, $s0, 4 /* FCA70 802D80C0 0220202D */ daddu $a0, $s1, $zero -/* FCA74 802D80C4 0C0B210B */ jal get_float_variable +/* FCA74 802D80C4 0C0B210B */ jal evt_get_float_variable /* FCA78 802D80C8 46000606 */ mov.s $f24, $f0 /* FCA7C 802D80CC 8E050000 */ lw $a1, ($s0) /* FCA80 802D80D0 26100004 */ addiu $s0, $s0, 4 /* FCA84 802D80D4 0220202D */ daddu $a0, $s1, $zero -/* FCA88 802D80D8 0C0B210B */ jal get_float_variable +/* FCA88 802D80D8 0C0B210B */ jal evt_get_float_variable /* FCA8C 802D80DC 46000586 */ mov.s $f22, $f0 /* FCA90 802D80E0 8E050000 */ lw $a1, ($s0) /* FCA94 802D80E4 26100004 */ addiu $s0, $s0, 4 /* FCA98 802D80E8 0220202D */ daddu $a0, $s1, $zero -/* FCA9C 802D80EC 0C0B210B */ jal get_float_variable +/* FCA9C 802D80EC 0C0B210B */ jal evt_get_float_variable /* FCAA0 802D80F0 46000506 */ mov.s $f20, $f0 /* FCAA4 802D80F4 8E100000 */ lw $s0, ($s0) /* FCAA8 802D80F8 12400006 */ beqz $s2, .L802D8114 @@ -128,7 +128,7 @@ glabel ShowSleepBubble /* FCBB0 802D8200 AFA20018 */ sw $v0, 0x18($sp) /* FCBB4 802D8204 0220202D */ daddu $a0, $s1, $zero /* FCBB8 802D8208 8FA60020 */ lw $a2, 0x20($sp) -/* FCBBC 802D820C 0C0B2026 */ jal set_variable +/* FCBBC 802D820C 0C0B2026 */ jal evt_set_variable /* FCBC0 802D8210 0200282D */ daddu $a1, $s0, $zero .L802D8214: /* FCBC4 802D8214 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s index 35870ad4a2..7e8c555a13 100644 --- a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s +++ b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s @@ -17,27 +17,27 @@ glabel func_802D7690 /* FC070 802D76C0 F7B40028 */ sdc1 $f20, 0x28($sp) /* FC074 802D76C4 8E50000C */ lw $s0, 0xc($s2) /* FC078 802D76C8 8E050000 */ lw $a1, ($s0) -/* FC07C 802D76CC 0C0B210B */ jal get_float_variable +/* FC07C 802D76CC 0C0B210B */ jal evt_get_float_variable /* FC080 802D76D0 26100004 */ addiu $s0, $s0, 4 /* FC084 802D76D4 8E050000 */ lw $a1, ($s0) /* FC088 802D76D8 26100004 */ addiu $s0, $s0, 4 /* FC08C 802D76DC 0240202D */ daddu $a0, $s2, $zero -/* FC090 802D76E0 0C0B210B */ jal get_float_variable +/* FC090 802D76E0 0C0B210B */ jal evt_get_float_variable /* FC094 802D76E4 E7A00010 */ swc1 $f0, 0x10($sp) /* FC098 802D76E8 8E050000 */ lw $a1, ($s0) /* FC09C 802D76EC 26100004 */ addiu $s0, $s0, 4 /* FC0A0 802D76F0 0240202D */ daddu $a0, $s2, $zero -/* FC0A4 802D76F4 0C0B210B */ jal get_float_variable +/* FC0A4 802D76F4 0C0B210B */ jal evt_get_float_variable /* FC0A8 802D76F8 46000786 */ mov.s $f30, $f0 /* FC0AC 802D76FC 8E050000 */ lw $a1, ($s0) /* FC0B0 802D7700 26100004 */ addiu $s0, $s0, 4 /* FC0B4 802D7704 0240202D */ daddu $a0, $s2, $zero -/* FC0B8 802D7708 0C0B210B */ jal get_float_variable +/* FC0B8 802D7708 0C0B210B */ jal evt_get_float_variable /* FC0BC 802D770C E7A00014 */ swc1 $f0, 0x14($sp) /* FC0C0 802D7710 8E050000 */ lw $a1, ($s0) /* FC0C4 802D7714 26100004 */ addiu $s0, $s0, 4 /* FC0C8 802D7718 0240202D */ daddu $a0, $s2, $zero -/* FC0CC 802D771C 0C0B210B */ jal get_float_variable +/* FC0CC 802D771C 0C0B210B */ jal evt_get_float_variable /* FC0D0 802D7720 46000586 */ mov.s $f22, $f0 /* FC0D4 802D7724 0240202D */ daddu $a0, $s2, $zero /* FC0D8 802D7728 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7E08.s b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7E08.s index c6dac1ee6a..6477907b0f 100644 --- a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7E08.s +++ b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7E08.s @@ -27,7 +27,7 @@ glabel func_802D7E08 /* FC810 802D7E60 8E050000 */ lw $a1, ($s0) /* FC814 802D7E64 26100004 */ addiu $s0, $s0, 4 /* FC818 802D7E68 0220202D */ daddu $a0, $s1, $zero -/* FC81C 802D7E6C 0C0B210B */ jal get_float_variable +/* FC81C 802D7E6C 0C0B210B */ jal evt_get_float_variable /* FC820 802D7E70 0040A02D */ daddu $s4, $v0, $zero /* FC824 802D7E74 8E050000 */ lw $a1, ($s0) /* FC828 802D7E78 26100004 */ addiu $s0, $s0, 4 @@ -37,22 +37,22 @@ glabel func_802D7E08 /* FC838 802D7E88 8E050000 */ lw $a1, ($s0) /* FC83C 802D7E8C 26100004 */ addiu $s0, $s0, 4 /* FC840 802D7E90 0220202D */ daddu $a0, $s1, $zero -/* FC844 802D7E94 0C0B210B */ jal get_float_variable +/* FC844 802D7E94 0C0B210B */ jal evt_get_float_variable /* FC848 802D7E98 0040902D */ daddu $s2, $v0, $zero /* FC84C 802D7E9C 8E050000 */ lw $a1, ($s0) /* FC850 802D7EA0 26100004 */ addiu $s0, $s0, 4 /* FC854 802D7EA4 0220202D */ daddu $a0, $s1, $zero -/* FC858 802D7EA8 0C0B210B */ jal get_float_variable +/* FC858 802D7EA8 0C0B210B */ jal evt_get_float_variable /* FC85C 802D7EAC 46000686 */ mov.s $f26, $f0 /* FC860 802D7EB0 8E050000 */ lw $a1, ($s0) /* FC864 802D7EB4 26100004 */ addiu $s0, $s0, 4 /* FC868 802D7EB8 0220202D */ daddu $a0, $s1, $zero -/* FC86C 802D7EBC 0C0B210B */ jal get_float_variable +/* FC86C 802D7EBC 0C0B210B */ jal evt_get_float_variable /* FC870 802D7EC0 46000606 */ mov.s $f24, $f0 /* FC874 802D7EC4 8E050000 */ lw $a1, ($s0) /* FC878 802D7EC8 26100004 */ addiu $s0, $s0, 4 /* FC87C 802D7ECC 0220202D */ daddu $a0, $s1, $zero -/* FC880 802D7ED0 0C0B210B */ jal get_float_variable +/* FC880 802D7ED0 0C0B210B */ jal evt_get_float_variable /* FC884 802D7ED4 46000586 */ mov.s $f22, $f0 /* FC888 802D7ED8 0220202D */ daddu $a0, $s1, $zero /* FC88C 802D7EDC 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/evt/si/get_float_variable.s b/ver/us/asm/nonmatchings/evt/si/evt_get_float_variable.s similarity index 96% rename from ver/us/asm/nonmatchings/evt/si/get_float_variable.s rename to ver/us/asm/nonmatchings/evt/si/evt_get_float_variable.s index b986a37a7a..cacb60225a 100644 --- a/ver/us/asm/nonmatchings/evt/si/get_float_variable.s +++ b/ver/us/asm/nonmatchings/evt/si/evt_get_float_variable.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel get_float_variable +glabel evt_get_float_variable /* ECDDC 802C842C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ECDE0 802C8430 3C02EFE8 */ lui $v0, 0xefe8 /* ECDE4 802C8434 34422080 */ ori $v0, $v0, 0x2080 @@ -15,7 +15,7 @@ glabel get_float_variable /* ECE04 802C8454 3C02F2E3 */ lui $v0, 0xf2e3 .L802C8458: /* ECE08 802C8458 44850000 */ mtc1 $a1, $f0 -/* ECE0C 802C845C 00000000 */ nop +/* ECE0C 802C845C 00000000 */ nop /* ECE10 802C8460 080B218D */ j .L802C8634 /* ECE14 802C8464 46800020 */ cvt.s.w $f0, $f0 .L802C8468: @@ -112,10 +112,10 @@ glabel get_float_variable .L802C85B4: /* ECF64 802C85B4 00622824 */ and $a1, $v1, $v0 /* ECF68 802C85B8 14A0001E */ bnez $a1, .L802C8634 -/* ECF6C 802C85BC 00000000 */ nop +/* ECF6C 802C85BC 00000000 */ nop /* ECF70 802C85C0 44800000 */ mtc1 $zero, $f0 /* ECF74 802C85C4 080B218D */ j .L802C8634 -/* ECF78 802C85C8 00000000 */ nop +/* ECF78 802C85C8 00000000 */ nop .L802C85CC: /* ECF7C 802C85CC 3442A600 */ ori $v0, $v0, 0xa600 /* ECF80 802C85D0 0045102A */ slt $v0, $v0, $a1 @@ -144,8 +144,8 @@ glabel get_float_variable /* ECFD4 802C8624 00821021 */ addu $v0, $a0, $v0 /* ECFD8 802C8628 8C440084 */ lw $a0, 0x84($v0) .L802C862C: -/* ECFDC 802C862C 0C0B1248 */ jal fixed_var_to_float -/* ECFE0 802C8630 00000000 */ nop +/* ECFDC 802C862C 0C0B1248 */ jal evt_fixed_var_to_float +/* ECFE0 802C8630 00000000 */ nop .L802C8634: /* ECFE4 802C8634 8FBF0010 */ lw $ra, 0x10($sp) /* ECFE8 802C8638 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/evt/si/get_variable.s b/ver/us/asm/nonmatchings/evt/si/evt_get_variable.s similarity index 96% rename from ver/us/asm/nonmatchings/evt/si/get_variable.s rename to ver/us/asm/nonmatchings/evt/si/evt_get_variable.s index f994606e0e..5b04f0bca5 100644 --- a/ver/us/asm/nonmatchings/evt/si/get_variable.s +++ b/ver/us/asm/nonmatchings/evt/si/evt_get_variable.s @@ -17,12 +17,12 @@ glabel get_variable /* EC49C 802C7AEC 00C5102A */ slt $v0, $a2, $a1 /* EC4A0 802C7AF0 14400007 */ bnez $v0, .L802C7B10 /* EC4A4 802C7AF4 3C02F414 */ lui $v0, 0xf414 -/* EC4A8 802C7AF8 0C0B1248 */ jal fixed_var_to_float +/* EC4A8 802C7AF8 0C0B1248 */ jal evt_fixed_var_to_float /* EC4AC 802C7AFC 00A0202D */ daddu $a0, $a1, $zero /* EC4B0 802C7B00 4600008D */ trunc.w.s $f2, $f0 /* EC4B4 802C7B04 44021000 */ mfc1 $v0, $f2 /* EC4B8 802C7B08 080B1F67 */ j .L802C7D9C -/* EC4BC 802C7B0C 00000000 */ nop +/* EC4BC 802C7B0C 00000000 */ nop .L802C7B10: /* EC4C0 802C7B10 34423E00 */ ori $v0, $v0, 0x3e00 /* EC4C4 802C7B14 0045102A */ slt $v0, $v0, $a1 @@ -61,7 +61,7 @@ glabel get_variable /* EC540 802C7B90 10400081 */ beqz $v0, .L802C7D98 /* EC544 802C7B94 00C5102A */ slt $v0, $a2, $a1 /* EC548 802C7B98 080B1F5F */ j .L802C7D7C -/* EC54C 802C7B9C 00000000 */ nop +/* EC54C 802C7B9C 00000000 */ nop .L802C7BA0: /* EC550 802C7BA0 34429800 */ ori $v0, $v0, 0x9800 /* EC554 802C7BA4 0045102A */ slt $v0, $v0, $a1 @@ -72,7 +72,7 @@ glabel get_variable /* EC568 802C7BB8 0C05154E */ jal get_global_byte /* EC56C 802C7BBC 00A42021 */ addu $a0, $a1, $a0 /* EC570 802C7BC0 080B1F67 */ j .L802C7D9C -/* EC574 802C7BC4 00000000 */ nop +/* EC574 802C7BC4 00000000 */ nop .L802C7BC8: /* EC578 802C7BC8 3442C500 */ ori $v0, $v0, 0xc500 /* EC57C 802C7BCC 0045102A */ slt $v0, $v0, $a1 @@ -83,7 +83,7 @@ glabel get_variable /* EC590 802C7BE0 0C051594 */ jal get_area_byte /* EC594 802C7BE4 00A42021 */ addu $a0, $a1, $a0 /* EC598 802C7BE8 080B1F67 */ j .L802C7D9C -/* EC59C 802C7BEC 00000000 */ nop +/* EC59C 802C7BEC 00000000 */ nop .L802C7BF0: /* EC5A0 802C7BF0 3442F200 */ ori $v0, $v0, 0xf200 /* EC5A4 802C7BF4 0045102A */ slt $v0, $v0, $a1 @@ -94,7 +94,7 @@ glabel get_variable /* EC5B8 802C7C08 0C05152F */ jal get_global_flag /* EC5BC 802C7C0C 00A42021 */ addu $a0, $a1, $a0 /* EC5C0 802C7C10 080B1F67 */ j .L802C7D9C -/* EC5C4 802C7C14 00000000 */ nop +/* EC5C4 802C7C14 00000000 */ nop .L802C7C18: /* EC5C8 802C7C18 34421F00 */ ori $v0, $v0, 0x1f00 /* EC5CC 802C7C1C 0045102A */ slt $v0, $v0, $a1 @@ -105,7 +105,7 @@ glabel get_variable /* EC5E0 802C7C30 0C05157C */ jal get_area_flag /* EC5E4 802C7C34 00A42021 */ addu $a0, $a1, $a0 /* EC5E8 802C7C38 080B1F67 */ j .L802C7D9C -/* EC5EC 802C7C3C 00000000 */ nop +/* EC5EC 802C7C3C 00000000 */ nop .L802C7C40: /* EC5F0 802C7C40 34424C00 */ ori $v0, $v0, 0x4c00 /* EC5F4 802C7C44 0045102A */ slt $v0, $v0, $a1 @@ -196,11 +196,11 @@ glabel get_variable .L802C7D7C: /* EC72C 802C7D7C 14400007 */ bnez $v0, .L802C7D9C /* EC730 802C7D80 00A0102D */ daddu $v0, $a1, $zero -/* EC734 802C7D84 0C0B1248 */ jal fixed_var_to_float +/* EC734 802C7D84 0C0B1248 */ jal evt_fixed_var_to_float /* EC738 802C7D88 00A0202D */ daddu $a0, $a1, $zero /* EC73C 802C7D8C 4600008D */ trunc.w.s $f2, $f0 /* EC740 802C7D90 44051000 */ mfc1 $a1, $f2 -/* EC744 802C7D94 00000000 */ nop +/* EC744 802C7D94 00000000 */ nop .L802C7D98: /* EC748 802C7D98 00A0102D */ daddu $v0, $a1, $zero .L802C7D9C: diff --git a/ver/us/asm/nonmatchings/evt/si/evt_handle_print_debug_var.s b/ver/us/asm/nonmatchings/evt/si/evt_handle_print_debug_var.s index 9e249ca7bd..89525998a2 100644 --- a/ver/us/asm/nonmatchings/evt/si/evt_handle_print_debug_var.s +++ b/ver/us/asm/nonmatchings/evt/si/evt_handle_print_debug_var.s @@ -99,7 +99,7 @@ glabel evt_handle_print_debug_var /* EB81C 802C6E6C 0250102A */ slt $v0, $s2, $s0 /* EB820 802C6E70 1440000D */ bnez $v0, .L802C6EA8 /* EB824 802C6E74 3C02F414 */ lui $v0, 0xf414 -/* EB828 802C6E78 0C0B1248 */ jal fixed_var_to_float +/* EB828 802C6E78 0C0B1248 */ jal evt_fixed_var_to_float /* EB82C 802C6E7C 0200202D */ daddu $a0, $s0, $zero /* EB830 802C6E80 3C04802E */ lui $a0, %hi(evtDebugPrintBuffer) /* EB834 802C6E84 2484ACA0 */ addiu $a0, $a0, %lo(evtDebugPrintBuffer) @@ -162,7 +162,7 @@ glabel evt_handle_print_debug_var .L802C6F5C: /* EB90C 802C6F5C 1440000A */ bnez $v0, .L802C6F88 /* EB910 802C6F60 00000000 */ nop -/* EB914 802C6F64 0C0B1248 */ jal fixed_var_to_float +/* EB914 802C6F64 0C0B1248 */ jal evt_fixed_var_to_float /* EB918 802C6F68 00E0202D */ daddu $a0, $a3, $zero /* EB91C 802C6F6C 46000021 */ cvt.d.s $f0, $f0 /* EB920 802C6F70 F7A00010 */ sdc1 $f0, 0x10($sp) @@ -200,7 +200,7 @@ glabel evt_handle_print_debug_var .L802C6FE8: /* EB998 802C6FE8 1440000A */ bnez $v0, .L802C7014 /* EB99C 802C6FEC 00000000 */ nop -/* EB9A0 802C6FF0 0C0B1248 */ jal fixed_var_to_float +/* EB9A0 802C6FF0 0C0B1248 */ jal evt_fixed_var_to_float /* EB9A4 802C6FF4 00E0202D */ daddu $a0, $a3, $zero /* EB9A8 802C6FF8 46000021 */ cvt.d.s $f0, $f0 /* EB9AC 802C6FFC F7A00010 */ sdc1 $f0, 0x10($sp) @@ -238,7 +238,7 @@ glabel evt_handle_print_debug_var .L802C7074: /* EBA24 802C7074 1440000A */ bnez $v0, .L802C70A0 /* EBA28 802C7078 00000000 */ nop -/* EBA2C 802C707C 0C0B1248 */ jal fixed_var_to_float +/* EBA2C 802C707C 0C0B1248 */ jal evt_fixed_var_to_float /* EBA30 802C7080 00E0202D */ daddu $a0, $a3, $zero /* EBA34 802C7084 46000021 */ cvt.d.s $f0, $f0 /* EBA38 802C7088 F7A00010 */ sdc1 $f0, 0x10($sp) @@ -377,7 +377,7 @@ glabel evt_handle_print_debug_var /* EBC20 802C7270 0047102A */ slt $v0, $v0, $a3 /* EBC24 802C7274 1440000A */ bnez $v0, .L802C72A0 /* EBC28 802C7278 00000000 */ nop -/* EBC2C 802C727C 0C0B1248 */ jal fixed_var_to_float +/* EBC2C 802C727C 0C0B1248 */ jal evt_fixed_var_to_float /* EBC30 802C7280 00E0202D */ daddu $a0, $a3, $zero /* EBC34 802C7284 46000021 */ cvt.d.s $f0, $f0 /* EBC38 802C7288 F7A00010 */ sdc1 $f0, 0x10($sp) @@ -419,7 +419,7 @@ glabel evt_handle_print_debug_var /* EBCBC 802C730C 0047102A */ slt $v0, $v0, $a3 /* EBCC0 802C7310 1440000D */ bnez $v0, .L802C7348 /* EBCC4 802C7314 00000000 */ nop -/* EBCC8 802C7318 0C0B1248 */ jal fixed_var_to_float +/* EBCC8 802C7318 0C0B1248 */ jal evt_fixed_var_to_float /* EBCCC 802C731C 00E0202D */ daddu $a0, $a3, $zero /* EBCD0 802C7320 46000021 */ cvt.d.s $f0, $f0 /* EBCD4 802C7324 F7A00010 */ sdc1 $f0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/evt/si/set_float_variable.s b/ver/us/asm/nonmatchings/evt/si/evt_set_float_variable.s similarity index 96% rename from ver/us/asm/nonmatchings/evt/si/set_float_variable.s rename to ver/us/asm/nonmatchings/evt/si/evt_set_float_variable.s index ca345f0a9f..44865d1a27 100644 --- a/ver/us/asm/nonmatchings/evt/si/set_float_variable.s +++ b/ver/us/asm/nonmatchings/evt/si/evt_set_float_variable.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel set_float_variable +glabel evt_set_float_variable /* ECFF0 802C8640 27BDFFE0 */ addiu $sp, $sp, -0x20 /* ECFF4 802C8644 AFB10014 */ sw $s1, 0x14($sp) /* ECFF8 802C8648 0080882D */ daddu $s1, $a0, $zero @@ -28,7 +28,7 @@ glabel set_float_variable /* ED04C 802C869C 8E22013C */ lw $v0, 0x13c($s1) /* ED050 802C86A0 00058080 */ sll $s0, $a1, 2 /* ED054 802C86A4 02021021 */ addu $v0, $s0, $v0 -/* ED058 802C86A8 0C0B125B */ jal float_to_fixed_var +/* ED058 802C86A8 0C0B125B */ jal evt_float_to_fixed_var /* ED05C 802C86AC 8C520000 */ lw $s2, ($v0) /* ED060 802C86B0 8E23013C */ lw $v1, 0x13c($s1) /* ED064 802C86B4 0240202D */ daddu $a0, $s2, $zero @@ -132,7 +132,7 @@ glabel set_float_variable /* ED1C4 802C8814 8E220000 */ lw $v0, ($s1) /* ED1C8 802C8818 00058080 */ sll $s0, $a1, 2 /* ED1CC 802C881C 02021021 */ addu $v0, $s0, $v0 -/* ED1D0 802C8820 0C0B125B */ jal float_to_fixed_var +/* ED1D0 802C8820 0C0B125B */ jal evt_float_to_fixed_var /* ED1D4 802C8824 8C520000 */ lw $s2, ($v0) /* ED1D8 802C8828 8E230000 */ lw $v1, ($s1) /* ED1DC 802C882C 0240202D */ daddu $a0, $s2, $zero @@ -149,12 +149,12 @@ glabel set_float_variable /* ED204 802C8854 00A22821 */ addu $a1, $a1, $v0 /* ED208 802C8858 00058080 */ sll $s0, $a1, 2 /* ED20C 802C885C 02308021 */ addu $s0, $s1, $s0 -/* ED210 802C8860 0C0B125B */ jal float_to_fixed_var +/* ED210 802C8860 0C0B125B */ jal evt_float_to_fixed_var /* ED214 802C8864 8E120084 */ lw $s2, 0x84($s0) /* ED218 802C8868 AE020084 */ sw $v0, 0x84($s0) /* ED21C 802C886C 0240202D */ daddu $a0, $s2, $zero .L802C8870: -/* ED220 802C8870 0C0B1248 */ jal fixed_var_to_float +/* ED220 802C8870 0C0B1248 */ jal evt_fixed_var_to_float /* ED224 802C8874 00000000 */ nop .L802C8878: /* ED228 802C8878 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/evt/si/set_variable.s b/ver/us/asm/nonmatchings/evt/si/evt_set_variable.s similarity index 99% rename from ver/us/asm/nonmatchings/evt/si/set_variable.s rename to ver/us/asm/nonmatchings/evt/si/evt_set_variable.s index 30cac1a806..db4fce7c0a 100644 --- a/ver/us/asm/nonmatchings/evt/si/set_variable.s +++ b/ver/us/asm/nonmatchings/evt/si/evt_set_variable.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel set_variable +glabel evt_set_variable /* ECA48 802C8098 27BDFFE0 */ addiu $sp, $sp, -0x20 /* ECA4C 802C809C 0080382D */ daddu $a3, $a0, $zero /* ECA50 802C80A0 AFB00010 */ sw $s0, 0x10($sp) @@ -19,7 +19,7 @@ glabel set_variable /* ECA80 802C80D0 0050102A */ slt $v0, $v0, $s0 /* ECA84 802C80D4 14400007 */ bnez $v0, .L802C80F4 /* ECA88 802C80D8 3C02F414 */ lui $v0, 0xf414 -/* ECA8C 802C80DC 0C0B1248 */ jal fixed_var_to_float +/* ECA8C 802C80DC 0C0B1248 */ jal evt_fixed_var_to_float /* ECA90 802C80E0 0240202D */ daddu $a0, $s2, $zero /* ECA94 802C80E4 4600008D */ trunc.w.s $f2, $f0 /* ECA98 802C80E8 44021000 */ mfc1 $v0, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s index 21182dff5a..b453e4aec7 100644 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s +++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s @@ -50,7 +50,7 @@ glabel L80242458_96B618 /* 96B624 80242464 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) /* 96B628 80242468 3C018025 */ lui $at, %hi(D_8024EF88) /* 96B62C 8024246C AC20EF88 */ sw $zero, %lo(D_8024EF88)($at) -/* 96B630 80242470 0C0B2026 */ jal set_variable +/* 96B630 80242470 0C0B2026 */ jal evt_set_variable /* 96B634 80242474 24060001 */ addiu $a2, $zero, 1 /* 96B638 80242478 3C028025 */ lui $v0, %hi(D_8024F010) /* 96B63C 8024247C 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) @@ -135,7 +135,7 @@ glabel L8024252C_96B6EC /* 96B770 802425B0 34A5D489 */ ori $a1, $a1, 0xd489 /* 96B774 802425B4 3C048025 */ lui $a0, %hi(D_8024EFCC) /* 96B778 802425B8 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B77C 802425BC 0C0B2026 */ jal set_variable +/* 96B77C 802425BC 0C0B2026 */ jal evt_set_variable /* 96B780 802425C0 24060002 */ addiu $a2, $zero, 2 /* 96B784 802425C4 08090BA5 */ j L80242E94_96C054 /* 96B788 802425C8 AE000000 */ sw $zero, ($s0) @@ -210,7 +210,7 @@ glabel L80242660_96B820 /* 96B890 802426D0 3C048025 */ lui $a0, %hi(D_8024EFCC) /* 96B894 802426D4 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) /* 96B898 802426D8 24060005 */ addiu $a2, $zero, 5 -/* 96B89C 802426DC 0C0B2026 */ jal set_variable +/* 96B89C 802426DC 0C0B2026 */ jal evt_set_variable /* 96B8A0 802426E0 ACE00000 */ sw $zero, ($a3) /* 96B8A4 802426E4 24040203 */ addiu $a0, $zero, 0x203 /* 96B8A8 802426E8 0000282D */ daddu $a1, $zero, $zero @@ -264,7 +264,7 @@ glabel L802426F4_96B8B4 /* 96B960 802427A0 34A5D489 */ ori $a1, $a1, 0xd489 /* 96B964 802427A4 3C048025 */ lui $a0, %hi(D_8024EFCC) /* 96B968 802427A8 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B96C 802427AC 0C0B2026 */ jal set_variable +/* 96B96C 802427AC 0C0B2026 */ jal evt_set_variable /* 96B970 802427B0 AE000000 */ sw $zero, ($s0) /* 96B974 802427B4 24040203 */ addiu $a0, $zero, 0x203 /* 96B978 802427B8 0000282D */ daddu $a1, $zero, $zero @@ -320,7 +320,7 @@ glabel L802427C4_96B984 /* 96BA38 80242878 34A5D489 */ ori $a1, $a1, 0xd489 /* 96BA3C 8024287C 3C048025 */ lui $a0, %hi(D_8024EFCC) /* 96BA40 80242880 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96BA44 80242884 0C0B2026 */ jal set_variable +/* 96BA44 80242884 0C0B2026 */ jal evt_set_variable /* 96BA48 80242888 AE000000 */ sw $zero, ($s0) /* 96BA4C 8024288C 24040203 */ addiu $a0, $zero, 0x203 /* 96BA50 80242890 0000282D */ daddu $a1, $zero, $zero @@ -380,7 +380,7 @@ glabel L802428A8_96BA68 /* 96BB1C 8024295C 34A5D489 */ ori $a1, $a1, 0xd489 /* 96BB20 80242960 3C048025 */ lui $a0, %hi(D_8024EFCC) /* 96BB24 80242964 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96BB28 80242968 0C0B2026 */ jal set_variable +/* 96BB28 80242968 0C0B2026 */ jal evt_set_variable /* 96BB2C 8024296C AE000000 */ sw $zero, ($s0) /* 96BB30 80242970 08090BA5 */ j L80242E94_96C054 /* 96BB34 80242974 00000000 */ nop @@ -438,7 +438,7 @@ glabel L802429D0_96BB90 /* 96BBFC 80242A3C 3C048025 */ lui $a0, %hi(D_8024EFCC) /* 96BC00 80242A40 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) .L80242A44: -/* 96BC04 80242A44 0C0B2026 */ jal set_variable +/* 96BC04 80242A44 0C0B2026 */ jal evt_set_variable /* 96BC08 80242A48 ACE00000 */ sw $zero, ($a3) /* 96BC0C 80242A4C 08090BA5 */ j L80242E94_96C054 /* 96BC10 80242A50 00000000 */ nop @@ -489,7 +489,7 @@ glabel L80242A80_96BC40 /* 96BCBC 80242AFC E4400008 */ swc1 $f0, 8($v0) /* 96BCC0 80242B00 E4420010 */ swc1 $f2, 0x10($v0) /* 96BCC4 80242B04 E440002C */ swc1 $f0, 0x2c($v0) -/* 96BCC8 80242B08 0C0B2026 */ jal set_variable +/* 96BCC8 80242B08 0C0B2026 */ jal evt_set_variable /* 96BCCC 80242B0C E4420034 */ swc1 $f2, 0x34($v0) /* 96BCD0 80242B10 24040001 */ addiu $a0, $zero, 1 /* 96BCD4 80242B14 27A50048 */ addiu $a1, $sp, 0x48 @@ -685,7 +685,7 @@ glabel L80242C2C_96BDEC /* 96BFAC 80242DEC 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) /* 96BFB0 80242DF0 2406000D */ addiu $a2, $zero, 0xd /* 96BFB4 80242DF4 E608002C */ swc1 $f8, 0x2c($s0) -/* 96BFB8 80242DF8 0C0B2026 */ jal set_variable +/* 96BFB8 80242DF8 0C0B2026 */ jal evt_set_variable /* 96BFBC 80242DFC ACE00000 */ sw $zero, ($a3) /* 96BFC0 80242E00 24040001 */ addiu $a0, $zero, 1 /* 96BFC4 80242E04 27A50068 */ addiu $a1, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242A30_DF9430.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242A30_DF9430.s index d7538e5faa..b6caff0262 100644 --- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242A30_DF9430.s +++ b/ver/us/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242A30_DF9430.s @@ -17,16 +17,16 @@ glabel func_80242A30_DF9430 /* DF9460 80242A60 8E050000 */ lw $a1, ($s0) /* DF9464 80242A64 26100004 */ addiu $s0, $s0, 4 /* DF9468 80242A68 0220202D */ daddu $a0, $s1, $zero -/* DF946C 80242A6C 0C0B210B */ jal get_float_variable +/* DF946C 80242A6C 0C0B210B */ jal evt_get_float_variable /* DF9470 80242A70 0040902D */ daddu $s2, $v0, $zero /* DF9474 80242A74 8E050000 */ lw $a1, ($s0) /* DF9478 80242A78 26100004 */ addiu $s0, $s0, 4 /* DF947C 80242A7C 0220202D */ daddu $a0, $s1, $zero -/* DF9480 80242A80 0C0B210B */ jal get_float_variable +/* DF9480 80242A80 0C0B210B */ jal evt_get_float_variable /* DF9484 80242A84 46000586 */ mov.s $f22, $f0 /* DF9488 80242A88 0220202D */ daddu $a0, $s1, $zero /* DF948C 80242A8C 8E050000 */ lw $a1, ($s0) -/* DF9490 80242A90 0C0B210B */ jal get_float_variable +/* DF9490 80242A90 0C0B210B */ jal evt_get_float_variable /* DF9494 80242A94 46000506 */ mov.s $f20, $f0 /* DF9498 80242A98 8E42000C */ lw $v0, 0xc($s2) /* DF949C 80242A9C E4560008 */ swc1 $f22, 8($v0) diff --git a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s index a7726b656e..84969ef62f 100644 --- a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s +++ b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s @@ -18,7 +18,7 @@ glabel func_80242754_E07AB4 /* E07AE8 80242788 0040282D */ daddu $a1, $v0, $zero /* E07AEC 8024278C 0220202D */ daddu $a0, $s1, $zero /* E07AF0 80242790 0040302D */ daddu $a2, $v0, $zero -/* E07AF4 80242794 0C0B2026 */ jal set_variable +/* E07AF4 80242794 0C0B2026 */ jal evt_set_variable /* E07AF8 80242798 0200282D */ daddu $a1, $s0, $zero /* E07AFC 8024279C 8FBF0018 */ lw $ra, 0x18($sp) /* E07B00 802427A0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s index bf55597752..053c6b6482 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240050_A0BD40.s @@ -15,41 +15,41 @@ glabel func_80240050_A0BD40 /* A0BD68 80240078 F7B40038 */ sdc1 $f20, 0x38($sp) /* A0BD6C 8024007C 8E30000C */ lw $s0, 0xc($s1) /* A0BD70 80240080 8E050000 */ lw $a1, ($s0) -/* A0BD74 80240084 0C0B210B */ jal get_float_variable +/* A0BD74 80240084 0C0B210B */ jal evt_get_float_variable /* A0BD78 80240088 26100004 */ addiu $s0, $s0, 4 /* A0BD7C 8024008C 8E050000 */ lw $a1, ($s0) /* A0BD80 80240090 26100004 */ addiu $s0, $s0, 4 /* A0BD84 80240094 0220202D */ daddu $a0, $s1, $zero -/* A0BD88 80240098 0C0B210B */ jal get_float_variable +/* A0BD88 80240098 0C0B210B */ jal evt_get_float_variable /* A0BD8C 8024009C E7A00020 */ swc1 $f0, 0x20($sp) /* A0BD90 802400A0 8E050000 */ lw $a1, ($s0) /* A0BD94 802400A4 26100004 */ addiu $s0, $s0, 4 /* A0BD98 802400A8 0220202D */ daddu $a0, $s1, $zero -/* A0BD9C 802400AC 0C0B210B */ jal get_float_variable +/* A0BD9C 802400AC 0C0B210B */ jal evt_get_float_variable /* A0BDA0 802400B0 46000786 */ mov.s $f30, $f0 /* A0BDA4 802400B4 8E050000 */ lw $a1, ($s0) /* A0BDA8 802400B8 26100004 */ addiu $s0, $s0, 4 /* A0BDAC 802400BC 0220202D */ daddu $a0, $s1, $zero -/* A0BDB0 802400C0 0C0B210B */ jal get_float_variable +/* A0BDB0 802400C0 0C0B210B */ jal evt_get_float_variable /* A0BDB4 802400C4 46000706 */ mov.s $f28, $f0 /* A0BDB8 802400C8 8E050000 */ lw $a1, ($s0) /* A0BDBC 802400CC 26100004 */ addiu $s0, $s0, 4 /* A0BDC0 802400D0 0220202D */ daddu $a0, $s1, $zero -/* A0BDC4 802400D4 0C0B210B */ jal get_float_variable +/* A0BDC4 802400D4 0C0B210B */ jal evt_get_float_variable /* A0BDC8 802400D8 46000686 */ mov.s $f26, $f0 /* A0BDCC 802400DC 8E050000 */ lw $a1, ($s0) /* A0BDD0 802400E0 26100004 */ addiu $s0, $s0, 4 /* A0BDD4 802400E4 0220202D */ daddu $a0, $s1, $zero -/* A0BDD8 802400E8 0C0B210B */ jal get_float_variable +/* A0BDD8 802400E8 0C0B210B */ jal evt_get_float_variable /* A0BDDC 802400EC 46000606 */ mov.s $f24, $f0 /* A0BDE0 802400F0 8E050000 */ lw $a1, ($s0) /* A0BDE4 802400F4 26100004 */ addiu $s0, $s0, 4 /* A0BDE8 802400F8 0220202D */ daddu $a0, $s1, $zero -/* A0BDEC 802400FC 0C0B210B */ jal get_float_variable +/* A0BDEC 802400FC 0C0B210B */ jal evt_get_float_variable /* A0BDF0 80240100 46000586 */ mov.s $f22, $f0 /* A0BDF4 80240104 0220202D */ daddu $a0, $s1, $zero /* A0BDF8 80240108 8E050000 */ lw $a1, ($s0) -/* A0BDFC 8024010C 0C0B210B */ jal get_float_variable +/* A0BDFC 8024010C 0C0B210B */ jal evt_get_float_variable /* A0BE00 80240110 46000506 */ mov.s $f20, $f0 /* A0BE04 80240114 4405F000 */ mfc1 $a1, $f30 /* A0BE08 80240118 4406E000 */ mfc1 $a2, $f28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s index e9aa9142b4..1bf4ca1b16 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_8024091C_A0C60C.s @@ -10,11 +10,11 @@ glabel func_8024091C_A0C60C /* A0C620 80240930 F7B40020 */ sdc1 $f20, 0x20($sp) /* A0C624 80240934 8E30000C */ lw $s0, 0xc($s1) /* A0C628 80240938 8E050000 */ lw $a1, ($s0) -/* A0C62C 8024093C 0C0B210B */ jal get_float_variable +/* A0C62C 8024093C 0C0B210B */ jal evt_get_float_variable /* A0C630 80240940 26100004 */ addiu $s0, $s0, 4 /* A0C634 80240944 0220202D */ daddu $a0, $s1, $zero /* A0C638 80240948 8E050000 */ lw $a1, ($s0) -/* A0C63C 8024094C 0C0B210B */ jal get_float_variable +/* A0C63C 8024094C 0C0B210B */ jal evt_get_float_variable /* A0C640 80240950 46000506 */ mov.s $f20, $f0 /* A0C644 80240954 0C00A8BB */ jal sin_deg /* A0C648 80240958 46000306 */ mov.s $f12, $f0 @@ -23,7 +23,7 @@ glabel func_8024091C_A0C60C /* A0C654 80240964 26100004 */ addiu $s0, $s0, 4 /* A0C658 80240968 8E050000 */ lw $a1, ($s0) /* A0C65C 8024096C 4406A000 */ mfc1 $a2, $f20 -/* A0C660 80240970 0C0B2190 */ jal set_float_variable +/* A0C660 80240970 0C0B2190 */ jal evt_set_float_variable /* A0C664 80240974 0220202D */ daddu $a0, $s1, $zero /* A0C668 80240978 8FBF0018 */ lw $ra, 0x18($sp) /* A0C66C 8024097C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s index d1d8cddb89..e52ed8b696 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240000_A10880.s @@ -15,41 +15,41 @@ glabel func_80240000_A10880 /* A108A8 80240028 F7B40038 */ sdc1 $f20, 0x38($sp) /* A108AC 8024002C 8E30000C */ lw $s0, 0xc($s1) /* A108B0 80240030 8E050000 */ lw $a1, ($s0) -/* A108B4 80240034 0C0B210B */ jal get_float_variable +/* A108B4 80240034 0C0B210B */ jal evt_get_float_variable /* A108B8 80240038 26100004 */ addiu $s0, $s0, 4 /* A108BC 8024003C 8E050000 */ lw $a1, ($s0) /* A108C0 80240040 26100004 */ addiu $s0, $s0, 4 /* A108C4 80240044 0220202D */ daddu $a0, $s1, $zero -/* A108C8 80240048 0C0B210B */ jal get_float_variable +/* A108C8 80240048 0C0B210B */ jal evt_get_float_variable /* A108CC 8024004C E7A00020 */ swc1 $f0, 0x20($sp) /* A108D0 80240050 8E050000 */ lw $a1, ($s0) /* A108D4 80240054 26100004 */ addiu $s0, $s0, 4 /* A108D8 80240058 0220202D */ daddu $a0, $s1, $zero -/* A108DC 8024005C 0C0B210B */ jal get_float_variable +/* A108DC 8024005C 0C0B210B */ jal evt_get_float_variable /* A108E0 80240060 46000786 */ mov.s $f30, $f0 /* A108E4 80240064 8E050000 */ lw $a1, ($s0) /* A108E8 80240068 26100004 */ addiu $s0, $s0, 4 /* A108EC 8024006C 0220202D */ daddu $a0, $s1, $zero -/* A108F0 80240070 0C0B210B */ jal get_float_variable +/* A108F0 80240070 0C0B210B */ jal evt_get_float_variable /* A108F4 80240074 46000706 */ mov.s $f28, $f0 /* A108F8 80240078 8E050000 */ lw $a1, ($s0) /* A108FC 8024007C 26100004 */ addiu $s0, $s0, 4 /* A10900 80240080 0220202D */ daddu $a0, $s1, $zero -/* A10904 80240084 0C0B210B */ jal get_float_variable +/* A10904 80240084 0C0B210B */ jal evt_get_float_variable /* A10908 80240088 46000686 */ mov.s $f26, $f0 /* A1090C 8024008C 8E050000 */ lw $a1, ($s0) /* A10910 80240090 26100004 */ addiu $s0, $s0, 4 /* A10914 80240094 0220202D */ daddu $a0, $s1, $zero -/* A10918 80240098 0C0B210B */ jal get_float_variable +/* A10918 80240098 0C0B210B */ jal evt_get_float_variable /* A1091C 8024009C 46000606 */ mov.s $f24, $f0 /* A10920 802400A0 8E050000 */ lw $a1, ($s0) /* A10924 802400A4 26100004 */ addiu $s0, $s0, 4 /* A10928 802400A8 0220202D */ daddu $a0, $s1, $zero -/* A1092C 802400AC 0C0B210B */ jal get_float_variable +/* A1092C 802400AC 0C0B210B */ jal evt_get_float_variable /* A10930 802400B0 46000586 */ mov.s $f22, $f0 /* A10934 802400B4 0220202D */ daddu $a0, $s1, $zero /* A10938 802400B8 8E050000 */ lw $a1, ($s0) -/* A1093C 802400BC 0C0B210B */ jal get_float_variable +/* A1093C 802400BC 0C0B210B */ jal evt_get_float_variable /* A10940 802400C0 46000506 */ mov.s $f20, $f0 /* A10944 802400C4 4405F000 */ mfc1 $a1, $f30 /* A10948 802400C8 4406E000 */ mfc1 $a2, $f28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s index da5715768c..96819471d6 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s @@ -60,24 +60,24 @@ glabel func_802425E0_A1D6E0 /* A1D7B8 802426B8 0220202D */ daddu $a0, $s1, $zero /* A1D7BC 802426BC 3C05F5DE */ lui $a1, 0xf5de /* A1D7C0 802426C0 34A502DE */ ori $a1, $a1, 0x2de -/* A1D7C4 802426C4 0C0B2026 */ jal set_variable +/* A1D7C4 802426C4 0C0B2026 */ jal evt_set_variable /* A1D7C8 802426C8 0280302D */ daddu $a2, $s4, $zero /* A1D7CC 802426CC 0220202D */ daddu $a0, $s1, $zero /* A1D7D0 802426D0 3C05F5DE */ lui $a1, 0xf5de /* A1D7D4 802426D4 34A502DF */ ori $a1, $a1, 0x2df -/* A1D7D8 802426D8 0C0B2026 */ jal set_variable +/* A1D7D8 802426D8 0C0B2026 */ jal evt_set_variable /* A1D7DC 802426DC 32A6FFFF */ andi $a2, $s5, 0xffff /* A1D7E0 802426E0 24100001 */ addiu $s0, $zero, 1 /* A1D7E4 802426E4 0220202D */ daddu $a0, $s1, $zero .L802426E8: /* A1D7E8 802426E8 3C05F840 */ lui $a1, 0xf840 /* A1D7EC 802426EC 34A56268 */ ori $a1, $a1, 0x6268 -/* A1D7F0 802426F0 0C0B2026 */ jal set_variable +/* A1D7F0 802426F0 0C0B2026 */ jal evt_set_variable /* A1D7F4 802426F4 3206FFFF */ andi $a2, $s0, 0xffff /* A1D7F8 802426F8 0220202D */ daddu $a0, $s1, $zero /* A1D7FC 802426FC 3C05F840 */ lui $a1, 0xf840 /* A1D800 80242700 34A56269 */ ori $a1, $a1, 0x6269 -/* A1D804 80242704 0C0B2026 */ jal set_variable +/* A1D804 80242704 0C0B2026 */ jal evt_set_variable /* A1D808 80242708 32E6FFFF */ andi $a2, $s7, 0xffff /* A1D80C 8024270C 0000202D */ daddu $a0, $zero, $zero /* A1D810 80242710 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s index 0649af0285..89d055a181 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s @@ -13,7 +13,7 @@ glabel func_80240634_A2A874 /* A2A894 80240654 26100004 */ addiu $s0, $s0, 4 /* A2A898 80240658 0220202D */ daddu $a0, $s1, $zero /* A2A89C 8024065C 8E050000 */ lw $a1, ($s0) -/* A2A8A0 80240660 0C0B210B */ jal get_float_variable +/* A2A8A0 80240660 0C0B210B */ jal evt_get_float_variable /* A2A8A4 80240664 0040802D */ daddu $s0, $v0, $zero /* A2A8A8 80240668 00108080 */ sll $s0, $s0, 2 /* A2A8AC 8024066C 02308821 */ addu $s1, $s1, $s0 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s index 250b14e4c2..26d4c27c18 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s @@ -13,7 +13,7 @@ glabel func_80240DA0_A2AFE0 /* A2B000 80240DC0 26100004 */ addiu $s0, $s0, 4 /* A2B004 80240DC4 0220202D */ daddu $a0, $s1, $zero /* A2B008 80240DC8 8E050000 */ lw $a1, ($s0) -/* A2B00C 80240DCC 0C0B210B */ jal get_float_variable +/* A2B00C 80240DCC 0C0B210B */ jal evt_get_float_variable /* A2B010 80240DD0 0040802D */ daddu $s0, $v0, $zero /* A2B014 80240DD4 44050000 */ mfc1 $a1, $f0 /* A2B018 80240DD8 0C090355 */ jal func_80240D54_A2AF94 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s index b65a635777..0e2dc401fb 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s @@ -20,18 +20,18 @@ glabel func_80240E50_A2B090 /* A2B0CC 80240E8C 0040902D */ daddu $s2, $v0, $zero /* A2B0D0 80240E90 8E050000 */ lw $a1, ($s0) /* A2B0D4 80240E94 26100004 */ addiu $s0, $s0, 4 -/* A2B0D8 80240E98 0C0B210B */ jal get_float_variable +/* A2B0D8 80240E98 0C0B210B */ jal evt_get_float_variable /* A2B0DC 80240E9C 0220202D */ daddu $a0, $s1, $zero /* A2B0E0 80240EA0 8E050000 */ lw $a1, ($s0) /* A2B0E4 80240EA4 26100004 */ addiu $s0, $s0, 4 /* A2B0E8 80240EA8 4600010D */ trunc.w.s $f4, $f0 /* A2B0EC 80240EAC 44132000 */ mfc1 $s3, $f4 -/* A2B0F0 80240EB0 0C0B210B */ jal get_float_variable +/* A2B0F0 80240EB0 0C0B210B */ jal evt_get_float_variable /* A2B0F4 80240EB4 0220202D */ daddu $a0, $s1, $zero /* A2B0F8 80240EB8 8E050000 */ lw $a1, ($s0) /* A2B0FC 80240EBC 4600010D */ trunc.w.s $f4, $f0 /* A2B100 80240EC0 44102000 */ mfc1 $s0, $f4 -/* A2B104 80240EC4 0C0B210B */ jal get_float_variable +/* A2B104 80240EC4 0C0B210B */ jal evt_get_float_variable /* A2B108 80240EC8 0220202D */ daddu $a0, $s1, $zero /* A2B10C 80240ECC 8E43000C */ lw $v1, 0xc($s2) /* A2B110 80240ED0 44931000 */ mtc1 $s3, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s index e4e0e1ca64..54cbed422e 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s @@ -53,11 +53,11 @@ glabel func_802428C8_A2CB08 /* A2CB58 80242918 8E050000 */ lw $a1, ($s0) /* A2CB5C 8024291C 26100004 */ addiu $s0, $s0, 4 /* A2CB60 80242920 0260202D */ daddu $a0, $s3, $zero -/* A2CB64 80242924 0C0B210B */ jal get_float_variable +/* A2CB64 80242924 0C0B210B */ jal evt_get_float_variable /* A2CB68 80242928 0040B02D */ daddu $s6, $v0, $zero /* A2CB6C 8024292C 8E050000 */ lw $a1, ($s0) /* A2CB70 80242930 0260202D */ daddu $a0, $s3, $zero -/* A2CB74 80242934 0C0B210B */ jal get_float_variable +/* A2CB74 80242934 0C0B210B */ jal evt_get_float_variable /* A2CB78 80242938 E7A00010 */ swc1 $f0, 0x10($sp) /* A2CB7C 8024293C 0260202D */ daddu $a0, $s3, $zero /* A2CB80 80242940 3C05F4AC */ lui $a1, 0xf4ac @@ -354,17 +354,17 @@ glabel L80242C28_A2CE68 /* A2CFCC 80242D8C E6020020 */ swc1 $f2, 0x20($s0) /* A2CFD0 80242D90 0260202D */ daddu $a0, $s3, $zero /* A2CFD4 80242D94 3C05FE36 */ lui $a1, 0xfe36 -/* A2CFD8 80242D98 0C0B210B */ jal get_float_variable +/* A2CFD8 80242D98 0C0B210B */ jal evt_get_float_variable /* A2CFDC 80242D9C 34A53C80 */ ori $a1, $a1, 0x3c80 /* A2CFE0 80242DA0 0260202D */ daddu $a0, $s3, $zero /* A2CFE4 80242DA4 3C05FE36 */ lui $a1, 0xfe36 /* A2CFE8 80242DA8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A2CFEC 80242DAC 0C0B210B */ jal get_float_variable +/* A2CFEC 80242DAC 0C0B210B */ jal evt_get_float_variable /* A2CFF0 80242DB0 E6400000 */ swc1 $f0, ($s2) /* A2CFF4 80242DB4 0260202D */ daddu $a0, $s3, $zero /* A2CFF8 80242DB8 3C05FE36 */ lui $a1, 0xfe36 /* A2CFFC 80242DBC 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A2D000 80242DC0 0C0B210B */ jal get_float_variable +/* A2D000 80242DC0 0C0B210B */ jal evt_get_float_variable /* A2D004 80242DC4 E6400004 */ swc1 $f0, 4($s2) /* A2D008 80242DC8 26510018 */ addiu $s1, $s2, 0x18 /* A2D00C 80242DCC E6400008 */ swc1 $f0, 8($s2) @@ -373,7 +373,7 @@ glabel L80242C28_A2CE68 /* A2D018 80242DD8 2652000C */ addiu $s2, $s2, 0xc /* A2D01C 80242DDC 0260202D */ daddu $a0, $s3, $zero /* A2D020 80242DE0 3C05FE36 */ lui $a1, 0xfe36 -/* A2D024 80242DE4 0C0B210B */ jal get_float_variable +/* A2D024 80242DE4 0C0B210B */ jal evt_get_float_variable /* A2D028 80242DE8 34A53C80 */ ori $a1, $a1, 0x3c80 /* A2D02C 80242DEC 461C0002 */ mul.s $f0, $f0, $f28 /* A2D030 80242DF0 00000000 */ nop @@ -388,7 +388,7 @@ glabel L80242C28_A2CE68 /* A2D054 80242E14 46020000 */ add.s $f0, $f0, $f2 /* A2D058 80242E18 3C05FE36 */ lui $a1, 0xfe36 /* A2D05C 80242E1C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A2D060 80242E20 0C0B210B */ jal get_float_variable +/* A2D060 80242E20 0C0B210B */ jal evt_get_float_variable /* A2D064 80242E24 E6400000 */ swc1 $f0, ($s2) /* A2D068 80242E28 461C0002 */ mul.s $f0, $f0, $f28 /* A2D06C 80242E2C 00000000 */ nop @@ -401,7 +401,7 @@ glabel L80242C28_A2CE68 /* A2D088 80242E48 46040000 */ add.s $f0, $f0, $f4 /* A2D08C 80242E4C 3C05FE36 */ lui $a1, 0xfe36 /* A2D090 80242E50 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A2D094 80242E54 0C0B210B */ jal get_float_variable +/* A2D094 80242E54 0C0B210B */ jal evt_get_float_variable /* A2D098 80242E58 E6400004 */ swc1 $f0, 4($s2) /* A2D09C 80242E5C 461C0002 */ mul.s $f0, $f0, $f28 /* A2D0A0 80242E60 00000000 */ nop @@ -413,7 +413,7 @@ glabel L80242C28_A2CE68 .L80242E78: /* A2D0B8 80242E78 0260202D */ daddu $a0, $s3, $zero /* A2D0BC 80242E7C 3C05FE36 */ lui $a1, 0xfe36 -/* A2D0C0 80242E80 0C0B210B */ jal get_float_variable +/* A2D0C0 80242E80 0C0B210B */ jal evt_get_float_variable /* A2D0C4 80242E84 34A53C80 */ ori $a1, $a1, 0x3c80 /* A2D0C8 80242E88 461C0002 */ mul.s $f0, $f0, $f28 /* A2D0CC 80242E8C 00000000 */ nop @@ -431,7 +431,7 @@ glabel L80242C28_A2CE68 /* A2D0FC 80242EBC 46160001 */ sub.s $f0, $f0, $f22 /* A2D100 80242EC0 3C05FE36 */ lui $a1, 0xfe36 /* A2D104 80242EC4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A2D108 80242EC8 0C0B210B */ jal get_float_variable +/* A2D108 80242EC8 0C0B210B */ jal evt_get_float_variable /* A2D10C 80242ECC E6400000 */ swc1 $f0, ($s2) /* A2D110 80242ED0 461C0002 */ mul.s $f0, $f0, $f28 /* A2D114 80242ED4 00000000 */ nop @@ -444,7 +444,7 @@ glabel L80242C28_A2CE68 /* A2D130 80242EF0 46040000 */ add.s $f0, $f0, $f4 /* A2D134 80242EF4 3C05FE36 */ lui $a1, 0xfe36 /* A2D138 80242EF8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A2D13C 80242EFC 0C0B210B */ jal get_float_variable +/* A2D13C 80242EFC 0C0B210B */ jal evt_get_float_variable /* A2D140 80242F00 E6400004 */ swc1 $f0, 4($s2) /* A2D144 80242F04 461C0002 */ mul.s $f0, $f0, $f28 /* A2D148 80242F08 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s index c527bf5b23..12c2b4345b 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s @@ -19,7 +19,7 @@ glabel func_80240654_A39B34 .L80240688: /* A39B68 80240688 8CC50000 */ lw $a1, ($a2) /* A39B6C 8024068C 3C068024 */ lui $a2, %hi(D_80242C70_A3C150) -/* A39B70 80240690 0C0B2026 */ jal set_variable +/* A39B70 80240690 0C0B2026 */ jal evt_set_variable /* A39B74 80240694 8CC62C70 */ lw $a2, %lo(D_80242C70_A3C150)($a2) /* A39B78 80240698 24020002 */ addiu $v0, $zero, 2 .L8024069C: diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s index 20cbc0e829..145dd5dbea 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s @@ -7,7 +7,7 @@ glabel func_80240A68_A39F48 /* A39F50 80240A70 8C82000C */ lw $v0, 0xc($a0) /* A39F54 80240A74 3C068011 */ lui $a2, %hi(gPlayerData+0xF) /* A39F58 80240A78 90C6F29F */ lbu $a2, %lo(gPlayerData+0xF)($a2) -/* A39F5C 80240A7C 0C0B2026 */ jal set_variable +/* A39F5C 80240A7C 0C0B2026 */ jal evt_set_variable /* A39F60 80240A80 8C450000 */ lw $a1, ($v0) /* A39F64 80240A84 8FBF0010 */ lw $ra, 0x10($sp) /* A39F68 80240A88 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94_A39F74.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94_A39F74.s index 6dff15c745..0fd9f15f41 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94_A39F74.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94_A39F74.s @@ -11,7 +11,7 @@ glabel func_80240A94_A39F74 /* A39F8C 80240AAC 34A5626B */ ori $a1, $a1, 0x626b /* A39F90 80240AB0 0000202D */ daddu $a0, $zero, $zero /* A39F94 80240AB4 00452821 */ addu $a1, $v0, $a1 -/* A39F98 80240AB8 0C0B2026 */ jal set_variable +/* A39F98 80240AB8 0C0B2026 */ jal evt_set_variable /* A39F9C 80240ABC 24060001 */ addiu $a2, $zero, 1 /* A39FA0 80240AC0 8FBF0010 */ lw $ra, 0x10($sp) /* A39FA4 80240AC4 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s index a26f98b783..cc7aeec35f 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s @@ -19,7 +19,7 @@ glabel func_80240F7C_A3A45C .L80240FB0: /* A3A490 80240FB0 8CC50000 */ lw $a1, ($a2) /* A3A494 80240FB4 3C068024 */ lui $a2, %hi(D_802445D4_A3DAB4) -/* A3A498 80240FB8 0C0B2026 */ jal set_variable +/* A3A498 80240FB8 0C0B2026 */ jal evt_set_variable /* A3A49C 80240FBC 8CC645D4 */ lw $a2, %lo(D_802445D4_A3DAB4)($a2) /* A3A4A0 80240FC0 24020002 */ addiu $v0, $zero, 2 .L80240FC4: diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0_A3A6D0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0_A3A6D0.s index 64c8d73d2e..f74605a1f6 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0_A3A6D0.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0_A3A6D0.s @@ -12,7 +12,7 @@ glabel func_802411F0_A3A6D0 /* A3A6EC 8024120C 0000202D */ daddu $a0, $zero, $zero .L80241210: /* A3A6F0 80241210 02112821 */ addu $a1, $s0, $s1 -/* A3A6F4 80241214 0C0B2026 */ jal set_variable +/* A3A6F4 80241214 0C0B2026 */ jal evt_set_variable /* A3A6F8 80241218 0080302D */ daddu $a2, $a0, $zero /* A3A6FC 8024121C 26100001 */ addiu $s0, $s0, 1 /* A3A700 80241220 2E02004F */ sltiu $v0, $s0, 0x4f @@ -23,7 +23,7 @@ glabel func_802411F0_A3A6D0 /* A3A714 80241234 363188E4 */ ori $s1, $s1, 0x88e4 .L80241238: /* A3A718 80241238 02112821 */ addu $a1, $s0, $s1 -/* A3A71C 8024123C 0C0B2026 */ jal set_variable +/* A3A71C 8024123C 0C0B2026 */ jal evt_set_variable /* A3A720 80241240 0080302D */ daddu $a2, $a0, $zero /* A3A724 80241244 26100001 */ addiu $s0, $s0, 1 /* A3A728 80241248 2E020010 */ sltiu $v0, $s0, 0x10 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s index 74661bd0be..c72fbf8f0e 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s @@ -96,7 +96,7 @@ glabel func_8024126C_A3A74C .L802413BC: /* A3A89C 802413BC 8E620000 */ lw $v0, ($s3) /* A3A8A0 802413C0 24060001 */ addiu $a2, $zero, 1 -/* A3A8A4 802413C4 0C0B2026 */ jal set_variable +/* A3A8A4 802413C4 0C0B2026 */ jal evt_set_variable /* A3A8A8 802413C8 AFC20088 */ sw $v0, 0x88($fp) /* A3A8AC 802413CC 0809052D */ j .L802414B4 /* A3A8B0 802413D0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s index 1b8a5e4f88..646fca92bd 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s @@ -81,7 +81,7 @@ glabel func_802414E4_A3A9C4 /* A3AAE4 80241604 0220282D */ daddu $a1, $s1, $zero /* A3AAE8 80241608 8E620000 */ lw $v0, ($s3) /* A3AAEC 8024160C 24060001 */ addiu $a2, $zero, 1 -/* A3AAF0 80241610 0C0B2026 */ jal set_variable +/* A3AAF0 80241610 0C0B2026 */ jal evt_set_variable /* A3AAF4 80241614 AFC20088 */ sw $v0, 0x88($fp) /* A3AAF8 80241618 0809058D */ j .L80241634 /* A3AAFC 8024161C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s index 72671f27ba..ec5083ad00 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s @@ -81,7 +81,7 @@ glabel func_80241668_A3AB48 /* A3AC68 80241788 0220282D */ daddu $a1, $s1, $zero /* A3AC6C 8024178C 8E620000 */ lw $v0, ($s3) /* A3AC70 80241790 24060001 */ addiu $a2, $zero, 1 -/* A3AC74 80241794 0C0B2026 */ jal set_variable +/* A3AC74 80241794 0C0B2026 */ jal evt_set_variable /* A3AC78 80241798 AFC20088 */ sw $v0, 0x88($fp) /* A3AC7C 8024179C 080905EE */ j .L802417B8 /* A3AC80 802417A0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s index 7b483607b8..855a76df63 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s @@ -25,7 +25,7 @@ glabel func_802417EC_A3ACCC .L8024183C: /* A3AD1C 8024183C 0000302D */ daddu $a2, $zero, $zero .L80241840: -/* A3AD20 80241840 0C0B2026 */ jal set_variable +/* A3AD20 80241840 0C0B2026 */ jal evt_set_variable /* A3AD24 80241844 00000000 */ nop /* A3AD28 80241848 8FBF0018 */ lw $ra, 0x18($sp) /* A3AD2C 8024184C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s index eed3ccb62b..b473aab9f1 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s @@ -138,7 +138,7 @@ glabel func_8024228C_A3B76C /* A3B958 80242478 8E65008C */ lw $a1, 0x8c($s3) /* A3B95C 8024247C 0000202D */ daddu $a0, $zero, $zero /* A3B960 80242480 00A62821 */ addu $a1, $a1, $a2 -/* A3B964 80242484 0C0B2026 */ jal set_variable +/* A3B964 80242484 0C0B2026 */ jal evt_set_variable /* A3B968 80242488 24060001 */ addiu $a2, $zero, 1 .L8024248C: /* A3B96C 8024248C 8E640078 */ lw $a0, 0x78($s3) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s index 9229d4a592..c1fb9db0a9 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s @@ -25,7 +25,7 @@ glabel func_802424CC_A3B9AC /* A3B9F0 80242510 34A55D6E */ ori $a1, $a1, 0x5d6e /* A3B9F4 80242514 0000202D */ daddu $a0, $zero, $zero /* A3B9F8 80242518 00C52821 */ addu $a1, $a2, $a1 -/* A3B9FC 8024251C 0C0B2026 */ jal set_variable +/* A3B9FC 8024251C 0C0B2026 */ jal evt_set_variable /* A3BA00 80242520 24060001 */ addiu $a2, $zero, 1 .L80242524: /* A3BA04 80242524 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240B44_A40284.s b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240B44_A40284.s index 00e685c62e..70494e1c81 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240B44_A40284.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240B44_A40284.s @@ -13,7 +13,7 @@ glabel func_80240B44_A40284 /* A402A4 80240B64 26100004 */ addiu $s0, $s0, 4 /* A402A8 80240B68 0220202D */ daddu $a0, $s1, $zero /* A402AC 80240B6C 8E050000 */ lw $a1, ($s0) -/* A402B0 80240B70 0C0B210B */ jal get_float_variable +/* A402B0 80240B70 0C0B210B */ jal evt_get_float_variable /* A402B4 80240B74 0040802D */ daddu $s0, $v0, $zero /* A402B8 80240B78 8E03000C */ lw $v1, 0xc($s0) /* A402BC 80240B7C E4600010 */ swc1 $f0, 0x10($v1) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s index 13a67309fe..6f885d858f 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s @@ -17,18 +17,18 @@ glabel func_80241C5C_97F72C /* 97F740 80241C70 AFB00010 */ sw $s0, 0x10($sp) /* 97F744 80241C74 8E30000C */ lw $s0, 0xc($s1) /* 97F748 80241C78 8E050000 */ lw $a1, ($s0) -/* 97F74C 80241C7C 0C0B210B */ jal get_float_variable +/* 97F74C 80241C7C 0C0B210B */ jal evt_get_float_variable /* 97F750 80241C80 26100004 */ addiu $s0, $s0, 4 /* 97F754 80241C84 8E050000 */ lw $a1, ($s0) /* 97F758 80241C88 26100004 */ addiu $s0, $s0, 4 /* 97F75C 80241C8C 4600018D */ trunc.w.s $f6, $f0 /* 97F760 80241C90 44123000 */ mfc1 $s2, $f6 -/* 97F764 80241C94 0C0B210B */ jal get_float_variable +/* 97F764 80241C94 0C0B210B */ jal evt_get_float_variable /* 97F768 80241C98 0220202D */ daddu $a0, $s1, $zero /* 97F76C 80241C9C 8E050000 */ lw $a1, ($s0) /* 97F770 80241CA0 4600018D */ trunc.w.s $f6, $f0 /* 97F774 80241CA4 44103000 */ mfc1 $s0, $f6 -/* 97F778 80241CA8 0C0B210B */ jal get_float_variable +/* 97F778 80241CA8 0C0B210B */ jal evt_get_float_variable /* 97F77C 80241CAC 0220202D */ daddu $a0, $s1, $zero /* 97F780 80241CB0 3C028024 */ lui $v0, %hi(D_80242614_9800E4) /* 97F784 80241CB4 24422614 */ addiu $v0, $v0, %lo(D_80242614_9800E4) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s index b73c36956a..c73326202e 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s @@ -10,18 +10,18 @@ glabel func_80241D44_97F814 /* 97F828 80241D58 AFB00010 */ sw $s0, 0x10($sp) /* 97F82C 80241D5C 8E30000C */ lw $s0, 0xc($s1) /* 97F830 80241D60 8E050000 */ lw $a1, ($s0) -/* 97F834 80241D64 0C0B210B */ jal get_float_variable +/* 97F834 80241D64 0C0B210B */ jal evt_get_float_variable /* 97F838 80241D68 26100004 */ addiu $s0, $s0, 4 /* 97F83C 80241D6C 8E050000 */ lw $a1, ($s0) /* 97F840 80241D70 26100004 */ addiu $s0, $s0, 4 /* 97F844 80241D74 4600010D */ trunc.w.s $f4, $f0 /* 97F848 80241D78 44122000 */ mfc1 $s2, $f4 -/* 97F84C 80241D7C 0C0B210B */ jal get_float_variable +/* 97F84C 80241D7C 0C0B210B */ jal evt_get_float_variable /* 97F850 80241D80 0220202D */ daddu $a0, $s1, $zero /* 97F854 80241D84 8E050000 */ lw $a1, ($s0) /* 97F858 80241D88 4600010D */ trunc.w.s $f4, $f0 /* 97F85C 80241D8C 44102000 */ mfc1 $s0, $f4 -/* 97F860 80241D90 0C0B210B */ jal get_float_variable +/* 97F860 80241D90 0C0B210B */ jal evt_get_float_variable /* 97F864 80241D94 0220202D */ daddu $a0, $s1, $zero /* 97F868 80241D98 3C038024 */ lui $v1, %hi(D_80242614_9800E4) /* 97F86C 80241D9C 24632614 */ addiu $v1, $v1, %lo(D_80242614_9800E4) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s index b1e303746a..67babebacb 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s @@ -37,7 +37,7 @@ glabel func_80240D38_989898 /* 9898E8 80240D88 04C00004 */ bltz $a2, .L80240D9C /* 9898EC 80240D8C 00000000 */ nop /* 9898F0 80240D90 3C05FD05 */ lui $a1, 0xfd05 -/* 9898F4 80240D94 0C0B2026 */ jal set_variable +/* 9898F4 80240D94 0C0B2026 */ jal evt_set_variable /* 9898F8 80240D98 34A50F89 */ ori $a1, $a1, 0xf89 .L80240D9C: /* 9898FC 80240D9C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s b/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s index cfd5dd1b29..ef1acdd771 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s @@ -12,17 +12,17 @@ glabel func_80240000_98AA10 /* 98AA2C 8024001C F7B40028 */ sdc1 $f20, 0x28($sp) /* 98AA30 80240020 8E30000C */ lw $s0, 0xc($s1) /* 98AA34 80240024 8E050000 */ lw $a1, ($s0) -/* 98AA38 80240028 0C0B210B */ jal get_float_variable +/* 98AA38 80240028 0C0B210B */ jal evt_get_float_variable /* 98AA3C 8024002C 26100004 */ addiu $s0, $s0, 4 /* 98AA40 80240030 8E050000 */ lw $a1, ($s0) /* 98AA44 80240034 26100004 */ addiu $s0, $s0, 4 /* 98AA48 80240038 0220202D */ daddu $a0, $s1, $zero -/* 98AA4C 8024003C 0C0B210B */ jal get_float_variable +/* 98AA4C 8024003C 0C0B210B */ jal evt_get_float_variable /* 98AA50 80240040 46000606 */ mov.s $f24, $f0 /* 98AA54 80240044 8E050000 */ lw $a1, ($s0) /* 98AA58 80240048 26100004 */ addiu $s0, $s0, 4 /* 98AA5C 8024004C 0220202D */ daddu $a0, $s1, $zero -/* 98AA60 80240050 0C0B210B */ jal get_float_variable +/* 98AA60 80240050 0C0B210B */ jal evt_get_float_variable /* 98AA64 80240054 46000586 */ mov.s $f22, $f0 /* 98AA68 80240058 0220202D */ daddu $a0, $s1, $zero /* 98AA6C 8024005C 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s index f67a55f3a7..74e6fab9fa 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AAC0/func_802400B0_98AAC0.s @@ -19,7 +19,7 @@ glabel func_802400B0_98AAC0 /* 98AAF8 802400E8 3C068008 */ lui $a2, %hi(gItemTable) /* 98AAFC 802400EC 00C23021 */ addu $a2, $a2, $v0 /* 98AB00 802400F0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 98AB04 802400F4 0C0B2026 */ jal set_variable +/* 98AB04 802400F4 0C0B2026 */ jal evt_set_variable /* 98AB08 802400F8 0220202D */ daddu $a0, $s1, $zero /* 98AB0C 802400FC 8FBF0018 */ lw $ra, 0x18($sp) /* 98AB10 80240100 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s index f04500c95f..ca71f56108 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s @@ -88,7 +88,7 @@ glabel func_80241BA8_991388 /* 9914B8 80241CD8 3C05FD05 */ lui $a1, 0xfd05 /* 9914BC 80241CDC 34A50F8A */ ori $a1, $a1, 0xf8a /* 9914C0 80241CE0 0200302D */ daddu $a2, $s0, $zero -/* 9914C4 80241CE4 0C0B2026 */ jal set_variable +/* 9914C4 80241CE4 0C0B2026 */ jal evt_set_variable /* 9914C8 80241CE8 ACC20008 */ sw $v0, 8($a2) /* 9914CC 80241CEC 8FBF002C */ lw $ra, 0x2c($sp) /* 9914D0 80241CF0 8FB20028 */ lw $s2, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s index f2059653ba..1590f50f7b 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s @@ -18,18 +18,18 @@ glabel func_80241D38_991518 /* 991530 80241D50 AFB00010 */ sw $s0, 0x10($sp) /* 991534 80241D54 8E30000C */ lw $s0, 0xc($s1) /* 991538 80241D58 8E050000 */ lw $a1, ($s0) -/* 99153C 80241D5C 0C0B210B */ jal get_float_variable +/* 99153C 80241D5C 0C0B210B */ jal evt_get_float_variable /* 991540 80241D60 26100004 */ addiu $s0, $s0, 4 /* 991544 80241D64 8E050000 */ lw $a1, ($s0) /* 991548 80241D68 26100004 */ addiu $s0, $s0, 4 /* 99154C 80241D6C 4600010D */ trunc.w.s $f4, $f0 /* 991550 80241D70 44132000 */ mfc1 $s3, $f4 -/* 991554 80241D74 0C0B210B */ jal get_float_variable +/* 991554 80241D74 0C0B210B */ jal evt_get_float_variable /* 991558 80241D78 0220202D */ daddu $a0, $s1, $zero /* 99155C 80241D7C 8E050000 */ lw $a1, ($s0) /* 991560 80241D80 4600010D */ trunc.w.s $f4, $f0 /* 991564 80241D84 44122000 */ mfc1 $s2, $f4 -/* 991568 80241D88 0C0B210B */ jal get_float_variable +/* 991568 80241D88 0C0B210B */ jal evt_get_float_variable /* 99156C 80241D8C 0220202D */ daddu $a0, $s1, $zero /* 991570 80241D90 0220202D */ daddu $a0, $s1, $zero /* 991574 80241D94 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s index 95a86e70b4..99f45d2027 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s @@ -11,18 +11,18 @@ glabel func_80241E34_991614 /* 99162C 80241E4C AFB00010 */ sw $s0, 0x10($sp) /* 991630 80241E50 8E30000C */ lw $s0, 0xc($s1) /* 991634 80241E54 8E050000 */ lw $a1, ($s0) -/* 991638 80241E58 0C0B210B */ jal get_float_variable +/* 991638 80241E58 0C0B210B */ jal evt_get_float_variable /* 99163C 80241E5C 26100004 */ addiu $s0, $s0, 4 /* 991640 80241E60 8E050000 */ lw $a1, ($s0) /* 991644 80241E64 26100004 */ addiu $s0, $s0, 4 /* 991648 80241E68 4600008D */ trunc.w.s $f2, $f0 /* 99164C 80241E6C 44131000 */ mfc1 $s3, $f2 -/* 991650 80241E70 0C0B210B */ jal get_float_variable +/* 991650 80241E70 0C0B210B */ jal evt_get_float_variable /* 991654 80241E74 0220202D */ daddu $a0, $s1, $zero /* 991658 80241E78 8E050000 */ lw $a1, ($s0) /* 99165C 80241E7C 4600008D */ trunc.w.s $f2, $f0 /* 991660 80241E80 44121000 */ mfc1 $s2, $f2 -/* 991664 80241E84 0C0B210B */ jal get_float_variable +/* 991664 80241E84 0C0B210B */ jal evt_get_float_variable /* 991668 80241E88 0220202D */ daddu $a0, $s1, $zero /* 99166C 80241E8C 0220202D */ daddu $a0, $s1, $zero /* 991670 80241E90 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s index a4e4bd973a..1a0e039cd7 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s @@ -18,21 +18,21 @@ glabel func_80241EF8_9916D8 /* 99170C 80241F2C 0220202D */ daddu $a0, $s1, $zero /* 991710 80241F30 0040902D */ daddu $s2, $v0, $zero /* 991714 80241F34 8E050000 */ lw $a1, ($s0) -/* 991718 80241F38 0C0B210B */ jal get_float_variable +/* 991718 80241F38 0C0B210B */ jal evt_get_float_variable /* 99171C 80241F3C 26100004 */ addiu $s0, $s0, 4 /* 991720 80241F40 46000606 */ mov.s $f24, $f0 /* 991724 80241F44 8E050000 */ lw $a1, ($s0) /* 991728 80241F48 26100004 */ addiu $s0, $s0, 4 -/* 99172C 80241F4C 0C0B210B */ jal get_float_variable +/* 99172C 80241F4C 0C0B210B */ jal evt_get_float_variable /* 991730 80241F50 0220202D */ daddu $a0, $s1, $zero /* 991734 80241F54 46000586 */ mov.s $f22, $f0 /* 991738 80241F58 8E050000 */ lw $a1, ($s0) /* 99173C 80241F5C 26100004 */ addiu $s0, $s0, 4 -/* 991740 80241F60 0C0B210B */ jal get_float_variable +/* 991740 80241F60 0C0B210B */ jal evt_get_float_variable /* 991744 80241F64 0220202D */ daddu $a0, $s1, $zero /* 991748 80241F68 46000506 */ mov.s $f20, $f0 /* 99174C 80241F6C 8E050000 */ lw $a1, ($s0) -/* 991750 80241F70 0C0B210B */ jal get_float_variable +/* 991750 80241F70 0C0B210B */ jal evt_get_float_variable /* 991754 80241F74 0220202D */ daddu $a0, $s1, $zero /* 991758 80241F78 44801000 */ mtc1 $zero, $f2 /* 99175C 80241F7C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s index 357e8312f4..7682c7530f 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s @@ -10,18 +10,18 @@ glabel func_80241BEC_99431C /* 994330 80241C00 AFB00010 */ sw $s0, 0x10($sp) /* 994334 80241C04 8E30000C */ lw $s0, 0xc($s1) /* 994338 80241C08 8E050000 */ lw $a1, ($s0) -/* 99433C 80241C0C 0C0B210B */ jal get_float_variable +/* 99433C 80241C0C 0C0B210B */ jal evt_get_float_variable /* 994340 80241C10 26100004 */ addiu $s0, $s0, 4 /* 994344 80241C14 8E050000 */ lw $a1, ($s0) /* 994348 80241C18 26100004 */ addiu $s0, $s0, 4 /* 99434C 80241C1C 4600010D */ trunc.w.s $f4, $f0 /* 994350 80241C20 44122000 */ mfc1 $s2, $f4 -/* 994354 80241C24 0C0B210B */ jal get_float_variable +/* 994354 80241C24 0C0B210B */ jal evt_get_float_variable /* 994358 80241C28 0220202D */ daddu $a0, $s1, $zero /* 99435C 80241C2C 8E050000 */ lw $a1, ($s0) /* 994360 80241C30 4600010D */ trunc.w.s $f4, $f0 /* 994364 80241C34 44102000 */ mfc1 $s0, $f4 -/* 994368 80241C38 0C0B210B */ jal get_float_variable +/* 994368 80241C38 0C0B210B */ jal evt_get_float_variable /* 99436C 80241C3C 0220202D */ daddu $a0, $s1, $zero /* 994370 80241C40 3C038024 */ lui $v1, %hi(btl_state_draw_begin_player_turn) /* 994374 80241C44 24632AC0 */ addiu $v1, $v1, %lo(btl_state_draw_begin_player_turn) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s index 404b818ff9..bd7691a563 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s @@ -10,18 +10,18 @@ glabel func_80241CA0_9943D0 /* 9943E4 80241CB4 AFB00010 */ sw $s0, 0x10($sp) /* 9943E8 80241CB8 8E30000C */ lw $s0, 0xc($s1) /* 9943EC 80241CBC 8E050000 */ lw $a1, ($s0) -/* 9943F0 80241CC0 0C0B210B */ jal get_float_variable +/* 9943F0 80241CC0 0C0B210B */ jal evt_get_float_variable /* 9943F4 80241CC4 26100004 */ addiu $s0, $s0, 4 /* 9943F8 80241CC8 8E050000 */ lw $a1, ($s0) /* 9943FC 80241CCC 26100004 */ addiu $s0, $s0, 4 /* 994400 80241CD0 4600010D */ trunc.w.s $f4, $f0 /* 994404 80241CD4 44122000 */ mfc1 $s2, $f4 -/* 994408 80241CD8 0C0B210B */ jal get_float_variable +/* 994408 80241CD8 0C0B210B */ jal evt_get_float_variable /* 99440C 80241CDC 0220202D */ daddu $a0, $s1, $zero /* 994410 80241CE0 8E050000 */ lw $a1, ($s0) /* 994414 80241CE4 4600010D */ trunc.w.s $f4, $f0 /* 994418 80241CE8 44102000 */ mfc1 $s0, $f4 -/* 99441C 80241CEC 0C0B210B */ jal get_float_variable +/* 99441C 80241CEC 0C0B210B */ jal evt_get_float_variable /* 994420 80241CF0 0220202D */ daddu $a0, $s1, $zero /* 994424 80241CF4 3C038024 */ lui $v1, %hi(btl_state_draw_begin_player_turn) /* 994428 80241CF8 24632AC0 */ addiu $v1, $v1, %lo(btl_state_draw_begin_player_turn) diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_8024004C_99523C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_8024004C_99523C.s index 269e1f829f..9397559641 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_8024004C_99523C.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_8024004C_99523C.s @@ -17,7 +17,7 @@ glabel func_8024004C_99523C /* 99526C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 /* 995270 80240080 0040802D */ daddu $s0, $v0, $zero /* 995274 80240084 0200302D */ daddu $a2, $s0, $zero -/* 995278 80240088 0C0B2026 */ jal set_variable +/* 995278 80240088 0C0B2026 */ jal evt_set_variable /* 99527C 8024008C AE500084 */ sw $s0, 0x84($s2) /* 995280 80240090 8E250000 */ lw $a1, ($s1) /* 995284 80240094 26310004 */ addiu $s1, $s1, 4 @@ -31,41 +31,41 @@ glabel func_8024004C_99523C /* 9952A4 802400B4 AE02003C */ sw $v0, 0x3c($s0) /* 9952A8 802400B8 8E250000 */ lw $a1, ($s1) /* 9952AC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* 9952B0 802400C0 0C0B210B */ jal get_float_variable +/* 9952B0 802400C0 0C0B210B */ jal evt_get_float_variable /* 9952B4 802400C4 0240202D */ daddu $a0, $s2, $zero /* 9952B8 802400C8 E600000C */ swc1 $f0, 0xc($s0) /* 9952BC 802400CC 8E250000 */ lw $a1, ($s1) /* 9952C0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* 9952C4 802400D4 0C0B210B */ jal get_float_variable +/* 9952C4 802400D4 0C0B210B */ jal evt_get_float_variable /* 9952C8 802400D8 0240202D */ daddu $a0, $s2, $zero /* 9952CC 802400DC E6000010 */ swc1 $f0, 0x10($s0) /* 9952D0 802400E0 8E250000 */ lw $a1, ($s1) /* 9952D4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* 9952D8 802400E8 0C0B210B */ jal get_float_variable +/* 9952D8 802400E8 0C0B210B */ jal evt_get_float_variable /* 9952DC 802400EC 0240202D */ daddu $a0, $s2, $zero /* 9952E0 802400F0 E6000014 */ swc1 $f0, 0x14($s0) /* 9952E4 802400F4 8E250000 */ lw $a1, ($s1) /* 9952E8 802400F8 26310004 */ addiu $s1, $s1, 4 -/* 9952EC 802400FC 0C0B210B */ jal get_float_variable +/* 9952EC 802400FC 0C0B210B */ jal evt_get_float_variable /* 9952F0 80240100 0240202D */ daddu $a0, $s2, $zero /* 9952F4 80240104 E6000018 */ swc1 $f0, 0x18($s0) /* 9952F8 80240108 8E250000 */ lw $a1, ($s1) /* 9952FC 8024010C 26310004 */ addiu $s1, $s1, 4 -/* 995300 80240110 0C0B210B */ jal get_float_variable +/* 995300 80240110 0C0B210B */ jal evt_get_float_variable /* 995304 80240114 0240202D */ daddu $a0, $s2, $zero /* 995308 80240118 E600001C */ swc1 $f0, 0x1c($s0) /* 99530C 8024011C 8E250000 */ lw $a1, ($s1) /* 995310 80240120 26310004 */ addiu $s1, $s1, 4 -/* 995314 80240124 0C0B210B */ jal get_float_variable +/* 995314 80240124 0C0B210B */ jal evt_get_float_variable /* 995318 80240128 0240202D */ daddu $a0, $s2, $zero /* 99531C 8024012C E6000020 */ swc1 $f0, 0x20($s0) /* 995320 80240130 8E250000 */ lw $a1, ($s1) /* 995324 80240134 26310004 */ addiu $s1, $s1, 4 -/* 995328 80240138 0C0B210B */ jal get_float_variable +/* 995328 80240138 0C0B210B */ jal evt_get_float_variable /* 99532C 8024013C 0240202D */ daddu $a0, $s2, $zero /* 995330 80240140 E6000024 */ swc1 $f0, 0x24($s0) /* 995334 80240144 8E250000 */ lw $a1, ($s1) -/* 995338 80240148 0C0B210B */ jal get_float_variable +/* 995338 80240148 0C0B210B */ jal evt_get_float_variable /* 99533C 8024014C 0240202D */ daddu $a0, $s2, $zero /* 995340 80240150 3C013F80 */ lui $at, 0x3f80 /* 995344 80240154 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s index 21011e4760..098c581651 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s @@ -21,21 +21,21 @@ glabel func_802405FC_9957EC /* 99582C 8024063C AE020038 */ sw $v0, 0x38($s0) /* 995830 80240640 8E250000 */ lw $a1, ($s1) /* 995834 80240644 26310004 */ addiu $s1, $s1, 4 -/* 995838 80240648 0C0B210B */ jal get_float_variable +/* 995838 80240648 0C0B210B */ jal evt_get_float_variable /* 99583C 8024064C 0240202D */ daddu $a0, $s2, $zero /* 995840 80240650 E6000018 */ swc1 $f0, 0x18($s0) /* 995844 80240654 8E250000 */ lw $a1, ($s1) /* 995848 80240658 26310004 */ addiu $s1, $s1, 4 -/* 99584C 8024065C 0C0B210B */ jal get_float_variable +/* 99584C 8024065C 0C0B210B */ jal evt_get_float_variable /* 995850 80240660 0240202D */ daddu $a0, $s2, $zero /* 995854 80240664 E6000024 */ swc1 $f0, 0x24($s0) /* 995858 80240668 8E250000 */ lw $a1, ($s1) /* 99585C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* 995860 80240670 0C0B210B */ jal get_float_variable +/* 995860 80240670 0C0B210B */ jal evt_get_float_variable /* 995864 80240674 0240202D */ daddu $a0, $s2, $zero /* 995868 80240678 E6000020 */ swc1 $f0, 0x20($s0) /* 99586C 8024067C 8E250000 */ lw $a1, ($s1) -/* 995870 80240680 0C0B210B */ jal get_float_variable +/* 995870 80240680 0C0B210B */ jal evt_get_float_variable /* 995874 80240684 0240202D */ daddu $a0, $s2, $zero /* 995878 80240688 3C013F80 */ lui $at, 0x3f80 /* 99587C 8024068C 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s index 83bc8d42a0..6fa2feae58 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s @@ -25,7 +25,7 @@ glabel func_80240398_90FA48 /* 90FA7C 802403CC 0000202D */ daddu $a0, $zero, $zero /* 90FA80 802403D0 3C05FD05 */ lui $a1, 0xfd05 /* 90FA84 802403D4 34A50F8F */ ori $a1, $a1, 0xf8f -/* 90FA88 802403D8 0C0B2026 */ jal set_variable +/* 90FA88 802403D8 0C0B2026 */ jal evt_set_variable /* 90FA8C 802403DC 0260302D */ daddu $a2, $s3, $zero /* 90FA90 802403E0 0000902D */ daddu $s2, $zero, $zero /* 90FA94 802403E4 3C146666 */ lui $s4, 0x6666 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s index fd83fcefd7..4311f98cac 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s @@ -280,7 +280,7 @@ glabel func_80240FB8_910668 /* 910A50 802413A0 AE220000 */ sw $v0, ($s1) /* 910A54 802413A4 AC800070 */ sw $zero, 0x70($a0) .L802413A8: -/* 910A58 802413A8 0C0B2026 */ jal set_variable +/* 910A58 802413A8 0C0B2026 */ jal evt_set_variable /* 910A5C 802413AC 00000000 */ nop /* 910A60 802413B0 080904FA */ j .L802413E8 /* 910A64 802413B4 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s index fda9bf828e..97c7e6f517 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s @@ -30,7 +30,7 @@ glabel func_802402BC_918E6C /* 918EC8 80240318 04C00004 */ bltz $a2, .L8024032C /* 918ECC 8024031C 00000000 */ nop /* 918ED0 80240320 3C05FD05 */ lui $a1, 0xfd05 -/* 918ED4 80240324 0C0B2026 */ jal set_variable +/* 918ED4 80240324 0C0B2026 */ jal evt_set_variable /* 918ED8 80240328 34A50F89 */ ori $a1, $a1, 0xf89 .L8024032C: /* 918EDC 8024032C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s index df2af31344..fde30ed4d9 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s @@ -30,7 +30,7 @@ glabel func_80240000_91B8E0 /* 91B93C 8024005C 04C00004 */ bltz $a2, .L80240070 /* 91B940 80240060 00000000 */ nop /* 91B944 80240064 3C05FD05 */ lui $a1, 0xfd05 -/* 91B948 80240068 0C0B2026 */ jal set_variable +/* 91B948 80240068 0C0B2026 */ jal evt_set_variable /* 91B94C 8024006C 34A50F89 */ ori $a1, $a1, 0xf89 .L80240070: /* 91B950 80240070 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s index 12c60d137b..3cb945c074 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s @@ -19,7 +19,7 @@ glabel func_802413E0_91F950 .L80241414: /* 91F984 80241414 8CC50000 */ lw $a1, ($a2) /* 91F988 80241418 3C068024 */ lui $a2, %hi(D_80246270_9247E0) -/* 91F98C 8024141C 0C0B2026 */ jal set_variable +/* 91F98C 8024141C 0C0B2026 */ jal evt_set_variable /* 91F990 80241420 8CC66270 */ lw $a2, %lo(D_80246270_9247E0)($a2) /* 91F994 80241424 24020002 */ addiu $v0, $zero, 2 .L80241428: diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s index a6ab89a2f6..d6187d6e1c 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_802401B0_926BA0.s @@ -17,7 +17,7 @@ glabel func_802401B0_926BA0 /* 926BD0 802401E0 3C05FE36 */ lui $a1, 0xfe36 /* 926BD4 802401E4 34A53C80 */ ori $a1, $a1, 0x3c80 /* 926BD8 802401E8 44060000 */ mfc1 $a2, $f0 -/* 926BDC 802401EC 0C0B2190 */ jal set_float_variable +/* 926BDC 802401EC 0C0B2190 */ jal evt_set_float_variable /* 926BE0 802401F0 0200202D */ daddu $a0, $s0, $zero /* 926BE4 802401F4 8FBF0014 */ lw $ra, 0x14($sp) /* 926BE8 802401F8 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s index a1a113778f..59b75f3b91 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_11/926A10/func_80240208_926BF8.s @@ -23,7 +23,7 @@ glabel func_80240208_926BF8 /* 926C40 80240250 3C05FE36 */ lui $a1, 0xfe36 /* 926C44 80240254 34A53C80 */ ori $a1, $a1, 0x3c80 /* 926C48 80240258 44060000 */ mfc1 $a2, $f0 -/* 926C4C 8024025C 0C0B2190 */ jal set_float_variable +/* 926C4C 8024025C 0C0B2190 */ jal evt_set_float_variable /* 926C50 80240260 0200202D */ daddu $a0, $s0, $zero /* 926C54 80240264 8FBF0014 */ lw $ra, 0x14($sp) /* 926C58 80240268 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s index 4082aa58d3..b856a71b87 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s @@ -19,7 +19,7 @@ glabel func_80240738_B20C78 .L8024076C: /* B20CAC 8024076C 8CC50000 */ lw $a1, ($a2) /* B20CB0 80240770 3C068024 */ lui $a2, %hi(D_80242430_B22970) -/* B20CB4 80240774 0C0B2026 */ jal set_variable +/* B20CB4 80240774 0C0B2026 */ jal evt_set_variable /* B20CB8 80240778 8CC62430 */ lw $a2, %lo(D_80242430_B22970)($a2) /* B20CBC 8024077C 24020002 */ addiu $v0, $zero, 2 .L80240780: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s index 2a56ee06c0..fdb89a00b7 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B4C_B2108C.s @@ -92,15 +92,15 @@ glabel func_80240B4C_B2108C /* B211D0 80240C90 0240202D */ daddu $a0, $s2, $zero .L80240C94: /* B211D4 80240C94 4406D000 */ mfc1 $a2, $f26 -/* B211D8 80240C98 0C0B2190 */ jal set_float_variable +/* B211D8 80240C98 0C0B2190 */ jal evt_set_float_variable /* B211DC 80240C9C 0260282D */ daddu $a1, $s3, $zero /* B211E0 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B211E4 80240CA4 4406A000 */ mfc1 $a2, $f20 -/* B211E8 80240CA8 0C0B2190 */ jal set_float_variable +/* B211E8 80240CA8 0C0B2190 */ jal evt_set_float_variable /* B211EC 80240CAC 0280282D */ daddu $a1, $s4, $zero /* B211F0 80240CB0 0240202D */ daddu $a0, $s2, $zero /* B211F4 80240CB4 4406C000 */ mfc1 $a2, $f24 -/* B211F8 80240CB8 0C0B2190 */ jal set_float_variable +/* B211F8 80240CB8 0C0B2190 */ jal evt_set_float_variable /* B211FC 80240CBC 02A0282D */ daddu $a1, $s5, $zero /* B21200 80240CC0 8FBF0028 */ lw $ra, 0x28($sp) /* B21204 80240CC4 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s index 500235d4cc..89b25c1d92 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s @@ -69,15 +69,15 @@ glabel func_802411EC_B2172C /* B21820 802412E0 0220202D */ daddu $a0, $s1, $zero .L802412E4: /* B21824 802412E4 8E060038 */ lw $a2, 0x38($s0) -/* B21828 802412E8 0C0B2190 */ jal set_float_variable +/* B21828 802412E8 0C0B2190 */ jal evt_set_float_variable /* B2182C 802412EC 0240282D */ daddu $a1, $s2, $zero /* B21830 802412F0 0220202D */ daddu $a0, $s1, $zero /* B21834 802412F4 4406A000 */ mfc1 $a2, $f20 -/* B21838 802412F8 0C0B2190 */ jal set_float_variable +/* B21838 802412F8 0C0B2190 */ jal evt_set_float_variable /* B2183C 802412FC 0260282D */ daddu $a1, $s3, $zero /* B21840 80241300 0220202D */ daddu $a0, $s1, $zero /* B21844 80241304 8E060040 */ lw $a2, 0x40($s0) -/* B21848 80241308 0C0B2190 */ jal set_float_variable +/* B21848 80241308 0C0B2190 */ jal evt_set_float_variable /* B2184C 8024130C 0280282D */ daddu $a1, $s4, $zero /* B21850 80241310 24020002 */ addiu $v0, $zero, 2 .L80241314: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s index effd349931..c1497620b2 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s @@ -24,12 +24,12 @@ glabel func_802416F8_B21C38 /* B21C84 80241744 26100004 */ addiu $s0, $s0, 4 /* B21C88 80241748 8E050000 */ lw $a1, ($s0) /* B21C8C 8024174C 26100004 */ addiu $s0, $s0, 4 -/* B21C90 80241750 0C0B210B */ jal get_float_variable +/* B21C90 80241750 0C0B210B */ jal evt_get_float_variable /* B21C94 80241754 0240202D */ daddu $a0, $s2, $zero /* B21C98 80241758 8E050000 */ lw $a1, ($s0) /* B21C9C 8024175C 26100004 */ addiu $s0, $s0, 4 /* B21CA0 80241760 0240202D */ daddu $a0, $s2, $zero -/* B21CA4 80241764 0C0B210B */ jal get_float_variable +/* B21CA4 80241764 0C0B210B */ jal evt_get_float_variable /* B21CA8 80241768 46000606 */ mov.s $f24, $f0 /* B21CAC 8024176C 8E050000 */ lw $a1, ($s0) /* B21CB0 80241770 26100004 */ addiu $s0, $s0, 4 @@ -43,7 +43,7 @@ glabel func_802416F8_B21C38 /* B21CD0 80241790 0040882D */ daddu $s1, $v0, $zero /* B21CD4 80241794 0240202D */ daddu $a0, $s2, $zero /* B21CD8 80241798 8E050000 */ lw $a1, ($s0) -/* B21CDC 8024179C 0C0B210B */ jal get_float_variable +/* B21CDC 8024179C 0C0B210B */ jal evt_get_float_variable /* B21CE0 802417A0 0040802D */ daddu $s0, $v0, $zero /* B21CE4 802417A4 4618A501 */ sub.s $f20, $f20, $f24 /* B21CE8 802417A8 3C013F00 */ lui $at, 0x3f00 @@ -58,7 +58,7 @@ glabel func_802416F8_B21C38 /* B21D0C 802417CC 0240202D */ daddu $a0, $s2, $zero /* B21D10 802417D0 0220982D */ daddu $s3, $s1, $zero /* B21D14 802417D4 0280282D */ daddu $a1, $s4, $zero -/* B21D18 802417D8 0C0B2026 */ jal set_variable +/* B21D18 802417D8 0C0B2026 */ jal evt_set_variable /* B21D1C 802417DC 0220302D */ daddu $a2, $s1, $zero .L802417E0: /* B21D20 802417E0 3C014334 */ lui $at, 0x4334 @@ -80,7 +80,7 @@ glabel func_802416F8_B21C38 /* B21D60 80241820 46001081 */ sub.s $f2, $f2, $f0 /* B21D64 80241824 0240202D */ daddu $a0, $s2, $zero /* B21D68 80241828 44061000 */ mfc1 $a2, $f2 -/* B21D6C 8024182C 0C0B2190 */ jal set_float_variable +/* B21D6C 8024182C 0C0B2190 */ jal evt_set_float_variable /* B21D70 80241830 02A0282D */ daddu $a1, $s5, $zero /* B21D74 80241834 8FBF0028 */ lw $ra, 0x28($sp) /* B21D78 80241838 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s index 171f3076e7..2d8413096e 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s @@ -40,17 +40,17 @@ glabel func_80241868_B21DA8 /* B21E34 802418F4 3C014248 */ lui $at, 0x4248 /* B21E38 802418F8 44810000 */ mtc1 $at, $f0 /* B21E3C 802418FC 4406B000 */ mfc1 $a2, $f22 -/* B21E40 80241900 0C0B2190 */ jal set_float_variable +/* B21E40 80241900 0C0B2190 */ jal evt_set_float_variable /* B21E44 80241904 4600A500 */ add.s $f20, $f20, $f0 /* B21E48 80241908 0220202D */ daddu $a0, $s1, $zero /* B21E4C 8024190C 3C05FE36 */ lui $a1, 0xfe36 /* B21E50 80241910 4406A000 */ mfc1 $a2, $f20 -/* B21E54 80241914 0C0B2190 */ jal set_float_variable +/* B21E54 80241914 0C0B2190 */ jal evt_set_float_variable /* B21E58 80241918 34A53C81 */ ori $a1, $a1, 0x3c81 /* B21E5C 8024191C 0220202D */ daddu $a0, $s1, $zero /* B21E60 80241920 3C05FE36 */ lui $a1, 0xfe36 /* B21E64 80241924 4406C000 */ mfc1 $a2, $f24 -/* B21E68 80241928 0C0B2190 */ jal set_float_variable +/* B21E68 80241928 0C0B2190 */ jal evt_set_float_variable /* B21E6C 8024192C 34A53C82 */ ori $a1, $a1, 0x3c82 /* B21E70 80241930 8FBF0018 */ lw $ra, 0x18($sp) /* B21E74 80241934 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s index 63d91c20b5..85495a3ccf 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s @@ -19,7 +19,7 @@ glabel func_802414EC_B2D95C .L80241520: /* B2D990 80241520 8CC50000 */ lw $a1, ($a2) /* B2D994 80241524 3C068024 */ lui $a2, %hi(D_8024304C_B2F4BC) -/* B2D998 80241528 0C0B2026 */ jal set_variable +/* B2D998 80241528 0C0B2026 */ jal evt_set_variable /* B2D99C 8024152C 8CC6304C */ lw $a2, %lo(D_8024304C_B2F4BC)($a2) /* B2D9A0 80241530 24020002 */ addiu $v0, $zero, 2 .L80241534: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s index fa0f1bb7e2..8ec24908e1 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s @@ -60,24 +60,24 @@ glabel func_80241750_B2DBC0 /* B2DC98 80241828 0220202D */ daddu $a0, $s1, $zero /* B2DC9C 8024182C 3C05F5DE */ lui $a1, 0xf5de /* B2DCA0 80241830 34A502DE */ ori $a1, $a1, 0x2de -/* B2DCA4 80241834 0C0B2026 */ jal set_variable +/* B2DCA4 80241834 0C0B2026 */ jal evt_set_variable /* B2DCA8 80241838 0280302D */ daddu $a2, $s4, $zero /* B2DCAC 8024183C 0220202D */ daddu $a0, $s1, $zero /* B2DCB0 80241840 3C05F5DE */ lui $a1, 0xf5de /* B2DCB4 80241844 34A502DF */ ori $a1, $a1, 0x2df -/* B2DCB8 80241848 0C0B2026 */ jal set_variable +/* B2DCB8 80241848 0C0B2026 */ jal evt_set_variable /* B2DCBC 8024184C 32A6FFFF */ andi $a2, $s5, 0xffff /* B2DCC0 80241850 24100001 */ addiu $s0, $zero, 1 /* B2DCC4 80241854 0220202D */ daddu $a0, $s1, $zero .L80241858: /* B2DCC8 80241858 3C05F840 */ lui $a1, 0xf840 /* B2DCCC 8024185C 34A56268 */ ori $a1, $a1, 0x6268 -/* B2DCD0 80241860 0C0B2026 */ jal set_variable +/* B2DCD0 80241860 0C0B2026 */ jal evt_set_variable /* B2DCD4 80241864 3206FFFF */ andi $a2, $s0, 0xffff /* B2DCD8 80241868 0220202D */ daddu $a0, $s1, $zero /* B2DCDC 8024186C 3C05F840 */ lui $a1, 0xf840 /* B2DCE0 80241870 34A56269 */ ori $a1, $a1, 0x6269 -/* B2DCE4 80241874 0C0B2026 */ jal set_variable +/* B2DCE4 80241874 0C0B2026 */ jal evt_set_variable /* B2DCE8 80241878 32E6FFFF */ andi $a2, $s7, 0xffff /* B2DCEC 8024187C 0000202D */ daddu $a0, $zero, $zero /* B2DCF0 80241880 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s index 320cd435d3..8eea8b8ebb 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s @@ -19,7 +19,7 @@ glabel func_802419D8_B365A8 .L80241A0C: /* B365DC 80241A0C 8CC50000 */ lw $a1, ($a2) /* B365E0 80241A10 3C068024 */ lui $a2, %hi(D_80247448_B3C018) -/* B365E4 80241A14 0C0B2026 */ jal set_variable +/* B365E4 80241A14 0C0B2026 */ jal evt_set_variable /* B365E8 80241A18 8CC67448 */ lw $a2, %lo(D_80247448_B3C018)($a2) /* B365EC 80241A1C 24020002 */ addiu $v0, $zero, 2 .L80241A20: diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s index b03957f80f..397eb28acf 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s @@ -60,24 +60,24 @@ glabel func_80241CD8_B368A8 /* B36980 80241DB0 0220202D */ daddu $a0, $s1, $zero /* B36984 80241DB4 3C05F5DE */ lui $a1, 0xf5de /* B36988 80241DB8 34A502DE */ ori $a1, $a1, 0x2de -/* B3698C 80241DBC 0C0B2026 */ jal set_variable +/* B3698C 80241DBC 0C0B2026 */ jal evt_set_variable /* B36990 80241DC0 0280302D */ daddu $a2, $s4, $zero /* B36994 80241DC4 0220202D */ daddu $a0, $s1, $zero /* B36998 80241DC8 3C05F5DE */ lui $a1, 0xf5de /* B3699C 80241DCC 34A502DF */ ori $a1, $a1, 0x2df -/* B369A0 80241DD0 0C0B2026 */ jal set_variable +/* B369A0 80241DD0 0C0B2026 */ jal evt_set_variable /* B369A4 80241DD4 32A6FFFF */ andi $a2, $s5, 0xffff /* B369A8 80241DD8 24100001 */ addiu $s0, $zero, 1 /* B369AC 80241DDC 0220202D */ daddu $a0, $s1, $zero .L80241DE0: /* B369B0 80241DE0 3C05F840 */ lui $a1, 0xf840 /* B369B4 80241DE4 34A56268 */ ori $a1, $a1, 0x6268 -/* B369B8 80241DE8 0C0B2026 */ jal set_variable +/* B369B8 80241DE8 0C0B2026 */ jal evt_set_variable /* B369BC 80241DEC 3206FFFF */ andi $a2, $s0, 0xffff /* B369C0 80241DF0 0220202D */ daddu $a0, $s1, $zero /* B369C4 80241DF4 3C05F840 */ lui $a1, 0xf840 /* B369C8 80241DF8 34A56269 */ ori $a1, $a1, 0x6269 -/* B369CC 80241DFC 0C0B2026 */ jal set_variable +/* B369CC 80241DFC 0C0B2026 */ jal evt_set_variable /* B369D0 80241E00 32E6FFFF */ andi $a2, $s7, 0xffff /* B369D4 80241E04 0000202D */ daddu $a0, $zero, $zero /* B369D8 80241E08 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s index 36b31d66bc..7eed769076 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s @@ -31,7 +31,7 @@ glabel func_80242F1C_B37AEC /* B37B44 80242F74 2922000A */ slti $v0, $t1, 0xa /* B37B48 80242F78 1440FFF0 */ bnez $v0, .L80242F3C /* B37B4C 80242F7C 25080002 */ addiu $t0, $t0, 2 -/* B37B50 80242F80 0C0B2026 */ jal set_variable +/* B37B50 80242F80 0C0B2026 */ jal evt_set_variable /* B37B54 80242F84 00000000 */ nop /* B37B58 80242F88 8FBF0010 */ lw $ra, 0x10($sp) /* B37B5C 80242F8C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s index e6830e3f5b..c916d5ac3b 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4ADC0/func_80240350_B4ADC0.s @@ -28,7 +28,7 @@ glabel func_80240350_B4ADC0 /* B4AE1C 802403AC 0220202D */ daddu $a0, $s1, $zero /* B4AE20 802403B0 8E25007C */ lw $a1, 0x7c($s1) /* B4AE24 802403B4 0000302D */ daddu $a2, $zero, $zero -/* B4AE28 802403B8 0C0B2026 */ jal set_variable +/* B4AE28 802403B8 0C0B2026 */ jal evt_set_variable /* B4AE2C 802403BC AE220078 */ sw $v0, 0x78($s1) .L802403C0: /* B4AE30 802403C0 8E25007C */ lw $a1, 0x7c($s1) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s index 39986a000e..0e648d7e2f 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s @@ -16,7 +16,7 @@ glabel func_80240738_B4B1A8 /* B4B1D4 80240764 0040202D */ daddu $a0, $v0, $zero /* B4B1D8 80240768 0220202D */ daddu $a0, $s1, $zero /* B4B1DC 8024076C 8E050000 */ lw $a1, ($s0) -/* B4B1E0 80240770 0C0B210B */ jal get_float_variable +/* B4B1E0 80240770 0C0B210B */ jal evt_get_float_variable /* B4B1E4 80240774 0040802D */ daddu $s0, $v0, $zero /* B4B1E8 80240778 0200202D */ daddu $a0, $s0, $zero /* B4B1EC 8024077C 0C046B4C */ jal get_model_from_list_index diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s index 77442cf933..f69673697c 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s @@ -28,7 +28,7 @@ glabel func_802403B0_B52BE0 /* B52C3C 8024040C 0220202D */ daddu $a0, $s1, $zero /* B52C40 80240410 8E25007C */ lw $a1, 0x7c($s1) /* B52C44 80240414 0000302D */ daddu $a2, $zero, $zero -/* B52C48 80240418 0C0B2026 */ jal set_variable +/* B52C48 80240418 0C0B2026 */ jal evt_set_variable /* B52C4C 8024041C AE220078 */ sw $v0, 0x78($s1) .L80240420: /* B52C50 80240420 8E25007C */ lw $a1, 0x7c($s1) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s index 90ac987375..876c482259 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s @@ -16,7 +16,7 @@ glabel func_802405A8_B5E858 /* B5E884 802405D4 0040202D */ daddu $a0, $v0, $zero /* B5E888 802405D8 0220202D */ daddu $a0, $s1, $zero /* B5E88C 802405DC 8E050000 */ lw $a1, ($s0) -/* B5E890 802405E0 0C0B210B */ jal get_float_variable +/* B5E890 802405E0 0C0B210B */ jal evt_get_float_variable /* B5E894 802405E4 0040802D */ daddu $s0, $v0, $zero /* B5E898 802405E8 0200202D */ daddu $a0, $s0, $zero /* B5E89C 802405EC 0C046B4C */ jal get_model_from_list_index diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s index ab207d5214..ae88c02ee5 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s @@ -16,7 +16,7 @@ glabel func_80240888_B66338 /* B66364 802408B4 0040202D */ daddu $a0, $v0, $zero /* B66368 802408B8 0220202D */ daddu $a0, $s1, $zero /* B6636C 802408BC 8E050000 */ lw $a1, ($s0) -/* B66370 802408C0 0C0B210B */ jal get_float_variable +/* B66370 802408C0 0C0B210B */ jal evt_get_float_variable /* B66374 802408C4 0040802D */ daddu $s0, $v0, $zero /* B66378 802408C8 0200202D */ daddu $a0, $s0, $zero /* B6637C 802408CC 0C046B4C */ jal get_model_from_list_index diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s index b7df85da87..ddbcdd913a 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_10/B6D4C0/func_80241130_B6D4C0.s @@ -28,7 +28,7 @@ glabel func_80241130_B6D4C0 /* B6D51C 8024118C 0220202D */ daddu $a0, $s1, $zero /* B6D520 80241190 8E25007C */ lw $a1, 0x7c($s1) /* B6D524 80241194 0000302D */ daddu $a2, $zero, $zero -/* B6D528 80241198 0C0B2026 */ jal set_variable +/* B6D528 80241198 0C0B2026 */ jal evt_set_variable /* B6D52C 8024119C AE220078 */ sw $v0, 0x78($s1) .L802411A0: /* B6D530 802411A0 8E25007C */ lw $a1, 0x7c($s1) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s index 79622c990a..689b536ce5 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240000_B730B0.s @@ -12,23 +12,23 @@ glabel func_80240000_B730B0 /* B730CC 8024001C F7B40020 */ sdc1 $f20, 0x20($sp) /* B730D0 80240020 8E30000C */ lw $s0, 0xc($s1) /* B730D4 80240024 8E050000 */ lw $a1, ($s0) -/* B730D8 80240028 0C0B210B */ jal get_float_variable +/* B730D8 80240028 0C0B210B */ jal evt_get_float_variable /* B730DC 8024002C 26100004 */ addiu $s0, $s0, 4 /* B730E0 80240030 8E050000 */ lw $a1, ($s0) /* B730E4 80240034 26100004 */ addiu $s0, $s0, 4 /* B730E8 80240038 0220202D */ daddu $a0, $s1, $zero -/* B730EC 8024003C 0C0B210B */ jal get_float_variable +/* B730EC 8024003C 0C0B210B */ jal evt_get_float_variable /* B730F0 80240040 46000606 */ mov.s $f24, $f0 /* B730F4 80240044 8E050000 */ lw $a1, ($s0) /* B730F8 80240048 26100004 */ addiu $s0, $s0, 4 /* B730FC 8024004C 3C014170 */ lui $at, 0x4170 /* B73100 80240050 44811000 */ mtc1 $at, $f2 /* B73104 80240054 0220202D */ daddu $a0, $s1, $zero -/* B73108 80240058 0C0B210B */ jal get_float_variable +/* B73108 80240058 0C0B210B */ jal evt_get_float_variable /* B7310C 8024005C 46020580 */ add.s $f22, $f0, $f2 /* B73110 80240060 0220202D */ daddu $a0, $s1, $zero /* B73114 80240064 8E050000 */ lw $a1, ($s0) -/* B73118 80240068 0C0B210B */ jal get_float_variable +/* B73118 80240068 0C0B210B */ jal evt_get_float_variable /* B7311C 8024006C 46000506 */ mov.s $f20, $f0 /* B73120 80240070 46000002 */ mul.s $f0, $f0, $f0 /* B73124 80240074 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s index fc6349ddcc..c9870bfee4 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s @@ -10,12 +10,12 @@ glabel func_802400F8_B731A8 /* B731BC 8024010C F7B40020 */ sdc1 $f20, 0x20($sp) /* B731C0 80240110 8E30000C */ lw $s0, 0xc($s1) /* B731C4 80240114 8E050000 */ lw $a1, ($s0) -/* B731C8 80240118 0C0B210B */ jal get_float_variable +/* B731C8 80240118 0C0B210B */ jal evt_get_float_variable /* B731CC 8024011C 26100004 */ addiu $s0, $s0, 4 /* B731D0 80240120 8E050000 */ lw $a1, ($s0) /* B731D4 80240124 26100004 */ addiu $s0, $s0, 4 /* B731D8 80240128 0220202D */ daddu $a0, $s1, $zero -/* B731DC 8024012C 0C0B210B */ jal get_float_variable +/* B731DC 8024012C 0C0B210B */ jal evt_get_float_variable /* B731E0 80240130 46000506 */ mov.s $f20, $f0 /* B731E4 80240134 46140001 */ sub.s $f0, $f0, $f20 /* B731E8 80240138 3C014120 */ lui $at, 0x4120 @@ -23,7 +23,7 @@ glabel func_802400F8_B731A8 /* B731F0 80240140 8E050000 */ lw $a1, ($s0) /* B731F4 80240144 46020003 */ div.s $f0, $f0, $f2 /* B731F8 80240148 44060000 */ mfc1 $a2, $f0 -/* B731FC 8024014C 0C0B2190 */ jal set_float_variable +/* B731FC 8024014C 0C0B2190 */ jal evt_set_float_variable /* B73200 80240150 0220202D */ daddu $a0, $s1, $zero /* B73204 80240154 8FBF0018 */ lw $ra, 0x18($sp) /* B73208 80240158 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s index a49425567e..b74b657882 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s @@ -16,7 +16,7 @@ glabel func_802401CC_B7327C /* B732A8 802401F8 0040202D */ daddu $a0, $v0, $zero /* B732AC 802401FC 0220202D */ daddu $a0, $s1, $zero /* B732B0 80240200 8E050000 */ lw $a1, ($s0) -/* B732B4 80240204 0C0B210B */ jal get_float_variable +/* B732B4 80240204 0C0B210B */ jal evt_get_float_variable /* B732B8 80240208 0040802D */ daddu $s0, $v0, $zero /* B732BC 8024020C 0200202D */ daddu $a0, $s0, $zero /* B732C0 80240210 0C046B4C */ jal get_model_from_list_index diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s index eaf1000f34..c585a8c342 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240000_B7A050.s @@ -12,23 +12,23 @@ glabel func_80240000_B7A050 /* B7A06C 8024001C F7B40020 */ sdc1 $f20, 0x20($sp) /* B7A070 80240020 8E30000C */ lw $s0, 0xc($s1) /* B7A074 80240024 8E050000 */ lw $a1, ($s0) -/* B7A078 80240028 0C0B210B */ jal get_float_variable +/* B7A078 80240028 0C0B210B */ jal evt_get_float_variable /* B7A07C 8024002C 26100004 */ addiu $s0, $s0, 4 /* B7A080 80240030 8E050000 */ lw $a1, ($s0) /* B7A084 80240034 26100004 */ addiu $s0, $s0, 4 /* B7A088 80240038 0220202D */ daddu $a0, $s1, $zero -/* B7A08C 8024003C 0C0B210B */ jal get_float_variable +/* B7A08C 8024003C 0C0B210B */ jal evt_get_float_variable /* B7A090 80240040 46000606 */ mov.s $f24, $f0 /* B7A094 80240044 8E050000 */ lw $a1, ($s0) /* B7A098 80240048 26100004 */ addiu $s0, $s0, 4 /* B7A09C 8024004C 3C014170 */ lui $at, 0x4170 /* B7A0A0 80240050 44811000 */ mtc1 $at, $f2 /* B7A0A4 80240054 0220202D */ daddu $a0, $s1, $zero -/* B7A0A8 80240058 0C0B210B */ jal get_float_variable +/* B7A0A8 80240058 0C0B210B */ jal evt_get_float_variable /* B7A0AC 8024005C 46020580 */ add.s $f22, $f0, $f2 /* B7A0B0 80240060 0220202D */ daddu $a0, $s1, $zero /* B7A0B4 80240064 8E050000 */ lw $a1, ($s0) -/* B7A0B8 80240068 0C0B210B */ jal get_float_variable +/* B7A0B8 80240068 0C0B210B */ jal evt_get_float_variable /* B7A0BC 8024006C 46000506 */ mov.s $f20, $f0 /* B7A0C0 80240070 46000002 */ mul.s $f0, $f0, $f0 /* B7A0C4 80240074 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s index c9ccec5362..21341fc24a 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802400F8_B7A148.s @@ -10,12 +10,12 @@ glabel func_802400F8_B7A148 /* B7A15C 8024010C F7B40020 */ sdc1 $f20, 0x20($sp) /* B7A160 80240110 8E30000C */ lw $s0, 0xc($s1) /* B7A164 80240114 8E050000 */ lw $a1, ($s0) -/* B7A168 80240118 0C0B210B */ jal get_float_variable +/* B7A168 80240118 0C0B210B */ jal evt_get_float_variable /* B7A16C 8024011C 26100004 */ addiu $s0, $s0, 4 /* B7A170 80240120 8E050000 */ lw $a1, ($s0) /* B7A174 80240124 26100004 */ addiu $s0, $s0, 4 /* B7A178 80240128 0220202D */ daddu $a0, $s1, $zero -/* B7A17C 8024012C 0C0B210B */ jal get_float_variable +/* B7A17C 8024012C 0C0B210B */ jal evt_get_float_variable /* B7A180 80240130 46000506 */ mov.s $f20, $f0 /* B7A184 80240134 46140001 */ sub.s $f0, $f0, $f20 /* B7A188 80240138 3C014120 */ lui $at, 0x4120 @@ -23,7 +23,7 @@ glabel func_802400F8_B7A148 /* B7A190 80240140 8E050000 */ lw $a1, ($s0) /* B7A194 80240144 46020003 */ div.s $f0, $f0, $f2 /* B7A198 80240148 44060000 */ mfc1 $a2, $f0 -/* B7A19C 8024014C 0C0B2190 */ jal set_float_variable +/* B7A19C 8024014C 0C0B2190 */ jal evt_set_float_variable /* B7A1A0 80240150 0220202D */ daddu $a0, $s1, $zero /* B7A1A4 80240154 8FBF0018 */ lw $ra, 0x18($sp) /* B7A1A8 80240158 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s index 753f5cfdff..e59b35e95b 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s @@ -16,7 +16,7 @@ glabel func_802401CC_B7A21C /* B7A248 802401F8 0040202D */ daddu $a0, $v0, $zero /* B7A24C 802401FC 0220202D */ daddu $a0, $s1, $zero /* B7A250 80240200 8E050000 */ lw $a1, ($s0) -/* B7A254 80240204 0C0B210B */ jal get_float_variable +/* B7A254 80240204 0C0B210B */ jal evt_get_float_variable /* B7A258 80240208 0040802D */ daddu $s0, $v0, $zero /* B7A25C 8024020C 0200202D */ daddu $a0, $s0, $zero /* B7A260 80240210 0C046B4C */ jal get_model_from_list_index diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s index 07db846cec..9f473e054e 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s @@ -16,7 +16,7 @@ glabel func_80241668_B857E8 /* B85814 80241694 0040202D */ daddu $a0, $v0, $zero /* B85818 80241698 0220202D */ daddu $a0, $s1, $zero /* B8581C 8024169C 8E050000 */ lw $a1, ($s0) -/* B85820 802416A0 0C0B210B */ jal get_float_variable +/* B85820 802416A0 0C0B210B */ jal evt_get_float_variable /* B85824 802416A4 0040802D */ daddu $s0, $v0, $zero /* B85828 802416A8 0200202D */ daddu $a0, $s0, $zero /* B8582C 802416AC 0C046B4C */ jal get_model_from_list_index diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s index 97fa341259..28d1c2a1ee 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s @@ -5,7 +5,7 @@ glabel func_80240034_ACAB54 /* ACAB54 80240034 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACAB58 80240038 AFBF0010 */ sw $ra, 0x10($sp) /* ACAB5C 8024003C 8C82000C */ lw $v0, 0xc($a0) -/* ACAB60 80240040 0C0B210B */ jal get_float_variable +/* ACAB60 80240040 0C0B210B */ jal evt_get_float_variable /* ACAB64 80240044 8C450000 */ lw $a1, ($v0) /* ACAB68 80240048 8FBF0010 */ lw $ra, 0x10($sp) /* ACAB6C 8024004C 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s index 4dcef1ba0a..5e9aff68c8 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s @@ -136,7 +136,7 @@ glabel func_802400B0_ACABD0 /* ACADA0 80240280 0260202D */ daddu $a0, $s3, $zero .L80240284: /* ACADA4 80240284 0280282D */ daddu $a1, $s4, $zero -/* ACADA8 80240288 0C0B2026 */ jal set_variable +/* ACADA8 80240288 0C0B2026 */ jal evt_set_variable /* ACADAC 8024028C 0220302D */ daddu $a2, $s1, $zero /* ACADB0 80240290 8FBF0044 */ lw $ra, 0x44($sp) /* ACADB4 80240294 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s index 2a0a819b7b..dbe54dcbaf 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s @@ -176,7 +176,7 @@ glabel func_8024036C_ACAE8C /* ACB110 802405F0 02E0202D */ daddu $a0, $s7, $zero .L802405F4: /* ACB114 802405F4 03C0282D */ daddu $a1, $fp, $zero -/* ACB118 802405F8 0C0B2026 */ jal set_variable +/* ACB118 802405F8 0C0B2026 */ jal evt_set_variable /* ACB11C 802405FC 0200302D */ daddu $a2, $s0, $zero /* ACB120 80240600 8FBF0054 */ lw $ra, 0x54($sp) /* ACB124 80240604 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s index 673140ce94..daca3a234f 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240644_ACB164.s @@ -48,7 +48,7 @@ glabel func_80240644_ACB164 /* ACB210 802406F0 0220202D */ daddu $a0, $s1, $zero /* ACB214 802406F4 4600008D */ trunc.w.s $f2, $f0 /* ACB218 802406F8 44061000 */ mfc1 $a2, $f2 -/* ACB21C 802406FC 0C0B2026 */ jal set_variable +/* ACB21C 802406FC 0C0B2026 */ jal evt_set_variable /* ACB220 80240700 0280282D */ daddu $a1, $s4, $zero /* ACB224 80240704 8FBF0024 */ lw $ra, 0x24($sp) /* ACB228 80240708 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s index 9a14306bb8..1f673d3847 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_80240728_ACB248.s @@ -67,17 +67,17 @@ glabel func_80240728_ACB248 /* ACB33C 8024081C 02A0282D */ daddu $a1, $s5, $zero /* ACB340 80240820 C6540030 */ lwc1 $f20, 0x30($s2) /* ACB344 80240824 0280302D */ daddu $a2, $s4, $zero -/* ACB348 80240828 0C0B2026 */ jal set_variable +/* ACB348 80240828 0C0B2026 */ jal evt_set_variable /* ACB34C 8024082C 4600A501 */ sub.s $f20, $f20, $f0 /* ACB350 80240830 0260202D */ daddu $a0, $s3, $zero /* ACB354 80240834 4600B08D */ trunc.w.s $f2, $f22 /* ACB358 80240838 44061000 */ mfc1 $a2, $f2 -/* ACB35C 8024083C 0C0B2026 */ jal set_variable +/* ACB35C 8024083C 0C0B2026 */ jal evt_set_variable /* ACB360 80240840 02C0282D */ daddu $a1, $s6, $zero /* ACB364 80240844 0260202D */ daddu $a0, $s3, $zero /* ACB368 80240848 4600A08D */ trunc.w.s $f2, $f20 /* ACB36C 8024084C 44061000 */ mfc1 $a2, $f2 -/* ACB370 80240850 0C0B2026 */ jal set_variable +/* ACB370 80240850 0C0B2026 */ jal evt_set_variable /* ACB374 80240854 02E0282D */ daddu $a1, $s7, $zero .L80240858: /* ACB378 80240858 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s index 31636b6dd4..d4066c4431 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s @@ -136,7 +136,7 @@ glabel func_802408A0_ACB3C0 /* ACB590 80240A70 0260202D */ daddu $a0, $s3, $zero .L80240A74: /* ACB594 80240A74 0280282D */ daddu $a1, $s4, $zero -/* ACB598 80240A78 0C0B2026 */ jal set_variable +/* ACB598 80240A78 0C0B2026 */ jal evt_set_variable /* ACB59C 80240A7C 0220302D */ daddu $a2, $s1, $zero /* ACB5A0 80240A80 8FBF0044 */ lw $ra, 0x44($sp) /* ACB5A4 80240A84 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s index 35833fc266..eb0ffd087f 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s @@ -176,7 +176,7 @@ glabel func_80240B5C_ACB67C /* ACB900 80240DE0 02E0202D */ daddu $a0, $s7, $zero .L80240DE4: /* ACB904 80240DE4 03C0282D */ daddu $a1, $fp, $zero -/* ACB908 80240DE8 0C0B2026 */ jal set_variable +/* ACB908 80240DE8 0C0B2026 */ jal evt_set_variable /* ACB90C 80240DEC 0200302D */ daddu $a2, $s0, $zero /* ACB910 80240DF0 8FBF0054 */ lw $ra, 0x54($sp) /* ACB914 80240DF4 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s index 77aecb79c5..07d4e4a322 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s @@ -48,7 +48,7 @@ glabel func_80240E34_ACB954 /* ACBA00 80240EE0 0220202D */ daddu $a0, $s1, $zero /* ACBA04 80240EE4 4600008D */ trunc.w.s $f2, $f0 /* ACBA08 80240EE8 44061000 */ mfc1 $a2, $f2 -/* ACBA0C 80240EEC 0C0B2026 */ jal set_variable +/* ACBA0C 80240EEC 0C0B2026 */ jal evt_set_variable /* ACBA10 80240EF0 0280282D */ daddu $a1, $s4, $zero /* ACBA14 80240EF4 8FBF0024 */ lw $ra, 0x24($sp) /* ACBA18 80240EF8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s index a1a360bf0d..cf023643a2 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s @@ -7,7 +7,7 @@ glabel func_80240F18_ACBA38 /* ACBA40 80240F20 8C82000C */ lw $v0, 0xc($a0) /* ACBA44 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* ACBA48 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* ACBA4C 80240F2C 0C0B2026 */ jal set_variable +/* ACBA4C 80240F2C 0C0B2026 */ jal evt_set_variable /* ACBA50 80240F30 8C450000 */ lw $a1, ($v0) /* ACBA54 80240F34 8FBF0010 */ lw $ra, 0x10($sp) /* ACBA58 80240F38 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s index 2e9d920dc5..5cfc77b782 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s @@ -67,17 +67,17 @@ glabel func_80240F60_ACBA80 /* ACBB74 80241054 02A0282D */ daddu $a1, $s5, $zero /* ACBB78 80241058 C6540030 */ lwc1 $f20, 0x30($s2) /* ACBB7C 8024105C 0280302D */ daddu $a2, $s4, $zero -/* ACBB80 80241060 0C0B2026 */ jal set_variable +/* ACBB80 80241060 0C0B2026 */ jal evt_set_variable /* ACBB84 80241064 4600A501 */ sub.s $f20, $f20, $f0 /* ACBB88 80241068 0260202D */ daddu $a0, $s3, $zero /* ACBB8C 8024106C 4600B08D */ trunc.w.s $f2, $f22 /* ACBB90 80241070 44061000 */ mfc1 $a2, $f2 -/* ACBB94 80241074 0C0B2026 */ jal set_variable +/* ACBB94 80241074 0C0B2026 */ jal evt_set_variable /* ACBB98 80241078 02C0282D */ daddu $a1, $s6, $zero /* ACBB9C 8024107C 0260202D */ daddu $a0, $s3, $zero /* ACBBA0 80241080 4600A08D */ trunc.w.s $f2, $f20 /* ACBBA4 80241084 44061000 */ mfc1 $a2, $f2 -/* ACBBA8 80241088 0C0B2026 */ jal set_variable +/* ACBBA8 80241088 0C0B2026 */ jal evt_set_variable /* ACBBAC 8024108C 02E0282D */ daddu $a1, $s7, $zero .L80241090: /* ACBBB0 80241090 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s index eca7cb8466..c9049a8ce3 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s @@ -5,7 +5,7 @@ glabel func_80240034_ACE174 /* ACE174 80240034 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACE178 80240038 AFBF0010 */ sw $ra, 0x10($sp) /* ACE17C 8024003C 8C82000C */ lw $v0, 0xc($a0) -/* ACE180 80240040 0C0B210B */ jal get_float_variable +/* ACE180 80240040 0C0B210B */ jal evt_get_float_variable /* ACE184 80240044 8C450000 */ lw $a1, ($v0) /* ACE188 80240048 8FBF0010 */ lw $ra, 0x10($sp) /* ACE18C 8024004C 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s index 9f0cff6b92..da0775d3fb 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s @@ -136,7 +136,7 @@ glabel func_802400B0_ACE1F0 /* ACE3C0 80240280 0260202D */ daddu $a0, $s3, $zero .L80240284: /* ACE3C4 80240284 0280282D */ daddu $a1, $s4, $zero -/* ACE3C8 80240288 0C0B2026 */ jal set_variable +/* ACE3C8 80240288 0C0B2026 */ jal evt_set_variable /* ACE3CC 8024028C 0220302D */ daddu $a2, $s1, $zero /* ACE3D0 80240290 8FBF0044 */ lw $ra, 0x44($sp) /* ACE3D4 80240294 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s index 02f64606f9..d4b54e9d90 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s @@ -176,7 +176,7 @@ glabel func_8024036C_ACE4AC /* ACE730 802405F0 02E0202D */ daddu $a0, $s7, $zero .L802405F4: /* ACE734 802405F4 03C0282D */ daddu $a1, $fp, $zero -/* ACE738 802405F8 0C0B2026 */ jal set_variable +/* ACE738 802405F8 0C0B2026 */ jal evt_set_variable /* ACE73C 802405FC 0200302D */ daddu $a2, $s0, $zero /* ACE740 80240600 8FBF0054 */ lw $ra, 0x54($sp) /* ACE744 80240604 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s index fe7b7f25ea..4a1a8f271d 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240644_ACE784.s @@ -48,7 +48,7 @@ glabel func_80240644_ACE784 /* ACE830 802406F0 0220202D */ daddu $a0, $s1, $zero /* ACE834 802406F4 4600008D */ trunc.w.s $f2, $f0 /* ACE838 802406F8 44061000 */ mfc1 $a2, $f2 -/* ACE83C 802406FC 0C0B2026 */ jal set_variable +/* ACE83C 802406FC 0C0B2026 */ jal evt_set_variable /* ACE840 80240700 0280282D */ daddu $a1, $s4, $zero /* ACE844 80240704 8FBF0024 */ lw $ra, 0x24($sp) /* ACE848 80240708 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s index eb749845ac..9677d4c488 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_80240728_ACE868.s @@ -67,17 +67,17 @@ glabel func_80240728_ACE868 /* ACE95C 8024081C 02A0282D */ daddu $a1, $s5, $zero /* ACE960 80240820 C6540030 */ lwc1 $f20, 0x30($s2) /* ACE964 80240824 0280302D */ daddu $a2, $s4, $zero -/* ACE968 80240828 0C0B2026 */ jal set_variable +/* ACE968 80240828 0C0B2026 */ jal evt_set_variable /* ACE96C 8024082C 4600A501 */ sub.s $f20, $f20, $f0 /* ACE970 80240830 0260202D */ daddu $a0, $s3, $zero /* ACE974 80240834 4600B08D */ trunc.w.s $f2, $f22 /* ACE978 80240838 44061000 */ mfc1 $a2, $f2 -/* ACE97C 8024083C 0C0B2026 */ jal set_variable +/* ACE97C 8024083C 0C0B2026 */ jal evt_set_variable /* ACE980 80240840 02C0282D */ daddu $a1, $s6, $zero /* ACE984 80240844 0260202D */ daddu $a0, $s3, $zero /* ACE988 80240848 4600A08D */ trunc.w.s $f2, $f20 /* ACE98C 8024084C 44061000 */ mfc1 $a2, $f2 -/* ACE990 80240850 0C0B2026 */ jal set_variable +/* ACE990 80240850 0C0B2026 */ jal evt_set_variable /* ACE994 80240854 02E0282D */ daddu $a1, $s7, $zero .L80240858: /* ACE998 80240858 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s index 937fb39dea..fb171aba47 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s @@ -136,7 +136,7 @@ glabel func_802408A0_ACE9E0 /* ACEBB0 80240A70 0260202D */ daddu $a0, $s3, $zero .L80240A74: /* ACEBB4 80240A74 0280282D */ daddu $a1, $s4, $zero -/* ACEBB8 80240A78 0C0B2026 */ jal set_variable +/* ACEBB8 80240A78 0C0B2026 */ jal evt_set_variable /* ACEBBC 80240A7C 0220302D */ daddu $a2, $s1, $zero /* ACEBC0 80240A80 8FBF0044 */ lw $ra, 0x44($sp) /* ACEBC4 80240A84 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s index e9765c230f..2de40063cb 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s @@ -176,7 +176,7 @@ glabel func_80240B5C_ACEC9C /* ACEF20 80240DE0 02E0202D */ daddu $a0, $s7, $zero .L80240DE4: /* ACEF24 80240DE4 03C0282D */ daddu $a1, $fp, $zero -/* ACEF28 80240DE8 0C0B2026 */ jal set_variable +/* ACEF28 80240DE8 0C0B2026 */ jal evt_set_variable /* ACEF2C 80240DEC 0200302D */ daddu $a2, $s0, $zero /* ACEF30 80240DF0 8FBF0054 */ lw $ra, 0x54($sp) /* ACEF34 80240DF4 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s index 28189093ac..0485cf6012 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240E34_ACEF74.s @@ -48,7 +48,7 @@ glabel func_80240E34_ACEF74 /* ACF020 80240EE0 0220202D */ daddu $a0, $s1, $zero /* ACF024 80240EE4 4600008D */ trunc.w.s $f2, $f0 /* ACF028 80240EE8 44061000 */ mfc1 $a2, $f2 -/* ACF02C 80240EEC 0C0B2026 */ jal set_variable +/* ACF02C 80240EEC 0C0B2026 */ jal evt_set_variable /* ACF030 80240EF0 0280282D */ daddu $a1, $s4, $zero /* ACF034 80240EF4 8FBF0024 */ lw $ra, 0x24($sp) /* ACF038 80240EF8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s index 2efc6d90e5..fe4d8222c8 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s @@ -7,7 +7,7 @@ glabel func_80240F18_ACF058 /* ACF060 80240F20 8C82000C */ lw $v0, 0xc($a0) /* ACF064 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* ACF068 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* ACF06C 80240F2C 0C0B2026 */ jal set_variable +/* ACF06C 80240F2C 0C0B2026 */ jal evt_set_variable /* ACF070 80240F30 8C450000 */ lw $a1, ($v0) /* ACF074 80240F34 8FBF0010 */ lw $ra, 0x10($sp) /* ACF078 80240F38 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s index e27a0a85a1..6ca3a71619 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F60_ACF0A0.s @@ -67,17 +67,17 @@ glabel func_80240F60_ACF0A0 /* ACF194 80241054 02A0282D */ daddu $a1, $s5, $zero /* ACF198 80241058 C6540030 */ lwc1 $f20, 0x30($s2) /* ACF19C 8024105C 0280302D */ daddu $a2, $s4, $zero -/* ACF1A0 80241060 0C0B2026 */ jal set_variable +/* ACF1A0 80241060 0C0B2026 */ jal evt_set_variable /* ACF1A4 80241064 4600A501 */ sub.s $f20, $f20, $f0 /* ACF1A8 80241068 0260202D */ daddu $a0, $s3, $zero /* ACF1AC 8024106C 4600B08D */ trunc.w.s $f2, $f22 /* ACF1B0 80241070 44061000 */ mfc1 $a2, $f2 -/* ACF1B4 80241074 0C0B2026 */ jal set_variable +/* ACF1B4 80241074 0C0B2026 */ jal evt_set_variable /* ACF1B8 80241078 02C0282D */ daddu $a1, $s6, $zero /* ACF1BC 8024107C 0260202D */ daddu $a0, $s3, $zero /* ACF1C0 80241080 4600A08D */ trunc.w.s $f2, $f20 /* ACF1C4 80241084 44061000 */ mfc1 $a2, $f2 -/* ACF1C8 80241088 0C0B2026 */ jal set_variable +/* ACF1C8 80241088 0C0B2026 */ jal evt_set_variable /* ACF1CC 8024108C 02E0282D */ daddu $a1, $s7, $zero .L80241090: /* ACF1D0 80241090 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s index e24d38021f..9823ac661f 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s @@ -5,7 +5,7 @@ glabel func_80240034_AD40C4 /* AD40C4 80240034 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AD40C8 80240038 AFBF0010 */ sw $ra, 0x10($sp) /* AD40CC 8024003C 8C82000C */ lw $v0, 0xc($a0) -/* AD40D0 80240040 0C0B210B */ jal get_float_variable +/* AD40D0 80240040 0C0B210B */ jal evt_get_float_variable /* AD40D4 80240044 8C450000 */ lw $a1, ($v0) /* AD40D8 80240048 8FBF0010 */ lw $ra, 0x10($sp) /* AD40DC 8024004C 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s index 880f157bbf..633cebd7ca 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s @@ -136,7 +136,7 @@ glabel func_80240070_AD4100 /* AD42D0 80240240 0260202D */ daddu $a0, $s3, $zero .L80240244: /* AD42D4 80240244 0280282D */ daddu $a1, $s4, $zero -/* AD42D8 80240248 0C0B2026 */ jal set_variable +/* AD42D8 80240248 0C0B2026 */ jal evt_set_variable /* AD42DC 8024024C 0220302D */ daddu $a2, $s1, $zero /* AD42E0 80240250 8FBF0044 */ lw $ra, 0x44($sp) /* AD42E4 80240254 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s index 67e4cd62d3..c775c3a299 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s @@ -176,7 +176,7 @@ glabel func_8024032C_AD43BC /* AD4640 802405B0 02E0202D */ daddu $a0, $s7, $zero .L802405B4: /* AD4644 802405B4 03C0282D */ daddu $a1, $fp, $zero -/* AD4648 802405B8 0C0B2026 */ jal set_variable +/* AD4648 802405B8 0C0B2026 */ jal evt_set_variable /* AD464C 802405BC 0200302D */ daddu $a2, $s0, $zero /* AD4650 802405C0 8FBF0054 */ lw $ra, 0x54($sp) /* AD4654 802405C4 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s index 862bf6c9cb..beb35193eb 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240604_AD4694.s @@ -48,7 +48,7 @@ glabel func_80240604_AD4694 /* AD4740 802406B0 0220202D */ daddu $a0, $s1, $zero /* AD4744 802406B4 4600008D */ trunc.w.s $f2, $f0 /* AD4748 802406B8 44061000 */ mfc1 $a2, $f2 -/* AD474C 802406BC 0C0B2026 */ jal set_variable +/* AD474C 802406BC 0C0B2026 */ jal evt_set_variable /* AD4750 802406C0 0280282D */ daddu $a1, $s4, $zero /* AD4754 802406C4 8FBF0024 */ lw $ra, 0x24($sp) /* AD4758 802406C8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s index bd512fcc47..28e35241ee 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s @@ -7,7 +7,7 @@ glabel func_802406E8_AD4778 /* AD4780 802406F0 8C82000C */ lw $v0, 0xc($a0) /* AD4784 802406F4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* AD4788 802406F8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* AD478C 802406FC 0C0B2026 */ jal set_variable +/* AD478C 802406FC 0C0B2026 */ jal evt_set_variable /* AD4790 80240700 8C450000 */ lw $a1, ($v0) /* AD4794 80240704 8FBF0010 */ lw $ra, 0x10($sp) /* AD4798 80240708 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s index f97c6e25fb..cd904f91c8 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240730_AD47C0.s @@ -67,17 +67,17 @@ glabel func_80240730_AD47C0 /* AD48B4 80240824 02A0282D */ daddu $a1, $s5, $zero /* AD48B8 80240828 C6540030 */ lwc1 $f20, 0x30($s2) /* AD48BC 8024082C 0280302D */ daddu $a2, $s4, $zero -/* AD48C0 80240830 0C0B2026 */ jal set_variable +/* AD48C0 80240830 0C0B2026 */ jal evt_set_variable /* AD48C4 80240834 4600A501 */ sub.s $f20, $f20, $f0 /* AD48C8 80240838 0260202D */ daddu $a0, $s3, $zero /* AD48CC 8024083C 4600B08D */ trunc.w.s $f2, $f22 /* AD48D0 80240840 44061000 */ mfc1 $a2, $f2 -/* AD48D4 80240844 0C0B2026 */ jal set_variable +/* AD48D4 80240844 0C0B2026 */ jal evt_set_variable /* AD48D8 80240848 02C0282D */ daddu $a1, $s6, $zero /* AD48DC 8024084C 0260202D */ daddu $a0, $s3, $zero /* AD48E0 80240850 4600A08D */ trunc.w.s $f2, $f20 /* AD48E4 80240854 44061000 */ mfc1 $a2, $f2 -/* AD48E8 80240858 0C0B2026 */ jal set_variable +/* AD48E8 80240858 0C0B2026 */ jal evt_set_variable /* AD48EC 8024085C 02E0282D */ daddu $a1, $s7, $zero .L80240860: /* AD48F0 80240860 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s index 808e385b3b..270d8d2834 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s @@ -7,7 +7,7 @@ glabel func_802403A0_ADB240 /* ADB248 802403A8 8C82000C */ lw $v0, 0xc($a0) /* ADB24C 802403AC 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* ADB250 802403B0 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* ADB254 802403B4 0C0B2026 */ jal set_variable +/* ADB254 802403B4 0C0B2026 */ jal evt_set_variable /* ADB258 802403B8 8C450000 */ lw $a1, ($v0) /* ADB25C 802403BC 8FBF0010 */ lw $ra, 0x10($sp) /* ADB260 802403C0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s index 17fdcd0f5f..d7a61ec3b5 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s @@ -5,7 +5,7 @@ glabel func_80240028_AED438 /* AED438 80240028 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AED43C 8024002C AFBF0010 */ sw $ra, 0x10($sp) /* AED440 80240030 8C82000C */ lw $v0, 0xc($a0) -/* AED444 80240034 0C0B210B */ jal get_float_variable +/* AED444 80240034 0C0B210B */ jal evt_get_float_variable /* AED448 80240038 8C450000 */ lw $a1, ($v0) /* AED44C 8024003C 8FBF0010 */ lw $ra, 0x10($sp) /* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s index 1cb3ef5b15..a2b913bce8 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s @@ -136,7 +136,7 @@ glabel func_80240060_AED470 /* AED640 80240230 0260202D */ daddu $a0, $s3, $zero .L80240234: /* AED644 80240234 0280282D */ daddu $a1, $s4, $zero -/* AED648 80240238 0C0B2026 */ jal set_variable +/* AED648 80240238 0C0B2026 */ jal evt_set_variable /* AED64C 8024023C 0220302D */ daddu $a2, $s1, $zero /* AED650 80240240 8FBF0044 */ lw $ra, 0x44($sp) /* AED654 80240244 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s index f429860649..3df40753ae 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s @@ -176,7 +176,7 @@ glabel func_8024031C_AED72C /* AED9B0 802405A0 02E0202D */ daddu $a0, $s7, $zero .L802405A4: /* AED9B4 802405A4 03C0282D */ daddu $a1, $fp, $zero -/* AED9B8 802405A8 0C0B2026 */ jal set_variable +/* AED9B8 802405A8 0C0B2026 */ jal evt_set_variable /* AED9BC 802405AC 0200302D */ daddu $a2, $s0, $zero /* AED9C0 802405B0 8FBF0054 */ lw $ra, 0x54($sp) /* AED9C4 802405B4 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s index f4aab6b2a0..737a47f7ed 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802405F4_AEDA04.s @@ -48,7 +48,7 @@ glabel func_802405F4_AEDA04 /* AEDAB0 802406A0 0220202D */ daddu $a0, $s1, $zero /* AEDAB4 802406A4 4600008D */ trunc.w.s $f2, $f0 /* AEDAB8 802406A8 44061000 */ mfc1 $a2, $f2 -/* AEDABC 802406AC 0C0B2026 */ jal set_variable +/* AEDABC 802406AC 0C0B2026 */ jal evt_set_variable /* AEDAC0 802406B0 0280282D */ daddu $a1, $s4, $zero /* AEDAC4 802406B4 8FBF0024 */ lw $ra, 0x24($sp) /* AEDAC8 802406B8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s index 3dde078ee0..dea9c0b84d 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s @@ -67,17 +67,17 @@ glabel func_802406D8_AEDAE8 /* AEDBDC 802407CC 02A0282D */ daddu $a1, $s5, $zero /* AEDBE0 802407D0 C6540030 */ lwc1 $f20, 0x30($s2) /* AEDBE4 802407D4 0280302D */ daddu $a2, $s4, $zero -/* AEDBE8 802407D8 0C0B2026 */ jal set_variable +/* AEDBE8 802407D8 0C0B2026 */ jal evt_set_variable /* AEDBEC 802407DC 4600A501 */ sub.s $f20, $f20, $f0 /* AEDBF0 802407E0 0260202D */ daddu $a0, $s3, $zero /* AEDBF4 802407E4 4600B08D */ trunc.w.s $f2, $f22 /* AEDBF8 802407E8 44061000 */ mfc1 $a2, $f2 -/* AEDBFC 802407EC 0C0B2026 */ jal set_variable +/* AEDBFC 802407EC 0C0B2026 */ jal evt_set_variable /* AEDC00 802407F0 02C0282D */ daddu $a1, $s6, $zero /* AEDC04 802407F4 0260202D */ daddu $a0, $s3, $zero /* AEDC08 802407F8 4600A08D */ trunc.w.s $f2, $f20 /* AEDC0C 802407FC 44061000 */ mfc1 $a2, $f2 -/* AEDC10 80240800 0C0B2026 */ jal set_variable +/* AEDC10 80240800 0C0B2026 */ jal evt_set_variable /* AEDC14 80240804 02E0282D */ daddu $a1, $s7, $zero .L80240808: /* AEDC18 80240808 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s index 7cf5b6d29d..c0cdc20ac5 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s @@ -136,7 +136,7 @@ glabel func_80240850_AEDC60 /* AEDE30 80240A20 0260202D */ daddu $a0, $s3, $zero .L80240A24: /* AEDE34 80240A24 0280282D */ daddu $a1, $s4, $zero -/* AEDE38 80240A28 0C0B2026 */ jal set_variable +/* AEDE38 80240A28 0C0B2026 */ jal evt_set_variable /* AEDE3C 80240A2C 0220302D */ daddu $a2, $s1, $zero /* AEDE40 80240A30 8FBF0044 */ lw $ra, 0x44($sp) /* AEDE44 80240A34 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s index 4f6477e6dd..a20abbfecc 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s @@ -176,7 +176,7 @@ glabel func_80240B0C_AEDF1C /* AEE1A0 80240D90 02E0202D */ daddu $a0, $s7, $zero .L80240D94: /* AEE1A4 80240D94 03C0282D */ daddu $a1, $fp, $zero -/* AEE1A8 80240D98 0C0B2026 */ jal set_variable +/* AEE1A8 80240D98 0C0B2026 */ jal evt_set_variable /* AEE1AC 80240D9C 0200302D */ daddu $a2, $s0, $zero /* AEE1B0 80240DA0 8FBF0054 */ lw $ra, 0x54($sp) /* AEE1B4 80240DA4 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s index 5d78982901..e05120feb6 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s @@ -48,7 +48,7 @@ glabel func_80240DE4_AEE1F4 /* AEE2A0 80240E90 0220202D */ daddu $a0, $s1, $zero /* AEE2A4 80240E94 4600008D */ trunc.w.s $f2, $f0 /* AEE2A8 80240E98 44061000 */ mfc1 $a2, $f2 -/* AEE2AC 80240E9C 0C0B2026 */ jal set_variable +/* AEE2AC 80240E9C 0C0B2026 */ jal evt_set_variable /* AEE2B0 80240EA0 0280282D */ daddu $a1, $s4, $zero /* AEE2B4 80240EA4 8FBF0024 */ lw $ra, 0x24($sp) /* AEE2B8 80240EA8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s index dcb61015b5..fa83ece4b8 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s @@ -7,7 +7,7 @@ glabel func_80240EC8_AEE2D8 /* AEE2E0 80240ED0 8C82000C */ lw $v0, 0xc($a0) /* AEE2E4 80240ED4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* AEE2EC 80240EDC 0C0B2026 */ jal set_variable +/* AEE2EC 80240EDC 0C0B2026 */ jal evt_set_variable /* AEE2F0 80240EE0 8C450000 */ lw $a1, ($v0) /* AEE2F4 80240EE4 8FBF0010 */ lw $ra, 0x10($sp) /* AEE2F8 80240EE8 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s index 08f207f2aa..98ca42a730 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s @@ -67,17 +67,17 @@ glabel func_80240F10_AEE320 /* AEE414 80241004 02A0282D */ daddu $a1, $s5, $zero /* AEE418 80241008 C6540030 */ lwc1 $f20, 0x30($s2) /* AEE41C 8024100C 0280302D */ daddu $a2, $s4, $zero -/* AEE420 80241010 0C0B2026 */ jal set_variable +/* AEE420 80241010 0C0B2026 */ jal evt_set_variable /* AEE424 80241014 4600A501 */ sub.s $f20, $f20, $f0 /* AEE428 80241018 0260202D */ daddu $a0, $s3, $zero /* AEE42C 8024101C 4600B08D */ trunc.w.s $f2, $f22 /* AEE430 80241020 44061000 */ mfc1 $a2, $f2 -/* AEE434 80241024 0C0B2026 */ jal set_variable +/* AEE434 80241024 0C0B2026 */ jal evt_set_variable /* AEE438 80241028 02C0282D */ daddu $a1, $s6, $zero /* AEE43C 8024102C 0260202D */ daddu $a0, $s3, $zero /* AEE440 80241030 4600A08D */ trunc.w.s $f2, $f20 /* AEE444 80241034 44061000 */ mfc1 $a2, $f2 -/* AEE448 80241038 0C0B2026 */ jal set_variable +/* AEE448 80241038 0C0B2026 */ jal evt_set_variable /* AEE44C 8024103C 02E0282D */ daddu $a1, $s7, $zero .L80241040: /* AEE450 80241040 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s index d32e3734e5..bab32866a0 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s @@ -139,7 +139,7 @@ glabel func_802402BC_AF1F1C /* AF210C 802404AC 8E65008C */ lw $a1, 0x8c($s3) /* AF2110 802404B0 0000202D */ daddu $a0, $zero, $zero /* AF2114 802404B4 00A62821 */ addu $a1, $a1, $a2 -/* AF2118 802404B8 0C0B2026 */ jal set_variable +/* AF2118 802404B8 0C0B2026 */ jal evt_set_variable /* AF211C 802404BC 24060001 */ addiu $a2, $zero, 1 .L802404C0: /* AF2120 802404C0 8E640078 */ lw $a0, 0x78($s3) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s index d658d1f4f0..b6aa48f89c 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s @@ -25,7 +25,7 @@ glabel func_80240500_AF2160 /* AF21A4 80240544 34A55D6E */ ori $a1, $a1, 0x5d6e /* AF21A8 80240548 0000202D */ daddu $a0, $zero, $zero /* AF21AC 8024054C 00C52821 */ addu $a1, $a2, $a1 -/* AF21B0 80240550 0C0B2026 */ jal set_variable +/* AF21B0 80240550 0C0B2026 */ jal evt_set_variable /* AF21B4 80240554 24060001 */ addiu $a2, $zero, 1 .L80240558: /* AF21B8 80240558 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s index dab034d9dc..b0f9339a4d 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s @@ -19,7 +19,7 @@ glabel func_8024056C_AF320C .L802405A0: /* AF3240 802405A0 8CC50000 */ lw $a1, ($a2) /* AF3244 802405A4 3C068024 */ lui $a2, %hi(D_80241F14_AF4BB4) -/* AF3248 802405A8 0C0B2026 */ jal set_variable +/* AF3248 802405A8 0C0B2026 */ jal evt_set_variable /* AF324C 802405AC 8CC61F14 */ lw $a2, %lo(D_80241F14_AF4BB4)($a2) /* AF3250 802405B0 24020002 */ addiu $v0, $zero, 2 .L802405B4: diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s index 8b153555e6..33d4adf59b 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s @@ -5,7 +5,7 @@ glabel func_80240730_AF33D0 /* AF33D0 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AF33D4 80240734 AFBF0010 */ sw $ra, 0x10($sp) /* AF33D8 80240738 8C82000C */ lw $v0, 0xc($a0) -/* AF33DC 8024073C 0C0B210B */ jal get_float_variable +/* AF33DC 8024073C 0C0B210B */ jal evt_get_float_variable /* AF33E0 80240740 8C450000 */ lw $a1, ($v0) /* AF33E4 80240744 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* AF33E8 80240748 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s index 8106dccc3e..95c72605ea 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s @@ -19,7 +19,7 @@ glabel func_802404DC_AF7E2C .L80240510: /* AF7E60 80240510 8CC50000 */ lw $a1, ($a2) /* AF7E64 80240514 3C068024 */ lui $a2, %hi(D_80241B14_AF9464) -/* AF7E68 80240518 0C0B2026 */ jal set_variable +/* AF7E68 80240518 0C0B2026 */ jal evt_set_variable /* AF7E6C 8024051C 8CC61B14 */ lw $a2, %lo(D_80241B14_AF9464)($a2) /* AF7E70 80240520 24020002 */ addiu $v0, $zero, 2 .L80240524: 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 d89e9c6aad..b05e7466e3 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 @@ -306,7 +306,7 @@ glabel L80240ACC_AF841C /* AF8460 80240B10 3C05F70F */ lui $a1, 0xf70f /* AF8464 80240B14 3C068024 */ lui $a2, %hi(D_8024652C) /* AF8468 80240B18 8CC6652C */ lw $a2, %lo(D_8024652C)($a2) -/* AF846C 80240B1C 0C0B2026 */ jal set_variable +/* AF846C 80240B1C 0C0B2026 */ jal evt_set_variable /* AF8470 80240B20 34A52E83 */ ori $a1, $a1, 0x2e83 /* AF8474 80240B24 0000102D */ daddu $v0, $zero, $zero .L80240B28: diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s index d2001ce36d..397c7c630a 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s @@ -16,7 +16,7 @@ glabel func_80240B8C_AF84DC /* AF8508 80240BB8 3C068008 */ lui $a2, %hi(gItemTable) /* AF850C 80240BBC 00C23021 */ addu $a2, $a2, $v0 /* AF8510 80240BC0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AF8514 80240BC4 0C0B2026 */ jal set_variable +/* AF8514 80240BC4 0C0B2026 */ jal evt_set_variable /* AF8518 80240BC8 0220282D */ daddu $a1, $s1, $zero /* AF851C 80240BCC 8FBF0018 */ lw $ra, 0x18($sp) /* AF8520 80240BD0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s index 190a9cb267..101b2668cb 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s @@ -7,7 +7,7 @@ glabel func_802405BC_AFE0FC /* AFE104 802405C4 8C82000C */ lw $v0, 0xc($a0) /* AFE108 802405C8 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* AFE10C 802405CC 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* AFE110 802405D0 0C0B2026 */ jal set_variable +/* AFE110 802405D0 0C0B2026 */ jal evt_set_variable /* AFE114 802405D4 8C450000 */ lw $a1, ($v0) /* AFE118 802405D8 8FBF0010 */ lw $ra, 0x10($sp) /* AFE11C 802405DC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s index 00c5b21f3a..6e95eef59e 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s @@ -5,7 +5,7 @@ glabel func_80240048_B028C8 /* B028C8 80240048 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B028CC 8024004C AFBF0010 */ sw $ra, 0x10($sp) /* B028D0 80240050 8C82000C */ lw $v0, 0xc($a0) -/* B028D4 80240054 0C0B210B */ jal get_float_variable +/* B028D4 80240054 0C0B210B */ jal evt_get_float_variable /* B028D8 80240058 8C450000 */ lw $a1, ($v0) /* B028DC 8024005C 8FBF0010 */ lw $ra, 0x10($sp) /* B028E0 80240060 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s index a4023f2ecd..5fe05aeeda 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s @@ -136,7 +136,7 @@ glabel func_802400E0_B02960 /* B02B30 802402B0 0260202D */ daddu $a0, $s3, $zero .L802402B4: /* B02B34 802402B4 0280282D */ daddu $a1, $s4, $zero -/* B02B38 802402B8 0C0B2026 */ jal set_variable +/* B02B38 802402B8 0C0B2026 */ jal evt_set_variable /* B02B3C 802402BC 0220302D */ daddu $a2, $s1, $zero /* B02B40 802402C0 8FBF0044 */ lw $ra, 0x44($sp) /* B02B44 802402C4 8FB40040 */ lw $s4, 0x40($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s index ba54687adf..85f881dc59 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s @@ -176,7 +176,7 @@ glabel func_8024039C_B02C1C /* B02EA0 80240620 02E0202D */ daddu $a0, $s7, $zero .L80240624: /* B02EA4 80240624 03C0282D */ daddu $a1, $fp, $zero -/* B02EA8 80240628 0C0B2026 */ jal set_variable +/* B02EA8 80240628 0C0B2026 */ jal evt_set_variable /* B02EAC 8024062C 0200302D */ daddu $a2, $s0, $zero /* B02EB0 80240630 8FBF0054 */ lw $ra, 0x54($sp) /* B02EB4 80240634 8FBE0050 */ lw $fp, 0x50($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s index f95635538a..196703f943 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240674_B02EF4.s @@ -48,7 +48,7 @@ glabel func_80240674_B02EF4 /* B02FA0 80240720 0220202D */ daddu $a0, $s1, $zero /* B02FA4 80240724 4600008D */ trunc.w.s $f2, $f0 /* B02FA8 80240728 44061000 */ mfc1 $a2, $f2 -/* B02FAC 8024072C 0C0B2026 */ jal set_variable +/* B02FAC 8024072C 0C0B2026 */ jal evt_set_variable /* B02FB0 80240730 0280282D */ daddu $a1, $s4, $zero /* B02FB4 80240734 8FBF0024 */ lw $ra, 0x24($sp) /* B02FB8 80240738 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s index d829944e67..fced2a8c36 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s @@ -7,7 +7,7 @@ glabel func_80240758_B02FD8 /* B02FE0 80240760 8C82000C */ lw $v0, 0xc($a0) /* B02FE4 80240764 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* B02FE8 80240768 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* B02FEC 8024076C 0C0B2026 */ jal set_variable +/* B02FEC 8024076C 0C0B2026 */ jal evt_set_variable /* B02FF0 80240770 8C450000 */ lw $a1, ($v0) /* B02FF4 80240774 8FBF0010 */ lw $ra, 0x10($sp) /* B02FF8 80240778 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s index 55efc59701..491c894205 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802407A0_B03020.s @@ -67,17 +67,17 @@ glabel func_802407A0_B03020 /* B03114 80240894 02A0282D */ daddu $a1, $s5, $zero /* B03118 80240898 C6540030 */ lwc1 $f20, 0x30($s2) /* B0311C 8024089C 0280302D */ daddu $a2, $s4, $zero -/* B03120 802408A0 0C0B2026 */ jal set_variable +/* B03120 802408A0 0C0B2026 */ jal evt_set_variable /* B03124 802408A4 4600A501 */ sub.s $f20, $f20, $f0 /* B03128 802408A8 0260202D */ daddu $a0, $s3, $zero /* B0312C 802408AC 4600B08D */ trunc.w.s $f2, $f22 /* B03130 802408B0 44061000 */ mfc1 $a2, $f2 -/* B03134 802408B4 0C0B2026 */ jal set_variable +/* B03134 802408B4 0C0B2026 */ jal evt_set_variable /* B03138 802408B8 02C0282D */ daddu $a1, $s6, $zero /* B0313C 802408BC 0260202D */ daddu $a0, $s3, $zero /* B03140 802408C0 4600A08D */ trunc.w.s $f2, $f20 /* B03144 802408C4 44061000 */ mfc1 $a2, $f2 -/* B03148 802408C8 0C0B2026 */ jal set_variable +/* B03148 802408C8 0C0B2026 */ jal evt_set_variable /* B0314C 802408CC 02E0282D */ daddu $a1, $s7, $zero .L802408D0: /* B03150 802408D0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s index 09cb683131..4f77182d43 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s @@ -12,17 +12,17 @@ glabel func_80240264_B06C64 /* B06C80 80240280 F7B40028 */ sdc1 $f20, 0x28($sp) /* B06C84 80240284 8E30000C */ lw $s0, 0xc($s1) /* B06C88 80240288 8E050000 */ lw $a1, ($s0) -/* B06C8C 8024028C 0C0B210B */ jal get_float_variable +/* B06C8C 8024028C 0C0B210B */ jal evt_get_float_variable /* B06C90 80240290 26100004 */ addiu $s0, $s0, 4 /* B06C94 80240294 8E050000 */ lw $a1, ($s0) /* B06C98 80240298 26100004 */ addiu $s0, $s0, 4 /* B06C9C 8024029C 0220202D */ daddu $a0, $s1, $zero -/* B06CA0 802402A0 0C0B210B */ jal get_float_variable +/* B06CA0 802402A0 0C0B210B */ jal evt_get_float_variable /* B06CA4 802402A4 46000606 */ mov.s $f24, $f0 /* B06CA8 802402A8 8E050000 */ lw $a1, ($s0) /* B06CAC 802402AC 26100004 */ addiu $s0, $s0, 4 /* B06CB0 802402B0 0220202D */ daddu $a0, $s1, $zero -/* B06CB4 802402B4 0C0B210B */ jal get_float_variable +/* B06CB4 802402B4 0C0B210B */ jal evt_get_float_variable /* B06CB8 802402B8 46000586 */ mov.s $f22, $f0 /* B06CBC 802402BC 0220202D */ daddu $a0, $s1, $zero /* B06CC0 802402C0 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s index 7b51da5e10..737b6da137 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s @@ -61,7 +61,7 @@ glabel func_802406EC_B070EC /* B071CC 802407CC 3C05FD05 */ lui $a1, 0xfd05 /* B071D0 802407D0 34A50F8A */ ori $a1, $a1, 0xf8a /* B071D4 802407D4 0200302D */ daddu $a2, $s0, $zero -/* B071D8 802407D8 0C0B2026 */ jal set_variable +/* B071D8 802407D8 0C0B2026 */ jal evt_set_variable /* B071DC 802407DC AE020004 */ sw $v0, 4($s0) /* B071E0 802407E0 8FBF0020 */ lw $ra, 0x20($sp) /* B071E4 802407E4 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240800_B07200.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240800_B07200.s index 488a5c4cb2..5683364f2b 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240800_B07200.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240800_B07200.s @@ -21,7 +21,7 @@ glabel func_80240800_B07200 /* B07240 80240840 0220202D */ daddu $a0, $s1, $zero /* B07244 80240844 3C05FD05 */ lui $a1, 0xfd05 /* B07248 80240848 34A50F8A */ ori $a1, $a1, 0xf8a -/* B0724C 8024084C 0C0B2026 */ jal set_variable +/* B0724C 8024084C 0C0B2026 */ jal evt_set_variable /* B07250 80240850 0000302D */ daddu $a2, $zero, $zero /* B07254 80240854 8FBF0018 */ lw $ra, 0x18($sp) /* B07258 80240858 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s index 06d12d7055..7fc8ccdbe5 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024086C_B0726C.s @@ -10,19 +10,19 @@ glabel func_8024086C_B0726C /* B07280 80240880 AFB00010 */ sw $s0, 0x10($sp) /* B07284 80240884 8E30000C */ lw $s0, 0xc($s1) /* B07288 80240888 8E050000 */ lw $a1, ($s0) -/* B0728C 8024088C 0C0B210B */ jal get_float_variable +/* B0728C 8024088C 0C0B210B */ jal evt_get_float_variable /* B07290 80240890 26100004 */ addiu $s0, $s0, 4 /* B07294 80240894 8E050000 */ lw $a1, ($s0) /* B07298 80240898 26100004 */ addiu $s0, $s0, 4 /* B0729C 8024089C 4600008D */ trunc.w.s $f2, $f0 /* B072A0 802408A0 44121000 */ mfc1 $s2, $f2 -/* B072A4 802408A4 0C0B210B */ jal get_float_variable +/* B072A4 802408A4 0C0B210B */ jal evt_get_float_variable /* B072A8 802408A8 0220202D */ daddu $a0, $s1, $zero /* B072AC 802408AC 0220202D */ daddu $a0, $s1, $zero /* B072B0 802408B0 8E050000 */ lw $a1, ($s0) /* B072B4 802408B4 4600008D */ trunc.w.s $f2, $f0 /* B072B8 802408B8 44111000 */ mfc1 $s1, $f2 -/* B072BC 802408BC 0C0B210B */ jal get_float_variable +/* B072BC 802408BC 0C0B210B */ jal evt_get_float_variable /* B072C0 802408C0 00000000 */ nop /* B072C4 802408C4 0000202D */ daddu $a0, $zero, $zero /* B072C8 802408C8 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s index af087e7bad..5385c78f23 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s @@ -10,19 +10,19 @@ glabel func_8024092C_B0732C /* B07340 80240940 AFB00010 */ sw $s0, 0x10($sp) /* B07344 80240944 8E30000C */ lw $s0, 0xc($s1) /* B07348 80240948 8E050000 */ lw $a1, ($s0) -/* B0734C 8024094C 0C0B210B */ jal get_float_variable +/* B0734C 8024094C 0C0B210B */ jal evt_get_float_variable /* B07350 80240950 26100004 */ addiu $s0, $s0, 4 /* B07354 80240954 8E050000 */ lw $a1, ($s0) /* B07358 80240958 26100004 */ addiu $s0, $s0, 4 /* B0735C 8024095C 4600008D */ trunc.w.s $f2, $f0 /* B07360 80240960 44121000 */ mfc1 $s2, $f2 -/* B07364 80240964 0C0B210B */ jal get_float_variable +/* B07364 80240964 0C0B210B */ jal evt_get_float_variable /* B07368 80240968 0220202D */ daddu $a0, $s1, $zero /* B0736C 8024096C 0220202D */ daddu $a0, $s1, $zero /* B07370 80240970 8E050000 */ lw $a1, ($s0) /* B07374 80240974 4600008D */ trunc.w.s $f2, $f0 /* B07378 80240978 44111000 */ mfc1 $s1, $f2 -/* B0737C 8024097C 0C0B210B */ jal get_float_variable +/* B0737C 8024097C 0C0B210B */ jal evt_get_float_variable /* B07380 80240980 00000000 */ nop /* B07384 80240984 0000202D */ daddu $a0, $zero, $zero /* B07388 80240988 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s index 48b7e9f715..25033e5878 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802409EC_B073EC.s @@ -10,19 +10,19 @@ glabel func_802409EC_B073EC /* B07400 80240A00 AFB00010 */ sw $s0, 0x10($sp) /* B07404 80240A04 8E30000C */ lw $s0, 0xc($s1) /* B07408 80240A08 8E050000 */ lw $a1, ($s0) -/* B0740C 80240A0C 0C0B210B */ jal get_float_variable +/* B0740C 80240A0C 0C0B210B */ jal evt_get_float_variable /* B07410 80240A10 26100004 */ addiu $s0, $s0, 4 /* B07414 80240A14 8E050000 */ lw $a1, ($s0) /* B07418 80240A18 26100004 */ addiu $s0, $s0, 4 /* B0741C 80240A1C 4600008D */ trunc.w.s $f2, $f0 /* B07420 80240A20 44121000 */ mfc1 $s2, $f2 -/* B07424 80240A24 0C0B210B */ jal get_float_variable +/* B07424 80240A24 0C0B210B */ jal evt_get_float_variable /* B07428 80240A28 0220202D */ daddu $a0, $s1, $zero /* B0742C 80240A2C 0220202D */ daddu $a0, $s1, $zero /* B07430 80240A30 8E050000 */ lw $a1, ($s0) /* B07434 80240A34 4600008D */ trunc.w.s $f2, $f0 /* B07438 80240A38 44111000 */ mfc1 $s1, $f2 -/* B0743C 80240A3C 0C0B210B */ jal get_float_variable +/* B0743C 80240A3C 0C0B210B */ jal evt_get_float_variable /* B07440 80240A40 00000000 */ nop /* B07444 80240A44 0000202D */ daddu $a0, $zero, $zero /* B07448 80240A48 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s index a014ea3838..bde65631fa 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s @@ -60,24 +60,24 @@ glabel func_802404CC_8B053C /* 8B0614 802405A4 0220202D */ daddu $a0, $s1, $zero /* 8B0618 802405A8 3C05F5DE */ lui $a1, 0xf5de /* 8B061C 802405AC 34A502DE */ ori $a1, $a1, 0x2de -/* 8B0620 802405B0 0C0B2026 */ jal set_variable +/* 8B0620 802405B0 0C0B2026 */ jal evt_set_variable /* 8B0624 802405B4 0280302D */ daddu $a2, $s4, $zero /* 8B0628 802405B8 0220202D */ daddu $a0, $s1, $zero /* 8B062C 802405BC 3C05F5DE */ lui $a1, 0xf5de /* 8B0630 802405C0 34A502DF */ ori $a1, $a1, 0x2df -/* 8B0634 802405C4 0C0B2026 */ jal set_variable +/* 8B0634 802405C4 0C0B2026 */ jal evt_set_variable /* 8B0638 802405C8 32A6FFFF */ andi $a2, $s5, 0xffff /* 8B063C 802405CC 24100001 */ addiu $s0, $zero, 1 /* 8B0640 802405D0 0220202D */ daddu $a0, $s1, $zero .L802405D4: /* 8B0644 802405D4 3C05F840 */ lui $a1, 0xf840 /* 8B0648 802405D8 34A56268 */ ori $a1, $a1, 0x6268 -/* 8B064C 802405DC 0C0B2026 */ jal set_variable +/* 8B064C 802405DC 0C0B2026 */ jal evt_set_variable /* 8B0650 802405E0 3206FFFF */ andi $a2, $s0, 0xffff /* 8B0654 802405E4 0220202D */ daddu $a0, $s1, $zero /* 8B0658 802405E8 3C05F840 */ lui $a1, 0xf840 /* 8B065C 802405EC 34A56269 */ ori $a1, $a1, 0x6269 -/* 8B0660 802405F0 0C0B2026 */ jal set_variable +/* 8B0660 802405F0 0C0B2026 */ jal evt_set_variable /* 8B0664 802405F4 32E6FFFF */ andi $a2, $s7, 0xffff /* 8B0668 802405F8 0000202D */ daddu $a0, $zero, $zero /* 8B066C 802405FC 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s index 9befef70d8..70ecbb7e4b 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s @@ -19,7 +19,7 @@ glabel func_8024226C_8B22DC .L802422A0: /* 8B2310 802422A0 8CC50000 */ lw $a1, ($a2) /* 8B2314 802422A4 3C068024 */ lui $a2, %hi(D_80247E34_8B7EA4) -/* 8B2318 802422A8 0C0B2026 */ jal set_variable +/* 8B2318 802422A8 0C0B2026 */ jal evt_set_variable /* 8B231C 802422AC 8CC67E34 */ lw $a2, %lo(D_80247E34_8B7EA4)($a2) /* 8B2320 802422B0 24020002 */ addiu $v0, $zero, 2 .L802422B4: diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s index 9b72d1b647..23ec4069ff 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s @@ -12,7 +12,7 @@ glabel func_8024280C_8B287C /* 8B2898 80242828 0000282D */ daddu $a1, $zero, $zero /* 8B289C 8024282C 0200202D */ daddu $a0, $s0, $zero /* 8B28A0 80242830 8E250000 */ lw $a1, ($s1) -/* 8B28A4 80242834 0C0B210B */ jal get_float_variable +/* 8B28A4 80242834 0C0B210B */ jal evt_get_float_variable /* 8B28A8 80242838 0040802D */ daddu $s0, $v0, $zero /* 8B28AC 8024283C C6020034 */ lwc1 $f2, 0x34($s0) /* 8B28B0 80242840 46001080 */ add.s $f2, $f2, $f0 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s index bce96bbdae..73b8f86c8e 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s @@ -72,17 +72,17 @@ glabel func_802417E0_8D2CF0 /* 8D2DFC 802418EC 3C05FD05 */ lui $a1, 0xfd05 /* 8D2E00 802418F0 34A50F8A */ ori $a1, $a1, 0xf8a /* 8D2E04 802418F4 0200302D */ daddu $a2, $s0, $zero -/* 8D2E08 802418F8 0C0B2026 */ jal set_variable +/* 8D2E08 802418F8 0C0B2026 */ jal evt_set_variable /* 8D2E0C 802418FC ACC20004 */ sw $v0, 4($a2) /* 8D2E10 80241900 0260202D */ daddu $a0, $s3, $zero /* 8D2E14 80241904 3C05FD05 */ lui $a1, 0xfd05 /* 8D2E18 80241908 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D2E1C 8024190C 0C0B2026 */ jal set_variable +/* 8D2E1C 8024190C 0C0B2026 */ jal evt_set_variable /* 8D2E20 80241910 02A0302D */ daddu $a2, $s5, $zero /* 8D2E24 80241914 0260202D */ daddu $a0, $s3, $zero /* 8D2E28 80241918 3C05FD05 */ lui $a1, 0xfd05 /* 8D2E2C 8024191C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D2E30 80241920 0C0B2026 */ jal set_variable +/* 8D2E30 80241920 0C0B2026 */ jal evt_set_variable /* 8D2E34 80241924 0280302D */ daddu $a2, $s4, $zero /* 8D2E38 80241928 8FBF0028 */ lw $ra, 0x28($sp) /* 8D2E3C 8024192C 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s index f015a63b62..4f4adb81af 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s @@ -12,16 +12,16 @@ glabel func_80241950_8D2E60 /* 8D2E7C 8024196C F7B40020 */ sdc1 $f20, 0x20($sp) /* 8D2E80 80241970 8E30000C */ lw $s0, 0xc($s1) /* 8D2E84 80241974 8E050000 */ lw $a1, ($s0) -/* 8D2E88 80241978 0C0B210B */ jal get_float_variable +/* 8D2E88 80241978 0C0B210B */ jal evt_get_float_variable /* 8D2E8C 8024197C 26100004 */ addiu $s0, $s0, 4 /* 8D2E90 80241980 8E050000 */ lw $a1, ($s0) /* 8D2E94 80241984 26100004 */ addiu $s0, $s0, 4 /* 8D2E98 80241988 0220202D */ daddu $a0, $s1, $zero -/* 8D2E9C 8024198C 0C0B210B */ jal get_float_variable +/* 8D2E9C 8024198C 0C0B210B */ jal evt_get_float_variable /* 8D2EA0 80241990 46000606 */ mov.s $f24, $f0 /* 8D2EA4 80241994 0220202D */ daddu $a0, $s1, $zero /* 8D2EA8 80241998 8E050000 */ lw $a1, ($s0) -/* 8D2EAC 8024199C 0C0B210B */ jal get_float_variable +/* 8D2EAC 8024199C 0C0B210B */ jal evt_get_float_variable /* 8D2EB0 802419A0 46000586 */ mov.s $f22, $f0 /* 8D2EB4 802419A4 0220202D */ daddu $a0, $s1, $zero /* 8D2EB8 802419A8 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s index 83e471f750..89e9851678 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s @@ -11,11 +11,11 @@ glabel func_802419EC_8D2EFC /* 8D2F14 80241A04 F7B40020 */ sdc1 $f20, 0x20($sp) /* 8D2F18 80241A08 8E30000C */ lw $s0, 0xc($s1) /* 8D2F1C 80241A0C 8E050000 */ lw $a1, ($s0) -/* 8D2F20 80241A10 0C0B210B */ jal get_float_variable +/* 8D2F20 80241A10 0C0B210B */ jal evt_get_float_variable /* 8D2F24 80241A14 26100004 */ addiu $s0, $s0, 4 /* 8D2F28 80241A18 0220202D */ daddu $a0, $s1, $zero /* 8D2F2C 80241A1C 8E050000 */ lw $a1, ($s0) -/* 8D2F30 80241A20 0C0B210B */ jal get_float_variable +/* 8D2F30 80241A20 0C0B210B */ jal evt_get_float_variable /* 8D2F34 80241A24 46000586 */ mov.s $f22, $f0 /* 8D2F38 80241A28 0220202D */ daddu $a0, $s1, $zero /* 8D2F3C 80241A2C 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s index 5ce49a712d..5770192ef4 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s @@ -25,19 +25,19 @@ glabel func_80241A68_8D2F78 /* 8D2FC4 80241AB4 00000000 */ nop /* 8D2FC8 80241AB8 8E450000 */ lw $a1, ($s2) /* 8D2FCC 80241ABC 26520004 */ addiu $s2, $s2, 4 -/* 8D2FD0 80241AC0 0C0B210B */ jal get_float_variable +/* 8D2FD0 80241AC0 0C0B210B */ jal evt_get_float_variable /* 8D2FD4 80241AC4 0260202D */ daddu $a0, $s3, $zero /* 8D2FD8 80241AC8 8E450000 */ lw $a1, ($s2) /* 8D2FDC 80241ACC 26520004 */ addiu $s2, $s2, 4 /* 8D2FE0 80241AD0 0260202D */ daddu $a0, $s3, $zero -/* 8D2FE4 80241AD4 0C0B210B */ jal get_float_variable +/* 8D2FE4 80241AD4 0C0B210B */ jal evt_get_float_variable /* 8D2FE8 80241AD8 46000506 */ mov.s $f20, $f0 /* 8D2FEC 80241ADC 8E450000 */ lw $a1, ($s2) /* 8D2FF0 80241AE0 26520004 */ addiu $s2, $s2, 4 /* 8D2FF4 80241AE4 3C014140 */ lui $at, 0x4140 /* 8D2FF8 80241AE8 44811000 */ mtc1 $at, $f2 /* 8D2FFC 80241AEC 0260202D */ daddu $a0, $s3, $zero -/* 8D3000 80241AF0 0C0B210B */ jal get_float_variable +/* 8D3000 80241AF0 0C0B210B */ jal evt_get_float_variable /* 8D3004 80241AF4 46020580 */ add.s $f22, $f0, $f2 /* 8D3008 80241AF8 E6340028 */ swc1 $f20, 0x28($s1) /* 8D300C 80241AFC E6200030 */ swc1 $f0, 0x30($s1) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s index 950a526db8..de74537c09 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s @@ -8,7 +8,7 @@ glabel func_80241C78_8D3188 /* 8D3194 80241C84 AFBF0014 */ sw $ra, 0x14($sp) /* 8D3198 80241C88 F7B40018 */ sdc1 $f20, 0x18($sp) /* 8D319C 80241C8C 8E02000C */ lw $v0, 0xc($s0) -/* 8D31A0 80241C90 0C0B210B */ jal get_float_variable +/* 8D31A0 80241C90 0C0B210B */ jal evt_get_float_variable /* 8D31A4 80241C94 8C450000 */ lw $a1, ($v0) /* 8D31A8 80241C98 0200202D */ daddu $a0, $s0, $zero /* 8D31AC 80241C9C 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s index bd09541f23..bfff8df7f7 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s @@ -12,17 +12,17 @@ glabel func_802402A0_8DA3A0 /* 8DA3BC 802402BC F7B40028 */ sdc1 $f20, 0x28($sp) /* 8DA3C0 802402C0 8E30000C */ lw $s0, 0xc($s1) /* 8DA3C4 802402C4 8E050000 */ lw $a1, ($s0) -/* 8DA3C8 802402C8 0C0B210B */ jal get_float_variable +/* 8DA3C8 802402C8 0C0B210B */ jal evt_get_float_variable /* 8DA3CC 802402CC 26100004 */ addiu $s0, $s0, 4 /* 8DA3D0 802402D0 8E050000 */ lw $a1, ($s0) /* 8DA3D4 802402D4 26100004 */ addiu $s0, $s0, 4 /* 8DA3D8 802402D8 0220202D */ daddu $a0, $s1, $zero -/* 8DA3DC 802402DC 0C0B210B */ jal get_float_variable +/* 8DA3DC 802402DC 0C0B210B */ jal evt_get_float_variable /* 8DA3E0 802402E0 46000606 */ mov.s $f24, $f0 /* 8DA3E4 802402E4 8E050000 */ lw $a1, ($s0) /* 8DA3E8 802402E8 26100004 */ addiu $s0, $s0, 4 /* 8DA3EC 802402EC 0220202D */ daddu $a0, $s1, $zero -/* 8DA3F0 802402F0 0C0B210B */ jal get_float_variable +/* 8DA3F0 802402F0 0C0B210B */ jal evt_get_float_variable /* 8DA3F4 802402F4 46000586 */ mov.s $f22, $f0 /* 8DA3F8 802402F8 0220202D */ daddu $a0, $s1, $zero /* 8DA3FC 802402FC 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s index 09ef69e853..b872e401f8 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s @@ -5,7 +5,7 @@ glabel func_80240344_8DA444 /* 8DA444 80240344 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8DA448 80240348 AFBF0010 */ sw $ra, 0x10($sp) /* 8DA44C 8024034C 8C82000C */ lw $v0, 0xc($a0) -/* 8DA450 80240350 0C0B210B */ jal get_float_variable +/* 8DA450 80240350 0C0B210B */ jal evt_get_float_variable /* 8DA454 80240354 8C450000 */ lw $a1, ($v0) /* 8DA458 80240358 8FBF0010 */ lw $ra, 0x10($sp) /* 8DA45C 8024035C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index 4720f1c843..b336ef5b72 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -212,7 +212,7 @@ glabel func_802406C8_8EC4E8 /* 8EC7DC 802409BC 0000202D */ daddu $a0, $zero, $zero /* 8EC7E0 802409C0 3C05F840 */ lui $a1, 0xf840 /* 8EC7E4 802409C4 34A55BE7 */ ori $a1, $a1, 0x5be7 -/* 8EC7E8 802409C8 0C0B2026 */ jal set_variable +/* 8EC7E8 802409C8 0C0B2026 */ jal evt_set_variable /* 8EC7EC 802409CC 24060001 */ addiu $a2, $zero, 1 .L802409D0: /* 8EC7F0 802409D0 3C148025 */ lui $s4, %hi(D_80253390) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s index 15ef55efa0..6518a59c76 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s @@ -5,7 +5,7 @@ glabel func_80241CF0_8EDB10 /* 8EDB10 80241CF0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8EDB14 80241CF4 AFBF0010 */ sw $ra, 0x10($sp) /* 8EDB18 80241CF8 8C82000C */ lw $v0, 0xc($a0) -/* 8EDB1C 80241CFC 0C0B210B */ jal get_float_variable +/* 8EDB1C 80241CFC 0C0B210B */ jal evt_get_float_variable /* 8EDB20 80241D00 8C450000 */ lw $a1, ($v0) /* 8EDB24 80241D04 8FBF0010 */ lw $ra, 0x10($sp) /* 8EDB28 80241D08 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s index e049cc49e7..1b51514682 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s @@ -23,7 +23,7 @@ glabel func_80242B04_8EE924 /* 8EE96C 80242B4C 3C05FD05 */ lui $a1, 0xfd05 /* 8EE970 80242B50 34A50F8A */ ori $a1, $a1, 0xf8a /* 8EE974 80242B54 0200302D */ daddu $a2, $s0, $zero -/* 8EE978 80242B58 0C0B2026 */ jal set_variable +/* 8EE978 80242B58 0C0B2026 */ jal evt_set_variable /* 8EE97C 80242B5C AE020020 */ sw $v0, 0x20($s0) /* 8EE980 80242B60 0C090A8F */ jal func_80242A3C_8EE85C /* 8EE984 80242B64 0200202D */ daddu $a0, $s0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240_8FF8B0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240_8FF8B0.s index f8abfca6eb..8922437bbb 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240_8FF8B0.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240_8FF8B0.s @@ -31,17 +31,17 @@ glabel func_80240240_8FF8B0 /* 8FF914 802402A4 24050001 */ addiu $a1, $zero, 1 /* 8FF918 802402A8 0220202D */ daddu $a0, $s1, $zero /* 8FF91C 802402AC 3C05FE36 */ lui $a1, 0xfe36 -/* 8FF920 802402B0 0C0B210B */ jal get_float_variable +/* 8FF920 802402B0 0C0B210B */ jal evt_get_float_variable /* 8FF924 802402B4 34A53C81 */ ori $a1, $a1, 0x3c81 /* 8FF928 802402B8 0220202D */ daddu $a0, $s1, $zero /* 8FF92C 802402BC 3C05FE36 */ lui $a1, 0xfe36 /* 8FF930 802402C0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8FF934 802402C4 0C0B210B */ jal get_float_variable +/* 8FF934 802402C4 0C0B210B */ jal evt_get_float_variable /* 8FF938 802402C8 E6000098 */ swc1 $f0, 0x98($s0) /* 8FF93C 802402CC 0220202D */ daddu $a0, $s1, $zero /* 8FF940 802402D0 3C05FE36 */ lui $a1, 0xfe36 /* 8FF944 802402D4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8FF948 802402D8 0C0B210B */ jal get_float_variable +/* 8FF948 802402D8 0C0B210B */ jal evt_get_float_variable /* 8FF94C 802402DC E600009C */ swc1 $f0, 0x9c($s0) /* 8FF950 802402E0 E60000A0 */ swc1 $f0, 0xa0($s0) /* 8FF954 802402E4 2610000C */ addiu $s0, $s0, 0xc diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s index 83a1977feb..028c4dba22 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s @@ -11,7 +11,7 @@ glabel func_80240B4C_9001BC /* 9001D4 80240B64 0200202D */ daddu $a0, $s0, $zero /* 9001D8 80240B68 3C05FD05 */ lui $a1, 0xfd05 /* 9001DC 80240B6C 34A50F80 */ ori $a1, $a1, 0xf80 -/* 9001E0 80240B70 0C0B2026 */ jal set_variable +/* 9001E0 80240B70 0C0B2026 */ jal evt_set_variable /* 9001E4 80240B74 0040302D */ daddu $a2, $v0, $zero /* 9001E8 80240B78 2402FFFF */ addiu $v0, $zero, -1 /* 9001EC 80240B7C 3C058024 */ lui $a1, %hi(func_80240B00_900170) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s index 245c4da6be..5830507a82 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s @@ -22,7 +22,7 @@ glabel func_80240040_907A70 /* 907AB4 80240084 3C05FD05 */ lui $a1, 0xfd05 /* 907AB8 80240088 34A50F80 */ ori $a1, $a1, 0xf80 /* 907ABC 8024008C 0200302D */ daddu $a2, $s0, $zero -/* 907AC0 80240090 0C0B2026 */ jal set_variable +/* 907AC0 80240090 0C0B2026 */ jal evt_set_variable /* 907AC4 80240094 AE700060 */ sw $s0, 0x60($s3) /* 907AC8 80240098 8E250000 */ lw $a1, ($s1) /* 907ACC 8024009C 26310004 */ addiu $s1, $s1, 4 @@ -31,16 +31,16 @@ glabel func_80240040_907A70 /* 907AD8 802400A8 A6020022 */ sh $v0, 0x22($s0) /* 907ADC 802400AC 8E250000 */ lw $a1, ($s1) /* 907AE0 802400B0 26310004 */ addiu $s1, $s1, 4 -/* 907AE4 802400B4 0C0B210B */ jal get_float_variable +/* 907AE4 802400B4 0C0B210B */ jal evt_get_float_variable /* 907AE8 802400B8 0260202D */ daddu $a0, $s3, $zero /* 907AEC 802400BC E6000000 */ swc1 $f0, ($s0) /* 907AF0 802400C0 8E250000 */ lw $a1, ($s1) /* 907AF4 802400C4 26310004 */ addiu $s1, $s1, 4 -/* 907AF8 802400C8 0C0B210B */ jal get_float_variable +/* 907AF8 802400C8 0C0B210B */ jal evt_get_float_variable /* 907AFC 802400CC 0260202D */ daddu $a0, $s3, $zero /* 907B00 802400D0 E6000004 */ swc1 $f0, 4($s0) /* 907B04 802400D4 8E250000 */ lw $a1, ($s1) -/* 907B08 802400D8 0C0B210B */ jal get_float_variable +/* 907B08 802400D8 0C0B210B */ jal evt_get_float_variable /* 907B0C 802400DC 0260202D */ daddu $a0, $s3, $zero /* 907B10 802400E0 E6000008 */ swc1 $f0, 8($s0) /* 907B14 802400E4 3C013F80 */ lui $at, 0x3f80 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274_907CA4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274_907CA4.s index 6ffde01333..c4970f4e20 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274_907CA4.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274_907CA4.s @@ -18,7 +18,7 @@ glabel func_80240274_907CA4 /* 907CD8 802402A8 0040882D */ daddu $s1, $v0, $zero /* 907CDC 802402AC A6200020 */ sh $zero, 0x20($s1) /* 907CE0 802402B0 8E650000 */ lw $a1, ($s3) -/* 907CE4 802402B4 0C0B210B */ jal get_float_variable +/* 907CE4 802402B4 0C0B210B */ jal evt_get_float_variable /* 907CE8 802402B8 0240202D */ daddu $a0, $s2, $zero /* 907CEC 802402BC E6200014 */ swc1 $f0, 0x14($s1) .L802402C0: diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s index b2f6c327b0..bf788bc3e5 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s @@ -11,7 +11,7 @@ glabel func_80240300_907D30 /* 907D48 80240318 50A00011 */ beql $a1, $zero, .L80240360 /* 907D4C 8024031C 0220202D */ daddu $a0, $s1, $zero /* 907D50 80240320 8E050000 */ lw $a1, ($s0) -/* 907D54 80240324 0C0B210B */ jal get_float_variable +/* 907D54 80240324 0C0B210B */ jal evt_get_float_variable /* 907D58 80240328 26100004 */ addiu $s0, $s0, 4 /* 907D5C 8024032C E6200074 */ swc1 $f0, 0x74($s1) /* 907D60 80240330 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s index 860aade61e..e81d7431e2 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s @@ -10,7 +10,7 @@ glabel func_80240494_907EC4 /* 907ED8 802404A8 F7B40028 */ sdc1 $f20, 0x28($sp) /* 907EDC 802404AC 8E30000C */ lw $s0, 0xc($s1) /* 907EE0 802404B0 8E050000 */ lw $a1, ($s0) -/* 907EE4 802404B4 0C0B210B */ jal get_float_variable +/* 907EE4 802404B4 0C0B210B */ jal evt_get_float_variable /* 907EE8 802404B8 26100004 */ addiu $s0, $s0, 4 /* 907EEC 802404BC 0220202D */ daddu $a0, $s1, $zero /* 907EF0 802404C0 8E050000 */ lw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s index 9c8ce1e0d8..aa0f1f00aa 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s @@ -14,7 +14,7 @@ glabel func_80241E50_A4A410 /* A4A434 80241E74 0040802D */ daddu $s0, $v0, $zero /* A4A438 80241E78 3C05FD05 */ lui $a1, 0xfd05 /* A4A43C 80241E7C 34A50F80 */ ori $a1, $a1, 0xf80 -/* A4A440 80241E80 0C0B2026 */ jal set_variable +/* A4A440 80241E80 0C0B2026 */ jal evt_set_variable /* A4A444 80241E84 0000302D */ daddu $a2, $zero, $zero .L80241E88: /* A4A448 80241E88 86020018 */ lh $v0, 0x18($s0) @@ -23,7 +23,7 @@ glabel func_80241E50_A4A410 /* A4A454 80241E94 0220202D */ daddu $a0, $s1, $zero /* A4A458 80241E98 3C05FD05 */ lui $a1, 0xfd05 /* A4A45C 80241E9C 34A50F80 */ ori $a1, $a1, 0xf80 -/* A4A460 80241EA0 0C0B2026 */ jal set_variable +/* A4A460 80241EA0 0C0B2026 */ jal evt_set_variable /* A4A464 80241EA4 24060001 */ addiu $a2, $zero, 1 .L80241EA8: /* A4A468 80241EA8 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s index 1f10011907..ca356ca6e8 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s @@ -280,7 +280,7 @@ glabel func_80240B38_A4FB38 /* A4FF20 80240F20 AE220000 */ sw $v0, ($s1) /* A4FF24 80240F24 AC800070 */ sw $zero, 0x70($a0) .L80240F28: -/* A4FF28 80240F28 0C0B2026 */ jal set_variable +/* A4FF28 80240F28 0C0B2026 */ jal evt_set_variable /* A4FF2C 80240F2C 00000000 */ nop /* A4FF30 80240F30 080903DA */ j .L80240F68 /* A4FF34 80240F34 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s index 8a1ab2acc4..e3b1d2a17b 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s @@ -280,7 +280,7 @@ glabel func_80240DA8_A944E8 /* A948D0 80241190 AE220000 */ sw $v0, ($s1) /* A948D4 80241194 AC800070 */ sw $zero, 0x70($a0) .L80241198: -/* A948D8 80241198 0C0B2026 */ jal set_variable +/* A948D8 80241198 0C0B2026 */ jal evt_set_variable /* A948DC 8024119C 00000000 */ nop /* A948E0 802411A0 08090476 */ j .L802411D8 /* A948E4 802411A4 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s index f8c5c63c44..1600ac882c 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s @@ -280,7 +280,7 @@ glabel func_80240C08_A9A198 /* A9A580 80240FF0 AE220000 */ sw $v0, ($s1) /* A9A584 80240FF4 AC800070 */ sw $zero, 0x70($a0) .L80240FF8: -/* A9A588 80240FF8 0C0B2026 */ jal set_variable +/* A9A588 80240FF8 0C0B2026 */ jal evt_set_variable /* A9A58C 80240FFC 00000000 */ nop /* A9A590 80241000 0809040E */ j .L80241038 /* A9A594 80241004 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s index e4658ec138..5767b23fda 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s @@ -280,7 +280,7 @@ glabel func_80240C08_A9F948 /* A9FD30 80240FF0 AE220000 */ sw $v0, ($s1) /* A9FD34 80240FF4 AC800070 */ sw $zero, 0x70($a0) .L80240FF8: -/* A9FD38 80240FF8 0C0B2026 */ jal set_variable +/* A9FD38 80240FF8 0C0B2026 */ jal evt_set_variable /* A9FD3C 80240FFC 00000000 */ nop /* A9FD40 80241000 0809040E */ j .L80241038 /* A9FD44 80241004 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s index 22b9ad567a..92ea8e6578 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s @@ -280,7 +280,7 @@ glabel func_80240A98_A61468 /* A61850 80240E80 AE220000 */ sw $v0, ($s1) /* A61854 80240E84 AC800070 */ sw $zero, 0x70($a0) .L80240E88: -/* A61858 80240E88 0C0B2026 */ jal set_variable +/* A61858 80240E88 0C0B2026 */ jal evt_set_variable /* A6185C 80240E8C 00000000 */ nop /* A61860 80240E90 080903B2 */ j .L80240EC8 /* A61864 80240E94 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s index 25fcfd7a7b..e8d6b9a591 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s @@ -280,7 +280,7 @@ glabel func_80240B78_A67C78 /* A68060 80240F60 AE220000 */ sw $v0, ($s1) /* A68064 80240F64 AC800070 */ sw $zero, 0x70($a0) .L80240F68: -/* A68068 80240F68 0C0B2026 */ jal set_variable +/* A68068 80240F68 0C0B2026 */ jal evt_set_variable /* A6806C 80240F6C 00000000 */ nop /* A68070 80240F70 080903EA */ j .L80240FA8 /* A68074 80240F74 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s index 88b7c97f7d..c235421f9a 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s @@ -73,7 +73,7 @@ glabel func_80240050_A6ACF0 /* A6ADDC 8024013C C6000080 */ lwc1 $f0, 0x80($s0) /* A6ADE0 80240140 4600010D */ trunc.w.s $f4, $f0 /* A6ADE4 80240144 44062000 */ mfc1 $a2, $f4 -/* A6ADE8 80240148 0C0B2026 */ jal set_variable +/* A6ADE8 80240148 0C0B2026 */ jal evt_set_variable /* A6ADEC 8024014C 0240282D */ daddu $a1, $s2, $zero /* A6ADF0 80240150 24020002 */ addiu $v0, $zero, 2 .L80240154: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s index 7c399da0d9..770ed08856 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s @@ -19,7 +19,7 @@ glabel func_8024027C_A7873C .L802402B0: /* A78770 802402B0 8CC50000 */ lw $a1, ($a2) /* A78774 802402B4 3C068024 */ lui $a2, %hi(D_80240D9C_A7925C) -/* A78778 802402B8 0C0B2026 */ jal set_variable +/* A78778 802402B8 0C0B2026 */ jal evt_set_variable /* A7877C 802402BC 8CC60D9C */ lw $a2, %lo(D_80240D9C_A7925C)($a2) /* A78780 802402C0 24020002 */ addiu $v0, $zero, 2 .L802402C4: diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s index f8e409216a..4f84c65226 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s @@ -19,7 +19,7 @@ glabel func_8024027C_A7A77C .L802402B0: /* A7A7B0 802402B0 8CC50000 */ lw $a1, ($a2) /* A7A7B4 802402B4 3C068024 */ lui $a2, %hi(D_80240C24_A7B124) -/* A7A7B8 802402B8 0C0B2026 */ jal set_variable +/* A7A7B8 802402B8 0C0B2026 */ jal evt_set_variable /* A7A7BC 802402BC 8CC60C24 */ lw $a2, %lo(D_80240C24_A7B124)($a2) /* A7A7C0 802402C0 24020002 */ addiu $v0, $zero, 2 .L802402C4: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s index cc8f5101d1..829d57977c 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s @@ -7,7 +7,7 @@ glabel func_802403B0_C5AAF0 /* C5AAF8 802403B8 8C82000C */ lw $v0, 0xc($a0) /* C5AAFC 802403BC 3C068011 */ lui $a2, %hi(gPartnerActionStatus+0x3) /* C5AB00 802403C0 80C6EBB3 */ lb $a2, %lo(gPartnerActionStatus+0x3)($a2) -/* C5AB04 802403C4 0C0B2026 */ jal set_variable +/* C5AB04 802403C4 0C0B2026 */ jal evt_set_variable /* C5AB08 802403C8 8C450000 */ lw $a1, ($v0) /* C5AB0C 802403CC 8FBF0010 */ lw $ra, 0x10($sp) /* C5AB10 802403D0 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s index 428e2163ee..6c54a81cd8 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s @@ -19,7 +19,7 @@ glabel func_80242310_C5CA50 .L80242344: /* C5CA84 80242344 8CC50000 */ lw $a1, ($a2) /* C5CA88 80242348 3C068024 */ lui $a2, %hi(D_80244A78_C5F1B8) -/* C5CA8C 8024234C 0C0B2026 */ jal set_variable +/* C5CA8C 8024234C 0C0B2026 */ jal evt_set_variable /* C5CA90 80242350 8CC64A78 */ lw $a2, %lo(D_80244A78_C5F1B8)($a2) /* C5CA94 80242354 24020002 */ addiu $v0, $zero, 2 .L80242358: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s index 392571a3d5..682a4c8346 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s @@ -19,7 +19,7 @@ glabel func_802428E0_C635F0 .L80242914: /* C63624 80242914 8CC50000 */ lw $a1, ($a2) /* C63628 80242918 3C068024 */ lui $a2, %hi(D_80244208_C64F18) -/* C6362C 8024291C 0C0B2026 */ jal set_variable +/* C6362C 8024291C 0C0B2026 */ jal evt_set_variable /* C63630 80242920 8CC64208 */ lw $a2, %lo(D_80244208_C64F18)($a2) /* C63634 80242924 24020002 */ addiu $v0, $zero, 2 .L80242928: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s index 6dd5da9346..ebca4b7915 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s @@ -35,7 +35,7 @@ glabel func_80242D38_C63A48 /* C63A9C 80242D8C 04C00004 */ bltz $a2, .L80242DA0 /* C63AA0 80242D90 00000000 */ nop /* C63AA4 80242D94 3C05FD05 */ lui $a1, 0xfd05 -/* C63AA8 80242D98 0C0B2026 */ jal set_variable +/* C63AA8 80242D98 0C0B2026 */ jal evt_set_variable /* C63AAC 80242D9C 34A50F89 */ ori $a1, $a1, 0xf89 .L80242DA0: /* C63AB0 80242DA0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s index ed10cca0b5..ea26430faf 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s @@ -102,7 +102,7 @@ glabel func_802403F0_C6CD10 /* C6CE5C 8024053C 00000000 */ nop .L80240540: /* C6CE60 80240540 3C05FD05 */ lui $a1, 0xfd05 -/* C6CE64 80240544 0C0B210B */ jal get_float_variable +/* C6CE64 80240544 0C0B210B */ jal evt_get_float_variable /* C6CE68 80240548 34A50F80 */ ori $a1, $a1, 0xf80 /* C6CE6C 8024054C 44802000 */ mtc1 $zero, $f4 /* C6CE70 80240550 00000000 */ nop @@ -133,7 +133,7 @@ glabel func_802403F0_C6CD10 .L802405B0: /* C6CED0 802405B0 0000202D */ daddu $a0, $zero, $zero /* C6CED4 802405B4 3C05FD05 */ lui $a1, 0xfd05 -/* C6CED8 802405B8 0C0B210B */ jal get_float_variable +/* C6CED8 802405B8 0C0B210B */ jal evt_get_float_variable /* C6CEDC 802405BC 34A50F80 */ ori $a1, $a1, 0xf80 /* C6CEE0 802405C0 3C018024 */ lui $at, %hi(D_80241A00_C6E320) /* C6CEE4 802405C4 D4221A00 */ ldc1 $f2, %lo(D_80241A00_C6E320)($at) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s index f3a5aa9605..6f5c37ba7e 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s @@ -102,7 +102,7 @@ glabel func_80240000_C6E330 /* C6E47C 8024014C 00000000 */ nop .L80240150: /* C6E480 80240150 3C05FD05 */ lui $a1, 0xfd05 -/* C6E484 80240154 0C0B210B */ jal get_float_variable +/* C6E484 80240154 0C0B210B */ jal evt_get_float_variable /* C6E488 80240158 34A50F80 */ ori $a1, $a1, 0xf80 /* C6E48C 8024015C 44802000 */ mtc1 $zero, $f4 /* C6E490 80240160 00000000 */ nop @@ -133,7 +133,7 @@ glabel func_80240000_C6E330 .L802401C0: /* C6E4F0 802401C0 0000202D */ daddu $a0, $zero, $zero /* C6E4F4 802401C4 3C05FD05 */ lui $a1, 0xfd05 -/* C6E4F8 802401C8 0C0B210B */ jal get_float_variable +/* C6E4F8 802401C8 0C0B210B */ jal evt_get_float_variable /* C6E4FC 802401CC 34A50F80 */ ori $a1, $a1, 0xf80 /* C6E500 802401D0 3C018024 */ lui $at, %hi(D_80243080_C713B0) /* C6E504 802401D4 D4223080 */ ldc1 $f2, %lo(D_80243080_C713B0)($at) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s index c2de9a4bb1..bd72f5f7d3 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s @@ -102,7 +102,7 @@ glabel func_80240000_C71480 /* C715CC 8024014C 00000000 */ nop .L80240150: /* C715D0 80240150 3C05FD05 */ lui $a1, 0xfd05 -/* C715D4 80240154 0C0B210B */ jal get_float_variable +/* C715D4 80240154 0C0B210B */ jal evt_get_float_variable /* C715D8 80240158 34A50F80 */ ori $a1, $a1, 0xf80 /* C715DC 8024015C 44802000 */ mtc1 $zero, $f4 /* C715E0 80240160 00000000 */ nop @@ -133,7 +133,7 @@ glabel func_80240000_C71480 .L802401C0: /* C71640 802401C0 0000202D */ daddu $a0, $zero, $zero /* C71644 802401C4 3C05FD05 */ lui $a1, 0xfd05 -/* C71648 802401C8 0C0B210B */ jal get_float_variable +/* C71648 802401C8 0C0B210B */ jal evt_get_float_variable /* C7164C 802401CC 34A50F80 */ ori $a1, $a1, 0xf80 /* C71650 802401D0 3C018024 */ lui $at, %hi(D_802455D0_C76A50) /* C71654 802401D4 D42255D0 */ ldc1 $f2, %lo(D_802455D0_C76A50)($at) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s index 2b886a7a88..657352a59c 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s @@ -19,7 +19,7 @@ glabel func_802435F0_C7A2D0 .L80243624: /* C7A304 80243624 8CC50000 */ lw $a1, ($a2) /* C7A308 80243628 3C068024 */ lui $a2, %hi(D_802452B8_C7BF98) -/* C7A30C 8024362C 0C0B2026 */ jal set_variable +/* C7A30C 8024362C 0C0B2026 */ jal evt_set_variable /* C7A310 80243630 8CC652B8 */ lw $a2, %lo(D_802452B8_C7BF98)($a2) /* C7A314 80243634 24020002 */ addiu $v0, $zero, 2 .L80243638: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s index ba6065b3ca..b1000fa9b7 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s @@ -19,7 +19,7 @@ glabel func_802428E0_C88390 .L80242914: /* C883C4 80242914 8CC50000 */ lw $a1, ($a2) /* C883C8 80242918 3C068024 */ lui $a2, %hi(D_802440DC_C89B8C) -/* C883CC 8024291C 0C0B2026 */ jal set_variable +/* C883CC 8024291C 0C0B2026 */ jal evt_set_variable /* C883D0 80242920 8CC640DC */ lw $a2, %lo(D_802440DC_C89B8C)($a2) /* C883D4 80242924 24020002 */ addiu $v0, $zero, 2 .L80242928: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240358_C8DF08.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240358_C8DF08.s index fbd8025a16..a0bc2014d9 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240358_C8DF08.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240358_C8DF08.s @@ -17,7 +17,7 @@ glabel func_80240358_C8DF08 /* C8DF38 80240388 34A50F81 */ ori $a1, $a1, 0xf81 /* C8DF3C 8024038C 0040802D */ daddu $s0, $v0, $zero /* C8DF40 80240390 0200302D */ daddu $a2, $s0, $zero -/* C8DF44 80240394 0C0B2026 */ jal set_variable +/* C8DF44 80240394 0C0B2026 */ jal evt_set_variable /* C8DF48 80240398 AE500084 */ sw $s0, 0x84($s2) /* C8DF4C 8024039C 8E250000 */ lw $a1, ($s1) /* C8DF50 802403A0 26310004 */ addiu $s1, $s1, 4 @@ -31,41 +31,41 @@ glabel func_80240358_C8DF08 /* C8DF70 802403C0 AE02003C */ sw $v0, 0x3c($s0) /* C8DF74 802403C4 8E250000 */ lw $a1, ($s1) /* C8DF78 802403C8 26310004 */ addiu $s1, $s1, 4 -/* C8DF7C 802403CC 0C0B210B */ jal get_float_variable +/* C8DF7C 802403CC 0C0B210B */ jal evt_get_float_variable /* C8DF80 802403D0 0240202D */ daddu $a0, $s2, $zero /* C8DF84 802403D4 E600000C */ swc1 $f0, 0xc($s0) /* C8DF88 802403D8 8E250000 */ lw $a1, ($s1) /* C8DF8C 802403DC 26310004 */ addiu $s1, $s1, 4 -/* C8DF90 802403E0 0C0B210B */ jal get_float_variable +/* C8DF90 802403E0 0C0B210B */ jal evt_get_float_variable /* C8DF94 802403E4 0240202D */ daddu $a0, $s2, $zero /* C8DF98 802403E8 E6000010 */ swc1 $f0, 0x10($s0) /* C8DF9C 802403EC 8E250000 */ lw $a1, ($s1) /* C8DFA0 802403F0 26310004 */ addiu $s1, $s1, 4 -/* C8DFA4 802403F4 0C0B210B */ jal get_float_variable +/* C8DFA4 802403F4 0C0B210B */ jal evt_get_float_variable /* C8DFA8 802403F8 0240202D */ daddu $a0, $s2, $zero /* C8DFAC 802403FC E6000014 */ swc1 $f0, 0x14($s0) /* C8DFB0 80240400 8E250000 */ lw $a1, ($s1) /* C8DFB4 80240404 26310004 */ addiu $s1, $s1, 4 -/* C8DFB8 80240408 0C0B210B */ jal get_float_variable +/* C8DFB8 80240408 0C0B210B */ jal evt_get_float_variable /* C8DFBC 8024040C 0240202D */ daddu $a0, $s2, $zero /* C8DFC0 80240410 E6000018 */ swc1 $f0, 0x18($s0) /* C8DFC4 80240414 8E250000 */ lw $a1, ($s1) /* C8DFC8 80240418 26310004 */ addiu $s1, $s1, 4 -/* C8DFCC 8024041C 0C0B210B */ jal get_float_variable +/* C8DFCC 8024041C 0C0B210B */ jal evt_get_float_variable /* C8DFD0 80240420 0240202D */ daddu $a0, $s2, $zero /* C8DFD4 80240424 E600001C */ swc1 $f0, 0x1c($s0) /* C8DFD8 80240428 8E250000 */ lw $a1, ($s1) /* C8DFDC 8024042C 26310004 */ addiu $s1, $s1, 4 -/* C8DFE0 80240430 0C0B210B */ jal get_float_variable +/* C8DFE0 80240430 0C0B210B */ jal evt_get_float_variable /* C8DFE4 80240434 0240202D */ daddu $a0, $s2, $zero /* C8DFE8 80240438 E6000020 */ swc1 $f0, 0x20($s0) /* C8DFEC 8024043C 8E250000 */ lw $a1, ($s1) /* C8DFF0 80240440 26310004 */ addiu $s1, $s1, 4 -/* C8DFF4 80240444 0C0B210B */ jal get_float_variable +/* C8DFF4 80240444 0C0B210B */ jal evt_get_float_variable /* C8DFF8 80240448 0240202D */ daddu $a0, $s2, $zero /* C8DFFC 8024044C E6000024 */ swc1 $f0, 0x24($s0) /* C8E000 80240450 8E250000 */ lw $a1, ($s1) -/* C8E004 80240454 0C0B210B */ jal get_float_variable +/* C8E004 80240454 0C0B210B */ jal evt_get_float_variable /* C8E008 80240458 0240202D */ daddu $a0, $s2, $zero /* C8E00C 8024045C 3C013F80 */ lui $at, 0x3f80 /* C8E010 80240460 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240908_C8E4B8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240908_C8E4B8.s index dda3cc64c2..8226d52025 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240908_C8E4B8.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240908_C8E4B8.s @@ -21,21 +21,21 @@ glabel func_80240908_C8E4B8 /* C8E4F8 80240948 AE020038 */ sw $v0, 0x38($s0) /* C8E4FC 8024094C 8E250000 */ lw $a1, ($s1) /* C8E500 80240950 26310004 */ addiu $s1, $s1, 4 -/* C8E504 80240954 0C0B210B */ jal get_float_variable +/* C8E504 80240954 0C0B210B */ jal evt_get_float_variable /* C8E508 80240958 0240202D */ daddu $a0, $s2, $zero /* C8E50C 8024095C E6000018 */ swc1 $f0, 0x18($s0) /* C8E510 80240960 8E250000 */ lw $a1, ($s1) /* C8E514 80240964 26310004 */ addiu $s1, $s1, 4 -/* C8E518 80240968 0C0B210B */ jal get_float_variable +/* C8E518 80240968 0C0B210B */ jal evt_get_float_variable /* C8E51C 8024096C 0240202D */ daddu $a0, $s2, $zero /* C8E520 80240970 E6000024 */ swc1 $f0, 0x24($s0) /* C8E524 80240974 8E250000 */ lw $a1, ($s1) /* C8E528 80240978 26310004 */ addiu $s1, $s1, 4 -/* C8E52C 8024097C 0C0B210B */ jal get_float_variable +/* C8E52C 8024097C 0C0B210B */ jal evt_get_float_variable /* C8E530 80240980 0240202D */ daddu $a0, $s2, $zero /* C8E534 80240984 E6000020 */ swc1 $f0, 0x20($s0) /* C8E538 80240988 8E250000 */ lw $a1, ($s1) -/* C8E53C 8024098C 0C0B210B */ jal get_float_variable +/* C8E53C 8024098C 0C0B210B */ jal evt_get_float_variable /* C8E540 80240990 0240202D */ daddu $a0, $s2, $zero /* C8E544 80240994 3C013F80 */ lui $at, 0x3f80 /* C8E548 80240998 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240B00_C8E6B0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240B00_C8E6B0.s index c7f0c6ae8d..9e0f3a2a6f 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240B00_C8E6B0.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240B00_C8E6B0.s @@ -31,17 +31,17 @@ glabel func_80240B00_C8E6B0 /* C8E714 80240B64 24050001 */ addiu $a1, $zero, 1 /* C8E718 80240B68 0220202D */ daddu $a0, $s1, $zero /* C8E71C 80240B6C 3C05FE36 */ lui $a1, 0xfe36 -/* C8E720 80240B70 0C0B210B */ jal get_float_variable +/* C8E720 80240B70 0C0B210B */ jal evt_get_float_variable /* C8E724 80240B74 34A53C81 */ ori $a1, $a1, 0x3c81 /* C8E728 80240B78 0220202D */ daddu $a0, $s1, $zero /* C8E72C 80240B7C 3C05FE36 */ lui $a1, 0xfe36 /* C8E730 80240B80 34A53C82 */ ori $a1, $a1, 0x3c82 -/* C8E734 80240B84 0C0B210B */ jal get_float_variable +/* C8E734 80240B84 0C0B210B */ jal evt_get_float_variable /* C8E738 80240B88 E6000098 */ swc1 $f0, 0x98($s0) /* C8E73C 80240B8C 0220202D */ daddu $a0, $s1, $zero /* C8E740 80240B90 3C05FE36 */ lui $a1, 0xfe36 /* C8E744 80240B94 34A53C83 */ ori $a1, $a1, 0x3c83 -/* C8E748 80240B98 0C0B210B */ jal get_float_variable +/* C8E748 80240B98 0C0B210B */ jal evt_get_float_variable /* C8E74C 80240B9C E600009C */ swc1 $f0, 0x9c($s0) /* C8E750 80240BA0 E60000A0 */ swc1 $f0, 0xa0($s0) /* C8E754 80240BA4 2610000C */ addiu $s0, $s0, 0xc diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s index 5263261fa3..9c77cb9685 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s @@ -11,7 +11,7 @@ glabel func_8024140C_C8EFBC /* C8EFD4 80241424 0200202D */ daddu $a0, $s0, $zero /* C8EFD8 80241428 3C05FD05 */ lui $a1, 0xfd05 /* C8EFDC 8024142C 34A50F80 */ ori $a1, $a1, 0xf80 -/* C8EFE0 80241430 0C0B2026 */ jal set_variable +/* C8EFE0 80241430 0C0B2026 */ jal evt_set_variable /* C8EFE4 80241434 0040302D */ daddu $a2, $v0, $zero /* C8EFE8 80241438 2402FFFF */ addiu $v0, $zero, -1 /* C8EFEC 8024143C 3C058024 */ lui $a1, %hi(func_802413C0_C8EF70) diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s index 121c3c17b3..0b102b2c0d 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s @@ -19,7 +19,7 @@ glabel func_802417AC_C8F35C .L802417E0: /* C8F390 802417E0 8CC50000 */ lw $a1, ($a2) /* C8F394 802417E4 3C068024 */ lui $a2, %hi(D_80243DDC_C9198C) -/* C8F398 802417E8 0C0B2026 */ jal set_variable +/* C8F398 802417E8 0C0B2026 */ jal evt_set_variable /* C8F39C 802417EC 8CC63DDC */ lw $a2, %lo(D_80243DDC_C9198C)($a2) /* C8F3A0 802417F0 24020002 */ addiu $v0, $zero, 2 .L802417F4: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s index 94650bab98..b16a1a1775 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s @@ -19,7 +19,7 @@ glabel func_80240654_C96584 .L80240688: /* C965B8 80240688 8CC50000 */ lw $a1, ($a2) /* C965BC 8024068C 3C068024 */ lui $a2, %hi(D_802417E8_C97718) -/* C965C0 80240690 0C0B2026 */ jal set_variable +/* C965C0 80240690 0C0B2026 */ jal evt_set_variable /* C965C4 80240694 8CC617E8 */ lw $a2, %lo(D_802417E8_C97718)($a2) /* C965C8 80240698 24020002 */ addiu $v0, $zero, 2 .L8024069C: diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240478_C9C778.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240478_C9C778.s index 07b8d69c25..c54671687d 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240478_C9C778.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240478_C9C778.s @@ -11,16 +11,16 @@ glabel func_80240478_C9C778 /* C9C790 80240490 F7B40020 */ sdc1 $f20, 0x20($sp) /* C9C794 80240494 8E30000C */ lw $s0, 0xc($s1) /* C9C798 80240498 8E050000 */ lw $a1, ($s0) -/* C9C79C 8024049C 0C0B210B */ jal get_float_variable +/* C9C79C 8024049C 0C0B210B */ jal evt_get_float_variable /* C9C7A0 802404A0 26100004 */ addiu $s0, $s0, 4 /* C9C7A4 802404A4 8E050000 */ lw $a1, ($s0) /* C9C7A8 802404A8 26100004 */ addiu $s0, $s0, 4 /* C9C7AC 802404AC 0220202D */ daddu $a0, $s1, $zero -/* C9C7B0 802404B0 0C0B210B */ jal get_float_variable +/* C9C7B0 802404B0 0C0B210B */ jal evt_get_float_variable /* C9C7B4 802404B4 46000586 */ mov.s $f22, $f0 /* C9C7B8 802404B8 0220202D */ daddu $a0, $s1, $zero /* C9C7BC 802404BC 8E050000 */ lw $a1, ($s0) -/* C9C7C0 802404C0 0C0B210B */ jal get_float_variable +/* C9C7C0 802404C0 0C0B210B */ jal evt_get_float_variable /* C9C7C4 802404C4 46000506 */ mov.s $f20, $f0 /* C9C7C8 802404C8 8E2300BC */ lw $v1, 0xbc($s1) /* C9C7CC 802404CC 8C62000C */ lw $v0, 0xc($v1) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s index 5b615e0d6f..d98535e1e8 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s @@ -60,24 +60,24 @@ glabel func_8024076C_7EB47C /* 7EB554 80240844 0220202D */ daddu $a0, $s1, $zero /* 7EB558 80240848 3C05F5DE */ lui $a1, 0xf5de /* 7EB55C 8024084C 34A502DE */ ori $a1, $a1, 0x2de -/* 7EB560 80240850 0C0B2026 */ jal set_variable +/* 7EB560 80240850 0C0B2026 */ jal evt_set_variable /* 7EB564 80240854 0280302D */ daddu $a2, $s4, $zero /* 7EB568 80240858 0220202D */ daddu $a0, $s1, $zero /* 7EB56C 8024085C 3C05F5DE */ lui $a1, 0xf5de /* 7EB570 80240860 34A502DF */ ori $a1, $a1, 0x2df -/* 7EB574 80240864 0C0B2026 */ jal set_variable +/* 7EB574 80240864 0C0B2026 */ jal evt_set_variable /* 7EB578 80240868 32A6FFFF */ andi $a2, $s5, 0xffff /* 7EB57C 8024086C 24100001 */ addiu $s0, $zero, 1 /* 7EB580 80240870 0220202D */ daddu $a0, $s1, $zero .L80240874: /* 7EB584 80240874 3C05F840 */ lui $a1, 0xf840 /* 7EB588 80240878 34A56268 */ ori $a1, $a1, 0x6268 -/* 7EB58C 8024087C 0C0B2026 */ jal set_variable +/* 7EB58C 8024087C 0C0B2026 */ jal evt_set_variable /* 7EB590 80240880 3206FFFF */ andi $a2, $s0, 0xffff /* 7EB594 80240884 0220202D */ daddu $a0, $s1, $zero /* 7EB598 80240888 3C05F840 */ lui $a1, 0xf840 /* 7EB59C 8024088C 34A56269 */ ori $a1, $a1, 0x6269 -/* 7EB5A0 80240890 0C0B2026 */ jal set_variable +/* 7EB5A0 80240890 0C0B2026 */ jal evt_set_variable /* 7EB5A4 80240894 32E6FFFF */ andi $a2, $s7, 0xffff /* 7EB5A8 80240898 0000202D */ daddu $a0, $zero, $zero /* 7EB5AC 8024089C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s index a4be81450f..dea7590c1c 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s @@ -19,7 +19,7 @@ glabel func_802418F0_7EC600 .L80241924: /* 7EC634 80241924 8CC50000 */ lw $a1, ($a2) /* 7EC638 80241928 3C068025 */ lui $a2, %hi(D_802483EC_7F30FC) -/* 7EC63C 8024192C 0C0B2026 */ jal set_variable +/* 7EC63C 8024192C 0C0B2026 */ jal evt_set_variable /* 7EC640 80241930 8CC683EC */ lw $a2, %lo(D_802483EC_7F30FC)($a2) /* 7EC644 80241934 24020002 */ addiu $v0, $zero, 2 .L80241938: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s index 380355f07d..cdf50d601a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s @@ -16,7 +16,7 @@ glabel func_80241DA0_7ECAB0 /* 7ECAD8 80241DC8 8E250010 */ lw $a1, 0x10($s1) /* 7ECADC 80241DCC 26310014 */ addiu $s1, $s1, 0x14 /* 7ECAE0 80241DD0 0240202D */ daddu $a0, $s2, $zero -/* 7ECAE4 80241DD4 0C0B2026 */ jal set_variable +/* 7ECAE4 80241DD4 0C0B2026 */ jal evt_set_variable /* 7ECAE8 80241DD8 0000302D */ daddu $a2, $zero, $zero /* 7ECAEC 80241DDC 2E020024 */ sltiu $v0, $s0, 0x24 /* 7ECAF0 80241DE0 1440FFF9 */ bnez $v0, .L80241DC8 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s index 71e98de3c7..6e702529f6 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s @@ -22,7 +22,7 @@ glabel func_80241E04_7ECB14 /* 7ECB54 80241E44 8E03FFFC */ lw $v1, -4($s0) /* 7ECB58 80241E48 26100014 */ addiu $s0, $s0, 0x14 /* 7ECB5C 80241E4C 0043102A */ slt $v0, $v0, $v1 -/* 7ECB60 80241E50 0C0B2026 */ jal set_variable +/* 7ECB60 80241E50 0C0B2026 */ jal evt_set_variable /* 7ECB64 80241E54 38460001 */ xori $a2, $v0, 1 /* 7ECB68 80241E58 2E220024 */ sltiu $v0, $s1, 0x24 /* 7ECB6C 80241E5C 1440FFF3 */ bnez $v0, .L80241E2C diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s index 89ee58822b..d852db7dfa 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s @@ -86,11 +86,11 @@ glabel func_80241E80_7ECB90 /* 7ECCB0 80241FA0 AE95008C */ sw $s5, 0x8c($s4) /* 7ECCB4 80241FA4 AE820088 */ sw $v0, 0x88($s4) /* 7ECCB8 80241FA8 8E65000C */ lw $a1, 0xc($s3) -/* 7ECCBC 80241FAC 0C0B2026 */ jal set_variable +/* 7ECCBC 80241FAC 0C0B2026 */ jal evt_set_variable /* 7ECCC0 80241FB0 24060001 */ addiu $a2, $zero, 1 /* 7ECCC4 80241FB4 0280202D */ daddu $a0, $s4, $zero /* 7ECCC8 80241FB8 8E650010 */ lw $a1, 0x10($s3) -/* 7ECCCC 80241FBC 0C0B2026 */ jal set_variable +/* 7ECCCC 80241FBC 0C0B2026 */ jal evt_set_variable /* 7ECCD0 80241FC0 24060001 */ addiu $a2, $zero, 1 /* 7ECCD4 80241FC4 8FBF002C */ lw $ra, 0x2c($sp) /* 7ECCD8 80241FC8 8FB60028 */ lw $s6, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s index 51303ecc99..431c0ff230 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s @@ -19,7 +19,7 @@ glabel func_80243744_7EE454 .L80243778: /* 7EE488 80243778 8CC50000 */ lw $a1, ($a2) /* 7EE48C 8024377C 3C068025 */ lui $a2, %hi(D_8024ED50_7F9A60) -/* 7EE490 80243780 0C0B2026 */ jal set_variable +/* 7EE490 80243780 0C0B2026 */ jal evt_set_variable /* 7EE494 80243784 8CC6ED50 */ lw $a2, %lo(D_8024ED50_7F9A60)($a2) /* 7EE498 80243788 24020002 */ addiu $v0, $zero, 2 .L8024378C: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s index a1c72569d3..88e94722b9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s @@ -100,7 +100,7 @@ glabel func_802400C8_800948 /* 800AB8 80240238 8FA70050 */ lw $a3, 0x50($sp) /* 800ABC 8024023C 26B50001 */ addiu $s5, $s5, 1 /* 800AC0 80240240 00E61021 */ addu $v0, $a3, $a2 -/* 800AC4 80240244 0C0B2026 */ jal set_variable +/* 800AC4 80240244 0C0B2026 */ jal evt_set_variable /* 800AC8 80240248 AEC20000 */ sw $v0, ($s6) /* 800ACC 8024024C 26D60004 */ addiu $s6, $s6, 4 /* 800AD0 80240250 2AA20003 */ slti $v0, $s5, 3 @@ -129,12 +129,12 @@ glabel func_802400C8_800948 /* 800B20 802402A0 03C0202D */ daddu $a0, $fp, $zero /* 800B24 802402A4 3C05F5DE */ lui $a1, 0xf5de /* 800B28 802402A8 34A501AC */ ori $a1, $a1, 0x1ac -/* 800B2C 802402AC 0C0B2026 */ jal set_variable +/* 800B2C 802402AC 0C0B2026 */ jal evt_set_variable /* 800B30 802402B0 02A0302D */ daddu $a2, $s5, $zero /* 800B34 802402B4 03C0202D */ daddu $a0, $fp, $zero /* 800B38 802402B8 3C05F840 */ lui $a1, 0xf840 /* 800B3C 802402BC 34A55C87 */ ori $a1, $a1, 0x5c87 -/* 800B40 802402C0 0C0B2026 */ jal set_variable +/* 800B40 802402C0 0C0B2026 */ jal evt_set_variable /* 800B44 802402C4 24060001 */ addiu $a2, $zero, 1 /* 800B48 802402C8 080900DC */ j .L80240370 /* 800B4C 802402CC AFC00090 */ sw $zero, 0x90($fp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s index b9e3d654a1..68f29ca319 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s @@ -24,7 +24,7 @@ glabel func_80240ED8_801758 /* 8017A0 80240F20 0200202D */ daddu $a0, $s0, $zero .L80240F24: /* 8017A4 80240F24 3C05F5DE */ lui $a1, 0xf5de -/* 8017A8 80240F28 0C0B2026 */ jal set_variable +/* 8017A8 80240F28 0C0B2026 */ jal evt_set_variable /* 8017AC 80240F2C 34A502DD */ ori $a1, $a1, 0x2dd /* 8017B0 80240F30 8FBF0014 */ lw $ra, 0x14($sp) /* 8017B4 80240F34 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s index d998f14bc9..1956cceeb6 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s @@ -60,24 +60,24 @@ glabel func_8024204C_8028CC /* 8029A4 80242124 0220202D */ daddu $a0, $s1, $zero /* 8029A8 80242128 3C05F5DE */ lui $a1, 0xf5de /* 8029AC 8024212C 34A502DE */ ori $a1, $a1, 0x2de -/* 8029B0 80242130 0C0B2026 */ jal set_variable +/* 8029B0 80242130 0C0B2026 */ jal evt_set_variable /* 8029B4 80242134 0280302D */ daddu $a2, $s4, $zero /* 8029B8 80242138 0220202D */ daddu $a0, $s1, $zero /* 8029BC 8024213C 3C05F5DE */ lui $a1, 0xf5de /* 8029C0 80242140 34A502DF */ ori $a1, $a1, 0x2df -/* 8029C4 80242144 0C0B2026 */ jal set_variable +/* 8029C4 80242144 0C0B2026 */ jal evt_set_variable /* 8029C8 80242148 32A6FFFF */ andi $a2, $s5, 0xffff /* 8029CC 8024214C 24100001 */ addiu $s0, $zero, 1 /* 8029D0 80242150 0220202D */ daddu $a0, $s1, $zero .L80242154: /* 8029D4 80242154 3C05F840 */ lui $a1, 0xf840 /* 8029D8 80242158 34A56268 */ ori $a1, $a1, 0x6268 -/* 8029DC 8024215C 0C0B2026 */ jal set_variable +/* 8029DC 8024215C 0C0B2026 */ jal evt_set_variable /* 8029E0 80242160 3206FFFF */ andi $a2, $s0, 0xffff /* 8029E4 80242164 0220202D */ daddu $a0, $s1, $zero /* 8029E8 80242168 3C05F840 */ lui $a1, 0xf840 /* 8029EC 8024216C 34A56269 */ ori $a1, $a1, 0x6269 -/* 8029F0 80242170 0C0B2026 */ jal set_variable +/* 8029F0 80242170 0C0B2026 */ jal evt_set_variable /* 8029F4 80242174 32E6FFFF */ andi $a2, $s7, 0xffff /* 8029F8 80242178 0000202D */ daddu $a0, $zero, $zero /* 8029FC 8024217C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s index 5e1a96ef48..11e09bb340 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s @@ -61,7 +61,7 @@ glabel filemenu_update_show_name_input_803C00 /* 803CE0 80243460 3C05FD05 */ lui $a1, 0xfd05 /* 803CE4 80243464 34A50F8A */ ori $a1, $a1, 0xf8a /* 803CE8 80243468 0200302D */ daddu $a2, $s0, $zero -/* 803CEC 8024346C 0C0B2026 */ jal set_variable +/* 803CEC 8024346C 0C0B2026 */ jal evt_set_variable /* 803CF0 80243470 AE020004 */ sw $v0, 4($s0) /* 803CF4 80243474 8FBF0020 */ lw $ra, 0x20($sp) /* 803CF8 80243478 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s index bbe375e941..dcd5647ff4 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s @@ -21,7 +21,7 @@ glabel func_80243494_803D14 /* 803D54 802434D4 0220202D */ daddu $a0, $s1, $zero /* 803D58 802434D8 3C05FD05 */ lui $a1, 0xfd05 /* 803D5C 802434DC 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803D60 802434E0 0C0B2026 */ jal set_variable +/* 803D60 802434E0 0C0B2026 */ jal evt_set_variable /* 803D64 802434E4 0000302D */ daddu $a2, $zero, $zero /* 803D68 802434E8 8FBF0018 */ lw $ra, 0x18($sp) /* 803D6C 802434EC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s index a4f9480094..8f6b2730b0 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s @@ -10,19 +10,19 @@ glabel func_80243500_803D80 /* 803D94 80243514 AFB00010 */ sw $s0, 0x10($sp) /* 803D98 80243518 8E30000C */ lw $s0, 0xc($s1) /* 803D9C 8024351C 8E050000 */ lw $a1, ($s0) -/* 803DA0 80243520 0C0B210B */ jal get_float_variable +/* 803DA0 80243520 0C0B210B */ jal evt_get_float_variable /* 803DA4 80243524 26100004 */ addiu $s0, $s0, 4 /* 803DA8 80243528 8E050000 */ lw $a1, ($s0) /* 803DAC 8024352C 26100004 */ addiu $s0, $s0, 4 /* 803DB0 80243530 4600008D */ trunc.w.s $f2, $f0 /* 803DB4 80243534 44121000 */ mfc1 $s2, $f2 -/* 803DB8 80243538 0C0B210B */ jal get_float_variable +/* 803DB8 80243538 0C0B210B */ jal evt_get_float_variable /* 803DBC 8024353C 0220202D */ daddu $a0, $s1, $zero /* 803DC0 80243540 0220202D */ daddu $a0, $s1, $zero /* 803DC4 80243544 8E050000 */ lw $a1, ($s0) /* 803DC8 80243548 4600008D */ trunc.w.s $f2, $f0 /* 803DCC 8024354C 44111000 */ mfc1 $s1, $f2 -/* 803DD0 80243550 0C0B210B */ jal get_float_variable +/* 803DD0 80243550 0C0B210B */ jal evt_get_float_variable /* 803DD4 80243554 00000000 */ nop /* 803DD8 80243558 0000202D */ daddu $a0, $zero, $zero /* 803DDC 8024355C 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s index 3babf36366..0aca241e28 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s @@ -10,19 +10,19 @@ glabel func_802435C0_803E40 /* 803E54 802435D4 AFB00010 */ sw $s0, 0x10($sp) /* 803E58 802435D8 8E30000C */ lw $s0, 0xc($s1) /* 803E5C 802435DC 8E050000 */ lw $a1, ($s0) -/* 803E60 802435E0 0C0B210B */ jal get_float_variable +/* 803E60 802435E0 0C0B210B */ jal evt_get_float_variable /* 803E64 802435E4 26100004 */ addiu $s0, $s0, 4 /* 803E68 802435E8 8E050000 */ lw $a1, ($s0) /* 803E6C 802435EC 26100004 */ addiu $s0, $s0, 4 /* 803E70 802435F0 4600008D */ trunc.w.s $f2, $f0 /* 803E74 802435F4 44121000 */ mfc1 $s2, $f2 -/* 803E78 802435F8 0C0B210B */ jal get_float_variable +/* 803E78 802435F8 0C0B210B */ jal evt_get_float_variable /* 803E7C 802435FC 0220202D */ daddu $a0, $s1, $zero /* 803E80 80243600 0220202D */ daddu $a0, $s1, $zero /* 803E84 80243604 8E050000 */ lw $a1, ($s0) /* 803E88 80243608 4600008D */ trunc.w.s $f2, $f0 /* 803E8C 8024360C 44111000 */ mfc1 $s1, $f2 -/* 803E90 80243610 0C0B210B */ jal get_float_variable +/* 803E90 80243610 0C0B210B */ jal evt_get_float_variable /* 803E94 80243614 00000000 */ nop /* 803E98 80243618 0000202D */ daddu $a0, $zero, $zero /* 803E9C 8024361C 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s index cd36674032..5b3e05393d 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s @@ -10,19 +10,19 @@ glabel func_80243680_803F00 /* 803F14 80243694 AFB00010 */ sw $s0, 0x10($sp) /* 803F18 80243698 8E30000C */ lw $s0, 0xc($s1) /* 803F1C 8024369C 8E050000 */ lw $a1, ($s0) -/* 803F20 802436A0 0C0B210B */ jal get_float_variable +/* 803F20 802436A0 0C0B210B */ jal evt_get_float_variable /* 803F24 802436A4 26100004 */ addiu $s0, $s0, 4 /* 803F28 802436A8 8E050000 */ lw $a1, ($s0) /* 803F2C 802436AC 26100004 */ addiu $s0, $s0, 4 /* 803F30 802436B0 4600008D */ trunc.w.s $f2, $f0 /* 803F34 802436B4 44121000 */ mfc1 $s2, $f2 -/* 803F38 802436B8 0C0B210B */ jal get_float_variable +/* 803F38 802436B8 0C0B210B */ jal evt_get_float_variable /* 803F3C 802436BC 0220202D */ daddu $a0, $s1, $zero /* 803F40 802436C0 0220202D */ daddu $a0, $s1, $zero /* 803F44 802436C4 8E050000 */ lw $a1, ($s0) /* 803F48 802436C8 4600008D */ trunc.w.s $f2, $f0 /* 803F4C 802436CC 44111000 */ mfc1 $s1, $f2 -/* 803F50 802436D0 0C0B210B */ jal get_float_variable +/* 803F50 802436D0 0C0B210B */ jal evt_get_float_variable /* 803F54 802436D4 00000000 */ nop /* 803F58 802436D8 0000202D */ daddu $a0, $zero, $zero /* 803F5C 802436DC 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s index cc40a8ef0f..9d4ee5bbff 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s @@ -19,7 +19,7 @@ glabel func_80243CD4_804554 .L80243D08: /* 804588 80243D08 8CC50000 */ lw $a1, ($a2) /* 80458C 80243D0C 3C068025 */ lui $a2, %hi(D_8024D948_80E1C8) -/* 804590 80243D10 0C0B2026 */ jal set_variable +/* 804590 80243D10 0C0B2026 */ jal evt_set_variable /* 804594 80243D14 8CC6D948 */ lw $a2, %lo(D_8024D948_80E1C8)($a2) /* 804598 80243D18 24020002 */ addiu $v0, $zero, 2 .L80243D1C: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s index 27fefecef1..989fade579 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s @@ -125,7 +125,7 @@ glabel func_8024522C_805AAC /* 805C68 802453E8 00220821 */ addu $at, $at, $v0 /* 805C6C 802453EC 8C226AEC */ lw $v0, %lo(D_80256AEC_81736C)($at) /* 805C70 802453F0 00A32821 */ addu $a1, $a1, $v1 -/* 805C74 802453F4 0C0B2026 */ jal set_variable +/* 805C74 802453F4 0C0B2026 */ jal evt_set_variable /* 805C78 802453F8 AEA20084 */ sw $v0, 0x84($s5) /* 805C7C 802453FC 08091504 */ j .L80245410 /* 805C80 80245400 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s index be89d63a9a..f5a5b56a0a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s @@ -60,24 +60,24 @@ glabel func_802418FC_824BBC /* 824C94 802419D4 0220202D */ daddu $a0, $s1, $zero /* 824C98 802419D8 3C05F5DE */ lui $a1, 0xf5de /* 824C9C 802419DC 34A502DE */ ori $a1, $a1, 0x2de -/* 824CA0 802419E0 0C0B2026 */ jal set_variable +/* 824CA0 802419E0 0C0B2026 */ jal evt_set_variable /* 824CA4 802419E4 0280302D */ daddu $a2, $s4, $zero /* 824CA8 802419E8 0220202D */ daddu $a0, $s1, $zero /* 824CAC 802419EC 3C05F5DE */ lui $a1, 0xf5de /* 824CB0 802419F0 34A502DF */ ori $a1, $a1, 0x2df -/* 824CB4 802419F4 0C0B2026 */ jal set_variable +/* 824CB4 802419F4 0C0B2026 */ jal evt_set_variable /* 824CB8 802419F8 32A6FFFF */ andi $a2, $s5, 0xffff /* 824CBC 802419FC 24100001 */ addiu $s0, $zero, 1 /* 824CC0 80241A00 0220202D */ daddu $a0, $s1, $zero .L80241A04: /* 824CC4 80241A04 3C05F840 */ lui $a1, 0xf840 /* 824CC8 80241A08 34A56268 */ ori $a1, $a1, 0x6268 -/* 824CCC 80241A0C 0C0B2026 */ jal set_variable +/* 824CCC 80241A0C 0C0B2026 */ jal evt_set_variable /* 824CD0 80241A10 3206FFFF */ andi $a2, $s0, 0xffff /* 824CD4 80241A14 0220202D */ daddu $a0, $s1, $zero /* 824CD8 80241A18 3C05F840 */ lui $a1, 0xf840 /* 824CDC 80241A1C 34A56269 */ ori $a1, $a1, 0x6269 -/* 824CE0 80241A20 0C0B2026 */ jal set_variable +/* 824CE0 80241A20 0C0B2026 */ jal evt_set_variable /* 824CE4 80241A24 32E6FFFF */ andi $a2, $s7, 0xffff /* 824CE8 80241A28 0000202D */ daddu $a0, $zero, $zero /* 824CEC 80241A2C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s index e4016a0fb3..ed8df429e0 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s @@ -19,7 +19,7 @@ glabel func_80242A80_825D40 .L80242AB4: /* 825D74 80242AB4 8CC50000 */ lw $a1, ($a2) /* 825D78 80242AB8 3C068025 */ lui $a2, %hi(D_8024877C_82BA3C) -/* 825D7C 80242ABC 0C0B2026 */ jal set_variable +/* 825D7C 80242ABC 0C0B2026 */ jal evt_set_variable /* 825D80 80242AC0 8CC6877C */ lw $a2, %lo(D_8024877C_82BA3C)($a2) /* 825D84 80242AC4 24020002 */ addiu $v0, $zero, 2 .L80242AC8: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s index 789686fde8..eee36e0b9a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s @@ -90,11 +90,11 @@ glabel func_80242C44_825F04 .L80242D80: /* 826040 80242D80 0220202D */ daddu $a0, $s1, $zero .L80242D84: -/* 826044 80242D84 0C0B2026 */ jal set_variable +/* 826044 80242D84 0C0B2026 */ jal evt_set_variable /* 826048 80242D88 0240282D */ daddu $a1, $s2, $zero /* 82604C 80242D8C 0220202D */ daddu $a0, $s1, $zero /* 826050 80242D90 0260282D */ daddu $a1, $s3, $zero -/* 826054 80242D94 0C0B2026 */ jal set_variable +/* 826054 80242D94 0C0B2026 */ jal evt_set_variable /* 826058 80242D98 0200302D */ daddu $a2, $s0, $zero /* 82605C 80242D9C 8FBF0020 */ lw $ra, 0x20($sp) /* 826060 80242DA0 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s index ea2a77f875..1e0b19c764 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s @@ -106,11 +106,11 @@ glabel func_80242DBC_82607C /* 8261DC 80242F1C 00621821 */ addu $v1, $v1, $v0 /* 8261E0 80242F20 8C660004 */ lw $a2, 4($v1) /* 8261E4 80242F24 8C700000 */ lw $s0, ($v1) -/* 8261E8 80242F28 0C0B2026 */ jal set_variable +/* 8261E8 80242F28 0C0B2026 */ jal evt_set_variable /* 8261EC 80242F2C 0240282D */ daddu $a1, $s2, $zero /* 8261F0 80242F30 0220202D */ daddu $a0, $s1, $zero /* 8261F4 80242F34 0260282D */ daddu $a1, $s3, $zero -/* 8261F8 80242F38 0C0B2026 */ jal set_variable +/* 8261F8 80242F38 0C0B2026 */ jal evt_set_variable /* 8261FC 80242F3C 0200302D */ daddu $a2, $s0, $zero /* 826200 80242F40 8FBF0020 */ lw $ra, 0x20($sp) /* 826204 80242F44 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s index de0de81efd..d2d814db0e 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s @@ -59,7 +59,7 @@ glabel func_80242F60_826220 /* 8262C4 80243004 24A50004 */ addiu $a1, $a1, 4 /* 8262C8 80243008 0000202D */ daddu $a0, $zero, $zero /* 8262CC 8024300C 8CA50000 */ lw $a1, ($a1) -/* 8262D0 80243010 0C0B2026 */ jal set_variable +/* 8262D0 80243010 0C0B2026 */ jal evt_set_variable /* 8262D4 80243014 24060001 */ addiu $a2, $zero, 1 /* 8262D8 80243018 08090C0C */ j .L80243030 /* 8262DC 8024301C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040_826300.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040_826300.s index 485b78d416..634f8ef141 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040_826300.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040_826300.s @@ -12,7 +12,7 @@ glabel func_80243040_826300 /* 82631C 8024305C 8C510000 */ lw $s1, ($v0) /* 826320 80243060 0200202D */ daddu $a0, $s0, $zero /* 826324 80243064 0040302D */ daddu $a2, $v0, $zero -/* 826328 80243068 0C0B2026 */ jal set_variable +/* 826328 80243068 0C0B2026 */ jal evt_set_variable /* 82632C 8024306C 0220282D */ daddu $a1, $s1, $zero /* 826330 80243070 8FBF0018 */ lw $ra, 0x18($sp) /* 826334 80243074 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088_826348.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088_826348.s index 39b6fd9c8a..1112d99abf 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088_826348.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088_826348.s @@ -12,7 +12,7 @@ glabel func_80243088_826348 /* 826364 802430A4 8C510000 */ lw $s1, ($v0) /* 826368 802430A8 0200202D */ daddu $a0, $s0, $zero /* 82636C 802430AC 0040302D */ daddu $a2, $v0, $zero -/* 826370 802430B0 0C0B2026 */ jal set_variable +/* 826370 802430B0 0C0B2026 */ jal evt_set_variable /* 826374 802430B4 0220282D */ daddu $a1, $s1, $zero /* 826378 802430B8 8FBF0018 */ lw $ra, 0x18($sp) /* 82637C 802430BC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s index e1f580e678..3984809419 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s @@ -60,24 +60,24 @@ glabel func_802405EC_831DEC /* 831EC4 802406C4 0220202D */ daddu $a0, $s1, $zero /* 831EC8 802406C8 3C05F5DE */ lui $a1, 0xf5de /* 831ECC 802406CC 34A502DE */ ori $a1, $a1, 0x2de -/* 831ED0 802406D0 0C0B2026 */ jal set_variable +/* 831ED0 802406D0 0C0B2026 */ jal evt_set_variable /* 831ED4 802406D4 0280302D */ daddu $a2, $s4, $zero /* 831ED8 802406D8 0220202D */ daddu $a0, $s1, $zero /* 831EDC 802406DC 3C05F5DE */ lui $a1, 0xf5de /* 831EE0 802406E0 34A502DF */ ori $a1, $a1, 0x2df -/* 831EE4 802406E4 0C0B2026 */ jal set_variable +/* 831EE4 802406E4 0C0B2026 */ jal evt_set_variable /* 831EE8 802406E8 32A6FFFF */ andi $a2, $s5, 0xffff /* 831EEC 802406EC 24100001 */ addiu $s0, $zero, 1 /* 831EF0 802406F0 0220202D */ daddu $a0, $s1, $zero .L802406F4: /* 831EF4 802406F4 3C05F840 */ lui $a1, 0xf840 /* 831EF8 802406F8 34A56268 */ ori $a1, $a1, 0x6268 -/* 831EFC 802406FC 0C0B2026 */ jal set_variable +/* 831EFC 802406FC 0C0B2026 */ jal evt_set_variable /* 831F00 80240700 3206FFFF */ andi $a2, $s0, 0xffff /* 831F04 80240704 0220202D */ daddu $a0, $s1, $zero /* 831F08 80240708 3C05F840 */ lui $a1, 0xf840 /* 831F0C 8024070C 34A56269 */ ori $a1, $a1, 0x6269 -/* 831F10 80240710 0C0B2026 */ jal set_variable +/* 831F10 80240710 0C0B2026 */ jal evt_set_variable /* 831F14 80240714 32E6FFFF */ andi $a2, $s7, 0xffff /* 831F18 80240718 0000202D */ daddu $a0, $zero, $zero /* 831F1C 8024071C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s index a5259d207f..f49c7d13a9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s @@ -19,7 +19,7 @@ glabel func_80241770_832F70 .L802417A4: /* 832FA4 802417A4 8CC50000 */ lw $a1, ($a2) /* 832FA8 802417A8 3C068025 */ lui $a2, %hi(D_80248C70_83A470) -/* 832FAC 802417AC 0C0B2026 */ jal set_variable +/* 832FAC 802417AC 0C0B2026 */ jal evt_set_variable /* 832FB0 802417B0 8CC68C70 */ lw $a2, %lo(D_80248C70_83A470)($a2) /* 832FB4 802417B4 24020002 */ addiu $v0, $zero, 2 .L802417B8: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s index 9d212ea7cf..50b96949cd 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s @@ -34,7 +34,7 @@ glabel func_8024206C_83386C /* 8338E0 802420E0 3C05FD05 */ lui $a1, 0xfd05 /* 8338E4 802420E4 34A50F82 */ ori $a1, $a1, 0xf82 /* 8338E8 802420E8 0040802D */ daddu $s0, $v0, $zero -/* 8338EC 802420EC 0C0B2026 */ jal set_variable +/* 8338EC 802420EC 0C0B2026 */ jal evt_set_variable /* 8338F0 802420F0 0200302D */ daddu $a2, $s0, $zero /* 8338F4 802420F4 1A60002F */ blez $s3, .L802421B4 /* 8338F8 802420F8 24150002 */ addiu $s5, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s index f0ec308c09..57d9150885 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s @@ -91,7 +91,7 @@ glabel func_802421E8_8339E8 /* 833B40 80242340 8E22000C */ lw $v0, 0xc($s1) /* 833B44 80242344 24030002 */ addiu $v1, $zero, 2 /* 833B48 80242348 00531021 */ addu $v0, $v0, $s3 -/* 833B4C 8024234C 0C0B2026 */ jal set_variable +/* 833B4C 8024234C 0C0B2026 */ jal evt_set_variable /* 833B50 80242350 A04300EF */ sb $v1, 0xef($v0) .L80242354: /* 833B54 80242354 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0_833CA0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0_833CA0.s index a41d6254f2..8d41d2a085 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0_833CA0.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0_833CA0.s @@ -32,7 +32,7 @@ glabel func_802424A0_833CA0 /* 833D0C 8024250C 8E100004 */ lw $s0, 4($s0) /* 833D10 80242510 4600008D */ trunc.w.s $f2, $f0 /* 833D14 80242514 44061000 */ mfc1 $a2, $f2 -/* 833D18 80242518 0C0B2026 */ jal set_variable +/* 833D18 80242518 0C0B2026 */ jal evt_set_variable /* 833D1C 8024251C 0220202D */ daddu $a0, $s1, $zero /* 833D20 80242520 8E62000C */ lw $v0, 0xc($s3) /* 833D24 80242524 0220202D */ daddu $a0, $s1, $zero @@ -40,7 +40,7 @@ glabel func_802424A0_833CA0 /* 833D2C 8024252C C4400060 */ lwc1 $f0, 0x60($v0) /* 833D30 80242530 4600008D */ trunc.w.s $f2, $f0 /* 833D34 80242534 44061000 */ mfc1 $a2, $f2 -/* 833D38 80242538 0C0B2026 */ jal set_variable +/* 833D38 80242538 0C0B2026 */ jal evt_set_variable /* 833D3C 8024253C 02A0282D */ daddu $a1, $s5, $zero /* 833D40 80242540 8E62000C */ lw $v0, 0xc($s3) /* 833D44 80242544 0220202D */ daddu $a0, $s1, $zero @@ -48,7 +48,7 @@ glabel func_802424A0_833CA0 /* 833D4C 8024254C C440008C */ lwc1 $f0, 0x8c($v0) /* 833D50 80242550 4600008D */ trunc.w.s $f2, $f0 /* 833D54 80242554 44061000 */ mfc1 $a2, $f2 -/* 833D58 80242558 0C0B2026 */ jal set_variable +/* 833D58 80242558 0C0B2026 */ jal evt_set_variable /* 833D5C 8024255C 0280282D */ daddu $a1, $s4, $zero /* 833D60 80242560 8E62000C */ lw $v0, 0xc($s3) /* 833D64 80242564 0220202D */ daddu $a0, $s1, $zero @@ -56,7 +56,7 @@ glabel func_802424A0_833CA0 /* 833D6C 8024256C C44000B8 */ lwc1 $f0, 0xb8($v0) /* 833D70 80242570 4600008D */ trunc.w.s $f2, $f0 /* 833D74 80242574 44061000 */ mfc1 $a2, $f2 -/* 833D78 80242578 0C0B2026 */ jal set_variable +/* 833D78 80242578 0C0B2026 */ jal evt_set_variable /* 833D7C 8024257C 0200282D */ daddu $a1, $s0, $zero /* 833D80 80242580 8FBF0028 */ lw $ra, 0x28($sp) /* 833D84 80242584 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694_833E94.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694_833E94.s index 64bec72362..6505c028e0 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694_833E94.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694_833E94.s @@ -29,7 +29,7 @@ glabel func_80242694_833E94 /* 833EF0 802426F0 0280202D */ daddu $a0, $s4, $zero /* 833EF4 802426F4 02552821 */ addu $a1, $s2, $s5 /* 833EF8 802426F8 0040802D */ daddu $s0, $v0, $zero -/* 833EFC 802426FC 0C0B2026 */ jal set_variable +/* 833EFC 802426FC 0C0B2026 */ jal evt_set_variable /* 833F00 80242700 0200302D */ daddu $a2, $s0, $zero /* 833F04 80242704 8E63000C */ lw $v1, 0xc($s3) /* 833F08 80242708 00121080 */ sll $v0, $s2, 2 @@ -69,7 +69,7 @@ glabel func_80242694_833E94 /* 833F90 80242790 8C43002C */ lw $v1, 0x2c($v0) /* 833F94 80242794 2407FFFE */ addiu $a3, $zero, -2 /* 833F98 80242798 00671824 */ and $v1, $v1, $a3 -/* 833F9C 8024279C 0C0B2026 */ jal set_variable +/* 833F9C 8024279C 0C0B2026 */ jal evt_set_variable /* 833FA0 802427A0 AC43002C */ sw $v1, 0x2c($v0) /* 833FA4 802427A4 8FBF002C */ lw $ra, 0x2c($sp) /* 833FA8 802427A8 8FB60028 */ lw $s6, 0x28($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s index 17426a9eae..522242bfc2 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s @@ -24,15 +24,15 @@ glabel func_802427D0_833FD0 /* 83401C 8024281C 26310004 */ addiu $s1, $s1, 4 /* 834020 80242820 8E330000 */ lw $s3, ($s1) /* 834024 80242824 8E310004 */ lw $s1, 4($s1) -/* 834028 80242828 0C0B2026 */ jal set_variable +/* 834028 80242828 0C0B2026 */ jal evt_set_variable /* 83402C 8024282C 0240202D */ daddu $a0, $s2, $zero /* 834030 80242830 0240202D */ daddu $a0, $s2, $zero /* 834034 80242834 8E060004 */ lw $a2, 4($s0) -/* 834038 80242838 0C0B2026 */ jal set_variable +/* 834038 80242838 0C0B2026 */ jal evt_set_variable /* 83403C 8024283C 0260282D */ daddu $a1, $s3, $zero /* 834040 80242840 0240202D */ daddu $a0, $s2, $zero /* 834044 80242844 8E060008 */ lw $a2, 8($s0) -/* 834048 80242848 0C0B2026 */ jal set_variable +/* 834048 80242848 0C0B2026 */ jal evt_set_variable /* 83404C 8024284C 0220282D */ daddu $a1, $s1, $zero /* 834050 80242850 8FBF0020 */ lw $ra, 0x20($sp) /* 834054 80242854 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s index 34f93568f0..0ccffc9ed9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s @@ -60,24 +60,24 @@ glabel func_8024059C_84316C /* 843244 80240674 0220202D */ daddu $a0, $s1, $zero /* 843248 80240678 3C05F5DE */ lui $a1, 0xf5de /* 84324C 8024067C 34A502DE */ ori $a1, $a1, 0x2de -/* 843250 80240680 0C0B2026 */ jal set_variable +/* 843250 80240680 0C0B2026 */ jal evt_set_variable /* 843254 80240684 0280302D */ daddu $a2, $s4, $zero /* 843258 80240688 0220202D */ daddu $a0, $s1, $zero /* 84325C 8024068C 3C05F5DE */ lui $a1, 0xf5de /* 843260 80240690 34A502DF */ ori $a1, $a1, 0x2df -/* 843264 80240694 0C0B2026 */ jal set_variable +/* 843264 80240694 0C0B2026 */ jal evt_set_variable /* 843268 80240698 32A6FFFF */ andi $a2, $s5, 0xffff /* 84326C 8024069C 24100001 */ addiu $s0, $zero, 1 /* 843270 802406A0 0220202D */ daddu $a0, $s1, $zero .L802406A4: /* 843274 802406A4 3C05F840 */ lui $a1, 0xf840 /* 843278 802406A8 34A56268 */ ori $a1, $a1, 0x6268 -/* 84327C 802406AC 0C0B2026 */ jal set_variable +/* 84327C 802406AC 0C0B2026 */ jal evt_set_variable /* 843280 802406B0 3206FFFF */ andi $a2, $s0, 0xffff /* 843284 802406B4 0220202D */ daddu $a0, $s1, $zero /* 843288 802406B8 3C05F840 */ lui $a1, 0xf840 /* 84328C 802406BC 34A56269 */ ori $a1, $a1, 0x6269 -/* 843290 802406C0 0C0B2026 */ jal set_variable +/* 843290 802406C0 0C0B2026 */ jal evt_set_variable /* 843294 802406C4 32E6FFFF */ andi $a2, $s7, 0xffff /* 843298 802406C8 0000202D */ daddu $a0, $zero, $zero /* 84329C 802406CC 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s index 3c0970fc0e..14d6fe6792 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s @@ -19,7 +19,7 @@ glabel func_80241720_8442F0 .L80241754: /* 844324 80241754 8CC50000 */ lw $a1, ($a2) /* 844328 80241758 3C068024 */ lui $a2, %hi(D_80246614_8491E4) -/* 84432C 8024175C 0C0B2026 */ jal set_variable +/* 84432C 8024175C 0C0B2026 */ jal evt_set_variable /* 844330 80241760 8CC66614 */ lw $a2, %lo(D_80246614_8491E4)($a2) /* 844334 80241764 24020002 */ addiu $v0, $zero, 2 .L80241768: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s index 139ebd10f7..a6a387e5f6 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s @@ -34,7 +34,7 @@ glabel func_802418AC_84447C /* 8444E8 80241918 0240282D */ daddu $a1, $s2, $zero /* 8444EC 8024191C 24060001 */ addiu $a2, $zero, 1 .L80241920: -/* 8444F0 80241920 0C0B2026 */ jal set_variable +/* 8444F0 80241920 0C0B2026 */ jal evt_set_variable /* 8444F4 80241924 00000000 */ nop /* 8444F8 80241928 24020002 */ addiu $v0, $zero, 2 /* 8444FC 8024192C 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s index 19c027e981..d3ce47ac14 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s @@ -16,15 +16,15 @@ glabel func_802419E4_8445B4 /* 8445E0 80241A10 8C450000 */ lw $a1, ($v0) /* 8445E4 80241A14 24420004 */ addiu $v0, $v0, 4 /* 8445E8 80241A18 8C520000 */ lw $s2, ($v0) -/* 8445EC 80241A1C 0C0B2026 */ jal set_variable +/* 8445EC 80241A1C 0C0B2026 */ jal evt_set_variable /* 8445F0 80241A20 8C530004 */ lw $s3, 4($v0) /* 8445F4 80241A24 0200202D */ daddu $a0, $s0, $zero /* 8445F8 80241A28 82260007 */ lb $a2, 7($s1) -/* 8445FC 80241A2C 0C0B2026 */ jal set_variable +/* 8445FC 80241A2C 0C0B2026 */ jal evt_set_variable /* 844600 80241A30 0240282D */ daddu $a1, $s2, $zero /* 844604 80241A34 0200202D */ daddu $a0, $s0, $zero /* 844608 80241A38 82260008 */ lb $a2, 8($s1) -/* 84460C 80241A3C 0C0B2026 */ jal set_variable +/* 84460C 80241A3C 0C0B2026 */ jal evt_set_variable /* 844610 80241A40 0260282D */ daddu $a1, $s3, $zero /* 844614 80241A44 8FBF0020 */ lw $ra, 0x20($sp) /* 844618 80241A48 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s index 7009a923f1..166153c455 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s @@ -14,7 +14,7 @@ glabel func_80241BB8_844788 /* 8447AC 80241BDC 26100004 */ addiu $s0, $s0, 4 /* 8447B0 80241BE0 0220202D */ daddu $a0, $s1, $zero /* 8447B4 80241BE4 8E050000 */ lw $a1, ($s0) -/* 8447B8 80241BE8 0C0B210B */ jal get_float_variable +/* 8447B8 80241BE8 0C0B210B */ jal evt_get_float_variable /* 8447BC 80241BEC 0040802D */ daddu $s0, $v0, $zero /* 8447C0 80241BF0 0220202D */ daddu $a0, $s1, $zero /* 8447C4 80241BF4 0200282D */ daddu $a1, $s0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s index 61e39501f1..2418442894 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s @@ -18,7 +18,7 @@ glabel func_80241C90_844860 /* 844894 80241CC4 0200202D */ daddu $a0, $s0, $zero /* 844898 80241CC8 3C05FD05 */ lui $a1, 0xfd05 /* 84489C 80241CCC 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8448A0 80241CD0 0C0B2026 */ jal set_variable +/* 8448A0 80241CD0 0C0B2026 */ jal evt_set_variable /* 8448A4 80241CD4 0040302D */ daddu $a2, $v0, $zero /* 8448A8 80241CD8 8FBF0014 */ lw $ra, 0x14($sp) /* 8448AC 80241CDC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s index 749e626def..af6e129c08 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s @@ -18,7 +18,7 @@ glabel func_80241DAC_84497C /* 844994 80241DC4 AFB00098 */ sw $s0, 0x98($sp) /* 844998 80241DC8 F7B600B0 */ sdc1 $f22, 0xb0($sp) /* 84499C 80241DCC F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* 8449A0 80241DD0 0C0B210B */ jal get_float_variable +/* 8449A0 80241DD0 0C0B210B */ jal evt_get_float_variable /* 8449A4 80241DD4 34A50F8A */ ori $a1, $a1, 0xf8a /* 8449A8 80241DD8 44801000 */ mtc1 $zero, $f2 /* 8449AC 80241DDC 3C013F80 */ lui $at, 0x3f80 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s index 68b7bc77ad..19577a7f4a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s @@ -24,12 +24,12 @@ glabel func_8024030C_85247C /* 8524C8 80240358 26100004 */ addiu $s0, $s0, 4 /* 8524CC 8024035C 8E050000 */ lw $a1, ($s0) /* 8524D0 80240360 26100004 */ addiu $s0, $s0, 4 -/* 8524D4 80240364 0C0B210B */ jal get_float_variable +/* 8524D4 80240364 0C0B210B */ jal evt_get_float_variable /* 8524D8 80240368 0240202D */ daddu $a0, $s2, $zero /* 8524DC 8024036C 8E050000 */ lw $a1, ($s0) /* 8524E0 80240370 26100004 */ addiu $s0, $s0, 4 /* 8524E4 80240374 0240202D */ daddu $a0, $s2, $zero -/* 8524E8 80240378 0C0B210B */ jal get_float_variable +/* 8524E8 80240378 0C0B210B */ jal evt_get_float_variable /* 8524EC 8024037C 46000606 */ mov.s $f24, $f0 /* 8524F0 80240380 8E050000 */ lw $a1, ($s0) /* 8524F4 80240384 26100004 */ addiu $s0, $s0, 4 @@ -43,7 +43,7 @@ glabel func_8024030C_85247C /* 852514 802403A4 0040882D */ daddu $s1, $v0, $zero /* 852518 802403A8 0240202D */ daddu $a0, $s2, $zero /* 85251C 802403AC 8E050000 */ lw $a1, ($s0) -/* 852520 802403B0 0C0B210B */ jal get_float_variable +/* 852520 802403B0 0C0B210B */ jal evt_get_float_variable /* 852524 802403B4 0040802D */ daddu $s0, $v0, $zero /* 852528 802403B8 4618A501 */ sub.s $f20, $f20, $f24 /* 85252C 802403BC 3C013F00 */ lui $at, 0x3f00 @@ -58,7 +58,7 @@ glabel func_8024030C_85247C /* 852550 802403E0 0240202D */ daddu $a0, $s2, $zero /* 852554 802403E4 0220982D */ daddu $s3, $s1, $zero /* 852558 802403E8 0280282D */ daddu $a1, $s4, $zero -/* 85255C 802403EC 0C0B2026 */ jal set_variable +/* 85255C 802403EC 0C0B2026 */ jal evt_set_variable /* 852560 802403F0 0220302D */ daddu $a2, $s1, $zero .L802403F4: /* 852564 802403F4 3C014334 */ lui $at, 0x4334 @@ -80,7 +80,7 @@ glabel func_8024030C_85247C /* 8525A4 80240434 46001081 */ sub.s $f2, $f2, $f0 /* 8525A8 80240438 0240202D */ daddu $a0, $s2, $zero /* 8525AC 8024043C 44061000 */ mfc1 $a2, $f2 -/* 8525B0 80240440 0C0B2190 */ jal set_float_variable +/* 8525B0 80240440 0C0B2190 */ jal evt_set_float_variable /* 8525B4 80240444 02A0282D */ daddu $a1, $s5, $zero /* 8525B8 80240448 8FBF0028 */ lw $ra, 0x28($sp) /* 8525BC 8024044C 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s index dbd46b905f..07d403eeed 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s @@ -60,24 +60,24 @@ glabel func_8024145C_8535CC /* 8536A4 80241534 0220202D */ daddu $a0, $s1, $zero /* 8536A8 80241538 3C05F5DE */ lui $a1, 0xf5de /* 8536AC 8024153C 34A502DE */ ori $a1, $a1, 0x2de -/* 8536B0 80241540 0C0B2026 */ jal set_variable +/* 8536B0 80241540 0C0B2026 */ jal evt_set_variable /* 8536B4 80241544 0280302D */ daddu $a2, $s4, $zero /* 8536B8 80241548 0220202D */ daddu $a0, $s1, $zero /* 8536BC 8024154C 3C05F5DE */ lui $a1, 0xf5de /* 8536C0 80241550 34A502DF */ ori $a1, $a1, 0x2df -/* 8536C4 80241554 0C0B2026 */ jal set_variable +/* 8536C4 80241554 0C0B2026 */ jal evt_set_variable /* 8536C8 80241558 32A6FFFF */ andi $a2, $s5, 0xffff /* 8536CC 8024155C 24100001 */ addiu $s0, $zero, 1 /* 8536D0 80241560 0220202D */ daddu $a0, $s1, $zero .L80241564: /* 8536D4 80241564 3C05F840 */ lui $a1, 0xf840 /* 8536D8 80241568 34A56268 */ ori $a1, $a1, 0x6268 -/* 8536DC 8024156C 0C0B2026 */ jal set_variable +/* 8536DC 8024156C 0C0B2026 */ jal evt_set_variable /* 8536E0 80241570 3206FFFF */ andi $a2, $s0, 0xffff /* 8536E4 80241574 0220202D */ daddu $a0, $s1, $zero /* 8536E8 80241578 3C05F840 */ lui $a1, 0xf840 /* 8536EC 8024157C 34A56269 */ ori $a1, $a1, 0x6269 -/* 8536F0 80241580 0C0B2026 */ jal set_variable +/* 8536F0 80241580 0C0B2026 */ jal evt_set_variable /* 8536F4 80241584 32E6FFFF */ andi $a2, $s7, 0xffff /* 8536F8 80241588 0000202D */ daddu $a0, $zero, $zero /* 8536FC 8024158C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s index 273f672df0..4f4b4ccf22 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s @@ -19,7 +19,7 @@ glabel func_802425E0_854750 .L80242614: /* 854784 80242614 8CC50000 */ lw $a1, ($a2) /* 854788 80242618 3C068024 */ lui $a2, %hi(D_802476DC_85984C) -/* 85478C 8024261C 0C0B2026 */ jal set_variable +/* 85478C 8024261C 0C0B2026 */ jal evt_set_variable /* 854790 80242620 8CC676DC */ lw $a2, %lo(D_802476DC_85984C)($a2) /* 854794 80242624 24020002 */ addiu $v0, $zero, 2 .L80242628: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s index e428e32c87..5caed89762 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s @@ -115,15 +115,15 @@ glabel L80242B68_854CD8 /* 854D80 80242C10 0240202D */ daddu $a0, $s2, $zero .L80242C14: /* 854D84 80242C14 4406C000 */ mfc1 $a2, $f24 -/* 854D88 80242C18 0C0B2190 */ jal set_float_variable +/* 854D88 80242C18 0C0B2190 */ jal evt_set_float_variable /* 854D8C 80242C1C 0260282D */ daddu $a1, $s3, $zero /* 854D90 80242C20 0240202D */ daddu $a0, $s2, $zero /* 854D94 80242C24 4406B000 */ mfc1 $a2, $f22 -/* 854D98 80242C28 0C0B2190 */ jal set_float_variable +/* 854D98 80242C28 0C0B2190 */ jal evt_set_float_variable /* 854D9C 80242C2C 0280282D */ daddu $a1, $s4, $zero /* 854DA0 80242C30 0240202D */ daddu $a0, $s2, $zero /* 854DA4 80242C34 4406A000 */ mfc1 $a2, $f20 -/* 854DA8 80242C38 0C0B2190 */ jal set_float_variable +/* 854DA8 80242C38 0C0B2190 */ jal evt_set_float_variable /* 854DAC 80242C3C 02A0282D */ daddu $a1, $s5, $zero /* 854DB0 80242C40 8FBF0028 */ lw $ra, 0x28($sp) /* 854DB4 80242C44 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s index 3f8cb7a45e..3a7a5c47c7 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s @@ -57,7 +57,7 @@ glabel func_802430B4_855224 /* 8552F0 80243180 0240202D */ daddu $a0, $s2, $zero .L80243184: /* 8552F4 80243184 8E250000 */ lw $a1, ($s1) -/* 8552F8 80243188 0C0B2026 */ jal set_variable +/* 8552F8 80243188 0C0B2026 */ jal evt_set_variable /* 8552FC 8024318C 0200302D */ daddu $a2, $s0, $zero /* 855300 80243190 8FBF003C */ lw $ra, 0x3c($sp) /* 855304 80243194 8FB20038 */ lw $s2, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s index e11f094cfc..05dcce9931 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s @@ -50,12 +50,12 @@ glabel func_80243254_8553C4 /* 855478 80243308 C6140030 */ lwc1 $f20, 0x30($s0) /* 85547C 8024330C 4600B08D */ trunc.w.s $f2, $f22 /* 855480 80243310 44061000 */ mfc1 $a2, $f2 -/* 855484 80243314 0C0B2026 */ jal set_variable +/* 855484 80243314 0C0B2026 */ jal evt_set_variable /* 855488 80243318 4600A501 */ sub.s $f20, $f20, $f0 /* 85548C 8024331C 0220202D */ daddu $a0, $s1, $zero /* 855490 80243320 4600A08D */ trunc.w.s $f2, $f20 /* 855494 80243324 44061000 */ mfc1 $a2, $f2 -/* 855498 80243328 0C0B2026 */ jal set_variable +/* 855498 80243328 0C0B2026 */ jal evt_set_variable /* 85549C 8024332C 0260282D */ daddu $a1, $s3, $zero /* 8554A0 80243330 24020002 */ addiu $v0, $zero, 2 .L80243334: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s index ad0e704d92..523c39e586 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s @@ -69,15 +69,15 @@ glabel func_8024343C_8555AC /* 8556A0 80243530 0220202D */ daddu $a0, $s1, $zero .L80243534: /* 8556A4 80243534 8E060038 */ lw $a2, 0x38($s0) -/* 8556A8 80243538 0C0B2190 */ jal set_float_variable +/* 8556A8 80243538 0C0B2190 */ jal evt_set_float_variable /* 8556AC 8024353C 0240282D */ daddu $a1, $s2, $zero /* 8556B0 80243540 0220202D */ daddu $a0, $s1, $zero /* 8556B4 80243544 4406A000 */ mfc1 $a2, $f20 -/* 8556B8 80243548 0C0B2190 */ jal set_float_variable +/* 8556B8 80243548 0C0B2190 */ jal evt_set_float_variable /* 8556BC 8024354C 0260282D */ daddu $a1, $s3, $zero /* 8556C0 80243550 0220202D */ daddu $a0, $s1, $zero /* 8556C4 80243554 8E060040 */ lw $a2, 0x40($s0) -/* 8556C8 80243558 0C0B2190 */ jal set_float_variable +/* 8556C8 80243558 0C0B2190 */ jal evt_set_float_variable /* 8556CC 8024355C 0280282D */ daddu $a1, $s4, $zero /* 8556D0 80243560 24020002 */ addiu $v0, $zero, 2 .L80243564: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s index f90def98bd..eb9469b53f 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s @@ -24,12 +24,12 @@ glabel func_80243948_855AB8 /* 855B04 80243994 26100004 */ addiu $s0, $s0, 4 /* 855B08 80243998 8E050000 */ lw $a1, ($s0) /* 855B0C 8024399C 26100004 */ addiu $s0, $s0, 4 -/* 855B10 802439A0 0C0B210B */ jal get_float_variable +/* 855B10 802439A0 0C0B210B */ jal evt_get_float_variable /* 855B14 802439A4 0240202D */ daddu $a0, $s2, $zero /* 855B18 802439A8 8E050000 */ lw $a1, ($s0) /* 855B1C 802439AC 26100004 */ addiu $s0, $s0, 4 /* 855B20 802439B0 0240202D */ daddu $a0, $s2, $zero -/* 855B24 802439B4 0C0B210B */ jal get_float_variable +/* 855B24 802439B4 0C0B210B */ jal evt_get_float_variable /* 855B28 802439B8 46000606 */ mov.s $f24, $f0 /* 855B2C 802439BC 8E050000 */ lw $a1, ($s0) /* 855B30 802439C0 26100004 */ addiu $s0, $s0, 4 @@ -43,7 +43,7 @@ glabel func_80243948_855AB8 /* 855B50 802439E0 0040882D */ daddu $s1, $v0, $zero /* 855B54 802439E4 0240202D */ daddu $a0, $s2, $zero /* 855B58 802439E8 8E050000 */ lw $a1, ($s0) -/* 855B5C 802439EC 0C0B210B */ jal get_float_variable +/* 855B5C 802439EC 0C0B210B */ jal evt_get_float_variable /* 855B60 802439F0 0040802D */ daddu $s0, $v0, $zero /* 855B64 802439F4 4618A501 */ sub.s $f20, $f20, $f24 /* 855B68 802439F8 3C013F00 */ lui $at, 0x3f00 @@ -58,7 +58,7 @@ glabel func_80243948_855AB8 /* 855B8C 80243A1C 0240202D */ daddu $a0, $s2, $zero /* 855B90 80243A20 0220982D */ daddu $s3, $s1, $zero /* 855B94 80243A24 0280282D */ daddu $a1, $s4, $zero -/* 855B98 80243A28 0C0B2026 */ jal set_variable +/* 855B98 80243A28 0C0B2026 */ jal evt_set_variable /* 855B9C 80243A2C 0220302D */ daddu $a2, $s1, $zero .L80243A30: /* 855BA0 80243A30 3C014334 */ lui $at, 0x4334 @@ -80,7 +80,7 @@ glabel func_80243948_855AB8 /* 855BE0 80243A70 46001081 */ sub.s $f2, $f2, $f0 /* 855BE4 80243A74 0240202D */ daddu $a0, $s2, $zero /* 855BE8 80243A78 44061000 */ mfc1 $a2, $f2 -/* 855BEC 80243A7C 0C0B2190 */ jal set_float_variable +/* 855BEC 80243A7C 0C0B2190 */ jal evt_set_float_variable /* 855BF0 80243A80 02A0282D */ daddu $a1, $s5, $zero /* 855BF4 80243A84 8FBF0028 */ lw $ra, 0x28($sp) /* 855BF8 80243A88 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s index 524078e956..b656995d97 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s @@ -40,17 +40,17 @@ glabel func_80243AB8_855C28 /* 855CB4 80243B44 3C014248 */ lui $at, 0x4248 /* 855CB8 80243B48 44810000 */ mtc1 $at, $f0 /* 855CBC 80243B4C 4406B000 */ mfc1 $a2, $f22 -/* 855CC0 80243B50 0C0B2190 */ jal set_float_variable +/* 855CC0 80243B50 0C0B2190 */ jal evt_set_float_variable /* 855CC4 80243B54 4600A500 */ add.s $f20, $f20, $f0 /* 855CC8 80243B58 0220202D */ daddu $a0, $s1, $zero /* 855CCC 80243B5C 3C05FE36 */ lui $a1, 0xfe36 /* 855CD0 80243B60 4406A000 */ mfc1 $a2, $f20 -/* 855CD4 80243B64 0C0B2190 */ jal set_float_variable +/* 855CD4 80243B64 0C0B2190 */ jal evt_set_float_variable /* 855CD8 80243B68 34A53C81 */ ori $a1, $a1, 0x3c81 /* 855CDC 80243B6C 0220202D */ daddu $a0, $s1, $zero /* 855CE0 80243B70 3C05FE36 */ lui $a1, 0xfe36 /* 855CE4 80243B74 4406C000 */ mfc1 $a2, $f24 -/* 855CE8 80243B78 0C0B2190 */ jal set_float_variable +/* 855CE8 80243B78 0C0B2190 */ jal evt_set_float_variable /* 855CEC 80243B7C 34A53C82 */ ori $a1, $a1, 0x3c82 /* 855CF0 80243B80 8FBF0018 */ lw $ra, 0x18($sp) /* 855CF4 80243B84 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243CD4_855E44.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243CD4_855E44.s index 27a28326e9..20999e301a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243CD4_855E44.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243CD4_855E44.s @@ -17,16 +17,16 @@ glabel func_80243CD4_855E44 /* 855E74 80243D04 8E050000 */ lw $a1, ($s0) /* 855E78 80243D08 26100004 */ addiu $s0, $s0, 4 /* 855E7C 80243D0C 0220202D */ daddu $a0, $s1, $zero -/* 855E80 80243D10 0C0B210B */ jal get_float_variable +/* 855E80 80243D10 0C0B210B */ jal evt_get_float_variable /* 855E84 80243D14 0040902D */ daddu $s2, $v0, $zero /* 855E88 80243D18 8E050000 */ lw $a1, ($s0) /* 855E8C 80243D1C 26100004 */ addiu $s0, $s0, 4 /* 855E90 80243D20 0220202D */ daddu $a0, $s1, $zero -/* 855E94 80243D24 0C0B210B */ jal get_float_variable +/* 855E94 80243D24 0C0B210B */ jal evt_get_float_variable /* 855E98 80243D28 46000586 */ mov.s $f22, $f0 /* 855E9C 80243D2C 0220202D */ daddu $a0, $s1, $zero /* 855EA0 80243D30 8E050000 */ lw $a1, ($s0) -/* 855EA4 80243D34 0C0B210B */ jal get_float_variable +/* 855EA4 80243D34 0C0B210B */ jal evt_get_float_variable /* 855EA8 80243D38 46000506 */ mov.s $f20, $f0 /* 855EAC 80243D3C 8E42000C */ lw $v0, 0xc($s2) /* 855EB0 80243D40 E4560008 */ swc1 $f22, 8($v0) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s index 565e971114..5b2f0f535f 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s @@ -24,12 +24,12 @@ glabel func_8024030C_864E4C /* 864E98 80240358 26100004 */ addiu $s0, $s0, 4 /* 864E9C 8024035C 8E050000 */ lw $a1, ($s0) /* 864EA0 80240360 26100004 */ addiu $s0, $s0, 4 -/* 864EA4 80240364 0C0B210B */ jal get_float_variable +/* 864EA4 80240364 0C0B210B */ jal evt_get_float_variable /* 864EA8 80240368 0240202D */ daddu $a0, $s2, $zero /* 864EAC 8024036C 8E050000 */ lw $a1, ($s0) /* 864EB0 80240370 26100004 */ addiu $s0, $s0, 4 /* 864EB4 80240374 0240202D */ daddu $a0, $s2, $zero -/* 864EB8 80240378 0C0B210B */ jal get_float_variable +/* 864EB8 80240378 0C0B210B */ jal evt_get_float_variable /* 864EBC 8024037C 46000606 */ mov.s $f24, $f0 /* 864EC0 80240380 8E050000 */ lw $a1, ($s0) /* 864EC4 80240384 26100004 */ addiu $s0, $s0, 4 @@ -43,7 +43,7 @@ glabel func_8024030C_864E4C /* 864EE4 802403A4 0040882D */ daddu $s1, $v0, $zero /* 864EE8 802403A8 0240202D */ daddu $a0, $s2, $zero /* 864EEC 802403AC 8E050000 */ lw $a1, ($s0) -/* 864EF0 802403B0 0C0B210B */ jal get_float_variable +/* 864EF0 802403B0 0C0B210B */ jal evt_get_float_variable /* 864EF4 802403B4 0040802D */ daddu $s0, $v0, $zero /* 864EF8 802403B8 4618A501 */ sub.s $f20, $f20, $f24 /* 864EFC 802403BC 3C013F00 */ lui $at, 0x3f00 @@ -58,7 +58,7 @@ glabel func_8024030C_864E4C /* 864F20 802403E0 0240202D */ daddu $a0, $s2, $zero /* 864F24 802403E4 0220982D */ daddu $s3, $s1, $zero /* 864F28 802403E8 0280282D */ daddu $a1, $s4, $zero -/* 864F2C 802403EC 0C0B2026 */ jal set_variable +/* 864F2C 802403EC 0C0B2026 */ jal evt_set_variable /* 864F30 802403F0 0220302D */ daddu $a2, $s1, $zero .L802403F4: /* 864F34 802403F4 3C014334 */ lui $at, 0x4334 @@ -80,7 +80,7 @@ glabel func_8024030C_864E4C /* 864F74 80240434 46001081 */ sub.s $f2, $f2, $f0 /* 864F78 80240438 0240202D */ daddu $a0, $s2, $zero /* 864F7C 8024043C 44061000 */ mfc1 $a2, $f2 -/* 864F80 80240440 0C0B2190 */ jal set_float_variable +/* 864F80 80240440 0C0B2190 */ jal evt_set_float_variable /* 864F84 80240444 02A0282D */ daddu $a1, $s5, $zero /* 864F88 80240448 8FBF0028 */ lw $ra, 0x28($sp) /* 864F8C 8024044C 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s index 1e82e5be7f..175048d1c9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s @@ -69,15 +69,15 @@ glabel func_8024050C_86504C /* 865140 80240600 0220202D */ daddu $a0, $s1, $zero .L80240604: /* 865144 80240604 8E060038 */ lw $a2, 0x38($s0) -/* 865148 80240608 0C0B2190 */ jal set_float_variable +/* 865148 80240608 0C0B2190 */ jal evt_set_float_variable /* 86514C 8024060C 0240282D */ daddu $a1, $s2, $zero /* 865150 80240610 0220202D */ daddu $a0, $s1, $zero /* 865154 80240614 4406A000 */ mfc1 $a2, $f20 -/* 865158 80240618 0C0B2190 */ jal set_float_variable +/* 865158 80240618 0C0B2190 */ jal evt_set_float_variable /* 86515C 8024061C 0260282D */ daddu $a1, $s3, $zero /* 865160 80240620 0220202D */ daddu $a0, $s1, $zero /* 865164 80240624 8E060040 */ lw $a2, 0x40($s0) -/* 865168 80240628 0C0B2190 */ jal set_float_variable +/* 865168 80240628 0C0B2190 */ jal evt_set_float_variable /* 86516C 8024062C 0280282D */ daddu $a1, $s4, $zero /* 865170 80240630 24020002 */ addiu $v0, $zero, 2 .L80240634: diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s index a55d77dd46..cff7b54284 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s @@ -24,12 +24,12 @@ glabel func_80240A18_865558 /* 8655A4 80240A64 26100004 */ addiu $s0, $s0, 4 /* 8655A8 80240A68 8E050000 */ lw $a1, ($s0) /* 8655AC 80240A6C 26100004 */ addiu $s0, $s0, 4 -/* 8655B0 80240A70 0C0B210B */ jal get_float_variable +/* 8655B0 80240A70 0C0B210B */ jal evt_get_float_variable /* 8655B4 80240A74 0240202D */ daddu $a0, $s2, $zero /* 8655B8 80240A78 8E050000 */ lw $a1, ($s0) /* 8655BC 80240A7C 26100004 */ addiu $s0, $s0, 4 /* 8655C0 80240A80 0240202D */ daddu $a0, $s2, $zero -/* 8655C4 80240A84 0C0B210B */ jal get_float_variable +/* 8655C4 80240A84 0C0B210B */ jal evt_get_float_variable /* 8655C8 80240A88 46000606 */ mov.s $f24, $f0 /* 8655CC 80240A8C 8E050000 */ lw $a1, ($s0) /* 8655D0 80240A90 26100004 */ addiu $s0, $s0, 4 @@ -43,7 +43,7 @@ glabel func_80240A18_865558 /* 8655F0 80240AB0 0040882D */ daddu $s1, $v0, $zero /* 8655F4 80240AB4 0240202D */ daddu $a0, $s2, $zero /* 8655F8 80240AB8 8E050000 */ lw $a1, ($s0) -/* 8655FC 80240ABC 0C0B210B */ jal get_float_variable +/* 8655FC 80240ABC 0C0B210B */ jal evt_get_float_variable /* 865600 80240AC0 0040802D */ daddu $s0, $v0, $zero /* 865604 80240AC4 4618A501 */ sub.s $f20, $f20, $f24 /* 865608 80240AC8 3C013F00 */ lui $at, 0x3f00 @@ -58,7 +58,7 @@ glabel func_80240A18_865558 /* 86562C 80240AEC 0240202D */ daddu $a0, $s2, $zero /* 865630 80240AF0 0220982D */ daddu $s3, $s1, $zero /* 865634 80240AF4 0280282D */ daddu $a1, $s4, $zero -/* 865638 80240AF8 0C0B2026 */ jal set_variable +/* 865638 80240AF8 0C0B2026 */ jal evt_set_variable /* 86563C 80240AFC 0220302D */ daddu $a2, $s1, $zero .L80240B00: /* 865640 80240B00 3C014334 */ lui $at, 0x4334 @@ -80,7 +80,7 @@ glabel func_80240A18_865558 /* 865680 80240B40 46001081 */ sub.s $f2, $f2, $f0 /* 865684 80240B44 0240202D */ daddu $a0, $s2, $zero /* 865688 80240B48 44061000 */ mfc1 $a2, $f2 -/* 86568C 80240B4C 0C0B2190 */ jal set_float_variable +/* 86568C 80240B4C 0C0B2190 */ jal evt_set_float_variable /* 865690 80240B50 02A0282D */ daddu $a1, $s5, $zero /* 865694 80240B54 8FBF0028 */ lw $ra, 0x28($sp) /* 865698 80240B58 8FB50024 */ lw $s5, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s index 67722b6bfb..249f2e90f6 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s @@ -40,17 +40,17 @@ glabel func_80240B88_8656C8 /* 865754 80240C14 3C014248 */ lui $at, 0x4248 /* 865758 80240C18 44810000 */ mtc1 $at, $f0 /* 86575C 80240C1C 4406B000 */ mfc1 $a2, $f22 -/* 865760 80240C20 0C0B2190 */ jal set_float_variable +/* 865760 80240C20 0C0B2190 */ jal evt_set_float_variable /* 865764 80240C24 4600A500 */ add.s $f20, $f20, $f0 /* 865768 80240C28 0220202D */ daddu $a0, $s1, $zero /* 86576C 80240C2C 3C05FE36 */ lui $a1, 0xfe36 /* 865770 80240C30 4406A000 */ mfc1 $a2, $f20 -/* 865774 80240C34 0C0B2190 */ jal set_float_variable +/* 865774 80240C34 0C0B2190 */ jal evt_set_float_variable /* 865778 80240C38 34A53C81 */ ori $a1, $a1, 0x3c81 /* 86577C 80240C3C 0220202D */ daddu $a0, $s1, $zero /* 865780 80240C40 3C05FE36 */ lui $a1, 0xfe36 /* 865784 80240C44 4406C000 */ mfc1 $a2, $f24 -/* 865788 80240C48 0C0B2190 */ jal set_float_variable +/* 865788 80240C48 0C0B2190 */ jal evt_set_float_variable /* 86578C 80240C4C 34A53C82 */ ori $a1, $a1, 0x3c82 /* 865790 80240C50 8FBF0018 */ lw $ra, 0x18($sp) /* 865794 80240C54 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4_8658E4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4_8658E4.s index 491fcea65f..cdbe0e5587 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4_8658E4.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4_8658E4.s @@ -17,16 +17,16 @@ glabel func_80240DA4_8658E4 /* 865914 80240DD4 8E050000 */ lw $a1, ($s0) /* 865918 80240DD8 26100004 */ addiu $s0, $s0, 4 /* 86591C 80240DDC 0220202D */ daddu $a0, $s1, $zero -/* 865920 80240DE0 0C0B210B */ jal get_float_variable +/* 865920 80240DE0 0C0B210B */ jal evt_get_float_variable /* 865924 80240DE4 0040902D */ daddu $s2, $v0, $zero /* 865928 80240DE8 8E050000 */ lw $a1, ($s0) /* 86592C 80240DEC 26100004 */ addiu $s0, $s0, 4 /* 865930 80240DF0 0220202D */ daddu $a0, $s1, $zero -/* 865934 80240DF4 0C0B210B */ jal get_float_variable +/* 865934 80240DF4 0C0B210B */ jal evt_get_float_variable /* 865938 80240DF8 46000586 */ mov.s $f22, $f0 /* 86593C 80240DFC 0220202D */ daddu $a0, $s1, $zero /* 865940 80240E00 8E050000 */ lw $a1, ($s0) -/* 865944 80240E04 0C0B210B */ jal get_float_variable +/* 865944 80240E04 0C0B210B */ jal evt_get_float_variable /* 865948 80240E08 46000506 */ mov.s $f20, $f0 /* 86594C 80240E0C 8E42000C */ lw $v0, 0xc($s2) /* 865950 80240E10 E4560008 */ swc1 $f22, 8($v0) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s index 579cdadd29..52b28d0cc9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s @@ -39,15 +39,15 @@ glabel func_802412AC_865DEC /* 865E70 80241330 4600A006 */ mov.s $f0, $f20 .L80241334: /* 865E74 80241334 44060000 */ mfc1 $a2, $f0 -/* 865E78 80241338 0C0B2190 */ jal set_float_variable +/* 865E78 80241338 0C0B2190 */ jal evt_set_float_variable /* 865E7C 8024133C 0240282D */ daddu $a1, $s2, $zero /* 865E80 80241340 0220202D */ daddu $a0, $s1, $zero /* 865E84 80241344 4406B000 */ mfc1 $a2, $f22 -/* 865E88 80241348 0C0B2190 */ jal set_float_variable +/* 865E88 80241348 0C0B2190 */ jal evt_set_float_variable /* 865E8C 8024134C 0260282D */ daddu $a1, $s3, $zero /* 865E90 80241350 0220202D */ daddu $a0, $s1, $zero /* 865E94 80241354 4406A000 */ mfc1 $a2, $f20 -/* 865E98 80241358 0C0B2190 */ jal set_float_variable +/* 865E98 80241358 0C0B2190 */ jal evt_set_float_variable /* 865E9C 8024135C 0200282D */ daddu $a1, $s0, $zero /* 865EA0 80241360 8FBF0020 */ lw $ra, 0x20($sp) /* 865EA4 80241364 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s index 6ce4c2067f..9568d0c295 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s @@ -19,27 +19,27 @@ glabel func_80241388_865EC8 /* 865EE4 802413A4 F7B80028 */ sdc1 $f24, 0x28($sp) /* 865EE8 802413A8 F7B60020 */ sdc1 $f22, 0x20($sp) /* 865EEC 802413AC F7B40018 */ sdc1 $f20, 0x18($sp) -/* 865EF0 802413B0 0C0B210B */ jal get_float_variable +/* 865EF0 802413B0 0C0B210B */ jal evt_get_float_variable /* 865EF4 802413B4 34A53C81 */ ori $a1, $a1, 0x3c81 /* 865EF8 802413B8 0200202D */ daddu $a0, $s0, $zero /* 865EFC 802413BC 3C05FE36 */ lui $a1, 0xfe36 /* 865F00 802413C0 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 865F04 802413C4 0C0B210B */ jal get_float_variable +/* 865F04 802413C4 0C0B210B */ jal evt_get_float_variable /* 865F08 802413C8 46000706 */ mov.s $f28, $f0 /* 865F0C 802413CC 0200202D */ daddu $a0, $s0, $zero /* 865F10 802413D0 3C05FE36 */ lui $a1, 0xfe36 /* 865F14 802413D4 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 865F18 802413D8 0C0B210B */ jal get_float_variable +/* 865F18 802413D8 0C0B210B */ jal evt_get_float_variable /* 865F1C 802413DC 46000606 */ mov.s $f24, $f0 /* 865F20 802413E0 0200202D */ daddu $a0, $s0, $zero /* 865F24 802413E4 3C05FE36 */ lui $a1, 0xfe36 /* 865F28 802413E8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 865F2C 802413EC 0C0B210B */ jal get_float_variable +/* 865F2C 802413EC 0C0B210B */ jal evt_get_float_variable /* 865F30 802413F0 46000686 */ mov.s $f26, $f0 /* 865F34 802413F4 0200202D */ daddu $a0, $s0, $zero /* 865F38 802413F8 3C05FE36 */ lui $a1, 0xfe36 /* 865F3C 802413FC 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 865F40 80241400 0C0B210B */ jal get_float_variable +/* 865F40 80241400 0C0B210B */ jal evt_get_float_variable /* 865F44 80241404 46000506 */ mov.s $f20, $f0 /* 865F48 80241408 46000586 */ mov.s $f22, $f0 /* 865F4C 8024140C 0200202D */ daddu $a0, $s0, $zero @@ -51,22 +51,22 @@ glabel func_80241388_865EC8 /* 865F64 80241424 4480A000 */ mtc1 $zero, $f20 /* 865F68 80241428 3C05FE36 */ lui $a1, 0xfe36 /* 865F6C 8024142C 4406A000 */ mfc1 $a2, $f20 -/* 865F70 80241430 0C0B2190 */ jal set_float_variable +/* 865F70 80241430 0C0B2190 */ jal evt_set_float_variable /* 865F74 80241434 34A53C86 */ ori $a1, $a1, 0x3c86 /* 865F78 80241438 0200202D */ daddu $a0, $s0, $zero /* 865F7C 8024143C 3C05FE36 */ lui $a1, 0xfe36 /* 865F80 80241440 4406A000 */ mfc1 $a2, $f20 -/* 865F84 80241444 0C0B2190 */ jal set_float_variable +/* 865F84 80241444 0C0B2190 */ jal evt_set_float_variable /* 865F88 80241448 34A53C87 */ ori $a1, $a1, 0x3c87 /* 865F8C 8024144C 0200202D */ daddu $a0, $s0, $zero /* 865F90 80241450 3C05FBD3 */ lui $a1, 0xfbd3 /* 865F94 80241454 34A5E280 */ ori $a1, $a1, 0xe280 -/* 865F98 80241458 0C0B2026 */ jal set_variable +/* 865F98 80241458 0C0B2026 */ jal evt_set_variable /* 865F9C 8024145C 0000302D */ daddu $a2, $zero, $zero /* 865FA0 80241460 0200202D */ daddu $a0, $s0, $zero /* 865FA4 80241464 3C05FBD3 */ lui $a1, 0xfbd3 /* 865FA8 80241468 34A5E281 */ ori $a1, $a1, 0xe281 -/* 865FAC 8024146C 0C0B2026 */ jal set_variable +/* 865FAC 8024146C 0C0B2026 */ jal evt_set_variable /* 865FB0 80241470 24060001 */ addiu $a2, $zero, 1 /* 865FB4 80241474 08090576 */ j .L802415D8 /* 865FB8 80241478 24020002 */ addiu $v0, $zero, 2 @@ -95,17 +95,17 @@ glabel func_80241388_865EC8 /* 86600C 802414CC 0200202D */ daddu $a0, $s0, $zero /* 866010 802414D0 3C05FE36 */ lui $a1, 0xfe36 /* 866014 802414D4 4406A000 */ mfc1 $a2, $f20 -/* 866018 802414D8 0C0B2190 */ jal set_float_variable +/* 866018 802414D8 0C0B2190 */ jal evt_set_float_variable /* 86601C 802414DC 34A53C86 */ ori $a1, $a1, 0x3c86 /* 866020 802414E0 0200202D */ daddu $a0, $s0, $zero /* 866024 802414E4 3C05FE36 */ lui $a1, 0xfe36 /* 866028 802414E8 4406A000 */ mfc1 $a2, $f20 -/* 86602C 802414EC 0C0B2190 */ jal set_float_variable +/* 86602C 802414EC 0C0B2190 */ jal evt_set_float_variable /* 866030 802414F0 34A53C87 */ ori $a1, $a1, 0x3c87 /* 866034 802414F4 0200202D */ daddu $a0, $s0, $zero /* 866038 802414F8 3C05FBD3 */ lui $a1, 0xfbd3 /* 86603C 802414FC 34A5E281 */ ori $a1, $a1, 0xe281 -/* 866040 80241500 0C0B2026 */ jal set_variable +/* 866040 80241500 0C0B2026 */ jal evt_set_variable /* 866044 80241504 0000302D */ daddu $a2, $zero, $zero /* 866048 80241508 08090576 */ j .L802415D8 /* 86604C 8024150C 24020002 */ addiu $v0, $zero, 2 @@ -121,7 +121,7 @@ glabel func_80241388_865EC8 /* 866070 80241530 0200202D */ daddu $a0, $s0, $zero /* 866074 80241534 3C05FE36 */ lui $a1, 0xfe36 /* 866078 80241538 4406A000 */ mfc1 $a2, $f20 -/* 86607C 8024153C 0C0B2190 */ jal set_float_variable +/* 86607C 8024153C 0C0B2190 */ jal evt_set_float_variable /* 866080 80241540 34A53C86 */ ori $a1, $a1, 0x3c86 /* 866084 80241544 4614B081 */ sub.s $f2, $f22, $f20 /* 866088 80241548 3C014334 */ lui $at, 0x4334 @@ -160,7 +160,7 @@ glabel func_80241388_865EC8 /* 866100 802415C0 0200202D */ daddu $a0, $s0, $zero /* 866104 802415C4 3C05FE36 */ lui $a1, 0xfe36 /* 866108 802415C8 4406B000 */ mfc1 $a2, $f22 -/* 86610C 802415CC 0C0B2190 */ jal set_float_variable +/* 86610C 802415CC 0C0B2190 */ jal evt_set_float_variable /* 866110 802415D0 34A53C87 */ ori $a1, $a1, 0x3c87 /* 866114 802415D4 24020002 */ addiu $v0, $zero, 2 .L802415D8: diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s index eb9e6d8337..7ab2c44aa4 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80241170_E0F910.s @@ -23,7 +23,7 @@ glabel func_80241170_E0F910 /* E0F950 802411B0 0220202D */ daddu $a0, $s1, $zero /* E0F954 802411B4 3C05FE36 */ lui $a1, 0xfe36 /* E0F958 802411B8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* E0F95C 802411BC 0C0B2026 */ jal set_variable +/* E0F95C 802411BC 0C0B2026 */ jal evt_set_variable /* E0F960 802411C0 0200302D */ daddu $a2, $s0, $zero /* E0F964 802411C4 8FBF0018 */ lw $ra, 0x18($sp) /* E0F968 802411C8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s index 3758a2b22c..1e4c194d3a 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s @@ -30,7 +30,7 @@ glabel func_802416F8_E0FE98 /* E0FEFC 8024175C 34A50F8A */ ori $a1, $a1, 0xf8a /* E0FF00 80241760 0200302D */ daddu $a2, $s0, $zero /* E0FF04 80241764 AE020014 */ sw $v0, 0x14($s0) -/* E0FF08 80241768 0C0B2026 */ jal set_variable +/* E0FF08 80241768 0C0B2026 */ jal evt_set_variable /* E0FF0C 8024176C AE120008 */ sw $s2, 8($s0) .L80241770: /* E0FF10 80241770 8E300070 */ lw $s0, 0x70($s1) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s index 7563fa70b3..7370fe1ada 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s @@ -97,22 +97,22 @@ glabel func_80240000_E12760 /* E12868 80240108 34A53C80 */ ori $a1, $a1, 0x3c80 /* E1286C 8024010C 44062000 */ mfc1 $a2, $f4 /* E12870 80240110 4620A520 */ cvt.s.d $f20, $f20 -/* E12874 80240114 0C0B2190 */ jal set_float_variable +/* E12874 80240114 0C0B2190 */ jal evt_set_float_variable /* E12878 80240118 4620B5A0 */ cvt.s.d $f22, $f22 /* E1287C 8024011C 0200202D */ daddu $a0, $s0, $zero /* E12880 80240120 3C05FE36 */ lui $a1, 0xfe36 /* E12884 80240124 4406C000 */ mfc1 $a2, $f24 -/* E12888 80240128 0C0B2190 */ jal set_float_variable +/* E12888 80240128 0C0B2190 */ jal evt_set_float_variable /* E1288C 8024012C 34A53C81 */ ori $a1, $a1, 0x3c81 /* E12890 80240130 0200202D */ daddu $a0, $s0, $zero /* E12894 80240134 3C05FE36 */ lui $a1, 0xfe36 /* E12898 80240138 4406A000 */ mfc1 $a2, $f20 -/* E1289C 8024013C 0C0B2190 */ jal set_float_variable +/* E1289C 8024013C 0C0B2190 */ jal evt_set_float_variable /* E128A0 80240140 34A53C82 */ ori $a1, $a1, 0x3c82 /* E128A4 80240144 0200202D */ daddu $a0, $s0, $zero /* E128A8 80240148 3C05FE36 */ lui $a1, 0xfe36 /* E128AC 8024014C 4406B000 */ mfc1 $a2, $f22 -/* E128B0 80240150 0C0B2190 */ jal set_float_variable +/* E128B0 80240150 0C0B2190 */ jal evt_set_float_variable /* E128B4 80240154 34A53C83 */ ori $a1, $a1, 0x3c83 /* E128B8 80240158 8E230000 */ lw $v1, ($s1) /* E128BC 8024015C C4600028 */ lwc1 $f0, 0x28($v1) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024045C_E12BBC.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024045C_E12BBC.s index 26cfd21b8d..5fb9c30753 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024045C_E12BBC.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024045C_E12BBC.s @@ -23,22 +23,22 @@ glabel func_8024045C_E12BBC /* E12C04 802404A4 00031880 */ sll $v1, $v1, 2 /* E12C08 802404A8 02038021 */ addu $s0, $s0, $v1 /* E12C0C 802404AC 8E060074 */ lw $a2, 0x74($s0) -/* E12C10 802404B0 0C0B2026 */ jal set_variable +/* E12C10 802404B0 0C0B2026 */ jal evt_set_variable /* E12C14 802404B4 34A53C80 */ ori $a1, $a1, 0x3c80 /* E12C18 802404B8 0220202D */ daddu $a0, $s1, $zero /* E12C1C 802404BC 3C05FE36 */ lui $a1, 0xfe36 /* E12C20 802404C0 8E060078 */ lw $a2, 0x78($s0) -/* E12C24 802404C4 0C0B2026 */ jal set_variable +/* E12C24 802404C4 0C0B2026 */ jal evt_set_variable /* E12C28 802404C8 34A53C81 */ ori $a1, $a1, 0x3c81 /* E12C2C 802404CC 0220202D */ daddu $a0, $s1, $zero /* E12C30 802404D0 3C05FE36 */ lui $a1, 0xfe36 /* E12C34 802404D4 8E06007C */ lw $a2, 0x7c($s0) -/* E12C38 802404D8 0C0B2026 */ jal set_variable +/* E12C38 802404D8 0C0B2026 */ jal evt_set_variable /* E12C3C 802404DC 34A53C82 */ ori $a1, $a1, 0x3c82 /* E12C40 802404E0 0220202D */ daddu $a0, $s1, $zero /* E12C44 802404E4 3C05FE36 */ lui $a1, 0xfe36 /* E12C48 802404E8 8E060084 */ lw $a2, 0x84($s0) -/* E12C4C 802404EC 0C0B2026 */ jal set_variable +/* E12C4C 802404EC 0C0B2026 */ jal evt_set_variable /* E12C50 802404F0 34A53C83 */ ori $a1, $a1, 0x3c83 /* E12C54 802404F4 8FBF0018 */ lw $ra, 0x18($sp) /* E12C58 802404F8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s index 8f3512a34c..c37cc1dcca 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802406C4_E12E24.s @@ -68,7 +68,7 @@ glabel func_802406C4_E12E24 /* E12F1C 802407BC 34A53C83 */ ori $a1, $a1, 0x3c83 /* E12F20 802407C0 0000302D */ daddu $a2, $zero, $zero .L802407C4: -/* E12F24 802407C4 0C0B2026 */ jal set_variable +/* E12F24 802407C4 0C0B2026 */ jal evt_set_variable /* E12F28 802407C8 00000000 */ nop /* E12F2C 802407CC 8FBF0020 */ lw $ra, 0x20($sp) /* E12F30 802407D0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s index 95d8b0fefe..1b3b98342a 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024084C_E12FAC.s @@ -36,7 +36,7 @@ glabel func_8024084C_E12FAC /* E13024 802408C4 34A53C83 */ ori $a1, $a1, 0x3c83 /* E13028 802408C8 0000302D */ daddu $a2, $zero, $zero .L802408CC: -/* E1302C 802408CC 0C0B2026 */ jal set_variable +/* E1302C 802408CC 0C0B2026 */ jal evt_set_variable /* E13030 802408D0 00000000 */ nop /* E13034 802408D4 8FBF0018 */ lw $ra, 0x18($sp) /* E13038 802408D8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s index aba14e3b66..570f8a2161 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240AAC_E1320C.s @@ -78,7 +78,7 @@ glabel func_80240AAC_E1320C /* E1332C 80240BCC 34A53C83 */ ori $a1, $a1, 0x3c83 /* E13330 80240BD0 0000302D */ daddu $a2, $zero, $zero .L80240BD4: -/* E13334 80240BD4 0C0B2026 */ jal set_variable +/* E13334 80240BD4 0C0B2026 */ jal evt_set_variable /* E13338 80240BD8 00000000 */ nop /* E1333C 80240BDC 8FBF0020 */ lw $ra, 0x20($sp) /* E13340 80240BE0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s index 33f068b80f..ff4bb3108b 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s @@ -51,22 +51,22 @@ glabel func_80240DB8_E13518 /* E135C4 80240E64 44810000 */ mtc1 $at, $f0 /* E135C8 80240E68 34A53C81 */ ori $a1, $a1, 0x3c81 /* E135CC 80240E6C E600009C */ swc1 $f0, 0x9c($s0) -/* E135D0 80240E70 0C0B2026 */ jal set_variable +/* E135D0 80240E70 0C0B2026 */ jal evt_set_variable /* E135D4 80240E74 E6020098 */ swc1 $f2, 0x98($s0) /* E135D8 80240E78 0220202D */ daddu $a0, $s1, $zero /* E135DC 80240E7C 3C05FE36 */ lui $a1, 0xfe36 /* E135E0 80240E80 8E060094 */ lw $a2, 0x94($s0) -/* E135E4 80240E84 0C0B2190 */ jal set_float_variable +/* E135E4 80240E84 0C0B2190 */ jal evt_set_float_variable /* E135E8 80240E88 34A53C85 */ ori $a1, $a1, 0x3c85 /* E135EC 80240E8C 0220202D */ daddu $a0, $s1, $zero /* E135F0 80240E90 3C05FE36 */ lui $a1, 0xfe36 /* E135F4 80240E94 8E060098 */ lw $a2, 0x98($s0) -/* E135F8 80240E98 0C0B2190 */ jal set_float_variable +/* E135F8 80240E98 0C0B2190 */ jal evt_set_float_variable /* E135FC 80240E9C 34A53C86 */ ori $a1, $a1, 0x3c86 /* E13600 80240EA0 0220202D */ daddu $a0, $s1, $zero /* E13604 80240EA4 3C05FE36 */ lui $a1, 0xfe36 /* E13608 80240EA8 8E06009C */ lw $a2, 0x9c($s0) -/* E1360C 80240EAC 0C0B2190 */ jal set_float_variable +/* E1360C 80240EAC 0C0B2190 */ jal evt_set_float_variable /* E13610 80240EB0 34A53C87 */ ori $a1, $a1, 0x3c87 /* E13614 80240EB4 8FBF0018 */ lw $ra, 0x18($sp) /* E13618 80240EB8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240ECC_E1362C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240ECC_E1362C.s index 6e1df13ec2..140e42db0b 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240ECC_E1362C.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240ECC_E1362C.s @@ -23,27 +23,27 @@ glabel func_80240ECC_E1362C /* E13674 80240F14 00031880 */ sll $v1, $v1, 2 /* E13678 80240F18 02038021 */ addu $s0, $s0, $v1 /* E1367C 80240F1C 8E060094 */ lw $a2, 0x94($s0) -/* E13680 80240F20 0C0B2190 */ jal set_float_variable +/* E13680 80240F20 0C0B2190 */ jal evt_set_float_variable /* E13684 80240F24 34A53C85 */ ori $a1, $a1, 0x3c85 /* E13688 80240F28 0220202D */ daddu $a0, $s1, $zero /* E1368C 80240F2C 3C05FE36 */ lui $a1, 0xfe36 /* E13690 80240F30 8E060098 */ lw $a2, 0x98($s0) -/* E13694 80240F34 0C0B2190 */ jal set_float_variable +/* E13694 80240F34 0C0B2190 */ jal evt_set_float_variable /* E13698 80240F38 34A53C86 */ ori $a1, $a1, 0x3c86 /* E1369C 80240F3C 0220202D */ daddu $a0, $s1, $zero /* E136A0 80240F40 3C05FE36 */ lui $a1, 0xfe36 /* E136A4 80240F44 8E06009C */ lw $a2, 0x9c($s0) -/* E136A8 80240F48 0C0B2190 */ jal set_float_variable +/* E136A8 80240F48 0C0B2190 */ jal evt_set_float_variable /* E136AC 80240F4C 34A53C87 */ ori $a1, $a1, 0x3c87 /* E136B0 80240F50 0220202D */ daddu $a0, $s1, $zero /* E136B4 80240F54 3C05FE36 */ lui $a1, 0xfe36 /* E136B8 80240F58 8E0600B8 */ lw $a2, 0xb8($s0) -/* E136BC 80240F5C 0C0B2190 */ jal set_float_variable +/* E136BC 80240F5C 0C0B2190 */ jal evt_set_float_variable /* E136C0 80240F60 34A53C88 */ ori $a1, $a1, 0x3c88 /* E136C4 80240F64 0220202D */ daddu $a0, $s1, $zero /* E136C8 80240F68 3C05FE36 */ lui $a1, 0xfe36 /* E136CC 80240F6C 8E0600C4 */ lw $a2, 0xc4($s0) -/* E136D0 80240F70 0C0B2190 */ jal set_float_variable +/* E136D0 80240F70 0C0B2190 */ jal evt_set_float_variable /* E136D4 80240F74 34A53C89 */ ori $a1, $a1, 0x3c89 /* E136D8 80240F78 8FBF0018 */ lw $ra, 0x18($sp) /* E136DC 80240F7C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s index 9ab507f9fd..7edf953906 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s @@ -7,7 +7,7 @@ glabel func_802416CC_E13E2C /* E13E34 802416D4 3C068011 */ lui $a2, %hi(gPlayerData+0xC) /* E13E38 802416D8 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E13E3C 802416DC AFBF0010 */ sw $ra, 0x10($sp) -/* E13E40 802416E0 0C0B2026 */ jal set_variable +/* E13E40 802416E0 0C0B2026 */ jal evt_set_variable /* E13E44 802416E4 34A53C8A */ ori $a1, $a1, 0x3c8a /* E13E48 802416E8 8FBF0010 */ lw $ra, 0x10($sp) /* E13E4C 802416EC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s index 7a80d669ba..d00c6bf5af 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240644_E163C4.s @@ -38,7 +38,7 @@ glabel func_80240644_E163C4 /* E16440 802406C0 00021080 */ sll $v0, $v0, 2 /* E16444 802406C4 02228021 */ addu $s0, $s1, $v0 /* E16448 802406C8 8E060034 */ lw $a2, 0x34($s0) -/* E1644C 802406CC 0C0B2026 */ jal set_variable +/* E1644C 802406CC 0C0B2026 */ jal evt_set_variable /* E16450 802406D0 34A53C8C */ ori $a1, $a1, 0x3c8c /* E16454 802406D4 8E030034 */ lw $v1, 0x34($s0) /* E16458 802406D8 24020001 */ addiu $v0, $zero, 1 @@ -60,7 +60,7 @@ glabel func_80240644_E163C4 .L80240714: /* E16494 80240714 3C05FE36 */ lui $a1, 0xfe36 /* E16498 80240718 8E060040 */ lw $a2, 0x40($s0) -/* E1649C 8024071C 0C0B2026 */ jal set_variable +/* E1649C 8024071C 0C0B2026 */ jal evt_set_variable /* E164A0 80240720 34A53C8D */ ori $a1, $a1, 0x3c8d /* E164A4 80240724 080901DC */ j .L80240770 /* E164A8 80240728 2402000D */ addiu $v0, $zero, 0xd @@ -68,14 +68,14 @@ glabel func_80240644_E163C4 /* E164AC 8024072C 0240202D */ daddu $a0, $s2, $zero /* E164B0 80240730 3C05FE36 */ lui $a1, 0xfe36 /* E164B4 80240734 8E060040 */ lw $a2, 0x40($s0) -/* E164B8 80240738 0C0B2026 */ jal set_variable +/* E164B8 80240738 0C0B2026 */ jal evt_set_variable /* E164BC 8024073C 34A53C8D */ ori $a1, $a1, 0x3c8d /* E164C0 80240740 080901DC */ j .L80240770 /* E164C4 80240744 24020021 */ addiu $v0, $zero, 0x21 .L80240748: /* E164C8 80240748 3C05FE36 */ lui $a1, 0xfe36 /* E164CC 8024074C 8E060040 */ lw $a2, 0x40($s0) -/* E164D0 80240750 0C0B2026 */ jal set_variable +/* E164D0 80240750 0C0B2026 */ jal evt_set_variable /* E164D4 80240754 34A53C8D */ ori $a1, $a1, 0x3c8d /* E164D8 80240758 080901DC */ j .L80240770 /* E164DC 8024075C 24020034 */ addiu $v0, $zero, 0x34 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s index a2d7d94140..f1250f2704 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241DCC_E17B4C.s @@ -85,7 +85,7 @@ glabel func_80241DCC_E17B4C /* E17C84 80241F04 0280202D */ daddu $a0, $s4, $zero .L80241F08: /* E17C88 80241F08 3C05FE36 */ lui $a1, 0xfe36 -/* E17C8C 80241F0C 0C0B2026 */ jal set_variable +/* E17C8C 80241F0C 0C0B2026 */ jal evt_set_variable /* E17C90 80241F10 34A53C80 */ ori $a1, $a1, 0x3c80 /* E17C94 80241F14 8FBF0024 */ lw $ra, 0x24($sp) /* E17C98 80241F18 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s index 9ec8c4b87f..df39e05031 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s @@ -7,7 +7,7 @@ glabel func_80242314_E18094 /* E1809C 8024231C 3C068011 */ lui $a2, %hi(gPlayerData+0xC) /* E180A0 80242320 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E180A4 80242324 AFBF0010 */ sw $ra, 0x10($sp) -/* E180A8 80242328 0C0B2026 */ jal set_variable +/* E180A8 80242328 0C0B2026 */ jal evt_set_variable /* E180AC 8024232C 34A53C8A */ ori $a1, $a1, 0x3c8a /* E180B0 80242330 8FBF0010 */ lw $ra, 0x10($sp) /* E180B4 80242334 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s index 9e7f861910..5ebb24befe 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s @@ -38,7 +38,7 @@ glabel func_802403F0_B93830 /* B938B4 80240474 8E050000 */ lw $a1, ($s0) /* B938B8 80240478 4600008D */ trunc.w.s $f2, $f0 /* B938BC 8024047C 44061000 */ mfc1 $a2, $f2 -/* B938C0 80240480 0C0B2026 */ jal set_variable +/* B938C0 80240480 0C0B2026 */ jal evt_set_variable /* B938C4 80240484 0220202D */ daddu $a0, $s1, $zero /* B938C8 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) /* B938CC 8024048C 46140002 */ mul.s $f0, $f0, $f20 @@ -48,7 +48,7 @@ glabel func_802403F0_B93830 /* B938DC 8024049C 8E050000 */ lw $a1, ($s0) /* B938E0 802404A0 4600008D */ trunc.w.s $f2, $f0 /* B938E4 802404A4 44061000 */ mfc1 $a2, $f2 -/* B938E8 802404A8 0C0B2026 */ jal set_variable +/* B938E8 802404A8 0C0B2026 */ jal evt_set_variable /* B938EC 802404AC 0220202D */ daddu $a0, $s1, $zero /* B938F0 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) /* B938F4 802404B4 46140002 */ mul.s $f0, $f0, $f20 @@ -58,7 +58,7 @@ glabel func_802403F0_B93830 /* B93904 802404C4 8E050000 */ lw $a1, ($s0) /* B93908 802404C8 4600008D */ trunc.w.s $f2, $f0 /* B9390C 802404CC 44061000 */ mfc1 $a2, $f2 -/* B93910 802404D0 0C0B2026 */ jal set_variable +/* B93910 802404D0 0C0B2026 */ jal evt_set_variable /* B93914 802404D4 0220202D */ daddu $a0, $s1, $zero /* B93918 802404D8 8FBF0028 */ lw $ra, 0x28($sp) /* B9391C 802404DC 8FB10024 */ lw $s1, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s index 775056a998..7509129383 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s @@ -19,7 +19,7 @@ glabel func_802410B0_B98CB0 .L802410E4: /* B98CE4 802410E4 8CC50000 */ lw $a1, ($a2) /* B98CE8 802410E8 3C068024 */ lui $a2, %hi(D_802416B0_B992B0) -/* B98CEC 802410EC 0C0B2026 */ jal set_variable +/* B98CEC 802410EC 0C0B2026 */ jal evt_set_variable /* B98CF0 802410F0 8CC616B0 */ lw $a2, %lo(D_802416B0_B992B0)($a2) /* B98CF4 802410F4 24020002 */ addiu $v0, $zero, 2 .L802410F8: diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s index 15ec229cb4..5702e5d379 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s @@ -38,7 +38,7 @@ glabel func_80240420_B9B8A0 /* B9B924 802404A4 8E050000 */ lw $a1, ($s0) /* B9B928 802404A8 4600008D */ trunc.w.s $f2, $f0 /* B9B92C 802404AC 44061000 */ mfc1 $a2, $f2 -/* B9B930 802404B0 0C0B2026 */ jal set_variable +/* B9B930 802404B0 0C0B2026 */ jal evt_set_variable /* B9B934 802404B4 0220202D */ daddu $a0, $s1, $zero /* B9B938 802404B8 C7A00014 */ lwc1 $f0, 0x14($sp) /* B9B93C 802404BC 46140002 */ mul.s $f0, $f0, $f20 @@ -48,7 +48,7 @@ glabel func_80240420_B9B8A0 /* B9B94C 802404CC 8E050000 */ lw $a1, ($s0) /* B9B950 802404D0 4600008D */ trunc.w.s $f2, $f0 /* B9B954 802404D4 44061000 */ mfc1 $a2, $f2 -/* B9B958 802404D8 0C0B2026 */ jal set_variable +/* B9B958 802404D8 0C0B2026 */ jal evt_set_variable /* B9B95C 802404DC 0220202D */ daddu $a0, $s1, $zero /* B9B960 802404E0 C7A00018 */ lwc1 $f0, 0x18($sp) /* B9B964 802404E4 46140002 */ mul.s $f0, $f0, $f20 @@ -58,7 +58,7 @@ glabel func_80240420_B9B8A0 /* B9B974 802404F4 8E050000 */ lw $a1, ($s0) /* B9B978 802404F8 4600008D */ trunc.w.s $f2, $f0 /* B9B97C 802404FC 44061000 */ mfc1 $a2, $f2 -/* B9B980 80240500 0C0B2026 */ jal set_variable +/* B9B980 80240500 0C0B2026 */ jal evt_set_variable /* B9B984 80240504 0220202D */ daddu $a0, $s1, $zero /* B9B988 80240508 8FBF0028 */ lw $ra, 0x28($sp) /* B9B98C 8024050C 8FB10024 */ lw $s1, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s index a40e330a73..3f7afd1ce3 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s @@ -38,7 +38,7 @@ glabel func_802403F0_BA4B70 /* BA4BF4 80240474 8E050000 */ lw $a1, ($s0) /* BA4BF8 80240478 4600008D */ trunc.w.s $f2, $f0 /* BA4BFC 8024047C 44061000 */ mfc1 $a2, $f2 -/* BA4C00 80240480 0C0B2026 */ jal set_variable +/* BA4C00 80240480 0C0B2026 */ jal evt_set_variable /* BA4C04 80240484 0220202D */ daddu $a0, $s1, $zero /* BA4C08 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) /* BA4C0C 8024048C 46140002 */ mul.s $f0, $f0, $f20 @@ -48,7 +48,7 @@ glabel func_802403F0_BA4B70 /* BA4C1C 8024049C 8E050000 */ lw $a1, ($s0) /* BA4C20 802404A0 4600008D */ trunc.w.s $f2, $f0 /* BA4C24 802404A4 44061000 */ mfc1 $a2, $f2 -/* BA4C28 802404A8 0C0B2026 */ jal set_variable +/* BA4C28 802404A8 0C0B2026 */ jal evt_set_variable /* BA4C2C 802404AC 0220202D */ daddu $a0, $s1, $zero /* BA4C30 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) /* BA4C34 802404B4 46140002 */ mul.s $f0, $f0, $f20 @@ -58,7 +58,7 @@ glabel func_802403F0_BA4B70 /* BA4C44 802404C4 8E050000 */ lw $a1, ($s0) /* BA4C48 802404C8 4600008D */ trunc.w.s $f2, $f0 /* BA4C4C 802404CC 44061000 */ mfc1 $a2, $f2 -/* BA4C50 802404D0 0C0B2026 */ jal set_variable +/* BA4C50 802404D0 0C0B2026 */ jal evt_set_variable /* BA4C54 802404D4 0220202D */ daddu $a0, $s1, $zero /* BA4C58 802404D8 8FBF0028 */ lw $ra, 0x28($sp) /* BA4C5C 802404DC 8FB10024 */ lw $s1, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s index 23515e301d..597192fcdd 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s @@ -23,7 +23,7 @@ glabel func_802404F8_BA4C78 /* BA4CC0 80240540 8E050000 */ lw $a1, ($s0) /* BA4CC4 80240544 4600010D */ trunc.w.s $f4, $f0 /* BA4CC8 80240548 44062000 */ mfc1 $a2, $f4 -/* BA4CCC 8024054C 0C0B2026 */ jal set_variable +/* BA4CCC 8024054C 0C0B2026 */ jal evt_set_variable /* BA4CD0 80240550 0220202D */ daddu $a0, $s1, $zero /* BA4CD4 80240554 8FBF0018 */ lw $ra, 0x18($sp) /* BA4CD8 80240558 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s index 9e616f4f71..2c83220928 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s @@ -60,24 +60,24 @@ glabel func_80240EA4_9C6284 /* 9C635C 80240F7C 0220202D */ daddu $a0, $s1, $zero /* 9C6360 80240F80 3C05F5DE */ lui $a1, 0xf5de /* 9C6364 80240F84 34A502DE */ ori $a1, $a1, 0x2de -/* 9C6368 80240F88 0C0B2026 */ jal set_variable +/* 9C6368 80240F88 0C0B2026 */ jal evt_set_variable /* 9C636C 80240F8C 0280302D */ daddu $a2, $s4, $zero /* 9C6370 80240F90 0220202D */ daddu $a0, $s1, $zero /* 9C6374 80240F94 3C05F5DE */ lui $a1, 0xf5de /* 9C6378 80240F98 34A502DF */ ori $a1, $a1, 0x2df -/* 9C637C 80240F9C 0C0B2026 */ jal set_variable +/* 9C637C 80240F9C 0C0B2026 */ jal evt_set_variable /* 9C6380 80240FA0 32A6FFFF */ andi $a2, $s5, 0xffff /* 9C6384 80240FA4 24100001 */ addiu $s0, $zero, 1 /* 9C6388 80240FA8 0220202D */ daddu $a0, $s1, $zero .L80240FAC: /* 9C638C 80240FAC 3C05F840 */ lui $a1, 0xf840 /* 9C6390 80240FB0 34A56268 */ ori $a1, $a1, 0x6268 -/* 9C6394 80240FB4 0C0B2026 */ jal set_variable +/* 9C6394 80240FB4 0C0B2026 */ jal evt_set_variable /* 9C6398 80240FB8 3206FFFF */ andi $a2, $s0, 0xffff /* 9C639C 80240FBC 0220202D */ daddu $a0, $s1, $zero /* 9C63A0 80240FC0 3C05F840 */ lui $a1, 0xf840 /* 9C63A4 80240FC4 34A56269 */ ori $a1, $a1, 0x6269 -/* 9C63A8 80240FC8 0C0B2026 */ jal set_variable +/* 9C63A8 80240FC8 0C0B2026 */ jal evt_set_variable /* 9C63AC 80240FCC 32E6FFFF */ andi $a2, $s7, 0xffff /* 9C63B0 80240FD0 0000202D */ daddu $a0, $zero, $zero /* 9C63B4 80240FD4 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s index fd7a073770..c824281999 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s @@ -19,7 +19,7 @@ glabel func_80242028_9C7408 .L8024205C: /* 9C743C 8024205C 8CC50000 */ lw $a1, ($a2) /* 9C7440 80242060 3C068025 */ lui $a2, %hi(D_80248570_9CD950) -/* 9C7444 80242064 0C0B2026 */ jal set_variable +/* 9C7444 80242064 0C0B2026 */ jal evt_set_variable /* 9C7448 80242068 8CC68570 */ lw $a2, %lo(D_80248570_9CD950)($a2) /* 9C744C 8024206C 24020002 */ addiu $v0, $zero, 2 .L80242070: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s index 430ff97241..c7a5eeabaf 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s @@ -50,7 +50,7 @@ glabel func_8024243C_9C781C /* 9C78CC 802424EC 24060001 */ addiu $a2, $zero, 1 /* 9C78D0 802424F0 0220202D */ daddu $a0, $s1, $zero .L802424F4: -/* 9C78D4 802424F4 0C0B2026 */ jal set_variable +/* 9C78D4 802424F4 0C0B2026 */ jal evt_set_variable /* 9C78D8 802424F8 0200282D */ daddu $a1, $s0, $zero /* 9C78DC 802424FC 8FBF0018 */ lw $ra, 0x18($sp) /* 9C78E0 80242500 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s index 812626e62a..52d7ef2bfa 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s @@ -19,7 +19,7 @@ glabel func_80240624_9D7644 .L80240658: /* 9D7678 80240658 8CC50000 */ lw $a1, ($a2) /* 9D767C 8024065C 3C068024 */ lui $a2, %hi(D_80245438_9DC458) -/* 9D7680 80240660 0C0B2026 */ jal set_variable +/* 9D7680 80240660 0C0B2026 */ jal evt_set_variable /* 9D7684 80240664 8CC65438 */ lw $a2, %lo(D_80245438_9DC458)($a2) /* 9D7688 80240668 24020002 */ addiu $v0, $zero, 2 .L8024066C: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s index 286a85434d..62c52fdc76 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s @@ -22,17 +22,17 @@ glabel func_80240750_9D7770 /* 9D77B4 80240794 AE220020 */ sw $v0, 0x20($s1) /* 9D77B8 80240798 8E050000 */ lw $a1, ($s0) /* 9D77BC 8024079C 26100004 */ addiu $s0, $s0, 4 -/* 9D77C0 802407A0 0C0B210B */ jal get_float_variable +/* 9D77C0 802407A0 0C0B210B */ jal evt_get_float_variable /* 9D77C4 802407A4 0240202D */ daddu $a0, $s2, $zero /* 9D77C8 802407A8 E6200000 */ swc1 $f0, ($s1) /* 9D77CC 802407AC 8E050000 */ lw $a1, ($s0) /* 9D77D0 802407B0 26100004 */ addiu $s0, $s0, 4 -/* 9D77D4 802407B4 0C0B210B */ jal get_float_variable +/* 9D77D4 802407B4 0C0B210B */ jal evt_get_float_variable /* 9D77D8 802407B8 0240202D */ daddu $a0, $s2, $zero /* 9D77DC 802407BC E6200004 */ swc1 $f0, 4($s1) /* 9D77E0 802407C0 8E050000 */ lw $a1, ($s0) /* 9D77E4 802407C4 26100004 */ addiu $s0, $s0, 4 -/* 9D77E8 802407C8 0C0B210B */ jal get_float_variable +/* 9D77E8 802407C8 0C0B210B */ jal evt_get_float_variable /* 9D77EC 802407CC 0240202D */ daddu $a0, $s2, $zero /* 9D77F0 802407D0 E6200008 */ swc1 $f0, 8($s1) /* 9D77F4 802407D4 8E050000 */ lw $a1, ($s0) @@ -41,7 +41,7 @@ glabel func_80240750_9D7770 /* 9D7800 802407E0 0240202D */ daddu $a0, $s2, $zero /* 9D7804 802407E4 AE22001C */ sw $v0, 0x1c($s1) /* 9D7808 802407E8 8E050000 */ lw $a1, ($s0) -/* 9D780C 802407EC 0C0B210B */ jal get_float_variable +/* 9D780C 802407EC 0C0B210B */ jal evt_get_float_variable /* 9D7810 802407F0 0240202D */ daddu $a0, $s2, $zero /* 9D7814 802407F4 8E240020 */ lw $a0, 0x20($s1) /* 9D7818 802407F8 0C04C3D6 */ jal get_item_entity diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s index fda7d41722..7f44ccb55b 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s @@ -60,24 +60,24 @@ glabel func_80241A4C_9D8A6C /* 9D8B44 80241B24 0220202D */ daddu $a0, $s1, $zero /* 9D8B48 80241B28 3C05F5DE */ lui $a1, 0xf5de /* 9D8B4C 80241B2C 34A502DE */ ori $a1, $a1, 0x2de -/* 9D8B50 80241B30 0C0B2026 */ jal set_variable +/* 9D8B50 80241B30 0C0B2026 */ jal evt_set_variable /* 9D8B54 80241B34 0280302D */ daddu $a2, $s4, $zero /* 9D8B58 80241B38 0220202D */ daddu $a0, $s1, $zero /* 9D8B5C 80241B3C 3C05F5DE */ lui $a1, 0xf5de /* 9D8B60 80241B40 34A502DF */ ori $a1, $a1, 0x2df -/* 9D8B64 80241B44 0C0B2026 */ jal set_variable +/* 9D8B64 80241B44 0C0B2026 */ jal evt_set_variable /* 9D8B68 80241B48 32A6FFFF */ andi $a2, $s5, 0xffff /* 9D8B6C 80241B4C 24100001 */ addiu $s0, $zero, 1 /* 9D8B70 80241B50 0220202D */ daddu $a0, $s1, $zero .L80241B54: /* 9D8B74 80241B54 3C05F840 */ lui $a1, 0xf840 /* 9D8B78 80241B58 34A56268 */ ori $a1, $a1, 0x6268 -/* 9D8B7C 80241B5C 0C0B2026 */ jal set_variable +/* 9D8B7C 80241B5C 0C0B2026 */ jal evt_set_variable /* 9D8B80 80241B60 3206FFFF */ andi $a2, $s0, 0xffff /* 9D8B84 80241B64 0220202D */ daddu $a0, $s1, $zero /* 9D8B88 80241B68 3C05F840 */ lui $a1, 0xf840 /* 9D8B8C 80241B6C 34A56269 */ ori $a1, $a1, 0x6269 -/* 9D8B90 80241B70 0C0B2026 */ jal set_variable +/* 9D8B90 80241B70 0C0B2026 */ jal evt_set_variable /* 9D8B94 80241B74 32E6FFFF */ andi $a2, $s7, 0xffff /* 9D8B98 80241B78 0000202D */ daddu $a0, $zero, $zero /* 9D8B9C 80241B7C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s index 9f5d83b941..ff41373210 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s @@ -19,7 +19,7 @@ glabel func_80242BD0_9D9BF0 .L80242C04: /* 9D9C24 80242C04 8CC50000 */ lw $a1, ($a2) /* 9D9C28 80242C08 3C068025 */ lui $a2, %hi(D_802496F4_9E0714) -/* 9D9C2C 80242C0C 0C0B2026 */ jal set_variable +/* 9D9C2C 80242C0C 0C0B2026 */ jal evt_set_variable /* 9D9C30 80242C10 8CC696F4 */ lw $a2, %lo(D_802496F4_9E0714)($a2) /* 9D9C34 80242C14 24020002 */ addiu $v0, $zero, 2 .L80242C18: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s index 9d1bb70eb5..0595bedc7e 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s @@ -19,7 +19,7 @@ glabel func_80243BEC_9DAC0C .L80243C20: /* 9DAC40 80243C20 8CC50000 */ lw $a1, ($a2) /* 9DAC44 80243C24 3C068025 */ lui $a2, %hi(D_80252404_9E9424) -/* 9DAC48 80243C28 0C0B2026 */ jal set_variable +/* 9DAC48 80243C28 0C0B2026 */ jal evt_set_variable /* 9DAC4C 80243C2C 8CC62404 */ lw $a2, %lo(D_80252404_9E9424)($a2) /* 9DAC50 80243C30 24020002 */ addiu $v0, $zero, 2 .L80243C34: diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s index da2156aa0d..efc9a9ee57 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s @@ -88,7 +88,7 @@ glabel func_80243F10_9DAF30 /* 9DB05C 8024403C 26260001 */ addiu $a2, $s1, 1 /* 9DB060 80244040 AC820084 */ sw $v0, 0x84($a0) .L80244044: -/* 9DB064 80244044 0C0B2026 */ jal set_variable +/* 9DB064 80244044 0C0B2026 */ jal evt_set_variable /* 9DB068 80244048 00000000 */ nop /* 9DB06C 8024404C 24020002 */ addiu $v0, $zero, 2 /* 9DB070 80244050 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s index 24c1f10673..e42bd48808 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s @@ -30,7 +30,7 @@ glabel func_80244078_9DB098 /* 9DB0FC 802440DC 3C058025 */ lui $a1, %hi(D_80252794_9E97B4) /* 9DB100 802440E0 00A22821 */ addu $a1, $a1, $v0 /* 9DB104 802440E4 8CA52794 */ lw $a1, %lo(D_80252794_9E97B4)($a1) -/* 9DB108 802440E8 0C0B2026 */ jal set_variable +/* 9DB108 802440E8 0C0B2026 */ jal evt_set_variable /* 9DB10C 802440EC 24060001 */ addiu $a2, $zero, 1 .L802440F0: /* 9DB110 802440F0 8E05FFFC */ lw $a1, -4($s0) @@ -104,7 +104,7 @@ glabel func_80244078_9DB098 /* 9DB204 802441E4 26260001 */ addiu $a2, $s1, 1 /* 9DB208 802441E8 AC820084 */ sw $v0, 0x84($a0) .L802441EC: -/* 9DB20C 802441EC 0C0B2026 */ jal set_variable +/* 9DB20C 802441EC 0C0B2026 */ jal evt_set_variable /* 9DB210 802441F0 00000000 */ nop /* 9DB214 802441F4 24020002 */ addiu $v0, $zero, 2 /* 9DB218 802441F8 8FBF0030 */ lw $ra, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s index a2577d6686..93acc74345 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s @@ -17,7 +17,7 @@ glabel func_80244288_9DB2A8 /* 9DB2D8 802442B8 3C058025 */ lui $a1, %hi(D_80252798_9E97B8) /* 9DB2DC 802442BC 00A32821 */ addu $a1, $a1, $v1 /* 9DB2E0 802442C0 8CA52798 */ lw $a1, %lo(D_80252798_9E97B8)($a1) -/* 9DB2E4 802442C4 0C0B2026 */ jal set_variable +/* 9DB2E4 802442C4 0C0B2026 */ jal evt_set_variable /* 9DB2E8 802442C8 24060001 */ addiu $a2, $zero, 1 /* 9DB2EC 802442CC 8FBF0014 */ lw $ra, 0x14($sp) /* 9DB2F0 802442D0 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s b/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s index d101ab92e7..cb4aab6e5a 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s @@ -23,7 +23,7 @@ glabel func_80240574_9EE164 /* 9EE1AC 802405BC 8CC61440 */ lw $a2, %lo(D_80241440_9EF030)($a2) /* 9EE1B0 802405C0 8E130000 */ lw $s3, ($s0) /* 9EE1B4 802405C4 8E100004 */ lw $s0, 4($s0) -/* 9EE1B8 802405C8 0C0B2026 */ jal set_variable +/* 9EE1B8 802405C8 0C0B2026 */ jal evt_set_variable /* 9EE1BC 802405CC 0240202D */ daddu $a0, $s2, $zero /* 9EE1C0 802405D0 0240202D */ daddu $a0, $s2, $zero /* 9EE1C4 802405D4 26220001 */ addiu $v0, $s1, 1 @@ -31,7 +31,7 @@ glabel func_80240574_9EE164 /* 9EE1CC 802405DC 3C068024 */ lui $a2, %hi(D_80241440_9EF030) /* 9EE1D0 802405E0 00C23021 */ addu $a2, $a2, $v0 /* 9EE1D4 802405E4 8CC61440 */ lw $a2, %lo(D_80241440_9EF030)($a2) -/* 9EE1D8 802405E8 0C0B2026 */ jal set_variable +/* 9EE1D8 802405E8 0C0B2026 */ jal evt_set_variable /* 9EE1DC 802405EC 0260282D */ daddu $a1, $s3, $zero /* 9EE1E0 802405F0 0240202D */ daddu $a0, $s2, $zero /* 9EE1E4 802405F4 26310002 */ addiu $s1, $s1, 2 @@ -39,7 +39,7 @@ glabel func_80240574_9EE164 /* 9EE1EC 802405FC 3C068024 */ lui $a2, %hi(D_80241440_9EF030) /* 9EE1F0 80240600 00D13021 */ addu $a2, $a2, $s1 /* 9EE1F4 80240604 8CC61440 */ lw $a2, %lo(D_80241440_9EF030)($a2) -/* 9EE1F8 80240608 0C0B2026 */ jal set_variable +/* 9EE1F8 80240608 0C0B2026 */ jal evt_set_variable /* 9EE1FC 8024060C 0200282D */ daddu $a1, $s0, $zero /* 9EE200 80240610 8FBF0020 */ lw $ra, 0x20($sp) /* 9EE204 80240614 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s b/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s index 97ad518ded..810ccdfbc6 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240630_9EE220.s @@ -33,7 +33,7 @@ glabel func_80240630_9EE220 /* 9EE28C 8024069C 24060006 */ addiu $a2, $zero, 6 /* 9EE290 802406A0 00C73023 */ subu $a2, $a2, $a3 .L802406A4: -/* 9EE294 802406A4 0C0B2026 */ jal set_variable +/* 9EE294 802406A4 0C0B2026 */ jal evt_set_variable /* 9EE298 802406A8 00000000 */ nop /* 9EE29C 802406AC 8FBF0018 */ lw $ra, 0x18($sp) /* 9EE2A0 802406B0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s index a00a526322..a79a9e0f91 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s @@ -21,7 +21,7 @@ glabel func_80241360_A01960 /* A019A0 802413A0 4600008D */ trunc.w.s $f2, $f0 /* A019A4 802413A4 44061000 */ mfc1 $a2, $f2 /* A019A8 802413A8 0220202D */ daddu $a0, $s1, $zero -/* A019AC 802413AC 0C0B2026 */ jal set_variable +/* A019AC 802413AC 0C0B2026 */ jal evt_set_variable /* A019B0 802413B0 0200282D */ daddu $a1, $s0, $zero /* A019B4 802413B4 8FBF0018 */ lw $ra, 0x18($sp) /* A019B8 802413B8 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s index 9b76174e99..3429a35aca 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s @@ -5,7 +5,7 @@ glabel func_80240038_BBD1D8 /* BBD1D8 80240038 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BBD1DC 8024003C AFBF0010 */ sw $ra, 0x10($sp) /* BBD1E0 80240040 8C82000C */ lw $v0, 0xc($a0) -/* BBD1E4 80240044 0C0B210B */ jal get_float_variable +/* BBD1E4 80240044 0C0B210B */ jal evt_get_float_variable /* BBD1E8 80240048 8C450000 */ lw $a1, ($v0) /* BBD1EC 8024004C 4600008D */ trunc.w.s $f2, $f0 /* BBD1F0 80240050 44021000 */ mfc1 $v0, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s index 96a6fa6b5b..0bb2daf55b 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s @@ -19,7 +19,7 @@ glabel func_80240B24_BBDCC4 .L80240B58: /* BBDCF8 80240B58 8CC50000 */ lw $a1, ($a2) /* BBDCFC 80240B5C 3C068024 */ lui $a2, %hi(D_80244158_BC12F8) -/* BBDD00 80240B60 0C0B2026 */ jal set_variable +/* BBDD00 80240B60 0C0B2026 */ jal evt_set_variable /* BBDD04 80240B64 8CC64158 */ lw $a2, %lo(D_80244158_BC12F8)($a2) /* BBDD08 80240B68 24020002 */ addiu $v0, $zero, 2 .L80240B6C: diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s index b601a3ae3c..4188c4ac7b 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s @@ -19,7 +19,7 @@ glabel func_802404B4_BC4734 .L802404E8: /* BC4768 802404E8 8CC50000 */ lw $a1, ($a2) /* BC476C 802404EC 3C068024 */ lui $a2, %hi(D_80242F34_BC71B4) -/* BC4770 802404F0 0C0B2026 */ jal set_variable +/* BC4770 802404F0 0C0B2026 */ jal evt_set_variable /* BC4774 802404F4 8CC62F34 */ lw $a2, %lo(D_80242F34_BC71B4)($a2) /* BC4778 802404F8 24020002 */ addiu $v0, $zero, 2 .L802404FC: diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s index 7bbcf82196..734f3f2798 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s @@ -104,7 +104,7 @@ glabel func_802402F4_BC8154 /* BC82C8 80240468 0220202D */ daddu $a0, $s1, $zero /* BC82CC 8024046C 3C05FD05 */ lui $a1, 0xfd05 /* BC82D0 80240470 34A50F82 */ ori $a1, $a1, 0xf82 -/* BC82D4 80240474 0C0B2026 */ jal set_variable +/* BC82D4 80240474 0C0B2026 */ jal evt_set_variable /* BC82D8 80240478 24060001 */ addiu $a2, $zero, 1 /* BC82DC 8024047C 0C09008B */ jal func_8024022C_BC808C /* BC82E0 80240480 00000000 */ nop @@ -139,7 +139,7 @@ glabel func_802402F4_BC8154 /* BC8348 802404E8 0220202D */ daddu $a0, $s1, $zero /* BC834C 802404EC 3C05FD05 */ lui $a1, 0xfd05 /* BC8350 802404F0 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC8354 802404F4 0C0B2026 */ jal set_variable +/* BC8354 802404F4 0C0B2026 */ jal evt_set_variable /* BC8358 802404F8 0000302D */ daddu $a2, $zero, $zero /* BC835C 802404FC 9602008E */ lhu $v0, 0x8e($s0) /* BC8360 80240500 24030032 */ addiu $v1, $zero, 0x32 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s index cd05433633..6ba3c7e228 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s @@ -110,7 +110,7 @@ glabel L80240BB0_BC8A10 /* BC8A20 80240BC0 24060008 */ addiu $a2, $zero, 8 .L80240BC4: /* BC8A24 80240BC4 4600008D */ trunc.w.s $f2, $f0 -/* BC8A28 80240BC8 0C0B2026 */ jal set_variable +/* BC8A28 80240BC8 0C0B2026 */ jal evt_set_variable /* BC8A2C 80240BCC E6020084 */ swc1 $f2, 0x84($s0) /* BC8A30 80240BD0 8E030084 */ lw $v1, 0x84($s0) .L80240BD4: diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240500_BCF0F0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240500_BCF0F0.s index 89dc2956fe..039ca7b445 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240500_BCF0F0.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240500_BCF0F0.s @@ -11,7 +11,7 @@ glabel func_80240500_BCF0F0 /* BCF108 80240518 0200202D */ daddu $a0, $s0, $zero /* BCF10C 8024051C 3C05FD05 */ lui $a1, 0xfd05 /* BCF110 80240520 34A50F86 */ ori $a1, $a1, 0xf86 -/* BCF114 80240524 0C0B2026 */ jal set_variable +/* BCF114 80240524 0C0B2026 */ jal evt_set_variable /* BCF118 80240528 0040302D */ daddu $a2, $v0, $zero /* BCF11C 8024052C 8FBF0014 */ lw $ra, 0x14($sp) /* BCF120 80240530 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s index e041c13417..232cc9cd67 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s @@ -131,7 +131,7 @@ glabel func_80240A6C_BCF65C /* BCF828 80240C38 00D03023 */ subu $a2, $a2, $s0 /* BCF82C 80240C3C 00063080 */ sll $a2, $a2, 2 /* BCF830 80240C40 00D03021 */ addu $a2, $a2, $s0 -/* BCF834 80240C44 0C0B2026 */ jal set_variable +/* BCF834 80240C44 0C0B2026 */ jal evt_set_variable /* BCF838 80240C48 000630C0 */ sll $a2, $a2, 3 /* BCF83C 80240C4C 3C032E8B */ lui $v1, 0x2e8b /* BCF840 80240C50 3463A2E9 */ ori $v1, $v1, 0xa2e9 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s index fe4a2e6605..7d7b3be685 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s @@ -11,7 +11,7 @@ glabel func_8024146C_BD005C /* BD0074 80241484 3C05FE36 */ lui $a1, 0xfe36 /* BD0078 80241488 34A53C82 */ ori $a1, $a1, 0x3c82 /* BD007C 8024148C 0040802D */ daddu $s0, $v0, $zero -/* BD0080 80241490 0C0B210B */ jal get_float_variable +/* BD0080 80241490 0C0B210B */ jal evt_get_float_variable /* BD0084 80241494 0220202D */ daddu $a0, $s1, $zero /* BD0088 80241498 E60001D0 */ swc1 $f0, 0x1d0($s0) /* BD008C 8024149C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s index dc151a0301..0ef21fdf09 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s @@ -11,7 +11,7 @@ glabel func_802414B4_BD00A4 /* BD00BC 802414CC 0200202D */ daddu $a0, $s0, $zero /* BD00C0 802414D0 3C05FE36 */ lui $a1, 0xfe36 /* BD00C4 802414D4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD00C8 802414D8 0C0B210B */ jal get_float_variable +/* BD00C8 802414D8 0C0B210B */ jal evt_get_float_variable /* BD00CC 802414DC 0040882D */ daddu $s1, $v0, $zero /* BD00D0 802414E0 0C00A6C9 */ jal clamp_angle /* BD00D4 802414E4 46000306 */ mov.s $f12, $f0 @@ -19,7 +19,7 @@ glabel func_802414B4_BD00A4 /* BD00DC 802414EC 3C05FE36 */ lui $a1, 0xfe36 /* BD00E0 802414F0 44060000 */ mfc1 $a2, $f0 /* BD00E4 802414F4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD00E8 802414F8 0C0B2190 */ jal set_float_variable +/* BD00E8 802414F8 0C0B2190 */ jal evt_set_float_variable /* BD00EC 802414FC AE2601C8 */ sw $a2, 0x1c8($s1) /* BD00F0 80241500 8FBF0018 */ lw $ra, 0x18($sp) /* BD00F4 80241504 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518_BD0108.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518_BD0108.s index cbd3e9ebe7..dd5d7d36c1 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518_BD0108.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518_BD0108.s @@ -11,7 +11,7 @@ glabel func_80241518_BD0108 /* BD0120 80241530 0200202D */ daddu $a0, $s0, $zero /* BD0124 80241534 3C05FE36 */ lui $a1, 0xfe36 /* BD0128 80241538 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD012C 8024153C 0C0B210B */ jal get_float_variable +/* BD012C 8024153C 0C0B210B */ jal evt_get_float_variable /* BD0130 80241540 0040882D */ daddu $s1, $v0, $zero /* BD0134 80241544 0C00A6C9 */ jal clamp_angle /* BD0138 80241548 46000306 */ mov.s $f12, $f0 @@ -19,7 +19,7 @@ glabel func_80241518_BD0108 /* BD0140 80241550 3C05FE36 */ lui $a1, 0xfe36 /* BD0144 80241554 44060000 */ mfc1 $a2, $f0 /* BD0148 80241558 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD014C 8024155C 0C0B2190 */ jal set_float_variable +/* BD014C 8024155C 0C0B2190 */ jal evt_set_float_variable /* BD0150 80241560 AE2601CC */ sw $a2, 0x1cc($s1) /* BD0154 80241564 8FBF0018 */ lw $ra, 0x18($sp) /* BD0158 80241568 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C_BD016C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C_BD016C.s index 9f70f77eed..cc78c83b76 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C_BD016C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C_BD016C.s @@ -10,7 +10,7 @@ glabel func_8024157C_BD016C /* BD0180 80241590 3C05FE36 */ lui $a1, 0xfe36 /* BD0184 80241594 34A53C80 */ ori $a1, $a1, 0x3c80 /* BD0188 80241598 8C4601D0 */ lw $a2, 0x1d0($v0) -/* BD018C 8024159C 0C0B2190 */ jal set_float_variable +/* BD018C 8024159C 0C0B2190 */ jal evt_set_float_variable /* BD0190 802415A0 0200202D */ daddu $a0, $s0, $zero /* BD0194 802415A4 8FBF0014 */ lw $ra, 0x14($sp) /* BD0198 802415A8 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8_BD01A8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8_BD01A8.s index da27c8227a..d10ec41aa3 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8_BD01A8.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8_BD01A8.s @@ -10,7 +10,7 @@ glabel func_802415B8_BD01A8 /* BD01BC 802415CC 3C05FE36 */ lui $a1, 0xfe36 /* BD01C0 802415D0 34A53C80 */ ori $a1, $a1, 0x3c80 /* BD01C4 802415D4 8C4601C8 */ lw $a2, 0x1c8($v0) -/* BD01C8 802415D8 0C0B2190 */ jal set_float_variable +/* BD01C8 802415D8 0C0B2190 */ jal evt_set_float_variable /* BD01CC 802415DC 0200202D */ daddu $a0, $s0, $zero /* BD01D0 802415E0 8FBF0014 */ lw $ra, 0x14($sp) /* BD01D4 802415E4 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s index ca95a69c63..3d28015018 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s @@ -10,7 +10,7 @@ glabel func_802415F4_BD01E4 /* BD01F8 80241608 3C05FE36 */ lui $a1, 0xfe36 /* BD01FC 8024160C 34A53C80 */ ori $a1, $a1, 0x3c80 /* BD0200 80241610 8C4601CC */ lw $a2, 0x1cc($v0) -/* BD0204 80241614 0C0B2190 */ jal set_float_variable +/* BD0204 80241614 0C0B2190 */ jal evt_set_float_variable /* BD0208 80241618 0200202D */ daddu $a0, $s0, $zero /* BD020C 8024161C 8FBF0014 */ lw $ra, 0x14($sp) /* BD0210 80241620 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241630_BD0220.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241630_BD0220.s index 1ef24fc21f..950de3af60 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241630_BD0220.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241630_BD0220.s @@ -7,12 +7,12 @@ glabel func_80241630_BD0220 /* BD0228 80241638 0080802D */ daddu $s0, $a0, $zero /* BD022C 8024163C 3C05FE36 */ lui $a1, 0xfe36 /* BD0230 80241640 AFBF0014 */ sw $ra, 0x14($sp) -/* BD0234 80241644 0C0B210B */ jal get_float_variable +/* BD0234 80241644 0C0B210B */ jal evt_get_float_variable /* BD0238 80241648 34A53C80 */ ori $a1, $a1, 0x3c80 /* BD023C 8024164C 0200202D */ daddu $a0, $s0, $zero /* BD0240 80241650 3C05FE36 */ lui $a1, 0xfe36 /* BD0244 80241654 44060000 */ mfc1 $a2, $f0 -/* BD0248 80241658 0C0B2190 */ jal set_float_variable +/* BD0248 80241658 0C0B2190 */ jal evt_set_float_variable /* BD024C 8024165C 34A53C81 */ ori $a1, $a1, 0x3c81 /* BD0250 80241660 8FBF0014 */ lw $ra, 0x14($sp) /* BD0254 80241664 8FB00010 */ lw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s index ac1f72832f..2beb5f86b7 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241674_BD0264.s @@ -8,12 +8,12 @@ glabel func_80241674_BD0264 /* BD0270 80241680 3C05FE36 */ lui $a1, 0xfe36 /* BD0274 80241684 AFBF0014 */ sw $ra, 0x14($sp) /* BD0278 80241688 F7B40018 */ sdc1 $f20, 0x18($sp) -/* BD027C 8024168C 0C0B210B */ jal get_float_variable +/* BD027C 8024168C 0C0B210B */ jal evt_get_float_variable /* BD0280 80241690 34A53C80 */ ori $a1, $a1, 0x3c80 /* BD0284 80241694 0200202D */ daddu $a0, $s0, $zero /* BD0288 80241698 3C05FE36 */ lui $a1, 0xfe36 /* BD028C 8024169C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BD0290 802416A0 0C0B210B */ jal get_float_variable +/* BD0290 802416A0 0C0B210B */ jal evt_get_float_variable /* BD0294 802416A4 46000506 */ mov.s $f20, $f0 /* BD0298 802416A8 3C013F80 */ lui $at, 0x3f80 /* BD029C 802416AC 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s index 6c5c128d4e..fd973941b1 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802416F8_BD02E8.s @@ -8,12 +8,12 @@ glabel func_802416F8_BD02E8 /* BD02F4 80241704 3C05FE36 */ lui $a1, 0xfe36 /* BD02F8 80241708 AFBF0014 */ sw $ra, 0x14($sp) /* BD02FC 8024170C F7B40018 */ sdc1 $f20, 0x18($sp) -/* BD0300 80241710 0C0B210B */ jal get_float_variable +/* BD0300 80241710 0C0B210B */ jal evt_get_float_variable /* BD0304 80241714 34A53C80 */ ori $a1, $a1, 0x3c80 /* BD0308 80241718 0200202D */ daddu $a0, $s0, $zero /* BD030C 8024171C 3C05FE36 */ lui $a1, 0xfe36 /* BD0310 80241720 34A53C81 */ ori $a1, $a1, 0x3c81 -/* BD0314 80241724 0C0B210B */ jal get_float_variable +/* BD0314 80241724 0C0B210B */ jal evt_get_float_variable /* BD0318 80241728 46000506 */ mov.s $f20, $f0 /* BD031C 8024172C 3C0143B4 */ lui $at, 0x43b4 /* BD0320 80241730 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s index fe4678e40b..7854992e19 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s @@ -61,7 +61,7 @@ glabel func_802403DC_BD3C4C /* BD3D2C 802404BC 3C05FD05 */ lui $a1, 0xfd05 /* BD3D30 802404C0 34A50F8A */ ori $a1, $a1, 0xf8a /* BD3D34 802404C4 0200302D */ daddu $a2, $s0, $zero -/* BD3D38 802404C8 0C0B2026 */ jal set_variable +/* BD3D38 802404C8 0C0B2026 */ jal evt_set_variable /* BD3D3C 802404CC AE020004 */ sw $v0, 4($s0) /* BD3D40 802404D0 8FBF0020 */ lw $ra, 0x20($sp) /* BD3D44 802404D4 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0_BD3D60.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0_BD3D60.s index 26997e339b..0ff1e46447 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0_BD3D60.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0_BD3D60.s @@ -21,7 +21,7 @@ glabel func_802404F0_BD3D60 /* BD3DA0 80240530 0220202D */ daddu $a0, $s1, $zero /* BD3DA4 80240534 3C05FD05 */ lui $a1, 0xfd05 /* BD3DA8 80240538 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD3DAC 8024053C 0C0B2026 */ jal set_variable +/* BD3DAC 8024053C 0C0B2026 */ jal evt_set_variable /* BD3DB0 80240540 0000302D */ daddu $a2, $zero, $zero /* BD3DB4 80240544 8FBF0018 */ lw $ra, 0x18($sp) /* BD3DB8 80240548 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s index e6e29fc44a..48c4d67ff8 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024055C_BD3DCC.s @@ -10,19 +10,19 @@ glabel func_8024055C_BD3DCC /* BD3DE0 80240570 AFB00010 */ sw $s0, 0x10($sp) /* BD3DE4 80240574 8E30000C */ lw $s0, 0xc($s1) /* BD3DE8 80240578 8E050000 */ lw $a1, ($s0) -/* BD3DEC 8024057C 0C0B210B */ jal get_float_variable +/* BD3DEC 8024057C 0C0B210B */ jal evt_get_float_variable /* BD3DF0 80240580 26100004 */ addiu $s0, $s0, 4 /* BD3DF4 80240584 8E050000 */ lw $a1, ($s0) /* BD3DF8 80240588 26100004 */ addiu $s0, $s0, 4 /* BD3DFC 8024058C 4600008D */ trunc.w.s $f2, $f0 /* BD3E00 80240590 44121000 */ mfc1 $s2, $f2 -/* BD3E04 80240594 0C0B210B */ jal get_float_variable +/* BD3E04 80240594 0C0B210B */ jal evt_get_float_variable /* BD3E08 80240598 0220202D */ daddu $a0, $s1, $zero /* BD3E0C 8024059C 0220202D */ daddu $a0, $s1, $zero /* BD3E10 802405A0 8E050000 */ lw $a1, ($s0) /* BD3E14 802405A4 4600008D */ trunc.w.s $f2, $f0 /* BD3E18 802405A8 44111000 */ mfc1 $s1, $f2 -/* BD3E1C 802405AC 0C0B210B */ jal get_float_variable +/* BD3E1C 802405AC 0C0B210B */ jal evt_get_float_variable /* BD3E20 802405B0 00000000 */ nop /* BD3E24 802405B4 0000202D */ daddu $a0, $zero, $zero /* BD3E28 802405B8 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s index 3677929ea8..8aa34a3976 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024061C_BD3E8C.s @@ -10,19 +10,19 @@ glabel func_8024061C_BD3E8C /* BD3EA0 80240630 AFB00010 */ sw $s0, 0x10($sp) /* BD3EA4 80240634 8E30000C */ lw $s0, 0xc($s1) /* BD3EA8 80240638 8E050000 */ lw $a1, ($s0) -/* BD3EAC 8024063C 0C0B210B */ jal get_float_variable +/* BD3EAC 8024063C 0C0B210B */ jal evt_get_float_variable /* BD3EB0 80240640 26100004 */ addiu $s0, $s0, 4 /* BD3EB4 80240644 8E050000 */ lw $a1, ($s0) /* BD3EB8 80240648 26100004 */ addiu $s0, $s0, 4 /* BD3EBC 8024064C 4600008D */ trunc.w.s $f2, $f0 /* BD3EC0 80240650 44121000 */ mfc1 $s2, $f2 -/* BD3EC4 80240654 0C0B210B */ jal get_float_variable +/* BD3EC4 80240654 0C0B210B */ jal evt_get_float_variable /* BD3EC8 80240658 0220202D */ daddu $a0, $s1, $zero /* BD3ECC 8024065C 0220202D */ daddu $a0, $s1, $zero /* BD3ED0 80240660 8E050000 */ lw $a1, ($s0) /* BD3ED4 80240664 4600008D */ trunc.w.s $f2, $f0 /* BD3ED8 80240668 44111000 */ mfc1 $s1, $f2 -/* BD3EDC 8024066C 0C0B210B */ jal get_float_variable +/* BD3EDC 8024066C 0C0B210B */ jal evt_get_float_variable /* BD3EE0 80240670 00000000 */ nop /* BD3EE4 80240674 0000202D */ daddu $a0, $zero, $zero /* BD3EE8 80240678 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s index 1343975cee..10b728187c 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802406DC_BD3F4C.s @@ -10,19 +10,19 @@ glabel func_802406DC_BD3F4C /* BD3F60 802406F0 AFB00010 */ sw $s0, 0x10($sp) /* BD3F64 802406F4 8E30000C */ lw $s0, 0xc($s1) /* BD3F68 802406F8 8E050000 */ lw $a1, ($s0) -/* BD3F6C 802406FC 0C0B210B */ jal get_float_variable +/* BD3F6C 802406FC 0C0B210B */ jal evt_get_float_variable /* BD3F70 80240700 26100004 */ addiu $s0, $s0, 4 /* BD3F74 80240704 8E050000 */ lw $a1, ($s0) /* BD3F78 80240708 26100004 */ addiu $s0, $s0, 4 /* BD3F7C 8024070C 4600008D */ trunc.w.s $f2, $f0 /* BD3F80 80240710 44121000 */ mfc1 $s2, $f2 -/* BD3F84 80240714 0C0B210B */ jal get_float_variable +/* BD3F84 80240714 0C0B210B */ jal evt_get_float_variable /* BD3F88 80240718 0220202D */ daddu $a0, $s1, $zero /* BD3F8C 8024071C 0220202D */ daddu $a0, $s1, $zero /* BD3F90 80240720 8E050000 */ lw $a1, ($s0) /* BD3F94 80240724 4600008D */ trunc.w.s $f2, $f0 /* BD3F98 80240728 44111000 */ mfc1 $s1, $f2 -/* BD3F9C 8024072C 0C0B210B */ jal get_float_variable +/* BD3F9C 8024072C 0C0B210B */ jal evt_get_float_variable /* BD3FA0 80240730 00000000 */ nop /* BD3FA4 80240734 0000202D */ daddu $a0, $zero, $zero /* BD3FA8 80240738 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s index 7ddfbde5c2..5ebe102471 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s @@ -86,7 +86,7 @@ glabel L80240B9C_BD440C /* BD4478 80240C08 0220202D */ daddu $a0, $s1, $zero /* BD447C 80240C0C 3C05FD05 */ lui $a1, 0xfd05 /* BD4480 80240C10 34A50F81 */ ori $a1, $a1, 0xf81 -/* BD4484 80240C14 0C0B2026 */ jal set_variable +/* BD4484 80240C14 0C0B2026 */ jal evt_set_variable /* BD4488 80240C18 24060001 */ addiu $a2, $zero, 1 /* BD448C 80240C1C 0C09029F */ jal func_80240A7C_BD42EC /* BD4490 80240C20 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s index 6eff1a2993..a2e2a94b61 100644 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s +++ b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241300_BD4B70.s @@ -42,7 +42,7 @@ glabel func_80241300_BD4B70 /* BD4C04 80241394 34A50F83 */ ori $a1, $a1, 0xf83 /* BD4C08 80241398 0000302D */ daddu $a2, $zero, $zero /* BD4C0C 8024139C AE400088 */ sw $zero, 0x88($s2) -/* BD4C10 802413A0 0C0B2026 */ jal set_variable +/* BD4C10 802413A0 0C0B2026 */ jal evt_set_variable /* BD4C14 802413A4 AFA20010 */ sw $v0, 0x10($sp) /* BD4C18 802413A8 8E430084 */ lw $v1, 0x84($s2) /* BD4C1C 802413AC C602000C */ lwc1 $f2, 0xc($s0) @@ -209,7 +209,7 @@ glabel func_80241300_BD4B70 /* BD4E80 80241610 0240202D */ daddu $a0, $s2, $zero /* BD4E84 80241614 3C05FD05 */ lui $a1, 0xfd05 /* BD4E88 80241618 34A50F83 */ ori $a1, $a1, 0xf83 -/* BD4E8C 8024161C 0C0B2026 */ jal set_variable +/* BD4E8C 8024161C 0C0B2026 */ jal evt_set_variable /* BD4E90 80241620 0220302D */ daddu $a2, $s1, $zero /* BD4E94 80241624 8FBF003C */ lw $ra, 0x3c($sp) /* BD4E98 80241628 8FBE0038 */ lw $fp, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s index e104eb0aad..054ee57ac0 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s @@ -280,7 +280,7 @@ glabel func_802423E0_D9F8B0 /* D9FC98 802427C8 AE220000 */ sw $v0, ($s1) /* D9FC9C 802427CC AC800070 */ sw $zero, 0x70($a0) .L802427D0: -/* D9FCA0 802427D0 0C0B2026 */ jal set_variable +/* D9FCA0 802427D0 0C0B2026 */ jal evt_set_variable /* D9FCA4 802427D4 00000000 */ nop /* D9FCA8 802427D8 08090A04 */ j .L80242810 /* D9FCAC 802427DC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024003C_DA527C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024003C_DA527C.s index 77d423aa37..e404b04216 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024003C_DA527C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024003C_DA527C.s @@ -15,21 +15,21 @@ glabel func_8024003C_DA527C /* DA52A4 80240064 8E120000 */ lw $s2, ($s0) /* DA52A8 80240068 26100004 */ addiu $s0, $s0, 4 /* DA52AC 8024006C 8E050000 */ lw $a1, ($s0) -/* DA52B0 80240070 0C0B210B */ jal get_float_variable +/* DA52B0 80240070 0C0B210B */ jal evt_get_float_variable /* DA52B4 80240074 26100004 */ addiu $s0, $s0, 4 /* DA52B8 80240078 8E050000 */ lw $a1, ($s0) /* DA52BC 8024007C 26100004 */ addiu $s0, $s0, 4 /* DA52C0 80240080 0220202D */ daddu $a0, $s1, $zero -/* DA52C4 80240084 0C0B210B */ jal get_float_variable +/* DA52C4 80240084 0C0B210B */ jal evt_get_float_variable /* DA52C8 80240088 46000606 */ mov.s $f24, $f0 /* DA52CC 8024008C 8E050000 */ lw $a1, ($s0) /* DA52D0 80240090 26100004 */ addiu $s0, $s0, 4 /* DA52D4 80240094 0220202D */ daddu $a0, $s1, $zero -/* DA52D8 80240098 0C0B210B */ jal get_float_variable +/* DA52D8 80240098 0C0B210B */ jal evt_get_float_variable /* DA52DC 8024009C 46000586 */ mov.s $f22, $f0 /* DA52E0 802400A0 0220202D */ daddu $a0, $s1, $zero /* DA52E4 802400A4 8E050000 */ lw $a1, ($s0) -/* DA52E8 802400A8 0C0B210B */ jal get_float_variable +/* DA52E8 802400A8 0C0B210B */ jal evt_get_float_variable /* DA52EC 802400AC 46000506 */ mov.s $f20, $f0 /* DA52F0 802400B0 4600C306 */ mov.s $f12, $f24 /* DA52F4 802400B4 4406A000 */ mfc1 $a2, $f20 @@ -40,7 +40,7 @@ glabel func_8024003C_DA527C /* DA5308 802400C8 46000306 */ mov.s $f12, $f0 /* DA530C 802400CC 0220202D */ daddu $a0, $s1, $zero /* DA5310 802400D0 44060000 */ mfc1 $a2, $f0 -/* DA5314 802400D4 0C0B2190 */ jal set_float_variable +/* DA5314 802400D4 0C0B2190 */ jal evt_set_float_variable /* DA5318 802400D8 0240282D */ daddu $a1, $s2, $zero /* DA531C 802400DC 8FBF001C */ lw $ra, 0x1c($sp) /* DA5320 802400E0 8FB20018 */ lw $s2, 0x18($sp) 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 index 86c5dc71e6..65568e0bcd 100644 --- 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 @@ -10,12 +10,12 @@ glabel func_80240104_DA5344 /* DA5358 80240118 F7B40020 */ sdc1 $f20, 0x20($sp) /* DA535C 8024011C 8E30000C */ lw $s0, 0xc($s1) /* DA5360 80240120 8E050000 */ lw $a1, ($s0) -/* DA5364 80240124 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 @@ -28,7 +28,7 @@ glabel func_80240104_DA5344 /* DA539C 8024015C 8E050000 */ lw $a1, ($s0) /* DA53A0 80240160 0000302D */ daddu $a2, $zero, $zero .L80240164: -/* DA53A4 80240164 0C0B2026 */ jal set_variable +/* 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) 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 index 29bc2cdcd8..547427beaa 100644 --- 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 @@ -12,21 +12,21 @@ glabel func_8024020C_DA544C /* DA5468 80240228 F7B40020 */ sdc1 $f20, 0x20($sp) /* DA546C 8024022C 8E30000C */ lw $s0, 0xc($s1) /* DA5470 80240230 8E050000 */ lw $a1, ($s0) -/* DA5474 80240234 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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) 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 index 9181dc6b8a..1b592259b5 100644 --- 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 @@ -19,21 +19,21 @@ glabel func_802402B0_DA54F0 /* DA5528 802402E8 8E050000 */ lw $a1, ($s0) /* DA552C 802402EC 26100004 */ addiu $s0, $s0, 4 /* DA5530 802402F0 0220202D */ daddu $a0, $s1, $zero -/* DA5534 802402F4 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s index 7d9ae9dcd6..0707ec7ea1 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s @@ -19,7 +19,7 @@ glabel func_80242178_DB4438 .L802421AC: /* DB446C 802421AC 8CC50000 */ lw $a1, ($a2) /* DB4470 802421B0 3C068024 */ lui $a2, %hi(D_8024309C_DB535C) -/* DB4474 802421B4 0C0B2026 */ jal set_variable +/* DB4474 802421B4 0C0B2026 */ jal evt_set_variable /* DB4478 802421B8 8CC6309C */ lw $a2, %lo(D_8024309C_DB535C)($a2) /* DB447C 802421BC 24020002 */ addiu $v0, $zero, 2 .L802421C0: diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024001C_DB792C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024001C_DB792C.s index 97f8e37d2f..155d214708 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024001C_DB792C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_8024001C_DB792C.s @@ -15,21 +15,21 @@ glabel func_8024001C_DB792C /* DB7954 80240044 8E120000 */ lw $s2, ($s0) /* DB7958 80240048 26100004 */ addiu $s0, $s0, 4 /* DB795C 8024004C 8E050000 */ lw $a1, ($s0) -/* DB7960 80240050 0C0B210B */ jal get_float_variable +/* DB7960 80240050 0C0B210B */ jal evt_get_float_variable /* DB7964 80240054 26100004 */ addiu $s0, $s0, 4 /* DB7968 80240058 8E050000 */ lw $a1, ($s0) /* DB796C 8024005C 26100004 */ addiu $s0, $s0, 4 /* DB7970 80240060 0220202D */ daddu $a0, $s1, $zero -/* DB7974 80240064 0C0B210B */ jal get_float_variable +/* DB7974 80240064 0C0B210B */ jal evt_get_float_variable /* DB7978 80240068 46000606 */ mov.s $f24, $f0 /* DB797C 8024006C 8E050000 */ lw $a1, ($s0) /* DB7980 80240070 26100004 */ addiu $s0, $s0, 4 /* DB7984 80240074 0220202D */ daddu $a0, $s1, $zero -/* DB7988 80240078 0C0B210B */ jal get_float_variable +/* DB7988 80240078 0C0B210B */ jal evt_get_float_variable /* DB798C 8024007C 46000586 */ mov.s $f22, $f0 /* DB7990 80240080 0220202D */ daddu $a0, $s1, $zero /* DB7994 80240084 8E050000 */ lw $a1, ($s0) -/* DB7998 80240088 0C0B210B */ jal get_float_variable +/* DB7998 80240088 0C0B210B */ jal evt_get_float_variable /* DB799C 8024008C 46000506 */ mov.s $f20, $f0 /* DB79A0 80240090 4600C306 */ mov.s $f12, $f24 /* DB79A4 80240094 4406A000 */ mfc1 $a2, $f20 @@ -40,7 +40,7 @@ glabel func_8024001C_DB792C /* DB79B8 802400A8 46000306 */ mov.s $f12, $f0 /* DB79BC 802400AC 0220202D */ daddu $a0, $s1, $zero /* DB79C0 802400B0 44060000 */ mfc1 $a2, $f0 -/* DB79C4 802400B4 0C0B2190 */ jal set_float_variable +/* DB79C4 802400B4 0C0B2190 */ jal evt_set_float_variable /* DB79C8 802400B8 0240282D */ daddu $a1, $s2, $zero /* DB79CC 802400BC 8FBF001C */ lw $ra, 0x1c($sp) /* DB79D0 802400C0 8FB20018 */ lw $s2, 0x18($sp) 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 index f546ce1d7c..ec1d422520 100644 --- 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 @@ -10,12 +10,12 @@ glabel func_802400E4_DB79F4 /* DB7A08 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) /* DB7A0C 802400FC 8E30000C */ lw $s0, 0xc($s1) /* DB7A10 80240100 8E050000 */ lw $a1, ($s0) -/* DB7A14 80240104 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 @@ -28,7 +28,7 @@ glabel func_802400E4_DB79F4 /* DB7A4C 8024013C 8E050000 */ lw $a1, ($s0) /* DB7A50 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: -/* DB7A54 80240144 0C0B2026 */ jal set_variable +/* 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) 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 index 1327a70101..f8ce0d8b47 100644 --- 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 @@ -12,21 +12,21 @@ glabel func_802401EC_DB7AFC /* DB7B18 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) /* DB7B1C 8024020C 8E30000C */ lw $s0, 0xc($s1) /* DB7B20 80240210 8E050000 */ lw $a1, ($s0) -/* DB7B24 80240214 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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) 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 index 6441b2079c..6c0edf31ce 100644 --- 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 @@ -19,21 +19,21 @@ glabel func_80240290_DB7BA0 /* DB7BD8 802402C8 8E050000 */ lw $a1, ($s0) /* DB7BDC 802402CC 26100004 */ addiu $s0, $s0, 4 /* DB7BE0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DB7BE4 802402D4 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s index 3d5a8f6b0a..c1ea17af38 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242EA8_DC0158.s @@ -20,7 +20,7 @@ glabel func_80242EA8_DC0158 /* DC0194 80242EE4 0240202D */ daddu $a0, $s2, $zero /* DC0198 80242EE8 0240202D */ daddu $a0, $s2, $zero /* DC019C 80242EEC 0220282D */ daddu $a1, $s1, $zero -/* DC01A0 80242EF0 0C0B2026 */ jal set_variable +/* DC01A0 80242EF0 0C0B2026 */ jal evt_set_variable /* DC01A4 80242EF4 0040302D */ daddu $a2, $v0, $zero /* DC01A8 80242EF8 8FBF001C */ lw $ra, 0x1c($sp) /* DC01AC 80242EFC 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024001C_DC43EC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024001C_DC43EC.s index 5e2e3eabff..b826f9a9a7 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024001C_DC43EC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_8024001C_DC43EC.s @@ -15,21 +15,21 @@ glabel func_8024001C_DC43EC /* DC4414 80240044 8E120000 */ lw $s2, ($s0) /* DC4418 80240048 26100004 */ addiu $s0, $s0, 4 /* DC441C 8024004C 8E050000 */ lw $a1, ($s0) -/* DC4420 80240050 0C0B210B */ jal get_float_variable +/* DC4420 80240050 0C0B210B */ jal evt_get_float_variable /* DC4424 80240054 26100004 */ addiu $s0, $s0, 4 /* DC4428 80240058 8E050000 */ lw $a1, ($s0) /* DC442C 8024005C 26100004 */ addiu $s0, $s0, 4 /* DC4430 80240060 0220202D */ daddu $a0, $s1, $zero -/* DC4434 80240064 0C0B210B */ jal get_float_variable +/* DC4434 80240064 0C0B210B */ jal evt_get_float_variable /* DC4438 80240068 46000606 */ mov.s $f24, $f0 /* DC443C 8024006C 8E050000 */ lw $a1, ($s0) /* DC4440 80240070 26100004 */ addiu $s0, $s0, 4 /* DC4444 80240074 0220202D */ daddu $a0, $s1, $zero -/* DC4448 80240078 0C0B210B */ jal get_float_variable +/* DC4448 80240078 0C0B210B */ jal evt_get_float_variable /* DC444C 8024007C 46000586 */ mov.s $f22, $f0 /* DC4450 80240080 0220202D */ daddu $a0, $s1, $zero /* DC4454 80240084 8E050000 */ lw $a1, ($s0) -/* DC4458 80240088 0C0B210B */ jal get_float_variable +/* DC4458 80240088 0C0B210B */ jal evt_get_float_variable /* DC445C 8024008C 46000506 */ mov.s $f20, $f0 /* DC4460 80240090 4600C306 */ mov.s $f12, $f24 /* DC4464 80240094 4406A000 */ mfc1 $a2, $f20 @@ -40,7 +40,7 @@ glabel func_8024001C_DC43EC /* DC4478 802400A8 46000306 */ mov.s $f12, $f0 /* DC447C 802400AC 0220202D */ daddu $a0, $s1, $zero /* DC4480 802400B0 44060000 */ mfc1 $a2, $f0 -/* DC4484 802400B4 0C0B2190 */ jal set_float_variable +/* DC4484 802400B4 0C0B2190 */ jal evt_set_float_variable /* DC4488 802400B8 0240282D */ daddu $a1, $s2, $zero /* DC448C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) /* DC4490 802400C0 8FB20018 */ lw $s2, 0x18($sp) 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 index f948fc77d0..846c12120b 100644 --- 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 @@ -10,12 +10,12 @@ glabel func_802400E4_DC44B4 /* DC44C8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) /* DC44CC 802400FC 8E30000C */ lw $s0, 0xc($s1) /* DC44D0 80240100 8E050000 */ lw $a1, ($s0) -/* DC44D4 80240104 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 @@ -28,7 +28,7 @@ glabel func_802400E4_DC44B4 /* DC450C 8024013C 8E050000 */ lw $a1, ($s0) /* DC4510 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: -/* DC4514 80240144 0C0B2026 */ jal set_variable +/* 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) 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 index 7f70f3faf7..46af586908 100644 --- 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 @@ -12,21 +12,21 @@ glabel func_802401EC_DC45BC /* DC45D8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) /* DC45DC 8024020C 8E30000C */ lw $s0, 0xc($s1) /* DC45E0 80240210 8E050000 */ lw $a1, ($s0) -/* DC45E4 80240214 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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) 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 index 82722b05b1..055377192e 100644 --- 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 @@ -19,21 +19,21 @@ glabel func_80240290_DC4660 /* DC4698 802402C8 8E050000 */ lw $a1, ($s0) /* DC469C 802402CC 26100004 */ addiu $s0, $s0, 4 /* DC46A0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DC46A4 802402D4 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s index 615b7ff8fb..eccfc335bd 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s @@ -280,7 +280,7 @@ glabel func_80242DF0_DCFAC0 /* DCFEA8 802431D8 AE220000 */ sw $v0, ($s1) /* DCFEAC 802431DC AC800070 */ sw $zero, 0x70($a0) .L802431E0: -/* DCFEB0 802431E0 0C0B2026 */ jal set_variable +/* DCFEB0 802431E0 0C0B2026 */ jal evt_set_variable /* DCFEB4 802431E4 00000000 */ nop /* DCFEB8 802431E8 08090C88 */ j .L80243220 /* DCFEBC 802431EC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024001C_DD79CC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024001C_DD79CC.s index eb28898969..f94ade5d28 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024001C_DD79CC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_8024001C_DD79CC.s @@ -15,21 +15,21 @@ glabel func_8024001C_DD79CC /* DD79F4 80240044 8E120000 */ lw $s2, ($s0) /* DD79F8 80240048 26100004 */ addiu $s0, $s0, 4 /* DD79FC 8024004C 8E050000 */ lw $a1, ($s0) -/* DD7A00 80240050 0C0B210B */ jal get_float_variable +/* DD7A00 80240050 0C0B210B */ jal evt_get_float_variable /* DD7A04 80240054 26100004 */ addiu $s0, $s0, 4 /* DD7A08 80240058 8E050000 */ lw $a1, ($s0) /* DD7A0C 8024005C 26100004 */ addiu $s0, $s0, 4 /* DD7A10 80240060 0220202D */ daddu $a0, $s1, $zero -/* DD7A14 80240064 0C0B210B */ jal get_float_variable +/* DD7A14 80240064 0C0B210B */ jal evt_get_float_variable /* DD7A18 80240068 46000606 */ mov.s $f24, $f0 /* DD7A1C 8024006C 8E050000 */ lw $a1, ($s0) /* DD7A20 80240070 26100004 */ addiu $s0, $s0, 4 /* DD7A24 80240074 0220202D */ daddu $a0, $s1, $zero -/* DD7A28 80240078 0C0B210B */ jal get_float_variable +/* DD7A28 80240078 0C0B210B */ jal evt_get_float_variable /* DD7A2C 8024007C 46000586 */ mov.s $f22, $f0 /* DD7A30 80240080 0220202D */ daddu $a0, $s1, $zero /* DD7A34 80240084 8E050000 */ lw $a1, ($s0) -/* DD7A38 80240088 0C0B210B */ jal get_float_variable +/* DD7A38 80240088 0C0B210B */ jal evt_get_float_variable /* DD7A3C 8024008C 46000506 */ mov.s $f20, $f0 /* DD7A40 80240090 4600C306 */ mov.s $f12, $f24 /* DD7A44 80240094 4406A000 */ mfc1 $a2, $f20 @@ -40,7 +40,7 @@ glabel func_8024001C_DD79CC /* DD7A58 802400A8 46000306 */ mov.s $f12, $f0 /* DD7A5C 802400AC 0220202D */ daddu $a0, $s1, $zero /* DD7A60 802400B0 44060000 */ mfc1 $a2, $f0 -/* DD7A64 802400B4 0C0B2190 */ jal set_float_variable +/* DD7A64 802400B4 0C0B2190 */ jal evt_set_float_variable /* DD7A68 802400B8 0240282D */ daddu $a1, $s2, $zero /* DD7A6C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) /* DD7A70 802400C0 8FB20018 */ lw $s2, 0x18($sp) 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 index e162b8e381..75e48f1ae6 100644 --- 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 @@ -10,12 +10,12 @@ glabel func_802400E4_DD7A94 /* DD7AA8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) /* DD7AAC 802400FC 8E30000C */ lw $s0, 0xc($s1) /* DD7AB0 80240100 8E050000 */ lw $a1, ($s0) -/* DD7AB4 80240104 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 @@ -28,7 +28,7 @@ glabel func_802400E4_DD7A94 /* DD7AEC 8024013C 8E050000 */ lw $a1, ($s0) /* DD7AF0 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: -/* DD7AF4 80240144 0C0B2026 */ jal set_variable +/* 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) 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 index 2359a68412..6149377160 100644 --- 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 @@ -12,21 +12,21 @@ glabel func_802401EC_DD7B9C /* DD7BB8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) /* DD7BBC 8024020C 8E30000C */ lw $s0, 0xc($s1) /* DD7BC0 80240210 8E050000 */ lw $a1, ($s0) -/* DD7BC4 80240214 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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) 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 index 3e5d0d0803..9aa0364cb8 100644 --- 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 @@ -19,21 +19,21 @@ glabel func_80240290_DD7C40 /* DD7C78 802402C8 8E050000 */ lw $a1, ($s0) /* DD7C7C 802402CC 26100004 */ addiu $s0, $s0, 4 /* DD7C80 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DD7C84 802402D4 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s index a726a1edeb..853fc595df 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s @@ -19,7 +19,7 @@ glabel func_80240F00_DE3390 .L80240F34: /* DE33C4 80240F34 8CC50000 */ lw $a1, ($a2) /* DE33C8 80240F38 3C068024 */ lui $a2, %hi(D_80241C08_DE4098) -/* DE33CC 80240F3C 0C0B2026 */ jal set_variable +/* DE33CC 80240F3C 0C0B2026 */ jal evt_set_variable /* DE33D0 80240F40 8CC61C08 */ lw $a2, %lo(D_80241C08_DE4098)($a2) /* DE33D4 80240F44 24020002 */ addiu $v0, $zero, 2 .L80240F48: diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s index 2cc033ad39..e4782f40bc 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_802403FC_DE5AAC.s @@ -17,11 +17,11 @@ glabel func_802403FC_DE5AAC /* DE5ADC 8024042C 8E050000 */ lw $a1, ($s0) /* DE5AE0 80240430 26100004 */ addiu $s0, $s0, 4 /* DE5AE4 80240434 0220202D */ daddu $a0, $s1, $zero -/* DE5AE8 80240438 0C0B210B */ jal get_float_variable +/* DE5AE8 80240438 0C0B210B */ jal evt_get_float_variable /* DE5AEC 8024043C 0040902D */ daddu $s2, $v0, $zero /* DE5AF0 80240440 0220202D */ daddu $a0, $s1, $zero /* DE5AF4 80240444 8E050000 */ lw $a1, ($s0) -/* DE5AF8 80240448 0C0B210B */ jal get_float_variable +/* DE5AF8 80240448 0C0B210B */ jal evt_get_float_variable /* DE5AFC 8024044C 46000586 */ mov.s $f22, $f0 /* DE5B00 80240450 46000506 */ mov.s $f20, $f0 /* DE5B04 80240454 C64C0038 */ lwc1 $f12, 0x38($s2) diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_8024004C_DE87BC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_8024004C_DE87BC.s index 6dad69b610..a6bc9dc8bf 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_8024004C_DE87BC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_8024004C_DE87BC.s @@ -17,7 +17,7 @@ glabel func_8024004C_DE87BC /* DE87EC 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 /* DE87F0 80240080 0040802D */ daddu $s0, $v0, $zero /* DE87F4 80240084 0200302D */ daddu $a2, $s0, $zero -/* DE87F8 80240088 0C0B2026 */ jal set_variable +/* DE87F8 80240088 0C0B2026 */ jal evt_set_variable /* DE87FC 8024008C AE500084 */ sw $s0, 0x84($s2) /* DE8800 80240090 8E250000 */ lw $a1, ($s1) /* DE8804 80240094 26310004 */ addiu $s1, $s1, 4 @@ -31,41 +31,41 @@ glabel func_8024004C_DE87BC /* DE8824 802400B4 AE02003C */ sw $v0, 0x3c($s0) /* DE8828 802400B8 8E250000 */ lw $a1, ($s1) /* DE882C 802400BC 26310004 */ addiu $s1, $s1, 4 -/* DE8830 802400C0 0C0B210B */ jal get_float_variable +/* DE8830 802400C0 0C0B210B */ jal evt_get_float_variable /* DE8834 802400C4 0240202D */ daddu $a0, $s2, $zero /* DE8838 802400C8 E600000C */ swc1 $f0, 0xc($s0) /* DE883C 802400CC 8E250000 */ lw $a1, ($s1) /* DE8840 802400D0 26310004 */ addiu $s1, $s1, 4 -/* DE8844 802400D4 0C0B210B */ jal get_float_variable +/* DE8844 802400D4 0C0B210B */ jal evt_get_float_variable /* DE8848 802400D8 0240202D */ daddu $a0, $s2, $zero /* DE884C 802400DC E6000010 */ swc1 $f0, 0x10($s0) /* DE8850 802400E0 8E250000 */ lw $a1, ($s1) /* DE8854 802400E4 26310004 */ addiu $s1, $s1, 4 -/* DE8858 802400E8 0C0B210B */ jal get_float_variable +/* DE8858 802400E8 0C0B210B */ jal evt_get_float_variable /* DE885C 802400EC 0240202D */ daddu $a0, $s2, $zero /* DE8860 802400F0 E6000014 */ swc1 $f0, 0x14($s0) /* DE8864 802400F4 8E250000 */ lw $a1, ($s1) /* DE8868 802400F8 26310004 */ addiu $s1, $s1, 4 -/* DE886C 802400FC 0C0B210B */ jal get_float_variable +/* DE886C 802400FC 0C0B210B */ jal evt_get_float_variable /* DE8870 80240100 0240202D */ daddu $a0, $s2, $zero /* DE8874 80240104 E6000018 */ swc1 $f0, 0x18($s0) /* DE8878 80240108 8E250000 */ lw $a1, ($s1) /* DE887C 8024010C 26310004 */ addiu $s1, $s1, 4 -/* DE8880 80240110 0C0B210B */ jal get_float_variable +/* DE8880 80240110 0C0B210B */ jal evt_get_float_variable /* DE8884 80240114 0240202D */ daddu $a0, $s2, $zero /* DE8888 80240118 E600001C */ swc1 $f0, 0x1c($s0) /* DE888C 8024011C 8E250000 */ lw $a1, ($s1) /* DE8890 80240120 26310004 */ addiu $s1, $s1, 4 -/* DE8894 80240124 0C0B210B */ jal get_float_variable +/* DE8894 80240124 0C0B210B */ jal evt_get_float_variable /* DE8898 80240128 0240202D */ daddu $a0, $s2, $zero /* DE889C 8024012C E6000020 */ swc1 $f0, 0x20($s0) /* DE88A0 80240130 8E250000 */ lw $a1, ($s1) /* DE88A4 80240134 26310004 */ addiu $s1, $s1, 4 -/* DE88A8 80240138 0C0B210B */ jal get_float_variable +/* DE88A8 80240138 0C0B210B */ jal evt_get_float_variable /* DE88AC 8024013C 0240202D */ daddu $a0, $s2, $zero /* DE88B0 80240140 E6000024 */ swc1 $f0, 0x24($s0) /* DE88B4 80240144 8E250000 */ lw $a1, ($s1) -/* DE88B8 80240148 0C0B210B */ jal get_float_variable +/* DE88B8 80240148 0C0B210B */ jal evt_get_float_variable /* DE88BC 8024014C 0240202D */ daddu $a0, $s2, $zero /* DE88C0 80240150 3C013F80 */ lui $at, 0x3f80 /* DE88C4 80240154 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405FC_DE8D6C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405FC_DE8D6C.s index 1b78fc57c6..d5ad1df21b 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405FC_DE8D6C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802405FC_DE8D6C.s @@ -21,21 +21,21 @@ glabel func_802405FC_DE8D6C /* DE8DAC 8024063C AE020038 */ sw $v0, 0x38($s0) /* DE8DB0 80240640 8E250000 */ lw $a1, ($s1) /* DE8DB4 80240644 26310004 */ addiu $s1, $s1, 4 -/* DE8DB8 80240648 0C0B210B */ jal get_float_variable +/* DE8DB8 80240648 0C0B210B */ jal evt_get_float_variable /* DE8DBC 8024064C 0240202D */ daddu $a0, $s2, $zero /* DE8DC0 80240650 E6000018 */ swc1 $f0, 0x18($s0) /* DE8DC4 80240654 8E250000 */ lw $a1, ($s1) /* DE8DC8 80240658 26310004 */ addiu $s1, $s1, 4 -/* DE8DCC 8024065C 0C0B210B */ jal get_float_variable +/* DE8DCC 8024065C 0C0B210B */ jal evt_get_float_variable /* DE8DD0 80240660 0240202D */ daddu $a0, $s2, $zero /* DE8DD4 80240664 E6000024 */ swc1 $f0, 0x24($s0) /* DE8DD8 80240668 8E250000 */ lw $a1, ($s1) /* DE8DDC 8024066C 26310004 */ addiu $s1, $s1, 4 -/* DE8DE0 80240670 0C0B210B */ jal get_float_variable +/* DE8DE0 80240670 0C0B210B */ jal evt_get_float_variable /* DE8DE4 80240674 0240202D */ daddu $a0, $s2, $zero /* DE8DE8 80240678 E6000020 */ swc1 $f0, 0x20($s0) /* DE8DEC 8024067C 8E250000 */ lw $a1, ($s1) -/* DE8DF0 80240680 0C0B210B */ jal get_float_variable +/* DE8DF0 80240680 0C0B210B */ jal evt_get_float_variable /* DE8DF4 80240684 0240202D */ daddu $a0, $s2, $zero /* DE8DF8 80240688 3C013F80 */ lui $at, 0x3f80 /* DE8DFC 8024068C 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024001C_DEBEEC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024001C_DEBEEC.s index 162e98e558..194c5c26e2 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024001C_DEBEEC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024001C_DEBEEC.s @@ -15,21 +15,21 @@ glabel func_8024001C_DEBEEC /* DEBF14 80240044 8E120000 */ lw $s2, ($s0) /* DEBF18 80240048 26100004 */ addiu $s0, $s0, 4 /* DEBF1C 8024004C 8E050000 */ lw $a1, ($s0) -/* DEBF20 80240050 0C0B210B */ jal get_float_variable +/* DEBF20 80240050 0C0B210B */ jal evt_get_float_variable /* DEBF24 80240054 26100004 */ addiu $s0, $s0, 4 /* DEBF28 80240058 8E050000 */ lw $a1, ($s0) /* DEBF2C 8024005C 26100004 */ addiu $s0, $s0, 4 /* DEBF30 80240060 0220202D */ daddu $a0, $s1, $zero -/* DEBF34 80240064 0C0B210B */ jal get_float_variable +/* DEBF34 80240064 0C0B210B */ jal evt_get_float_variable /* DEBF38 80240068 46000606 */ mov.s $f24, $f0 /* DEBF3C 8024006C 8E050000 */ lw $a1, ($s0) /* DEBF40 80240070 26100004 */ addiu $s0, $s0, 4 /* DEBF44 80240074 0220202D */ daddu $a0, $s1, $zero -/* DEBF48 80240078 0C0B210B */ jal get_float_variable +/* DEBF48 80240078 0C0B210B */ jal evt_get_float_variable /* DEBF4C 8024007C 46000586 */ mov.s $f22, $f0 /* DEBF50 80240080 0220202D */ daddu $a0, $s1, $zero /* DEBF54 80240084 8E050000 */ lw $a1, ($s0) -/* DEBF58 80240088 0C0B210B */ jal get_float_variable +/* DEBF58 80240088 0C0B210B */ jal evt_get_float_variable /* DEBF5C 8024008C 46000506 */ mov.s $f20, $f0 /* DEBF60 80240090 4600C306 */ mov.s $f12, $f24 /* DEBF64 80240094 4406A000 */ mfc1 $a2, $f20 @@ -40,7 +40,7 @@ glabel func_8024001C_DEBEEC /* DEBF78 802400A8 46000306 */ mov.s $f12, $f0 /* DEBF7C 802400AC 0220202D */ daddu $a0, $s1, $zero /* DEBF80 802400B0 44060000 */ mfc1 $a2, $f0 -/* DEBF84 802400B4 0C0B2190 */ jal set_float_variable +/* DEBF84 802400B4 0C0B2190 */ jal evt_set_float_variable /* DEBF88 802400B8 0240282D */ daddu $a1, $s2, $zero /* DEBF8C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) /* DEBF90 802400C0 8FB20018 */ lw $s2, 0x18($sp) 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 index 07d300e951..1df02a657c 100644 --- 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 @@ -10,12 +10,12 @@ glabel func_802400E4_DEBFB4 /* DEBFC8 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) /* DEBFCC 802400FC 8E30000C */ lw $s0, 0xc($s1) /* DEBFD0 80240100 8E050000 */ lw $a1, ($s0) -/* DEBFD4 80240104 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 @@ -28,7 +28,7 @@ glabel func_802400E4_DEBFB4 /* DEC00C 8024013C 8E050000 */ lw $a1, ($s0) /* DEC010 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: -/* DEC014 80240144 0C0B2026 */ jal set_variable +/* 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) 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 index 4c2a9ec315..9aa6300f42 100644 --- 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 @@ -12,21 +12,21 @@ glabel func_802401EC_DEC0BC /* DEC0D8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) /* DEC0DC 8024020C 8E30000C */ lw $s0, 0xc($s1) /* DEC0E0 80240210 8E050000 */ lw $a1, ($s0) -/* DEC0E4 80240214 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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) 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 index f29f06eddd..407e1d6219 100644 --- 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 @@ -19,21 +19,21 @@ glabel func_80240290_DEC160 /* DEC198 802402C8 8E050000 */ lw $a1, ($s0) /* DEC19C 802402CC 26100004 */ addiu $s0, $s0, 4 /* DEC1A0 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DEC1A4 802402D4 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s index 7b0e5d0fc6..7aeff3b327 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_8024055C_DEC42C.s @@ -7,7 +7,7 @@ glabel func_8024055C_DEC42C /* DEC434 80240564 0080802D */ daddu $s0, $a0, $zero /* DEC438 80240568 3C05FD05 */ lui $a1, 0xfd05 /* DEC43C 8024056C AFBF0014 */ sw $ra, 0x14($sp) -/* DEC440 80240570 0C0B210B */ jal get_float_variable +/* DEC440 80240570 0C0B210B */ jal evt_get_float_variable /* DEC444 80240574 34A50F8B */ ori $a1, $a1, 0xf8b /* DEC448 80240578 46000106 */ mov.s $f4, $f0 /* DEC44C 8024057C 3C0144FA */ lui $at, 0x44fa diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_8024001C_DEEEBC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_8024001C_DEEEBC.s index 6072dcf683..29b6927aba 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_8024001C_DEEEBC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_8024001C_DEEEBC.s @@ -15,21 +15,21 @@ glabel func_8024001C_DEEEBC /* DEEEE4 80240044 8E120000 */ lw $s2, ($s0) /* DEEEE8 80240048 26100004 */ addiu $s0, $s0, 4 /* DEEEEC 8024004C 8E050000 */ lw $a1, ($s0) -/* DEEEF0 80240050 0C0B210B */ jal get_float_variable +/* DEEEF0 80240050 0C0B210B */ jal evt_get_float_variable /* DEEEF4 80240054 26100004 */ addiu $s0, $s0, 4 /* DEEEF8 80240058 8E050000 */ lw $a1, ($s0) /* DEEEFC 8024005C 26100004 */ addiu $s0, $s0, 4 /* DEEF00 80240060 0220202D */ daddu $a0, $s1, $zero -/* DEEF04 80240064 0C0B210B */ jal get_float_variable +/* DEEF04 80240064 0C0B210B */ jal evt_get_float_variable /* DEEF08 80240068 46000606 */ mov.s $f24, $f0 /* DEEF0C 8024006C 8E050000 */ lw $a1, ($s0) /* DEEF10 80240070 26100004 */ addiu $s0, $s0, 4 /* DEEF14 80240074 0220202D */ daddu $a0, $s1, $zero -/* DEEF18 80240078 0C0B210B */ jal get_float_variable +/* DEEF18 80240078 0C0B210B */ jal evt_get_float_variable /* DEEF1C 8024007C 46000586 */ mov.s $f22, $f0 /* DEEF20 80240080 0220202D */ daddu $a0, $s1, $zero /* DEEF24 80240084 8E050000 */ lw $a1, ($s0) -/* DEEF28 80240088 0C0B210B */ jal get_float_variable +/* DEEF28 80240088 0C0B210B */ jal evt_get_float_variable /* DEEF2C 8024008C 46000506 */ mov.s $f20, $f0 /* DEEF30 80240090 4600C306 */ mov.s $f12, $f24 /* DEEF34 80240094 4406A000 */ mfc1 $a2, $f20 @@ -40,7 +40,7 @@ glabel func_8024001C_DEEEBC /* DEEF48 802400A8 46000306 */ mov.s $f12, $f0 /* DEEF4C 802400AC 0220202D */ daddu $a0, $s1, $zero /* DEEF50 802400B0 44060000 */ mfc1 $a2, $f0 -/* DEEF54 802400B4 0C0B2190 */ jal set_float_variable +/* DEEF54 802400B4 0C0B2190 */ jal evt_set_float_variable /* DEEF58 802400B8 0240282D */ daddu $a1, $s2, $zero /* DEEF5C 802400BC 8FBF001C */ lw $ra, 0x1c($sp) /* DEEF60 802400C0 8FB20018 */ lw $s2, 0x18($sp) 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 index 695cb3703e..936f7f2d20 100644 --- 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 @@ -10,12 +10,12 @@ glabel func_802400E4_DEEF84 /* DEEF98 802400F8 F7B40020 */ sdc1 $f20, 0x20($sp) /* DEEF9C 802400FC 8E30000C */ lw $s0, 0xc($s1) /* DEEFA0 80240100 8E050000 */ lw $a1, ($s0) -/* DEEFA4 80240104 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 @@ -28,7 +28,7 @@ glabel func_802400E4_DEEF84 /* DEEFDC 8024013C 8E050000 */ lw $a1, ($s0) /* DEEFE0 80240140 0000302D */ daddu $a2, $zero, $zero .L80240144: -/* DEEFE4 80240144 0C0B2026 */ jal set_variable +/* 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) 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 index 83a0e44d7d..971d5cdc28 100644 --- 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 @@ -12,21 +12,21 @@ glabel func_802401EC_DEF08C /* DEF0A8 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) /* DEF0AC 8024020C 8E30000C */ lw $s0, 0xc($s1) /* DEF0B0 80240210 8E050000 */ lw $a1, ($s0) -/* DEF0B4 80240214 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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) 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 index ae71e380ae..0de7718ed5 100644 --- 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 @@ -19,21 +19,21 @@ glabel func_80240290_DEF130 /* DEF168 802402C8 8E050000 */ lw $a1, ($s0) /* DEF16C 802402CC 26100004 */ addiu $s0, $s0, 4 /* DEF170 802402D0 0220202D */ daddu $a0, $s1, $zero -/* DEF174 802402D4 0C0B210B */ jal get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 get_float_variable +/* 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 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s index 34764f29ac..af3a7d7977 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s @@ -280,7 +280,7 @@ glabel func_80242F44_DF1DE4 /* DF21CC 8024332C AE220000 */ sw $v0, ($s1) /* DF21D0 80243330 AC800070 */ sw $zero, 0x70($a0) .L80243334: -/* DF21D4 80243334 0C0B2026 */ jal set_variable +/* DF21D4 80243334 0C0B2026 */ jal evt_set_variable /* DF21D8 80243338 00000000 */ nop /* DF21DC 8024333C 08090CDD */ j .L80243374 /* DF21E0 80243340 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s index 311de194a3..ea2d8cb80a 100644 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s +++ b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s @@ -19,7 +19,7 @@ glabel func_802406A4_AB0694 .L802406D8: /* AB06C8 802406D8 8CC50000 */ lw $a1, ($a2) /* AB06CC 802406DC 3C068024 */ lui $a2, %hi(D_80241220_AB1210) -/* AB06D0 802406E0 0C0B2026 */ jal set_variable +/* AB06D0 802406E0 0C0B2026 */ jal evt_set_variable /* AB06D4 802406E4 8CC61220 */ lw $a2, %lo(D_80241220_AB1210)($a2) /* AB06D8 802406E8 24020002 */ addiu $v0, $zero, 2 .L802406EC: diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s b/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s index f1260c4c64..7027788187 100644 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s +++ b/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s @@ -5,7 +5,7 @@ glabel func_80240020_AB2190 /* AB2190 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AB2194 80240024 AFBF0010 */ sw $ra, 0x10($sp) /* AB2198 80240028 8C82000C */ lw $v0, 0xc($a0) -/* AB219C 8024002C 0C0B210B */ jal get_float_variable +/* AB219C 8024002C 0C0B210B */ jal evt_get_float_variable /* AB21A0 80240030 8C450000 */ lw $a1, ($v0) /* AB21A4 80240034 8FBF0010 */ lw $ra, 0x10($sp) /* AB21A8 80240038 4600008D */ trunc.w.s $f2, $f0 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s b/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s index c0636d8db8..e960039bdf 100644 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s +++ b/ver/us/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s @@ -7,7 +7,7 @@ glabel func_80240120_AB2290 /* AB2298 80240128 8C82000C */ lw $v0, 0xc($a0) /* AB229C 8024012C 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) /* AB22A0 80240130 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) -/* AB22A4 80240134 0C0B2026 */ jal set_variable +/* AB22A4 80240134 0C0B2026 */ jal evt_set_variable /* AB22A8 80240138 8C450000 */ lw $a1, ($v0) /* AB22AC 8024013C 8FBF0010 */ lw $ra, 0x10($sp) /* AB22B0 80240140 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s index ab2d84a595..13a37e6994 100644 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s +++ b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240020_AB62B0.s @@ -22,7 +22,7 @@ glabel func_80240020_AB62B0 /* AB62F4 80240064 8E250000 */ lw $a1, ($s1) /* AB62F8 80240068 4600010D */ trunc.w.s $f4, $f0 /* AB62FC 8024006C 44062000 */ mfc1 $a2, $f4 -/* AB6300 80240070 0C0B2026 */ jal set_variable +/* AB6300 80240070 0C0B2026 */ jal evt_set_variable /* AB6304 80240074 0200202D */ daddu $a0, $s0, $zero /* AB6308 80240078 8FBF0018 */ lw $ra, 0x18($sp) /* AB630C 8024007C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s index 6353b7087d..aa8f4486bb 100644 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s +++ b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240290_AB6520.s @@ -14,7 +14,7 @@ glabel func_80240290_AB6520 /* AB6544 802402B4 26100004 */ addiu $s0, $s0, 4 /* AB6548 802402B8 0220202D */ daddu $a0, $s1, $zero /* AB654C 802402BC 8E050000 */ lw $a1, ($s0) -/* AB6550 802402C0 0C0B210B */ jal get_float_variable +/* AB6550 802402C0 0C0B210B */ jal evt_get_float_variable /* AB6554 802402C4 0040802D */ daddu $s0, $v0, $zero /* AB6558 802402C8 46000000 */ add.s $f0, $f0, $f0 /* AB655C 802402CC 3C014120 */ lui $at, 0x4120 diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s b/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s index 76c20f7b0d..4baee79c3f 100644 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s +++ b/ver/us/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240050_AB9300.s @@ -22,7 +22,7 @@ glabel func_80240050_AB9300 /* AB9344 80240094 8E250000 */ lw $a1, ($s1) /* AB9348 80240098 4600010D */ trunc.w.s $f4, $f0 /* AB934C 8024009C 44062000 */ mfc1 $a2, $f4 -/* AB9350 802400A0 0C0B2026 */ jal set_variable +/* AB9350 802400A0 0C0B2026 */ jal evt_set_variable /* AB9354 802400A4 0200202D */ daddu $a0, $s0, $zero /* AB9358 802400A8 8FBF0018 */ lw $ra, 0x18($sp) /* AB935C 802400AC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s index 4d17e014ea..4cfd1adfd6 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s @@ -19,7 +19,7 @@ glabel func_802411AC_D4E1EC .L802411E0: /* D4E220 802411E0 8CC50000 */ lw $a1, ($a2) /* D4E224 802411E4 3C068024 */ lui $a2, %hi(D_80241F98_D4EFD8) -/* D4E228 802411E8 0C0B2026 */ jal set_variable +/* D4E228 802411E8 0C0B2026 */ jal evt_set_variable /* D4E22C 802411EC 8CC61F98 */ lw $a2, %lo(D_80241F98_D4EFD8)($a2) /* D4E230 802411F0 24020002 */ addiu $v0, $zero, 2 .L802411F4: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s index 715e686e42..f92691330c 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s @@ -19,7 +19,7 @@ glabel func_8024114C_D5113C .L80241180: /* D51170 80241180 8CC50000 */ lw $a1, ($a2) /* D51174 80241184 3C068024 */ lui $a2, %hi(D_80242AD0_D52AC0) -/* D51178 80241188 0C0B2026 */ jal set_variable +/* D51178 80241188 0C0B2026 */ jal evt_set_variable /* D5117C 8024118C 8CC62AD0 */ lw $a2, %lo(D_80242AD0_D52AC0)($a2) /* D51180 80241190 24020002 */ addiu $v0, $zero, 2 .L80241194: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802414A8_D51498.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802414A8_D51498.s index 7de4d29365..4c467f2f53 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802414A8_D51498.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802414A8_D51498.s @@ -19,21 +19,21 @@ glabel func_802414A8_D51498 /* D514D0 802414E0 8E050000 */ lw $a1, ($s0) /* D514D4 802414E4 26100004 */ addiu $s0, $s0, 4 /* D514D8 802414E8 0220202D */ daddu $a0, $s1, $zero -/* D514DC 802414EC 0C0B210B */ jal get_float_variable +/* D514DC 802414EC 0C0B210B */ jal evt_get_float_variable /* D514E0 802414F0 0040902D */ daddu $s2, $v0, $zero /* D514E4 802414F4 8E050000 */ lw $a1, ($s0) /* D514E8 802414F8 26100004 */ addiu $s0, $s0, 4 /* D514EC 802414FC 0220202D */ daddu $a0, $s1, $zero -/* D514F0 80241500 0C0B210B */ jal get_float_variable +/* D514F0 80241500 0C0B210B */ jal evt_get_float_variable /* D514F4 80241504 46000686 */ mov.s $f26, $f0 /* D514F8 80241508 0220202D */ daddu $a0, $s1, $zero /* D514FC 8024150C 8E050000 */ lw $a1, ($s0) -/* D51500 80241510 0C0B210B */ jal get_float_variable +/* D51500 80241510 0C0B210B */ jal evt_get_float_variable /* D51504 80241514 46000606 */ mov.s $f24, $f0 /* D51508 80241518 0220202D */ daddu $a0, $s1, $zero /* D5150C 8024151C 3C05FD05 */ lui $a1, 0xfd05 /* D51510 80241520 34A50F80 */ ori $a1, $a1, 0xf80 -/* D51514 80241524 0C0B210B */ jal get_float_variable +/* D51514 80241524 0C0B210B */ jal evt_get_float_variable /* D51518 80241528 46000586 */ mov.s $f22, $f0 /* D5151C 8024152C 2402FFFF */ addiu $v0, $zero, -1 /* D51520 80241530 1242000A */ beq $s2, $v0, .L8024155C diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s index 989001938c..47449b9c5b 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s @@ -14,7 +14,7 @@ glabel func_80240138_D53DE8 /* D53E0C 8024015C 0040802D */ daddu $s0, $v0, $zero /* D53E10 80240160 3C05FD05 */ lui $a1, 0xfd05 /* D53E14 80240164 34A50F80 */ ori $a1, $a1, 0xf80 -/* D53E18 80240168 0C0B2026 */ jal set_variable +/* D53E18 80240168 0C0B2026 */ jal evt_set_variable /* D53E1C 8024016C 0000302D */ daddu $a2, $zero, $zero .L80240170: /* D53E20 80240170 86030018 */ lh $v1, 0x18($s0) @@ -23,7 +23,7 @@ glabel func_80240138_D53DE8 /* D53E2C 8024017C 0220202D */ daddu $a0, $s1, $zero /* D53E30 80240180 3C05FD05 */ lui $a1, 0xfd05 /* D53E34 80240184 34A50F80 */ ori $a1, $a1, 0xf80 -/* D53E38 80240188 0C0B2026 */ jal set_variable +/* D53E38 80240188 0C0B2026 */ jal evt_set_variable /* D53E3C 8024018C 24060001 */ addiu $a2, $zero, 1 .L80240190: /* D53E40 80240190 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s index 80f16eb2ca..a91064dd3b 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_04/D546B0/func_80240138_D547C8.s @@ -14,7 +14,7 @@ glabel func_80240138_D547C8 /* D547EC 8024015C 0040802D */ daddu $s0, $v0, $zero /* D547F0 80240160 3C05FD05 */ lui $a1, 0xfd05 /* D547F4 80240164 34A50F80 */ ori $a1, $a1, 0xf80 -/* D547F8 80240168 0C0B2026 */ jal set_variable +/* D547F8 80240168 0C0B2026 */ jal evt_set_variable /* D547FC 8024016C 0000302D */ daddu $a2, $zero, $zero .L80240170: /* D54800 80240170 86030018 */ lh $v1, 0x18($s0) @@ -23,7 +23,7 @@ glabel func_80240138_D547C8 /* D5480C 8024017C 0220202D */ daddu $a0, $s1, $zero /* D54810 80240180 3C05FD05 */ lui $a1, 0xfd05 /* D54814 80240184 34A50F80 */ ori $a1, $a1, 0xf80 -/* D54818 80240188 0C0B2026 */ jal set_variable +/* D54818 80240188 0C0B2026 */ jal evt_set_variable /* D5481C 8024018C 24060001 */ addiu $a2, $zero, 1 .L80240190: /* D54820 80240190 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s index 60795d8da1..1689844e8b 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s @@ -19,7 +19,7 @@ glabel func_8024114C_D599DC .L80241180: /* D59A10 80241180 8CC50000 */ lw $a1, ($a2) /* D59A14 80241184 3C068024 */ lui $a2, %hi(D_80241D9C_D5A62C) -/* D59A18 80241188 0C0B2026 */ jal set_variable +/* D59A18 80241188 0C0B2026 */ jal evt_set_variable /* D59A1C 8024118C 8CC61D9C */ lw $a2, %lo(D_80241D9C_D5A62C)($a2) /* D59A20 80241190 24020002 */ addiu $v0, $zero, 2 .L80241194: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s index 87094c3ec3..e94c08a1ab 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s @@ -19,7 +19,7 @@ glabel func_8024114C_D6572C .L80241180: /* D65760 80241180 8CC50000 */ lw $a1, ($a2) /* D65764 80241184 3C068024 */ lui $a2, %hi(D_802422D0_D668B0) -/* D65768 80241188 0C0B2026 */ jal set_variable +/* D65768 80241188 0C0B2026 */ jal evt_set_variable /* D6576C 8024118C 8CC622D0 */ lw $a2, %lo(D_802422D0_D668B0)($a2) /* D65770 80241190 24020002 */ addiu $v0, $zero, 2 .L80241194: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s index 90cac03eaf..38b34325fb 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s @@ -19,7 +19,7 @@ glabel func_8024114C_D6FAFC .L80241180: /* D6FB30 80241180 8CC50000 */ lw $a1, ($a2) /* D6FB34 80241184 3C068024 */ lui $a2, %hi(D_802421A0_D70B50) -/* D6FB38 80241188 0C0B2026 */ jal set_variable +/* D6FB38 80241188 0C0B2026 */ jal evt_set_variable /* D6FB3C 8024118C 8CC621A0 */ lw $a2, %lo(D_802421A0_D70B50)($a2) /* D6FB40 80241190 24020002 */ addiu $v0, $zero, 2 .L80241194: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s index 42eb56d473..fa8be91a0e 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_21/D77F40/func_802400AC_D77FCC.s @@ -14,7 +14,7 @@ glabel func_802400AC_D77FCC /* D77FF0 802400D0 0040802D */ daddu $s0, $v0, $zero /* D77FF4 802400D4 3C05FD05 */ lui $a1, 0xfd05 /* D77FF8 802400D8 34A50F80 */ ori $a1, $a1, 0xf80 -/* D77FFC 802400DC 0C0B2026 */ jal set_variable +/* D77FFC 802400DC 0C0B2026 */ jal evt_set_variable /* D78000 802400E0 0000302D */ daddu $a2, $zero, $zero .L802400E4: /* D78004 802400E4 86030018 */ lh $v1, 0x18($s0) @@ -23,7 +23,7 @@ glabel func_802400AC_D77FCC /* D78010 802400F0 0220202D */ daddu $a0, $s1, $zero /* D78014 802400F4 3C05FD05 */ lui $a1, 0xfd05 /* D78018 802400F8 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7801C 802400FC 0C0B2026 */ jal set_variable +/* D7801C 802400FC 0C0B2026 */ jal evt_set_variable /* D78020 80240100 24060001 */ addiu $a2, $zero, 1 .L80240104: /* D78024 80240104 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s index 8fd1183a0f..68dbfdddaa 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_8024025C_D78ADC.s @@ -14,7 +14,7 @@ glabel func_8024025C_D78ADC /* D78B00 80240280 0040802D */ daddu $s0, $v0, $zero /* D78B04 80240284 3C05FD05 */ lui $a1, 0xfd05 /* D78B08 80240288 34A50F80 */ ori $a1, $a1, 0xf80 -/* D78B0C 8024028C 0C0B2026 */ jal set_variable +/* D78B0C 8024028C 0C0B2026 */ jal evt_set_variable /* D78B10 80240290 0000302D */ daddu $a2, $zero, $zero .L80240294: /* D78B14 80240294 86030018 */ lh $v1, 0x18($s0) @@ -23,7 +23,7 @@ glabel func_8024025C_D78ADC /* D78B20 802402A0 0220202D */ daddu $a0, $s1, $zero /* D78B24 802402A4 3C05FD05 */ lui $a1, 0xfd05 /* D78B28 802402A8 34A50F80 */ ori $a1, $a1, 0xf80 -/* D78B2C 802402AC 0C0B2026 */ jal set_variable +/* D78B2C 802402AC 0C0B2026 */ jal evt_set_variable /* D78B30 802402B0 24060001 */ addiu $a2, $zero, 1 .L802402B4: /* D78B34 802402B4 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s index 514caf6fec..4ef7439aae 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s @@ -19,7 +19,7 @@ glabel func_8024024C_D7EFAC .L80240280: /* D7EFE0 80240280 8CC50000 */ lw $a1, ($a2) /* D7EFE4 80240284 3C068024 */ lui $a2, %hi(D_802411A0_D7FF00) -/* D7EFE8 80240288 0C0B2026 */ jal set_variable +/* D7EFE8 80240288 0C0B2026 */ jal evt_set_variable /* D7EFEC 8024028C 8CC611A0 */ lw $a2, %lo(D_802411A0_D7FF00)($a2) /* D7EFF0 80240290 24020002 */ addiu $v0, $zero, 2 .L80240294: diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s index 250efda06a..bf7b55df44 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s @@ -14,7 +14,7 @@ glabel func_80240510_D7F270 /* D7F294 80240534 0220202D */ daddu $a0, $s1, $zero /* D7F298 80240538 3C05FD05 */ lui $a1, 0xfd05 /* D7F29C 8024053C 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F2A0 80240540 0C0B2026 */ jal set_variable +/* D7F2A0 80240540 0C0B2026 */ jal evt_set_variable /* D7F2A4 80240544 0200302D */ daddu $a2, $s0, $zero /* D7F2A8 80240548 0220202D */ daddu $a0, $s1, $zero /* D7F2AC 8024054C 3C05F5DE */ lui $a1, 0xf5de @@ -107,17 +107,17 @@ glabel func_80240510_D7F270 /* D7F3F4 80240694 0220202D */ daddu $a0, $s1, $zero /* D7F3F8 80240698 3C05FD05 */ lui $a1, 0xfd05 /* D7F3FC 8024069C 34A50F83 */ ori $a1, $a1, 0xf83 -/* D7F400 802406A0 0C0B2026 */ jal set_variable +/* D7F400 802406A0 0C0B2026 */ jal evt_set_variable /* D7F404 802406A4 2406010E */ addiu $a2, $zero, 0x10e /* D7F408 802406A8 0220202D */ daddu $a0, $s1, $zero /* D7F40C 802406AC 3C05FD05 */ lui $a1, 0xfd05 /* D7F410 802406B0 34A50F84 */ ori $a1, $a1, 0xf84 -/* D7F414 802406B4 0C0B2026 */ jal set_variable +/* D7F414 802406B4 0C0B2026 */ jal evt_set_variable /* D7F418 802406B8 2406010E */ addiu $a2, $zero, 0x10e /* D7F41C 802406BC 0220202D */ daddu $a0, $s1, $zero /* D7F420 802406C0 3C05FD05 */ lui $a1, 0xfd05 /* D7F424 802406C4 34A50F85 */ ori $a1, $a1, 0xf85 -/* D7F428 802406C8 0C0B2026 */ jal set_variable +/* D7F428 802406C8 0C0B2026 */ jal evt_set_variable /* D7F42C 802406CC 2406010E */ addiu $a2, $zero, 0x10e .L802406D0: /* D7F430 802406D0 0220202D */ daddu $a0, $s1, $zero @@ -203,7 +203,7 @@ glabel func_80240510_D7F270 /* D7F54C 802407EC 0220202D */ daddu $a0, $s1, $zero /* D7F550 802407F0 3C05FD05 */ lui $a1, 0xfd05 /* D7F554 802407F4 34A50F81 */ ori $a1, $a1, 0xf81 -/* D7F558 802407F8 0C0B2026 */ jal set_variable +/* D7F558 802407F8 0C0B2026 */ jal evt_set_variable /* D7F55C 802407FC 24060001 */ addiu $a2, $zero, 1 .L80240800: /* D7F560 80240800 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240818_D7F578.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240818_D7F578.s index 4851090893..7c390fb134 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240818_D7F578.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240818_D7F578.s @@ -14,7 +14,7 @@ glabel func_80240818_D7F578 /* D7F59C 8024083C 26100004 */ addiu $s0, $s0, 4 /* D7F5A0 80240840 0220202D */ daddu $a0, $s1, $zero /* D7F5A4 80240844 8E050000 */ lw $a1, ($s0) -/* D7F5A8 80240848 0C0B210B */ jal get_float_variable +/* D7F5A8 80240848 0C0B210B */ jal evt_get_float_variable /* D7F5AC 8024084C 0040802D */ daddu $s0, $v0, $zero /* D7F5B0 80240850 0220202D */ daddu $a0, $s1, $zero /* D7F5B4 80240854 3C05FD05 */ lui $a1, 0xfd05 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s index ee3eba4551..c2c1f7929e 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s @@ -29,14 +29,14 @@ glabel func_80240E70_D7FBD0 /* D7FC14 80240EB4 000318C0 */ sll $v1, $v1, 3 /* D7FC18 80240EB8 00438021 */ addu $s0, $v0, $v1 /* D7FC1C 80240EBC 8E060004 */ lw $a2, 4($s0) -/* D7FC20 80240EC0 0C0B2190 */ jal set_float_variable +/* D7FC20 80240EC0 0C0B2190 */ jal evt_set_float_variable /* D7FC24 80240EC4 34A53C80 */ ori $a1, $a1, 0x3c80 /* D7FC28 80240EC8 0220202D */ daddu $a0, $s1, $zero /* D7FC2C 80240ECC C6000008 */ lwc1 $f0, 8($s0) /* D7FC30 80240ED0 3C05FE36 */ lui $a1, 0xfe36 /* D7FC34 80240ED4 46000007 */ neg.s $f0, $f0 /* D7FC38 80240ED8 44060000 */ mfc1 $a2, $f0 -/* D7FC3C 80240EDC 0C0B2190 */ jal set_float_variable +/* D7FC3C 80240EDC 0C0B2190 */ jal evt_set_float_variable /* D7FC40 80240EE0 34A53C81 */ ori $a1, $a1, 0x3c81 /* D7FC44 80240EE4 C60C0014 */ lwc1 $f12, 0x14($s0) /* D7FC48 80240EE8 3C018024 */ lui $at, %hi(D_80247C90_D869F0) @@ -48,7 +48,7 @@ glabel func_80240E70_D7FBD0 /* D7FC60 80240F00 0220202D */ daddu $a0, $s1, $zero /* D7FC64 80240F04 3C05FE36 */ lui $a1, 0xfe36 /* D7FC68 80240F08 44060000 */ mfc1 $a2, $f0 -/* D7FC6C 80240F0C 0C0B2190 */ jal set_float_variable +/* D7FC6C 80240F0C 0C0B2190 */ jal evt_set_float_variable /* D7FC70 80240F10 34A53C82 */ ori $a1, $a1, 0x3c82 /* D7FC74 80240F14 8FBF0018 */ lw $ra, 0x18($sp) /* D7FC78 80240F18 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s index 87f5a67243..7df006abeb 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240F2C_D7FC8C.s @@ -22,12 +22,12 @@ glabel func_80240F2C_D7FC8C /* D7FCD0 80240F70 000318C0 */ sll $v1, $v1, 3 /* D7FCD4 80240F74 00438021 */ addu $s0, $v0, $v1 /* D7FCD8 80240F78 8E060004 */ lw $a2, 4($s0) -/* D7FCDC 80240F7C 0C0B2190 */ jal set_float_variable +/* D7FCDC 80240F7C 0C0B2190 */ jal evt_set_float_variable /* D7FCE0 80240F80 34A53C80 */ ori $a1, $a1, 0x3c80 /* D7FCE4 80240F84 0220202D */ daddu $a0, $s1, $zero /* D7FCE8 80240F88 3C05FE36 */ lui $a1, 0xfe36 /* D7FCEC 80240F8C 8E060008 */ lw $a2, 8($s0) -/* D7FCF0 80240F90 0C0B2190 */ jal set_float_variable +/* D7FCF0 80240F90 0C0B2190 */ jal evt_set_float_variable /* D7FCF4 80240F94 34A53C81 */ ori $a1, $a1, 0x3c81 /* D7FCF8 80240F98 C60C0014 */ lwc1 $f12, 0x14($s0) /* D7FCFC 80240F9C 0C00A6C9 */ jal clamp_angle @@ -35,7 +35,7 @@ glabel func_80240F2C_D7FC8C /* D7FD04 80240FA4 0220202D */ daddu $a0, $s1, $zero /* D7FD08 80240FA8 3C05FE36 */ lui $a1, 0xfe36 /* D7FD0C 80240FAC 44060000 */ mfc1 $a2, $f0 -/* D7FD10 80240FB0 0C0B2190 */ jal set_float_variable +/* D7FD10 80240FB0 0C0B2190 */ jal evt_set_float_variable /* D7FD14 80240FB4 34A53C82 */ ori $a1, $a1, 0x3c82 /* D7FD18 80240FB8 8FBF0018 */ lw $ra, 0x18($sp) /* D7FD1C 80240FBC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024006C_D86A6C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024006C_D86A6C.s index 03384f7e71..7b7dd941c1 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024006C_D86A6C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024006C_D86A6C.s @@ -17,7 +17,7 @@ glabel func_8024006C_D86A6C /* D86A9C 8024009C 34A50F81 */ ori $a1, $a1, 0xf81 /* D86AA0 802400A0 0040802D */ daddu $s0, $v0, $zero /* D86AA4 802400A4 0200302D */ daddu $a2, $s0, $zero -/* D86AA8 802400A8 0C0B2026 */ jal set_variable +/* D86AA8 802400A8 0C0B2026 */ jal evt_set_variable /* D86AAC 802400AC AE500084 */ sw $s0, 0x84($s2) /* D86AB0 802400B0 8E250000 */ lw $a1, ($s1) /* D86AB4 802400B4 26310004 */ addiu $s1, $s1, 4 @@ -31,41 +31,41 @@ glabel func_8024006C_D86A6C /* D86AD4 802400D4 AE02003C */ sw $v0, 0x3c($s0) /* D86AD8 802400D8 8E250000 */ lw $a1, ($s1) /* D86ADC 802400DC 26310004 */ addiu $s1, $s1, 4 -/* D86AE0 802400E0 0C0B210B */ jal get_float_variable +/* D86AE0 802400E0 0C0B210B */ jal evt_get_float_variable /* D86AE4 802400E4 0240202D */ daddu $a0, $s2, $zero /* D86AE8 802400E8 E600000C */ swc1 $f0, 0xc($s0) /* D86AEC 802400EC 8E250000 */ lw $a1, ($s1) /* D86AF0 802400F0 26310004 */ addiu $s1, $s1, 4 -/* D86AF4 802400F4 0C0B210B */ jal get_float_variable +/* D86AF4 802400F4 0C0B210B */ jal evt_get_float_variable /* D86AF8 802400F8 0240202D */ daddu $a0, $s2, $zero /* D86AFC 802400FC E6000010 */ swc1 $f0, 0x10($s0) /* D86B00 80240100 8E250000 */ lw $a1, ($s1) /* D86B04 80240104 26310004 */ addiu $s1, $s1, 4 -/* D86B08 80240108 0C0B210B */ jal get_float_variable +/* D86B08 80240108 0C0B210B */ jal evt_get_float_variable /* D86B0C 8024010C 0240202D */ daddu $a0, $s2, $zero /* D86B10 80240110 E6000014 */ swc1 $f0, 0x14($s0) /* D86B14 80240114 8E250000 */ lw $a1, ($s1) /* D86B18 80240118 26310004 */ addiu $s1, $s1, 4 -/* D86B1C 8024011C 0C0B210B */ jal get_float_variable +/* D86B1C 8024011C 0C0B210B */ jal evt_get_float_variable /* D86B20 80240120 0240202D */ daddu $a0, $s2, $zero /* D86B24 80240124 E6000018 */ swc1 $f0, 0x18($s0) /* D86B28 80240128 8E250000 */ lw $a1, ($s1) /* D86B2C 8024012C 26310004 */ addiu $s1, $s1, 4 -/* D86B30 80240130 0C0B210B */ jal get_float_variable +/* D86B30 80240130 0C0B210B */ jal evt_get_float_variable /* D86B34 80240134 0240202D */ daddu $a0, $s2, $zero /* D86B38 80240138 E600001C */ swc1 $f0, 0x1c($s0) /* D86B3C 8024013C 8E250000 */ lw $a1, ($s1) /* D86B40 80240140 26310004 */ addiu $s1, $s1, 4 -/* D86B44 80240144 0C0B210B */ jal get_float_variable +/* D86B44 80240144 0C0B210B */ jal evt_get_float_variable /* D86B48 80240148 0240202D */ daddu $a0, $s2, $zero /* D86B4C 8024014C E6000020 */ swc1 $f0, 0x20($s0) /* D86B50 80240150 8E250000 */ lw $a1, ($s1) /* D86B54 80240154 26310004 */ addiu $s1, $s1, 4 -/* D86B58 80240158 0C0B210B */ jal get_float_variable +/* D86B58 80240158 0C0B210B */ jal evt_get_float_variable /* D86B5C 8024015C 0240202D */ daddu $a0, $s2, $zero /* D86B60 80240160 E6000024 */ swc1 $f0, 0x24($s0) /* D86B64 80240164 8E250000 */ lw $a1, ($s1) -/* D86B68 80240168 0C0B210B */ jal get_float_variable +/* D86B68 80240168 0C0B210B */ jal evt_get_float_variable /* D86B6C 8024016C 0240202D */ daddu $a0, $s2, $zero /* D86B70 80240170 3C013F80 */ lui $at, 0x3f80 /* D86B74 80240174 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024061C_D8701C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024061C_D8701C.s index 1a0a062c73..9088f95cc8 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024061C_D8701C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_8024061C_D8701C.s @@ -21,21 +21,21 @@ glabel func_8024061C_D8701C /* D8705C 8024065C AE020038 */ sw $v0, 0x38($s0) /* D87060 80240660 8E250000 */ lw $a1, ($s1) /* D87064 80240664 26310004 */ addiu $s1, $s1, 4 -/* D87068 80240668 0C0B210B */ jal get_float_variable +/* D87068 80240668 0C0B210B */ jal evt_get_float_variable /* D8706C 8024066C 0240202D */ daddu $a0, $s2, $zero /* D87070 80240670 E6000018 */ swc1 $f0, 0x18($s0) /* D87074 80240674 8E250000 */ lw $a1, ($s1) /* D87078 80240678 26310004 */ addiu $s1, $s1, 4 -/* D8707C 8024067C 0C0B210B */ jal get_float_variable +/* D8707C 8024067C 0C0B210B */ jal evt_get_float_variable /* D87080 80240680 0240202D */ daddu $a0, $s2, $zero /* D87084 80240684 E6000024 */ swc1 $f0, 0x24($s0) /* D87088 80240688 8E250000 */ lw $a1, ($s1) /* D8708C 8024068C 26310004 */ addiu $s1, $s1, 4 -/* D87090 80240690 0C0B210B */ jal get_float_variable +/* D87090 80240690 0C0B210B */ jal evt_get_float_variable /* D87094 80240694 0240202D */ daddu $a0, $s2, $zero /* D87098 80240698 E6000020 */ swc1 $f0, 0x20($s0) /* D8709C 8024069C 8E250000 */ lw $a1, ($s1) -/* D870A0 802406A0 0C0B210B */ jal get_float_variable +/* D870A0 802406A0 0C0B210B */ jal evt_get_float_variable /* D870A4 802406A4 0240202D */ daddu $a0, $s2, $zero /* D870A8 802406A8 3C013F80 */ lui $at, 0x3f80 /* D870AC 802406AC 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s index 8f4d73cc73..53bc153ff7 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s @@ -19,7 +19,7 @@ glabel func_8024053C_CF80AC .L80240570: /* CF80E0 80240570 8CC50000 */ lw $a1, ($a2) /* CF80E4 80240574 3C068024 */ lui $a2, %hi(D_802432D4_CFAE44) -/* CF80E8 80240578 0C0B2026 */ jal set_variable +/* CF80E8 80240578 0C0B2026 */ jal evt_set_variable /* CF80EC 8024057C 8CC632D4 */ lw $a2, %lo(D_802432D4_CFAE44)($a2) /* CF80F0 80240580 24020002 */ addiu $v0, $zero, 2 .L80240584: diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s index a6039eb610..98431fb8d4 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s @@ -60,24 +60,24 @@ glabel func_8024083C_CF83AC /* CF8484 80240914 0220202D */ daddu $a0, $s1, $zero /* CF8488 80240918 3C05F5DE */ lui $a1, 0xf5de /* CF848C 8024091C 34A502DE */ ori $a1, $a1, 0x2de -/* CF8490 80240920 0C0B2026 */ jal set_variable +/* CF8490 80240920 0C0B2026 */ jal evt_set_variable /* CF8494 80240924 0280302D */ daddu $a2, $s4, $zero /* CF8498 80240928 0220202D */ daddu $a0, $s1, $zero /* CF849C 8024092C 3C05F5DE */ lui $a1, 0xf5de /* CF84A0 80240930 34A502DF */ ori $a1, $a1, 0x2df -/* CF84A4 80240934 0C0B2026 */ jal set_variable +/* CF84A4 80240934 0C0B2026 */ jal evt_set_variable /* CF84A8 80240938 32A6FFFF */ andi $a2, $s5, 0xffff /* CF84AC 8024093C 24100001 */ addiu $s0, $zero, 1 /* CF84B0 80240940 0220202D */ daddu $a0, $s1, $zero .L80240944: /* CF84B4 80240944 3C05F840 */ lui $a1, 0xf840 /* CF84B8 80240948 34A56268 */ ori $a1, $a1, 0x6268 -/* CF84BC 8024094C 0C0B2026 */ jal set_variable +/* CF84BC 8024094C 0C0B2026 */ jal evt_set_variable /* CF84C0 80240950 3206FFFF */ andi $a2, $s0, 0xffff /* CF84C4 80240954 0220202D */ daddu $a0, $s1, $zero /* CF84C8 80240958 3C05F840 */ lui $a1, 0xf840 /* CF84CC 8024095C 34A56269 */ ori $a1, $a1, 0x6269 -/* CF84D0 80240960 0C0B2026 */ jal set_variable +/* CF84D0 80240960 0C0B2026 */ jal evt_set_variable /* CF84D4 80240964 32E6FFFF */ andi $a2, $s7, 0xffff /* CF84D8 80240968 0000202D */ daddu $a0, $zero, $zero /* CF84DC 8024096C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s index 15e18ff3c2..f1b351ce2f 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s @@ -60,24 +60,24 @@ glabel func_80240C68_D06398 /* D06470 80240D40 0220202D */ daddu $a0, $s1, $zero /* D06474 80240D44 3C05F5DE */ lui $a1, 0xf5de /* D06478 80240D48 34A502DE */ ori $a1, $a1, 0x2de -/* D0647C 80240D4C 0C0B2026 */ jal set_variable +/* D0647C 80240D4C 0C0B2026 */ jal evt_set_variable /* D06480 80240D50 0280302D */ daddu $a2, $s4, $zero /* D06484 80240D54 0220202D */ daddu $a0, $s1, $zero /* D06488 80240D58 3C05F5DE */ lui $a1, 0xf5de /* D0648C 80240D5C 34A502DF */ ori $a1, $a1, 0x2df -/* D06490 80240D60 0C0B2026 */ jal set_variable +/* D06490 80240D60 0C0B2026 */ jal evt_set_variable /* D06494 80240D64 32A6FFFF */ andi $a2, $s5, 0xffff /* D06498 80240D68 24100001 */ addiu $s0, $zero, 1 /* D0649C 80240D6C 0220202D */ daddu $a0, $s1, $zero .L80240D70: /* D064A0 80240D70 3C05F840 */ lui $a1, 0xf840 /* D064A4 80240D74 34A56268 */ ori $a1, $a1, 0x6268 -/* D064A8 80240D78 0C0B2026 */ jal set_variable +/* D064A8 80240D78 0C0B2026 */ jal evt_set_variable /* D064AC 80240D7C 3206FFFF */ andi $a2, $s0, 0xffff /* D064B0 80240D80 0220202D */ daddu $a0, $s1, $zero /* D064B4 80240D84 3C05F840 */ lui $a1, 0xf840 /* D064B8 80240D88 34A56269 */ ori $a1, $a1, 0x6269 -/* D064BC 80240D8C 0C0B2026 */ jal set_variable +/* D064BC 80240D8C 0C0B2026 */ jal evt_set_variable /* D064C0 80240D90 32E6FFFF */ andi $a2, $s7, 0xffff /* D064C4 80240D94 0000202D */ daddu $a0, $zero, $zero /* D064C8 80240D98 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s index 53b336ad09..501b0913d7 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D13810/func_80240240_D13810.s @@ -15,21 +15,21 @@ glabel func_80240240_D13810 /* D13838 80240268 8E120000 */ lw $s2, ($s0) /* D1383C 8024026C 26100004 */ addiu $s0, $s0, 4 /* D13840 80240270 8E050000 */ lw $a1, ($s0) -/* D13844 80240274 0C0B210B */ jal get_float_variable +/* D13844 80240274 0C0B210B */ jal evt_get_float_variable /* D13848 80240278 26100004 */ addiu $s0, $s0, 4 /* D1384C 8024027C 8E050000 */ lw $a1, ($s0) /* D13850 80240280 26100004 */ addiu $s0, $s0, 4 /* D13854 80240284 0220202D */ daddu $a0, $s1, $zero -/* D13858 80240288 0C0B210B */ jal get_float_variable +/* D13858 80240288 0C0B210B */ jal evt_get_float_variable /* D1385C 8024028C 46000606 */ mov.s $f24, $f0 /* D13860 80240290 8E050000 */ lw $a1, ($s0) /* D13864 80240294 26100004 */ addiu $s0, $s0, 4 /* D13868 80240298 0220202D */ daddu $a0, $s1, $zero -/* D1386C 8024029C 0C0B210B */ jal get_float_variable +/* D1386C 8024029C 0C0B210B */ jal evt_get_float_variable /* D13870 802402A0 46000586 */ mov.s $f22, $f0 /* D13874 802402A4 0220202D */ daddu $a0, $s1, $zero /* D13878 802402A8 8E050000 */ lw $a1, ($s0) -/* D1387C 802402AC 0C0B210B */ jal get_float_variable +/* D1387C 802402AC 0C0B210B */ jal evt_get_float_variable /* D13880 802402B0 46000506 */ mov.s $f20, $f0 /* D13884 802402B4 4600C306 */ mov.s $f12, $f24 /* D13888 802402B8 4406A000 */ mfc1 $a2, $f20 @@ -40,7 +40,7 @@ glabel func_80240240_D13810 /* D1389C 802402CC 46000306 */ mov.s $f12, $f0 /* D138A0 802402D0 0220202D */ daddu $a0, $s1, $zero /* D138A4 802402D4 44060000 */ mfc1 $a2, $f0 -/* D138A8 802402D8 0C0B2190 */ jal set_float_variable +/* D138A8 802402D8 0C0B2190 */ jal evt_set_float_variable /* D138AC 802402DC 0240282D */ daddu $a1, $s2, $zero /* D138B0 802402E0 8FBF001C */ lw $ra, 0x1c($sp) /* D138B4 802402E4 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s index 9943a0b292..7f20028fda 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s @@ -19,7 +19,7 @@ glabel func_8024053C_D13B0C .L80240570: /* D13B40 80240570 8CC50000 */ lw $a1, ($a2) /* D13B44 80240574 3C068024 */ lui $a2, %hi(D_80243880_D16E50) -/* D13B48 80240578 0C0B2026 */ jal set_variable +/* D13B48 80240578 0C0B2026 */ jal evt_set_variable /* D13B4C 8024057C 8CC63880 */ lw $a2, %lo(D_80243880_D16E50)($a2) /* D13B50 80240580 24020002 */ addiu $v0, $zero, 2 .L80240584: diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s index fe5f5963b6..87269dc581 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s @@ -19,7 +19,7 @@ glabel func_80241D8C_D21C1C .L80241DC0: /* D21C50 80241DC0 8CC50000 */ lw $a1, ($a2) /* D21C54 80241DC4 3C068024 */ lui $a2, %hi(D_80244438_D242C8) -/* D21C58 80241DC8 0C0B2026 */ jal set_variable +/* D21C58 80241DC8 0C0B2026 */ jal evt_set_variable /* D21C5C 80241DCC 8CC64438 */ lw $a2, %lo(D_80244438_D242C8)($a2) /* D21C60 80241DD0 24020002 */ addiu $v0, $zero, 2 .L80241DD4: diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240158_D36448.s b/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240158_D36448.s index 36e498c1f8..62c6d81d91 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240158_D36448.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240158_D36448.s @@ -19,13 +19,13 @@ glabel func_80240158_D36448 /* D3647C 8024018C 0220202D */ daddu $a0, $s1, $zero /* D36480 80240190 3C05F5DE */ lui $a1, 0xf5de /* D36484 80240194 34A50288 */ ori $a1, $a1, 0x288 -/* D36488 80240198 0C0B2026 */ jal set_variable +/* D36488 80240198 0C0B2026 */ jal evt_set_variable /* D3648C 8024019C 320600FF */ andi $a2, $s0, 0xff /* D36490 802401A0 0220202D */ daddu $a0, $s1, $zero /* D36494 802401A4 3C05F5DE */ lui $a1, 0xf5de /* D36498 802401A8 34A50289 */ ori $a1, $a1, 0x289 /* D3649C 802401AC 00103203 */ sra $a2, $s0, 8 -/* D364A0 802401B0 0C0B2026 */ jal set_variable +/* D364A0 802401B0 0C0B2026 */ jal evt_set_variable /* D364A4 802401B4 30C600FF */ andi $a2, $a2, 0xff /* D364A8 802401B8 0220202D */ daddu $a0, $s1, $zero /* D364AC 802401BC 3C05FD05 */ lui $a1, 0xfd05 @@ -38,13 +38,13 @@ glabel func_80240158_D36448 /* D364C4 802401D4 0220202D */ daddu $a0, $s1, $zero /* D364C8 802401D8 3C05F5DE */ lui $a1, 0xf5de /* D364CC 802401DC 34A5028A */ ori $a1, $a1, 0x28a -/* D364D0 802401E0 0C0B2026 */ jal set_variable +/* D364D0 802401E0 0C0B2026 */ jal evt_set_variable /* D364D4 802401E4 320600FF */ andi $a2, $s0, 0xff /* D364D8 802401E8 0220202D */ daddu $a0, $s1, $zero /* D364DC 802401EC 3C05F5DE */ lui $a1, 0xf5de /* D364E0 802401F0 34A5028B */ ori $a1, $a1, 0x28b /* D364E4 802401F4 00103203 */ sra $a2, $s0, 8 -/* D364E8 802401F8 0C0B2026 */ jal set_variable +/* D364E8 802401F8 0C0B2026 */ jal evt_set_variable /* D364EC 802401FC 30C600FF */ andi $a2, $a2, 0xff /* D364F0 80240200 0220202D */ daddu $a0, $s1, $zero /* D364F4 80240204 3C05FD05 */ lui $a1, 0xfd05 @@ -57,13 +57,13 @@ glabel func_80240158_D36448 /* D3650C 8024021C 0220202D */ daddu $a0, $s1, $zero /* D36510 80240220 3C05F5DE */ lui $a1, 0xf5de /* D36514 80240224 34A5028C */ ori $a1, $a1, 0x28c -/* D36518 80240228 0C0B2026 */ jal set_variable +/* D36518 80240228 0C0B2026 */ jal evt_set_variable /* D3651C 8024022C 320600FF */ andi $a2, $s0, 0xff /* D36520 80240230 0220202D */ daddu $a0, $s1, $zero /* D36524 80240234 3C05F5DE */ lui $a1, 0xf5de /* D36528 80240238 34A5028D */ ori $a1, $a1, 0x28d /* D3652C 8024023C 00103203 */ sra $a2, $s0, 8 -/* D36530 80240240 0C0B2026 */ jal set_variable +/* D36530 80240240 0C0B2026 */ jal evt_set_variable /* D36534 80240244 30C600FF */ andi $a2, $a2, 0xff /* D36538 80240248 8FBF001C */ lw $ra, 0x1c($sp) /* D3653C 8024024C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s b/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s index b956833009..39d0cd19c5 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240264_D36554.s @@ -29,7 +29,7 @@ glabel func_80240264_D36554 /* D365B0 802402C0 34A50F80 */ ori $a1, $a1, 0xf80 /* D365B4 802402C4 2406FFFF */ addiu $a2, $zero, -1 .L802402C8: -/* D365B8 802402C8 0C0B2026 */ jal set_variable +/* D365B8 802402C8 0C0B2026 */ jal evt_set_variable /* D365BC 802402CC 00000000 */ nop /* D365C0 802402D0 0220202D */ daddu $a0, $s1, $zero /* D365C4 802402D4 3C05F5DE */ lui $a1, 0xf5de @@ -54,7 +54,7 @@ glabel func_80240264_D36554 /* D3660C 8024031C 34A50F81 */ ori $a1, $a1, 0xf81 /* D36610 80240320 2406FFFF */ addiu $a2, $zero, -1 .L80240324: -/* D36614 80240324 0C0B2026 */ jal set_variable +/* D36614 80240324 0C0B2026 */ jal evt_set_variable /* D36618 80240328 00000000 */ nop /* D3661C 8024032C 0220202D */ daddu $a0, $s1, $zero /* D36620 80240330 3C05F5DE */ lui $a1, 0xf5de @@ -79,7 +79,7 @@ glabel func_80240264_D36554 /* D36668 80240378 34A50F82 */ ori $a1, $a1, 0xf82 /* D3666C 8024037C 2406FFFF */ addiu $a2, $zero, -1 .L80240380: -/* D36670 80240380 0C0B2026 */ jal set_variable +/* D36670 80240380 0C0B2026 */ jal evt_set_variable /* D36674 80240384 00000000 */ nop /* D36678 80240388 8FBF0018 */ lw $ra, 0x18($sp) /* D3667C 8024038C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s index 0bca5cc192..f50329f54a 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240754_D3AD24.s @@ -15,7 +15,7 @@ glabel func_80240754_D3AD24 /* D3AD4C 8024077C 0080882D */ daddu $s1, $a0, $zero /* D3AD50 80240780 3C05FD05 */ lui $a1, 0xfd05 /* D3AD54 80240784 34A50F87 */ ori $a1, $a1, 0xf87 -/* D3AD58 80240788 0C0B2026 */ jal set_variable +/* D3AD58 80240788 0C0B2026 */ jal evt_set_variable /* D3AD5C 8024078C 0000302D */ daddu $a2, $zero, $zero /* D3AD60 80240790 86030018 */ lh $v1, 0x18($s0) .L80240794: @@ -24,7 +24,7 @@ glabel func_80240754_D3AD24 /* D3AD6C 8024079C 0220202D */ daddu $a0, $s1, $zero /* D3AD70 802407A0 3C05FD05 */ lui $a1, 0xfd05 /* D3AD74 802407A4 34A50F87 */ ori $a1, $a1, 0xf87 -/* D3AD78 802407A8 0C0B2026 */ jal set_variable +/* D3AD78 802407A8 0C0B2026 */ jal evt_set_variable /* D3AD7C 802407AC 24060001 */ addiu $a2, $zero, 1 .L802407B0: /* D3AD80 802407B0 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s index 94787e31ad..ce1eafa1d0 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s @@ -60,24 +60,24 @@ glabel func_8024090C_D3AEDC /* D3AFB4 802409E4 0220202D */ daddu $a0, $s1, $zero /* D3AFB8 802409E8 3C05F5DE */ lui $a1, 0xf5de /* D3AFBC 802409EC 34A502DE */ ori $a1, $a1, 0x2de -/* D3AFC0 802409F0 0C0B2026 */ jal set_variable +/* D3AFC0 802409F0 0C0B2026 */ jal evt_set_variable /* D3AFC4 802409F4 0280302D */ daddu $a2, $s4, $zero /* D3AFC8 802409F8 0220202D */ daddu $a0, $s1, $zero /* D3AFCC 802409FC 3C05F5DE */ lui $a1, 0xf5de /* D3AFD0 80240A00 34A502DF */ ori $a1, $a1, 0x2df -/* D3AFD4 80240A04 0C0B2026 */ jal set_variable +/* D3AFD4 80240A04 0C0B2026 */ jal evt_set_variable /* D3AFD8 80240A08 32A6FFFF */ andi $a2, $s5, 0xffff /* D3AFDC 80240A0C 24100001 */ addiu $s0, $zero, 1 /* D3AFE0 80240A10 0220202D */ daddu $a0, $s1, $zero .L80240A14: /* D3AFE4 80240A14 3C05F840 */ lui $a1, 0xf840 /* D3AFE8 80240A18 34A56268 */ ori $a1, $a1, 0x6268 -/* D3AFEC 80240A1C 0C0B2026 */ jal set_variable +/* D3AFEC 80240A1C 0C0B2026 */ jal evt_set_variable /* D3AFF0 80240A20 3206FFFF */ andi $a2, $s0, 0xffff /* D3AFF4 80240A24 0220202D */ daddu $a0, $s1, $zero /* D3AFF8 80240A28 3C05F840 */ lui $a1, 0xf840 /* D3AFFC 80240A2C 34A56269 */ ori $a1, $a1, 0x6269 -/* D3B000 80240A30 0C0B2026 */ jal set_variable +/* D3B000 80240A30 0C0B2026 */ jal evt_set_variable /* D3B004 80240A34 32E6FFFF */ andi $a2, $s7, 0xffff /* D3B008 80240A38 0000202D */ daddu $a0, $zero, $zero /* D3B00C 80240A3C 3C05F5DE */ lui $a1, 0xf5de diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s index 62d90ee54b..d5114b83dc 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s @@ -57,7 +57,7 @@ glabel func_80242074_D3C644 /* D3C710 80242140 0240202D */ daddu $a0, $s2, $zero .L80242144: /* D3C714 80242144 8E250000 */ lw $a1, ($s1) -/* D3C718 80242148 0C0B2026 */ jal set_variable +/* D3C718 80242148 0C0B2026 */ jal evt_set_variable /* D3C71C 8024214C 0200302D */ daddu $a2, $s0, $zero /* D3C720 80242150 8FBF003C */ lw $ra, 0x3c($sp) /* D3C724 80242154 8FB20038 */ lw $s2, 0x38($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s index 9e55f5f6c6..bd5942a46d 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240090_D4BAB0.s @@ -5,7 +5,7 @@ glabel func_80240090_D4BAB0 /* D4BAB0 80240090 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D4BAB4 80240094 AFBF0010 */ sw $ra, 0x10($sp) /* D4BAB8 80240098 8C82000C */ lw $v0, 0xc($a0) -/* D4BABC 8024009C 0C0B210B */ jal get_float_variable +/* D4BABC 8024009C 0C0B210B */ jal evt_get_float_variable /* D4BAC0 802400A0 8C450000 */ lw $a1, ($v0) /* D4BAC4 802400A4 44050000 */ mfc1 $a1, $f0 /* D4BAC8 802400A8 0C04DF62 */ jal set_screen_overlay_params_front diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s index aa499bd286..affb561217 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_802400C0_D4BAE0.s @@ -16,19 +16,19 @@ glabel func_802400C0_D4BAE0 /* D4BB0C 802400EC 8E050000 */ lw $a1, ($s0) /* D4BB10 802400F0 26100004 */ addiu $s0, $s0, 4 /* D4BB14 802400F4 0220202D */ daddu $a0, $s1, $zero -/* D4BB18 802400F8 0C0B210B */ jal get_float_variable +/* D4BB18 802400F8 0C0B210B */ jal evt_get_float_variable /* D4BB1C 802400FC 0040982D */ daddu $s3, $v0, $zero /* D4BB20 80240100 8E050000 */ lw $a1, ($s0) /* D4BB24 80240104 26100004 */ addiu $s0, $s0, 4 /* D4BB28 80240108 4600008D */ trunc.w.s $f2, $f0 /* D4BB2C 8024010C 44121000 */ mfc1 $s2, $f2 -/* D4BB30 80240110 0C0B210B */ jal get_float_variable +/* D4BB30 80240110 0C0B210B */ jal evt_get_float_variable /* D4BB34 80240114 0220202D */ daddu $a0, $s1, $zero /* D4BB38 80240118 0220202D */ daddu $a0, $s1, $zero /* D4BB3C 8024011C 8E050000 */ lw $a1, ($s0) /* D4BB40 80240120 4600008D */ trunc.w.s $f2, $f0 /* D4BB44 80240124 44111000 */ mfc1 $s1, $f2 -/* D4BB48 80240128 0C0B210B */ jal get_float_variable +/* D4BB48 80240128 0C0B210B */ jal evt_get_float_variable /* D4BB4C 8024012C 00000000 */ nop /* D4BB50 80240130 4600008D */ trunc.w.s $f2, $f0 /* D4BB54 80240134 44101000 */ mfc1 $s0, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s index f2e1e1b340..a2de0cf085 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240238_D4BC58.s @@ -13,26 +13,26 @@ glabel func_80240238_D4BC58 /* D4BC78 80240258 F7B40038 */ sdc1 $f20, 0x38($sp) /* D4BC7C 8024025C 8E30000C */ lw $s0, 0xc($s1) /* D4BC80 80240260 8E050000 */ lw $a1, ($s0) -/* D4BC84 80240264 0C0B210B */ jal get_float_variable +/* D4BC84 80240264 0C0B210B */ jal evt_get_float_variable /* D4BC88 80240268 26100004 */ addiu $s0, $s0, 4 /* D4BC8C 8024026C 8E050000 */ lw $a1, ($s0) /* D4BC90 80240270 26100004 */ addiu $s0, $s0, 4 /* D4BC94 80240274 0220202D */ daddu $a0, $s1, $zero -/* D4BC98 80240278 0C0B210B */ jal get_float_variable +/* D4BC98 80240278 0C0B210B */ jal evt_get_float_variable /* D4BC9C 8024027C 46000686 */ mov.s $f26, $f0 /* D4BCA0 80240280 8E050000 */ lw $a1, ($s0) /* D4BCA4 80240284 26100004 */ addiu $s0, $s0, 4 /* D4BCA8 80240288 0220202D */ daddu $a0, $s1, $zero -/* D4BCAC 8024028C 0C0B210B */ jal get_float_variable +/* D4BCAC 8024028C 0C0B210B */ jal evt_get_float_variable /* D4BCB0 80240290 46000506 */ mov.s $f20, $f0 /* D4BCB4 80240294 8E050000 */ lw $a1, ($s0) /* D4BCB8 80240298 26100004 */ addiu $s0, $s0, 4 /* D4BCBC 8024029C 0220202D */ daddu $a0, $s1, $zero -/* D4BCC0 802402A0 0C0B210B */ jal get_float_variable +/* D4BCC0 802402A0 0C0B210B */ jal evt_get_float_variable /* D4BCC4 802402A4 46000586 */ mov.s $f22, $f0 /* D4BCC8 802402A8 0220202D */ daddu $a0, $s1, $zero /* D4BCCC 802402AC 8E050000 */ lw $a1, ($s0) -/* D4BCD0 802402B0 0C0B210B */ jal get_float_variable +/* D4BCD0 802402B0 0C0B210B */ jal evt_get_float_variable /* D4BCD4 802402B4 46000606 */ mov.s $f24, $f0 /* D4BCD8 802402B8 3C065555 */ lui $a2, 0x5555 /* D4BCDC 802402BC 3C078011 */ lui $a3, %hi(gPlayerStatus) @@ -80,7 +80,7 @@ glabel func_80240238_D4BC58 /* D4BD84 80240364 E7A20010 */ swc1 $f2, 0x10($sp) /* D4BD88 80240368 0220202D */ daddu $a0, $s1, $zero /* D4BD8C 8024036C 8FA60020 */ lw $a2, 0x20($sp) -/* D4BD90 80240370 0C0B2026 */ jal set_variable +/* D4BD90 80240370 0C0B2026 */ jal evt_set_variable /* D4BD94 80240374 0200282D */ daddu $a1, $s0, $zero /* D4BD98 80240378 8FBF0030 */ lw $ra, 0x30($sp) /* D4BD9C 8024037C 8FB1002C */ lw $s1, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s index 4d198ada43..6711196b8b 100644 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s +++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s @@ -19,7 +19,7 @@ glabel func_8024091C_92ABCC .L80240950: /* 92AC00 80240950 8CC50000 */ lw $a1, ($a2) /* 92AC04 80240954 3C068024 */ lui $a2, %hi(D_80244050_92E300) -/* 92AC08 80240958 0C0B2026 */ jal set_variable +/* 92AC08 80240958 0C0B2026 */ jal evt_set_variable /* 92AC0C 8024095C 8CC64050 */ lw $a2, %lo(D_80244050_92E300)($a2) /* 92AC10 80240960 24020002 */ addiu $v0, $zero, 2 .L80240964: diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s index 99cb66fc89..034e770513 100644 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s +++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s @@ -19,7 +19,7 @@ glabel func_80241120_9406D0 .L80241154: /* 940704 80241154 8CC50000 */ lw $a1, ($a2) /* 940708 80241158 3C068024 */ lui $a2, %hi(D_8024205C_94160C) -/* 94070C 8024115C 0C0B2026 */ jal set_variable +/* 94070C 8024115C 0C0B2026 */ jal evt_set_variable /* 940710 80241160 8CC6205C */ lw $a2, %lo(D_8024205C_94160C)($a2) /* 940714 80241164 24020002 */ addiu $v0, $zero, 2 .L80241168: diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s index 3b4b4f5a37..6e93a8f9e6 100644 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s +++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s @@ -19,7 +19,7 @@ glabel func_80240384_946254 .L802403B8: /* 946288 802403B8 8CC50000 */ lw $a1, ($a2) /* 94628C 802403BC 3C068024 */ lui $a2, %hi(D_80240E04_946CD4) -/* 946290 802403C0 0C0B2026 */ jal set_variable +/* 946290 802403C0 0C0B2026 */ jal evt_set_variable /* 946294 802403C4 8CC60E04 */ lw $a2, %lo(D_80240E04_946CD4)($a2) /* 946298 802403C8 24020002 */ addiu $v0, $zero, 2 .L802403CC: diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s index d74f6c610d..720d2d4f8d 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s @@ -39,7 +39,7 @@ glabel func_80241204_8833C4 /* 883438 80241278 25290004 */ addiu $t1, $t1, 4 .L8024127C: /* 88343C 8024127C 8CA50000 */ lw $a1, ($a1) -/* 883440 80241280 0C0B2026 */ jal set_variable +/* 883440 80241280 0C0B2026 */ jal evt_set_variable /* 883444 80241284 00000000 */ nop /* 883448 80241288 8FBF0010 */ lw $ra, 0x10($sp) /* 88344C 8024128C 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s b/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s index f53382cf1c..6af747318b 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s @@ -9,7 +9,7 @@ glabel func_80240AD0_890670 /* 890680 80240AE0 8C82000C */ lw $v0, 0xc($a0) /* 890684 80240AE4 28C60040 */ slti $a2, $a2, 0x40 /* 890688 80240AE8 8C450000 */ lw $a1, ($v0) -/* 89068C 80240AEC 0C0B2026 */ jal set_variable +/* 89068C 80240AEC 0C0B2026 */ jal evt_set_variable /* 890690 80240AF0 38C60001 */ xori $a2, $a2, 1 /* 890694 80240AF4 8FBF0010 */ lw $ra, 0x10($sp) /* 890698 80240AF8 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s index 2ceaf4bafe..909f32b468 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s @@ -17,18 +17,18 @@ glabel func_80240508_9AEC08 /* 9AEC1C 8024051C AFB00010 */ sw $s0, 0x10($sp) /* 9AEC20 80240520 8E30000C */ lw $s0, 0xc($s1) /* 9AEC24 80240524 8E050000 */ lw $a1, ($s0) -/* 9AEC28 80240528 0C0B210B */ jal get_float_variable +/* 9AEC28 80240528 0C0B210B */ jal evt_get_float_variable /* 9AEC2C 8024052C 26100004 */ addiu $s0, $s0, 4 /* 9AEC30 80240530 8E050000 */ lw $a1, ($s0) /* 9AEC34 80240534 26100004 */ addiu $s0, $s0, 4 /* 9AEC38 80240538 4600018D */ trunc.w.s $f6, $f0 /* 9AEC3C 8024053C 44123000 */ mfc1 $s2, $f6 -/* 9AEC40 80240540 0C0B210B */ jal get_float_variable +/* 9AEC40 80240540 0C0B210B */ jal evt_get_float_variable /* 9AEC44 80240544 0220202D */ daddu $a0, $s1, $zero /* 9AEC48 80240548 8E050000 */ lw $a1, ($s0) /* 9AEC4C 8024054C 4600018D */ trunc.w.s $f6, $f0 /* 9AEC50 80240550 44103000 */ mfc1 $s0, $f6 -/* 9AEC54 80240554 0C0B210B */ jal get_float_variable +/* 9AEC54 80240554 0C0B210B */ jal evt_get_float_variable /* 9AEC58 80240558 0220202D */ daddu $a0, $s1, $zero /* 9AEC5C 8024055C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) /* 9AEC60 80240560 8442F078 */ lh $v0, %lo(gPlayerStatus+0xB0)($v0) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s index fbbe7b1c0c..34abf0cacb 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s @@ -16,18 +16,18 @@ glabel func_802405FC_9AECFC /* 9AED28 80240628 8E050000 */ lw $a1, ($s0) /* 9AED2C 8024062C 26100004 */ addiu $s0, $s0, 4 /* 9AED30 80240630 0220202D */ daddu $a0, $s1, $zero -/* 9AED34 80240634 0C0B210B */ jal get_float_variable +/* 9AED34 80240634 0C0B210B */ jal evt_get_float_variable /* 9AED38 80240638 0040902D */ daddu $s2, $v0, $zero /* 9AED3C 8024063C 8E050000 */ lw $a1, ($s0) /* 9AED40 80240640 26100004 */ addiu $s0, $s0, 4 /* 9AED44 80240644 4600020D */ trunc.w.s $f8, $f0 /* 9AED48 80240648 44134000 */ mfc1 $s3, $f8 -/* 9AED4C 8024064C 0C0B210B */ jal get_float_variable +/* 9AED4C 8024064C 0C0B210B */ jal evt_get_float_variable /* 9AED50 80240650 0220202D */ daddu $a0, $s1, $zero /* 9AED54 80240654 8E050000 */ lw $a1, ($s0) /* 9AED58 80240658 4600020D */ trunc.w.s $f8, $f0 /* 9AED5C 8024065C 44104000 */ mfc1 $s0, $f8 -/* 9AED60 80240660 0C0B210B */ jal get_float_variable +/* 9AED60 80240660 0C0B210B */ jal evt_get_float_variable /* 9AED64 80240664 0220202D */ daddu $a0, $s1, $zero /* 9AED68 80240668 4600020D */ trunc.w.s $f8, $f0 /* 9AED6C 8024066C 44044000 */ mfc1 $a0, $f8 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s index 8f0c8cbffc..6334d14f90 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s @@ -17,18 +17,18 @@ glabel func_80240854_9B1FE4 /* 9B1FF8 80240868 AFB00010 */ sw $s0, 0x10($sp) /* 9B1FFC 8024086C 8E30000C */ lw $s0, 0xc($s1) /* 9B2000 80240870 8E050000 */ lw $a1, ($s0) -/* 9B2004 80240874 0C0B210B */ jal get_float_variable +/* 9B2004 80240874 0C0B210B */ jal evt_get_float_variable /* 9B2008 80240878 26100004 */ addiu $s0, $s0, 4 /* 9B200C 8024087C 8E050000 */ lw $a1, ($s0) /* 9B2010 80240880 26100004 */ addiu $s0, $s0, 4 /* 9B2014 80240884 4600018D */ trunc.w.s $f6, $f0 /* 9B2018 80240888 44123000 */ mfc1 $s2, $f6 -/* 9B201C 8024088C 0C0B210B */ jal get_float_variable +/* 9B201C 8024088C 0C0B210B */ jal evt_get_float_variable /* 9B2020 80240890 0220202D */ daddu $a0, $s1, $zero /* 9B2024 80240894 8E050000 */ lw $a1, ($s0) /* 9B2028 80240898 4600018D */ trunc.w.s $f6, $f0 /* 9B202C 8024089C 44103000 */ mfc1 $s0, $f6 -/* 9B2030 802408A0 0C0B210B */ jal get_float_variable +/* 9B2030 802408A0 0C0B210B */ jal evt_get_float_variable /* 9B2034 802408A4 0220202D */ daddu $a0, $s1, $zero /* 9B2038 802408A8 3C028024 */ lui $v0, %hi(D_802451F0) /* 9B203C 802408AC 244251F0 */ addiu $v0, $v0, %lo(D_802451F0) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s index 4f850b1fde..02ebd9fde9 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s @@ -16,18 +16,18 @@ glabel func_8024093C_9B20CC /* 9B20F8 80240968 8E050000 */ lw $a1, ($s0) /* 9B20FC 8024096C 26100004 */ addiu $s0, $s0, 4 /* 9B2100 80240970 0220202D */ daddu $a0, $s1, $zero -/* 9B2104 80240974 0C0B210B */ jal get_float_variable +/* 9B2104 80240974 0C0B210B */ jal evt_get_float_variable /* 9B2108 80240978 0040902D */ daddu $s2, $v0, $zero /* 9B210C 8024097C 8E050000 */ lw $a1, ($s0) /* 9B2110 80240980 26100004 */ addiu $s0, $s0, 4 /* 9B2114 80240984 4600020D */ trunc.w.s $f8, $f0 /* 9B2118 80240988 44134000 */ mfc1 $s3, $f8 -/* 9B211C 8024098C 0C0B210B */ jal get_float_variable +/* 9B211C 8024098C 0C0B210B */ jal evt_get_float_variable /* 9B2120 80240990 0220202D */ daddu $a0, $s1, $zero /* 9B2124 80240994 8E050000 */ lw $a1, ($s0) /* 9B2128 80240998 4600020D */ trunc.w.s $f8, $f0 /* 9B212C 8024099C 44104000 */ mfc1 $s0, $f8 -/* 9B2130 802409A0 0C0B210B */ jal get_float_variable +/* 9B2130 802409A0 0C0B210B */ jal evt_get_float_variable /* 9B2134 802409A4 0220202D */ daddu $a0, $s1, $zero /* 9B2138 802409A8 4600020D */ trunc.w.s $f8, $f0 /* 9B213C 802409AC 44044000 */ mfc1 $a0, $f8 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s index 4931b59121..9f7b60da76 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s @@ -39,7 +39,7 @@ glabel func_8024256C_9B8EEC /* 9B8F60 802425E0 25290004 */ addiu $t1, $t1, 4 .L802425E4: /* 9B8F64 802425E4 8CA50000 */ lw $a1, ($a1) -/* 9B8F68 802425E8 0C0B2026 */ jal set_variable +/* 9B8F68 802425E8 0C0B2026 */ jal evt_set_variable /* 9B8F6C 802425EC 00000000 */ nop /* 9B8F70 802425F0 8FBF0010 */ lw $ra, 0x10($sp) /* 9B8F74 802425F4 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s index db8ee2f70a..22d9a2ae68 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s @@ -15,16 +15,16 @@ glabel func_80242600_9B8F80 /* 9B8FA8 80242628 F7B40020 */ sdc1 $f20, 0x20($sp) /* 9B8FAC 8024262C 8E30000C */ lw $s0, 0xc($s1) /* 9B8FB0 80242630 8E050000 */ lw $a1, ($s0) -/* 9B8FB4 80242634 0C0B210B */ jal get_float_variable +/* 9B8FB4 80242634 0C0B210B */ jal evt_get_float_variable /* 9B8FB8 80242638 26100004 */ addiu $s0, $s0, 4 /* 9B8FBC 8024263C 8E050000 */ lw $a1, ($s0) /* 9B8FC0 80242640 26100004 */ addiu $s0, $s0, 4 /* 9B8FC4 80242644 0220202D */ daddu $a0, $s1, $zero -/* 9B8FC8 80242648 0C0B210B */ jal get_float_variable +/* 9B8FC8 80242648 0C0B210B */ jal evt_get_float_variable /* 9B8FCC 8024264C 46000506 */ mov.s $f20, $f0 /* 9B8FD0 80242650 0220202D */ daddu $a0, $s1, $zero /* 9B8FD4 80242654 8E050000 */ lw $a1, ($s0) -/* 9B8FD8 80242658 0C0B210B */ jal get_float_variable +/* 9B8FD8 80242658 0C0B210B */ jal evt_get_float_variable /* 9B8FDC 8024265C 46000586 */ mov.s $f22, $f0 /* 9B8FE0 80242660 3C10800B */ lui $s0, %hi(gCameras) /* 9B8FE4 80242664 26101D80 */ addiu $s0, $s0, %lo(gCameras) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s b/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s index 799aac64d9..6b86969ec7 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD660/func_80240000_9BD660.s @@ -40,7 +40,7 @@ glabel func_80240000_9BD660 /* 9BD6E4 80240084 0200282D */ daddu $a1, $s0, $zero /* 9BD6E8 80240088 2406FFFF */ addiu $a2, $zero, -1 .L8024008C: -/* 9BD6EC 8024008C 0C0B2026 */ jal set_variable +/* 9BD6EC 8024008C 0C0B2026 */ jal evt_set_variable /* 9BD6F0 80240090 00000000 */ nop /* 9BD6F4 80240094 8FBF0024 */ lw $ra, 0x24($sp) /* 9BD6F8 80240098 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_8024004C_9C295C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_8024004C_9C295C.s index a7f951926b..59ef4494b7 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_8024004C_9C295C.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_8024004C_9C295C.s @@ -17,7 +17,7 @@ glabel func_8024004C_9C295C /* 9C298C 8024007C 34A50F81 */ ori $a1, $a1, 0xf81 /* 9C2990 80240080 0040802D */ daddu $s0, $v0, $zero /* 9C2994 80240084 0200302D */ daddu $a2, $s0, $zero -/* 9C2998 80240088 0C0B2026 */ jal set_variable +/* 9C2998 80240088 0C0B2026 */ jal evt_set_variable /* 9C299C 8024008C AE500084 */ sw $s0, 0x84($s2) /* 9C29A0 80240090 8E250000 */ lw $a1, ($s1) /* 9C29A4 80240094 26310004 */ addiu $s1, $s1, 4 @@ -31,41 +31,41 @@ glabel func_8024004C_9C295C /* 9C29C4 802400B4 AE02003C */ sw $v0, 0x3c($s0) /* 9C29C8 802400B8 8E250000 */ lw $a1, ($s1) /* 9C29CC 802400BC 26310004 */ addiu $s1, $s1, 4 -/* 9C29D0 802400C0 0C0B210B */ jal get_float_variable +/* 9C29D0 802400C0 0C0B210B */ jal evt_get_float_variable /* 9C29D4 802400C4 0240202D */ daddu $a0, $s2, $zero /* 9C29D8 802400C8 E600000C */ swc1 $f0, 0xc($s0) /* 9C29DC 802400CC 8E250000 */ lw $a1, ($s1) /* 9C29E0 802400D0 26310004 */ addiu $s1, $s1, 4 -/* 9C29E4 802400D4 0C0B210B */ jal get_float_variable +/* 9C29E4 802400D4 0C0B210B */ jal evt_get_float_variable /* 9C29E8 802400D8 0240202D */ daddu $a0, $s2, $zero /* 9C29EC 802400DC E6000010 */ swc1 $f0, 0x10($s0) /* 9C29F0 802400E0 8E250000 */ lw $a1, ($s1) /* 9C29F4 802400E4 26310004 */ addiu $s1, $s1, 4 -/* 9C29F8 802400E8 0C0B210B */ jal get_float_variable +/* 9C29F8 802400E8 0C0B210B */ jal evt_get_float_variable /* 9C29FC 802400EC 0240202D */ daddu $a0, $s2, $zero /* 9C2A00 802400F0 E6000014 */ swc1 $f0, 0x14($s0) /* 9C2A04 802400F4 8E250000 */ lw $a1, ($s1) /* 9C2A08 802400F8 26310004 */ addiu $s1, $s1, 4 -/* 9C2A0C 802400FC 0C0B210B */ jal get_float_variable +/* 9C2A0C 802400FC 0C0B210B */ jal evt_get_float_variable /* 9C2A10 80240100 0240202D */ daddu $a0, $s2, $zero /* 9C2A14 80240104 E6000018 */ swc1 $f0, 0x18($s0) /* 9C2A18 80240108 8E250000 */ lw $a1, ($s1) /* 9C2A1C 8024010C 26310004 */ addiu $s1, $s1, 4 -/* 9C2A20 80240110 0C0B210B */ jal get_float_variable +/* 9C2A20 80240110 0C0B210B */ jal evt_get_float_variable /* 9C2A24 80240114 0240202D */ daddu $a0, $s2, $zero /* 9C2A28 80240118 E600001C */ swc1 $f0, 0x1c($s0) /* 9C2A2C 8024011C 8E250000 */ lw $a1, ($s1) /* 9C2A30 80240120 26310004 */ addiu $s1, $s1, 4 -/* 9C2A34 80240124 0C0B210B */ jal get_float_variable +/* 9C2A34 80240124 0C0B210B */ jal evt_get_float_variable /* 9C2A38 80240128 0240202D */ daddu $a0, $s2, $zero /* 9C2A3C 8024012C E6000020 */ swc1 $f0, 0x20($s0) /* 9C2A40 80240130 8E250000 */ lw $a1, ($s1) /* 9C2A44 80240134 26310004 */ addiu $s1, $s1, 4 -/* 9C2A48 80240138 0C0B210B */ jal get_float_variable +/* 9C2A48 80240138 0C0B210B */ jal evt_get_float_variable /* 9C2A4C 8024013C 0240202D */ daddu $a0, $s2, $zero /* 9C2A50 80240140 E6000024 */ swc1 $f0, 0x24($s0) /* 9C2A54 80240144 8E250000 */ lw $a1, ($s1) -/* 9C2A58 80240148 0C0B210B */ jal get_float_variable +/* 9C2A58 80240148 0C0B210B */ jal evt_get_float_variable /* 9C2A5C 8024014C 0240202D */ daddu $a0, $s2, $zero /* 9C2A60 80240150 3C013F80 */ lui $at, 0x3f80 /* 9C2A64 80240154 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405FC_9C2F0C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405FC_9C2F0C.s index 09223673d0..b93408b122 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405FC_9C2F0C.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802405FC_9C2F0C.s @@ -21,21 +21,21 @@ glabel func_802405FC_9C2F0C /* 9C2F4C 8024063C AE020038 */ sw $v0, 0x38($s0) /* 9C2F50 80240640 8E250000 */ lw $a1, ($s1) /* 9C2F54 80240644 26310004 */ addiu $s1, $s1, 4 -/* 9C2F58 80240648 0C0B210B */ jal get_float_variable +/* 9C2F58 80240648 0C0B210B */ jal evt_get_float_variable /* 9C2F5C 8024064C 0240202D */ daddu $a0, $s2, $zero /* 9C2F60 80240650 E6000018 */ swc1 $f0, 0x18($s0) /* 9C2F64 80240654 8E250000 */ lw $a1, ($s1) /* 9C2F68 80240658 26310004 */ addiu $s1, $s1, 4 -/* 9C2F6C 8024065C 0C0B210B */ jal get_float_variable +/* 9C2F6C 8024065C 0C0B210B */ jal evt_get_float_variable /* 9C2F70 80240660 0240202D */ daddu $a0, $s2, $zero /* 9C2F74 80240664 E6000024 */ swc1 $f0, 0x24($s0) /* 9C2F78 80240668 8E250000 */ lw $a1, ($s1) /* 9C2F7C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* 9C2F80 80240670 0C0B210B */ jal get_float_variable +/* 9C2F80 80240670 0C0B210B */ jal evt_get_float_variable /* 9C2F84 80240674 0240202D */ daddu $a0, $s2, $zero /* 9C2F88 80240678 E6000020 */ swc1 $f0, 0x20($s0) /* 9C2F8C 8024067C 8E250000 */ lw $a1, ($s1) -/* 9C2F90 80240680 0C0B210B */ jal get_float_variable +/* 9C2F90 80240680 0C0B210B */ jal evt_get_float_variable /* 9C2F94 80240684 0240202D */ daddu $a0, $s2, $zero /* 9C2F98 80240688 3C013F80 */ lui $at, 0x3f80 /* 9C2F9C 8024068C 44811000 */ mtc1 $at, $f2 diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s index 724af65d3c..257fa23826 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s @@ -168,7 +168,7 @@ glabel ShowShopPurchaseDialog /* 7E1604 80280784 0000202D */ daddu $a0, $zero, $zero /* 7E1608 80280788 3C05F840 */ lui $a1, 0xf840 /* 7E160C 8028078C 34A55CF0 */ ori $a1, $a1, 0x5cf0 -/* 7E1610 80280790 0C0B2026 */ jal set_variable +/* 7E1610 80280790 0C0B2026 */ jal evt_set_variable /* 7E1614 80280794 24060001 */ addiu $a2, $zero, 1 /* 7E1618 80280798 080A01EA */ j .L802807A8 /* 7E161C 8028079C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s b/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s index 2663f990ca..24f48c1a31 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E2AA0/func_80282594.s @@ -5,7 +5,7 @@ glabel func_80282594 /* 7E3414 80282594 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7E3418 80282598 AFBF0010 */ sw $ra, 0x10($sp) /* 7E341C 8028259C 8C82000C */ lw $v0, 0xc($a0) -/* 7E3420 802825A0 0C0B210B */ jal get_float_variable +/* 7E3420 802825A0 0C0B210B */ jal evt_get_float_variable /* 7E3424 802825A4 8C450000 */ lw $a1, ($v0) /* 7E3428 802825A8 46000086 */ mov.s $f2, $f0 /* 7E342C 802825AC 3C02800B */ lui $v0, %hi(gCameras) diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s index f27013fbf2..de52d5660d 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s @@ -49,11 +49,11 @@ glabel GetGridIndexFromPos /* 7E45E8 80283768 000217C3 */ sra $v0, $v0, 0x1f /* 7E45EC 8028376C 00001810 */ mfhi $v1 /* 7E45F0 80283770 000388C3 */ sra $s1, $v1, 3 -/* 7E45F4 80283774 0C0B2026 */ jal set_variable +/* 7E45F4 80283774 0C0B2026 */ jal evt_set_variable /* 7E45F8 80283778 02228823 */ subu $s1, $s1, $v0 /* 7E45FC 8028377C 0260202D */ daddu $a0, $s3, $zero /* 7E4600 80283780 0200282D */ daddu $a1, $s0, $zero -/* 7E4604 80283784 0C0B2026 */ jal set_variable +/* 7E4604 80283784 0C0B2026 */ jal evt_set_variable /* 7E4608 80283788 0220302D */ daddu $a2, $s1, $zero /* 7E460C 8028378C 8FBF0020 */ lw $ra, 0x20($sp) /* 7E4610 80283790 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s index b538e62d85..29bb268ba7 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s @@ -46,7 +46,7 @@ glabel GetPushBlock .L80283660: /* 7E44E0 80283660 0200282D */ daddu $a1, $s0, $zero .L80283664: -/* 7E44E4 80283664 0C0B2026 */ jal set_variable +/* 7E44E4 80283664 0C0B2026 */ jal evt_set_variable /* 7E44E8 80283668 24060003 */ addiu $a2, $zero, 3 .L8028366C: /* 7E44EC 8028366C 92420004 */ lbu $v0, 4($s2) @@ -57,7 +57,7 @@ glabel GetPushBlock /* 7E4500 80283680 02671821 */ addu $v1, $s3, $a3 /* 7E4504 80283684 00431021 */ addu $v0, $v0, $v1 /* 7E4508 80283688 90460000 */ lbu $a2, ($v0) -/* 7E450C 8028368C 0C0B2026 */ jal set_variable +/* 7E450C 8028368C 0C0B2026 */ jal evt_set_variable /* 7E4510 80283690 0200282D */ daddu $a1, $s0, $zero /* 7E4514 80283694 8FBF0024 */ lw $ra, 0x24($sp) /* 7E4518 80283698 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/script_api/7E3700/func_80283240.s b/ver/us/asm/nonmatchings/world/script_api/7E3700/func_80283240.s index 5eba70cf38..de4486915c 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E3700/func_80283240.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E3700/func_80283240.s @@ -35,7 +35,7 @@ glabel func_80283240 .L802832AC: /* 7E412C 802832AC 0260202D */ daddu $a0, $s3, $zero /* 7E4130 802832B0 0280282D */ daddu $a1, $s4, $zero -/* 7E4134 802832B4 0C0B2026 */ jal set_variable +/* 7E4134 802832B4 0C0B2026 */ jal evt_set_variable /* 7E4138 802832B8 0220302D */ daddu $a2, $s1, $zero /* 7E413C 802832BC 8FBF0024 */ lw $ra, 0x24($sp) /* 7E4140 802832C0 8FB40020 */ lw $s4, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/script_api/7E4690/GetEntryCoords.s b/ver/us/asm/nonmatchings/world/script_api/7E4690/GetEntryCoords.s index c92db9b8cd..776d179523 100644 --- a/ver/us/asm/nonmatchings/world/script_api/7E4690/GetEntryCoords.s +++ b/ver/us/asm/nonmatchings/world/script_api/7E4690/GetEntryCoords.s @@ -23,27 +23,27 @@ glabel GetEntryCoords /* 7E4AFC 80283C7C C6200000 */ lwc1 $f0, ($s1) /* 7E4B00 80283C80 4600008D */ trunc.w.s $f2, $f0 /* 7E4B04 80283C84 44061000 */ mfc1 $a2, $f2 -/* 7E4B08 80283C88 0C0B2026 */ jal set_variable +/* 7E4B08 80283C88 0C0B2026 */ jal evt_set_variable /* 7E4B0C 80283C8C 0240202D */ daddu $a0, $s2, $zero /* 7E4B10 80283C90 8E050000 */ lw $a1, ($s0) /* 7E4B14 80283C94 26100004 */ addiu $s0, $s0, 4 /* 7E4B18 80283C98 C6200004 */ lwc1 $f0, 4($s1) /* 7E4B1C 80283C9C 4600008D */ trunc.w.s $f2, $f0 /* 7E4B20 80283CA0 44061000 */ mfc1 $a2, $f2 -/* 7E4B24 80283CA4 0C0B2026 */ jal set_variable +/* 7E4B24 80283CA4 0C0B2026 */ jal evt_set_variable /* 7E4B28 80283CA8 0240202D */ daddu $a0, $s2, $zero /* 7E4B2C 80283CAC 8E050000 */ lw $a1, ($s0) /* 7E4B30 80283CB0 26100004 */ addiu $s0, $s0, 4 /* 7E4B34 80283CB4 C6200008 */ lwc1 $f0, 8($s1) /* 7E4B38 80283CB8 4600008D */ trunc.w.s $f2, $f0 /* 7E4B3C 80283CBC 44061000 */ mfc1 $a2, $f2 -/* 7E4B40 80283CC0 0C0B2026 */ jal set_variable +/* 7E4B40 80283CC0 0C0B2026 */ jal evt_set_variable /* 7E4B44 80283CC4 0240202D */ daddu $a0, $s2, $zero /* 7E4B48 80283CC8 C620000C */ lwc1 $f0, 0xc($s1) /* 7E4B4C 80283CCC 8E050000 */ lw $a1, ($s0) /* 7E4B50 80283CD0 4600008D */ trunc.w.s $f2, $f0 /* 7E4B54 80283CD4 44061000 */ mfc1 $a2, $f2 -/* 7E4B58 80283CD8 0C0B2026 */ jal set_variable +/* 7E4B58 80283CD8 0C0B2026 */ jal evt_set_variable /* 7E4B5C 80283CDC 0240202D */ daddu $a0, $s2, $zero /* 7E4B60 80283CE0 8FBF0020 */ lw $ra, 0x20($sp) /* 7E4B64 80283CE4 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index cfa2115e11..132e49c403 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2799,8 +2799,8 @@ get_script_by_index = 0x802C4790; // type:func rom:0xE9140 get_script_by_id = 0x802C47A8; // type:func rom:0xE9158 set_script_flags = 0x802C47E8; // type:func rom:0xE9198 clear_script_flags = 0x802C4880; // type:func rom:0xE9230 -fixed_var_to_float = 0x802C4920; // type:func rom:0xE92D0 -float_to_fixed_var = 0x802C496C; // type:func rom:0xE931C +evt_fixed_var_to_float = 0x802C4920; // type:func rom:0xE92D0 +evt_float_to_fixed_var = 0x802C496C; // type:func rom:0xE931C evt_handle_return = 0x802C4998; // type:func rom:0xE9348 evt_handle_label = 0x802C49B8; // type:func rom:0xE9368 evt_handle_goto = 0x802C49C0; // type:func rom:0xE9370 @@ -2871,7 +2871,7 @@ evt_handle_exec1 = 0x802C646C; // type:func rom:0xEAE1C evt_handle_exec1_get_id = 0x802C6524; // type:func rom:0xEAED4 evt_handle_exec_wait = 0x802C65FC; // type:func rom:0xEAFAC evt_handle_jump = 0x802C6640; // type:func rom:0xEAFF0 -_bound_script_trigger_handler = 0x802C667C; // type:func rom:0xEB02C +evt_bound_script_trigger_handler = 0x802C667C; // type:func rom:0xEB02C evt_handle_bind = 0x802C6714; // type:func rom:0xEB0C4 DeleteTrigger = 0x802C6824; // type:func rom:0xEB1D4 evt_handle_unbind = 0x802C6850; // type:func rom:0xEB200 @@ -2898,12 +2898,12 @@ func_802C739C = 0x802C739C; // type:func rom:0xEBD4C func_802C73B0 = 0x802C73B0; // type:func rom:0xEBD60 func_802C73B8 = 0x802C73B8; // type:func rom:0xEBD68 evt_execute_next_command = 0x802C7404; // type:func rom:0xEBDB4 -get_variable = 0x802C7ABC; // type:func rom:0xEC46C -get_variable_index = 0x802C7DA8; // type:func rom:0xEC758 -get_variable_index_alt = 0x802C7F20; // type:func rom:0xEC8D0 -set_variable = 0x802C8098; // type:func rom:0xECA48 -get_float_variable = 0x802C842C; // type:func rom:0xECDDC -set_float_variable = 0x802C8640; // type:func rom:0xECFF0 +evt_get_variable = 0x802C7ABC; // type:func rom:0xEC46C +evt_get_variable_index = 0x802C7DA8; // type:func rom:0xEC758 +evt_get_variable_index_alt = 0x802C7F20; // type:func rom:0xEC8D0 +evt_set_variable = 0x802C8098; // type:func rom:0xECA48 +evt_get_float_variable = 0x802C842C; // type:func rom:0xECDDC +evt_set_float_variable = 0x802C8640; // type:func rom:0xECFF0 evt_find_label = 0x802C8890; // type:func rom:0xED240 evt_skip_if = 0x802C88FC; // type:func rom:0xED2AC evt_skip_else = 0x802C8978; // type:func rom:0xED328 @@ -21379,7 +21379,7 @@ dead_cos_rad = 0x8002B4C0; // type:func dead:yes dead_playFX_11 = 0x80075170; // type:func dead:yes dead_gItemTable = 0x8008D2C0; // type:data dead:true dead_gPlayerStatusPtr = 0x800FFC90; // type:data dead:yes -dead_get_variable = 0x802D4E8C; // type:func dead:yes -dead_set_variable = 0x802D5468; // type:func dead:yes -dead_get_float_variable = 0x802D57FC; // type:func dead:yes -dead_set_float_variable = 0x802D5A10; // type:func dead:yes +dead_evt_get_variable = 0x802D4E8C; // type:func dead:yes +dead_evt_set_variable = 0x802D5468; // type:func dead:yes +dead_evt_get_float_variable = 0x802D57FC; // type:func dead:yes +dead_evt_set_float_variable = 0x802D5A10; // type:func dead:yes diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index c8429763bb..a523287120 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1804,11 +1804,11 @@ gSpinHistoryPosAngle = 0x8010F6B8; dead_atan2 = 0x8002AF70; D_80100060 = 0x80100060; D_801000A0 = 0x801000A0; -dead_get_variable = 0x802D4E8C; -dead_set_variable = 0x802D5468; -dead_get_float_variable = 0x802D57FC; +dead_evt_get_variable = 0x802D4E8C; +dead_evt_set_variable = 0x802D5468; +dead_evt_get_float_variable = 0x802D57FC; dead_cos_rad = 0x8002B4C0; -dead_set_float_variable = 0x802D5A10; +dead_evt_set_float_variable = 0x802D5A10; dead_playFX_11 = 0x80075170; dead_gPlayerStatusPtr = 0x800FFC90; dead_set_main_pan_u = 0x80126064;